From defd79088926efd78dd98ede84f2ec77b26c45be Mon Sep 17 00:00:00 2001 From: KMY Date: Tue, 12 Sep 2023 14:45:36 +0900 Subject: [PATCH] Allow blocking emoji reaction settings always from federation --- app/models/account.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/account.rb b/app/models/account.rb index 5462659a68..fcc0514e4b 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -364,7 +364,7 @@ class Account < ApplicationRecord 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 @@ class Account < ApplicationRecord 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 @@ class Account < ApplicationRecord 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?