From 7cf631079afe3306d4b897f1145087f1eea04c61 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Mon, 13 Nov 2023 16:09:36 +0800 Subject: [PATCH] fix: the original message referenced by the pull message processing is withdrawn --- pkg/common/db/controller/msg.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index e395ca794..80c77a7a4 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -461,10 +461,15 @@ func (db *commonMsgDatabase) handlerDBMsg(ctx context.Context, userID, conversat log.ZError(ctx, "GetMsgBySeqIndexIn1Doc", err, "conversationID", conversationID, "seq", quoteMsg.QuoteMessage.Seq) return } - if len(msgs) != 0 && msgs[0].Msg.ContentType != constant.MsgRevokeNotification { + if len(msgs) != 0 && msgs[0].Msg.ContentType == constant.MsgRevokeNotification { return } - quoteMsg.QuoteMessage = nil + quoteMsg.QuoteMessage.ContentType = constant.MsgRevokeNotification + if len(msgs) > 0 { + quoteMsg.QuoteMessage.Content = msgs[0].Msg.Content + } else { + quoteMsg.QuoteMessage.Content = "{}" + } data, err := json.Marshal("eMsg) if err != nil { log.ZError(ctx, "json.Marshal", err)