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

Fix test

Browse source
This commit is contained in:
KMY 2023-11-04 10:11:06 +09:00
parent 52dac50826
commit 7e088863b4
5 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/models/concerns/account_other_settings.rb
View file

@ -97,26 +97,14 @@ module AccountOtherSettings
'translatable_private' => translatable_private?,
'link_preview' => link_preview?,
'allow_quote' => allow_quote?,
'emoji_reaction_policy' => Setting.enable_emoji_reaction ? emoji_reaction_policy : :block,
}
if Setting.enable_emoji_reaction
config = config.merge({
'emoji_reaction_policy' => emoji_reaction_policy,
})
end
config = config.merge(settings) if settings.present?
config
end
def public_settings_for_local
config = public_settings
unless Setting.enable_emoji_reaction
config = config.merge({
'emoji_reaction_policy' => :block,
})
end
config
public_settings
end
end
end