This commit is contained in:
aozhiwei 2020-09-25 17:20:08 +08:00
parent a3c4ca6dbe
commit 3ebe574ed8

View File

@ -250,24 +250,33 @@ void Guild::_CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg)
respmsg); respmsg);
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) {
if (sender->guild_job != kGuildOwner) {
RemoveMember(sender->account_id,
sender->account_id,
kGuildQuit);
}
} }
} }
void Guild::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg) void Guild::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg)
{ {
ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data;
cs::SMGuildDismiss respmsg; cs::SMGuildDismiss respmsg;
#if 0 GuildMember* sender = GetMember(forward_msg->context().user_info().base_data().account_id());
GuildMember* member = GetMember(context.user_info().base_data().account_id()); if (sender) {
if (!member) { if (sender->guild_job != kGuildOwner) {
return; respmsg.set_errcode(3);
respmsg.set_errmsg("权限不够");
GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
forward_msg->context(),
respmsg);
return;
}
} }
if (member->guild_job != kGuildOwner) { GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
return; forward_msg->context(),
} respmsg);
guild_status = kGuildDismissed;
SaveToDB();
GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle, context, respmsg);
#endif
} }
void Guild::_CMGuildRename(f8::MsgHdr& hdr, const cs::CMGuildRename& msg) void Guild::_CMGuildRename(f8::MsgHdr& hdr, const cs::CMGuildRename& msg)