From e2d44d3d06af7f8ebc752da14b7321385770c751 Mon Sep 17 00:00:00 2001
From: Federico Cecchetto <fedecek3@gmail.com>
Date: Sat, 3 Sep 2022 02:24:46 +0200
Subject: [PATCH] Remove setdiscordimage

---
 src/client/component/discord.cpp | 25 ++++---------------------
 src/client/game/symbols.hpp      |  1 +
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/client/component/discord.cpp b/src/client/component/discord.cpp
index 92e61a31..1d15df7c 100644
--- a/src/client/component/discord.cpp
+++ b/src/client/component/discord.cpp
@@ -17,7 +17,6 @@ namespace discord
 		DiscordRichPresence discord_presence;
 		std::string state;
 		std::optional<std::string> details{};
-		std::optional<std::string> image{};
 
 		void update_discord()
 		{
@@ -27,7 +26,6 @@ namespace discord
 			{
 				state = {};
 				details.reset();
-				image.reset();
 
 				discord_presence.details = game::UI_SafeTranslateString("MENU_MAIN_MENU");
 				discord_presence.state = "";
@@ -39,19 +37,14 @@ namespace discord
 			}
 			else
 			{
-				static char map[0x1000] = {0};
-				if (image.has_value())
+				const char* base_mapname = nullptr;
+				auto* map = game::Dvar_FindVar("mapname")->current.string;
+				if (game::Com_IsAddonMap(map, &base_mapname))
 				{
-					strncpy_s(map, image.value().data(), sizeof(map));
-				}
-				else
-				{
-					const auto mapname = game::Dvar_FindVar("mapname")->current.string;
-					strncpy_s(map, mapname, sizeof(map));
+					map = base_mapname;
 				}
 				
 				const auto mapname = game::UI_SafeTranslateString(utils::string::va("PRESENCE_SP_%s", map));
-
 				discord_presence.largeImageKey = map;
 
 				if (details.has_value())
@@ -124,16 +117,6 @@ namespace discord
 					update_discord();
 				}, scheduler::pipeline::async);
 			});
-
-			command::add("setdiscordimage", [](const command::params& params)
-			{
-				const std::string image_ = params.join(1);
-				scheduler::once([=]()
-				{
-					image = image_;
-					update_discord();
-				}, scheduler::pipeline::async);
-			});
 		}
 
 	private:
diff --git a/src/client/game/symbols.hpp b/src/client/game/symbols.hpp
index 1e3202f6..5177464b 100644
--- a/src/client/game/symbols.hpp
+++ b/src/client/game/symbols.hpp
@@ -33,6 +33,7 @@ namespace game
 	WEAK symbol<void(char const* finalMessage)> Com_Shutdown{0x1405A62C0};
 	WEAK symbol<void()> Com_Quit_f{0x1405A50D0};
 	WEAK symbol<bool()> Com_InFrontend{0x140328BD0};
+	WEAK symbol<bool(const char* mapName, const char** pBaseMapName)> Com_IsAddonMap{0x140609570};
 	WEAK symbol<void()> Quit{0x1405A52A0};
 
 	WEAK symbol<void(XAssetType type, void(__cdecl* func)(game::XAssetHeader, void*), const void* inData, bool includeOverride)>