diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index 51384ef98..45ce7252f 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -37,7 +37,7 @@ class ActivityPub::Activity ActivityPub::Activity::Delete when 'Follow' ActivityPub::Activity::Follow - when 'Like' + when 'Like', 'EmojiReaction', 'EmojiReact' ActivityPub::Activity::Like when 'Block' ActivityPub::Activity::Block diff --git a/app/lib/activitypub/activity/undo.rb b/app/lib/activitypub/activity/undo.rb index b36ff0daf..09a7ac7a3 100644 --- a/app/lib/activitypub/activity/undo.rb +++ b/app/lib/activitypub/activity/undo.rb @@ -127,7 +127,7 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity if @account.reacted?(@original_status, shortcode, emoji) @original_status.emoji_reactions.where(account: @account, name: shortcode, custom_emoji: emoji).first&.destroy - + if @original_status.account.local? forward_for_undo_emoji_reaction relay_for_undo_emoji_reaction diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb index 864328631..0cd211d1f 100644 --- a/app/lib/activitypub/tag_manager.rb +++ b/app/lib/activitypub/tag_manager.rb @@ -45,8 +45,12 @@ class ActivityPub::TagManager account_status_url(target.account, target) when :emoji emoji_url(target) + when :flag target.uri + + when :emoji_reaction + emoji_reaction_url(target) end end