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

Fix removing activitypub emoji reaction

Browse source
This commit is contained in:
KMY 2023-02-28 14:48:55 +09:00
parent 9f2fb36e01
commit 1e67d25856
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/services/un_emoji_react_service.rb
View file

@ -5,20 +5,16 @@ class UnEmojiReactService < BaseService
include Payloadable include Payloadable
def call(account_id, status_id, emoji_reaction = nil) def call(account_id, status_id, emoji_reaction = nil)
@account_id = account_id @status = Status.find(status_id)
@account = Account.find(account_id)
@status = Status.find(status_id)
p '==================================== DEBUG'
p emoji_reaction
if emoji_reaction if emoji_reaction
emoji_reaction.destroy! emoji_reaction.destroy!
create_notification(emoji_reaction) if !@account.local? && @account.activitypub? create_notification(emoji_reaction) if !@status.account.local? && @status.account.activitypub?
notify_to_followers(emoji_reaction) if @account.local? notify_to_followers(emoji_reaction) if @status.account.local?
write_stream(emoji_reaction) write_stream(emoji_reaction)
else else
bulk(@account, @status) account = Account.find(account_id)
bulk(account, @status)
end end
emoji_reaction emoji_reaction
end end
@ -32,11 +28,11 @@ class UnEmojiReactService < BaseService
end end
def create_notification(emoji_reaction) def create_notification(emoji_reaction)
ActivityPub::DeliveryWorker.perform_async(build_json(emoji_reaction), @account_id, @account.inbox_url) ActivityPub::DeliveryWorker.perform_async(build_json(emoji_reaction), emoji_reaction.account_id, @status.account.inbox_url)
end end
def notify_to_followers(emoji_reaction) def notify_to_followers(emoji_reaction)
ActivityPub::RawDistributionWorker.perform_async(build_json(emoji_reaction), @account_id) ActivityPub::RawDistributionWorker.perform_async(build_json(emoji_reaction), @status.account_id)
end end
def write_stream(emoji_reaction) def write_stream(emoji_reaction)
@ -49,7 +45,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
FeedAnyJsonWorker.perform_async(render_emoji_reaction(emoji_group), @status.id, @account_id) FeedAnyJsonWorker.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)