From b299da6129dab71c3640b06a2cba0dcaf7b0b6d8 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 18 Jul 2023 19:40:50 +0800 Subject: [PATCH] fix bug: heartbeat get self notification --- internal/rpc/msg/sync_msg.go | 1 + pkg/utils/utils.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/internal/rpc/msg/sync_msg.go b/internal/rpc/msg/sync_msg.go index 70967a1ba..e05bd5644 100644 --- a/internal/rpc/msg/sync_msg.go +++ b/internal/rpc/msg/sync_msg.go @@ -95,6 +95,7 @@ func (m *msgServer) GetMaxSeq(ctx context.Context, req *sdkws.GetMaxSeqReq) (*sd for _, conversationID := range conversationIDs { conversationIDs = append(conversationIDs, utils.GetNotificationConversationIDByConversationID(conversationID)) } + conversationIDs = append(conversationIDs, utils.GetSelfNotificationConversationID(req.UserID)) log.ZDebug(ctx, "GetMaxSeq", "conversationIDs", conversationIDs) maxSeqs, err := m.MsgDatabase.GetMaxSeqs(ctx, conversationIDs) if err != nil { diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 418e65d34..2662e0a61 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -367,6 +367,10 @@ func GetNotificationConversationIDByConversationID(conversationID string) string return "" } +func GetSelfNotificationConversationID(userID string) string { + return "n_" + userID + "_" + userID +} + func GetSeqsBeginEnd(seqs []int64) (int64, int64) { if len(seqs) == 0 { return 0, 0