blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-04-29 18:34:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2e710a84e858234c00b76b5fa3f000015c801a26 into b7200c163c45c5e855b717ceb5be5093a70a7bd5

Browse Source
This commit is contained in:
niqinge 2026-03-10 16:33:17 +08:00 committed by GitHub
commit ede2cc913a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/rpc/group/callback.go
View File

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

2
internal/rpc/group/group.go
View File

@ -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 {

1
pkg/callbackstruct/group.go
View File

@ -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