From 7fa6d4c81e9d1f22fd67a7cab2d70cba27d89275 Mon Sep 17 00:00:00 2001
From: Jpuc1143 <jaime.perez@uc.cl>
Date: Thu, 19 Jan 2023 23:28:52 -0300
Subject: Add "Allowed Tags" to Parental Controls

---
 MediaBrowser.Controller/Entities/BaseItem.cs           | 5 +++++
 MediaBrowser.Controller/Entities/InternalItemsQuery.cs | 4 ++++
 2 files changed, 9 insertions(+)

(limited to 'MediaBrowser.Controller/Entities')

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index f2c2007f7a..0cd9720549 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1607,6 +1607,11 @@ namespace MediaBrowser.Controller.Entities
                 return false;
             }
 
+            if (user.GetPreference(PreferenceKind.AllowedTags).Any() && !user.GetPreference(PreferenceKind.AllowedTags).Any(i => Tags.Contains(i, StringComparison.OrdinalIgnoreCase)))
+            {
+                return false;
+            }
+
             return true;
         }
 
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index a1e5319048..a51299284b 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -26,6 +26,7 @@ namespace MediaBrowser.Controller.Entities
             EnableTotalRecordCount = true;
             ExcludeArtistIds = Array.Empty<Guid>();
             ExcludeInheritedTags = Array.Empty<string>();
+            IncludeInheritedTags = Array.Empty<string>();
             ExcludeItemIds = Array.Empty<Guid>();
             ExcludeItemTypes = Array.Empty<BaseItemKind>();
             ExcludeTags = Array.Empty<string>();
@@ -95,6 +96,8 @@ namespace MediaBrowser.Controller.Entities
 
         public string[] ExcludeInheritedTags { get; set; }
 
+        public string[] IncludeInheritedTags { get; set; }
+
         public IReadOnlyList<string> Genres { get; set; }
 
         public bool? IsSpecialSeason { get; set; }
@@ -368,6 +371,7 @@ namespace MediaBrowser.Controller.Entities
             }
 
             ExcludeInheritedTags = user.GetPreference(PreferenceKind.BlockedTags);
+            IncludeInheritedTags = user.GetPreference(PreferenceKind.AllowedTags);
 
             User = user;
         }
-- 
cgit v1.2.3


From cb61a57e828f1e35b32cdb020a57bb4df35a5b3a Mon Sep 17 00:00:00 2001
From: Jpuc1143 <80900349+Jpuc1143@users.noreply.github.com>
Date: Thu, 9 Feb 2023 20:45:40 -0300
Subject: Reduced number of calls to GetPreference()

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 MediaBrowser.Controller/Entities/BaseItem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller/Entities')

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 0cd9720549..3d683052fe 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1607,7 +1607,8 @@ namespace MediaBrowser.Controller.Entities
                 return false;
             }
 
-            if (user.GetPreference(PreferenceKind.AllowedTags).Any() && !user.GetPreference(PreferenceKind.AllowedTags).Any(i => Tags.Contains(i, StringComparison.OrdinalIgnoreCase)))
+            var allowedTagsPreference = user.GetPreference(PreferenceKind.AllowedTags);
+            if (allowedTagsPreference.Any() && !allowedTagsPreference.Any(i => Tags.Contains(i, StringComparison.OrdinalIgnoreCase)))
             {
                 return false;
             }
-- 
cgit v1.2.3