diff options
Diffstat (limited to 'Pages/Component')
| -rw-r--r-- | Pages/Component/TagSelectDialog.razor | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Pages/Component/TagSelectDialog.razor b/Pages/Component/TagSelectDialog.razor index f21d570..9008cc8 100644 --- a/Pages/Component/TagSelectDialog.razor +++ b/Pages/Component/TagSelectDialog.razor @@ -76,14 +76,20 @@ var selected = SelectedTags.Select(td => td.Guid); + int[] nsfwTags = Array.Empty<int>(); + if(!userService.ShowNsfw) + nsfwTags = tagService.TagsThatImply(HBContext.NsfwTag) + .Select(td => td.ObjectId) + .ToArray(); + tagDefinitions = db.TagDefinitions + .Include(td => td.ImplicitTags) .Where(td => td.Source == TagSource.UserTag) .OrderBy(td => td.Name) .AsEnumerable() - .Where(td => userService.ShowNsfw || !tagService - .GetAllTags(td) - .Select(e => e.tagDefinition.Guid) - .Contains(HBContext.NsfwTag)) + .Where(td => userService.ShowNsfw || !td.ImplicitTags + .IntersectBy(nsfwTags, td => td.ObjectId) + .Any()) .Select(td => new Tuple<TagDefinition, bool>( td, selected.Contains(td.Guid)).ToValueTuple()) |