mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 21:15:05 +01:00
Code Issues Projects Releases Wiki Activity

Silence more scope order warnings (#1604)

Browse Source
This commit is contained in:
Matt Jankowski 2017-04-12 09:58:08 -04:00 committed by Eugen
parent b155e6ccf5
commit 323671a653
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/after_block_service.rb
View File

@ -12,7 +12,7 @@ class AfterBlockService < BaseService
home_key = FeedManager.instance.key(:home, account.id) home_key = FeedManager.instance.key(:home, account.id)
redis.pipelined do 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) redis.zrem(home_key, status.id)
end end
end end

2
app/services/fan_out_on_write_service.rb
View File

@ -34,7 +34,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).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) FeedInsertWorker.perform_async(status.id, follower.id)
end end
end end

2
app/services/mute_service.rb
View File

@ -12,7 +12,7 @@ class MuteService < BaseService
def clear_home_timeline(account, target_account) def clear_home_timeline(account, target_account)
home_key = FeedManager.instance.key(:home, account.id) 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) redis.zrem(home_key, status.id)
end end
end end

2
app/services/suspend_account_service.rb
View File

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