From 8757ac7deb4e33d98e689ee5f1ea8ff0024afae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?=
 <tt@kmycode.net>
Date: Wed, 3 Jan 2024 22:10:13 +0900
Subject: [PATCH] =?UTF-8?q?Add:=20#396=20=E3=82=B9=E3=82=BF=E3=83=B3?=
 =?UTF-8?q?=E3=83=97=E3=81=AE=E6=95=B0=E5=AD=97=E3=82=92=E9=9A=A0=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=20(#412)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mastodon/components/status_emoji_reactions_bar.jsx | 10 ++++++++--
 app/javascript/mastodon/initial_state.js               |  1 +
 app/models/concerns/user/has_settings.rb               |  4 ++++
 app/models/user_settings.rb                            |  1 +
 app/serializers/initial_state_serializer.rb            |  1 +
 .../settings/preferences/appearance/show.html.haml     |  1 +
 config/locales/simple_form.en.yml                      |  1 +
 config/locales/simple_form.ja.yml                      |  1 +
 8 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx b/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
index 5592c04f4c..84fb45f4f7 100644
--- a/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
+++ b/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
@@ -7,6 +7,8 @@ import classNames from 'classnames';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
+import { isHideItem } from 'mastodon/initial_state';
+
 import EmojiView from './emoji_view';
 
 class EmojiReactionButton extends PureComponent {
@@ -41,12 +43,14 @@ class EmojiReactionButton extends PureComponent {
       'toggled': me,
     };
 
+    const countView = count !== undefined && <span className='count'>{count}</span>;
+
     return (
       <button className={classNames(classList)} type='button' onClick={this.onClick}>
         <span className='emoji'>
           <EmojiView name={name} url={url} staticUrl={staticUrl} />
         </span>
-        <span className='count'>{count}</span>
+        {countView}
       </button>
     );
   }
@@ -76,6 +80,8 @@ class StatusEmojiReactionsBar extends PureComponent {
   render () {
     const { emojiReactions, myReactionOnly } = this.props;
 
+    const isShowCount = !isHideItem('emoji_reaction_count');
+
     const emojiButtons = Array.from(emojiReactions)
       .filter(emoji => emoji.get('count') !== 0)
       .filter(emoji => !myReactionOnly || emoji.get('me'))
@@ -83,7 +89,7 @@ class StatusEmojiReactionsBar extends PureComponent {
         <EmojiReactionButton
           key={index}
           name={emoji.get('name')}
-          count={myReactionOnly ? 1 : emoji.get('count')}
+          count={isShowCount ? (myReactionOnly ? 1 : emoji.get('count')) : undefined}
           me={emoji.get('me')}
           url={emoji.get('url')}
           staticUrl={emoji.get('static_url')}
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 480c4edb3b..49b23789d2 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -5,6 +5,7 @@
  * @typedef { 'blocking_quote'
  *   | 'emoji_reaction_on_timeline'
  *   | 'emoji_reaction_unavailable_server'
+ *   | 'emoji_reaction_count'
  *   | 'favourite_menu'
  *   | 'quote_in_home'
  *   | 'quote_in_public'
diff --git a/app/models/concerns/user/has_settings.rb b/app/models/concerns/user/has_settings.rb
index c85a550c50..adb2257ee9 100644
--- a/app/models/concerns/user/has_settings.rb
+++ b/app/models/concerns/user/has_settings.rb
@@ -259,6 +259,10 @@ module User::HasSettings
     settings['web.hide_emoji_reaction_unavailable_server']
   end
 
+  def setting_hide_emoji_reaction_count
+    settings['web.hide_emoji_reaction_count']
+  end
+
   def setting_hide_favourite_menu
     settings['web.hide_favourite_menu']
   end
diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb
index 0b9093cf9a..06dde3f72b 100644
--- a/app/models/user_settings.rb
+++ b/app/models/user_settings.rb
@@ -72,6 +72,7 @@ class UserSettings
     setting :hide_blocking_quote, default: true
     setting :hide_emoji_reaction_unavailable_server, default: false
     setting :hide_favourite_menu, default: false
+    setting :hide_emoji_reaction_count, default: false
   end
 
   namespace :notification_emails do
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 7812fff412..9115085a64 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -41,6 +41,7 @@ class InitialStateSerializer < ActiveModel::Serializer
         object_account_user.setting_hide_recent_emojis ? 'recent_emojis' : nil,
         object_account_user.setting_hide_blocking_quote ? 'blocking_quote' : nil,
         object_account_user.setting_hide_emoji_reaction_unavailable_server ? 'emoji_reaction_unavailable_server' : nil,
+        object_account_user.setting_hide_emoji_reaction_count ? 'emoji_reaction_count' : nil,
         object_account_user.setting_show_emoji_reaction_on_timeline ? nil : 'emoji_reaction_on_timeline',
         object_account_user.setting_show_quote_in_home ? nil : 'quote_in_home',
         object_account_user.setting_show_quote_in_public ? nil : 'quote_in_public',
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index ee2454739c..7536586598 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -46,6 +46,7 @@
         = 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')
         = ff.input :'web.show_emoji_reaction_on_timeline', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_emoji_reaction_on_timeline')
         = ff.input :'web.hide_emoji_reaction_unavailable_server', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_hide_emoji_reaction_unavailable_server')
+        = ff.input :'web.hide_emoji_reaction_count', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_hide_emoji_reaction_count')
 
     %h4= t 'appearance.saved_posts'
 
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 92c3f6557e..076f6d293d 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -269,6 +269,7 @@ en:
           outside_only: Followings or followers only
         setting_expand_spoilers: Always expand posts marked with content warnings
         setting_hide_blocking_quote: Hide posts which have a quote written by the user you are blocking
+        setting_hide_emoji_reaction_count: Hide stamp count
         setting_hide_emoji_reaction_unavailable_server: Hide stamp button from unavailable server
         setting_hide_favourite_menu: Hide favourite menu
         setting_hide_followers_count: Hide followers count
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index c3b9c08323..bdd15a2783 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -278,6 +278,7 @@ ja:
         setting_enable_emoji_reaction: スタンプ機能を使用する
         setting_expand_spoilers: 閲覧注意としてマークされた投稿を常に展開する
         setting_hide_blocking_quote: ブロックしたユーザーの投稿を引用した投稿を隠す
+        setting_hide_emoji_reaction_count: 各スタンプの数を隠す
         setting_hide_emoji_reaction_unavailable_server: スタンプに対応していないと思われるサーバーの投稿からスタンプボタンを隠す
         setting_hide_favourite_menu: 右サイドメニューから「お気に入り」を隠す
         setting_hide_followers_count: フォロワー数を隠す