From 1f81eff94dd6d57a01d726c88da4d4f81253f7e3 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 14 Oct 2020 11:58:37 +0800
Subject: [PATCH] 1

---
 server/imserver/guild.cc      | 32 +-------------------------------
 server/imserver/guild.h       |  1 -
 server/imserver/handlermgr.cc |  1 -
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc
index 68afd5e..57d67b4 100644
--- a/server/imserver/guild.cc
+++ b/server/imserver/guild.cc
@@ -481,6 +481,7 @@ void Guild::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg)
                                    sender,
                                    msg.account_id()
                                    );
+    SaveToDB();
 }
 
 void Guild::_CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg)
@@ -537,37 +538,6 @@ void Guild::_CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg)
     }
 }
 
-void Guild::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg)
-{
-    #if 0
-    ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data;
-
-    cs::SMGuildDismiss respmsg;
-    GuildMember* sender = GetMember(forward_msg->context().user_info().base_data().account_id());
-    if (sender) {
-        if (GetMemberJob(sender->account_id) != kGuildOwner) {
-            SendErrorMsg(hdr.socket_handle, forward_msg->context(), "权限不够");
-            respmsg.set_errcode(3);
-            respmsg.set_errmsg("权限不够");
-            GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
-                                                    forward_msg->context(),
-                                                    respmsg);
-            return;
-         }
-    }
-    GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
-                                            forward_msg->context(),
-                                            respmsg);
-    for (auto& pair : member_hash_) {
-        RemoveMember(sender->account_id,
-                     pair.second->account_id,
-                     kGuildDismisss);
-    }
-    guild_status_ = kGuildDismissed;
-    SaveToDB();
-    #endif
-}
-
 void Guild::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg)
 {
     cs::SMGuildChange respmsg;
diff --git a/server/imserver/guild.h b/server/imserver/guild.h
index 79e51af..17fd045 100644
--- a/server/imserver/guild.h
+++ b/server/imserver/guild.h
@@ -22,7 +22,6 @@ public:
     void _CMGuildRefuse(f8::MsgHdr& hdr, const cs::CMGuildRefuse& msg);
     void _CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg);
     void _CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg);
-    void _CMGuildDismiss(f8::MsgHdr& hdr,  const cs::CMGuildDismiss& msg);
     void _CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg);
     void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg);
     void _CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg);
diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc
index 6a01c0b..33086b1 100644
--- a/server/imserver/handlermgr.cc
+++ b/server/imserver/handlermgr.cc
@@ -133,7 +133,6 @@ void HandlerMgr::RegisterNetMsgHandlers()
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildRefuse);
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildKick);
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildQuit);
-    RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildDismiss);
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildChange);
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberList);
     RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildApplyList);