From 2ae2831d06cd1d082e3bf422ba89a92b7f00288b Mon Sep 17 00:00:00 2001 From: Federico Cecchetto Date: Mon, 11 Apr 2022 11:42:42 +0200 Subject: [PATCH] Set partyId --- src/client/component/discord.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/client/component/discord.cpp b/src/client/component/discord.cpp index 65fb74be..d75f9641 100644 --- a/src/client/component/discord.cpp +++ b/src/client/component/discord.cpp @@ -67,7 +67,7 @@ namespace discord discord_presence.details = utils::string::va("%s on %s", gametype, mapname); - char clean_hostname[0x100] = {0}; + char clean_hostname[0x80] = {0}; utils::string::strip(game::Dvar_FindVar("sv_hostname")->current.string, clean_hostname, sizeof(clean_hostname)); auto max_clients = party::server_client_count(); @@ -81,18 +81,22 @@ namespace discord } else { - discord_presence.partyPrivacy = DISCORD_PARTY_PUBLIC; - - // TODO: we need to make this a random string that represents the session ID - // const auto sessionId = party::get_state_challenge(); - discord_presence.partyId = "PLACEHOLDER"; - const auto server_net_info = party::get_state_host(); const auto server_ip_port = utils::string::va("%i.%i.%i.%i:%i", - server_net_info.ip[0], server_net_info.ip[1], server_net_info.ip[2], server_net_info.ip[3], - ntohs(server_net_info.port)); + server_net_info.ip[0], + server_net_info.ip[1], + server_net_info.ip[2], + server_net_info.ip[3], + ntohs(server_net_info.port) + ); + char party_id[0x80] = {0}; + const auto server_ip_port_hash = utils::cryptography::sha1::compute(server_ip_port, true); + strcpy_s(party_id, 0x80, server_ip_port_hash.data()); + + discord_presence.partyId = party_id; discord_presence.joinSecret = server_ip_port; + discord_presence.partyPrivacy = DISCORD_PARTY_PUBLIC; } discord_presence.partySize = *reinterpret_cast(0x1429864C4);