gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Allow blocking emoji reaction settings always from federation

Browse source
This commit is contained in:
KMY 2023-09-12 14:45:36 +09:00
parent e505ba6615
commit defd790889
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/account.rb
View file

@ -364,7 +364,7 @@ class Account < ApplicationRecord
end end
def emoji_reactions_must_following? 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 user&.settings&.[]('emoji_reactions.must_be_following') || false if user.present?
return settings['emoji_reactions_must_be_following'] || false if settings.present? return settings['emoji_reactions_must_be_following'] || false if settings.present?
@ -372,7 +372,7 @@ class Account < ApplicationRecord
end end
def emoji_reactions_must_follower? 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 user&.settings&.[]('emoji_reactions.must_be_follower') || false if user.present?
return settings['emoji_reaction_must_be_follower'] || false if settings.present? return settings['emoji_reaction_must_be_follower'] || false if settings.present?
@ -380,7 +380,7 @@ class Account < ApplicationRecord
end end
def emoji_reactions_deny_from_all? 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 user&.settings&.[]('emoji_reactions.deny_from_all') || false if user.present?
return settings['emoji_reaction_deny_from_all'] || false if settings.present? return settings['emoji_reaction_deny_from_all'] || false if settings.present?