From f5bea67515d00a4ff981f6fb11a951abe8c4d8a6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 21 Nov 2021 13:36:44 +0900
Subject: [PATCH] =?UTF-8?q?client:=20=E3=83=8E=E3=83=BC=E3=83=88=E3=81=AB?=
 =?UTF-8?q?=E3=83=A2=E3=83=87=E3=83=AC=E3=83=BC=E3=82=BF=E3=83=BC=E3=83=90?=
 =?UTF-8?q?=E3=83=83=E3=82=B8=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E5=BB=83=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                     | 9 +++++++++
 packages/client/src/components/note-detailed.vue | 8 --------
 packages/client/src/components/note-header.vue   | 9 ---------
 packages/client/src/ui/chat/note-header.vue      | 8 --------
 4 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f24c80fc94..d315743fe6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,15 @@
 
 -->
 
+## 12.x.x (unreleased)
+
+### Improvements
+
+### Bugfixes
+
+### Changes
+- クライアント: ノートにモデレーターバッジを表示するのを廃止
+
 ## 12.97.0 (2021/11/19)
 
 ### Improvements
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue
index 5fd8e9f6e2..378dd6516b 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@@ -42,8 +42,6 @@
 						<MkUserName :user="appearNote.user"/>
 					</MkA>
 					<span v-if="appearNote.user.isBot" class="is-bot">bot</span>
-					<span v-if="appearNote.user.isAdmin" class="admin"><i class="fas fa-bookmark"></i></span>
-					<span v-if="!appearNote.user.isAdmin && appearNote.user.isModerator" class="moderator"><i class="far fa-bookmark"></i></span>
 					<span v-if="appearNote.visibility !== 'public'" class="visibility">
 						<i v-if="appearNote.visibility === 'home'" class="fas fa-home"></i>
 						<i v-else-if="appearNote.visibility === 'followers'" class="fas fa-unlock"></i>
@@ -1017,12 +1015,6 @@ export default defineComponent({
 						border: solid 0.5px var(--divider);
 						border-radius: 4px;
 					}
-
-					> .admin,
-					> .moderator {
-						margin-right: 0.5em;
-						color: var(--badge);
-					}
 				}
 			}
 		}
diff --git a/packages/client/src/components/note-header.vue b/packages/client/src/components/note-header.vue
index ca4be1e67f..3bbeeece1e 100644
--- a/packages/client/src/components/note-header.vue
+++ b/packages/client/src/components/note-header.vue
@@ -5,8 +5,6 @@
 	</MkA>
 	<div v-if="note.user.isBot" class="is-bot">bot</div>
 	<div class="username"><MkAcct :user="note.user"/></div>
-	<div v-if="note.user.isAdmin" class="admin"><i class="fas fa-bookmark"></i></div>
-	<div v-if="!note.user.isAdmin && note.user.isModerator" class="moderator"><i class="far fa-bookmark"></i></div>
 	<div class="info">
 		<MkA class="created-at" :to="notePage(note)">
 			<MkTime :time="note.createdAt"/>
@@ -79,13 +77,6 @@ export default defineComponent({
 		border-radius: 3px;
 	}
 
-	> .admin,
-	> .moderator {
-		flex-shrink: 0;
-		margin-right: 0.5em;
-		color: var(--badge);
-	}
-
 	> .username {
 		flex-shrink: 9999999;
 		margin: 0 .5em 0 0;
diff --git a/packages/client/src/ui/chat/note-header.vue b/packages/client/src/ui/chat/note-header.vue
index 0b318ba8f1..32b4573dc4 100644
--- a/packages/client/src/ui/chat/note-header.vue
+++ b/packages/client/src/ui/chat/note-header.vue
@@ -5,8 +5,6 @@
 	</MkA>
 	<span v-if="note.user.isBot" class="is-bot">bot</span>
 	<span class="username"><MkAcct :user="note.user"/></span>
-	<span v-if="note.user.isAdmin" class="admin"><i class="fas fa-bookmark"></i></span>
-	<span v-if="!note.user.isAdmin && note.user.isModerator" class="moderator"><i class="far fa-bookmark"></i></span>
 	<div class="info">
 		<MkA class="created-at" :to="notePage(note)">
 			<MkTime :time="note.createdAt"/>
@@ -79,12 +77,6 @@ export default defineComponent({
 		border-radius: 3px;
 	}
 
-	> .admin,
-	> .moderator {
-		margin-right: 0.5em;
-		color: var(--badge);
-	}
-
 	> .username {
 		margin: 0 .5em 0 0;
 		overflow: hidden;