diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 6ea6bc0..e894949 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -920,10 +920,7 @@ void Player::_CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg) SendMsg(respmsg); return; } - #if 0 - SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()), - msg); - #endif + ForwardGuildCMMsg(hdr, GuildId()); } 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; FillIMMsgConext(msg.mutable_context()); + msg.set_guild_id(guild_id); msg.set_msgid(hdr.msgid); if (hdr.buflen > 0) { msg.mutable_payload()->assign(hdr.buf, hdr.buflen); diff --git a/server/tools/protobuild/ss_proto.proto b/server/tools/protobuild/ss_proto.proto index 9bd2111..0d86fa5 100755 --- a/server/tools/protobuild/ss_proto.proto +++ b/server/tools/protobuild/ss_proto.proto @@ -182,8 +182,9 @@ message SS_MS_LoadGroup message SS_IM_ForwardGuildCMMsg { optional MFIMMsgConext context = 1; - optional int32 msgid = 2; - optional bytes payload = 3; + optional int64 guild_id = 2; + optional int32 msgid = 3; + optional bytes payload = 4; } message SS_IM_ForwardGuildSMMsg