diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 8ed4afe5a..0898da0f5 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -287,6 +287,19 @@ func (g *groupServer) webhookAfterJoinGroup(ctx context.Context, after *config.A g.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackAfterJoinGroupResp{}, after) } +func afterJoinGroupRequests(members []*model.GroupMember, reqMessage string) []*group.JoinGroupReq { + requests := make([]*group.JoinGroupReq, 0, len(members)) + for _, member := range members { + requests = append(requests, &group.JoinGroupReq{ + GroupID: member.GroupID, + ReqMessage: reqMessage, + JoinSource: member.JoinSource, + InviterUserID: member.UserID, + }) + } + return requests +} + func (g *groupServer) webhookBeforeSetGroupInfo(ctx context.Context, before *config.BeforeConfig, req *group.SetGroupInfoReq) error { return webhook.WithCondition(ctx, before, func(ctx context.Context) error { cbReq := &callbackstruct.CallbackBeforeSetGroupInfoReq{ diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 46bd59867..4c6ecc38b 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -478,6 +478,9 @@ func (g *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite if err := g.setMemberJoinSeq(ctx, req.GroupID, req.InvitedUserIDs); err != nil { return nil, err } + for _, joinReq := range afterJoinGroupRequests(groupMembers, req.Reason) { + g.webhookAfterJoinGroup(ctx, &g.config.WebhooksConfig.AfterJoinGroup, joinReq) + } return &pbgroup.InviteUserToGroupResp{}, nil } @@ -914,6 +917,9 @@ func (g *groupServer) GroupApplicationResponse(ctx context.Context, req *pbgroup if err := g.setMemberJoinSeq(ctx, req.GroupID, []string{req.FromUserID}); err != nil { return nil, err } + for _, joinReq := range afterJoinGroupRequests([]*model.GroupMember{member}, groupRequest.ReqMsg) { + g.webhookAfterJoinGroup(ctx, &g.config.WebhooksConfig.AfterJoinGroup, joinReq) + } } case constant.GroupResponseRefuse: g.notification.GroupApplicationRejectedNotification(ctx, req)