diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-05-09 23:27:34 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-05-09 23:27:34 +0900 |
| commit | 168de3c31674048856399faf549fcadbe7b4bf02 (patch) | |
| tree | d822b1dc5b53d4a5d5b75ba6e335e2187b19f491 /src/server/api | |
| parent | Validate Note on createNote (#4881) (diff) | |
| download | sharkey-168de3c31674048856399faf549fcadbe7b4bf02.tar.gz sharkey-168de3c31674048856399faf549fcadbe7b4bf02.tar.bz2 sharkey-168de3c31674048856399faf549fcadbe7b4bf02.zip | |
Resolve #4870
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/endpoints/admin/show-users.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/admin/unverify-user.ts | 38 | ||||
| -rw-r--r-- | src/server/api/endpoints/admin/verify-user.ts | 38 | ||||
| -rw-r--r-- | src/server/api/endpoints/users.ts | 2 |
4 files changed, 0 insertions, 80 deletions
diff --git a/src/server/api/endpoints/admin/show-users.ts b/src/server/api/endpoints/admin/show-users.ts index 97760ae797..8733d87a38 100644 --- a/src/server/api/endpoints/admin/show-users.ts +++ b/src/server/api/endpoints/admin/show-users.ts @@ -36,7 +36,6 @@ export const meta = { 'admin', 'moderator', 'adminOrModerator', - 'verified', 'silenced', 'suspended', ]), @@ -61,7 +60,6 @@ export default define(meta, async (ps, me) => { case 'admin': query.where('user.isAdmin = TRUE'); break; case 'moderator': query.where('user.isModerator = TRUE'); break; case 'adminOrModerator': query.where('user.isAdmin = TRUE OR isModerator = TRUE'); break; - case 'verified': query.where('user.isVerified = TRUE'); break; case 'alive': query.where('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break; case 'silenced': query.where('user.isSilenced = TRUE'); break; case 'suspended': query.where('user.isSuspended = TRUE'); break; diff --git a/src/server/api/endpoints/admin/unverify-user.ts b/src/server/api/endpoints/admin/unverify-user.ts deleted file mode 100644 index b215dbf10d..0000000000 --- a/src/server/api/endpoints/admin/unverify-user.ts +++ /dev/null @@ -1,38 +0,0 @@ -import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { Users } from '../../../../models'; - -export const meta = { - desc: { - 'ja-JP': '指定したユーザーの公式アカウントを解除します。', - 'en-US': 'Mark a user as unverified.' - }, - - tags: ['admin'], - - requireCredential: true, - requireModerator: true, - - params: { - userId: { - validator: $.type(ID), - desc: { - 'ja-JP': '対象のユーザーID', - 'en-US': 'The user ID which you want to unverify' - } - }, - } -}; - -export default define(meta, async (ps) => { - const user = await Users.findOne(ps.userId as string); - - if (user == null) { - throw new Error('user not found'); - } - - await Users.update(user.id, { - isVerified: false - }); -}); diff --git a/src/server/api/endpoints/admin/verify-user.ts b/src/server/api/endpoints/admin/verify-user.ts deleted file mode 100644 index c1b447a92b..0000000000 --- a/src/server/api/endpoints/admin/verify-user.ts +++ /dev/null @@ -1,38 +0,0 @@ -import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { Users } from '../../../../models'; - -export const meta = { - desc: { - 'ja-JP': '指定したユーザーを公式アカウントにします。', - 'en-US': 'Mark a user as verified.' - }, - - tags: ['admin'], - - requireCredential: true, - requireModerator: true, - - params: { - userId: { - validator: $.type(ID), - desc: { - 'ja-JP': '対象のユーザーID', - 'en-US': 'The user ID which you want to verify' - } - }, - } -}; - -export default define(meta, async (ps) => { - const user = await Users.findOne(ps.userId as string); - - if (user == null) { - throw new Error('user not found'); - } - - await Users.update(user.id, { - isVerified: true - }); -}); diff --git a/src/server/api/endpoints/users.ts b/src/server/api/endpoints/users.ts index be317223b6..539f2ef897 100644 --- a/src/server/api/endpoints/users.ts +++ b/src/server/api/endpoints/users.ts @@ -37,7 +37,6 @@ export const meta = { 'admin', 'moderator', 'adminOrModerator', - 'verified', 'alive' ]), default: 'all' @@ -71,7 +70,6 @@ export default define(meta, async (ps, me) => { case 'admin': query.where('user.isAdmin = TRUE'); break; case 'moderator': query.where('user.isModerator = TRUE'); break; case 'adminOrModerator': query.where('user.isAdmin = TRUE OR isModerator = TRUE'); break; - case 'verified': query.where('user.isVerified = TRUE'); break; case 'alive': query.where('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break; } |