From 0ce4baef306eb1ff111dc81c5df1f4c534c467ff Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 24 Sep 2020 14:11:14 +0800
Subject: [PATCH] 1

---
 server/imserver/player.cc | 36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 6f9ee28..6ea6bc0 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -622,8 +622,7 @@ void Player::_CMGuildInfo(f8::MsgHdr& hdr, const cs::CMGuildInfo& msg)
         SendMsg(respmsg);
         return;
     }
-    SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()),
-                                          msg);
+    ForwardGuildCMMsg(hdr, msg.guild_id());
 }
 
 void Player::_CMGuildCreate(f8::MsgHdr& hdr, const cs::CMGuildCreate& msg)
@@ -706,8 +705,7 @@ void Player::_CMGuildJoin(f8::MsgHdr& hdr, const cs::CMGuildJoin& msg)
         SendMsg(respmsg);
         return;
     }
-    SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()),
-                                          msg);
+    ForwardGuildCMMsg(hdr, msg.guild_id());
 }
 
 void Player::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
@@ -719,10 +717,7 @@ void Player::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
         SendMsg(respmsg);
         return;
     }
-    #if 0
-    SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()),
-                                          msg);
-    #endif
+    ForwardGuildCMMsg(hdr, GuildId());
 }
 
 void Player::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg)
@@ -734,10 +729,7 @@ void Player::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg)
         SendMsg(respmsg);
         return;
     }
-    #if 0
-    SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()),
-                                          msg);
-    #endif
+    ForwardGuildCMMsg(hdr, GuildId());
 }
 
 void Player::_CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg)
@@ -747,10 +739,7 @@ void Player::_CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg)
         SendMsg(respmsg);
         return;
     }
-    #if 0
-    SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()),
-                                          msg);
-    #endif
+    ForwardGuildCMMsg(hdr, GuildId());
 }
 
 void Player::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg)
@@ -762,10 +751,7 @@ void Player::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg)
         SendMsg(respmsg);
         return;
     }
-    #if 0
-    SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()),
-                                          msg);
-    #endif
+    ForwardGuildCMMsg(hdr, GuildId());
 }
 
 void Player::_CMGuildRename(f8::MsgHdr& hdr, const cs::CMGuildRename& msg)
@@ -777,10 +763,7 @@ void Player::_CMGuildRename(f8::MsgHdr& hdr, const cs::CMGuildRename& msg)
         SendMsg(respmsg);
         return;
     }
-    #if 0
-    SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()),
-                                          msg);
-    #endif
+    ForwardGuildCMMsg(hdr, GuildId());
 }
 
 void Player::_CMGuildSearch(f8::MsgHdr& hdr, const cs::CMGuildSearch& msg)
@@ -927,10 +910,7 @@ void Player::_CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& ms
         SendMsg(respmsg);
         return;
     }
-    #if 0
-    SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()),
-                                          msg);
-    #endif
+    ForwardGuildCMMsg(hdr, GuildId());
 }
 
 void Player::_CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg)