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}");
  }
 
+ if (App.Settings.Prop.AccountShownOnProfile)
+ {
+ 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!;
+ }
+}

Bloxstrap/Models/Settings.cs

@@ -24,6 +24,7 @@ public class Settings
  public bool EnableActivityTracking { get; set; } = true;
  public bool UseDiscordRichPresence { get; set; } = true;
  public bool HideRPCButtons { get; set; } = true;
+ public bool AccountShownOnProfile { get; set; } = true;
  public bool ShowServerDetails { get; set; } = false;
  public ObservableCollection<CustomIntegration> CustomIntegrations { get; set; } = new();
 

Bloxstrap/Resources/Strings.resx

@@ -761,6 +761,12 @@ Selecting 'No' will ignore this warning and continue installation.</value>
  <data name="Menu.Integrations.AllowActivityJoining.Title" xml:space="preserve">
  <value>Allow activity joining</value>
  </data>
+ <data name="Menu.Integrations.ShowAccountOnProfile.Description" xml:space="preserve">
+ <value>Shows what Roblox account your using on your Discord profile.</value>
+ </data>
+ <data name="Menu.Integrations.ShowAccountOnProfile.Title" xml:space="preserve">
+ <value>Show account on profile</value>
+ </data>
  <data name="Menu.Integrations.Custom.AppLocation" xml:space="preserve">
  <value>Application Location</value>
  </data>
@@ -1021,4 +1027,4 @@ Selecting 'No' will ignore this warning and continue installation.</value>
  <data name="Common.SystemDefault" xml:space="preserve">
  <value>System default</value>
  </data>
-</root>
+</root>

Bloxstrap/UI/Elements/Menu/Pages/IntegrationsPage.xaml

@@ -57,6 +57,13 @@
  <ui:ToggleSwitch IsChecked="{Binding DiscordActivityJoinEnabled, Mode=TwoWay}" />
  </controls:OptionControl>
 
+ <controls:OptionControl 
+ Header="{x:Static resources:Strings.Menu_Integrations_ShowAccountOnProfile_Title}" 
+ Description="{x:Static resources:Strings.Menu_Integrations_ShowAccountOnProfile_Description}"
+ IsEnabled="{Binding InnerContent.IsChecked, ElementName=DiscordActivityOption, Mode=OneWay}">
+ <ui:ToggleSwitch IsChecked="{Binding DiscordAccountOnProfile, Mode=TwoWay}" />
+ </controls:OptionControl>
+
  <TextBlock Text="{x:Static resources:Strings.Menu_Integrations_Custom_Title}" FontSize="20" FontWeight="Medium" Margin="0,16,0,0" />
  <TextBlock Text="{x:Static resources:Strings.Menu_Integrations_Custom_Description}" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
  <Grid Margin="0,8,0,0">

Bloxstrap/UI/ViewModels/Menu/IntegrationsViewModel.cs

@@ -99,7 +99,9 @@ public bool DiscordActivityEnabled
  if (!value)
  {
  DiscordActivityJoinEnabled = value;
+ DiscordAccountOnProfile = value;
  OnPropertyChanged(nameof(DiscordActivityJoinEnabled));
+ OnPropertyChanged(nameof(DiscordAccountOnProfile));
  }
  }
  }
@@ -110,6 +112,12 @@ public bool DiscordActivityJoinEnabled
  set => App.Settings.Prop.HideRPCButtons = !value;
  }
 
+ public bool DiscordAccountOnProfile
+ {
+ get => App.Settings.Prop.AccountShownOnProfile;
+ set => App.Settings.Prop.AccountShownOnProfile = value;
+ }
+
  public bool DisableAppPatchEnabled
  {
  get => App.Settings.Prop.UseDisableAppPatch;