blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-25 02:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

Browse Source
This commit is contained in:
wangchuxiao 2023-05-22 15:15:06 +08:00
commit 416bf4921c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/push/push_to_client.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"errors" "errors"
"github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush" "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush"
"github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/fcm" "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/fcm"
"github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/getui" "github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush/getui"
@ -153,17 +152,18 @@ func (p *Pusher) Push2SuperGroup(ctx context.Context, groupID string, msg *sdkws
kickedUsers := utils.Slice(tips.KickedUserList, func(e *sdkws.GroupMemberFullInfo) string { return e.UserID }) kickedUsers := utils.Slice(tips.KickedUserList, func(e *sdkws.GroupMemberFullInfo) string { return e.UserID })
pushToUserIDs = append(pushToUserIDs, kickedUsers...) pushToUserIDs = append(pushToUserIDs, kickedUsers...)
case constant.GroupDismissedNotification: case constant.GroupDismissedNotification:
var tips sdkws.GroupDismissedTips if utils.IsNotification(utils.GetConversationIDByMsg(msg)) { // 消息先到,通知后到
if p.UnmarshalNotificationElem(msg.Content, &tips) != nil { var tips sdkws.GroupDismissedTips
return err if p.UnmarshalNotificationElem(msg.Content, &tips) != nil {
} return err
log.ZInfo(ctx, "GroupDismissedNotification userIDs", "groupID", groupID, "userIDs", pushToUserIDs) }
if len(config.Config.Manager.AppManagerUid) > 0 { log.ZInfo(ctx, "GroupDismissedNotificationInfo****", "groupID", groupID, "num", len(pushToUserIDs), "list", pushToUserIDs)
ctx = mcontext.WithOpUserIDContext(ctx, config.Config.Manager.AppManagerUid[0]) if len(config.Config.Manager.AppManagerUid) > 0 {
} ctx = mcontext.WithOpUserIDContext(ctx, config.Config.Manager.AppManagerUid[0])
if err := p.DismissGroup(ctx, groupID); err != nil { }
log.ZError(ctx, "DismissGroup Notification clear members", err, "groupID", groupID) if err := p.DismissGroup(ctx, groupID); err != nil {
return err log.ZError(ctx, "DismissGroup Notification clear members", err, "groupID", groupID)
}
} }
} }
} }

2
pkg/rpcclient/msg.go
View File

@ -172,7 +172,7 @@ func (c *MsgClient) Notification(ctx context.Context, sendID, recvID string, con
if err == nil { if err == nil {
log.ZDebug(ctx, "MsgClient Notification SendMsg success", "req", &req) log.ZDebug(ctx, "MsgClient Notification SendMsg success", "req", &req)
} else { } else {
log.ZError(ctx, "MsgClient Notification SendMsg failed %s\n", err, "req", &req) log.ZError(ctx, "MsgClient Notification SendMsg failed", err, "req", &req)
} }
return err return err
} }