diff options
Diffstat (limited to 'Pages/Gallery.razor')
| -rw-r--r-- | Pages/Gallery.razor | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Pages/Gallery.razor b/Pages/Gallery.razor index 695f2f7..62d1a27 100644 --- a/Pages/Gallery.razor +++ b/Pages/Gallery.razor @@ -40,6 +40,8 @@ using var db = dbFactory.CreateDbContext(); IEnumerable<Media> media = db.Media + .Include(m => m.Tags) + .ThenInclude(t => t.TagDefinition) .OrderByDescending(m => m.ObjectId) .ToArray(); @@ -53,10 +55,15 @@ .Where(m => m.IsIngest); // Filter both NSFW AND ingest images if we're not showing NSFW - if(!userState.ShowNsfw) + if(!userState.ShowNsfw) { + var nsfwTags = tagService.TagsThatImply(HBContext.NsfwTag) + .Select(td => td.Guid) + .ToArray(); media = media .AsEnumerable() - .Where(m => !m.IsNsfw && !m.IsIngest); + .Where(m => !m.Tags.Select(t => t.TagDefinition.Guid).Intersect(nsfwTags).Any()) + .Where(m => !m.IsIngest); + } Media = media.ToArray(); } |