Fix emoji reaction streaming
This commit is contained in:
parent
9ea0d28d77
commit
503a24967d
5 changed files with 11 additions and 30 deletions
|
@ -6,23 +6,21 @@ class DeliveryEmojiReactionWorker
|
|||
include Lockable
|
||||
include AccountScope
|
||||
|
||||
def perform(payload_json, emoji_reaction_id, _status_id, _my_account_id = nil)
|
||||
emoji_reaction = EmojiReaction.find(emoji_reaction_id)
|
||||
status = emoji_reaction&.status
|
||||
def perform(payload_json, emoji_reaction_id, status_id, _my_account_id = nil)
|
||||
emoji_reaction = emoji_reaction_id ? EmojiReaction.find(emoji_reaction_id) : nil
|
||||
status = Status.find(status_id)
|
||||
|
||||
if status.present?
|
||||
return if status.account.excluded_from_timeline_domains.include?(emoji_reaction.account.domain)
|
||||
|
||||
scope = scope_status(status)
|
||||
|
||||
policy = status.account.emoji_reaction_policy
|
||||
return if policy == :block_and_hide
|
||||
|
||||
scope = scope.merge(policy_scope(status.account)) unless policy == :allow
|
||||
|
||||
scope.includes(:user).find_each do |account|
|
||||
next unless (account.user.nil? || (!account.user&.setting_stop_emoji_reaction_streaming && !account.user&.setting_enable_emoji_reaction)) && redis.exists?("subscribed:timeline:#{account.id}")
|
||||
next if account.excluded_from_timeline_domains.include?(emoji_reaction.account.domain)
|
||||
next if account.user.present? && (account.user.setting_stop_emoji_reaction_streaming || !account.user.setting_enable_emoji_reaction)
|
||||
next unless redis.exists?("subscribed:timeline:#{account.id}")
|
||||
next if emoji_reaction.present? && account.excluded_from_timeline_domains.include?(emoji_reaction.account.domain)
|
||||
next if policy != :allow && !status.account.show_emoji_reaction?(account)
|
||||
|
||||
redis.publish("timeline:#{account.id}", payload_json)
|
||||
end
|
||||
|
@ -32,21 +30,4 @@ class DeliveryEmojiReactionWorker
|
|||
rescue ActiveRecord::RecordNotFound
|
||||
true
|
||||
end
|
||||
|
||||
def policy_scope(account)
|
||||
case account.emoji_reaction_policy
|
||||
when :blocked, :block_and_hide
|
||||
nil
|
||||
when :followees_only
|
||||
account.following
|
||||
when :followers_only
|
||||
account.followers
|
||||
when :mutuals_only
|
||||
account.mutuals
|
||||
when :outside_only
|
||||
Account.where(id: account.following.pluck(:id) + account.followers.pluck(:id))
|
||||
else
|
||||
Account
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue