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

Change followees_only to following_only

Browse source
This commit is contained in:
KMY 2023-09-13 12:59:07 +09:00
parent 1cbd000b43
commit 04418d5b01
8 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/components/status_action_bar.jsx
View file

@ -411,7 +411,7 @@ class StatusActionBar extends ImmutablePureComponent {
);
const emojiReactionPolicy = account.getIn(['other_settings', 'emoji_reaction_policy']) || 'allow';
const following = emojiReactionPolicy !== 'followees_only' || (relationship && relationship.get('following'));
const following = emojiReactionPolicy !== 'following_only' || (relationship && relationship.get('following'));
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')));

2
app/javascript/mastodon/features/status/components/action_bar.jsx
View file

@ -327,7 +327,7 @@ class ActionBar extends PureComponent {
}
const emojiReactionPolicy = account.getIn(['other_settings', 'emoji_reaction_policy']) || 'allow';
const following = emojiReactionPolicy !== 'followees_only' || (relationship && relationship.get('following'));
const following = emojiReactionPolicy !== 'following_only' || (relationship && relationship.get('following'));
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')));

2
app/models/account.rb
View file

@ -377,7 +377,7 @@ class Account < ApplicationRecord
case emoji_reaction_policy
when :block
false
when :followees_only
when :following_only
account.present? && (id == account.id || following?(account))
when :followers_only
account.present? && (id == account.id || followed_by?(account))

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)
setting :emoji_reaction_policy, default: :allow, in: %w(allow outside_only followers_only following_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

2
app/views/settings/preferences/other/show.html.haml
View file

@ -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'], 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', 'following_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

2
app/workers/delivery_emoji_reaction_worker.rb
View file

@ -36,7 +36,7 @@ class DeliveryEmojiReactionWorker
Account.where(id: 0)
when :mutuals_only
account.mutuals.local.or(Account.where(id: account))
when :followees_only
when :following_only
account.following.local.or(Account.where(id: account))
when :followers_only
account.followers.local.or(Account.where(id: account))

2
config/locales/simple_form.en.yml
View file

@ -250,8 +250,8 @@ en:
setting_emoji_reaction_policy_items:
allow: Allow all
block: Block
followees_only: Followings only
followers_only: Followers only
following_only: Followings only
mutuals_only: Mutuals only
outside_only: Followings or followers only
setting_expand_spoilers: Always expand posts marked with content warnings

2
config/locales/simple_form.ja.yml
View file

@ -258,8 +258,8 @@ ja:
setting_emoji_reaction_policy_items:
allow: 全員に許可
block: 全員禁止
followees_only: フォロー中の相手のみ許可
followers_only: フォロワーのみ許可
following_only: フォロー中の相手のみ許可
mutuals_only: 相互のみ許可
outside_only: フォロー中、またはフォロワーのみに許可
setting_emoji_reaction_streaming_notify_impl2: Nyastodon, Catstodon, glitch-soc互換のスタンプ機能を有効にする