make output shorter on proxy server

This commit is contained in:
Martin Michelsen
2022-07-07 23:45:33 -07:00
parent b0319d34a0
commit 58f0501010
+17 -18
View File
@@ -124,6 +124,9 @@ static void server_command_lobby_info(shared_ptr<ServerState>, shared_ptr<Lobby>
static void proxy_command_lobby_info(shared_ptr<ServerState>, static void proxy_command_lobby_info(shared_ptr<ServerState>,
ProxyServer::LinkedSession& session, const std::u16string&) { ProxyServer::LinkedSession& session, const std::u16string&) {
string msg = string_printf("$C7GC: $C6%" PRIu32 "\n$C7Client ID: $C6%zu",
session.remote_guild_card_number, session.lobby_client_id);
vector<const char*> cheats_tokens; vector<const char*> cheats_tokens;
if (session.switch_assist) { if (session.switch_assist) {
cheats_tokens.emplace_back("SWA"); cheats_tokens.emplace_back("SWA");
@@ -134,33 +137,29 @@ static void proxy_command_lobby_info(shared_ptr<ServerState>,
if (session.infinite_tp) { if (session.infinite_tp) {
cheats_tokens.emplace_back("TP"); cheats_tokens.emplace_back("TP");
} }
string cheats_str = cheats_tokens.empty() ? "none" : join(cheats_tokens, ","); if (!cheats_tokens.empty()) {
msg += "\n$C7Cheats: $C6";
msg += join(cheats_tokens, ",");
}
vector<const char*> behaviors_tokens; vector<const char*> behaviors_tokens;
if (session.save_files) { if (session.save_files) {
behaviors_tokens.emplace_back("SF"); behaviors_tokens.emplace_back("SAVE");
} }
if (session.function_call_return_value >= 0) { if (session.function_call_return_value >= 0) {
behaviors_tokens.emplace_back("BFC"); behaviors_tokens.emplace_back("BFC");
} }
string behaviors_str = behaviors_tokens.empty() ? "none" : join(behaviors_tokens, ","); if (!behaviors_tokens.empty()) {
msg += "\n$C7Flags: $C6";
string section_id_override = "none"; msg += join(behaviors_tokens, ",");
if (session.override_section_id >= 0) {
section_id_override = name_for_section_id(session.override_section_id);
} }
send_text_message_printf(session.client_channel, if (session.override_section_id >= 0) {
"$C7GC: $C6%" PRIu32 "\n" msg += "\n$C7SecID override: $C6%s";
"$C7Client ID: $C6%zu\n" msg += name_for_section_id(session.override_section_id);
"$C7Cheats: $C6%s\n" }
"$C7Flags: $C6%s\n"
"$C7SecID override: $C6%s\n", send_text_message(session.client_channel, decode_sjis(msg));
session.remote_guild_card_number,
session.lobby_client_id,
cheats_str.c_str(),
behaviors_str.c_str(),
section_id_override.c_str());
} }
static void server_command_ax(shared_ptr<ServerState>, shared_ptr<Lobby>, static void server_command_ax(shared_ptr<ServerState>, shared_ptr<Lobby>,