nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Store home feeds for 7 days instead of 14 (#7354) 

* Store home feeds for 7 days instead of 14

Reduces workload for status fan-out to active followers

* Fix test for user model
This commit is contained in:
Eugen Rochko 2018-05-05 00:54:24 +02:00 committed by GitHub
parent ef7d64c801
commit c73ce7b695
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -41,7 +41,7 @@ class User < ApplicationRecord
include Settings::Extend include Settings::Extend
include Omniauthable include Omniauthable
ACTIVE_DURATION = 14.days ACTIVE_DURATION = 7.days
devise :two_factor_authenticatable, devise :two_factor_authenticatable,
otp_secret_encryption_key: Rails.configuration.x.otp_secret otp_secret_encryption_key: Rails.configuration.x.otp_secret

4
app/services/fan_out_on_write_service.rb
View File

@ -37,7 +37,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).joins(:user).where('users.current_sign_in_at > ?', 14.days.ago).select(:id).reorder(nil).find_in_batches do |followers| status.account.followers.where(domain: nil).joins(:user).where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago).select(:id).reorder(nil).find_in_batches do |followers|
FeedInsertWorker.push_bulk(followers) do |follower| FeedInsertWorker.push_bulk(followers) do |follower|
[status.id, follower.id, :home] [status.id, follower.id, :home]
end end
@ -47,7 +47,7 @@ class FanOutOnWriteService < BaseService
def deliver_to_lists(status) def deliver_to_lists(status)
Rails.logger.debug "Delivering status #{status.id} to lists" Rails.logger.debug "Delivering status #{status.id} to lists"
status.account.lists.joins(account: :user).where('users.current_sign_in_at > ?', 14.days.ago).select(:id).reorder(nil).find_in_batches do |lists| status.account.lists.joins(account: :user).where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago).select(:id).reorder(nil).find_in_batches do |lists|
FeedInsertWorker.push_bulk(lists) do |list| FeedInsertWorker.push_bulk(lists) do |list|
[status.id, list.id, :list] [status.id, list.id, :list]
end end

2
spec/models/user_spec.rb
View File

@ -75,7 +75,7 @@ RSpec.describe User, type: :model do
describe 'inactive' do describe 'inactive' do
it 'returns a relation of inactive users' do it 'returns a relation of inactive users' do
specified = Fabricate(:user, current_sign_in_at: 15.days.ago) specified = Fabricate(:user, current_sign_in_at: 15.days.ago)
Fabricate(:user, current_sign_in_at: 13.days.ago) Fabricate(:user, current_sign_in_at: 6.days.ago)
expect(User.inactive).to match_array([specified]) expect(User.inactive).to match_array([specified])
end end