Add hiding emoji reaction setting

2023-09-12 13:12:07 +09:00 · 2023-09-12 13:12:07 +09:00 · cd252a6062
commit cd252a6062
parent 649806a89b
13 changed files with 38 additions and 14 deletions
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@ -18,7 +18,7 @@ import Card from '../features/status/components/card';
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
-import { displayMedia } from '../initial_state';
+import { displayMedia, enableEmojiReaction } from '../initial_state';

 import { Avatar } from './avatar';
 import { AvatarOverlay } from './avatar_overlay';
@ -577,7 +577,7 @@ class Status extends ImmutablePureComponent {
    let emojiReactionsBar = null;
    if (!this.props.withoutEmojiReactions && status.get('emoji_reactions')) {
      const emojiReactions = status.get('emoji_reactions');
-      if (emojiReactions.size > 0) {
+      if (emojiReactions.size > 0 && enableEmojiReaction) {
        emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />;
      }
    }
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@ -10,9 +10,10 @@ import { connect } from 'react-redux';

 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';

+
 import DropdownMenuContainer from '../containers/dropdown_menu_container';
 import EmojiPickerDropdown from '../features/compose/containers/emoji_picker_dropdown_container';
-import { bookmarkCategoryNeeded, me } from '../initial_state';
+import { enableEmojiReaction , bookmarkCategoryNeeded, me } from '../initial_state';

 import { IconButton } from './icon_button';

@ -415,7 +416,7 @@ class StatusActionBar extends ImmutablePureComponent {
    const emojiPickerButton = (
      <IconButton className='status__action-bar__button' title={intl.formatMessage(messages.emojiReaction)} icon='smile-o' onClick={this.handleEmojiPickInnerButton} />
    );
-    const emojiPickerDropdown = (writtenByMe || ((denyFromAll) && (following) && (followed))) && (
+    const emojiPickerDropdown = enableEmojiReaction && (writtenByMe || ((denyFromAll) && (following) && (followed))) && (
      <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={emojiPickerButton} />
    );

--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@ -10,9 +10,10 @@ import { connect } from 'react-redux';

 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';

+
 import { IconButton } from '../../../components/icon_button';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
-import { bookmarkCategoryNeeded, me } from '../../../initial_state';
+import { enableEmojiReaction , bookmarkCategoryNeeded, me } from '../../../initial_state';
 import EmojiPickerDropdown from '../../compose/containers/emoji_picker_dropdown_container';

 const messages = defineMessages({
@ -305,10 +306,6 @@ class ActionBar extends PureComponent {
      }
    }

-    const emojiPickerButton = (
-      <IconButton icon='smile-o' onClick={this.handleEmojiPickInnerButton} title={intl.formatMessage(messages.pickEmoji)} />
-    );
-
    let replyIcon;
    if (status.get('in_reply_to_id', null) === null) {
      replyIcon = 'reply';
@ -329,13 +326,23 @@ class ActionBar extends PureComponent {
      reblogTitle = intl.formatMessage(messages.cannot_reblog);
    }

+    const following = !account.getIn(['other_settings', 'emoji_reaction_must_follower']) || (relationship && relationship.get('following'));
+    const followed = !account.getIn(['other_settings', 'emoji_reaction_must_following']) || (relationship && relationship.get('followed_by'));
+    const denyFromAll = !account.getIn(['other_settings', 'emoji_reaction_deny_from_all']);
+    const emojiPickerButton = (
+      <IconButton icon='smile-o' onClick={this.handleEmojiPickInnerButton} title={intl.formatMessage(messages.pickEmoji)} />
+    );
+    const emojiPickerDropdown = enableEmojiReaction && (writtenByMe || ((denyFromAll) && (following) && (followed))) && (
+      <div className='detailed-status__button'><EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={emojiPickerButton} /></div>
+    );
+
    return (
      <div className='detailed-status__action-bar'>
        <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
        <div className='detailed-status__button'><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} /></div>
        <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
        <div className='detailed-status__button'><IconButton className='bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
-        <div className='detailed-status__button'><EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={emojiPickerButton} /></div>
+        {emojiPickerDropdown}

        <div className='detailed-status__action-bar-dropdown'>
          <DropdownMenuContainer size={18} icon='ellipsis-h' status={status} items={menu} direction='left' title={intl.formatMessage(messages.more)} />
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@ -13,6 +13,7 @@ import EditedTimestamp from 'mastodon/components/edited_timestamp';
 import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
 import { Icon }  from 'mastodon/components/icon';
 import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
+import { enableEmojiReaction } from 'mastodon/initial_state';

 import { Avatar } from '../../../components/avatar';
 import { DisplayName } from '../../../components/display_name';
@ -240,7 +241,7 @@ class DetailedStatus extends ImmutablePureComponent {
    let emojiReactionsBar = null;
    if (status.get('emoji_reactions')) {
      const emojiReactions = status.get('emoji_reactions');
-      if (emojiReactions.size > 0) {
+      if (emojiReactions.size > 0 && enableEmojiReaction) {
        emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />;
      }
    }
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@ -59,6 +59,7 @@
 * @property {boolean} display_media_expand
 * @property {string} domain
 * @property {string} dtl_tag
+ * @property {boolean} enable_emoji_reaction
 * @property {boolean} enable_login_privacy
 * @property {boolean} enable_dtl_menu
 * @property {boolean=} expand_spoilers
@ -126,6 +127,7 @@ export const displayMedia = getMeta('display_media');
 export const displayMediaExpand = getMeta('display_media_expand');
 export const domain = getMeta('domain');
 export const dtlTag = getMeta('dtl_tag');
+export const enableEmojiReaction = getMeta('enable_emoji_reaction');
 export const enableLoginPrivacy = getMeta('enable_login_privacy');
 export const enableDtlMenu = getMeta('enable_dtl_menu');
 export const expandSpoilers = getMeta('expand_spoilers');
--- a/app/models/concerns/has_user_settings.rb
+++ b/app/models/concerns/has_user_settings.rb
@ -43,6 +43,10 @@ module HasUserSettings
    settings['web.hide_recent_emojis']
  end

+  def setting_enable_emoji_reaction
+    settings['web.enable_emoji_reaction']
+  end
+
  def setting_default_sensitive
    settings['default_sensitive']
  end
--- a/app/models/user_settings.rb
+++ b/app/models/user_settings.rb
@ -54,6 +54,7 @@ class UserSettings
    setting :enable_login_privacy, default: false
    setting :enable_dtl_menu, default: false
    setting :hide_recent_emojis, default: false
+    setting :enable_emoji_reaction, default: true
    setting :reblog_modal, default: false
    setting :unfollow_modal, default: true
    setting :reduce_motion, default: false
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@ -48,6 +48,7 @@ class InitialStateSerializer < ActiveModel::Serializer
      store[:display_media]     = object.current_account.user.setting_display_media
      store[:display_media_expand] = object.current_account.user.setting_display_media_expand
      store[:expand_spoilers] = object.current_account.user.setting_expand_spoilers
+      store[:enable_emoji_reaction] = object.current_account.user.setting_enable_emoji_reaction
      store[:enable_login_privacy] = object.current_account.user.setting_enable_login_privacy
      store[:enable_dtl_menu] = object.current_account.user.setting_enable_dtl_menu
      store[:hide_recent_emojis] = object.current_account.user.setting_hide_recent_emojis
--- a/app/services/emoji_react_service.rb
+++ b/app/services/emoji_react_service.rb
@ -46,8 +46,10 @@ class EmojiReactService < BaseService
    status = emoji_reaction.status

    if status.account.local?
-      LocalNotificationWorker.perform_async(status.account_id, emoji_reaction.id, 'EmojiReaction', 'reaction') if status.account.user&.setting_emoji_reaction_streaming_notify_impl2
-      LocalNotificationWorker.perform_async(status.account_id, emoji_reaction.id, 'EmojiReaction', 'emoji_reaction')
+      if status.account.user&.setting_enable_emoji_reaction
+        LocalNotificationWorker.perform_async(status.account_id, emoji_reaction.id, 'EmojiReaction', 'reaction') if status.account.user&.setting_emoji_reaction_streaming_notify_impl2
+        LocalNotificationWorker.perform_async(status.account_id, emoji_reaction.id, 'EmojiReaction', 'emoji_reaction')
+      end
    elsif status.account.activitypub?
      ActivityPub::DeliveryWorker.perform_async(build_json(emoji_reaction), emoji_reaction.account_id, status.account.inbox_url)
    end
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@ -39,6 +39,7 @@

    .fields-group
      = ff.input :'web.hide_recent_emojis', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_hide_recent_emojis'), hint: false
+      = ff.input :'web.enable_emoji_reaction', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_enable_emoji_reaction'), hint: I18n.t('simple_form.hints.defaults.setting_enable_emoji_reaction')

    .fields-group
      = ff.input :'web.bookmark_category_needed', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_bookmark_category_needed'), hint: I18n.t('simple_form.hints.defaults.setting_bookmark_category_needed')
--- a/app/workers/delivery_emoji_reaction_worker.rb
+++ b/app/workers/delivery_emoji_reaction_worker.rb
@ -11,7 +11,7 @@ class DeliveryEmojiReactionWorker

    if status.present?
      scope_status(status).includes(:user).find_each do |account|
-        redis.publish("timeline:#{account.id}", payload_json) if (account.user.nil? || !account.user&.setting_stop_emoji_reaction_streaming) && redis.exists?("subscribed:timeline:#{account.id}")
+        redis.publish("timeline:#{account.id}", payload_json) if (account.user.nil? || (!account.user&.setting_stop_emoji_reaction_streaming && !account.user&.setting_enable_emoji_reaction)) && redis.exists?("subscribed:timeline:#{account.id}")
      end
    end

--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@ -69,6 +69,7 @@ en:
        setting_dtl_force_subscribable: Your post can be detected local user's antenna to subscribe deep timeline
        setting_dtl_force_with_tag: "With using #%{tag} tag, your post settings will be changed forcibly"
        setting_dtl_menu: Show DTL menu on web
+        setting_enable_emoji_reaction: If turn off, other users still can react your posts
        setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details
        setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed
        username: You can use letters, numbers, and underscores
@ -241,6 +242,7 @@ en:
        setting_dtl_force_subscribable: Ignore your dissubscribable setting when using the DTL tag
        setting_dtl_force_with_tag: Post with DTL tag
        setting_emoji_reaction_streaming_notify_impl2: Enable stamp notification compat with Nyastodon, Catstodon, glitch-soc
+        setting_enable_emoji_reaction: Show emoji reaction on your display
        setting_enable_login_privacy: Enable login visibility
        setting_expand_spoilers: Always expand posts marked with content warnings
        setting_hide_followers_count: Hide followers count
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@ -71,6 +71,7 @@ ja:
        setting_dtl_force_subscribable: 購読拒否設定に関係なく、ディープタイムラインに向けた投稿はアンテナに掲載されます。ディープタイムラインをアンテナ経由で閲覧している人にあなたの発言が届きます
        setting_dtl_force_with_tag: "ハッシュタグ #%{tag} をつけて投稿するとき、公開範囲と検索許可を強制的に置き換えるかを設定します"
        setting_emoji_reaction_streaming_notify_impl2: 当該サーバーの独自機能に対応したアプリを利用時に、スタンプ機能を利用できます。動作確認していないため（そもそもそのようなアプリ自体を確認できていないため）正しく動かない場合があります
+        setting_enable_emoji_reaction: この機能を無効にしても、他の人はあなたの投稿にスタンプをつけられます
        setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
        setting_link_preview: プレビュー生成を停止することは、センシティブなサイトへのリンクを頻繁に投稿する人にも有効かもしれません
        setting_noai: AI学習への利用を禁止するメタタグをプロフィールページに追加します。ただし実効性があるとは限りません
@ -252,6 +253,7 @@ ja:
        setting_dtl_menu: Webクライアントのメニューにディープタイムラインを追加する
        setting_enable_login_privacy: 公開範囲「ログインユーザーのみ」をWeb UIで選択可能にする
        setting_emoji_reaction_streaming_notify_impl2: Nyastodon, Catstodon, glitch-soc互換のスタンプ機能を有効にする
+        setting_enable_emoji_reaction: 自分の画面に絵文字リアクションを表示する
        setting_expand_spoilers: 閲覧注意としてマークされた投稿を常に展開する
        setting_hide_followers_count: フォロワー数を隠す
        setting_hide_following_count: フォロー数を隠す