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

Remove block_and_hide to block

Browse source
This commit is contained in:
KMY 2023-09-13 09:00:13 +09:00
parent 2be77df3aa
commit 1bac691642
9 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/account.rb
View file

@ -366,7 +366,7 @@ class Account < ApplicationRecord
def emoji_reaction_policy
return settings['emoji_reaction_policy']&.to_sym || :allow if settings.present? && user.nil?
return :allow if user.nil?
return :block_and_hide if local? && !Setting.enable_emoji_reaction
return :block if local? && !Setting.enable_emoji_reaction
user.setting_emoji_reaction_policy&.to_sym
end
@ -375,7 +375,7 @@ class Account < ApplicationRecord
return false unless Setting.enable_emoji_reaction
case emoji_reaction_policy
when :block_and_hide
when :block
false
when :followees_only
account.present? && (id == account.id || following?(account))
@ -421,7 +421,7 @@ class Account < ApplicationRecord
unless Setting.enable_emoji_reaction
config = config.merge({
'emoji_reaction_policy' => :block_and_hide,
'emoji_reaction_policy' => :block,
})
end

2
app/models/user_settings.rb
View file

@ -36,7 +36,7 @@ class UserSettings
setting :reaction_deck, default: nil
setting :stop_emoji_reaction_streaming, default: false
setting :emoji_reaction_streaming_notify_impl2, default: false
setting :emoji_reaction_policy, default: :allow, in: %w(allow outside_only followers_only followees_only mutuals_only block block_and_hide)
setting :emoji_reaction_policy, default: :allow, in: %w(allow outside_only followers_only followees_only mutuals_only block)
setting :unsafe_limited_distribution, default: false
setting :dtl_force_with_tag, default: :none, in: %w(full searchability none)
setting :dtl_force_subscribable, default: false