Only distribute statuses to followers who signed in in the last 2 weeks, add rake task for clearing feeds of inactive users

rebase/4.0.0rc2
Eugen Rochko 2016-11-24 18:17:58 +01:00
parent 7baca3fe4d
commit 4f1d863615
3 changed files with 12 additions and 3 deletions

View File

@ -24,7 +24,7 @@ class FanOutOnWriteService < BaseService
def deliver_to_followers(status) def deliver_to_followers(status)
Rails.logger.debug "Delivering status #{status.id} to followers" 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) next if FeedManager.instance.filter?(:home, status, follower)
FeedManager.instance.push(:home, follower, status) FeedManager.instance.push(:home, follower, status)
end end

View File

@ -50,7 +50,8 @@ Rails.application.configure do
host: ENV.fetch('REDIS_HOST') { 'localhost' }, host: ENV.fetch('REDIS_HOST') { 'localhost' },
port: ENV.fetch('REDIS_PORT') { 6379 }, port: ENV.fetch('REDIS_PORT') { 6379 },
db: 0, db: 0,
namespace: 'cache' namespace: 'cache',
expires_in: 20.minutes
} }
# Enable serving of images, stylesheets, and JavaScripts from an asset server. # Enable serving of images, stylesheets, and JavaScripts from an asset server.

View File

@ -36,8 +36,16 @@ namespace :mastodon do
end end
namespace :feeds do 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 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) } Redis.current.keys('feed:*').each { |key| Redis.current.del(key) }
end end
end end