fix typing cause callback

pull/1681/head
AndrewZuo01 2 years ago
parent 3e8aabf67e
commit 79c58996a6

@ -62,9 +62,12 @@ func (m *msgServer) sendMsgSuperGroupChat(
prommetrics.GroupChatMsgProcessFailedCounter.Inc()
return nil, err
}
if err = callbackBeforeSendGroupMsg(ctx, req); err != nil {
return nil, err
if req.MsgData.ContentType != constant.Typing {
if err = callbackBeforeSendGroupMsg(ctx, req); err != nil {
return nil, err
}
}
if err := callbackMsgModify(ctx, req); err != nil {
return nil, err
}
@ -75,8 +78,10 @@ func (m *msgServer) sendMsgSuperGroupChat(
if req.MsgData.ContentType == constant.AtText {
go m.setConversationAtInfo(ctx, req.MsgData)
}
if err = callbackAfterSendGroupMsg(ctx, req); err != nil {
log.ZWarn(ctx, "CallbackAfterSendGroupMsg", err)
if req.MsgData.ContentType != constant.Typing {
if err = callbackAfterSendGroupMsg(ctx, req); err != nil {
log.ZWarn(ctx, "CallbackAfterSendGroupMsg", err)
}
}
prommetrics.GroupChatMsgProcessSuccessCounter.Inc()
resp = &pbmsg.SendMsgResp{}
@ -164,9 +169,12 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbmsg.SendMsgReq
prommetrics.SingleChatMsgProcessFailedCounter.Inc()
return nil, nil
} else {
if err = callbackBeforeSendSingleMsg(ctx, req); err != nil {
return nil, err
if req.MsgData.ContentType != constant.Typing {
if err = callbackBeforeSendSingleMsg(ctx, req); err != nil {
return nil, err
}
}
if err := callbackMsgModify(ctx, req); err != nil {
return nil, err
}
@ -174,7 +182,9 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbmsg.SendMsgReq
prommetrics.SingleChatMsgProcessFailedCounter.Inc()
return nil, err
}
err = callbackAfterSendSingleMsg(ctx, req)
if req.MsgData.ContentType != constant.Typing {
err = callbackAfterSendSingleMsg(ctx, req)
}
if err != nil {
log.ZWarn(ctx, "CallbackAfterSendSingleMsg", err, "req", req)
}

Loading…
Cancel
Save