gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 17

Fix: スタンプを外すとき、自分が外したスタンプが投稿から全部消える問題 (#316)

Browse source
This commit is contained in:
KMY（雪あすか） 2023-11-29 13:45:24 +09:00 • committed by GitHub
parent 99e28a0cfb
commit c21827f5ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/status.rb
View file

@ -405,6 +405,8 @@ class Status < ApplicationRecord
end
public_emoji_reactions
else
emoji_reactions
end
end
end

5
app/services/un_emoji_react_service.rb
View file

@ -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