Tidy up controllers

ProjectLighthouse/Controllers/GameApi/ClientConfigurationController.cs

@@ -6,7 +6,7 @@ using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/CommentController.cs

@@ -11,7 +11,7 @@ using LBPUnion.ProjectLighthouse.Types.Profiles;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/DeveloperController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/FriendsController.cs

@@ -11,7 +11,7 @@ using LBPUnion.ProjectLighthouse.Types.Profiles;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/LoginController.cs

@@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using IOFile = System.IO.File;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/login")]

ProjectLighthouse/Controllers/GameApi/Matching/EnterLevelController.cs

@@ -7,7 +7,7 @@ using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi.Matching;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/Matching/MatchController.cs

@@ -14,7 +14,7 @@ using LBPUnion.ProjectLighthouse.Types.Match;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi.Matching;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/MessageController.cs

@@ -8,7 +8,7 @@ using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
@@ -38,13 +38,13 @@ public class MessageController : ControllerBase
         User? user = await this.database.UserFromGameRequest(this.Request);
         if (user == null) return this.StatusCode(403, "");
         #else
-            (User, GameToken)? userAndToken = await this.database.UserAndGameTokenFromRequest(this.Request);
+        (User, GameToken)? userAndToken = await this.database.UserAndGameTokenFromRequest(this.Request);
 
-            if (userAndToken == null) return this.StatusCode(403, "");
+        if (userAndToken == null) return this.StatusCode(403, "");
 
-            // ReSharper disable once PossibleInvalidOperationException
-            User user = userAndToken.Value.Item1;
-            GameToken gameToken = userAndToken.Value.Item2;
+        // ReSharper disable once PossibleInvalidOperationException
+        User user = userAndToken.Value.Item1;
+        GameToken gameToken = userAndToken.Value.Item2;
         #endif
 
         string announceText = ServerSettings.Instance.AnnounceText;
@@ -56,13 +56,13 @@ public class MessageController : ControllerBase
         (
             announceText +
             #if DEBUG
-                "\n\n---DEBUG INFO---\n" +
-                $"user.UserId: {user.UserId}\n" +
-                $"token.Approved: {gameToken.Approved}\n" +
-                $"token.Used: {gameToken.Used}\n" +
-                $"token.UserLocation: {gameToken.UserLocation}\n" +
-                $"token.GameVersion: {gameToken.GameVersion}\n" +
-                "---DEBUG INFO---" +
+            "\n\n---DEBUG INFO---\n" +
+            $"user.UserId: {user.UserId}\n" +
+            $"token.Approved: {gameToken.Approved}\n" +
+            $"token.Used: {gameToken.Used}\n" +
+            $"token.UserLocation: {gameToken.UserLocation}\n" +
+            $"token.GameVersion: {gameToken.GameVersion}\n" +
+            "---DEBUG INFO---" +
             #endif
             "\n"
         );

ProjectLighthouse/Controllers/GameApi/Resources/PhotosController.cs

@@ -15,7 +15,7 @@ using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi.Resources;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/Resources/ResourcesController.cs

@@ -12,7 +12,7 @@ using LBPUnion.ProjectLighthouse.Types.Files;
 using Microsoft.AspNetCore.Mvc;
 using IOFile = System.IO.File;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi.Resources;
 
 [ApiController]
 [Produces("text/xml")]

ProjectLighthouse/Controllers/GameApi/Slots/CollectionController.cs

@@ -11,7 +11,7 @@ using LBPUnion.ProjectLighthouse.Types.Categories;
 using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/Slots/LevelTagsController.cs

@@ -2,7 +2,7 @@ using System;
 using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/tags")]

ProjectLighthouse/Controllers/GameApi/Slots/ListController.cs

@@ -9,7 +9,7 @@ using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/Slots/PublishController.cs

@@ -13,7 +13,7 @@ using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/Slots/ReviewController.cs

@@ -13,7 +13,7 @@ using LBPUnion.ProjectLighthouse.Types.Reviews;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/Slots/ScoreController.cs

@@ -11,7 +11,7 @@ using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/Slots/SearchController.cs

@@ -7,7 +7,7 @@ using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/Slots/SlotsController.cs

@@ -11,7 +11,7 @@ using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/StatisticsController.cs

@@ -3,7 +3,7 @@ using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Serialization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/StoreController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]

ProjectLighthouse/Controllers/GameApi/UserController.cs

@@ -12,7 +12,7 @@ using LBPUnion.ProjectLighthouse.Types.Profiles;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Controllers;
+namespace LBPUnion.ProjectLighthouse.Controllers.GameApi;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]