Cleanup more trivial warnings

jvyden · jvyden · commit 29cd9a07e3bf · 2025-05-31T15:16:21.000-04:00
diff --git a/Refresh.Database/GameDatabaseProvider.cs b/Refresh.Database/GameDatabaseProvider.cs
@@ -841,9 +841,4 @@ protected override void Migrate(Migration migration, ulong oldVersion)
         //     }
     }
     #endif
-    
-    public void Dispose()
-    {
-        GC.SuppressFinalize(this);
-    }
 }
diff --git a/Refresh.Database/Models/Comments/GameLevelComment.cs b/Refresh.Database/Models/Comments/GameLevelComment.cs
@@ -3,6 +3,8 @@
 
 namespace Refresh.Database.Models.Comments;
 
+#nullable disable
+
 public partial class GameLevelComment : IRealmObject, IGameComment, ISequentialId
 {
     [PrimaryKey] public int SequentialId { get; set; }
diff --git a/Refresh.Database/Models/Comments/GameProfileComment.cs b/Refresh.Database/Models/Comments/GameProfileComment.cs
@@ -2,6 +2,8 @@
 
 namespace Refresh.Database.Models.Comments;
 
+#nullable disable
+
 public partial class GameProfileComment : IRealmObject, IGameComment, ISequentialId
 {
     [PrimaryKey] public int SequentialId { get; set; }
diff --git a/Refresh.GameServer/Services/CommandService.cs b/Refresh.GameServer/Services/CommandService.cs
@@ -86,7 +86,7 @@ public void HandleCommand(CommandInvocation command, GameDatabaseContext databas
         {
             case "forcematch":
             {
-                if (command.Arguments == null)
+                if (command.Arguments.IsEmpty)
                 {
                     throw new Exception("User not provided for force match command");
                 }
diff --git a/Refresh.GameServer/Types/Challenges/Lbp3/SerializedLevelChallenge.cs b/Refresh.GameServer/Types/Challenges/Lbp3/SerializedLevelChallenge.cs
@@ -2,6 +2,8 @@
 
 namespace Refresh.GameServer.Types.Challenges.Lbp3;
 
+#nullable disable
+
 public class SerializedLbp3Challenge
 {
     /// <summary>
diff --git a/Refresh.GameServer/Types/Challenges/Lbp3/SerializedLevelChallengeList.cs b/Refresh.GameServer/Types/Challenges/Lbp3/SerializedLevelChallengeList.cs
@@ -2,6 +2,8 @@
 
 namespace Refresh.GameServer.Types.Challenges.Lbp3;
 
+#nullable disable
+
 [XmlRoot("Challenge_header")]
 public class SerializedLbp3ChallengeList
 {
diff --git a/Refresh.GameServer/Types/Levels/GameMinimalLevelResponse.cs b/Refresh.GameServer/Types/Levels/GameMinimalLevelResponse.cs
@@ -11,7 +11,7 @@
 
 namespace Refresh.GameServer.Types.Levels;
 
-public class GameMinimalLevelResponse : IDataConvertableFrom<GameMinimalLevelResponse, Database.Models.Levels.GameLevel>, IDataConvertableFrom<GameMinimalLevelResponse, GamePlaylist>, IDataConvertableFrom<GameMinimalLevelResponse, GameLevelResponse>
+public class GameMinimalLevelResponse : IDataConvertableFrom<GameMinimalLevelResponse, GameLevel>, IDataConvertableFrom<GameMinimalLevelResponse, GamePlaylist>, IDataConvertableFrom<GameMinimalLevelResponse, GameLevelResponse>
 {
     //NOTE: THIS MUST BE AT THE TOP OF THE XML RESPONSE OR ELSE LBP PSP WILL CRASH
     [XmlElement("id")] public required int LevelId { get; set; }
@@ -64,7 +64,7 @@ public static GameMinimalLevelResponse FromHash(string hash, DataContext dataCon
         return FromOld(GameLevelResponse.FromHash(hash, dataContext), dataContext)!;
     }
 
-    public static GameMinimalLevelResponse? FromOld(Database.Models.Levels.GameLevel? level, DataContext dataContext)
+    public static GameMinimalLevelResponse? FromOld(GameLevel? level, DataContext dataContext)
     {
         if(level == null) return null;
         return FromOld(GameLevelResponse.FromOld(level, dataContext), dataContext);
@@ -152,7 +152,7 @@ public static GameMinimalLevelResponse FromHash(string hash, DataContext dataCon
         };
     }
 
-    public static IEnumerable<GameMinimalLevelResponse> FromOldList(IEnumerable<Database.Models.Levels.GameLevel> oldList,
+    public static IEnumerable<GameMinimalLevelResponse> FromOldList(IEnumerable<GameLevel> oldList,
         DataContext dataContext) => oldList.Select(old => FromOld(old, dataContext)).ToList()!;
     public static IEnumerable<GameMinimalLevelResponse> FromOldList(IEnumerable<GameLevelResponse> oldList,
         DataContext dataContext) => oldList.Select(old => FromOld(old, dataContext)).ToList()!;
diff --git a/Refresh.GameServer/Types/Playlists/SerializedLbp1Playlist.cs b/Refresh.GameServer/Types/Playlists/SerializedLbp1Playlist.cs
@@ -6,6 +6,8 @@
 
 namespace Refresh.GameServer.Types.Playlists;
 
+#nullable disable
+
 [XmlType("playlist")]
 [XmlRoot("playlist")]
 public class SerializedLbp1Playlist : IDataConvertableFrom<SerializedLbp1Playlist, Database.Models.Playlists.GamePlaylist>, ISerializedCreatePlaylistInfo
@@ -14,14 +16,16 @@ public class SerializedLbp1Playlist : IDataConvertableFrom<SerializedLbp1Playlis
     public int Id { get; set; }
     
     [XmlElement("name")]
-    public string Name { get; set; }
+    public string Name { get; set; } = null!;
     [XmlElement("description")]
-    public string Description { get; set; }
+    public string Description { get; set; } = null!;
     [XmlElement("icon")]
     public string Icon { get; set; }
     
     [XmlElement("location")]
     public GameLocation Location { get; set; }
+    
+    #nullable enable
 
     public static SerializedLbp1Playlist? FromOld(Database.Models.Playlists.GamePlaylist? old, DataContext dataContext)
     {
diff --git a/Refresh.GameServer/Types/Reviews/GameReviewSlot.cs b/Refresh.GameServer/Types/Reviews/GameReviewSlot.cs
@@ -2,6 +2,8 @@
 
 namespace Refresh.GameServer.Types.Reviews;
 
+#nullable disable
+
 [XmlRoot("slot")]
 public class GameReviewSlot 
 {
diff --git a/Refresh.GameServer/Types/Reviews/SerializedGameReview.cs b/Refresh.GameServer/Types/Reviews/SerializedGameReview.cs
@@ -7,9 +7,11 @@
 
 namespace Refresh.GameServer.Types.Reviews;
 
+#nullable disable
+
 [XmlRoot("review")]
 [XmlType("review")]
-public class SerializedGameReview : IDataConvertableFrom<SerializedGameReview, Database.Models.Comments.GameReview>
+public class SerializedGameReview : IDataConvertableFrom<SerializedGameReview, GameReview>
 {
     [XmlElement("id")] 
     public int Id { get; set; }
@@ -49,8 +51,10 @@ public class SerializedGameReview : IDataConvertableFrom<SerializedGameReview, D
     
     [XmlElement("yourthumb")]
     public int YourThumb { get; set; }
+    
+    #nullable enable
 
-    public static SerializedGameReview? FromOld(Database.Models.Comments.GameReview? review, DataContext dataContext)
+    public static SerializedGameReview? FromOld(GameReview? review, DataContext dataContext)
     {
         if (review == null) 
             return null;
@@ -80,6 +84,6 @@ public class SerializedGameReview : IDataConvertableFrom<SerializedGameReview, D
         };
     }
     
-    public static IEnumerable<SerializedGameReview> FromOldList(IEnumerable<Database.Models.Comments.GameReview> oldList,
+    public static IEnumerable<SerializedGameReview> FromOldList(IEnumerable<GameReview> oldList,
         DataContext dataContext) => oldList.Select(old => FromOld(old, dataContext)).ToList()!;
 }
diff --git a/Refresh.GameServer/Types/Scores/FriendScoresRequest.cs b/Refresh.GameServer/Types/Scores/FriendScoresRequest.cs
@@ -2,6 +2,8 @@
 
 namespace Refresh.GameServer.Types.Scores;
 
+#nullable disable
+
 [XmlRoot("playRecord")]
 public class FriendScoresRequest
 {

Original file line number	Diff line number	Diff line change
`@@ -841,9 +841,4 @@ protected override void Migrate(Migration migration, ulong oldVersion)`
`841`	`841`	`// }`
`842`	`842`	`}`
`843`	`843`	`#endif`
`844`		`-`
`845`		`- public void Dispose()`
`846`		`- {`
`847`		`- GC.SuppressFinalize(this);`
`848`		`- }`
`849`	`844`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`
`4`	`4`	`namespace Refresh.Database.Models.Comments;`
`5`	`5`
	`6`	`+#nullable disable`
	`7`	`+`
`6`	`8`	`public partial class GameLevelComment : IRealmObject, IGameComment, ISequentialId`
`7`	`9`	`{`
`8`	`10`	`[PrimaryKey] public int SequentialId { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Refresh.Database.Models.Comments;`
`4`	`4`
	`5`	`+#nullable disable`
	`6`	`+`
`5`	`7`	`public partial class GameProfileComment : IRealmObject, IGameComment, ISequentialId`
`6`	`8`	`{`
`7`	`9`	`[PrimaryKey] public int SequentialId { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public void HandleCommand(CommandInvocation command, GameDatabaseContext databas`
`86`	`86`	`{`
`87`	`87`	`case "forcematch":`
`88`	`88`	`{`
`89`		`- if (command.Arguments == null)`
	`89`	`+ if (command.Arguments.IsEmpty)`
`90`	`90`	`{`
`91`	`91`	`throw new Exception("User not provided for force match command");`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Refresh.GameServer.Types.Challenges.Lbp3;`
`4`	`4`
	`5`	`+#nullable disable`
	`6`	`+`
`5`	`7`	`public class SerializedLbp3Challenge`
`6`	`8`	`{`
`7`	`9`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Refresh.GameServer.Types.Levels;`
`13`	`13`
`14`		`-public class GameMinimalLevelResponse : IDataConvertableFrom<GameMinimalLevelResponse, Database.Models.Levels.GameLevel>, IDataConvertableFrom<GameMinimalLevelResponse, GamePlaylist>, IDataConvertableFrom<GameMinimalLevelResponse, GameLevelResponse>`
	`14`	`+public class GameMinimalLevelResponse : IDataConvertableFrom<GameMinimalLevelResponse, GameLevel>, IDataConvertableFrom<GameMinimalLevelResponse, GamePlaylist>, IDataConvertableFrom<GameMinimalLevelResponse, GameLevelResponse>`
`15`	`15`	`{`
`16`	`16`	`//NOTE: THIS MUST BE AT THE TOP OF THE XML RESPONSE OR ELSE LBP PSP WILL CRASH`
`17`	`17`	`[XmlElement("id")] public required int LevelId { get; set; }`
`@@ -64,7 +64,7 @@ public static GameMinimalLevelResponse FromHash(string hash, DataContext dataCon`
`64`	`64`	`return FromOld(GameLevelResponse.FromHash(hash, dataContext), dataContext)!;`
`65`	`65`	`}`
`66`	`66`
`67`		`- public static GameMinimalLevelResponse? FromOld(Database.Models.Levels.GameLevel? level, DataContext dataContext)`
	`67`	`+ public static GameMinimalLevelResponse? FromOld(GameLevel? level, DataContext dataContext)`
`68`	`68`	`{`
`69`	`69`	`if(level == null) return null;`
`70`	`70`	`return FromOld(GameLevelResponse.FromOld(level, dataContext), dataContext);`
`@@ -152,7 +152,7 @@ public static GameMinimalLevelResponse FromHash(string hash, DataContext dataCon`
`152`	`152`	`};`
`153`	`153`	`}`
`154`	`154`
`155`		`- public static IEnumerable<GameMinimalLevelResponse> FromOldList(IEnumerable<Database.Models.Levels.GameLevel> oldList,`
	`155`	`+ public static IEnumerable<GameMinimalLevelResponse> FromOldList(IEnumerable<GameLevel> oldList,`
`156`	`156`	`DataContext dataContext) => oldList.Select(old => FromOld(old, dataContext)).ToList()!;`
`157`	`157`	`public static IEnumerable<GameMinimalLevelResponse> FromOldList(IEnumerable<GameLevelResponse> oldList,`
`158`	`158`	`DataContext dataContext) => oldList.Select(old => FromOld(old, dataContext)).ToList()!;`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Refresh.GameServer.Types.Reviews;`
`4`	`4`
	`5`	`+#nullable disable`
	`6`	`+`
`5`	`7`	`[XmlRoot("slot")]`
`6`	`8`	`public class GameReviewSlot`
`7`	`9`	`{`