From 4b3afdffb11cafde482fce1833a1a742b55605f4 Mon Sep 17 00:00:00 2001 From: Jake Mannens Date: Fri, 25 Aug 2023 13:07:32 +1000 Subject: Renamed UserStateService to UserService --- Media.cs | 4 ---- Pages/Component/NsfwSwitch.razor | 6 +++--- Pages/Component/TagSelectDialog.razor | 6 +++--- Pages/Gallery.razor | 6 +++--- Pages/TagDefinitions.razor | 6 +++--- Program.cs | 2 +- Services/UserService.cs | 21 +++++++++++++++++++++ Services/UserStateService.cs | 21 --------------------- 8 files changed, 34 insertions(+), 38 deletions(-) create mode 100644 Services/UserService.cs delete mode 100644 Services/UserStateService.cs diff --git a/Media.cs b/Media.cs index 56d5f41..750aeb4 100644 --- a/Media.cs +++ b/Media.cs @@ -17,10 +17,6 @@ public class Media : HBObject { .Select(t => t.TagDefinition.Guid) .Contains(HBContext.IngestTag); - public bool IsNsfw => Tags - .Select(t => t.TagDefinition.Guid) - .Contains(HBContext.NsfwTag); - public string? DisplayName { get { if(ShortDescription is not null) diff --git a/Pages/Component/NsfwSwitch.razor b/Pages/Component/NsfwSwitch.razor index d4e809b..d0f499d 100644 --- a/Pages/Component/NsfwSwitch.razor +++ b/Pages/Component/NsfwSwitch.razor @@ -1,8 +1,8 @@ -@inject IUserStateService userState +@inject IUserService userService - + @code { private void ToggleNsfw(bool showNsfw) => - userState.ShowNsfw = showNsfw; + userService.ShowNsfw = showNsfw; } \ No newline at end of file diff --git a/Pages/Component/TagSelectDialog.razor b/Pages/Component/TagSelectDialog.razor index c7a7a49..e9f3295 100644 --- a/Pages/Component/TagSelectDialog.razor +++ b/Pages/Component/TagSelectDialog.razor @@ -1,6 +1,6 @@ @inject IDbContextFactory dbFactory @inject ITagService tagService -@inject IUserStateService userState +@inject IUserService userService @implements IDisposable @@ -64,7 +64,7 @@ public void Hide() => Visible = false; protected override void OnInitialized() { - userState.ShowNsfwChanged += ShowNsfwChanged; + userService.ShowNsfwChanged += ShowNsfwChanged; LoadTags(); } @@ -77,7 +77,7 @@ .Where(td => td.Source == TagSource.UserTag) .OrderBy(td => td.Name) .AsEnumerable() - .Where(td => userState.ShowNsfw || !tagService + .Where(td => userService.ShowNsfw || !tagService .GetAllTags(td) .Select(e => e.tagDefinition.Guid) .Contains(HBContext.NsfwTag)) diff --git a/Pages/Gallery.razor b/Pages/Gallery.razor index 7894fb7..41125fc 100644 --- a/Pages/Gallery.razor +++ b/Pages/Gallery.razor @@ -3,7 +3,7 @@ @inject IDbContextFactory dbFactory @inject ITagService tagService @inject ISearchService searchService -@inject IUserStateService userState +@inject IUserService userService @Title @@ -41,7 +41,7 @@ private Media[] Media; protected override void OnInitialized() => - userState.ShowNsfwChanged += ShowNsfwChanged; + userService.ShowNsfwChanged += ShowNsfwChanged; protected override void OnParametersSet() => LoadMedia(); @@ -64,7 +64,7 @@ .Where(m => m.IsIngest); // Filter both NSFW AND ingest images if we're not showing NSFW - if(!userState.ShowNsfw) { + if(!userService.ShowNsfw) { var nsfwTags = tagService.TagsThatImply(HBContext.NsfwTag) .Select(td => td.Guid) .ToArray(); diff --git a/Pages/TagDefinitions.razor b/Pages/TagDefinitions.razor index 455c4ac..892ca8a 100644 --- a/Pages/TagDefinitions.razor +++ b/Pages/TagDefinitions.razor @@ -1,7 +1,7 @@ @page "/TagDefinitions" @inject IDbContextFactory dbFactory @inject ITagService tagService -@inject IUserStateService userState +@inject IUserService userService Tag Definitions @@ -106,14 +106,14 @@ .OrderBy(td => td.Namespace) .ThenBy(td => td.Name) .AsEnumerable() - .Where(td => userState.ShowNsfw || !tagService + .Where(td => userService.ShowNsfw || !tagService .GetAllTags(td) .Select(td => td.tagDefinition.Guid) .Contains(HBContext.NsfwTag)) .ToArray(); protected override void OnInitialized() => - userState.ShowNsfwChanged += ShowNsfwChanged; + userService.ShowNsfwChanged += ShowNsfwChanged; private void CreateTagDefinition() { diff --git a/Program.cs b/Program.cs index 4a3be86..90375b0 100644 --- a/Program.cs +++ b/Program.cs @@ -20,7 +20,7 @@ public class Program { builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); - builder.Services.AddSingleton(); + builder.Services.AddSingleton(); var app = builder.Build(); diff --git a/Services/UserService.cs b/Services/UserService.cs new file mode 100644 index 0000000..d2abea3 --- /dev/null +++ b/Services/UserService.cs @@ -0,0 +1,21 @@ +namespace HyperBooru.Services; + +public interface IUserService { + public bool ShowNsfw { get; set; } + + public event EventHandler ShowNsfwChanged; +} + +public class UserService : IUserService { + public bool ShowNsfw { + get => showNsfw; + set { + showNsfw = value; + ShowNsfwChanged?.Invoke(this, value); + } + } + + public event EventHandler ShowNsfwChanged; + + private bool showNsfw = false; +} diff --git a/Services/UserStateService.cs b/Services/UserStateService.cs deleted file mode 100644 index dc742e1..0000000 --- a/Services/UserStateService.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace HyperBooru.Services; - -public interface IUserStateService { - public bool ShowNsfw { get; set; } - - public event EventHandler ShowNsfwChanged; -} - -public class UserStateService : IUserStateService { - public bool ShowNsfw { - get => showNsfw; - set { - showNsfw = value; - ShowNsfwChanged?.Invoke(this, value); - } - } - - public event EventHandler ShowNsfwChanged; - - private bool showNsfw = false; -} -- cgit v1.3