hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use #any? instead of #exists? when checking media attachments (#7570) 

If media_attachments are not loaded, SQL query is the same, but
the #exists? method performs SQL query even if preloaded
signup-info-prompt
Eugen Rochko 2018-05-21 16:01:16 +02:00 committed by GitHub
parent e583f110c3
commit 32d4372381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/batched_remove_status_service.rb
View File

@ -81,7 +81,7 @@ class BatchedRemoveStatusService < BaseService
redis.publish('timeline:public', payload) redis.publish('timeline:public', payload)
redis.publish('timeline:public:local', payload) if status.local? redis.publish('timeline:public:local', payload) if status.local?
if status.media_attachments.exists? if status.media_attachments.any?
redis.publish('timeline:public:media', payload) redis.publish('timeline:public:media', payload)
redis.publish('timeline:public:local:media', payload) if status.local? redis.publish('timeline:public:local:media', payload) if status.local?
end end

2
app/services/fan_out_on_write_service.rb
View File

@ -25,7 +25,7 @@ class FanOutOnWriteService < BaseService
return if status.reply? && status.in_reply_to_account_id != status.account_id return if status.reply? && status.in_reply_to_account_id != status.account_id
deliver_to_public(status) deliver_to_public(status)
deliver_to_media(status) if status.media_attachments.exists? deliver_to_media(status) if status.media_attachments.any?
end end
private private

2
app/services/remove_status_service.rb
View File

@ -20,7 +20,7 @@ class RemoveStatusService < BaseService
remove_reblogs remove_reblogs
remove_from_hashtags remove_from_hashtags
remove_from_public remove_from_public
remove_from_media if status.media_attachments.exists? remove_from_media if status.media_attachments.any?
remove_from_direct if status.direct_visibility? remove_from_direct if status.direct_visibility?
@status.destroy! @status.destroy!