From 6d80f5500c3e2fb30d5c4fe6704f9ef3ff42da64 Mon Sep 17 00:00:00 2001 From: dsx137 <70027572+dsx137@users.noreply.github.com> Date: Thu, 5 Nov 2026 11:10:28 +0800 Subject: [PATCH] fix(core): derive possible real IDs from notification conversation IDs Use the shared helper to resolve candidate conversation IDs and validate ownership. --- pkg/rpccache/conversation.go | 15 +++------------ pkg/util/conversationutil/conversationutil.go | 13 +++++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/pkg/rpccache/conversation.go b/pkg/rpccache/conversation.go index d2fca39c8..1b8d69c98 100644 --- a/pkg/rpccache/conversation.go +++ b/pkg/rpccache/conversation.go @@ -155,20 +155,11 @@ func (c *ConversationLocalCache) CheckConversationAccess(ctx context.Context, us } candidateSet := make(map[string]struct{}, len(pending)) for conversationID := range pending { - if conversationutil.IsNotificationConversationID(conversationID) { - suffix := conversationID[2:] - candidateSet["si_"+suffix] = struct{}{} - candidateSet["sn_"+suffix] = struct{}{} - candidateSet["g_"+suffix] = struct{}{} - candidateSet[conversationutil.GenGroupConversationID(suffix)] = struct{}{} - } else { - candidateSet[conversationID] = struct{}{} + for _, rid := range conversationutil.GetPossibleRealConversationIDs(conversationID) { + candidateSet[rid] = struct{}{} } } - candidates := make([]string, 0, len(candidateSet)) - for conversationID := range candidateSet { - candidates = append(candidates, conversationID) - } + candidates := datautil.Keys(candidateSet) owned, err := c.GetConversations(ctx, userID, candidates) if err != nil { return err diff --git a/pkg/util/conversationutil/conversationutil.go b/pkg/util/conversationutil/conversationutil.go index f0a44ab1e..c5bed108e 100644 --- a/pkg/util/conversationutil/conversationutil.go +++ b/pkg/util/conversationutil/conversationutil.go @@ -52,3 +52,16 @@ func GetSeqsBeginEnd(seqs []int64) (int64, int64) { } return seqs[0], seqs[len(seqs)-1] } + +func GetPossibleRealConversationIDs(conversationID string) []string { + if !IsNotificationConversationID(conversationID) { + return []string{conversationID} + } + suffix := strings.TrimPrefix(conversationID, "n_") + return []string{ + "si_" + suffix, + "sn_" + suffix, + "g_" + suffix, + "sg_" + suffix, + } +}