fix: send simple msg

pull/3362/head
icey-yu 4 months ago
parent 0e330281ae
commit c4d2dca0c3

@ -513,11 +513,11 @@ func (m *MessageApi) SendSimpleMessage(c *gin.Context) {
Ex: req.Ex, Ex: req.Ex,
} }
sendReq := &msg.SendMsgReq{ sendReq := &msg.SendSimpleMsgReq{
MsgData: msgData, MsgData: msgData,
} }
respPb, err := m.Client.SendMsg(c, sendReq) respPb, err := m.Client.SendSimpleMsg(c, sendReq)
if err != nil { if err != nil {
apiresp.GinError(c, err) apiresp.GinError(c, err)
return return
@ -534,7 +534,12 @@ func (m *MessageApi) SendSimpleMessage(c *gin.Context) {
return return
} }
m.ginRespSendMsg(c, sendReq, respPb) m.ginRespSendMsg(c, &msg.SendMsgReq{MsgData: sendReq.MsgData}, &msg.SendMsgResp{
ServerMsgID: respPb.ServerMsgID,
ClientMsgID: respPb.ClientMsgID,
SendTime: respPb.SendTime,
Modify: respPb.Modify,
})
} }
func (m *MessageApi) CheckMsgIsSendSuccess(c *gin.Context) { func (m *MessageApi) CheckMsgIsSendSuccess(c *gin.Context) {

@ -203,3 +203,25 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbmsg.SendMsgReq
}, nil }, nil
} }
} }
func (m *msgServer) SendSimpleMsg(ctx context.Context, req *pbmsg.SendSimpleMsgReq) (*pbmsg.SendSimpleMsgResp, error) {
if req.MsgData == nil {
return nil, errs.ErrArgs.WrapMsg("msg data is nil")
}
sender, err := m.UserLocalCache.GetUserInfo(ctx, req.MsgData.SendID)
if err != nil {
return nil, err
}
req.MsgData.SenderFaceURL = sender.FaceURL
req.MsgData.SenderNickname = sender.Nickname
resp, err := m.SendMsg(ctx, &pbmsg.SendMsgReq{MsgData: req.MsgData})
if err != nil {
return nil, err
}
return &pbmsg.SendSimpleMsgResp{
ServerMsgID: resp.ServerMsgID,
ClientMsgID: resp.ClientMsgID,
SendTime: resp.SendTime,
Modify: resp.Modify,
}, nil
}

Loading…
Cancel
Save