Merge 2e710a84e8 into b7200c163c

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)
 }

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 {

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