diff --git a/app/models/account.rb b/app/models/account.rb index 5462659a6869cd..fcc0514e4b490c 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -364,7 +364,7 @@ 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? @@ -372,7 +372,7 @@ def emoji_reactions_must_following? 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? @@ -380,7 +380,7 @@ def emoji_reactions_must_follower? 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?