Change: #457 サイレンスされているユーザーに、フォロー相手以外への絵文字リアクションを禁止 (#522)

app/lib/activitypub/activity/like.rb

@@ -34,7 +34,7 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
 
   def process_emoji_reaction
     return if !@original_status.account.local? && !Setting.receive_other_servers_emoji_reaction
-    return if silence_domain? && (!@original_status.local? || !@original_status.account.following?(@account))
+    return if (silence_domain? || @account.silenced?) && (!@original_status.local? || !@original_status.account.following?(@account))
 
     # custom emoji
     emoji = nil

app/services/emoji_react_service.rb

@@ -16,6 +16,8 @@ class EmojiReactService < BaseService
     authorize_with account, status, :emoji_reaction?
     @status = status
 
+    raise Mastodon::ValidationError, I18n.t('reactions.errors.banned') if account.silenced? && !status.account.following?(account)
+
     with_redis_lock("emoji_reaction:#{status.id}") do
       shortcode, domain = name.split('@')
       domain = nil if TagManager.instance.local_domain?(domain)