fix: sn not sort (#2682)

* fix: GroupApplicationAcceptedNotification * fix: GroupApplicationAcceptedNotification * fix: NotificationUserInfoUpdate * cicd: robot automated Change * fix: component * fix: getConversationInfo * feat: cron task * feat: cron task * feat: cron task * feat: cron task * feat: cron task * fix: minio config url recognition error * update gomake version * update gomake version * fix: seq conversion bug * fix: redis pipe exec * fix: ImportFriends * fix: A large number of logs keysAndValues length is not even * feat: mark read aggregate write * feat: online status supports redis cluster * feat: online status supports redis cluster * feat: online status supports redis cluster * merge * merge * read seq is written to mongo * read seq is written to mongo * fix: invitation to join group notification * fix: friend op_user_id * feat: optimizing asynchronous context * feat: optimizing memamq size * feat: add GetSeqMessage * feat: GroupApplicationAgreeMemberEnterNotification * feat: GroupApplicationAgreeMemberEnterNotification * feat: go.mod * feat: go.mod * feat: join group notification and get seq * feat: join group notification and get seq * feat: avoid pulling messages from sessions with a large number of max seq values of 0 * feat: API supports gzip * go.mod * fix: nil pointer error on close * fix: listen error * fix: listen error * update go.mod * feat: add log * fix: token parse token value * fix: GetMsgBySeqs boundary issues * fix: sn_ not sort * fix: sn_ not sort * fix: sn_ not sort --------- Co-authored-by: withchao <[email protected]>
openimsdk · Sep 29, 2024 · 765fa17 · 765fa17
1 parent 0892c1c
commit 765fa17
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 397 deletions.
diff --git a/pkg/msgprocessor/conversation.go b/pkg/msgprocessor/conversation.go
@@ -39,7 +39,9 @@ func GetNotificationConversationIDByMsg(msg *sdkws.MsgData) string {
 	case constant.ReadGroupChatType:
 		return "n_" + msg.GroupID
 	case constant.NotificationChatType:
-		return "n_" + msg.SendID + "_" + msg.RecvID
+		l := []string{msg.SendID, msg.RecvID}
+		sort.Strings(l)
+		return "n_" + strings.Join(l, "_")
 	}
 	return ""
 }
@@ -55,21 +57,11 @@ func GetChatConversationIDByMsg(msg *sdkws.MsgData) string {
 	case constant.ReadGroupChatType:
 		return "sg_" + msg.GroupID
 	case constant.NotificationChatType:
-		return "sn_" + msg.SendID + "_" + msg.RecvID
-	}
-
-	return ""
-}
-
-func GenConversationUniqueKey(msg *sdkws.MsgData) string {
-	switch msg.SessionType {
-	case constant.SingleChatType, constant.NotificationChatType:
 		l := []string{msg.SendID, msg.RecvID}
 		sort.Strings(l)
-		return strings.Join(l, "_")
-	case constant.ReadGroupChatType:
-		return msg.GroupID
+		return "sn_" + strings.Join(l, "_")
 	}
+
 	return ""
 }
 
@@ -94,10 +86,12 @@ func GetConversationIDByMsg(msg *sdkws.MsgData) string {
 		}
 		return "sg_" + msg.GroupID // super group chat
 	case constant.NotificationChatType:
+		l := []string{msg.SendID, msg.RecvID}
+		sort.Strings(l)
 		if !options.IsNotNotification() {
-			return "n_" + msg.SendID + "_" + msg.RecvID // super group chat
+			return "n_" + strings.Join(l, "_")
 		}
-		return "sn_" + msg.SendID + "_" + msg.RecvID // server notification chat
+		return "sn_" + strings.Join(l, "_")
 	}
 	return ""
 }
@@ -120,30 +114,6 @@ func GetConversationIDBySessionType(sessionType int, ids ...string) string {
 	return ""
 }
 
-func GetNotificationConversationIDByConversationID(conversationID string) string {
-	l := strings.Split(conversationID, "_")
-	if len(l) > 1 {
-		l[0] = "n"
-		return strings.Join(l, "_")
-	}
-
-	return ""
-}
-
-func GetNotificationConversationID(sessionType int, ids ...string) string {
-	sort.Strings(ids)
-	if len(ids) > 2 || len(ids) < 1 {
-		return ""
-	}
-	switch sessionType {
-	case constant.SingleChatType:
-		return "n_" + strings.Join(ids, "_") // single chat
-	case constant.ReadGroupChatType:
-		return "n_" + ids[0] // super group chat
-	}
-	return ""
-}
-
 func IsNotification(conversationID string) bool {
 	return strings.HasPrefix(conversationID, "n_")
 }
@@ -152,30 +122,6 @@ func IsNotificationByMsg(msg *sdkws.MsgData) bool {
 	return !Options(msg.Options).IsNotNotification()
 }
 
-func ParseConversationID(msg *sdkws.MsgData) (isNotification bool, conversationID string) {
-	options := Options(msg.Options)
-	switch msg.SessionType {
-	case constant.SingleChatType:
-		l := []string{msg.SendID, msg.RecvID}
-		sort.Strings(l)
-		if !options.IsNotNotification() {
-			return true, "n_" + strings.Join(l, "_")
-		}
-		return false, "si_" + strings.Join(l, "_") // single chat
-	case constant.ReadGroupChatType:
-		if !options.IsNotNotification() {
-			return true, "n_" + msg.GroupID // super group chat
-		}
-		return false, "sg_" + msg.GroupID // super group chat
-	case constant.NotificationChatType:
-		if !options.IsNotNotification() {
-			return true, "n_" + msg.SendID + "_" + msg.RecvID // super group chat
-		}
-		return false, "sn_" + msg.SendID + "_" + msg.RecvID // server notification chat
-	}
-	return false, ""
-}
-
 type MsgBySeq []*sdkws.MsgData
 
 func (s MsgBySeq) Len() int {