diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-09-08 16:01:55 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-09-08 16:26:47 +0200 |
commit | 9748f074a385fce5ad6913b1a22fb7ea9e7566db (patch) | |
tree | ccd775be4b73170fcbf45407b84ad35fc37fb853 /app/workers/feed_insert_worker.rb | |
parent | 437d71bddf967573df3912ee5976f7c5a5a7b4c7 (diff) | |
parent | 65760f59df46e388919a9f7ccba1958d967b2695 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/api/v1/timelines/public_controller.rb - app/lib/feed_manager.rb - app/models/status.rb - app/services/precompute_feed_service.rb - app/workers/feed_insert_worker.rb - spec/models/status_spec.rb All conflicts are due to upstream refactoring feed management and us having local-only toots on top of that. Rewrote local-only toots management for upstream's changes.
Diffstat (limited to 'app/workers/feed_insert_worker.rb')
-rw-r--r-- | app/workers/feed_insert_worker.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/workers/feed_insert_worker.rb b/app/workers/feed_insert_worker.rb index 546f5c0c2..fd35af562 100644 --- a/app/workers/feed_insert_worker.rb +++ b/app/workers/feed_insert_worker.rb @@ -29,13 +29,13 @@ class FeedInsertWorker end def feed_filtered? - # Note: Lists are a variation of home, so the filtering rules - # of home apply to both case @type - when :home, :list - FeedManager.instance.filter?(:home, @status, @follower.id) + when :home + FeedManager.instance.filter?(:home, @status, @follower) + when :list + FeedManager.instance.filter?(:list, @status, @list) when :direct - FeedManager.instance.filter?(:direct, @status, @account.id) + FeedManager.instance.filter?(:direct, @status, @account) end end |