Fix timeout on invalid set of exclusionary parameters in /api/v1/timelines/public (#26239)

2023-08-23 10:50:23 -03:00
parent b91724fb9d
commit f337008819
2 changed files with 9 additions and 2 deletions
--- a/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@@ -45,11 +45,11 @@ class PublicFeed
  end

  def local_only?
-    options[:local]
+    options[:local] && !options[:remote]
  end

  def remote_only?
-    options[:remote]
+    options[:remote] && !options[:local]
  end

  def account?