From 323671a653e22704f0d50be13d67bf6fe6ee3a2a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Wed, 12 Apr 2017 09:58:08 -0400
Subject: [PATCH] Silence more scope order warnings (#1604)
---
app/services/after_block_service.rb | 2 +-
app/services/fan_out_on_write_service.rb | 2 +-
app/services/mute_service.rb | 2 +-
app/services/suspend_account_service.rb | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/services/after_block_service.rb b/app/services/after_block_service.rb
index 0f478bcb7d..d1a846f21c 100644
--- a/app/services/after_block_service.rb
+++ b/app/services/after_block_service.rb
@@ -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
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 19eedc0a75..055fda8a9b 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -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
diff --git a/app/services/mute_service.rb b/app/services/mute_service.rb
index 0050cfc8d0..1a650ed2a0 100644
--- a/app/services/mute_service.rb
+++ b/app/services/mute_service.rb
@@ -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
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index 8528ef62af..42ff4dcb78 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -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