From 1baa3109bc7fccf0202b1fec75ac215515ab7b2f Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Sat, 21 Jun 2025 14:32:59 +0800 Subject: [PATCH] :art: Removed unused dependency injected services arguments in constructor --- DysonNetwork.Sphere/Account/AccountController.cs | 5 +---- DysonNetwork.Sphere/Account/NotificationService.cs | 1 - DysonNetwork.Sphere/Auth/AuthService.cs | 2 +- DysonNetwork.Sphere/Auth/OpenId/ConnectionController.cs | 2 +- DysonNetwork.Sphere/Auth/OpenId/DiscordOidcService.cs | 6 +++--- DysonNetwork.Sphere/Chat/ChatRoomController.cs | 1 - DysonNetwork.Sphere/Chat/ChatService.cs | 1 - DysonNetwork.Sphere/Publisher/PublisherController.cs | 1 - DysonNetwork.Sphere/Publisher/PublisherService.cs | 2 +- DysonNetwork.Sphere/Realm/RealmController.cs | 1 - DysonNetwork.Sphere/Storage/CloudFileUnusedRecyclingJob.cs | 1 - .../Storage/Handlers/LastActiveFlushHandler.cs | 4 ++-- 12 files changed, 9 insertions(+), 18 deletions(-) diff --git a/DysonNetwork.Sphere/Account/AccountController.cs b/DysonNetwork.Sphere/Account/AccountController.cs index 6e2d39a..1e67bca 100644 --- a/DysonNetwork.Sphere/Account/AccountController.cs +++ b/DysonNetwork.Sphere/Account/AccountController.cs @@ -1,7 +1,6 @@ using System.ComponentModel.DataAnnotations; using DysonNetwork.Sphere.Auth; using DysonNetwork.Sphere.Permission; -using DysonNetwork.Sphere.Storage; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; @@ -15,11 +14,9 @@ namespace DysonNetwork.Sphere.Account; [Route("/accounts")] public class AccountController( AppDatabase db, - FileService fs, AuthService auth, AccountService accounts, - AccountEventService events, - MagicSpellService spells + AccountEventService events ) : ControllerBase { [HttpGet("{name}")] diff --git a/DysonNetwork.Sphere/Account/NotificationService.cs b/DysonNetwork.Sphere/Account/NotificationService.cs index a58b22c..3b43cc0 100644 --- a/DysonNetwork.Sphere/Account/NotificationService.cs +++ b/DysonNetwork.Sphere/Account/NotificationService.cs @@ -10,7 +10,6 @@ namespace DysonNetwork.Sphere.Account; public class NotificationService( AppDatabase db, WebSocketService ws, - ILogger logger, IHttpClientFactory httpFactory, IConfiguration config) { diff --git a/DysonNetwork.Sphere/Auth/AuthService.cs b/DysonNetwork.Sphere/Auth/AuthService.cs index a41e48b..c4ba150 100644 --- a/DysonNetwork.Sphere/Auth/AuthService.cs +++ b/DysonNetwork.Sphere/Auth/AuthService.cs @@ -58,7 +58,7 @@ public class AuthService(AppDatabase db, IConfiguration config, IHttpClientFacto // 4) Combine base “maxSteps” (the number of enabled factors) with any accumulated risk score. const int totalRiskScore = 3; - var totalRequiredSteps = (int)Math.Round((float)maxSteps * riskScore / 3); + var totalRequiredSteps = (int)Math.Round((float)maxSteps * riskScore / totalRiskScore); // Clamp the steps totalRequiredSteps = Math.Max(Math.Min(totalRequiredSteps, maxSteps), 1); diff --git a/DysonNetwork.Sphere/Auth/OpenId/ConnectionController.cs b/DysonNetwork.Sphere/Auth/OpenId/ConnectionController.cs index a0ced21..f432458 100644 --- a/DysonNetwork.Sphere/Auth/OpenId/ConnectionController.cs +++ b/DysonNetwork.Sphere/Auth/OpenId/ConnectionController.cs @@ -304,7 +304,7 @@ public class ConnectionController( { await db.SaveChangesAsync(); } - catch (DbUpdateException ex) + catch (DbUpdateException) { return StatusCode(500, $"Failed to save {provider} connection. Please try again."); } diff --git a/DysonNetwork.Sphere/Auth/OpenId/DiscordOidcService.cs b/DysonNetwork.Sphere/Auth/OpenId/DiscordOidcService.cs index c1b7366..fccdc36 100644 --- a/DysonNetwork.Sphere/Auth/OpenId/DiscordOidcService.cs +++ b/DysonNetwork.Sphere/Auth/OpenId/DiscordOidcService.cs @@ -33,15 +33,15 @@ public class DiscordOidcService( return $"https://discord.com/api/oauth2/authorize?{queryString}"; } - protected override async Task GetDiscoveryDocumentAsync() + protected override Task GetDiscoveryDocumentAsync() { - return new OidcDiscoveryDocument + return Task.FromResult(new OidcDiscoveryDocument { AuthorizationEndpoint = "https://discord.com/oauth2/authorize", TokenEndpoint = "https://discord.com/api/oauth2/token", UserinfoEndpoint = "https://discord.com/api/users/@me", JwksUri = null - }; + })!; } public override async Task ProcessCallbackAsync(OidcCallbackData callbackData) diff --git a/DysonNetwork.Sphere/Chat/ChatRoomController.cs b/DysonNetwork.Sphere/Chat/ChatRoomController.cs index b1b7694..3ab72ab 100644 --- a/DysonNetwork.Sphere/Chat/ChatRoomController.cs +++ b/DysonNetwork.Sphere/Chat/ChatRoomController.cs @@ -16,7 +16,6 @@ namespace DysonNetwork.Sphere.Chat; [Route("/chat")] public class ChatRoomController( AppDatabase db, - FileService fs, FileReferenceService fileRefService, ChatRoomService crs, RealmService rs, diff --git a/DysonNetwork.Sphere/Chat/ChatService.cs b/DysonNetwork.Sphere/Chat/ChatService.cs index b14d7fb..f893d11 100644 --- a/DysonNetwork.Sphere/Chat/ChatService.cs +++ b/DysonNetwork.Sphere/Chat/ChatService.cs @@ -9,7 +9,6 @@ namespace DysonNetwork.Sphere.Chat; public class ChatService( AppDatabase db, - FileService fs, FileReferenceService fileRefService, IServiceScopeFactory scopeFactory, IRealtimeService realtime, diff --git a/DysonNetwork.Sphere/Publisher/PublisherController.cs b/DysonNetwork.Sphere/Publisher/PublisherController.cs index d03e9c4..137e966 100644 --- a/DysonNetwork.Sphere/Publisher/PublisherController.cs +++ b/DysonNetwork.Sphere/Publisher/PublisherController.cs @@ -16,7 +16,6 @@ namespace DysonNetwork.Sphere.Publisher; public class PublisherController( AppDatabase db, PublisherService ps, - FileService fs, FileReferenceService fileRefService, ActionLogService als) : ControllerBase diff --git a/DysonNetwork.Sphere/Publisher/PublisherService.cs b/DysonNetwork.Sphere/Publisher/PublisherService.cs index 65119ef..5de97df 100644 --- a/DysonNetwork.Sphere/Publisher/PublisherService.cs +++ b/DysonNetwork.Sphere/Publisher/PublisherService.cs @@ -6,7 +6,7 @@ using NodaTime; namespace DysonNetwork.Sphere.Publisher; -public class PublisherService(AppDatabase db, FileService fs, FileReferenceService fileRefService, ICacheService cache) +public class PublisherService(AppDatabase db, FileReferenceService fileRefService, ICacheService cache) { private const string UserPublishersCacheKey = "accounts:{0}:publishers"; diff --git a/DysonNetwork.Sphere/Realm/RealmController.cs b/DysonNetwork.Sphere/Realm/RealmController.cs index a22f944..82997ee 100644 --- a/DysonNetwork.Sphere/Realm/RealmController.cs +++ b/DysonNetwork.Sphere/Realm/RealmController.cs @@ -13,7 +13,6 @@ namespace DysonNetwork.Sphere.Realm; public class RealmController( AppDatabase db, RealmService rs, - FileService fs, FileReferenceService fileRefService, RelationshipService rels, ActionLogService als diff --git a/DysonNetwork.Sphere/Storage/CloudFileUnusedRecyclingJob.cs b/DysonNetwork.Sphere/Storage/CloudFileUnusedRecyclingJob.cs index 3a46c5c..6b97a06 100644 --- a/DysonNetwork.Sphere/Storage/CloudFileUnusedRecyclingJob.cs +++ b/DysonNetwork.Sphere/Storage/CloudFileUnusedRecyclingJob.cs @@ -6,7 +6,6 @@ namespace DysonNetwork.Sphere.Storage; public class CloudFileUnusedRecyclingJob( AppDatabase db, - FileService fs, FileReferenceService fileRefService, ILogger logger ) diff --git a/DysonNetwork.Sphere/Storage/Handlers/LastActiveFlushHandler.cs b/DysonNetwork.Sphere/Storage/Handlers/LastActiveFlushHandler.cs index 8073df6..9546c03 100644 --- a/DysonNetwork.Sphere/Storage/Handlers/LastActiveFlushHandler.cs +++ b/DysonNetwork.Sphere/Storage/Handlers/LastActiveFlushHandler.cs @@ -6,8 +6,8 @@ namespace DysonNetwork.Sphere.Storage.Handlers; public class LastActiveInfo { - public Auth.Session Session { get; set; } - public Account.Account Account { get; set; } + public Auth.Session Session { get; set; } = null!; + public Account.Account Account { get; set; } = null!; public Instant SeenAt { get; set; } }