Allow blocking emoji reaction settings always from federation

kmycode · Sep 12, 2023 · defd790 · defd790
1 parent e505ba6
commit defd790
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/models/account.rb b/app/models/account.rb
@@ -364,23 +364,23 @@ def hide_followers_count?
   end
 
   def emoji_reactions_must_following?
-    return false unless Setting.enable_block_emoji_reaction_settings
+    return false unless Setting.enable_block_emoji_reaction_settings || !local?
     return user&.settings&.[]('emoji_reactions.must_be_following') || false if user.present?
     return settings['emoji_reactions_must_be_following'] || false if settings.present?
 
     false
   end
 
   def emoji_reactions_must_follower?
-    return false unless Setting.enable_block_emoji_reaction_settings
+    return false unless Setting.enable_block_emoji_reaction_settings || !local?
     return user&.settings&.[]('emoji_reactions.must_be_follower') || false if user.present?
     return settings['emoji_reaction_must_be_follower'] || false if settings.present?
 
     false
   end
 
   def emoji_reactions_deny_from_all?
-    return false unless Setting.enable_block_emoji_reaction_settings
+    return false unless Setting.enable_block_emoji_reaction_settings || !local?
     return user&.settings&.[]('emoji_reactions.deny_from_all') || false if user.present?
     return settings['emoji_reaction_deny_from_all'] || false if settings.present?