Lists redis clean-up (#5886)

* When list is deleted, remove feed from redis

* Clean up list feeds of inactive users

2 files changed, 49 insertions, 10 deletions

diff --git a/app/models/list.rb b/app/models/list.rb
index 5d7ba0065..910864b26 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -19,4 +19,23 @@ class List < ApplicationRecord
   has_many :accounts, through: :list_accounts
 
   validates :title, presence: true
+
+  before_destroy :clean_feed_manager
+
+  private
+
+  def clean_feed_manager
+    reblog_key       = FeedManager.instance.key(:list, id, 'reblogs')
+    reblogged_id_set = Redis.current.zrange(reblog_key, 0, -1)
+
+    Redis.current.pipelined do
+      Redis.current.del(FeedManager.instance.key(:list, id))
+      Redis.current.del(reblog_key)
+
+      reblogged_id_set.each do |reblogged_id|
+        reblog_set_key = FeedManager.instance.key(:list, id, "reblogs:#{reblogged_id}")
+        Redis.current.del(reblog_set_key)
+      end
+    end
+  end
 end
diff --git a/app/workers/scheduler/feed_cleanup_scheduler.rb b/app/workers/scheduler/feed_cleanup_scheduler.rb
index cfa2d31a4..23fa7672b 100644
--- a/app/workers/scheduler/feed_cleanup_scheduler.rb
+++ b/app/workers/scheduler/feed_cleanup_scheduler.rb
@@ -5,16 +5,30 @@ class Scheduler::FeedCleanupScheduler
   include Sidekiq::Worker
 
   def perform
+    clean_home_feeds!
+    clean_list_feeds!
+  end
+
+  private
+
+  def clean_home_feeds!
+    clean_feeds!(inactive_account_ids, :home)
+  end
+
+  def clean_list_feeds!
+    clean_feeds!(inactive_list_ids, :list)
+  end
+
+  def clean_feeds!(ids, type)
     reblogged_id_sets = {}
-    feedmanager = FeedManager.instance
 
     redis.pipelined do
-      inactive_user_ids.each do |account_id|
-        redis.del(feedmanager.key(:home, account_id))
-        reblog_key = feedmanager.key(:home, account_id, 'reblogs')
+      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[account_id] = redis.zrange(reblog_key, 0, -1)
+        reblogged_id_sets[feed_id] = redis.zrange(reblog_key, 0, -1)
         redis.del(reblog_key)
       end
     end
@@ -22,19 +36,25 @@ class Scheduler::FeedCleanupScheduler
     # Remove all of the reblog tracking keys we just removed the
     # references to.
     redis.pipelined do
-      reblogged_id_sets.each do |account_id, future|
+      reblogged_id_sets.each do |feed_id, future|
         future.value.each do |reblogged_id|
-          reblog_set_key = feedmanager.key(:home, account_id, "reblogs:#{reblogged_id}")
+          reblog_set_key = feed_manager.key(type, feed_id, "reblogs:#{reblogged_id}")
           redis.del(reblog_set_key)
         end
       end
     end
   end
 
-  private
+  def inactive_account_ids
+    @inactive_account_ids ||= User.confirmed.inactive.pluck(:account_id)
+  end
+
+  def inactive_list_ids
+    List.where(account_id: inactive_account_ids).pluck(:id)
+  end
 
-  def inactive_user_ids
-    @inactive_user_ids ||= User.confirmed.inactive.pluck(:account_id)
+  def feed_manager
+    FeedManager.instance
   end
 
   def redis