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

matt review changes

Browse Source
This commit is contained in:
axellse 2024-09-21 23:46:22 +02:00
parent 530bb84095
commit 5ff1901721
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Bloxstrap/Integrations/ActivityWatcher.cs
View File

@ -17,9 +17,9 @@
private const string GameDisconnectedEntry = "[FLog::Network] Time to disconnect replication data:"; private const string GameDisconnectedEntry = "[FLog::Network] Time to disconnect replication data:";
private const string GameTeleportingEntry = "[FLog::SingleSurfaceApp] initiateTeleport"; private const string GameTeleportingEntry = "[FLog::SingleSurfaceApp] initiateTeleport";
private const string GameLeavingEntry = "[FLog::SingleSurfaceApp] leaveUGCGameInternal"; 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 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 GameJoiningPrivateServerPattern = @"""accessCode"":""([0-9a-f\-]{36})""";
private const string GameJoiningUniversePattern = @"universeid:([0-9]+)"; private const string GameJoiningUniversePattern = @"universeid:([0-9]+)";
@ -217,13 +217,15 @@
if (match.Groups.Count != 2) 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); App.Logger.WriteLine(LOG_IDENT, entry);
return; return;
} }
Data.UserId = match.Groups[1].Value; UInt64.TryParse(match.Groups[1].Value, out ulong result);
App.Logger.WriteLine(LOG_IDENT, $"Got userid as " + Data.UserId);
Data.UserId = result;
App.Logger.WriteLine(LOG_IDENT, $"Got userid as {Data.UserId}");
} }
if (entry.Contains(GameJoiningUniverseEntry)) if (entry.Contains(GameJoiningUniverseEntry))

3
Bloxstrap/Integrations/DiscordRichPresence.cs
View File

@ -1,4 +1,5 @@
using System.Windows; using System.Windows;
using Bloxstrap.Models.RobloxApi;
using DiscordRPC; using DiscordRPC;
namespace Bloxstrap.Integrations namespace Bloxstrap.Integrations
@ -235,7 +236,7 @@ namespace Bloxstrap.Integrations
} }
else else
{ {
smallImage = userPfpResponse.Data.ToArray()[0].ImageUrl; smallImage = userPfpResponse.Data.First().ImageUrl;
App.Logger.WriteLine(LOG_IDENT, $"Got user thumbnail as {smallImage}"); App.Logger.WriteLine(LOG_IDENT, $"Got user thumbnail as {smallImage}");
} }

2
Bloxstrap/Models/Entities/ActivityData.cs
View File

@ -35,7 +35,7 @@ namespace Bloxstrap.Models.Entities
/// </summary> /// </summary>
public string AccessCode { get; set; } = string.Empty; 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; public string MachineAddress { get; set; } = string.Empty;