From 9f8432f73725f0298a7b7f45ec01ad021bea797e Mon Sep 17 00:00:00 2001
From: alexistb2904 <59259007+alexistb2904@users.noreply.github.com>
Date: Mon, 4 Aug 2025 09:47:55 +0000
Subject: [PATCH 1/3] Fix Discord Rich Presence integration

---
 .../client/modules/adjustments.lua            | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/[core]/es_extended/client/modules/adjustments.lua b/[core]/es_extended/client/modules/adjustments.lua
index 4c1f1993..670f765f 100644
--- a/[core]/es_extended/client/modules/adjustments.lua
+++ b/[core]/es_extended/client/modules/adjustments.lua
@@ -170,21 +170,23 @@ local placeHolders = {
     end,
 }
 
-function Adjustments:PresencePlaceholders()
-    local presence = Config.DiscordActivity.presence
-
+function Adjustments:ReplacePlaceholders(text)
     for placeholder, cb in pairs(placeHolders) do
         local success, result = pcall(cb)
 
         if not success then
-            error(("Failed to execute presence placeholder: ^5%s^7"):format(placeholder))
+            error(("Failed to execute placeholder: ^5%s^7"):format(placeholder))
             error(result)
-            return "Unknown"
+            result = "Unknown"
         end
 
-        presence = presence:gsub(("{%s}"):format(placeholder), result)
+        text = text:gsub(("{%s}"):format(placeholder), tostring(result))
     end
+    return text
+end
 
+function Adjustments:PresencePlaceholders()
+    local presence = self:ReplacePlaceholders(Config.DiscordActivity.presence)
     return presence
 end
 
@@ -193,15 +195,16 @@ function Adjustments:DiscordPresence()
         CreateThread(function()
             while true do
                 SetDiscordAppId(Config.DiscordActivity.appId)
+                SetRichPresence(self:PresencePlaceholders())
                 SetDiscordRichPresenceAsset(Config.DiscordActivity.assetName)
-                SetDiscordRichPresenceAssetText(Config.DiscordActivity.assetText)
+                SetDiscordRichPresenceAssetText(self:ReplacePlaceholders(Config.DiscordActivity.assetText))
 
                 for i = 1, #Config.DiscordActivity.buttons do
                     local button = Config.DiscordActivity.buttons[i]
-                    SetDiscordRichPresenceAction(i - 1, button.label, button.url)
+                    local buttonUrl = self:ReplacePlaceholders(button.url)
+                    SetDiscordRichPresenceAction(i - 1, button.label, buttonUrl)
                 end
 
-                SetRichPresence(self:PresencePlaceholders())
                 Wait(Config.DiscordActivity.refresh)
             end
         end)

From 797fa0d90e7cf0aaec97a1ba5fceb573bb2b032b Mon Sep 17 00:00:00 2001
From: alexistb2904 <59259007+alexistb2904@users.noreply.github.com>
Date: Tue, 5 Aug 2025 21:52:37 +0000
Subject: [PATCH 2/3] 2 error into 1

---
 [core]/es_extended/client/modules/adjustments.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/[core]/es_extended/client/modules/adjustments.lua b/[core]/es_extended/client/modules/adjustments.lua
index 670f765f..13de1426 100644
--- a/[core]/es_extended/client/modules/adjustments.lua
+++ b/[core]/es_extended/client/modules/adjustments.lua
@@ -175,8 +175,7 @@ function Adjustments:ReplacePlaceholders(text)
         local success, result = pcall(cb)
 
         if not success then
-            error(("Failed to execute placeholder: ^5%s^7"):format(placeholder))
-            error(result)
+            error(("Failed to execute placeholder: ^5%s^7\n%s"):format(placeholder, result))
             result = "Unknown"
         end
 

From 003cd0202afeefc20d01f6c430e43477ab13c26f Mon Sep 17 00:00:00 2001
From: alexistb2904 <59259007+alexistb2904@users.noreply.github.com>
Date: Fri, 8 Aug 2025 09:49:15 +0000
Subject: [PATCH 3/3] Remove PresencePlaceholders and replace it by
 ReplacePlaceholders

---
 [core]/es_extended/client/modules/adjustments.lua | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/[core]/es_extended/client/modules/adjustments.lua b/[core]/es_extended/client/modules/adjustments.lua
index 13de1426..1c83b148 100644
--- a/[core]/es_extended/client/modules/adjustments.lua
+++ b/[core]/es_extended/client/modules/adjustments.lua
@@ -184,17 +184,12 @@ function Adjustments:ReplacePlaceholders(text)
     return text
 end
 
-function Adjustments:PresencePlaceholders()
-    local presence = self:ReplacePlaceholders(Config.DiscordActivity.presence)
-    return presence
-end
-
 function Adjustments:DiscordPresence()
     if Config.DiscordActivity.appId ~= 0 then
         CreateThread(function()
             while true do
                 SetDiscordAppId(Config.DiscordActivity.appId)
-                SetRichPresence(self:PresencePlaceholders())
+                SetRichPresence(self:ReplacePlaceholders(Config.DiscordActivity.presence))
                 SetDiscordRichPresenceAsset(Config.DiscordActivity.assetName)
                 SetDiscordRichPresenceAssetText(self:ReplacePlaceholders(Config.DiscordActivity.assetText))