diff options
| author | Jake Mannens <jake@asger.xyz> | 2023-08-22 23:55:38 +1000 |
|---|---|---|
| committer | Jake Mannens <jake@asger.xyz> | 2023-08-22 23:55:38 +1000 |
| commit | f64d0b64918e0c2955d8519dd563563c69452bd4 (patch) | |
| tree | d9bb03c6ebad35a16e24cbd3858aab5fd892979c /Pages | |
| parent | 6cd1bd52992134e81e1b9bc57b90bd14a92ee56d (diff) | |
Fixed ingest toggle button
Gallery now filters out ingest media if now showing NSFW
Diffstat (limited to 'Pages')
| -rw-r--r-- | Pages/Gallery.razor | 10 | ||||
| -rw-r--r-- | Pages/ViewMedia.razor | 4 |
2 files changed, 7 insertions, 7 deletions
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/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(); } |