From 189688cd615e3e9734e4690eb39794c29cd24c21 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 ++++------
 Pages/Upload.razor    |  9 ++++-----
 Pages/ViewMedia.razor |  4 +++-
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'Pages')

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();
     }
diff --git a/Pages/Upload.razor b/Pages/Upload.razor
index c139aef..a9a1667 100644
--- a/Pages/Upload.razor
+++ b/Pages/Upload.razor
@@ -4,8 +4,7 @@
 
 <div id="dropzone">
     <p>Drag a file to upload it</p>
-    <input type="file" accept="image/*"/>
-</div>
-
-@code {
-}
\ No newline at end of file
+    <form id="upload" action="/media" method="post" enctype="multipart/form-data">
+        <input type="file" id="myFile" name="filename" accept="image/*,video/*"/>
+    </form>
+</div>
\ No newline at end of file
diff --git a/Pages/ViewMedia.razor b/Pages/ViewMedia.razor
index 68e6d70..fe73c7d 100644
--- a/Pages/ViewMedia.razor
+++ b/Pages/ViewMedia.razor
@@ -114,7 +114,6 @@
     }
 
     private void AddTags(TagDefinition[] tagDefs) {
-        Console.WriteLine($"Adding tags: {string.Join(", ", tagDefs.Select(td => td.Name))}");
         foreach(var tagDef in tagDefs)
             tagService.AddTag(media, tagDef);
         mediaTagTable.Refresh();
@@ -122,6 +121,9 @@
 
     private void SetIngest(bool ingest) {
         mediaService.SetIngest(media, ingest);
+        // TODO: fix this hacky method of reloading the media entity
+        db.Entry(media).State = EntityState.Detached;
+        media = db.Media.First(m => m.Guid == media.Guid);
         StateHasChanged();
     }
 
-- 
cgit v1.3