summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-02-10 19:43:46 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-02-10 19:43:46 +0900
commit93c3f34813027954af3e4e8a29aa631e9872d87b (patch)
tree611f52ba212970b35f88ac9947f41af9657ca5d7
parentUpdate CHANGELOG.md (diff)
downloadmisskey-93c3f34813027954af3e4e8a29aa631e9872d87b.tar.gz
misskey-93c3f34813027954af3e4e8a29aa631e9872d87b.tar.bz2
misskey-93c3f34813027954af3e4e8a29aa631e9872d87b.zip
管理画面でサイレンスされているユーザーを一覧できるように
-rw-r--r--CHANGELOG.md1
-rw-r--r--locales/ja-JP.yml1
-rw-r--r--src/client/app/admin/views/users.vue1
-rw-r--r--src/server/api/endpoints/admin/show-users.ts2
4 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d294f8a3f6..3ce46556b9 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 e9f91bb078..5aac4c7d37 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 d46c72cbe0..e0ead50f46 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 20ccfbd7f3..e883b25e79 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 } :
{}
);