alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-03 23:36:38 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix tag checks

Browse Source
This commit is contained in:
Shadowghost
2026-01-31 23:44:07 +01:00
parent 2789532aa8
commit 09a729effe
5 changed files with 81 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -1671,16 +1671,26 @@ namespace MediaBrowser.Controller.Entities
private bool IsVisibleViaTags(User user, bool skipAllowedTagsCheck)
{
var allowedTagsPreference = user.GetPreference(PreferenceKind.AllowedTags);
var blockedTagsPreference = user.GetPreference(PreferenceKind.BlockedTags);
var needsTagCheck = allowedTagsPreference.Length > 0 || blockedTagsPreference.Length > 0;
if (!needsTagCheck)
var blockedTags = user.GetPreference(PreferenceKind.BlockedTags);
var allowedTags = user.GetPreference(PreferenceKind.AllowedTags);
if (blockedTags.Length == 0 && allowedTags.Length == 0)
{
return true;
}
var allTags = GetInheritedTags();
if (blockedTagsPreference.Any(i => allTags.Contains(i, StringComparison.OrdinalIgnoreCase)))
// Normalize tags using the same logic as database queries
var normalizedBlockedTags = blockedTags
.Where(t => !string.IsNullOrWhiteSpace(t))
.Select(t => t.GetCleanValue())
.ToHashSet(StringComparer.Ordinal);
var normalizedItemTags = GetInheritedTags()
.Select(t => t.GetCleanValue())
.ToHashSet(StringComparer.Ordinal);
// Check blocked tags - item is hidden if it has any blocked tag
if (normalizedBlockedTags.Overlaps(normalizedItemTags))
{
return false;
}
@@ -1691,9 +1701,18 @@ namespace MediaBrowser.Controller.Entities
return true;
}
if (!skipAllowedTagsCheck && !allowedTagsPreference.Any(i => allTags.Contains(i, StringComparison.OrdinalIgnoreCase)))
// Check allowed tags - item must have at least one allowed tag
if (!skipAllowedTagsCheck && allowedTags.Length > 0)
{
return false;
var normalizedAllowedTags = allowedTags
.Where(t => !string.IsNullOrWhiteSpace(t))
.Select(t => t.GetCleanValue())
.ToHashSet(StringComparer.Ordinal);
if (!normalizedAllowedTags.Overlaps(normalizedItemTags))
{
return false;
}
}
return true;