diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx index ec7fcf5a02..84a6ec9d00 100644 --- a/app/javascript/mastodon/components/status_action_bar.jsx +++ b/app/javascript/mastodon/components/status_action_bar.jsx @@ -415,7 +415,7 @@ class StatusActionBar extends ImmutablePureComponent { const followed = emojiReactionPolicy !== 'followers_only' || (relationship && relationship.get('followed_by')); const mutual = emojiReactionPolicy !== 'mutuals_only' || (relationship && relationship.get('following') && relationship.get('followed_by')); const outside = emojiReactionPolicy !== 'outside_only' || (relationship && (relationship.get('following') || relationship.get('followed_by'))); - const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block_and_hide'; + const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block'; const emojiPickerButton = ( ); diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx index f22adbf572..b1bde14286 100644 --- a/app/javascript/mastodon/features/status/components/action_bar.jsx +++ b/app/javascript/mastodon/features/status/components/action_bar.jsx @@ -331,7 +331,7 @@ class ActionBar extends PureComponent { const followed = emojiReactionPolicy !== 'followers_only' || (relationship && relationship.get('followed_by')); const mutual = emojiReactionPolicy !== 'mutuals_only' || (relationship && relationship.get('following') && relationship.get('followed_by')); const outside = emojiReactionPolicy !== 'outside_only' || (relationship && (relationship.get('following') || relationship.get('followed_by'))); - const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block_and_hide'; + const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block'; const emojiPickerButton = ( ); diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx index ba22710f9c..3e0550b3d3 100644 --- a/app/javascript/mastodon/features/status/components/detailed_status.jsx +++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx @@ -242,7 +242,7 @@ class DetailedStatus extends ImmutablePureComponent { if (status.get('emoji_reactions')) { const emojiReactions = status.get('emoji_reactions'); const emojiReactionPolicy = status.getIn(['account', 'other_settings', 'emoji_reaction_policy']) || 'allow'; - if (emojiReactions.size > 0 && enableEmojiReaction && emojiReactionPolicy !== 'block_and_hide') { + if (emojiReactions.size > 0 && enableEmojiReaction && emojiReactionPolicy !== 'block') { emojiReactionsBar = ; } } diff --git a/app/models/account.rb b/app/models/account.rb index 4ad4fc0007..26584b68e5 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -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 diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb index 35fa26dd83..c37c4776d7 100644 --- a/app/models/user_settings.rb +++ b/app/models/user_settings.rb @@ -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 diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml index ff73f148dd..5b99c27479 100644 --- a/app/views/settings/preferences/other/show.html.haml +++ b/app/views/settings/preferences/other/show.html.haml @@ -22,7 +22,7 @@ .fields-row .fields-group.fields-row__column.fields-row__column-12 - = ff.input :emoji_reaction_policy, kmyblue: true, collection: ['allow', 'outside_only', 'followers_only', 'followees_only', 'mutuals_only', 'block_and_hide'], label_method: lambda { |item| safe_join([t("simple_form.labels.defaults.setting_emoji_reaction_policy_items.#{item}")]) }, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', include_blank: false, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_emoji_reaction_policy'), hint: false, warning_hint: I18n.t('simple_form.hints.defaults.setting_emoji_reaction_policy') + = ff.input :emoji_reaction_policy, kmyblue: true, collection: ['allow', 'outside_only', 'followers_only', 'followees_only', 'mutuals_only', 'block'], label_method: lambda { |item| safe_join([t("simple_form.labels.defaults.setting_emoji_reaction_policy_items.#{item}")]) }, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', include_blank: false, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_emoji_reaction_policy'), hint: false, warning_hint: I18n.t('simple_form.hints.defaults.setting_emoji_reaction_policy') - if @dtl_enabled diff --git a/app/workers/delivery_emoji_reaction_worker.rb b/app/workers/delivery_emoji_reaction_worker.rb index 637a7f463b..64c02173b5 100644 --- a/app/workers/delivery_emoji_reaction_worker.rb +++ b/app/workers/delivery_emoji_reaction_worker.rb @@ -14,7 +14,7 @@ class DeliveryEmojiReactionWorker scope = scope_status(status) policy = status.account.emoji_reaction_policy - return if policy == :block_and_hide + return if policy == :block scope.select(:id).merge(policy_scope(status.account, policy)).includes(:user).find_each do |account| next if account.user.present? && (account.user.setting_stop_emoji_reaction_streaming || !account.user.setting_enable_emoji_reaction) @@ -32,7 +32,7 @@ class DeliveryEmojiReactionWorker def policy_scope(account, policy) case policy - when :block_and_hide + when :block Account.where(id: 0) when :mutuals_only account.mutuals.local.or(Account.where(id: account)) diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index ca96aa3861..f14dad25fb 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -249,8 +249,7 @@ en: setting_emoji_reaction_policy: Stamp receive/display policy setting_emoji_reaction_policy_items: allow: Allow all - block: Block all but show existing reactions - block_and_hide: Block + block: Block followees_only: Followings only followers_only: Followers only mutuals_only: Mutuals only diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index b217436a74..cd9ddeb89c 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -257,8 +257,7 @@ ja: setting_emoji_reaction_policy: スタンプ受け入れと表示設定 setting_emoji_reaction_policy_items: allow: 全員に許可 - block: 全員禁止するが、既存のスタンプは表示する - block_and_hide: 全員禁止 + block: 全員禁止 followees_only: フォロー中の相手のみ許可 followers_only: フォロワーのみ許可 mutuals_only: 相互のみ許可