Browse Source

Silence more scope order warnings (#1604)

closed-social-v3
Matt Jankowski 7 years ago
committed by Eugen
parent
commit
323671a653
4 changed files with 4 additions and 4 deletions
  1. +1
    -1
      app/services/after_block_service.rb
  2. +1
    -1
      app/services/fan_out_on_write_service.rb
  3. +1
    -1
      app/services/mute_service.rb
  4. +1
    -1
      app/services/suspend_account_service.rb

+ 1
- 1
app/services/after_block_service.rb View File

@ -12,7 +12,7 @@ class AfterBlockService < BaseService
home_key = FeedManager.instance.key(:home, account.id)
redis.pipelined do
target_account.statuses.select('id').find_each do |status|
target_account.statuses.select('id').reorder(nil).find_each do |status|
redis.zrem(home_key, status.id)
end
end

+ 1
- 1
app/services/fan_out_on_write_service.rb View File

@ -34,7 +34,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).find_each do |follower|
status.account.followers.where(domain: nil).joins(:user).where('users.current_sign_in_at > ?', 14.days.ago).select(:id).reorder(nil).find_each do |follower|
FeedInsertWorker.perform_async(status.id, follower.id)
end
end

+ 1
- 1
app/services/mute_service.rb View File

@ -12,7 +12,7 @@ class MuteService < BaseService
def clear_home_timeline(account, target_account)
home_key = FeedManager.instance.key(:home, account.id)
target_account.statuses.select('id').find_each do |status|
target_account.statuses.select('id').reorder(nil).find_each do |status|
redis.zrem(home_key, status.id)
end
end

+ 1
- 1
app/services/suspend_account_service.rb View File

@ -12,7 +12,7 @@ class SuspendAccountService < BaseService
private
def purge_content
@account.statuses.find_each do |status|
@account.statuses.reorder(nil).find_each do |status|
RemoveStatusService.new.call(status)
end

Loading…
Cancel
Save