From 93c3f34813027954af3e4e8a29aa631e9872d87b Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 10 Feb 2019 19:43:46 +0900
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2=E3=81=A7?=
 =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=83=AC=E3=83=B3=E3=82=B9=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E3=82=92=E4=B8=80=E8=A6=A7=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                 | 1 +
 locales/ja-JP.yml                            | 1 +
 src/client/app/admin/views/users.vue         | 1 +
 src/server/api/endpoints/admin/show-users.ts | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d294f8a3f..3ce46556b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ unreleased
 ----------
 * deckにフォローされていますマークを追加
 * URLプレビューのサムネイルの調整
+* 管理画面でサイレンスされているユーザーを一覧できるように
 * ジョブキューを無効化
 * 軽微なバグ修正
 
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e9f91bb07..5aac4c7d3 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1319,6 +1319,7 @@ admin/views/users.vue:
       moderator: "モデレーター"
       adminOrModerator: "管理者+モデレーター"
       verified: "公式アカウント"
+      silenced: "サイレンス済み"
       suspended: "凍結済み"
     origin:
       title: "オリジン"
diff --git a/src/client/app/admin/views/users.vue b/src/client/app/admin/views/users.vue
index d46c72cbe..e0ead50f4 100644
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@@ -48,6 +48,7 @@
 					<option value="admin">{{ $t('users.state.admin') }}</option>
 					<option value="moderator">{{ $t('users.state.moderator') }}</option>
 					<option value="verified">{{ $t('users.state.verified') }}</option>
+					<option value="silenced">{{ $t('users.state.silenced') }}</option>
 					<option value="suspended">{{ $t('users.state.suspended') }}</option>
 				</ui-select>
 				<ui-select v-model="origin">
diff --git a/src/server/api/endpoints/admin/show-users.ts b/src/server/api/endpoints/admin/show-users.ts
index 20ccfbd7f..e883b25e7 100644
--- a/src/server/api/endpoints/admin/show-users.ts
+++ b/src/server/api/endpoints/admin/show-users.ts
@@ -35,6 +35,7 @@ export const meta = {
 				'moderator',
 				'adminOrModerator',
 				'verified',
+				'silenced',
 				'suspended',
 			]),
 			default: 'all'
@@ -101,6 +102,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 			}]
 		} :
 		ps.state == 'verified' ? { isVerified: true } :
+		ps.state == 'silenced' ? { isSilenced: true } :
 		ps.state == 'suspended' ? { isSuspended: true } :
 		{}
 	);