blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-27 20:30:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangchuxiao 2022-08-17 18:21:49 +08:00
commit 4614107b2b
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/push/fcm/push.go
View File

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

3
internal/rpc/group/group.go
View File

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

2
internal/rpc/msg/send_msg.go
View File

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

2
pkg/common/constant/constant.go
View File

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

2
pkg/tools/tools.go → pkg/tools/splitter/tools.go
View File

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