diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a6741184848ef7db1b44db07f663bfbb22c610b..244ceb382629171c92d8896d8e14399a127663fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ - ActivityPub: not reacted 㪠Undo.Like ãŒinboxã«æ»žç•™ã™ã‚‹ã®ã‚’ä¿®æ£ ### Changes +- 連åˆã®è€ƒæ…®ã«å•é¡ŒãŒã‚ã‚‹ã“ã¨ãªã©ãŒåˆ†ã‹ã£ãŸãŸã‚ã€ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚¿ãƒ¼ã‚’ブãƒãƒƒã‚¯ã§ããªã„仕様を廃æ¢ã—ã¾ã—㟠- データベースã«ãƒã‚°ã‚’ä¿å˜ã—ãªã„よã†ã«ãªã‚Šã¾ã—㟠- ãƒã‚°ã‚’永続化ã—ãŸã„å ´åˆã¯syslogを利用ã—ã¦ãã ã•ã„ diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts index 4deaa399743df9c1409ea2f8f1f5a5d48ed8e042..2953252394d2a7759919d893283536bccb692f61 100644 --- a/src/server/api/endpoints/blocking/create.ts +++ b/src/server/api/endpoints/blocking/create.ts @@ -43,12 +43,6 @@ export const meta = { code: 'ALREADY_BLOCKING', id: '787fed64-acb9-464a-82eb-afbd745b9614' }, - - cannotBlockModerator: { - message: 'Cannot block a moderator or an admin.', - code: 'CANNOT_BLOCK_MODERATOR', - id: '8544aaef-89fb-e470-9f6c-385d38b474f5' - } }, res: { @@ -82,12 +76,7 @@ export default define(meta, async (ps, user) => { throw new ApiError(meta.errors.alreadyBlocking); } - try { - await create(blocker, blockee); - } catch (e) { - if (e.id === 'e42b7890-5e4d-9d9c-d54b-cf4dd30adfb5') throw new ApiError(meta.errors.cannotBlockModerator); - throw e; - } + await create(blocker, blockee); NoteWatchings.delete({ userId: blocker.id, diff --git a/src/services/blocking/create.ts b/src/services/blocking/create.ts index defe37751474b7e6fe53ba2c5f2513d6f5db7452..6aadc847a94298ed23bd73f43c48d7d87157d804 100644 --- a/src/services/blocking/create.ts +++ b/src/services/blocking/create.ts @@ -12,10 +12,6 @@ import { genId } from '@/misc/gen-id'; import { IdentifiableError } from '@/misc/identifiable-error'; export default async function(blocker: User, blockee: User) { - if (blockee.isAdmin || blockee.isModerator) { - throw new IdentifiableError('e42b7890-5e4d-9d9c-d54b-cf4dd30adfb5'); - } - await Promise.all([ cancelRequest(blocker, blockee), cancelRequest(blockee, blocker),