From 79a4ce012c8661e69883197ea33f490c0bd0809f Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 10 Sep 2024 03:00:45 +0200 Subject: [PATCH] [frontend] Code cleanup --- .../Components/Note/NoteFooter.razor | 1 - .../Core/InMemoryLogger/InMemoryLogger.cs | 3 +-- .../Pages/Settings/Filters.razor | 24 +++++++------------ .../Pages/Settings/Settings.razor | 2 +- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/Iceshrimp.Frontend/Components/Note/NoteFooter.razor b/Iceshrimp.Frontend/Components/Note/NoteFooter.razor index b6aa33ac..7e379e44 100644 --- a/Iceshrimp.Frontend/Components/Note/NoteFooter.razor +++ b/Iceshrimp.Frontend/Components/Note/NoteFooter.razor @@ -3,7 +3,6 @@ @using Iceshrimp.Frontend.Localization @using Iceshrimp.Shared.Schemas.Web @using Microsoft.Extensions.Localization -@using _Imports = Iceshrimp.Frontend._Imports @inject IStringLocalizer Loc; @inject IJSRuntime Js; @inject SessionService Session; diff --git a/Iceshrimp.Frontend/Core/InMemoryLogger/InMemoryLogger.cs b/Iceshrimp.Frontend/Core/InMemoryLogger/InMemoryLogger.cs index 5aa28293..c756089a 100644 --- a/Iceshrimp.Frontend/Core/InMemoryLogger/InMemoryLogger.cs +++ b/Iceshrimp.Frontend/Core/InMemoryLogger/InMemoryLogger.cs @@ -1,4 +1,3 @@ -using Iceshrimp.Frontend.Core.Services; using Microsoft.Extensions.Options; namespace Iceshrimp.Frontend.Core.InMemoryLogger; @@ -15,5 +14,5 @@ internal class InMemoryLogger (IOptions config, InM return config.Value.LogLevel.HasFlag(logLevel); } - public IDisposable? BeginScope(TState state) where TState : notnull => default!; + public IDisposable BeginScope(TState state) where TState : notnull => default!; } \ No newline at end of file diff --git a/Iceshrimp.Frontend/Pages/Settings/Filters.razor b/Iceshrimp.Frontend/Pages/Settings/Filters.razor index 715601b0..0575035c 100644 --- a/Iceshrimp.Frontend/Pages/Settings/Filters.razor +++ b/Iceshrimp.Frontend/Pages/Settings/Filters.razor @@ -6,11 +6,9 @@ @using Iceshrimp.Shared.Schemas.Web @using Microsoft.Extensions.Localization @using Iceshrimp.Assets.PhosphorIcons -@using Microsoft.Extensions.Logging @using Microsoft.AspNetCore.Components.Sections @layout SettingsLayout @inject ApiService Api; -@inject ILogger Logger; @inject IStringLocalizer Loc; @@ -173,21 +171,21 @@ @code { - private List FilterList { get; set; } = []; + private List FilterList { get; set; } = []; private State State { get; set; } = State.Loading; private string FilterName { get; set; } = ""; private string Keyword { get; set; } = ""; - private List FilterKeywords { get; set; } = []; + private List FilterKeywords { get; } = []; private DateTime? FilterExpiry { get; set; } private FilterResponse.FilterAction FilterAction { get; set; } private Menu MenuFilterAction { get; set; } = null!; private Menu MenuFilterContexts { get; set; } = null!; - private List FilterContexts { get; set; } = []; + private List FilterContexts { get; } = []; private StateButton ButtonAddFilter { get; set; } = null!; - private bool _filterNameInvalid = false; - private bool _filterKeywordsInvalid = false; - private bool _filterExpiryInvalid = false; - private bool _filterContextsInvalid = false; + private bool _filterNameInvalid; + private bool _filterKeywordsInvalid; + private bool _filterExpiryInvalid; + private bool _filterContextsInvalid; protected override async Task OnInitializedAsync() { @@ -206,17 +204,13 @@ { try { - var res = await Api.Filters.DeleteFilter(id); - if (res == true) + if (await Api.Filters.DeleteFilter(id)) { var index = FilterList.FindIndex(p => p.Id == id); FilterList.RemoveAt(index); } } - catch (ApiException) - { - - } + catch (ApiException) { } } private async Task TryAddFilter() diff --git a/Iceshrimp.Frontend/Pages/Settings/Settings.razor b/Iceshrimp.Frontend/Pages/Settings/Settings.razor index af1d8cbd..abb5e9d4 100644 --- a/Iceshrimp.Frontend/Pages/Settings/Settings.razor +++ b/Iceshrimp.Frontend/Pages/Settings/Settings.razor @@ -4,7 +4,7 @@ @using Iceshrimp.Assets.PhosphorIcons @using Iceshrimp.Frontend.Localization @using Microsoft.Extensions.Localization -@inject NavigationManager Nav; +@* @inject NavigationManager Nav; *@ @inject IStringLocalizer Loc;