From 97d578eebdcbbc4705a303e8923e0332651890c1 Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Sun, 20 Sep 2020 23:46:30 -0500 Subject: Do not apply curated view on local timeline --- app/models/public_feed.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/public_feed.rb') 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? -- cgit