Remove enable_block_emoji_reaction_settings
This commit is contained in:
parent
673e607e94
commit
18a0908878
7 changed files with 4 additions and 16 deletions
|
@ -364,7 +364,6 @@ class Account < ApplicationRecord
|
|||
end
|
||||
|
||||
def emoji_reaction_policy
|
||||
return :allow unless Setting.enable_block_emoji_reaction_settings || !local?
|
||||
return settings['emoji_reaction_policy']&.to_sym || :allow if settings.present?
|
||||
return :allow if user.nil?
|
||||
|
||||
|
@ -381,12 +380,8 @@ class Account < ApplicationRecord
|
|||
'hide_followers_count' => hide_followers_count?,
|
||||
'translatable_private' => translatable_private?,
|
||||
'link_preview' => link_preview?,
|
||||
'emoji_reaction_policy' => user&.setting_emoji_reaction_policy,
|
||||
}
|
||||
if Setting.enable_block_emoji_reaction_settings
|
||||
config = config.merge({
|
||||
'emoji_reaction_policy' => user&.setting_emoji_reaction_policy,
|
||||
})
|
||||
end
|
||||
config = config.merge(settings) if settings.present?
|
||||
config
|
||||
end
|
||||
|
|
|
@ -37,7 +37,6 @@ class Form::AdminSettings
|
|||
status_page_url
|
||||
captcha_enabled
|
||||
ng_words
|
||||
enable_block_emoji_reaction_settings
|
||||
hide_local_users_for_anonymous
|
||||
post_hash_tags_max
|
||||
sensitive_words
|
||||
|
@ -64,7 +63,6 @@ class Form::AdminSettings
|
|||
noindex
|
||||
require_invite_text
|
||||
captcha_enabled
|
||||
enable_block_emoji_reaction_settings
|
||||
hide_local_users_for_anonymous
|
||||
authorized_fetch
|
||||
).freeze
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue