Merge branch 'main' into new-postgres

Refresh.Common/Refresh.Common.csproj

@@ -7,8 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Bunkum" Version="4.5.4" />
-      <PackageReference Include="Bunkum.Protocols.Http" Version="4.5.4" />
+      <PackageReference Include="Bunkum" Version="4.5.6" />
+      <PackageReference Include="Bunkum.Protocols.Http" Version="4.5.6" />
     </ItemGroup>
 
 </Project>

Refresh.GameServer/CommandLineManager.cs

@@ -58,12 +58,27 @@ private class Options
 
         [Option("rename-user", HelpText = "Changes a user's username. (old) username or Email option is required if this is set.")]
         public string? RenameUser { get; set; }
+
+        [Option("delete-user", HelpText = "Deletes a user's account, removing their data but keeping a record of their sign up.")]
+        public bool DeleteUser { get; set; }
+
+        [Option("fully-delete-user", HelpText = "Fully deletes a user, entirely removing the row and allowing people to register with that username once again. Not recommended.")]
+        public bool FullyDeleteUser { get; set; }
     }
 
     internal void StartWithArgs(string[] args)
     {
-        Parser.Default.ParseArguments<Options>(args)
-            .WithParsed(this.StartWithOptions);
+        try
+        {
+            Parser.Default.ParseArguments<Options>(args)
+                .WithParsed(this.StartWithOptions);
+        }
+        catch (Exception e)
+        {
+            Fail($"An internal error occurred: {e}", 139);
+        }
+
+        Console.WriteLine("The operation completed successfully.");
     }
 
     [DoesNotReturn]
@@ -73,7 +88,7 @@ private static void Fail(string reason, int code = 1)
 
         Console.ForegroundColor = ConsoleColor.Red;
         Console.WriteLine(reason);
-        Console.WriteLine($"Failed with exit code {code}");
+        Console.WriteLine($"The operation failed with exit code {code}");
         Console.ForegroundColor = oldColor;
 
         Environment.Exit(code);
@@ -162,5 +177,15 @@ private void StartWithOptions(Options options)
             GameUser user = this.GetUserOrFail(options);
             this._server.RenameUser(user, options.RenameUser);
         }
+        else if (options.DeleteUser)
+        {
+            GameUser user = this.GetUserOrFail(options);
+            this._server.DeleteUser(user);
+        }
+        else if (options.FullyDeleteUser)
+        {
+            GameUser user = this.GetUserOrFail(options);
+            this._server.FullyDeleteUser(user);
+        }
     }
 }

Refresh.GameServer/Database/GameDatabaseContext.Activity.cs → Refresh.GameServer/Database/Activity/GameDatabaseContext.Activity.cs

@@ -28,8 +28,8 @@ public DatabaseList<Event> GetUserRecentActivity(ActivityQueryParameters paramet
                 userFriends.Contains(e.User.UserId) ||
                 userFriends.Contains(e.StoredObjectId) ||
                 this.GetLevelById(e.StoredSequentialId ?? int.MaxValue)?.Publisher?.UserId == parameters.User.UserId ||
-                e.EventType == EventType.Level_TeamPick ||
-                e.EventType == EventType.User_FirstLogin
+                e.EventType == EventType.LevelTeamPick ||
+                e.EventType == EventType.UserFirstLogin
             );
         }
 
@@ -41,7 +41,7 @@ private IEnumerable<Event> GetRecentActivity(ActivityQueryParameters parameters)
         if (parameters.Timestamp == 0) 
             parameters.Timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
 
-        IEnumerable<Event> query = this._realm.All<Event>()
+        IEnumerable<Event> query = this.Events
             .Where(e => e.Timestamp < parameters.Timestamp && e.Timestamp >= parameters.EndTimestamp)
             .AsEnumerable();
 
@@ -91,5 +91,5 @@ ActivityQueryParameters parameters
             .OrderByDescending(e => e.Timestamp), parameters.Skip, parameters.Count);
     }
 
-    public int GetTotalEventCount() => this._realm.All<Event>().Count();
+    public int GetTotalEventCount() => this.Events.Count();
 }

Refresh.GameServer/Database/Activity/GameDatabaseContext.ActivityRead.cs

@@ -0,0 +1,52 @@
+using System.Diagnostics;
+using Refresh.GameServer.Types.Activity;
+using Refresh.GameServer.Types.Levels;
+using Refresh.GameServer.Types.Relations;
+using Refresh.GameServer.Types.UserData;
+using Refresh.GameServer.Types.UserData.Leaderboard;
+
+namespace Refresh.GameServer.Database;
+
+public partial class GameDatabaseContext // ActivityRead
+{
+    public GameUser? GetUserFromEvent(Event e)
+    {
+        if (e.StoredDataType != EventDataType.User)
+            throw new InvalidOperationException($"Event does not store the correct data type (expected {nameof(EventDataType.User)})");
+
+        Debug.Assert(e.StoredObjectId != null);
+
+        return this.GetUserByObjectId(e.StoredObjectId);
+    }
+
+    public GameLevel? GetLevelFromEvent(Event e)
+    {
+        if (e.StoredDataType != EventDataType.Level)
+            throw new InvalidOperationException($"Event does not store the correct data type (expected {nameof(EventDataType.Level)})");
+
+        Debug.Assert(e.StoredSequentialId != null);
+
+        return this.GetLevelById(e.StoredSequentialId.Value);
+    }
+
+    public GameSubmittedScore? GetScoreFromEvent(Event e)
+    {
+        if (e.StoredDataType != EventDataType.Score)
+            throw new InvalidOperationException($"Event does not store the correct data type (expected {nameof(EventDataType.Score)})");
+
+        Debug.Assert(e.StoredObjectId != null);
+
+        return this.GetScoreByObjectId(e.StoredObjectId);
+    }
+
+    public RateLevelRelation? GetRateLevelRelationFromEvent(Event e)
+    {
+        if (e.StoredDataType != EventDataType.RateLevelRelation)
+            throw new InvalidOperationException($"Event does not store the correct data type (expected {nameof(EventDataType.RateLevelRelation)})");
+
+        Debug.Assert(e.StoredObjectId != null);
+
+        return this.RateLevelRelations
+            .FirstOrDefault(l => l.RateLevelRelationId == e.StoredObjectId);
+    }
+}