diff --git a/modules/chat/api_send.go b/modules/chat/api_send.go index ca64ecd0f..e9e1e1815 100644 --- a/modules/chat/api_send.go +++ b/modules/chat/api_send.go @@ -87,26 +87,25 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (code return } break - case pb.ChatChannel_Private: - msg.Ruid = req.TargetId - if err = this.module.PushUser(msg); err != nil { - code = pb.ErrorCode_DBError - return - } - session.SendMsg(string(this.module.GetType()), "message", &pb.ChatMessagePush{Chat: msg}) - break - // case pb.ChatChannel_CrossServer: - // if userexpand, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { - // code = pb.ErrorCode_DBError - // return - // } - // msg.ChannelId = userexpand.Chatchannel //指定频道 - // if err = this.module.modelChat.addChatMsg(fmt.Sprintf("%s-%d", crosschatkey, userexpand.Chatchannel), int64(max_chat), msg); err != nil { - // code = pb.ErrorCode_DBError - // return - // } - // this.module.PushToUsers(userexpand.Chatchannel, msg) - break + // case pb.ChatChannel_Private: + // msg.Ruid = req.TargetId + // if err = this.module.PushUser(msg); err != nil { + // code = pb.ErrorCode_DBError + // return + // } + // session.SendMsg(string(this.module.GetType()), "message", &pb.ChatMessagePush{Chat: msg}) + // break + // case pb.ChatChannel_CrossServer: + // if userexpand, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { + // code = pb.ErrorCode_DBError + // return + // } + // msg.ChannelId = userexpand.Chatchannel //指定频道 + // if err = this.module.modelChat.addChatMsg(fmt.Sprintf("%s-%d", crosschatkey, userexpand.Chatchannel), int64(max_chat), msg); err != nil { + // code = pb.ErrorCode_DBError + // return + // } + // this.module.PushToUsers(userexpand.Chatchannel, msg) default: code = pb.ErrorCode_ReqParameterError this.module.Errorf("getlist no support channel:%d ", req.Channel) diff --git a/modules/chat/api_sendcross.go b/modules/chat/api_sendcross.go index 0c4140df3..82cc955ce 100644 --- a/modules/chat/api_sendcross.go +++ b/modules/chat/api_sendcross.go @@ -87,6 +87,14 @@ func (this *apiComp) SendCross(session comm.IUserSession, req *pb.ChatSendCrossR // } // session.SendMsg(string(this.module.GetType()), "message", &pb.ChatMessagePush{Chat: msg}) // break + case pb.ChatChannel_Private: + msg.Ruid = req.TargetId + if err = this.module.PushUser(msg); err != nil { + code = pb.ErrorCode_DBError + return + } + session.SendMsg(string(this.module.GetType()), "message", &pb.ChatMessagePush{Chat: msg}) + break case pb.ChatChannel_CrossServer: if userexpand, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { code = pb.ErrorCode_DBError