diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-07-13 16:16:13 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-07-13 16:16:13 +0900 |
| commit | 12456b22c53d6247ffb0687d63343acaa35d61b3 (patch) | |
| tree | f11ac449e3131f316f2d66e957289ea04b301c9f /packages/backend/src/server/api/endpoints/blocking | |
| parent | Update about-misskey.vue (diff) | |
| parent | refactor(backend): `core/activitypub` (#11247) (diff) | |
| download | misskey-12456b22c53d6247ffb0687d63343acaa35d61b3.tar.gz misskey-12456b22c53d6247ffb0687d63343acaa35d61b3.tar.bz2 misskey-12456b22c53d6247ffb0687d63343acaa35d61b3.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/backend/src/server/api/endpoints/blocking')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/blocking/create.ts | 10 | ||||
| -rw-r--r-- | packages/backend/src/server/api/endpoints/blocking/delete.ts | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/packages/backend/src/server/api/endpoints/blocking/create.ts b/packages/backend/src/server/api/endpoints/blocking/create.ts index d9ba99f209..4ad40c8f1c 100644 --- a/packages/backend/src/server/api/endpoints/blocking/create.ts +++ b/packages/backend/src/server/api/endpoints/blocking/create.ts @@ -84,12 +84,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { }); // Check if already blocking - const exist = await this.blockingsRepository.findOneBy({ - blockerId: blocker.id, - blockeeId: blockee.id, + const exist = await this.blockingsRepository.exist({ + where: { + blockerId: blocker.id, + blockeeId: blockee.id, + }, }); - if (exist != null) { + if (exist) { throw new ApiError(meta.errors.alreadyBlocking); } diff --git a/packages/backend/src/server/api/endpoints/blocking/delete.ts b/packages/backend/src/server/api/endpoints/blocking/delete.ts index 46dd26a45a..38913ae932 100644 --- a/packages/backend/src/server/api/endpoints/blocking/delete.ts +++ b/packages/backend/src/server/api/endpoints/blocking/delete.ts @@ -84,12 +84,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { }); // Check not blocking - const exist = await this.blockingsRepository.findOneBy({ - blockerId: blocker.id, - blockeeId: blockee.id, + const exist = await this.blockingsRepository.exist({ + where: { + blockerId: blocker.id, + blockeeId: blockee.id, + } }); - if (exist == null) { + if (!exist) { throw new ApiError(meta.errors.notBlocking); } |