blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +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-06-04 14:37:56 +08:00
commit 4a8f1d8392
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1109,19 +1109,19 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
return nil, err return nil, err
} }
} else { } else {
if !req.DeleteMember { //if !req.DeleteMember {
//s.Notification.GroupDismissedNotification(ctx, req) //s.Notification.GroupDismissedNotification(ctx, req)
tips := &sdkws.GroupDismissedTips{ tips := &sdkws.GroupDismissedTips{
Group: s.groupDB2PB(group, owner.UserID, uint32(len(userIDs))), Group: s.groupDB2PB(group, owner.UserID, uint32(len(userIDs))),
OpUser: &sdkws.GroupMemberFullInfo{}, OpUser: &sdkws.GroupMemberFullInfo{},
}
if mcontext.GetOpUserID(ctx) == owner.UserID {
tips.OpUser = s.groupMemberDB2PB(owner, 0)
} else {
tips.OpUser = &sdkws.GroupMemberFullInfo{UserID: mcontext.GetOpUserID(ctx)}
}
s.Notification.GroupDismissedNotification(ctx, tips)
} }
if mcontext.GetOpUserID(ctx) == owner.UserID {
tips.OpUser = s.groupMemberDB2PB(owner, 0)
} else {
tips.OpUser = &sdkws.GroupMemberFullInfo{UserID: mcontext.GetOpUserID(ctx)}
}
s.Notification.GroupDismissedNotification(ctx, tips)
//}
} }
return resp, nil return resp, nil
} }

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

@ -99,7 +99,7 @@ func (m *msgServer) messageVerification(ctx context.Context, data *msg.SendMsgRe
if err != nil { if err != nil {
return nil, err return nil, err
} }
if groupInfo.Status == constant.GroupStatusDismissed { if groupInfo.Status == constant.GroupStatusDismissed && data.MsgData.ContentType != constant.GroupDismissedNotification {
return nil, errs.ErrArgs.Wrap("group is dismissed") return nil, errs.ErrArgs.Wrap("group is dismissed")
} }
if groupInfo.GroupType == constant.SuperGroup { if groupInfo.GroupType == constant.SuperGroup {

3
pkg/common/log/zap.go
View File

@ -213,6 +213,9 @@ func (l *ZapLogger) Error(ctx context.Context, msg string, err error, keysAndVal
} }
func (l *ZapLogger) kvAppend(ctx context.Context, keysAndValues []interface{}) []interface{} { func (l *ZapLogger) kvAppend(ctx context.Context, keysAndValues []interface{}) []interface{} {
if ctx == nil {
return keysAndValues
}
operationID := mcontext.GetOperationID(ctx) operationID := mcontext.GetOperationID(ctx)
opUserID := mcontext.GetOpUserID(ctx) opUserID := mcontext.GetOpUserID(ctx)
connID := mcontext.GetConnID(ctx) connID := mcontext.GetConnID(ctx)