revise opt-in tags

3 files changed, 7 insertions, 24 deletions

diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs
index ab76f4e67f..b6514ca0a6 100644
--- a/MediaBrowser.Controller/Channels/Channel.cs
+++ b/MediaBrowser.Controller/Channels/Channel.cs
@@ -74,7 +74,7 @@ namespace MediaBrowser.Controller.Channels
             return false;
         }
 
-        protected override bool IsTagFilterEnforced(TagFilterMode mode)
+        protected override bool IsAllowTagFilterEnforced()
         {
             return false;
         }
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 75a09a7b04..89706f9177 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1080,31 +1080,14 @@ namespace MediaBrowser.Controller.Entities
 
             if (hasTags != null)
             {
-                if (user.Policy.TagFilters.Any(i => !IsTagFilterAccepted(hasTags, i)))
+                var policy = user.Policy;
+                if (policy.BlockedTags.Any(i => hasTags.Tags.Contains(i, StringComparer.OrdinalIgnoreCase)))
                 {
                     return false;
                 }
-            }
-
-            return true;
-        }
-
-        private bool IsTagFilterAccepted(IHasTags hasTags, TagFilter filter)
-        {
-            if (IsTagFilterEnforced(filter.Mode))
-            {
-                if (filter.Mode == TagFilterMode.Block)
-                {
-                    // If content has the tag, it's not allowed
-                    if (hasTags.Tags.Contains(filter.Tag, StringComparer.OrdinalIgnoreCase))
-                    {
-                        return false;
-                    }
-                }
-                else if (filter.Mode == TagFilterMode.Allow)
+                if (policy.AllowedTags.Length > 0 && IsAllowTagFilterEnforced())
                 {
-                    // If content doesn't have the tag, it's not allowed
-                    if (!hasTags.Tags.Contains(filter.Tag, StringComparer.OrdinalIgnoreCase))
+                    if (policy.AllowedTags.Any(i => !hasTags.Tags.Contains(i, StringComparer.OrdinalIgnoreCase)))
                     {
                         return false;
                     }
@@ -1114,7 +1097,7 @@ namespace MediaBrowser.Controller.Entities
             return true;
         }
 
-        protected virtual bool IsTagFilterEnforced(TagFilterMode mode)
+        protected virtual bool IsAllowTagFilterEnforced()
         {
             return true;
         }
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index fe9bea53b1..0d9bb03acf 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -80,7 +80,7 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        protected override bool IsTagFilterEnforced(TagFilterMode mode)
+        protected override bool IsAllowTagFilterEnforced()
         {
             if (this is ICollectionFolder)
             {