From d618ff350c6ae637e636340f68335b63b1c66f26 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Wed, 26 Jul 2023 22:36:24 +0100
Subject: [PATCH] Add message commands for presence timestamp/icon

also fix a bug with the server location query thingy
---
 Bloxstrap/Integrations/ActivityWatcher.cs     | 11 ++-
 Bloxstrap/Integrations/DiscordRichPresence.cs | 87 ++++++++++++++++++-
 2 files changed, 91 insertions(+), 7 deletions(-)

diff --git a/Bloxstrap/Integrations/ActivityWatcher.cs b/Bloxstrap/Integrations/ActivityWatcher.cs
index 4edcff4..dec25cd 100644
--- a/Bloxstrap/Integrations/ActivityWatcher.cs
+++ b/Bloxstrap/Integrations/ActivityWatcher.cs
@@ -26,7 +26,7 @@
         public event EventHandler? OnGameLeave;
         public event EventHandler<GameMessage>? OnGameMessage;
 
-        private Dictionary<string, string> GeolcationCache = new();
+        private Dictionary<string, string> GeolocationCache = new();
 
         public string LogLocation = null!;
 
@@ -268,8 +268,8 @@
         {
             const string LOG_IDENT = "ActivityWatcher::GetServerLocation";
 
-            if (GeolcationCache.ContainsKey(ActivityMachineAddress))
-                return GeolcationCache[ActivityMachineAddress];
+            if (GeolocationCache.ContainsKey(ActivityMachineAddress))
+                return GeolocationCache[ActivityMachineAddress];
 
             string location, locationCity, locationRegion, locationCountry = "";
 
@@ -298,7 +298,10 @@
             else
                 location = $"{locationCity}, {locationRegion}, {locationCountry}";
 
-            GeolcationCache[ActivityMachineAddress] = location;
+            if (!ActivityInGame)
+                return "N/A (left game)";
+
+            GeolocationCache[ActivityMachineAddress] = location;
 
             return location;
         }
diff --git a/Bloxstrap/Integrations/DiscordRichPresence.cs b/Bloxstrap/Integrations/DiscordRichPresence.cs
index a2f0b0a..1f470c9 100644
--- a/Bloxstrap/Integrations/DiscordRichPresence.cs
+++ b/Bloxstrap/Integrations/DiscordRichPresence.cs
@@ -1,4 +1,5 @@
 using DiscordRPC;
+using System.Reflection.Metadata.Ecma335;
 
 namespace Bloxstrap.Integrations
 {
@@ -47,10 +48,23 @@ namespace Bloxstrap.Integrations
 
         public void OnGameMessage(GameMessage message)
         {
-            if (message.Command == "SetPresenceStatus")
-                SetStatus(message.Data);
+            switch (message.Command)
+            {
+                case "SetPresenceStatus":
+                    SetStatus(message.Data);
+                    break;
+
+                case "SetPresenceTimestamp":
+                    SetTimestamp(message.Data);
+                    break;
+
+                case "SetPresenceIcon":
+                    SetIcon(message.Data);
+                    break;
+            }
         }
 
+        #region Game message commands
         public void SetStatus(string status)
         {
             const string LOG_IDENT = "DiscordRichPresence::SetStatus";
@@ -74,7 +88,7 @@ namespace Bloxstrap.Integrations
 
             string finalStatus;
 
-            if (string.IsNullOrEmpty(status))
+            if (String.IsNullOrEmpty(status))
             {
                 App.Logger.WriteLine(LOG_IDENT, $"Status is empty, reverting to initial status");
                 finalStatus = _initialStatus;
@@ -94,6 +108,73 @@ namespace Bloxstrap.Integrations
             UpdatePresence();
         }
 
+        public void SetTimestamp(string data)
+        {
+            const string LOG_IDENT = "DiscordRichPresence::SetTimestamp";
+
+            if (_currentPresence is null)
+            {
+                App.Logger.WriteLine(LOG_IDENT, "Presence is not set, aborting");
+                return;
+            }
+
+            if (String.IsNullOrEmpty(data))
+            {
+                App.Logger.WriteLine(LOG_IDENT, "Clearing timestamp");
+
+                _currentPresence.Timestamps.Start = null;
+                _currentPresence.Timestamps.End = null;
+            }
+            else
+            {
+                var parameters = data.Split(';');
+
+                if (parameters.Length >= 1 && ulong.TryParse(parameters[0], out ulong startTimestamp))
+                    _currentPresence.Timestamps.StartUnixMilliseconds = startTimestamp * 1000;
+
+                if (parameters.Length >= 2 && ulong.TryParse(parameters[1], out ulong endTimestamp))
+                    _currentPresence.Timestamps.EndUnixMilliseconds = endTimestamp * 1000;
+            }
+
+            UpdatePresence();
+        }
+
+        public void SetIcon(string data)
+        {
+            const string LOG_IDENT = "DiscordRichPresence::SetIcon";
+
+            if (_currentPresence is null)
+            {
+                App.Logger.WriteLine(LOG_IDENT, "Presence is not set, aborting");
+                return;
+            }
+
+            if (String.IsNullOrEmpty(data))
+            {
+                _currentPresence.Assets.SmallImageKey = "roblox";
+                _currentPresence.Assets.SmallImageText = "Roblox";
+            }
+            else
+            {
+                var parameters = data.Split(';');
+
+                if (parameters.Length < 2 || !ulong.TryParse(parameters[0], out ulong assetId))
+                    return;
+
+                if (parameters[1].Length > 128)
+                {
+                    App.Logger.WriteLine(LOG_IDENT, $"Icon text cannot be longer than 128 characters, aborting");
+                    return;
+                }
+
+                _currentPresence.Assets.SmallImageKey = $"https://assetdelivery.roblox.com/v1/asset/?id={assetId}";
+                _currentPresence.Assets.SmallImageText = parameters[1];
+            }
+
+            UpdatePresence();
+        }
+        #endregion
+
         public void SetVisibility(bool visible)
         {
             App.Logger.WriteLine("DiscordRichPresence::SetVisibility", $"Setting presence visibility ({visible})");