[backend] Refactor Controllers folder

Iceshrimp.Backend/Controllers/Federation/ActivityPubController.cs

@@ -1,6 +1,6 @@
 using System.Text;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Federation.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Extensions;

Iceshrimp.Backend/Controllers/Federation/Attributes/MediaTypeRouteFilterAttribute.cs

@@ -2,7 +2,7 @@ using System.Net.Http.Headers;
 using Microsoft.AspNetCore.Mvc.ActionConstraints;
 using Microsoft.Net.Http.Headers;
 
-namespace Iceshrimp.Backend.Controllers.Attributes;
+namespace Iceshrimp.Backend.Controllers.Federation.Attributes;
 
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
 public class MediaTypeRouteFilterAttribute(params string[] mediaTypes) : Attribute, IActionConstraint

Iceshrimp.Backend/Controllers/Mastodon/AccountController.cs

@@ -1,10 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;

Iceshrimp.Backend/Controllers/Mastodon/ConversationsController.cs

@@ -1,10 +1,10 @@
 using System.Net;
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Extensions;

Iceshrimp.Backend/Controllers/Mastodon/ListController.cs

@@ -1,10 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Extensions;

Iceshrimp.Backend/Controllers/Mastodon/NotificationController.cs

@@ -1,9 +1,9 @@
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Extensions;
 using Iceshrimp.Backend.Core.Middleware;

Iceshrimp.Backend/Controllers/Mastodon/Schemas/MastodonPaginationQuery.cs

@@ -1,4 +1,4 @@
-using Iceshrimp.Backend.Controllers.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Iceshrimp.Backend.Controllers.Mastodon.Schemas;

Iceshrimp.Backend/Controllers/Mastodon/SearchController.cs

@@ -1,11 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
 using System.Text.RegularExpressions;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Extensions;

Iceshrimp.Backend/Controllers/Mastodon/StatusController.cs

@@ -1,10 +1,10 @@
 using System.Net.Mime;
 using AsyncKeyedLock;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;

Iceshrimp.Backend/Controllers/Mastodon/TimelineController.cs

@@ -1,9 +1,9 @@
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Extensions;

Iceshrimp.Backend/Controllers/Shared/Attributes/LinkPaginationAttribute.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace Iceshrimp.Backend.Controllers.Attributes;
+namespace Iceshrimp.Backend.Controllers.Shared.Attributes;
 
 public class LinkPaginationAttribute(int defaultLimit, int maxLimit, bool offset = false) : ActionFilterAttribute
 {

Iceshrimp.Backend/Controllers/Shared/Attributes/UseJsonAttribute.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers.Attributes;
+namespace Iceshrimp.Backend.Controllers.Shared.Attributes;
 
 public abstract class UseJsonAttribute : Attribute, IAsyncActionFilter
 {

Iceshrimp.Backend/Controllers/Shared/Schemas/PaginationQuery.cs

@@ -1,7 +1,7 @@
-using Iceshrimp.Backend.Controllers.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Iceshrimp.Backend.Controllers.Schemas;
+namespace Iceshrimp.Backend.Controllers.Shared.Schemas;
 
 public class PaginationQuery : IPaginationQuery
 {

Iceshrimp.Backend/Controllers/Web/AdminController.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Federation;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
@@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [Authenticate]
 [Authorize("role:admin")]

Iceshrimp.Backend/Controllers/Web/AuthController.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Renderers;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Helpers;
@@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Tags("Authentication")]

Iceshrimp.Backend/Controllers/Web/DriveController.cs

@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Route("/api/iceshrimp/drive")]

Iceshrimp.Backend/Controllers/Web/EmojiController.cs

@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Authenticate]

Iceshrimp.Backend/Controllers/Web/FallbackController.cs

@@ -5,7 +5,7 @@ using Iceshrimp.Shared.Schemas.Web;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [Produces(MediaTypeNames.Application.Json)]
 public class FallbackController : ControllerBase

Iceshrimp.Backend/Controllers/Web/IdenticonController.cs

@@ -8,7 +8,7 @@ using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [EnableCors("drive")]

Iceshrimp.Backend/Controllers/Web/NoteController.cs

@@ -2,8 +2,8 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Net.Mime;
 using AsyncKeyedLock;
-using Iceshrimp.Backend.Controllers.Attributes;
-using Iceshrimp.Backend.Controllers.Renderers;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Extensions;
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [EnableRateLimiting("sliding")]

Iceshrimp.Backend/Controllers/Web/NotificationController.cs

@@ -1,7 +1,7 @@
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
-using Iceshrimp.Backend.Controllers.Renderers;
-using Iceshrimp.Backend.Controllers.Schemas;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Schemas;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Extensions;
 using Iceshrimp.Backend.Core.Middleware;
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Authenticate]

Iceshrimp.Backend/Controllers/Web/Renderers/NoteRenderer.cs

@@ -8,7 +8,7 @@ using Iceshrimp.Shared.Schemas.Web;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers.Renderers;
+namespace Iceshrimp.Backend.Controllers.Web.Renderers;
 
 public class NoteRenderer(
 	UserRenderer userRenderer,

Iceshrimp.Backend/Controllers/Web/Renderers/NotificationRenderer.cs

@@ -2,7 +2,7 @@ using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Extensions;
 using Iceshrimp.Shared.Schemas.Web;
 
-namespace Iceshrimp.Backend.Controllers.Renderers;
+namespace Iceshrimp.Backend.Controllers.Web.Renderers;
 
 public class NotificationRenderer(
 	UserRenderer userRenderer,

Iceshrimp.Backend/Controllers/Web/Renderers/UserProfileRenderer.cs

@@ -4,7 +4,7 @@ using Iceshrimp.Backend.Core.Extensions;
 using Iceshrimp.Shared.Schemas.Web;
 using Microsoft.EntityFrameworkCore;
 
-namespace Iceshrimp.Backend.Controllers.Renderers;
+namespace Iceshrimp.Backend.Controllers.Web.Renderers;
 
 public class UserProfileRenderer(DatabaseContext db)
 {

Iceshrimp.Backend/Controllers/Web/Renderers/UserRenderer.cs

@@ -6,7 +6,7 @@ using Iceshrimp.Shared.Schemas.Web;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers.Renderers;
+namespace Iceshrimp.Backend.Controllers.Web.Renderers;
 
 public class UserRenderer(IOptions<Config.InstanceSection> config, DatabaseContext db)
 {

Iceshrimp.Backend/Controllers/Web/SearchController.cs

@@ -1,8 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
-using Iceshrimp.Backend.Controllers.Renderers;
-using Iceshrimp.Backend.Controllers.Schemas;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Schemas;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Authenticate]

Iceshrimp.Backend/Controllers/Web/SettingsController.cs

@@ -6,7 +6,7 @@ using Iceshrimp.Shared.Schemas.Web;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Authenticate]

Iceshrimp.Backend/Controllers/Web/TimelineController.cs

@@ -1,7 +1,7 @@
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
-using Iceshrimp.Backend.Controllers.Renderers;
-using Iceshrimp.Backend.Controllers.Schemas;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Schemas;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Extensions;
@@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [LinkPagination(20, 80)]

Iceshrimp.Backend/Controllers/Web/UserController.cs

@@ -1,7 +1,7 @@
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
-using Iceshrimp.Backend.Controllers.Renderers;
-using Iceshrimp.Backend.Controllers.Schemas;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Schemas;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Authenticate]

Iceshrimp.Backend/Core/Extensions/MvcBuilderExtensions.cs

@@ -1,7 +1,7 @@
 using System.Buffers;
 using System.Net;
 using System.Text.Encodings.Web;
-using Iceshrimp.Backend.Controllers.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Middleware;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Formatters;

Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs

@@ -1,11 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq.Expressions;
 using EntityFrameworkCore.Projectables;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
-using Iceshrimp.Backend.Controllers.Schemas;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Schemas;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Middleware;

Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs

@@ -3,7 +3,7 @@ using System.Threading.RateLimiting;
 using System.Xml.Linq;
 using Iceshrimp.Backend.Controllers.Federation;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
-using Iceshrimp.Backend.Controllers.Renderers;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Federation.WebFinger;
@@ -28,9 +28,9 @@ using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
 using AuthenticationMiddleware = Iceshrimp.Backend.Core.Middleware.AuthenticationMiddleware;
 using AuthorizationMiddleware = Iceshrimp.Backend.Core.Middleware.AuthorizationMiddleware;
-using NoteRenderer = Iceshrimp.Backend.Controllers.Renderers.NoteRenderer;
-using NotificationRenderer = Iceshrimp.Backend.Controllers.Renderers.NotificationRenderer;
-using UserRenderer = Iceshrimp.Backend.Controllers.Renderers.UserRenderer;
+using NoteRenderer = Iceshrimp.Backend.Controllers.Web.Renderers.NoteRenderer;
+using NotificationRenderer = Iceshrimp.Backend.Controllers.Web.Renderers.NotificationRenderer;
+using UserRenderer = Iceshrimp.Backend.Controllers.Web.Renderers.UserRenderer;
 
 namespace Iceshrimp.Backend.Core.Extensions;
 

Iceshrimp.Backend/Core/Services/StreamingService.cs

@@ -1,6 +1,6 @@
 using System.Collections.Concurrent;
 using AsyncKeyedLock;
-using Iceshrimp.Backend.Controllers.Renderers;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Hubs;
 using Iceshrimp.Backend.Hubs.Helpers;

Iceshrimp.Backend/Hubs/Helpers/StreamingConnectionAggregate.cs

@@ -1,6 +1,6 @@
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
-using Iceshrimp.Backend.Controllers.Renderers;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Events;

Iceshrimp.Backend/Iceshrimp.Backend.csproj

@@ -98,6 +98,10 @@
         <None Remove="Core\Database\prune-designer-cs-files.sh"/>
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Controllers\Shared\" />
+    </ItemGroup>
+
     <Target Name="KeepOnlyBrotliCompressedStaticAssets" AfterTargets="Publish">
         <ItemGroup>
             <CompressedFiles Include="$(PublishDir)\wwwroot\_framework\*.br"/>