diff --git a/Iceshrimp.Backend/Controllers/Web/ProfileController.cs b/Iceshrimp.Backend/Controllers/Web/ProfileController.cs index 1e9f874a..fc0c97b8 100644 --- a/Iceshrimp.Backend/Controllers/Web/ProfileController.cs +++ b/Iceshrimp.Backend/Controllers/Web/ProfileController.cs @@ -1,7 +1,6 @@ using System.Net; using System.Net.Mime; using Iceshrimp.Backend.Controllers.Shared.Attributes; -using Iceshrimp.Backend.Core.Configuration; using Iceshrimp.Backend.Core.Database; using Iceshrimp.Backend.Core.Database.Tables; using Iceshrimp.Backend.Core.Middleware; @@ -10,7 +9,6 @@ using Iceshrimp.Shared.Schemas.Web; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.RateLimiting; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Options; namespace Iceshrimp.Backend.Controllers.Web; diff --git a/Iceshrimp.Backend/Core/Services/InstanceService.cs b/Iceshrimp.Backend/Core/Services/InstanceService.cs index c8b3fdfd..fb7d2c0e 100644 --- a/Iceshrimp.Backend/Core/Services/InstanceService.cs +++ b/Iceshrimp.Backend/Core/Services/InstanceService.cs @@ -150,7 +150,7 @@ public class InstanceService( await db.SaveChangesAsync(); } - public async Task> GetRules() + public async Task> GetRulesAsync() { return await db.Rules.OrderBy(p => p.Order).ThenBy(p => p.Id).ToListAsync(); } diff --git a/Iceshrimp.Backend/Core/Tasks/MediaCleanupTask.cs b/Iceshrimp.Backend/Core/Tasks/MediaCleanupTask.cs index fddc3aaf..20bf80a7 100644 --- a/Iceshrimp.Backend/Core/Tasks/MediaCleanupTask.cs +++ b/Iceshrimp.Backend/Core/Tasks/MediaCleanupTask.cs @@ -1,7 +1,6 @@ using System.Diagnostics.CodeAnalysis; using Iceshrimp.Backend.Core.Configuration; using Iceshrimp.Backend.Core.Database; -using Iceshrimp.Backend.Core.Extensions; using Iceshrimp.Backend.Core.Queues; using Iceshrimp.Backend.Core.Services; using Iceshrimp.EntityFrameworkCore.Extensions; diff --git a/Iceshrimp.Backend/Pages/Admin/Rules.razor b/Iceshrimp.Backend/Pages/Admin/Rules.razor index 118221a5..eb84bbfe 100644 --- a/Iceshrimp.Backend/Pages/Admin/Rules.razor +++ b/Iceshrimp.Backend/Pages/Admin/Rules.razor @@ -67,6 +67,7 @@ protected override void OnParametersSet() { + // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract Model ??= new RuleModel(); } diff --git a/Iceshrimp.Backend/Pages/Admin/RulesEdit.razor b/Iceshrimp.Backend/Pages/Admin/RulesEdit.razor index 7a3b495f..d243a5aa 100644 --- a/Iceshrimp.Backend/Pages/Admin/RulesEdit.razor +++ b/Iceshrimp.Backend/Pages/Admin/RulesEdit.razor @@ -41,6 +41,7 @@ protected override void OnParametersSet() { + // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract Model ??= new RuleModel(); } diff --git a/Iceshrimp.Backend/Pages/Index.cshtml.cs b/Iceshrimp.Backend/Pages/Index.cshtml.cs index c5a1510b..a1460bc8 100644 --- a/Iceshrimp.Backend/Pages/Index.cshtml.cs +++ b/Iceshrimp.Backend/Pages/Index.cshtml.cs @@ -32,7 +32,7 @@ public class IndexModel(MetaService meta, InstanceService instance, IOptionsSnap instanceDescription ?? "This Iceshrimp.NET instance does not appear to have a description"; ContactEmail = contactEmail; - Rules = await instance.GetRules(); + Rules = await instance.GetRulesAsync(); return Page(); } diff --git a/Iceshrimp.Frontend/Components/NoticeDialog.razor b/Iceshrimp.Frontend/Components/NoticeDialog.razor index 66f257fb..6099a185 100644 --- a/Iceshrimp.Frontend/Components/NoticeDialog.razor +++ b/Iceshrimp.Frontend/Components/NoticeDialog.razor @@ -21,7 +21,7 @@ break; default: - break; + throw new ArgumentOutOfRangeException(); } @Text diff --git a/Iceshrimp.Frontend/Pages/Settings/Profile.razor b/Iceshrimp.Frontend/Pages/Settings/Profile.razor index 35b4f66b..bc8802cc 100644 --- a/Iceshrimp.Frontend/Pages/Settings/Profile.razor +++ b/Iceshrimp.Frontend/Pages/Settings/Profile.razor @@ -148,12 +148,12 @@ private string FieldName { get; set; } = ""; private string FieldValue { get; set; } = ""; private StateButton SaveButton { get; set; } = null!; - private IBrowserFile? AvatarFile { get; set; } = null; - private bool DelAvatar { get; set; } = false; - private IBrowserFile? BannerFile { get; set; } = null; - private bool DelBanner { get; set; } = false; + private IBrowserFile? AvatarFile { get; set; } + private bool DelAvatar { get; set; } + private IBrowserFile? BannerFile { get; set; } + private bool DelBanner { get; set; } private DateTime Birthday { get; set; } = DateTime.Now; - private bool SetBirthday { get; set; } = false; + private bool SetBirthday { get; set; } private ElementReference Description { get; set; } private ElementReference EmojiButton { get; set; }