diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go index d84af8099..440680e1b 100644 --- a/internal/rpc/msg/callback.go +++ b/internal/rpc/msg/callback.go @@ -25,6 +25,8 @@ func copyCallbackCommonReqStruct(msg *pbChat.SendMsgReq) cbApi.CommonCallbackReq Status: msg.MsgData.Status, CreateTime: msg.MsgData.CreateTime, Content: string(msg.MsgData.Content), + AtUserIDList: msg.MsgData.AtUserIDList, + SenderFaceURL: msg.MsgData.SenderFaceURL, } } diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go index 118b7bd01..2e091e2e3 100644 --- a/internal/rpc/msg/send_msg.go +++ b/internal/rpc/msg/send_msg.go @@ -426,7 +426,7 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S return returnMsg(&replay, pb, 0, "", msgToMQSingle.MsgData.ServerMsgID, msgToMQSingle.MsgData.SendTime) case constant.SuperGroupChatType: // callback - callbackResp := callbackBeforeSendSingleMsg(pb) + callbackResp := callbackBeforeSendGroupMsg(pb) if callbackResp.ErrCode != 0 { log.NewError(pb.OperationID, utils.GetSelfFuncName(), "callbackBeforeSendSuperGroupMsg resp: ", callbackResp) } diff --git a/pkg/call_back_struct/common.go b/pkg/call_back_struct/common.go index 14aed5b97..d40315d7f 100644 --- a/pkg/call_back_struct/common.go +++ b/pkg/call_back_struct/common.go @@ -1,19 +1,21 @@ package call_back_struct type CommonCallbackReq struct { - SendID string `json:"sendID"` - CallbackCommand string `json:"callbackCommand"` - ServerMsgID string `json:"serverMsgID"` - ClientMsgID string `json:"clientMsgID"` - OperationID string `json:"operationID"` - SenderPlatformID int32 `json:"senderPlatformID"` - SenderNickname string `json:"senderNickname"` - SessionType int32 `json:"sessionType"` - MsgFrom int32 `json:"msgFrom"` - ContentType int32 `json:"contentType"` - Status int32 `json:"status"` - CreateTime int64 `json:"createTime"` - Content string `json:"content"` + SendID string `json:"sendID"` + CallbackCommand string `json:"callbackCommand"` + ServerMsgID string `json:"serverMsgID"` + ClientMsgID string `json:"clientMsgID"` + OperationID string `json:"operationID"` + SenderPlatformID int32 `json:"senderPlatformID"` + SenderNickname string `json:"senderNickname"` + SessionType int32 `json:"sessionType"` + MsgFrom int32 `json:"msgFrom"` + ContentType int32 `json:"contentType"` + Status int32 `json:"status"` + CreateTime int64 `json:"createTime"` + Content string `json:"content"` + AtUserIDList []string `json:"atUserList"` + SenderFaceURL string `json:"faceURL"` } type CommonCallbackResp struct {