Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Author: skiffer-git

internal/conversation_msg/conversation.go

@@ -251,7 +251,7 @@ func (c *Conversation) revokeOneMessage(callback open_im_sdk_callback.Base, req
 	switch req.SessionType {
 	case constant.SingleChatType:
 		recvID = req.RecvID
-		conversationID = utils.GetConversationIDBySessionType(groupID, constant.SingleChatType)
+		conversationID = utils.GetConversationIDBySessionType(recvID, constant.SingleChatType)
 	case constant.GroupChatType:
 		groupID = req.GroupID
 		conversationID = utils.GetConversationIDBySessionType(groupID, constant.GroupChatType)

internal/conversation_msg/conversation_msg.go

@@ -445,7 +445,7 @@ func (c *Conversation) doUpdateConversation(c2v common.Cmd2Value) {
 		lc := node.Args.(db.LocalConversation)
 		oc, err := c.db.GetConversation(lc.ConversationID)
 		if err == nil {
-			log.Info("this is old conversation", oc)
+			log.Info("this is old conversation", *oc)
 			if lc.LatestMsgSendTime >= oc.LatestMsgSendTime { //The session update of asynchronous messages is subject to the latest sending time
 				err := c.db.UpdateColumnsConversation(node.ConID, map[string]interface{}{"latest_msg_send_time": lc.LatestMsgSendTime, "latest_msg": lc.LatestMsg})
 				if err != nil {
@@ -458,6 +458,7 @@ func (c *Conversation) doUpdateConversation(c2v common.Cmd2Value) {
 				}
 			}
 		} else {
+			log.Info("this is new conversation", lc)
 			err4 := c.db.InsertConversation(&lc)
 			if err4 != nil {
 				log.Error("internal", "insert new conversation err:", err4.Error())