Procházet zdrojové kódy

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
master
Eugen Rochko před 6 roky
committed by GitHub
rodič
revize
c73ce7b695
V databázi nebyl nalezen žádný známý klíč pro tento podpis ID GPG klíče: 4AEE18F83AFDEB23
3 změnil soubory, kde provedl 4 přidání a 4 odebrání
  1. +1
    -1
      app/models/user.rb
  2. +2
    -2
      app/services/fan_out_on_write_service.rb
  3. +1
    -1
      spec/models/user_spec.rb

+ 1
- 1
app/models/user.rb Zobrazit soubor

@@ -41,7 +41,7 @@ class User < ApplicationRecord
include Settings::Extend
include Omniauthable

ACTIVE_DURATION = 14.days
ACTIVE_DURATION = 7.days

devise :two_factor_authenticatable,
otp_secret_encryption_key: Rails.configuration.x.otp_secret


+ 2
- 2
app/services/fan_out_on_write_service.rb Zobrazit soubor

@@ -37,7 +37,7 @@ class FanOutOnWriteService < BaseService
def deliver_to_followers(status)
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|
[status.id, follower.id, :home]
end
@@ -47,7 +47,7 @@ class FanOutOnWriteService < BaseService
def deliver_to_lists(status)
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|
[status.id, list.id, :list]
end


+ 1
- 1
spec/models/user_spec.rb Zobrazit soubor

@@ -75,7 +75,7 @@ RSpec.describe User, type: :model do
describe 'inactive' do
it 'returns a relation of inactive users' do
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])
end


Načítá se…
Zrušit
Uložit