From 3ab07fb46fd2a92847e1fbfe9850c66d7b3e934e Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Mon, 13 Nov 2023 15:45:09 +0800
Subject: [PATCH] fix: the original message referenced by the pull message
 processing is withdrawn

---
 pkg/common/db/controller/msg.go      | 29 +++++++++++++++++++++++++---
 pkg/common/db/controller/msg_test.go |  2 +-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go
index 55a4fba69..3ec9408ea 100644
--- a/pkg/common/db/controller/msg.go
+++ b/pkg/common/db/controller/msg.go
@@ -420,10 +420,33 @@ func (db *commonMsgDatabase) handlerDBMsg(ctx context.Context, userID, conversat
 	if msg.Msg.Content == "" {
 		return
 	}
-	//var quoteMsgItem map[string]json.RawMessage
+	type MsgData struct {
+		SendID           string                 `protobuf:"bytes,1,opt,name=sendID,proto3" json:"sendID"`
+		RecvID           string                 `protobuf:"bytes,2,opt,name=recvID,proto3" json:"recvID"`
+		GroupID          string                 `protobuf:"bytes,3,opt,name=groupID,proto3" json:"groupID"`
+		ClientMsgID      string                 `protobuf:"bytes,4,opt,name=clientMsgID,proto3" json:"clientMsgID"`
+		ServerMsgID      string                 `protobuf:"bytes,5,opt,name=serverMsgID,proto3" json:"serverMsgID"`
+		SenderPlatformID int32                  `protobuf:"varint,6,opt,name=senderPlatformID,proto3" json:"senderPlatformID"`
+		SenderNickname   string                 `protobuf:"bytes,7,opt,name=senderNickname,proto3" json:"senderNickname"`
+		SenderFaceURL    string                 `protobuf:"bytes,8,opt,name=senderFaceURL,proto3" json:"senderFaceURL"`
+		SessionType      int32                  `protobuf:"varint,9,opt,name=sessionType,proto3" json:"sessionType"`
+		MsgFrom          int32                  `protobuf:"varint,10,opt,name=msgFrom,proto3" json:"msgFrom"`
+		ContentType      int32                  `protobuf:"varint,11,opt,name=contentType,proto3" json:"contentType"`
+		Content          string                 `protobuf:"bytes,12,opt,name=content,proto3" json:"content"`
+		Seq              int64                  `protobuf:"varint,14,opt,name=seq,proto3" json:"seq"`
+		SendTime         int64                  `protobuf:"varint,15,opt,name=sendTime,proto3" json:"sendTime"`
+		CreateTime       int64                  `protobuf:"varint,16,opt,name=createTime,proto3" json:"createTime"`
+		Status           int32                  `protobuf:"varint,17,opt,name=status,proto3" json:"status"`
+		IsRead           bool                   `protobuf:"varint,18,opt,name=isRead,proto3" json:"isRead"`
+		Options          map[string]bool        `protobuf:"bytes,19,rep,name=options,proto3" json:"options" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+		OfflinePushInfo  *sdkws.OfflinePushInfo `protobuf:"bytes,20,opt,name=offlinePushInfo,proto3" json:"offlinePushInfo"`
+		AtUserIDList     []string               `protobuf:"bytes,21,rep,name=atUserIDList,proto3" json:"atUserIDList"`
+		AttachedInfo     string                 `protobuf:"bytes,22,opt,name=attachedInfo,proto3" json:"attachedInfo"`
+		Ex               string                 `protobuf:"bytes,23,opt,name=ex,proto3" json:"ex"`
+	}
 	var quoteMsg struct {
 		Text              string          `json:"text,omitempty"`
-		QuoteMessage      *sdkws.MsgData  `json:"quoteMessage,omitempty"`
+		QuoteMessage      *MsgData        `json:"quoteMessage,omitempty"`
 		MessageEntityList json.RawMessage `json:"messageEntityList,omitempty"`
 	}
 	if err := json.Unmarshal([]byte(msg.Msg.Content), &quoteMsg); err != nil {
@@ -443,7 +466,7 @@ func (db *commonMsgDatabase) handlerDBMsg(ctx context.Context, userID, conversat
 	} else {
 		if msgs[0].Msg.ContentType == constant.MsgRevokeNotification {
 			quoteMsg.QuoteMessage.ContentType = constant.MsgRevokeNotification
-			quoteMsg.QuoteMessage.Content = []byte(msgs[0].Msg.Content)
+			quoteMsg.QuoteMessage.Content = msgs[0].Msg.Content
 		}
 	}
 	data, err := json.Marshal(&quoteMsg)
diff --git a/pkg/common/db/controller/msg_test.go b/pkg/common/db/controller/msg_test.go
index ba5aecd25..e81ad4b28 100644
--- a/pkg/common/db/controller/msg_test.go
+++ b/pkg/common/db/controller/msg_test.go
@@ -144,7 +144,7 @@ func Test_BatchInsertChat2DB(t *testing.T) {
 }
 
 func GetDB() *commonMsgDatabase {
-	config.Config.Mongo.Address = []string{"203.56.175.233:37017"}
+	config.Config.Mongo.Address = []string{"192.168.0.10:37017"}
 	// config.Config.Mongo.Timeout = 60
 	config.Config.Mongo.Database = "openIM_v3"
 	// config.Config.Mongo.Source = "admin"