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

Merge commit '3a1a6ba39e' into kb_migration_development

Browse source
This commit is contained in:
KMY 2023-05-01 15:08:16 +09:00
commit 81a7272ce7
288 changed files with 1345 additions and 1343 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -121,9 +121,7 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
if shortcode.present?
emoji_tag = @object['tag'].is_a?(Array) ? @object['tag']&.first : @object['tag']
if emoji_tag.present? && emoji_tag['id'].present?
emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain)
end
emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain) if emoji_tag.present? && emoji_tag['id'].present?
emoji_reaction = @original_status.emoji_reactions.where(account: @account, name: shortcode, custom_emoji: emoji).first
@ -159,7 +157,7 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
end
def forward_for_undo_emoji_reaction
return unless @json['signature'].present?
return if @json['signature'].blank?
ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), @original_status.account.id, [@account.preferred_inbox_url])
end