From 67064de265b1922c0520773e2f4c80415f6494c4 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: Thu, 23 Jan 2025 19:18:40 +0900
Subject: [PATCH] =?UTF-8?q?Change:=20#955=20=E3=83=95=E3=82=A3=E3=83=AB?=
 =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=81=AE=E3=80=8C=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E5=90=8D=E3=81=A0=E3=81=91=E3=82=92=E5=87=BA=E3=81=97=E3=80=81?=
 =?UTF-8?q?=E6=9C=AC=E6=96=87=E3=81=AF=E8=AD=A6=E5=91=8A=E3=81=A7=E9=9A=A0?=
 =?UTF-8?q?=E3=81=99=E3=80=8D=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=80=81?=
 =?UTF-8?q?=E5=A4=96=E8=A6=B3=E8=A8=AD=E5=AE=9A=E3=81=AB=E7=A7=BB=E5=8B=95?=
 =?UTF-8?q?=20(#970)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove: #955 フィルターのアクション`half_warn`

* Add: 「フィルター対象投稿の投稿者名やアイコンを表示する」設定

* Fix test
---
 .../mastodon/actions/notifications.js         |  2 +-
 app/javascript/mastodon/components/status.jsx | 34 ++++++++++---------
 app/javascript/mastodon/initial_state.js      |  1 +
 app/javascript/mastodon/reducers/filters.js   |  1 -
 app/javascript/mastodon/selectors/index.js    |  6 +---
 app/models/concerns/user/has_settings.rb      |  4 +++
 app/models/custom_filter.rb                   |  2 +-
 app/models/user_settings.rb                   |  1 +
 app/serializers/initial_state_serializer.rb   |  1 +
 app/serializers/rest/filter_serializer.rb     | 12 +------
 app/views/filters/_filter_fields.html.haml    |  2 +-
 .../preferences/appearance/show.html.haml     |  1 +
 config/locales/simple_form.en.yml             |  3 +-
 config/locales/simple_form.ja.yml             |  3 +-
 ...23091137_remove_half_warn_filter_option.rb | 11 ++++++
 db/schema.rb                                  |  2 +-
 lib/mastodon/version.rb                       |  2 +-
 lib/tasks/dangerous.rake                      |  1 +
 streaming/index.js                            |  5 ++-
 19 files changed, 49 insertions(+), 45 deletions(-)
 create mode 100644 db/migrate/20250123091137_remove_half_warn_filter_option.rb

diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 3dc63fe5e6..87b842e51f 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -55,7 +55,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
     if (['mention', 'status'].includes(notification.type) && notification.status.filtered) {
       const filters = notification.status.filtered.filter(result => result.filter.context.includes('notifications'));
 
-      if (filters.some(result => result.filter.filter_action_ex === 'hide')) {
+      if (filters.some(result => result.filter.filter_action === 'hide')) {
         return;
       }
 
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 9ab7c20761..c129bda7bc 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -592,24 +592,26 @@ class Status extends ImmutablePureComponent {
 
           <div className={classNames('status', `status-${status.get('visibility_ex')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted })} data-id={status.get('id')}>
 
-            <div onMouseUp={this.handleMouseUp} className='status__info'>
-              <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} className='status__relative-time'>
-                {withQuote}
-                {withReference}
-                {withExpiration}
-                {withLimited}
-                <span className='status__visibility-icon'><VisibilityIcon visibility={status.get('visibility_ex')} /></span>
-                <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
-              </Link>
+            {(!matchedFilters || expanded || isShowItem('avatar_on_filter')) && (
+              <div onMouseUp={this.handleMouseUp} className='status__info'>
+                <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} className='status__relative-time'>
+                  {withQuote}
+                  {withReference}
+                  {withExpiration}
+                  {withLimited}
+                  <span className='status__visibility-icon'><VisibilityIcon visibility={status.get('visibility_ex')} /></span>
+                  <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
+                </Link>
 
-              <Link to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} data-hover-card-account={status.getIn(['account', 'id'])} className='status__display-name'>
-                <div className='status__avatar'>
-                  {statusAvatar}
-                </div>
+                <Link to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} data-hover-card-account={status.getIn(['account', 'id'])} className='status__display-name'>
+                  <div className='status__avatar'>
+                    {statusAvatar}
+                  </div>
 
-                <DisplayName account={status.get('account')} />
-              </Link>
-            </div>
+                  <DisplayName account={status.get('account')} />
+                </Link>
+              </div>
+            )}
 
             {matchedFilters && <FilterWarning title={matchedFilters.join(', ')} expanded={this.state.showDespiteFilter} onClick={this.handleFilterToggle} />}
 
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 34e5c35339..537f625f83 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -13,6 +13,7 @@
  *   | 'recent_emojis'
  *   | 'relationships'
  *   | 'status_reference_unavailable_server'
+ *   | 'avatar_on_filter'
  * } HideItemsDefinition
  */
 
diff --git a/app/javascript/mastodon/reducers/filters.js b/app/javascript/mastodon/reducers/filters.js
index 8816f3f81b..28f0c3e6e4 100644
--- a/app/javascript/mastodon/reducers/filters.js
+++ b/app/javascript/mastodon/reducers/filters.js
@@ -9,7 +9,6 @@ const normalizeFilter = (state, filter) => {
     title: filter.title,
     context: filter.context,
     filter_action: filter.filter_action,
-    filter_action_ex: filter.filter_action_ex,
     keywords: filter.keywords,
     expires_at: filter.expires_at ? Date.parse(filter.expires_at) : null,
     with_quote: filter.with_quote,
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 6b9a7250d5..85773152f2 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -36,7 +36,6 @@ export const makeGetStatus = () => {
       }
 
       let filtered = false;
-      let filterAction = 'warn';
       if ((accountReblog || accountBase).get('id') !== me && filters) {
         let filterResults = statusReblog?.get('filtered') || statusBase.get('filtered') || ImmutableList();
         const quoteFilterResults = statusQuote?.get('filtered');
@@ -47,13 +46,12 @@ export const makeGetStatus = () => {
           }
         }
 
-        if (filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action_ex']) === 'hide')) {
+        if (filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action']) === 'hide')) {
           return null;
         }
         filterResults = filterResults.filter(result => filters.has(result.get('filter')));
         if (!filterResults.isEmpty()) {
           filtered = filterResults.map(result => filters.getIn([result.get('filter'), 'title']));
-          filterAction = filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action_ex']) === 'warn') ? 'warn' : 'half_warn';
         }
       }
 
@@ -62,8 +60,6 @@ export const makeGetStatus = () => {
         map.set('quote', statusQuote);
         map.set('account', accountBase);
         map.set('matched_filters', filtered);
-        map.set('filter_action', filterAction);
-        map.set('filter_action_ex', filterAction);
       });
     },
   );
diff --git a/app/models/concerns/user/has_settings.rb b/app/models/concerns/user/has_settings.rb
index ecb8a823c5..2f8b11dcec 100644
--- a/app/models/concerns/user/has_settings.rb
+++ b/app/models/concerns/user/has_settings.rb
@@ -123,6 +123,10 @@ module User::HasSettings
     settings['web.show_relationships']
   end
 
+  def setting_show_avatar_on_filter
+    settings['web.show_avatar_on_filter']
+  end
+
   def setting_allow_quote
     settings['allow_quote']
   end
diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 3cc0490380..9e0784be28 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -38,7 +38,7 @@ class CustomFilter < ApplicationRecord
   include Expireable
   include Redisable
 
-  enum :action, { warn: 0, hide: 1, half_warn: 2 }, suffix: :action
+  enum :action, { warn: 0, hide: 1 }, suffix: :action
 
   belongs_to :account
   has_many :keywords, class_name: 'CustomFilterKeyword', inverse_of: :custom_filter, dependent: :destroy
diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb
index 05787ad1cb..c7b02b9a09 100644
--- a/app/models/user_settings.rb
+++ b/app/models/user_settings.rb
@@ -83,6 +83,7 @@ class UserSettings
     setting :hide_status_reference_unavailable_server, default: false
     setting :hide_favourite_menu, default: false
     setting :hide_emoji_reaction_count, default: false
+    setting :show_avatar_on_filter, default: true
 
     setting_inverse_alias :'web.show_blocking_quote', :'web.hide_blocking_quote'
     setting_inverse_alias :'web.show_emoji_reaction_count', :'web.hide_emoji_reaction_count'
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index a29ce33e03..9fda6d534d 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -48,6 +48,7 @@ class InitialStateSerializer < ActiveModel::Serializer
         object_account_user.setting_show_quote_in_home ? nil : 'quote_in_home',
         object_account_user.setting_show_quote_in_public ? nil : 'quote_in_public',
         object_account_user.setting_show_relationships ? nil : 'relationships',
+        object_account_user.setting_show_avatar_on_filter ? nil : 'avatar_on_filter',
       ].compact
       store[:enabled_visibilities] = enabled_visibilities
       store[:featured_tags] = object.current_account.featured_tags.pluck(:name)
diff --git a/app/serializers/rest/filter_serializer.rb b/app/serializers/rest/filter_serializer.rb
index 02df25226a..578cf16d98 100644
--- a/app/serializers/rest/filter_serializer.rb
+++ b/app/serializers/rest/filter_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::FilterSerializer < ActiveModel::Serializer
-  attributes :id, :title, :exclude_follows, :exclude_localusers, :with_quote, :with_profile, :context, :expires_at, :filter_action, :filter_action_ex
+  attributes :id, :title, :exclude_follows, :exclude_localusers, :with_quote, :with_profile, :context, :expires_at, :filter_action
   has_many :keywords, serializer: REST::FilterKeywordSerializer, if: :rules_requested?
   has_many :statuses, serializer: REST::FilterStatusSerializer, if: :rules_requested?
 
@@ -12,14 +12,4 @@ class REST::FilterSerializer < ActiveModel::Serializer
   def rules_requested?
     instance_options[:rules_requested]
   end
-
-  def filter_action
-    return :warn if object.half_warn_action?
-
-    object.filter_action
-  end
-
-  def filter_action_ex
-    object.filter_action
-  end
 end
diff --git a/app/views/filters/_filter_fields.html.haml b/app/views/filters/_filter_fields.html.haml
index 171531dc31..911b10467a 100644
--- a/app/views/filters/_filter_fields.html.haml
+++ b/app/views/filters/_filter_fields.html.haml
@@ -26,7 +26,7 @@
 .fields-group
   = f.input :filter_action,
             as: :radio_buttons,
-            collection: %i(half_warn warn hide),
+            collection: %i(warn hide),
             hint: t('simple_form.hints.filters.action'),
             include_blank: false,
             label_method: ->(action) { filter_action_label(action) },
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index dd1c710b32..7a41edcdab 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -141,6 +141,7 @@
 
     .fields-group
       = ff.input :'web.expand_content_warnings', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_expand_spoilers')
+      = ff.input :'web.show_avatar_on_filter', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_avatar_on_filter')
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 533046b998..c095585db8 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -99,7 +99,6 @@ en:
       filters:
         action: Chose which action to perform when a post matches the filter
         actions:
-          half_warn: Hide the filtered content (exclude account info) behind a warning mentioning the filter's title
           hide: Completely hide the filtered content, behaving as if it did not exist
           warn: Hide the filtered content behind a warning mentioning the filter's title
       form_admin_settings:
@@ -320,6 +319,7 @@ en:
         setting_reject_unlisted_subscription: Reject sending unlisted visibility/non-public searchability posts to Misskey, Calckey
         setting_reverse_search_quote: Perform word-by-word search when search keywords are not enclosed in double quotes
         setting_show_application: Disclose application used to send posts
+        setting_show_avatar_on_filter: Show filtered posts with avatar and user profile
         setting_show_blocking_quote: Show posts which have a quote written by the user you are blocking
         setting_show_emoji_reaction_count: Show emoji reaction number
         setting_show_emoji_reaction_on_timeline: Show all emoji reactions on timeline
@@ -372,7 +372,6 @@ en:
         name: Hashtag
       filters:
         actions:
-          half_warn: Half hide with a warning
           hide: Hide completely
           warn: Hide with a warning
         options:
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index edbcc0a806..18daa21214 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -98,7 +98,6 @@ ja:
       filters:
         action: 投稿がフィルタに一致したときに実行するアクションを選択
         actions:
-          half_warn: フィルターに一致した投稿の本文のみを非表示にし、フィルターのタイトルを含む警告を表示します
           hide: フィルタに一致した投稿を完全に非表示にします
           warn: フィルタに一致した投稿を非表示にし、フィルタのタイトルを含む警告を表示します
       form_admin_settings:
@@ -318,6 +317,7 @@ ja:
         setting_reject_unlisted_subscription: Misskey系サーバーに「非収載」かつ検索許可「誰でも以外」の投稿を「フォロワーのみ」に変換して配送する
         setting_reverse_search_quote: ダブルクオートで囲まず検索した時、単語単位で検索する
         setting_show_application: 送信したアプリを開示する
+        setting_show_avatar_on_filter: フィルター対象投稿の投稿者名やアイコンを表示する
         setting_show_blocking_quote: ブロックしたユーザーの投稿を引用した投稿を表示する
         setting_show_emoji_reaction_count: 投稿につけられた各絵文字の数を表示する
         setting_show_emoji_reaction_on_timeline: タイムライン上の投稿に他の人のつけた絵文字を表示する
@@ -370,7 +370,6 @@ ja:
         name: ハッシュタグ
       filters:
         actions:
-          half_warn: アカウント名だけを出し、本文は警告で隠す
           hide: 完全に隠す
           warn: 警告付きで隠す
         options:
diff --git a/db/migrate/20250123091137_remove_half_warn_filter_option.rb b/db/migrate/20250123091137_remove_half_warn_filter_option.rb
new file mode 100644
index 0000000000..4c777b2c02
--- /dev/null
+++ b/db/migrate/20250123091137_remove_half_warn_filter_option.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RemoveHalfWarnFilterOption < ActiveRecord::Migration[8.0]
+  class CustomFilter < ApplicationRecord; end
+
+  def up
+    CustomFilter.where(action: 2).in_batches.update_all(action: 0)
+  end
+
+  def down; end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 08cdfeffc9..467018a3ad 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_01_08_111200) do
+ActiveRecord::Schema[8.0].define(version: 2025_01_23_091137) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 8c8ad823a8..f09f32ab30 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -2,7 +2,7 @@
 
 module Mastodon
   module Version
-    KMYBLUE_API_VERSION = 1
+    KMYBLUE_API_VERSION = 2
 
     module_function
 
diff --git a/lib/tasks/dangerous.rake b/lib/tasks/dangerous.rake
index 9a7557989e..23a7e51121 100644
--- a/lib/tasks/dangerous.rake
+++ b/lib/tasks/dangerous.rake
@@ -14,6 +14,7 @@ namespace :dangerous do
     end
 
     target_migrations = %w(
+      20250123091137
       20241208232829
       20240828123604
       20240709063700
diff --git a/streaming/index.js b/streaming/index.js
index 2a6b573d7a..4b6817d8fd 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -784,9 +784,8 @@ const startServer = async () => {
                     // custom_filters.action database column, it is an integer
                     // representing a value in an enum defined by Ruby on Rails:
                     //
-                    // enum { warn: 0, hide: 1, half_warn: 2 }
-                    filter_action: filter.filter_action === 2 ? 'warn' : ['warn', 'hide', 'half_warn'][filter.filter_action],
-                    filter_action_ex: ['warn', 'hide', 'half_warn'][filter.filter_action],
+                    // enum { warn: 0, hide: 1 }
+                    filter_action: ['warn', 'hide'][filter.filter_action],
                     with_quote: filter.with_quote,
                     withAccountName: filter.with_profile,
                     excludeFollows: filter.exclude_follows,