From 859424194729089b9b3f22235bf6f89c22beb039 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Fri, 10 Feb 2023 21:35:32 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=AB=E3=82=BF=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=9F=E6=8A=95=E7=A8=BF=E3=81=AE=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E5=90=8D=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subwaytooter/appsetting/AppSettingItem.kt |  3 ++
 .../ItemViewHolderShowStatus.kt               | 28 +++++++++++--------
 .../jp/juggler/subwaytooter/pref/PrefB.kt     |  5 ++++
 app/src/main/res/values-ja/strings.xml        |  3 +-
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt b/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt
index b2f66dc7..4dc54fc7 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt
@@ -395,7 +395,10 @@ val appSettingRoot = AppSettingItem(null, SettingType.Section, R.string.app_sett
         )
 
         sw(PrefB.bpEnablePixelfed, R.string.enable_connect_to_pixelfed_server)
+
         sw(PrefB.bpShowFilteredWord, R.string.show_filtered_word)
+        sw(PrefB.bpShowUsernameFilteredPost,R.string.show_username_on_filtered_post)
+
         sw(PrefB.bpEnableDomainTimeline, R.string.enable_domain_timeline)
     }
 
diff --git a/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderShowStatus.kt b/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderShowStatus.kt
index d1cb7391..39deeea1 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderShowStatus.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/itemviewholder/ItemViewHolderShowStatus.kt
@@ -58,18 +58,20 @@ fun ItemViewHolder.showStatus(
 
     val filteredWord = status.filteredWord
     if (filteredWord != null) {
-        PrefI.ipEventBgColorFiltered.value.notZero()?.let{
+        PrefI.ipEventBgColorFiltered.value.notZero()?.let {
             viewRoot.backgroundColor = it
         }
-        showMessageHolder(
-            TootMessageHolder(
-                if (PrefB.bpShowFilteredWord.value) {
-                    "${activity.getString(R.string.filtered)} / $filteredWord"
-                } else {
-                    activity.getString(R.string.filtered)
-                }
-            )
-        )
+        val text = StringBuilder().apply {
+            append(activity.getString(R.string.filtered))
+            if (PrefB.bpShowFilteredWord.value) {
+                append(" / $filteredWord")
+            }
+            if (PrefB.bpShowUsernameFilteredPost.value) {
+                val s = status.reblog ?: status
+                append(" / ${s.account.display_name} @${s.account.acct}")
+            }
+        }.toString()
+        showMessageHolder(TootMessageHolder(text))
         return
     }
 
@@ -211,8 +213,10 @@ private fun ItemViewHolder.showSpoilerTextAndContent(status: TootStatus) {
 // 予約投稿でも使う
 fun ItemViewHolder.setContentVisibility(shown: Boolean) {
     llContents.visibility = if (shown) View.VISIBLE else View.GONE
-    btnContentWarning.contentDescription = activity.getString(if (shown) R.string.hide else R.string.show)
-    btnContentWarning.imageResource = if (shown) R.drawable.outline_compress_24 else R.drawable.outline_expand_24
+    btnContentWarning.contentDescription =
+        activity.getString(if (shown) R.string.hide else R.string.show)
+    btnContentWarning.imageResource =
+        if (shown) R.drawable.outline_compress_24 else R.drawable.outline_expand_24
 
     statusShowing?.let { status ->
         val r = status.auto_cw
diff --git a/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt b/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt
index 714c8165..6f461d2b 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt
@@ -355,4 +355,9 @@ object PrefB {
         "MisskeyNotificationCheck",
         false
     )
+
+    val bpShowUsernameFilteredPost = BooleanPref(
+        "ShowUsernameFilteredPost",
+        false
+    )
 }
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6415f6d9..8cca403c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1252,4 +1252,5 @@
     <string name="incorrect_chars">文字 \"%1$s\" は使えません</string>
     <string name="approved">承認されました。</string>
     <string name="account_list">アカウント一覧</string>
-</resources>
\ No newline at end of file
+    <string name="show_username_on_filtered_post">フィルタされた投稿にユーザ名を表示する</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ba70592..d8df8ffc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1253,4 +1253,5 @@
     <string name="glide_test">glide test</string>
     <string name="default_post_account_default_action">viewing column account(phone), or ask always(tablet)</string>
     <string name="quick_post_account">Quick post account</string>
+    <string name="show_username_on_filtered_post">Show username on filtered post</string>
 </resources>
\ No newline at end of file