From 1367b72fa3ba68cad83471dcd9a51e3865298c63 Mon Sep 17 00:00:00 2001 From: KMY Date: Wed, 13 Sep 2023 07:35:26 +0900 Subject: [PATCH] Remove DeliveryEmojiReactionWorker unused parameter --- app/lib/activitypub/activity/like.rb | 2 +- app/lib/activitypub/activity/undo.rb | 2 +- app/services/emoji_react_service.rb | 2 +- app/services/un_emoji_react_service.rb | 2 +- app/workers/delivery_emoji_reaction_worker.rb | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/lib/activitypub/activity/like.rb b/app/lib/activitypub/activity/like.rb index 40323ea710..8a65ed0ada 100644 --- a/app/lib/activitypub/activity/like.rb +++ b/app/lib/activitypub/activity/like.rb @@ -111,7 +111,7 @@ class ActivityPub::Activity::Like < ActivityPub::Activity 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) } 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 def render_emoji_reaction(emoji_group) diff --git a/app/lib/activitypub/activity/undo.rb b/app/lib/activitypub/activity/undo.rb index 4e3a14c059..c1862cc36d 100644 --- a/app/lib/activitypub/activity/undo.rb +++ b/app/lib/activitypub/activity/undo.rb @@ -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['domain'] = emoji_reaction.custom_emoji.domain if emoji_reaction.custom_emoji 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 def render_emoji_reaction(emoji_group) diff --git a/app/services/emoji_react_service.rb b/app/services/emoji_react_service.rb index e45a481e08..0dfefa6f0b 100644 --- a/app/services/emoji_react_service.rb +++ b/app/services/emoji_react_service.rb @@ -68,7 +68,7 @@ class EmojiReactService < BaseService 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) } 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 def bump_potential_friendship(account, status) diff --git a/app/services/un_emoji_react_service.rb b/app/services/un_emoji_react_service.rb index b5953685f4..b473d43459 100644 --- a/app/services/un_emoji_react_service.rb +++ b/app/services/un_emoji_react_service.rb @@ -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['domain'] = emoji_reaction.custom_emoji.domain if emoji_reaction.custom_emoji 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 def build_json(emoji_reaction) diff --git a/app/workers/delivery_emoji_reaction_worker.rb b/app/workers/delivery_emoji_reaction_worker.rb index 4d0154bfb8..00462ef01c 100644 --- a/app/workers/delivery_emoji_reaction_worker.rb +++ b/app/workers/delivery_emoji_reaction_worker.rb @@ -6,9 +6,9 @@ class DeliveryEmojiReactionWorker include Lockable include AccountScope - def perform(payload_json, emoji_reaction_id, status_id, _my_account_id = nil) - emoji_reaction = emoji_reaction_id ? EmojiReaction.find(emoji_reaction_id) : nil + def perform(payload_json, status_id, reacted_account_id) status = Status.find(status_id) + reacted_account = Account.find(reacted_account_id) if status.present? scope = scope_status(status) @@ -19,7 +19,7 @@ class DeliveryEmojiReactionWorker 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 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) redis.publish("timeline:#{account.id}", payload_json)