Skip to content

Commit 7d51797

Browse files
icey-yuOpenIM-Robot
authored andcommitted
fix: webhookBeforeSendSingleMsg will call before black and friend check (#2885)
1 parent d8afbb8 commit 7d51797

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

internal/rpc/msg/send.go

-3
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbmsg.SendMsgReq
174174
prommetrics.SingleChatMsgProcessFailedCounter.Inc()
175175
return nil, nil
176176
} else {
177-
if err = m.webhookBeforeSendSingleMsg(ctx, &m.config.WebhooksConfig.BeforeSendSingleMsg, req); err != nil {
178-
return nil, err
179-
}
180177
if err := m.webhookBeforeMsgModify(ctx, &m.config.WebhooksConfig.BeforeMsgModify, req); err != nil {
181178
return nil, err
182179
}

internal/rpc/msg/verify.go

+3
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ func (m *msgServer) messageVerification(ctx context.Context, data *msg.SendMsgRe
5959
data.MsgData.ContentType >= constant.NotificationBegin {
6060
return nil
6161
}
62+
if err := m.webhookBeforeSendSingleMsg(ctx, &m.config.WebhooksConfig.BeforeSendSingleMsg, data); err != nil {
63+
return err
64+
}
6265
black, err := m.FriendLocalCache.IsBlack(ctx, data.MsgData.SendID, data.MsgData.RecvID)
6366
if err != nil {
6467
return err

0 commit comments

Comments
 (0)