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 2022-11-28 13:21:55 +08:00
parent 92ed28634b
commit 277f2efbbd
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/imserver/guild.cc
View File

@ -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) void Guild::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg)
{ {
cs::SMGuildChange respmsg; 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()); GuildMember* sender = GetMember(forward_msg->context().user_info().base_data().account_id());
if (!sender) { 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_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, GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
forward_msg->context(), forward_msg->context(),
respmsg); respmsg);
@ -663,9 +670,9 @@ void Guild::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg)
GetMemberJob(sender->account_id) == kGuildOwner || GetMemberJob(sender->account_id) == kGuildOwner ||
GetMemberJob(sender->account_id) == kGuildAdmin 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_errcode(3);
respmsg.set_errmsg(TEXT("permission_denied", "权限不够")); respmsg.set_errmsg(TEXT("permission_denied", "permission denied"));
GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
forward_msg->context(), forward_msg->context(),
respmsg); respmsg);

1
server/imserver/guild.h
View File

@ -22,6 +22,7 @@ public:
void _CMGuildRefuse(f8::MsgHdr& hdr, const cs::CMGuildRefuse& msg); void _CMGuildRefuse(f8::MsgHdr& hdr, const cs::CMGuildRefuse& msg);
void _CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg); void _CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg);
void _CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& 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 _CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg);
void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg); void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg);
void _CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg); void _CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg);

6
server/imserver/guildmgr.cc
View File

@ -49,7 +49,7 @@ public:
hdr.user_data = &forward_msg; hdr.user_data = &forward_msg;
if (guild->Status() == kGuildDismissed) { if (guild->Status() == kGuildDismissed) {
cs::SMShowErrorMsg notifymsg; cs::SMShowErrorMsg notifymsg;
notifymsg.set_msg(TEXT("guild_dismissed", "战队已解散")); notifymsg.set_msg(TEXT("guild_dismissed", "dismissed"));
GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle, GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle,
forward_msg.context(), forward_msg.context(),
notifymsg); notifymsg);
@ -68,7 +68,7 @@ public:
void OnError() void OnError()
{ {
cs::SMShowErrorMsg notifymsg; 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, GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle,
forward_msg.context(), forward_msg.context(),
notifymsg); notifymsg);
@ -102,7 +102,7 @@ void GuildMgr::_SS_IM_ForwardGuildCMMsg(f8::MsgHdr& hdr, const ss::SS_IM_Forward
} }
if (!IsValidGuildId(msg.guild_id())) { if (!IsValidGuildId(msg.guild_id())) {
cs::SMShowErrorMsg respmsg; 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); ForwardGuildSMMsg(hdr.socket_handle, msg.context(), respmsg);
return; return;
} }

4
server/imserver/metamgr.cc
View File

@ -184,5 +184,9 @@ std::string MetaMgr::GetText(const std::string& textid, const std::string& def_t
if (itr != loader_->text_hash.end()) { if (itr != loader_->text_hash.end()) {
return itr->second; return itr->second;
} }
#if 1
return "";
#else
return loader_->text_hash.empty() ? def_text : ""; return loader_->text_hash.empty() ? def_text : "";
#endif
} }