From 344f8544bc756be2f403754d995621d72f193ed7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 27 Mar 2024 12:26:17 -0400
Subject: [PATCH] Only call all/none from TagFeed when present

---
 app/models/tag_feed.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/tag_feed.rb b/app/models/tag_feed.rb
index 6b5831d246c..cd7f9e42cc1 100644
--- a/app/models/tag_feed.rb
+++ b/app/models/tag_feed.rb
@@ -26,8 +26,8 @@ class TagFeed < PublicFeed
     scope = public_scope
 
     scope.merge!(tagged_with_any_scope)
-    scope.merge!(tagged_with_all_scope)
-    scope.merge!(tagged_with_none_scope)
+    scope.merge!(tagged_with_all_scope) if options[:all].present?
+    scope.merge!(tagged_with_none_scope) if options[:none].present?
     scope.merge!(local_only_scope) if local_only?
     scope.merge!(remote_only_scope) if remote_only?
     scope.merge!(account_filters_scope) if account?