Removed server_id and map_id from aliases

oscar-wos · May 25, 2024 · 752ca26 · 752ca26
1 parent b718018
commit 752ca26
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 22 deletions.
diff --git a/Globals.cs b/Globals.cs
@@ -5,7 +5,7 @@ public partial class Sessions
     public override string ModuleName => "Sessions";
     public override string ModuleDescription => "Track player sessions";
     public override string ModuleAuthor => "github.com/oscar-wos/Sessions";
-    public override string ModuleVersion => "1.2.7";
+    public override string ModuleVersion => "1.2.8";
 
     public required IDatabase _database;
     public readonly Ip _ip = new();

diff --git a/IDatabase.cs b/IDatabase.cs
@@ -5,7 +5,6 @@ namespace Sessions;
 public interface IDatabase
 {
     string BuildConnectionString(CoreConfig config);
-    //string SerializeString(string value);
 
     Task<ServerSQL> GetServerAsync(string serverIp, ushort serverPort);
     Task<MapSQL> GetMapAsync(string mapName);
@@ -17,7 +16,7 @@ public interface IDatabase
     void UpdateSessionsBulkAsync(int[] playerIds, int[] sessionIds);
     void UpdateSeen(int playerId);
 
-    void InsertAlias(int sessionId, int playerId, int serverId, int mapId, string alias);
+    void InsertAlias(int sessionId, int playerId, string alias);
     void InsertMessage(int sessionId, int playerId, int mapId, MessageType messageType, string message);
 }
 

diff --git a/PostgreService.cs b/PostgreService.cs
@@ -151,8 +151,8 @@ public async void UpdateSessionsBulkAsync(int[] playerIds, int[] sessionIds)
 
         try
         {
-            foreach (int player in playerIds)
-                await _connection.ExecuteAsync(_queries.UpdateSeen, new { PlayerId = player }, transaction: tx);
+            foreach (int playerId in playerIds)
+                await _connection.ExecuteAsync(_queries.UpdateSeen, new { PlayerId = playerId }, transaction: tx);
 
             foreach (int sessionId in sessionIds)
                 await _connection.ExecuteAsync(_queries.UpdateSession, new { SessionId = sessionId }, transaction: tx);
@@ -180,15 +180,14 @@ public void UpdateSeen(int playerId)
         }
     }
 
-    public void InsertAlias(int sessionId, int playerId, int serverId, int mapId, string alias)
+    public void InsertAlias(int sessionId, int playerId, string alias)
     {
         try
         {
             NpgsqlCommand command = new(_queries.InsertAlias, _connection);
 
             command.Parameters.AddWithValue("@SessionId", sessionId);
             command.Parameters.AddWithValue("@PlayerId", playerId);
-            command.Parameters.AddWithValue("@MapId", mapId);
             command.Parameters.AddWithValue("@Alias", alias);
 
             command.ExecuteNonQuery();
@@ -256,7 +255,6 @@ end_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP
         id BIGSERIAL PRIMARY KEY,
         session_id BIGINT NOT NULL,
         player_id INT NOT NULL,
-        map_id SMALLINT NOT NULL,
         timestamp TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
         alias VARCHAR(256)
     )";
@@ -285,6 +283,6 @@ message VARCHAR(512)
     public override string UpdateSeen => "UPDATE players SET last_seen = NOW() WHERE id = @PlayerId";
 
     public override string SelectAlias => "SELECT id, alias FROM aliases WHERE player_id = @PlayerId ORDER BY id DESC LIMIT 1";
-    public override string InsertAlias => "INSERT INTO aliases (session_id, player_id, map_id, alias) VALUES (@SessionId, @PlayerId, @MapId, @Alias)";
+    public override string InsertAlias => "INSERT INTO aliases (session_id, player_id, alias) VALUES (@SessionId, @PlayerId, @Alias)";
     public override string InsertMessage => "INSERT INTO messages (session_id, player_id, map_id, message_type, message) VALUES (@SessionId, @PlayerId, @MapId, @MessageType, @Message)";
 }
diff --git a/Sessions.cs b/Sessions.cs
@@ -24,8 +24,8 @@ public override void Load(bool hotReload)
         ushort port = (ushort)ConVar.Find("hostport")!.GetPrimitiveValue<int>();
         _server = _database!.GetServerAsync(ip, port).GetAwaiter().GetResult();
 
-        RegisterListener<Listeners.OnMapStart>(async mapName =>
-            _server.Map = await _database.GetMapAsync(mapName)
+        RegisterListener<Listeners.OnMapStart>(mapName =>
+            _server.Map = _database.GetMapAsync(mapName).GetAwaiter().GetResult()
         );
 
         RegisterListener<Listeners.OnClientAuthorized>((playerSlot, steamId) =>
@@ -50,16 +50,16 @@ public override void Load(bool hotReload)
             CCSPlayerController? playerController = Utilities.GetPlayerFromUserid(@event.Userid);
             
             if (playerController == null || !playerController.IsValid || playerController.IsBot
-                || @event.Text == null || !_players.TryGetValue(playerController.Slot, out PlayerSQL? value)
-                || value.Session == null || _server.Map == null)
+                || @event.Text == null || _server == null || _server.Map == null
+                || !_players.TryGetValue(playerController.Slot, out PlayerSQL? value) || value.Session == null)
                 return HookResult.Continue;
 
             MessageType messageType = @event.Teamonly ? MessageType.TeamChat : MessageType.Chat;
             _database.InsertMessage(value.Session.Id, value.Id, _server.Map.Id, messageType, @event.Text);
 
             return HookResult.Continue;
-        }, HookMode.Post);
-        
+        }, HookMode.Pre);
+
         _timer = AddTimer(1.0f, Timer_Repeat, TimerFlags.REPEAT);
 
         if (!hotReload)
@@ -99,6 +99,6 @@ public async Task CheckAlias(int playerSlot, string alias)
         alias = Regex.Replace(alias, @"[0\\]x[\da-fA-F]{2}", string.Empty);
 
         if (recentAlias == null || recentAlias.Alias != alias)
-            _database.InsertAlias(player.Session!.Id, player.Id, _server!.Id, _server.Map!.Id, alias);
+            _database.InsertAlias(player.Session!.Id, player.Id, alias);
     }
 }
diff --git a/SqlService.cs b/SqlService.cs
@@ -154,8 +154,8 @@ public async void UpdateSessionsBulkAsync(int[] playerIds, int[] sessionIds)
 
         try
         {
-            foreach (int player in playerIds)
-                await _connection.ExecuteAsync(_queries.UpdateSeen, new { PlayerId = player }, transaction: tx);
+            foreach (int playerId in playerIds)
+                await _connection.ExecuteAsync(_queries.UpdateSeen, new { PlayerId = playerId }, transaction: tx);
 
             foreach (int sessionId in sessionIds)
                 await _connection.ExecuteAsync(_queries.UpdateSession, new { SessionId = sessionId }, transaction: tx);
@@ -182,15 +182,14 @@ public void UpdateSeen(int playerId) {
         }
     }
 
-    public void InsertAlias(int sessionId, int playerId, int serverId, int mapId, string alias)
+    public void InsertAlias(int sessionId, int playerId, string alias)
     {
         try
         {
             MySqlCommand command = new(_queries.InsertAlias, _connection);
 
             command.Parameters.AddWithValue("@SessionId", sessionId);
             command.Parameters.AddWithValue("@PlayerId", playerId);
-            command.Parameters.AddWithValue("@MapId", mapId);
             command.Parameters.AddWithValue("@Alias", alias);
 
             command.ExecuteNonQuery();
@@ -258,7 +257,6 @@ end_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
         id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
         session_id BIGINT UNSIGNED NOT NULL,
         player_id INT UNSIGNED NOT NULL,
-        map_id SMALLINT UNSIGNED NOT NULL,
         timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
         alias VARCHAR(64) COLLATE utf8_unicode_520_ci
     )";
@@ -287,6 +285,6 @@ message VARCHAR(128) COLLATE utf8_unicode_520_ci
     public override string UpdateSeen => "UPDATE players SET last_seen = NOW() WHERE id = @PlayerId";
 
     public override string SelectAlias => "SELECT id, alias FROM aliases WHERE player_id = @PlayerId ORDER BY id DESC LIMIT 1";
-    public override string InsertAlias => "INSERT INTO aliases (session_id, player_id, map_id, alias) VALUES (@SessionId, @PlayerId, @MapId, @Alias)";
+    public override string InsertAlias => "INSERT INTO aliases (session_id, player_id, alias) VALUES (@SessionId, @PlayerId, @Alias)";
     public override string InsertMessage => "INSERT INTO messages (session_id, player_id, map_id, message_type, message) VALUES (@SessionId, @PlayerId, @MapId, @MessageType, @Message)";
 }