diff --git a/config/notification.yaml b/config/notification.yaml index 92a9e3f8c..a9a214b6d 100644 --- a/config/notification.yaml +++ b/config/notification.yaml @@ -270,7 +270,7 @@ userInfoUpdated: #####################conversation######################### conversationChanged: - isSendMsg: true + isSendMsg: false reliabilityLevel: 1 unreadCount: false offlinePush: diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 382dc3244..f84acd929 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1109,19 +1109,19 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou return nil, err } } else { - if !req.DeleteMember { - //s.Notification.GroupDismissedNotification(ctx, req) - tips := &sdkws.GroupDismissedTips{ - Group: s.groupDB2PB(group, owner.UserID, uint32(len(userIDs))), - 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 !req.DeleteMember { + //s.Notification.GroupDismissedNotification(ctx, req) + tips := &sdkws.GroupDismissedTips{ + Group: s.groupDB2PB(group, owner.UserID, uint32(len(userIDs))), + 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) + //} } return resp, nil } diff --git a/internal/rpc/msg/verify.go b/internal/rpc/msg/verify.go index b50c4c18b..5a190bbe3 100644 --- a/internal/rpc/msg/verify.go +++ b/internal/rpc/msg/verify.go @@ -99,7 +99,7 @@ func (m *msgServer) messageVerification(ctx context.Context, data *msg.SendMsgRe if err != nil { 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") } if groupInfo.GroupType == constant.SuperGroup {