From 5ff1901721525d6217113b73630981bbe2c7961d Mon Sep 17 00:00:00 2001
From: axellse <mail@axell.me>
Date: Sat, 21 Sep 2024 23:46:22 +0200
Subject: [PATCH] matt review changes

---
 Bloxstrap/Integrations/ActivityWatcher.cs     | 12 +++++++-----
 Bloxstrap/Integrations/DiscordRichPresence.cs |  3 ++-
 Bloxstrap/Models/Entities/ActivityData.cs     |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Bloxstrap/Integrations/ActivityWatcher.cs b/Bloxstrap/Integrations/ActivityWatcher.cs
index 7816afd..705ad7b 100644
--- a/Bloxstrap/Integrations/ActivityWatcher.cs
+++ b/Bloxstrap/Integrations/ActivityWatcher.cs
@@ -17,9 +17,9 @@
         private const string GameDisconnectedEntry           = "[FLog::Network] Time to disconnect replication data:";
         private const string GameTeleportingEntry            = "[FLog::SingleSurfaceApp] initiateTeleport";
         private const string GameLeavingEntry                = "[FLog::SingleSurfaceApp] leaveUGCGameInternal";
-        private const string GameJoinLoadTimeEntry = "[FLog::GameJoinLoadTime] Report game_join_loadtime:";
+        private const string GameJoinLoadTimeEntry           = "[FLog::GameJoinLoadTime] Report game_join_loadtime:";
 
-        private const string GameJoinLoadTimeEntryPattern = ", userid:([0-9]+)";
+        private const string GameJoinLoadTimeEntryPattern    = ", userid:([0-9]+)";
         private const string GameJoiningEntryPattern         = @"! Joining game '([0-9a-f\-]{36})' place ([0-9]+) at ([0-9\.]+)";
         private const string GameJoiningPrivateServerPattern = @"""accessCode"":""([0-9a-f\-]{36})""";
         private const string GameJoiningUniversePattern      = @"universeid:([0-9]+)";
@@ -217,13 +217,15 @@
 
                     if (match.Groups.Count != 2)
                     {
-                        App.Logger.WriteLine(LOG_IDENT, $"Failed to assert format for game join load time entry");
+                        App.Logger.WriteLine(LOG_IDENT, "Failed to assert format for game join load time entry");
                         App.Logger.WriteLine(LOG_IDENT, entry);
                         return;                
                     }
 
-                    Data.UserId = match.Groups[1].Value;
-                    App.Logger.WriteLine(LOG_IDENT, $"Got userid as " + Data.UserId);
+                    UInt64.TryParse(match.Groups[1].Value, out ulong result);
+
+                    Data.UserId = result;
+                    App.Logger.WriteLine(LOG_IDENT, $"Got userid as {Data.UserId}");
                 }
 
                 if (entry.Contains(GameJoiningUniverseEntry))
diff --git a/Bloxstrap/Integrations/DiscordRichPresence.cs b/Bloxstrap/Integrations/DiscordRichPresence.cs
index 3f2513e..e814e87 100644
--- a/Bloxstrap/Integrations/DiscordRichPresence.cs
+++ b/Bloxstrap/Integrations/DiscordRichPresence.cs
@@ -1,4 +1,5 @@
 using System.Windows;
+using Bloxstrap.Models.RobloxApi;
 using DiscordRPC;
 
 namespace Bloxstrap.Integrations
@@ -235,7 +236,7 @@ namespace Bloxstrap.Integrations
                 }
                 else
                 {
-                    smallImage = userPfpResponse.Data.ToArray()[0].ImageUrl;
+                    smallImage = userPfpResponse.Data.First().ImageUrl;
                     App.Logger.WriteLine(LOG_IDENT, $"Got user thumbnail as {smallImage}");
                 }
                 
diff --git a/Bloxstrap/Models/Entities/ActivityData.cs b/Bloxstrap/Models/Entities/ActivityData.cs
index dbbae3d..8cebff2 100644
--- a/Bloxstrap/Models/Entities/ActivityData.cs
+++ b/Bloxstrap/Models/Entities/ActivityData.cs
@@ -35,7 +35,7 @@ namespace Bloxstrap.Models.Entities
         /// </summary>
         public string AccessCode { get; set; } = string.Empty;
         
-        public string UserId { get; set; } = String.Empty;
+        public ulong UserId { get; set; } = 0;
 
         public string MachineAddress { get; set; } = string.Empty;