diff options
Diffstat (limited to 'app/services/revoke_status_service.rb')
| -rw-r--r-- | app/services/revoke_status_service.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/services/revoke_status_service.rb b/app/services/revoke_status_service.rb index b7d7a6e18..95810acd2 100644 --- a/app/services/revoke_status_service.rb +++ b/app/services/revoke_status_service.rb @@ -12,7 +12,7 @@ class RevokeStatusService < BaseService @status = status @account = status.account @account_ids = account_ids - @mentions = status.active_mentions.where(account_id: account_ids) + @mentions = status.mentions.where(account_id: account_ids) @reblogs = status.reblogs.where(account_id: account_ids) RedisLock.acquire(lock_options) do |lock| @@ -21,7 +21,7 @@ class RevokeStatusService < BaseService remove_from_lists remove_from_affected remove_reblogs - remove_from_hashtags unless @status.distributable? + remove_from_hashtags remove_from_public remove_from_media remove_from_direct if status.direct_visibility? @@ -62,7 +62,7 @@ class RevokeStatusService < BaseService featured_tag.decrement(@status.id) end - return unless @status.public_visibility? + return unless @status.distributable? @tags.each do |hashtag| redis.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}", @payload) @@ -71,7 +71,7 @@ class RevokeStatusService < BaseService end def remove_from_public - return if @status.public_visibility? + return if @status.distributable? redis.publish('timeline:public', @payload) if @status.local? @@ -82,7 +82,7 @@ class RevokeStatusService < BaseService end def remove_from_media - return if @status.public_visibility? + return if @status.distributable? redis.publish('timeline:public:media', @payload) if @status.local? |