diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-01-13 12:26:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-13 12:26:34 +0100 |
commit | afd0d424da4928b9e20a3c7a943f970252ed3a29 (patch) | |
tree | 98641aa5df145b1a025ff29940c2d8814f6b7b2f /app/lib/vacuum | |
parent | 932a22219ae99a285bdd0b69f02627f029327db3 (diff) | |
parent | b52dc5f69d27ce2fcc84b3929840f2d8704ae48a (diff) |
Merge pull request #2080 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/vacuum')
-rw-r--r-- | app/lib/vacuum/feeds_vacuum.rb | 8 | ||||
-rw-r--r-- | app/lib/vacuum/statuses_vacuum.rb | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/app/lib/vacuum/feeds_vacuum.rb b/app/lib/vacuum/feeds_vacuum.rb index 00b9fd646..b0246bc0d 100644 --- a/app/lib/vacuum/feeds_vacuum.rb +++ b/app/lib/vacuum/feeds_vacuum.rb @@ -10,14 +10,14 @@ class Vacuum::FeedsVacuum private def vacuum_inactive_home_feeds! - inactive_users.select(:id, :account_id).find_in_batches do |users| - feed_manager.clean_feeds!(:home, users.map(&:account_id)) + inactive_users.select(:id, :account_id).in_batches do |users| + feed_manager.clean_feeds!(:home, users.pluck(:account_id)) end end def vacuum_inactive_list_feeds! - inactive_users_lists.select(:id).find_in_batches do |lists| - feed_manager.clean_feeds!(:list, lists.map(&:id)) + inactive_users_lists.select(:id).in_batches do |lists| + feed_manager.clean_feeds!(:list, lists.ids) end end diff --git a/app/lib/vacuum/statuses_vacuum.rb b/app/lib/vacuum/statuses_vacuum.rb index d1c4e7197..28c087b1c 100644 --- a/app/lib/vacuum/statuses_vacuum.rb +++ b/app/lib/vacuum/statuses_vacuum.rb @@ -19,10 +19,7 @@ class Vacuum::StatusesVacuum # as the search index, must be handled first. statuses.direct_visibility .includes(mentions: :account) - .find_each do |status| - # TODO: replace temporary solution - call of private model method - status.send(:unlink_from_conversations) - end + .find_each(&:unlink_from_conversations!) remove_from_search_index(statuses.ids) if Chewy.enabled? # Foreign keys take care of most associated records for us. |