diff options
author | Claire <claire.github-309c@sitedethib.com> | 2020-12-23 01:47:45 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-23 01:47:45 +0100 |
commit | 537afa00f35dbaa98cbff284683317b411104a82 (patch) | |
tree | d71a57d5f5b6bd864ec11cc1c914a6c3b30ba612 /app/models/account.rb | |
parent | 81f4c550b2ed305f39f344d10289b38625f70bf7 (diff) | |
parent | 444b21b55ff5768e4cbbaf7cfa8285c65a4b54f9 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/lib/feed_manager.rb`: Not a real conflict, glitch-soc-only DM-related method too close to changed upstream stuff. Ported upstream changes. - `app/services/batched_remove_status_service.rb`: Additional logic in glitch-soc to clear DMs from timelines. Ported upstream changes and fixed the DM TL clearing logic. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Additional code in glitch-soc to clear DM timelines. Ported upstream changes.
Diffstat (limited to 'app/models/account.rb')
-rw-r--r-- | app/models/account.rb | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 840ec4c62..f6aba74c6 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -580,17 +580,6 @@ class Account < ApplicationRecord end def clean_feed_manager - reblog_key = FeedManager.instance.key(:home, id, 'reblogs') - reblogged_id_set = Redis.current.zrange(reblog_key, 0, -1) - - Redis.current.pipelined do - Redis.current.del(FeedManager.instance.key(:home, id)) - Redis.current.del(reblog_key) - - reblogged_id_set.each do |reblogged_id| - reblog_set_key = FeedManager.instance.key(:home, id, "reblogs:#{reblogged_id}") - Redis.current.del(reblog_set_key) - end - end + FeedManager.instance.clean_feeds!(:home, [id]) end end |