diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 8ed4afe5a..79b98b1a6 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -283,6 +283,7 @@ func (g *groupServer) webhookAfterJoinGroup(ctx context.Context, after *config.A ReqMessage: req.ReqMessage, JoinSource: req.JoinSource, InviterUserID: req.InviterUserID, + Ex: req.Ex, } g.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackAfterJoinGroupResp{}, after) } diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 359ecfa6f..e4a0fe8b7 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -960,6 +960,8 @@ func (g *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq) InviterUserID: req.InviterUserID, JoinTime: time.Now(), MuteEndTime: time.UnixMilli(0), + JoinSource: req.JoinSource, + Ex: req.Ex, } if err := g.webhookBeforeMembersJoinGroup(ctx, &g.config.WebhooksConfig.BeforeMemberJoinGroup, []*model.GroupMember{groupMember}, group.GroupID, group.Ex); err != nil && err != servererrs.ErrCallbackContinue { diff --git a/pkg/callbackstruct/group.go b/pkg/callbackstruct/group.go index 1f9b848cf..0e58814d9 100644 --- a/pkg/callbackstruct/group.go +++ b/pkg/callbackstruct/group.go @@ -194,6 +194,7 @@ type CallbackAfterJoinGroupReq struct { ReqMessage string `json:"reqMessage"` JoinSource int32 `json:"joinSource"` InviterUserID string `json:"inviterUserID"` + Ex string `json:"ex"` } type CallbackAfterJoinGroupResp struct { CommonCallbackResp