diff options
author | ThibG <thib@sitedethib.com> | 2020-12-23 14:33:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-23 14:33:47 +0100 |
commit | 225c934a1b66e2fcbedbda7936666c1ca3c9a04b (patch) | |
tree | d71a57d5f5b6bd864ec11cc1c914a6c3b30ba612 /app/workers/scheduler/feed_cleanup_scheduler.rb | |
parent | 81f4c550b2ed305f39f344d10289b38625f70bf7 (diff) | |
parent | 537afa00f35dbaa98cbff284683317b411104a82 (diff) |
Merge pull request #1481 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/workers/scheduler/feed_cleanup_scheduler.rb')
-rw-r--r-- | app/workers/scheduler/feed_cleanup_scheduler.rb | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/app/workers/scheduler/feed_cleanup_scheduler.rb b/app/workers/scheduler/feed_cleanup_scheduler.rb index 99e3440fe..96c17c578 100644 --- a/app/workers/scheduler/feed_cleanup_scheduler.rb +++ b/app/workers/scheduler/feed_cleanup_scheduler.rb @@ -15,41 +15,15 @@ class Scheduler::FeedCleanupScheduler private def clean_home_feeds! - clean_feeds!(inactive_account_ids, :home) + feed_manager.clean_feeds!(:home, inactive_account_ids) end def clean_list_feeds! - clean_feeds!(inactive_list_ids, :list) + feed_manager.clean_feeds!(:list, inactive_list_ids) end def clean_direct_feeds! - clean_feeds!(inactive_account_ids, :direct) - end - - def clean_feeds!(ids, type) - reblogged_id_sets = {} - - redis.pipelined do - ids.each do |feed_id| - redis.del(feed_manager.key(type, feed_id)) - reblog_key = feed_manager.key(type, feed_id, 'reblogs') - # We collect a future for this: we don't block while getting - # it, but we can iterate over it later. - reblogged_id_sets[feed_id] = redis.zrange(reblog_key, 0, -1) - redis.del(reblog_key) - end - end - - # Remove all of the reblog tracking keys we just removed the - # references to. - redis.pipelined do - reblogged_id_sets.each do |feed_id, future| - future.value.each do |reblogged_id| - reblog_set_key = feed_manager.key(type, feed_id, "reblogs:#{reblogged_id}") - redis.del(reblog_set_key) - end - end - end + feed_manager.clean_feeds!(:direct, inactive_account_ids) end def inactive_account_ids |