From 80f426064854e84d85b2227a9ca6778a7f65eea5 Mon Sep 17 00:00:00 2001
From: Leah <leah@leahdevs.xyz>
Date: Sun, 19 Jan 2025 20:23:42 +0100
Subject: [PATCH 1/2] cherrypicked from sharkey

---
 locales/en-US.yml                         |  2 ++
 locales/index.d.ts                        | 10 +++++++-
 locales/ja-JP.yml                         |  2 ++
 packages/frontend/src/pages/user/home.vue | 28 +++++++++++++++++------
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 3cf165e3e..fc2f0ec15 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -136,8 +136,10 @@ markAsSensitive: "Mark as sensitive"
 unmarkAsSensitive: "Unmark as sensitive"
 enterFileName: "Enter filename"
 mute: "Mute"
+muted: "Muted"
 unmute: "Unmute"
 renoteMute: "Mute Renotes"
+renoteMuted: "Boosts muted"
 renoteUnmute: "Unmute Renotes"
 mutedReactions: "Mute reactions"
 muteThisReaction: "Mute this reaction"
diff --git a/locales/index.d.ts b/locales/index.d.ts
index da14073e8..3b0f4582f 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -568,6 +568,10 @@ export interface Locale extends ILocale {
      * ミュート
      */
     "mute": string;
+    /**
+     * ミュート
+     */
+    "muted": string;
     /**
      * ミュート解除
      */
@@ -576,6 +580,10 @@ export interface Locale extends ILocale {
      * リノートをミュート
      */
     "renoteMute": string;
+    /**
+     * ブースト・ミュート
+     */
+    "renoteMuted": string;
     /**
      * リノートのミュートを解除
      */
@@ -6843,7 +6851,7 @@ export interface Locale extends ILocale {
             };
             "_tutorialCompleted": {
                 /**
-                 * Misskey初心者講座 修了証
+                 * Forkey初心者講座 修了証
                  */
                 "title": string;
                 /**
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 0e4770453..fb5d911a8 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -138,8 +138,10 @@ markAsSensitive: "センシティブとして設定"
 unmarkAsSensitive: "センシティブを解除する"
 enterFileName: "ファイル名を入力"
 mute: "ミュート"
+muted: "ミュート"
 unmute: "ミュート解除"
 renoteMute: "リノートをミュート"
+renoteMuted: "ブースト・ミュート"
 renoteUnmute: "リノートのミュートを解除"
 mutedReactions: "リアクションのミュート"
 muteThisReaction: "このリアクションをミュートする"
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 2cd06bb7b..935c261f9 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -32,7 +32,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 								</button>
 							</div>
 						</div>
-						<span v-if="$i && $i.id != user.id && user.isFollowed" class="followed">{{ i18n.ts.followsYou }}</span>
+						<div v-if="$i && $i.id != user.id" class="info-badges">
+							<span v-if="user.isFollowed">{{ i18n.ts.followsYou }}</span>
+							<span v-if="user.isMuted">{{ i18n.ts.muted }}</span>
+							<span v-if="user.isRenoteMuted">{{ i18n.ts.renoteMuted }}</span>
+							<span v-if="user.isBlocking">{{ i18n.ts.blocked }}</span>
+						</div>
 						<div v-if="$i" class="actions">
 							<button class="menu _button" @click="menu"><i class="ti ti-dots"></i></button>
 							<MkFollowButton v-if="$i.id != user.id" v-model:user="user" :inline="true" :transparent="false" :full="true" class="koudoku"/>
@@ -469,15 +474,24 @@ onUnmounted(() => {
 						background: linear-gradient(transparent, rgba(#000, 0.7));
 					}
 
-					> .followed {
+					> .info-badges {
 						position: absolute;
 						top: 12px;
 						left: 12px;
-						padding: 4px 8px;
-						color: #fff;
-						background: rgba(0, 0, 0, 0.7);
-						font-size: 0.7em;
-						border-radius: 6px;
+						display: flex;
+						flex-direction: row;
+
+						> * {
+							padding: 4px 8px;
+							color: #fff;
+							background: rgba(0, 0, 0, 0.7);
+							font-size: 0.7em;
+							border-radius: var(--radius);
+						}
+
+						> :not(:first-child) {
+							margin-left: 8px;
+						}
 					}
 
 					> .actions {
-- 
2.45.2


From 582d559fb862d2c279c89477a16a89f8b08e71dd Mon Sep 17 00:00:00 2001
From: Leah <leah@leahdevs.xyz>
Date: Sun, 19 Jan 2025 20:27:47 +0100
Subject: [PATCH 2/2] moved them a bit closer

---
 packages/frontend/src/pages/user/home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 935c261f9..04a7d075f 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -490,7 +490,7 @@ onUnmounted(() => {
 						}
 
 						> :not(:first-child) {
-							margin-left: 8px;
+							margin-left: 4px;
 						}
 					}
 
-- 
2.45.2