From 4f1d8636154d8f445eadec5ce3906f06324b0176 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 24 Nov 2016 18:17:58 +0100 Subject: [PATCH] Only distribute statuses to followers who signed in in the last 2 weeks, add rake task for clearing feeds of inactive users --- app/services/fan_out_on_write_service.rb | 2 +- config/environments/production.rb | 3 ++- lib/tasks/mastodon.rake | 10 +++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index 78cb0b13f..78301c6ca 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -24,7 +24,7 @@ class FanOutOnWriteService < BaseService def deliver_to_followers(status) Rails.logger.debug "Delivering status #{status.id} to followers" - status.account.followers.where(domain: nil).find_each do |follower| + status.account.followers.where(domain: nil).joins(:user).where('users.current_sign_in_at > ?', 14.days.ago).find_each do |follower| next if FeedManager.instance.filter?(:home, status, follower) FeedManager.instance.push(:home, follower, status) end diff --git a/config/environments/production.rb b/config/environments/production.rb index 7f13fcf6b..dcb659d6c 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -50,7 +50,8 @@ Rails.application.configure do host: ENV.fetch('REDIS_HOST') { 'localhost' }, port: ENV.fetch('REDIS_PORT') { 6379 }, db: 0, - namespace: 'cache' + namespace: 'cache', + expires_in: 20.minutes } # Enable serving of images, stylesheets, and JavaScripts from an asset server. diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index 58bafff66..93461bd0a 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -36,8 +36,16 @@ namespace :mastodon do end namespace :feeds do - desc 'Clears all timelines so that they would be regenerated on next hit' + desc 'Clear timelines of inactive users' task clear: :environment do + User.where('current_sign_in_at < ?', 14.days.ago).find_each do |user| + Redis.current.del(FeedManager.instance.key(:home, user.account_id)) + Redis.current.del(FeedManager.instance.key(:mentions, user.account_id)) + end + end + + desc 'Clears all timelines so that they would be regenerated on next hit' + task clear_all: :environment do Redis.current.keys('feed:*').each { |key| Redis.current.del(key) } end end