server/relation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-09-24 14:14:20 +08:00
parent 0ce4baef30
commit 8316eb4743
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/imserver/player.cc
View File

@ -920,10 +920,7 @@ void Player::_CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg)
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
#if 0 ForwardGuildCMMsg(hdr, GuildId());
SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()),
msg);
#endif
} }
void Player::_SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg) void Player::_SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg)
@ -1113,6 +1110,7 @@ void Player::ForwardGuildCMMsg(f8::MsgHdr& hdr, long long guild_id)
{ {
ss::SS_IM_ForwardGuildCMMsg msg; ss::SS_IM_ForwardGuildCMMsg msg;
FillIMMsgConext(msg.mutable_context()); FillIMMsgConext(msg.mutable_context());
msg.set_guild_id(guild_id);
msg.set_msgid(hdr.msgid); msg.set_msgid(hdr.msgid);
if (hdr.buflen > 0) { if (hdr.buflen > 0) {
msg.mutable_payload()->assign(hdr.buf, hdr.buflen); msg.mutable_payload()->assign(hdr.buf, hdr.buflen);

5
server/tools/protobuild/ss_proto.proto
View File

@ -182,8 +182,9 @@ message SS_MS_LoadGroup
message SS_IM_ForwardGuildCMMsg message SS_IM_ForwardGuildCMMsg
{ {
optional MFIMMsgConext context = 1; optional MFIMMsgConext context = 1;
optional int32 msgid = 2; optional int64 guild_id = 2;
optional bytes payload = 3; optional int32 msgid = 3;
optional bytes payload = 4;
} }
message SS_IM_ForwardGuildSMMsg message SS_IM_ForwardGuildSMMsg