post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Remove DeliveryEmojiReactionWorker unused parameter

Browse source
This commit is contained in:
KMY 2023-09-13 07:35:26 +09:00
parent 8c437a4332
commit 1367b72fa3
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/lib/activitypub/activity/like.rb
View file

@ -111,7 +111,7 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
emoji_group = @original_status.emoji_reactions_grouped_by_name emoji_group = @original_status.emoji_reactions_grouped_by_name
.find { |reaction_group| reaction_group['name'] == emoji_reaction.name && (!reaction_group.key?(:domain) || reaction_group['domain'] == emoji_reaction.custom_emoji&.domain) } .find { |reaction_group| reaction_group['name'] == emoji_reaction.name && (!reaction_group.key?(:domain) || reaction_group['domain'] == emoji_reaction.custom_emoji&.domain) }
emoji_group['status_id'] = @original_status.id.to_s emoji_group['status_id'] = @original_status.id.to_s
DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), emoji_reaction.id, @original_status.id, emoji_reaction.account_id) DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), @original_status.id, emoji_reaction.account_id)
end end
def render_emoji_reaction(emoji_group) def render_emoji_reaction(emoji_group)

2
app/lib/activitypub/activity/undo.rb
View file

@ -149,7 +149,7 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
emoji_group = { 'name' => emoji_reaction.name, 'count' => 0, 'account_ids' => [], 'status_id' => @original_status.id.to_s } emoji_group = { 'name' => emoji_reaction.name, 'count' => 0, 'account_ids' => [], 'status_id' => @original_status.id.to_s }
emoji_group['domain'] = emoji_reaction.custom_emoji.domain if emoji_reaction.custom_emoji emoji_group['domain'] = emoji_reaction.custom_emoji.domain if emoji_reaction.custom_emoji
end end
DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), nil, @original_status.id, emoji_reaction.account_id) DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), @original_status.id, emoji_reaction.account_id)
end end
def render_emoji_reaction(emoji_group) def render_emoji_reaction(emoji_group)

2
app/services/emoji_react_service.rb
View file

@ -68,7 +68,7 @@ class EmojiReactService < BaseService
emoji_group = emoji_reaction.status.emoji_reactions_grouped_by_name emoji_group = emoji_reaction.status.emoji_reactions_grouped_by_name
.find { |reaction_group| reaction_group['name'] == emoji_reaction.name && (!reaction_group.key?(:domain) || reaction_group['domain'] == emoji_reaction.custom_emoji&.domain) } .find { |reaction_group| reaction_group['name'] == emoji_reaction.name && (!reaction_group.key?(:domain) || reaction_group['domain'] == emoji_reaction.custom_emoji&.domain) }
emoji_group['status_id'] = emoji_reaction.status_id.to_s emoji_group['status_id'] = emoji_reaction.status_id.to_s
DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), emoji_reaction.id, emoji_reaction.status_id, emoji_reaction.account_id) DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), emoji_reaction.status_id, emoji_reaction.account_id)
end end
def bump_potential_friendship(account, status) def bump_potential_friendship(account, status)

2
app/services/un_emoji_react_service.rb
View file

@ -48,7 +48,7 @@ class UnEmojiReactService < BaseService
emoji_group = { 'name' => emoji_reaction.name, 'count' => 0, 'account_ids' => [], 'status_id' => @status.id.to_s } emoji_group = { 'name' => emoji_reaction.name, 'count' => 0, 'account_ids' => [], 'status_id' => @status.id.to_s }
emoji_group['domain'] = emoji_reaction.custom_emoji.domain if emoji_reaction.custom_emoji emoji_group['domain'] = emoji_reaction.custom_emoji.domain if emoji_reaction.custom_emoji
end end
DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), nil, @status.id, emoji_reaction.account_id) DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), @status.id, emoji_reaction.account_id)
end end
def build_json(emoji_reaction) def build_json(emoji_reaction)

6
app/workers/delivery_emoji_reaction_worker.rb
View file

@ -6,9 +6,9 @@ class DeliveryEmojiReactionWorker
include Lockable include Lockable
include AccountScope include AccountScope
def perform(payload_json, emoji_reaction_id, status_id, _my_account_id = nil) def perform(payload_json, status_id, reacted_account_id)
emoji_reaction = emoji_reaction_id ? EmojiReaction.find(emoji_reaction_id) : nil
status = Status.find(status_id) status = Status.find(status_id)
reacted_account = Account.find(reacted_account_id)
if status.present? if status.present?
scope = scope_status(status) scope = scope_status(status)
@ -19,7 +19,7 @@ class DeliveryEmojiReactionWorker
scope.includes(:user).find_each do |account| scope.includes(:user).find_each do |account|
next if account.user.present? && (account.user.setting_stop_emoji_reaction_streaming || !account.user.setting_enable_emoji_reaction) 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 unless redis.exists?("subscribed:timeline:#{account.id}")
next if emoji_reaction.present? && account.excluded_from_timeline_domains.include?(emoji_reaction.account.domain) next if account.excluded_from_timeline_domains.include?(reacted_account.domain)
next if policy != :allow && !status.account.show_emoji_reaction?(account) next if policy != :allow && !status.account.show_emoji_reaction?(account)
redis.publish("timeline:#{account.id}", payload_json) redis.publish("timeline:#{account.id}", payload_json)