SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 18:11:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
axellse 2024-09-04 17:12:13 +02:00
parent abb08f11b6
commit e023fa4472
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bloxstrap/Integrations/ActivityWatcher.cs
View File

@ -160,7 +160,7 @@
return; return;
} }
Data.ActivityUserId = match.Groups[1].Value; Data.UserId = match.Groups[1].Value;
} }
if (entry.Contains(GameJoiningPrivateServerEntry)) if (entry.Contains(GameJoiningPrivateServerEntry))

6
Bloxstrap/Integrations/DiscordRichPresence.cs
View File

@ -223,7 +223,7 @@ namespace Bloxstrap.Integrations
if (App.Settings.Prop.AccountShownOnProfile) if (App.Settings.Prop.AccountShownOnProfile)
{ {
var userPfpResponse = await Http.GetJson<ApiArrayResponse<ThumbnailResponse>>($"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<ApiArrayResponse<ThumbnailResponse>>($"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()) if (userPfpResponse is null || !userPfpResponse.Data.Any())
{ {
App.Logger.WriteLine(LOG_IDENT, "Could not get user thumbnail info!"); 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}"); App.Logger.WriteLine(LOG_IDENT, $"Got user thumbnail as {smallImage}");
} }
var userInfoResponse = await Http.GetJson<UserInfoResponse>($"https://users.roblox.com/v1/users/{activity.userId}"); var userInfoResponse = await Http.GetJson<UserInfoResponse>($"https://users.roblox.com/v1/users/{activity.UserId}");
if (userInfoResponse is null) if (userInfoResponse is null)
{ {
App.Logger.WriteLine(LOG_IDENT, "Could not get user info!"); App.Logger.WriteLine(LOG_IDENT, "Could not get user info!");
@ -273,7 +273,7 @@ namespace Bloxstrap.Integrations
Assets = new Assets Assets = new Assets
{ {
LargeImageKey = icon, LargeImageKey = icon,
LargeImageText = universeDetails.Name, LargeImageText = universeDetails.Data.Name,
SmallImageKey = smallImage, SmallImageKey = smallImage,
SmallImageText = smallImageText SmallImageText = smallImageText
} }

2
Bloxstrap/Models/ActivityData.cs
View File

@ -36,6 +36,8 @@ namespace Bloxstrap.Models
public string MachineAddress { get; set; } = String.Empty; public string MachineAddress { get; set; } = String.Empty;
public string UserId { get; set; } = String.Empty;
public bool IsTeleport { get; set; } = false; public bool IsTeleport { get; set; } = false;
public ServerType ServerType { get; set; } = ServerType.Public; public ServerType ServerType { get; set; } = ServerType.Public;