diff options
| -rw-r--r-- | Media.cs | 4 | ||||
| -rw-r--r-- | Pages/Component/NsfwSwitch.razor | 6 | ||||
| -rw-r--r-- | Pages/Component/TagSelectDialog.razor | 6 | ||||
| -rw-r--r-- | Pages/Gallery.razor | 6 | ||||
| -rw-r--r-- | Pages/TagDefinitions.razor | 6 | ||||
| -rw-r--r-- | Program.cs | 2 | ||||
| -rw-r--r-- | Services/UserService.cs (renamed from Services/UserStateService.cs) | 4 |
7 files changed, 15 insertions, 19 deletions
@@ -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 -<Switch InitialValue=userState.ShowNsfw OnToggle=ToggleNsfw/> +<Switch InitialValue=userService.ShowNsfw OnToggle=ToggleNsfw/> @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<HBContext> dbFactory @inject ITagService tagService -@inject IUserStateService userState +@inject IUserService userService @implements IDisposable <link rel="stylesheet" href="@(nameof(HyperBooru)).styles.css"/> @@ -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<HBContext> dbFactory @inject ITagService tagService @inject ISearchService searchService -@inject IUserStateService userState +@inject IUserService userService <PageTitle>@Title</PageTitle> @@ -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<HBContext> dbFactory @inject ITagService tagService -@inject IUserStateService userState +@inject IUserService userService <PageTitle>Tag Definitions</PageTitle> @@ -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() { @@ -20,7 +20,7 @@ public class Program { builder.Services.AddScoped<ISearchService, SearchService>(); builder.Services.AddScoped<ITagService, TagService>(); builder.Services.AddScoped<IMediaService, MediaService>(); - builder.Services.AddSingleton<IUserStateService, UserStateService>(); + builder.Services.AddSingleton<IUserService, UserService>(); var app = builder.Build(); diff --git a/Services/UserStateService.cs b/Services/UserService.cs index dc742e1..d2abea3 100644 --- a/Services/UserStateService.cs +++ b/Services/UserService.cs @@ -1,12 +1,12 @@ namespace HyperBooru.Services; -public interface IUserStateService { +public interface IUserService { public bool ShowNsfw { get; set; } public event EventHandler<bool> ShowNsfwChanged; } -public class UserStateService : IUserStateService { +public class UserService : IUserService { public bool ShowNsfw { get => showNsfw; set { |