From 05ab3fcd06944d7ad9ba6b5bf80f107cf03244ca Mon Sep 17 00:00:00 2001
From: chao <48119764+withchao@users.noreply.github.com>
Date: Mon, 13 Nov 2023 20:47:56 -0600
Subject: [PATCH] fix: the original quoted message is withdrawn and the quoted
 original message is displayed. (#1391)

* fix: GetUserReqApplicationList error when there is a disbanded group chat

* fix: error when querying some information about disbanded group

* fix: GetUserReqApplicationList dismissed group error

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* merge

* cicd: robot automated Change

* sdkws.MsgData

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>
---
 pkg/common/db/controller/msg.go | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go
index f9d6f507f..b9cf9427f 100644
--- a/pkg/common/db/controller/msg.go
+++ b/pkg/common/db/controller/msg.go
@@ -423,33 +423,9 @@ func (db *commonMsgDatabase) handlerDBMsg(ctx context.Context, cache map[int64][
 	if msg.Msg.Content == "" {
 		return
 	}
-	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      *MsgData        `json:"quoteMessage,omitempty"`
+		QuoteMessage      *sdkws.MsgData  `json:"quoteMessage,omitempty"`
 		MessageEntityList json.RawMessage `json:"messageEntityList,omitempty"`
 	}
 	if err := json.Unmarshal([]byte(msg.Msg.Content), &quoteMsg); err != nil {
@@ -478,9 +454,9 @@ func (db *commonMsgDatabase) handlerDBMsg(ctx context.Context, cache map[int64][
 	}
 	quoteMsg.QuoteMessage.ContentType = constant.MsgRevokeNotification
 	if len(msgs) > 0 {
-		quoteMsg.QuoteMessage.Content = msgs[0].Msg.Content
+		quoteMsg.QuoteMessage.Content = []byte(msgs[0].Msg.Content)
 	} else {
-		quoteMsg.QuoteMessage.Content = "{}"
+		quoteMsg.QuoteMessage.Content = []byte("{}")
 	}
 	data, err := json.Marshal(&quoteMsg)
 	if err != nil {