MatchService + GameUser: Move force matches to GameUser (#322)

This is in preparation of #282
LittleBigRefresh · Jan 2, 2024 · 55465b6 · 55465b6
2 parents 0b8ee5b + 6070e81
commit 55465b6
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 26 deletions.
diff --git a/Refresh.GameServer/Database/GameDatabaseContext.Users.cs b/Refresh.GameServer/Database/GameDatabaseContext.Users.cs
@@ -303,6 +303,22 @@ public void SetUserGriefReportRedirection(GameUser user, bool value)
             user.RedirectGriefReportsToPhotos = value;
         });
     }
+
+    public void ClearForceMatch(GameUser user)
+    {
+        this._realm.Write(() =>
+        {
+            user.ForceMatch = null;
+        });
+    }
+
+    public void SetForceMatch(GameUser user, GameUser target)
+    {
+        this._realm.Write(() =>
+        {
+            user.ForceMatch = target.ForceMatch;
+        });
+    }
 
     #if DEBUG
     public void ForceUserTokenGame(Token token, TokenGame game)

diff --git a/Refresh.GameServer/Database/GameDatabaseProvider.cs b/Refresh.GameServer/Database/GameDatabaseProvider.cs
@@ -32,7 +32,7 @@ protected GameDatabaseProvider(IDateTimeProvider time)
         this._time = time;
     }
 
-    protected override ulong SchemaVersion => 102;
+    protected override ulong SchemaVersion => 103;
 
     protected override string Filename => "refreshGameServer.realm";
 

diff --git a/Refresh.GameServer/Endpoints/Game/Handshake/AuthenticationEndpoints.cs b/Refresh.GameServer/Endpoints/Game/Handshake/AuthenticationEndpoints.cs
@@ -157,6 +157,9 @@ public class AuthenticationEndpoints : EndpointGroup
 
         Token token = database.GenerateTokenForUser(user, TokenType.Game, game.Value, platform.Value, GameDatabaseContext.GameTokenExpirySeconds); // 4 hours
 
+        //Clear the user's force match
+        database.ClearForceMatch(user);
+
         if (game == TokenGame.LittleBigPlanetPSP)
         {
             return new TicketLoginResponse

diff --git a/Refresh.GameServer/Services/CommandService.cs b/Refresh.GameServer/Services/CommandService.cs
@@ -94,14 +94,14 @@ public void HandleCommand(CommandInvocation command, GameDatabaseContext databas
 
                 if (target != null)
                 {
-                    this._match.SetForceMatch(user.UserId, target.UserId);
+                    database.SetForceMatch(user, target);
                 }
 
                 break;
             }
             case "clearforcematch":
             {
-                this._match.ClearForceMatch(user.UserId);
+                database.ClearForceMatch(user);
                 break;
             }
             case "griefphotoson":

diff --git a/Refresh.GameServer/Services/MatchService.cs b/Refresh.GameServer/Services/MatchService.cs
@@ -19,7 +19,6 @@ public partial class MatchService(Logger logger) : EndpointService(logger)
     private FrozenSet<IMatchMethod> _matchMethods = null!; // initialized in Initialize()
 
     public IRoomAccessor RoomAccessor { get; private set; } = null!; //initialized in Initialize()
-    private readonly Dictionary<ObjectId, ObjectId> _forceMatches = new();
 
     public GameRoom GetOrCreateRoomByPlayer(GameUser player, TokenPlatform platform, TokenGame game, NatType natType)
     {
@@ -120,24 +119,4 @@ public Response ExecuteMethod(string methodStr, SerializedRoomData roomData, Gam
 
         return method.Execute(this, this.Logger, database, user, token, roomData);
     }
-
-    public void SetForceMatch(ObjectId user, ObjectId target)
-    {
-        this._forceMatches[user] = target;
-    }
-
-    public ObjectId? GetForceMatch(ObjectId user)
-    {
-        if (this._forceMatches.TryGetValue(user, out ObjectId target))
-        {
-            return target;
-        }
-
-        return null;
-    }
-
-    public void ClearForceMatch(ObjectId user)
-    {
-        this._forceMatches.Remove(user);
-    }
 }
diff --git a/Refresh.GameServer/Types/Matching/MatchMethods/FindRoomMethod.cs b/Refresh.GameServer/Types/Matching/MatchMethods/FindRoomMethod.cs
@@ -50,7 +50,7 @@ public Response Execute(MatchService service, Logger logger, GameDatabaseContext
             rooms = rooms.Where(r => r.NatType == NatType.Open).ToList();
         }
 
-        ObjectId? forceMatch = service.GetForceMatch(user.UserId);
+        ObjectId? forceMatch = user.ForceMatch;
 
         //If the user has a forced match
         if (forceMatch != null)
@@ -68,7 +68,7 @@ public Response Execute(MatchService service, Logger logger, GameDatabaseContext
         if (forceMatch != null)
         {
             //Clear the user's force match
-            service.ClearForceMatch(user.UserId);
+            database.ClearForceMatch(user);
         }
 
         GameRoom room = rooms[Random.Shared.Next(0, rooms.Count)];

diff --git a/Refresh.GameServer/Types/UserData/GameUser.cs b/Refresh.GameServer/Types/UserData/GameUser.cs
@@ -22,6 +22,11 @@ public partial class GameUser : IRealmObject, IRateLimitUser
     public bool ShouldResetPassword { get; set; }
 
     public string IconHash { get; set; } = "0";
+
+    /// <summary>
+    /// The force match of the user, cleared on login
+    /// </summary>
+    public ObjectId? ForceMatch { get; set; }
 
     /// <summary>
     /// The <see cref="IconHash"/>, except only for PSP clients.