Show account on discord rich presence

Bloxstrap/Integrations/ActivityWatcher.cs

@@ -13,7 +13,9 @@ public class ActivityWatcher : IDisposable
         private const string GameTeleportingEntry = "[FLog::SingleSurfaceApp] initiateTeleport";
         private const string GameMessageEntry = "[FLog::Output] [BloxstrapRPC]";
         private const string GameLeavingEntry = "[FLog::SingleSurfaceApp] leaveUGCGameInternal";
-
+        private const string GameJoinLoadTimeEntry = "[FLog::GameJoinLoadTime] Report game_join_loadtime:";
+
+        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 GameJoiningUDMUXPattern = @"UDMUX Address = ([0-9\.]+), Port = [0-9]+ \| RCC Server Address = ([0-9\.]+), Port = [0-9]+";
         private const string GameJoinedEntryPattern = @"serverId: ([0-9\.]+)\|[0-9]+";
@@ -39,6 +41,7 @@ public class ActivityWatcher : IDisposable
         public bool ActivityInGame = false;
         public long ActivityPlaceId = 0;
         public string ActivityJobId = "";
+        public string ActivityUserId = "";
         public string ActivityMachineAddress = "";
         public bool ActivityMachineUDMUX = false;
         public bool ActivityIsTeleport = false;
@@ -143,6 +146,19 @@ private void ExamineLogEntry(string entry)
                 process.CloseMainWindow();
             }
 
+            if (ActivityUserId == "" && entry.Contains(GameJoinLoadTimeEntry))
+            {
+                Match match = Regex.Match(entry, GameJoinLoadTimeEntryPattern);
+
+                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, entry);
+                    return;                
+                }
+
+                ActivityUserId = match.Groups[1].Value;
+            }
             if (!ActivityInGame && ActivityPlaceId == 0)
             {
                 if (entry.Contains(GameJoiningPrivateServerEntry))
@@ -229,7 +245,8 @@ private void ExamineLogEntry(string entry)
                     ActivityMachineUDMUX = false;
                     ActivityIsTeleport = false;
                     ActivityServerType = ServerType.Public;
-
+                    ActivityUserId = "";
+
                     OnGameLeave?.Invoke(this, new EventArgs());
                 }
                 else if (entry.Contains(GameTeleportingEntry))

Bloxstrap/Integrations/DiscordRichPresence.cs

@@ -190,8 +190,12 @@ public async Task<bool> SetCurrentGame()
             }
 
             string icon = "roblox";
+            string smallimagetext = "Roblox";
+            string smallimage = "roblox";
+
             long placeId = _activityWatcher.ActivityPlaceId;
-
+            string userId = _activityWatcher.ActivityUserId;
+
             App.Logger.WriteLine(LOG_IDENT, $"Setting presence for Place ID {placeId}");
 
             var universeIdResponse = await Http.GetJson<UniverseIdResponse>($"https://apis.roblox.com/universes/v1/places/{placeId}/universe");
@@ -231,6 +235,31 @@ public async Task<bool> SetCurrentGame()
                 App.Logger.WriteLine(LOG_IDENT, $"Got Universe thumbnail as {icon}");
             }
 
+            //right now this is configured in a way so that it will only show your avatar and username if you have chosen to allow people to join you from their profile.
+            if (!App.Settings.Prop.HideRPCButtons)
+            {
+                var userPfpResponse = await Http.GetJson<ApiArrayResponse<ThumbnailResponse>>($"https://thumbnails.roblox.com/v1/users/avatar-headshot?userIds={userId}&size=180x180&format=Png&isCircular=false"); //we can remove '-headshot' from the url if we want a full avatar picture
+                if (userPfpResponse is null || !userPfpResponse.Data.Any())
+                {
+                    App.Logger.WriteLine(LOG_IDENT, "Could not get user thumbnail info!");
+                }
+                else
+                {
+                    smallimage = userPfpResponse.Data.ToArray()[0].ImageUrl;
+                    App.Logger.WriteLine(LOG_IDENT, $"Got user thumbnail as {smallimage}");
+                }
+
+                var userInfoResponse = await Http.GetJson<UserInfoResponse>($"https://users.roblox.com/v1/users/{userId}");
+                if (userInfoResponse is null)
+                {
+                    App.Logger.WriteLine(LOG_IDENT, "Could not get user info!");
+                } else {
+                    smallimagetext = userInfoResponse.DisplayName + $" (@{userInfoResponse.Username})"; //example: john doe (@johndoe)
+                    App.Logger.WriteLine(LOG_IDENT, $"Got user info as {smallimagetext}");
+                }
+            }
+
+
             List<Button> buttons = new();
 
             if (!App.Settings.Prop.HideRPCButtons && _activityWatcher.ActivityServerType == ServerType.Public)
@@ -274,8 +303,8 @@ public async Task<bool> SetCurrentGame()
                 {
                     LargeImageKey = icon,
                     LargeImageText = universeDetails.Name,
-                    SmallImageKey = "roblox",
-                    SmallImageText = "Roblox"
+                    SmallImageKey = smallimage,
+                    SmallImageText = smallimagetext
                 }
             };
 

Bloxstrap/Models/RobloxApi/UserInfoResponse.cs

@@ -0,0 +1,26 @@
+namespace Bloxstrap.Models.RobloxApi
+{
+    /// <summary>
+    /// Roblox.Web.Responses.Users.UserInfoResponse
+    /// </summary>
+    public class UserInfoResponse
+    {
+        [JsonPropertyName("description")]
+        public string ProfileDescription { get; set; } = null!;
+
+        [JsonPropertyName("created")]
+        public string JoinDate { get; set; } = null!;
+
+        [JsonPropertyName("isBanned")]
+        public bool IsBanned { get; set; }
+
+        [JsonPropertyName("hasVerifiedBadge")]
+        public bool HasVerifiedBadge { get; set; }
+
+        [JsonPropertyName("name")]
+        public string Username { get; set; } = null!;
+
+        [JsonPropertyName("displayName")]
+        public string DisplayName { get; set; } = null!;
+    }
+}