diff --git a/Bloxstrap/Integrations/ActivityWatcher.cs b/Bloxstrap/Integrations/ActivityWatcher.cs index 611d625..b2544ba 100644 --- a/Bloxstrap/Integrations/ActivityWatcher.cs +++ b/Bloxstrap/Integrations/ActivityWatcher.cs @@ -160,7 +160,7 @@ return; } - Data.ActivityUserId = match.Groups[1].Value; + Data.UserId = match.Groups[1].Value; } if (entry.Contains(GameJoiningPrivateServerEntry)) diff --git a/Bloxstrap/Integrations/DiscordRichPresence.cs b/Bloxstrap/Integrations/DiscordRichPresence.cs index becd447..729d2c6 100644 --- a/Bloxstrap/Integrations/DiscordRichPresence.cs +++ b/Bloxstrap/Integrations/DiscordRichPresence.cs @@ -223,7 +223,7 @@ namespace Bloxstrap.Integrations if (App.Settings.Prop.AccountShownOnProfile) { - var userPfpResponse = await Http.GetJson>($"https://thumbnails.roblox.com/v1/users/avatar-headshot?userIds={activity.userId}&size=180x180&format=Png&isCircular=false"); //we can remove '-headshot' from the url if we want a full avatar picture + var userPfpResponse = await Http.GetJson>($"https://thumbnails.roblox.com/v1/users/avatar-headshot?userIds={activity.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!"); @@ -234,7 +234,7 @@ namespace Bloxstrap.Integrations App.Logger.WriteLine(LOG_IDENT, $"Got user thumbnail as {smallImage}"); } - var userInfoResponse = await Http.GetJson($"https://users.roblox.com/v1/users/{activity.userId}"); + var userInfoResponse = await Http.GetJson($"https://users.roblox.com/v1/users/{activity.UserId}"); if (userInfoResponse is null) { App.Logger.WriteLine(LOG_IDENT, "Could not get user info!"); @@ -273,7 +273,7 @@ namespace Bloxstrap.Integrations Assets = new Assets { LargeImageKey = icon, - LargeImageText = universeDetails.Name, + LargeImageText = universeDetails.Data.Name, SmallImageKey = smallImage, SmallImageText = smallImageText } diff --git a/Bloxstrap/Models/ActivityData.cs b/Bloxstrap/Models/ActivityData.cs index 394be4f..abd2ef5 100644 --- a/Bloxstrap/Models/ActivityData.cs +++ b/Bloxstrap/Models/ActivityData.cs @@ -36,6 +36,8 @@ namespace Bloxstrap.Models public string MachineAddress { get; set; } = String.Empty; + public string UserId { get; set; } = String.Empty; + public bool IsTeleport { get; set; } = false; public ServerType ServerType { get; set; } = ServerType.Public;