From 3a1dd0cb1db1800ce0838804c914fca02962a7cc Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Fri, 19 May 2023 15:18:19 +0800 Subject: [PATCH] group notification --- internal/rpc/group/group.go | 1 + pkg/rpcclient/notification/group.go | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 82f523ce5..27cdb2f2c 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -781,6 +781,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) s.Notification.JoinGroupApplicationNotification(ctx, req) return resp, nil } +} func (s *groupServer) QuitGroup(ctx context.Context, req *pbGroup.QuitGroupReq) (*pbGroup.QuitGroupResp, error) { resp := &pbGroup.QuitGroupResp{} diff --git a/pkg/rpcclient/notification/group.go b/pkg/rpcclient/notification/group.go index 5f4453a83..81dfffa0b 100644 --- a/pkg/rpcclient/notification/group.go +++ b/pkg/rpcclient/notification/group.go @@ -614,11 +614,16 @@ func (g *GroupNotificationSender) GroupMutedNotification(ctx context.Context, gr if err != nil { return err } - user, err := g.getGroupMember(ctx, groupID, mcontext.GetOpUserID(ctx)) + users, err := g.getGroupMembers(ctx, groupID, []string{mcontext.GetOpUserID(ctx)}) if err != nil { return err } - tips := &sdkws.GroupMutedTips{Group: group, OpUser: user} + tips := &sdkws.GroupMutedTips{Group: group} + if len(users) > 0 { + tips.OpUser = users[0] + } else { + tips.OpUser = &sdkws.GroupMemberFullInfo{UserID: mcontext.GetOpUserID(ctx), GroupID: groupID} + } return g.msgClient.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.GroupMutedNotification, tips) }