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

Remove unusing settings from other_settings

Browse source
This commit is contained in:
KMY 2023-09-01 17:44:48 +09:00
parent 3cf08a8f4b
commit e5df772adb
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/models/account.rb
View file

@ -388,11 +388,15 @@ class Account < ApplicationRecord
'hide_statuses_count' => hide_statuses_count?, 'hide_statuses_count' => hide_statuses_count?,
'hide_following_count' => hide_following_count?, 'hide_following_count' => hide_following_count?,
'hide_followers_count' => hide_followers_count?, 'hide_followers_count' => hide_followers_count?,
'emoji_reaction_must_following' => emoji_reactions_must_following?,
'emoji_reaction_must_follower' => emoji_reactions_must_follower?,
'emoji_reaction_deny_from_all' => emoji_reactions_deny_from_all?,
'translatable_private' => translatable_private?, 'translatable_private' => translatable_private?,
} }
if Setting.enable_block_emoji_reaction_settings
config = config.merge({
'emoji_reaction_must_following' => emoji_reactions_must_following?,
'emoji_reaction_must_follower' => emoji_reactions_must_follower?,
'emoji_reaction_deny_from_all' => emoji_reactions_deny_from_all?,
})
end
config = config.merge(settings) if settings.present? config = config.merge(settings) if settings.present?
config config
end end