Skip to content

Commit e37ea50

Browse files
authored
fix: the source message of the reference is withdrawn, and the referenced message is deleted (#3137)
* pb * fix: Modifying other fields while setting IsPrivateChat does not take effect * fix: quote message error revoke * refactoring scheduled tasks * refactoring scheduled tasks * refactoring scheduled tasks * refactoring scheduled tasks * refactoring scheduled tasks * refactoring scheduled tasks * upgrading pkg tools * fix * fix * optimize log output * feat: support GetLastMessage * feat: support GetLastMessage * feat: s3 switch * feat: s3 switch * fix: GetUsersOnline * feat: SendBusinessNotification supported configuration parameters * feat: SendBusinessNotification supported configuration parameters * feat: SendBusinessNotification supported configuration parameters * feat: seq conversion failed without exiting * fix: DeleteDoc crash * fix: fill send time * fix: fill send time * fix: crash caused by withdrawing messages from users who have left the group * fix: user msg timestamp * seq read config * seq read config * fix: the source message of the reference is withdrawn, and the referenced message is deleted
1 parent a3c43a4 commit e37ea50

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

internal/msgtransfer/online_msg_to_mongo_handler.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,14 @@ func (mc *OnlineHistoryMongoConsumerHandler) handleChatWs2Mongo(ctx context.Cont
7373
} else {
7474
prommetrics.MsgInsertMongoSuccessCounter.Inc()
7575
}
76-
var seqs []int64
77-
for _, msg := range msgFromMQ.MsgData {
78-
seqs = append(seqs, msg.Seq)
79-
}
76+
//var seqs []int64
77+
//for _, msg := range msgFromMQ.MsgData {
78+
// seqs = append(seqs, msg.Seq)
79+
//}
80+
//if err := mc.msgTransferDatabase.DeleteMessagesFromCache(ctx, msgFromMQ.ConversationID, seqs); err != nil {
81+
// log.ZError(ctx, "remove cache msg from redis err", err, "msg",
82+
// msgFromMQ.MsgData, "conversationID", msgFromMQ.ConversationID)
83+
//}
8084
}
8185

8286
func (*OnlineHistoryMongoConsumerHandler) Setup(_ sarama.ConsumerGroupSession) error { return nil }

pkg/common/storage/controller/msg.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ func (db *commonMsgDatabase) handlerDBMsg(ctx context.Context, cache map[int64][
310310
log.ZError(ctx, "json.Unmarshal", err)
311311
return
312312
}
313-
if quoteMsg.QuoteMessage == nil || quoteMsg.QuoteMessage.Content == "" {
313+
if quoteMsg.QuoteMessage == nil {
314314
return
315315
}
316316
if quoteMsg.QuoteMessage.Content == "e30=" {

0 commit comments

Comments
 (0)