Merge player database models (#5267)

Content.Server.Database/ModelSqlite.cs

@@ -13,7 +13,6 @@ namespace Content.Server.Database
     {
         public DbSet<SqliteServerBan> Ban { get; set; } = default!;
         public DbSet<SqliteServerUnban> Unban { get; set; } = default!;
-        public DbSet<SqlitePlayer> Player { get; set; } = default!;
         public DbSet<SqliteConnectionLog> ConnectionLog { get; set; } = default!;
 
         public SqliteServerDbContext()
@@ -37,10 +36,18 @@ namespace Content.Server.Database
         {
             base.OnModelCreating(modelBuilder);
 
-            modelBuilder.Entity<SqlitePlayer>()
+            modelBuilder.Entity<Player>()
                 .HasIndex(p => p.LastSeenUserName);
 
-            var converter = new ValueConverter<(IPAddress address, int mask), string>(
+            var ipConverter = new ValueConverter<IPAddress, string>(
+                v => v.ToString(),
+                v => IPAddress.Parse(v));
+
+            modelBuilder.Entity<Player>()
+                .Property(p => p.LastSeenAddress)
+                .HasConversion(ipConverter);
+
+            var ipMaskConverter = new ValueConverter<(IPAddress address, int mask), string>(
                 v => InetToString(v.address, v.mask),
                 v => StringToInet(v)
             );
@@ -49,7 +56,7 @@ namespace Content.Server.Database
                 .Entity<SqliteServerBan>()
                 .Property(e => e.Address)
                 .HasColumnType("TEXT")
-                .HasConversion(converter);
+                .HasConversion(ipMaskConverter);
         }
 
         public SqliteServerDbContext(DbContextOptions<ServerDbContext> options) : base(options)
@@ -105,22 +112,6 @@ namespace Content.Server.Database
         public DateTime UnbanTime { get; set; }
     }
 
-    [Table("player")]
-    public class SqlitePlayer
-    {
-        public int Id { get; set; }
-
-        // Permanent data
-        public Guid UserId { get; set; }
-        public DateTime FirstSeenTime { get; set; }
-
-        // Data that gets updated on each join.
-        public string LastSeenUserName { get; set; } = null!;
-        public DateTime LastSeenTime { get; set; }
-        public string LastSeenAddress { get; set; } = null!;
-        public byte[]? LastSeenHWId { get; set; }
-    }
-
     [Table("connection_log")]
     public class SqliteConnectionLog
     {