add game to client

Application/IW4MServer.cs

@@ -431,6 +431,7 @@ namespace IW4MAdmin
                         Clients[E.Origin.ClientNumber] = E.Origin;
                         try
                         {
+                            E.Origin.GameName = (Reference.Game?)GameName;
                             E.Origin = await OnClientConnected(E.Origin);
                             E.Target = E.Origin;
                         }
@@ -952,6 +953,8 @@ namespace IW4MAdmin
                                  !string.IsNullOrEmpty(client.Name) && (client.Ping != 999 || client.IsBot)))
                     {
                         client.CurrentServer = this;
+                        client.GameName = (Reference.Game?)GameName;
+                        
                         var e = new GameEvent
                         {
                             Type = GameEvent.EventType.PreConnect,
@@ -959,7 +962,7 @@ namespace IW4MAdmin
                             Owner = this,
                             IsBlocking = true,
                             Extra = client.GetAdditionalProperty<string>("BotGuid"),
-                            Source = GameEvent.EventSource.Status
+                            Source = GameEvent.EventSource.Status,
                         };
 
                         Manager.AddEvent(e);

Data/Migrations/MySql/20220422202702_AddGameToEFClient.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddGameToEFClient : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "GameName",
+                table: "EFClients",
+                type: "int",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GameName",
+                table: "EFClients");
+        }
+    }
+}

Data/Migrations/MySql/MySqlDatabaseContextModelSnapshot.cs

@@ -64,6 +64,9 @@ namespace Data.Migrations.MySql
                     b.Property<DateTime>("FirstConnection")
                         .HasColumnType("datetime(6)");
 
+                    b.Property<int?>("GameName")
+                        .HasColumnType("int");
+
                     b.Property<DateTime>("LastConnection")
                         .HasColumnType("datetime(6)");
 

Data/Migrations/Postgresql/20220422203121_AddGameToEFClient.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddGameToEFClient : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "GameName",
+                table: "EFClients",
+                type: "integer",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GameName",
+                table: "EFClients");
+        }
+    }
+}

Data/Migrations/Postgresql/PostgresqlDatabaseContextModelSnapshot.cs

@@ -71,6 +71,9 @@ namespace Data.Migrations.Postgresql
                     b.Property<DateTime>("FirstConnection")
                         .HasColumnType("timestamp without time zone");
 
+                    b.Property<int?>("GameName")
+                        .HasColumnType("integer");
+
                     b.Property<DateTime>("LastConnection")
                         .HasColumnType("timestamp without time zone");
 

Data/Migrations/Sqlite/20220422202315_AddGameToEFClient.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddGameToEFClient : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "GameName",
+                table: "EFClients",
+                type: "INTEGER",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GameName",
+                table: "EFClients");
+        }
+    }
+}

Data/Migrations/Sqlite/SqliteDatabaseContextModelSnapshot.cs

@@ -62,6 +62,9 @@ namespace Data.Migrations.Sqlite
                     b.Property<DateTime>("FirstConnection")
                         .HasColumnType("TEXT");
 
+                    b.Property<int?>("GameName")
+                        .HasColumnType("INTEGER");
+
                     b.Property<DateTime>("LastConnection")
                         .HasColumnType("TEXT");
 
@@ -805,7 +808,7 @@ namespace Data.Migrations.Sqlite
                     b.Property<string>("SearchableIPAddress")
                         .ValueGeneratedOnAddOrUpdate()
                         .HasColumnType("TEXT")
-                        .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)");
+                        .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", true);
 
                     b.Property<string>("SearchableName")
                         .HasMaxLength(24)

Data/Models/Client/EFClient.cs

@@ -63,6 +63,7 @@ namespace Data.Models.Client
         public DateTime FirstConnection { get; set; }
         [Required]
         public DateTime LastConnection { get; set; }
+        public Reference.Game? GameName { get; set; } = Reference.Game.UKN;
         public bool Masked { get; set; }
         [Required]
         public int AliasLinkId { get; set; }

SharedLibraryCore/PartialEntities/EFClient.cs

@@ -626,6 +626,8 @@ namespace SharedLibraryCore.Database.Models
                 Utilities.DefaultLogger.LogInformation("Client {client} is joining the game from {source}", ToString(),
                     ipAddress.HasValue ? "Status" : "Log");
 
+                GameName = (Reference.Game)CurrentServer.GameName;
+
                 if (ipAddress != null)
                 {
                     IPAddress = ipAddress;

SharedLibraryCore/Services/ClientService.cs

@@ -103,7 +103,8 @@ namespace SharedLibraryCore.Services
                     Level = Permission.User,
                     FirstConnection = DateTime.UtcNow,
                     LastConnection = DateTime.UtcNow,
-                    NetworkId = entity.NetworkId
+                    NetworkId = entity.NetworkId,
+                    GameName = (Reference.Game)entity.CurrentServer.GameName
                 };
 
                 _logger.LogDebug("[create] adding {entity} to context", entity.ToString());
@@ -283,6 +284,8 @@ namespace SharedLibraryCore.Services
                 entity.PasswordSalt = temporalClient.PasswordSalt;
             }
 
+            entity.GameName ??= temporalClient.GameName;
+
             // update in database
             await context.SaveChangesAsync();
             return entity.ToPartialClient();
@@ -357,7 +360,8 @@ namespace SharedLibraryCore.Services
                     Level = Permission.User,
                     FirstConnection = DateTime.UtcNow,
                     LastConnection = DateTime.UtcNow,
-                    NetworkId = entity.NetworkId
+                    NetworkId = entity.NetworkId,
+                    GameName = (Reference.Game)entity.CurrentServer.GameName
                 };
 
                 if (existingAlias == null)