From a440be4df759c7d317c1574ce1132fab807494f2 Mon Sep 17 00:00:00 2001
From: Jake Mannens <jake@asger.xyz>
Date: Sun, 17 Sep 2023 22:51:50 +1000
Subject: Consolidated user session state and made it persistent across all
 scopes pertaining to a session

---
 Pages/Gallery.razor | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Pages/Gallery.razor')

diff --git a/Pages/Gallery.razor b/Pages/Gallery.razor
index d473c28..762ef7f 100644
--- a/Pages/Gallery.razor
+++ b/Pages/Gallery.razor
@@ -10,7 +10,7 @@
 
 <PageTitle>@Title</PageTitle>
 
-@if(Ingest && !userService.ShowNsfw) {
+@if(Ingest && !userService.UserSessionState.ShowNsfw) {
     <div id="ingest-warning">
         <p><center>Ingest feed is not available unless NSFW mode is enabled!</center></p>
         <p><center><i>You must enable NSFW mode to continue...</i></center></p>
@@ -68,7 +68,7 @@
     private IEnumerator<Media> mediaEnumerator;
 
     protected override void OnInitialized() =>
-        userService.ShowNsfwChanged += ShowNsfwChanged;
+        userService.UserSessionState.OnStateChange += ShowNsfwChanged;
 
     protected override void OnParametersSet() => LoadMedia();
 
@@ -124,7 +124,7 @@
                 break;
             Media? m = enumerator.Current;
 
-            if(!userService.ShowNsfw)
+            if(!userService.UserSessionState.ShowNsfw)
                 if(m.Tags.Select(t => t.TagDefinitionId).Intersect(nsfwTags).Any() || m.IsIngest)
                     continue;
 
@@ -135,7 +135,7 @@
         }
     }
 
-    private async void ShowNsfwChanged(object? sender, bool showNsfw) {
+    private async void ShowNsfwChanged(UserSessionState userSessionState) {
         await InvokeAsync(() => {
             LoadMedia();
             StateHasChanged();
@@ -144,6 +144,6 @@
 
     public void Dispose() {
         mediaEnumerator.Dispose();
-        userService.ShowNsfwChanged -= ShowNsfwChanged;
+        userService.UserSessionState.OnStateChange -= ShowNsfwChanged;
     }
 }
-- 
cgit v1.3