From 277f2efbbd3e9f740fa3d4036e7975c6877e8fc5 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 28 Nov 2022 13:21:55 +0800
Subject: [PATCH] 1

---
 server/imserver/guild.cc    | 15 +++++++++++----
 server/imserver/guild.h     |  1 +
 server/imserver/guildmgr.cc |  6 +++---
 server/imserver/metamgr.cc  |  4 ++++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc
index a5ff639..9daa483 100644
--- a/server/imserver/guild.cc
+++ b/server/imserver/guild.cc
@@ -644,6 +644,13 @@ void Guild::_CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg)
     }
 }
 
+void Guild::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg)
+{
+    cs::SMGuildDismiss respmsg;
+    ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data;
+
+}
+
 void Guild::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg)
 {
     cs::SMGuildChange respmsg;
@@ -651,9 +658,9 @@ void Guild::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg)
 
     GuildMember* sender = GetMember(forward_msg->context().user_info().base_data().account_id());
     if (!sender) {
-        SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("server_internal_error", "服务器内部错误"));
+        SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("server_internal_error", "server internal error"));
         respmsg.set_errcode(2);
-        respmsg.set_errmsg(TEXT("server_internal_error", "服务器内部错误"));
+        respmsg.set_errmsg(TEXT("server_internal_error", "server internal error"));
         GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
                                                 forward_msg->context(),
                                                 respmsg);
@@ -663,9 +670,9 @@ void Guild::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg)
           GetMemberJob(sender->account_id) == kGuildOwner ||
           GetMemberJob(sender->account_id) == kGuildAdmin
           )) {
-        SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("permission_denied", "权限不够"));
+        SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("permission_denied", "permission denied"));
         respmsg.set_errcode(3);
-        respmsg.set_errmsg(TEXT("permission_denied", "权限不够"));
+        respmsg.set_errmsg(TEXT("permission_denied", "permission denied"));
         GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
                                                 forward_msg->context(),
                                                 respmsg);
diff --git a/server/imserver/guild.h b/server/imserver/guild.h
index 2f8b461..21968c2 100644
--- a/server/imserver/guild.h
+++ b/server/imserver/guild.h
@@ -22,6 +22,7 @@ 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/guildmgr.cc b/server/imserver/guildmgr.cc
index 8691bea..0ac27b8 100644
--- a/server/imserver/guildmgr.cc
+++ b/server/imserver/guildmgr.cc
@@ -49,7 +49,7 @@ public:
             hdr.user_data = &forward_msg;
             if (guild->Status() == kGuildDismissed) {
                 cs::SMShowErrorMsg notifymsg;
-                notifymsg.set_msg(TEXT("guild_dismissed", "战队已解散"));
+                notifymsg.set_msg(TEXT("guild_dismissed", "dismissed"));
                 GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle,
                                                         forward_msg.context(),
                                                         notifymsg);
@@ -68,7 +68,7 @@ public:
     void OnError()
     {
         cs::SMShowErrorMsg notifymsg;
-        notifymsg.set_msg(TEXT("server_internal_error", "服务器内部错误"));
+        notifymsg.set_msg(TEXT("server_internal_error", "server internal error"));
         GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle,
                                                 forward_msg.context(),
                                                 notifymsg);
@@ -102,7 +102,7 @@ void GuildMgr::_SS_IM_ForwardGuildCMMsg(f8::MsgHdr& hdr, const ss::SS_IM_Forward
     }
     if (!IsValidGuildId(msg.guild_id())) {
         cs::SMShowErrorMsg respmsg;
-        respmsg.set_msg(TEXT("server_internal_error", "服务器内部错误"));
+        respmsg.set_msg(TEXT("server_internal_error", "server internal error"));
         ForwardGuildSMMsg(hdr.socket_handle, msg.context(), respmsg);
         return;
     }
diff --git a/server/imserver/metamgr.cc b/server/imserver/metamgr.cc
index 8562d4a..4658ead 100644
--- a/server/imserver/metamgr.cc
+++ b/server/imserver/metamgr.cc
@@ -184,5 +184,9 @@ std::string MetaMgr::GetText(const std::string& textid, const std::string& def_t
     if (itr != loader_->text_hash.end()) {
         return itr->second;
     }
+#if 1
+    return "";
+#else
     return loader_->text_hash.empty() ? def_text : "";
+#endif
 }