From 8e2be5e9a7c9a851bcdbbd77bf079a40ead598dc Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 14 Oct 2021 01:55:39 +0900 Subject: chore: https://github.com/misskey-dev/misskey/commit/ba6959b8c1c4faafccdeb0f76eb26fc29e02af2d のリモート対応 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/api/endpoints/blocking/create.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/api') diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts index 850406908b..4deaa39974 100644 --- a/src/server/api/endpoints/blocking/create.ts +++ b/src/server/api/endpoints/blocking/create.ts @@ -66,10 +66,6 @@ export default define(meta, async (ps, user) => { throw new ApiError(meta.errors.blockeeIsYourself); } - if (user.isAdmin || user.isModerator) { - throw new ApiError(meta.errors.cannotBlockModerator); - } - // Get blockee const blockee = await getUser(ps.userId).catch(e => { if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); @@ -86,8 +82,12 @@ export default define(meta, async (ps, user) => { throw new ApiError(meta.errors.alreadyBlocking); } - // Create blocking - await create(blocker, blockee); + try { + await create(blocker, blockee); + } catch (e) { + if (e.id === 'e42b7890-5e4d-9d9c-d54b-cf4dd30adfb5') throw new ApiError(meta.errors.cannotBlockModerator); + throw e; + } NoteWatchings.delete({ userId: blocker.id, -- cgit v1.2.3-freya