about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-09-20 23:46:30 -0500
committerFire Demon <firedemon@creature.cafe>2020-09-20 23:46:30 -0500
commit97d578eebdcbbc4705a303e8923e0332651890c1 (patch)
tree1c810eb4e4b6f23ca35eceb05d5ae0af80e3f62b /app/models
parent7be95a5dae20650419cf67e1f1e810e5907c46ff (diff)
Do not apply curated view on local timeline
Diffstat (limited to 'app/models')
-rw-r--r--app/models/public_feed.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb
index afde8aa65..7418a1c9d 100644
--- a/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@@ -27,7 +27,7 @@ class PublicFeed < Feed
     scope.merge!(without_reblogs_scope) unless with_reblogs?
     scope.merge!(local_only_scope) if local_only?
     #scope.merge!(remote_only_scope) if remote_only?
-    scope.merge!(curated_scope) unless remote_only?
+    scope.merge!(curated_scope) unless local_only? || remote_only?
     scope.merge!(account_filters_scope) if account?
     scope.merge!(media_only_scope) if media_only?