Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release

internal/push/fcm/push.go

@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/tools"
+	"Open_IM/pkg/tools/splitter"
 	"context"
 	firebase "firebase.google.com/go"
 	"firebase.google.com/go/messaging"
@@ -62,7 +62,7 @@ func (f *Fcm) Push(accounts []string, alert, detailContent, operationID string,
 	}
 	Success := 0
 	Fail := 0
-	result := tools.NewSplitter(SinglePushCountLimit, Tokens).GetSplitResult()
+	result := splitter.NewSplitter(SinglePushCountLimit, Tokens).GetSplitResult()
 	Msg := new(messaging.MulticastMessage)
 	Msg.Notification = &messaging.Notification{}
 	Msg.Notification.Body = detailContent

internal/rpc/group/group.go

@@ -256,6 +256,9 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo
 			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), v)
 			continue
 		}
+		if group.GroupType == constant.SuperGroup {
+			continue
+		}
 		if group.Status == constant.GroupStatusDismissed {
 			log.NewError(req.OperationID, "constant.GroupStatusDismissed ", group)
 			continue

internal/rpc/msg/send_msg.go

@@ -839,7 +839,7 @@ func Notification(n *NotificationMsg) {
 		unReadCount = config.Config.Notification.ConversationSetPrivate.Conversation.UnreadCount
 	case constant.DeleteMessageNotification:
 		reliabilityLevel = constant.ReliableNotificationNoMsg
-	case constant.SuperGroupUpdateNotification, constant.ConversationUnreadNotification:
+	case constant.ConversationUnreadNotification, constant.SuperGroupUpdateNotification:
 		reliabilityLevel = constant.UnreliableNotification
 	}
 	switch reliabilityLevel {

pkg/common/constant/constant.go

@@ -64,7 +64,6 @@ const (
 	FriendRemarkSetNotification           = 1206 //set_friend_remark?
 	BlackAddedNotification                = 1207 //add_black
 	BlackDeletedNotification              = 1208 //remove_black
-	MsgDeleteNotification                 = 1209
 
 	ConversationOptChangeNotification = 1300 // change conversation opt
 
@@ -100,6 +99,7 @@ const (
 
 	SuperGroupNotificationBegin  = 1650
 	SuperGroupUpdateNotification = 1651
+	MsgDeleteNotification        = 1652
 	SuperGroupNotificationEnd    = 1699
 
 	ConversationPrivateChatNotification = 1701

pkg/tools/splitter/tools.go

@@ -1,4 +1,4 @@
-package tools
+package splitter
 
 type SplitResult struct {
 	Item []string