From f64d0b64918e0c2955d8519dd563563c69452bd4 Mon Sep 17 00:00:00 2001
From: Jake Mannens <jake@asger.xyz>
Date: Tue, 22 Aug 2023 23:55:38 +1000
Subject: Fixed ingest toggle button Gallery now filters out ingest media if
 now showing NSFW

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

(limited to 'Pages/Gallery.razor')

diff --git a/Pages/Gallery.razor b/Pages/Gallery.razor
index b07c5e3..695f2f7 100644
--- a/Pages/Gallery.razor
+++ b/Pages/Gallery.razor
@@ -27,7 +27,7 @@
 
     [Parameter]
     [SupplyParameterFromQuery]
-    public bool? Ingest { get; set; }
+    public bool Ingest { get; set; } = false;
 
     private Media[] Media;
 
@@ -47,18 +47,16 @@
             media = searchService.Search(Query)
                 .OrderByDescending(m => m.ObjectId);
 
-        if(Ingest is not null && Ingest == true) {
+        if(Ingest)
             media = media
                 .AsEnumerable()
                 .Where(m => m.IsIngest);
-        }
 
+        // Filter both NSFW AND ingest images if we're not showing NSFW
         if(!userState.ShowNsfw)
             media = media
                 .AsEnumerable()
-                .Where(m => !tagService.GetAllTags(m)
-                    .Select(e => e.tagDefinition.Guid)
-                    .Contains(HBContext.NsfwTag));
+                .Where(m => !m.IsNsfw && !m.IsIngest);
 
         Media = media.ToArray();
     }
-- 
cgit v1.3