From c21827f5ee6193dd3f4ce373fd04fe4aa986ab71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?= Date: Wed, 29 Nov 2023 13:45:24 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20=E3=82=B9=E3=82=BF=E3=83=B3=E3=83=97?= =?UTF-8?q?=E3=82=92=E5=A4=96=E3=81=99=E3=81=A8=E3=81=8D=E3=80=81=E8=87=AA?= =?UTF-8?q?=E5=88=86=E3=81=8C=E5=A4=96=E3=81=97=E3=81=9F=E3=82=B9=E3=82=BF?= =?UTF-8?q?=E3=83=B3=E3=83=97=E3=81=8C=E6=8A=95=E7=A8=BF=E3=81=8B=E3=82=89?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=B6=88=E3=81=88=E3=82=8B=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=20(#316)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/status.rb | 2 ++ app/services/un_emoji_react_service.rb | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/models/status.rb b/app/models/status.rb index 0cb4c03a51..2b24ff50e5 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -405,6 +405,8 @@ class Status < ApplicationRecord end public_emoji_reactions + else + emoji_reactions end end end diff --git a/app/services/un_emoji_react_service.rb b/app/services/un_emoji_react_service.rb index 400efda19a..9dadfad68b 100644 --- a/app/services/un_emoji_react_service.rb +++ b/app/services/un_emoji_react_service.rb @@ -42,8 +42,8 @@ class UnEmojiReactService < BaseService end def write_stream(emoji_reaction) - emoji_group = @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.emoji_reactions_grouped_by_name(@account) + .find { |reaction_group| reaction_group['name'] == emoji_reaction.name } if emoji_group emoji_group['status_id'] = @status.id.to_s else @@ -51,6 +51,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), @status.id, emoji_reaction.account_id) end