diff --git a/app/models/emoji_reaction.rb b/app/models/emoji_reaction.rb index bbe00a2c54..f3f53496d8 100644 --- a/app/models/emoji_reaction.rb +++ b/app/models/emoji_reaction.rb @@ -35,6 +35,14 @@ class EmojiReaction < ApplicationRecord after_destroy :refresh_cache after_destroy :invalidate_cleanup_info + def custom_emoji? + custom_emoji.present? + end + + def remote_custom_emoji? + custom_emoji? && !custom_emoji.local? + end + private def refresh_cache diff --git a/app/services/emoji_react_service.rb b/app/services/emoji_react_service.rb index 7be550c391..0daa7fd3df 100644 --- a/app/services/emoji_react_service.rb +++ b/app/services/emoji_react_service.rb @@ -57,6 +57,7 @@ class EmojiReactService < BaseService status = emoji_reaction.status return unless status.account.local? + return if emoji_reaction.remote_custom_emoji? ActivityPub::RawDistributionWorker.perform_async(build_json(emoji_reaction), status.account_id) end