From 64694de343737360e797a92a0a6c0e88695facda Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Sun, 20 Sep 2020 22:52:50 -0500 Subject: Monsterfork v1-style curated Federated timeline --- app/models/public_feed.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'app/models/public_feed.rb') diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb index 2839da5cb..afde8aa65 100644 --- a/app/models/public_feed.rb +++ b/app/models/public_feed.rb @@ -26,7 +26,8 @@ class PublicFeed < Feed scope.merge!(without_replies_scope) unless with_replies? 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!(remote_only_scope) if remote_only? + scope.merge!(curated_scope) unless remote_only? scope.merge!(account_filters_scope) if account? scope.merge!(media_only_scope) if media_only? @@ -79,6 +80,10 @@ class PublicFeed < Feed Status.remote end + def curated_scope + Status.curated + end + def without_replies_scope Status.without_replies end -- cgit