From 417d252e9d701f95e809ebd21a33b701bc239c0b Mon Sep 17 00:00:00 2001 From: Johann150 Date: Tue, 3 Jan 2023 02:42:42 +0100 Subject: [PATCH] server: fix custom lint typeorm-prefer-count --- packages/backend/src/remote/activitypub/renderer/note.ts | 4 ++-- .../backend/src/server/api/endpoints/blocking/create.ts | 4 ++-- .../backend/src/server/api/endpoints/clips/add-note.ts | 4 ++-- .../server/api/endpoints/drive/files/check-existence.ts | 4 +--- .../backend/src/server/api/endpoints/following/create.ts | 4 ++-- .../src/server/api/endpoints/gallery/posts/like.ts | 4 ++-- .../src/server/api/endpoints/i/read-announcement.ts | 4 ++-- packages/backend/src/server/api/endpoints/mute/create.ts | 4 ++-- .../src/server/api/endpoints/notes/favorites/create.ts | 4 ++-- packages/backend/src/server/api/endpoints/pages/like.ts | 4 ++-- .../src/server/api/endpoints/renote-mute/create.ts | 4 ++-- packages/backend/src/server/api/endpoints/sw/register.ts | 4 ++-- packages/backend/src/services/add-note-to-antenna.ts | 2 +- .../backend/src/services/following/requests/create.ts | 8 ++++---- 14 files changed, 28 insertions(+), 30 deletions(-) diff --git a/packages/backend/src/remote/activitypub/renderer/note.ts b/packages/backend/src/remote/activitypub/renderer/note.ts index 1bcb5eae2..c097d2640 100644 --- a/packages/backend/src/remote/activitypub/renderer/note.ts +++ b/packages/backend/src/remote/activitypub/renderer/note.ts @@ -25,9 +25,9 @@ export default async function renderNote(note: Note, dive = true, isTalk = false inReplyToNote = await Notes.findOneBy({ id: note.replyId }); if (inReplyToNote != null) { - const inReplyToUser = await Users.findOneBy({ id: inReplyToNote.userId }); + const inReplyToUserExists = await Users.countBy({ id: inReplyToNote.userId }); - if (inReplyToUser != null) { + if (!inReplyToUserExists) { if (inReplyToNote.uri) { inReplyTo = inReplyToNote.uri; } else { diff --git a/packages/backend/src/server/api/endpoints/blocking/create.ts b/packages/backend/src/server/api/endpoints/blocking/create.ts index 7f45ad522..4a9a2db4a 100644 --- a/packages/backend/src/server/api/endpoints/blocking/create.ts +++ b/packages/backend/src/server/api/endpoints/blocking/create.ts @@ -48,12 +48,12 @@ export default define(meta, paramDef, async (ps, user) => { }); // Check if already blocking - const exist = await Blockings.findOneBy({ + const blocked = await Blockings.countBy({ blockerId: blocker.id, blockeeId: blockee.id, }); - if (exist != null) throw new ApiError('ALREADY_BLOCKING'); + if (blocked) throw new ApiError('ALREADY_BLOCKING'); await create(blocker, blockee); diff --git a/packages/backend/src/server/api/endpoints/clips/add-note.ts b/packages/backend/src/server/api/endpoints/clips/add-note.ts index 13b432d13..6317db0f3 100644 --- a/packages/backend/src/server/api/endpoints/clips/add-note.ts +++ b/packages/backend/src/server/api/endpoints/clips/add-note.ts @@ -37,12 +37,12 @@ export default define(meta, paramDef, async (ps, user) => { throw err; }); - const exist = await ClipNotes.findOneBy({ + const exist = await ClipNotes.countBy({ noteId: note.id, clipId: clip.id, }); - if (exist != null) throw new ApiError('ALREADY_CLIPPED'); + if (exist) throw new ApiError('ALREADY_CLIPPED'); await ClipNotes.insert({ id: genId(), diff --git a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts index ef12d1837..73d20450d 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts @@ -26,10 +26,8 @@ export const paramDef = { // eslint-disable-next-line import/no-default-export export default define(meta, paramDef, async (ps, user) => { - const file = await DriveFiles.findOneBy({ + return 0 < await DriveFiles.countBy({ md5: ps.md5, userId: user.id, }); - - return file != null; }); diff --git a/packages/backend/src/server/api/endpoints/following/create.ts b/packages/backend/src/server/api/endpoints/following/create.ts index 90ec95172..9341024c0 100644 --- a/packages/backend/src/server/api/endpoints/following/create.ts +++ b/packages/backend/src/server/api/endpoints/following/create.ts @@ -49,12 +49,12 @@ export default define(meta, paramDef, async (ps, user) => { }); // Check if already following - const exist = await Followings.findOneBy({ + const exist = await Followings.countBy({ followerId: follower.id, followeeId: followee.id, }); - if (exist != null) throw new ApiError('ALREADY_FOLLOWING'); + if (exist) throw new ApiError('ALREADY_FOLLOWING'); try { await create(follower, followee); diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts index 3e0eda503..1525d4dad 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts @@ -27,12 +27,12 @@ export default define(meta, paramDef, async (ps, user) => { if (post == null) throw new ApiError('NO_SUCH_POST'); // if already liked - const exist = await GalleryLikes.findOneBy({ + const exist = await GalleryLikes.countBy({ postId: post.id, userId: user.id, }); - if (exist != null) throw new ApiError('ALREADY_LIKED'); + if (exist) throw new ApiError('ALREADY_LIKED'); // Create like await GalleryLikes.insert({ diff --git a/packages/backend/src/server/api/endpoints/i/read-announcement.ts b/packages/backend/src/server/api/endpoints/i/read-announcement.ts index 433cb79b5..bbb510f0d 100644 --- a/packages/backend/src/server/api/endpoints/i/read-announcement.ts +++ b/packages/backend/src/server/api/endpoints/i/read-announcement.ts @@ -30,12 +30,12 @@ export default define(meta, paramDef, async (ps, user) => { if (!exists) throw new ApiError('NO_SUCH_ANNOUNCEMENT'); // Check if already read - const read = await AnnouncementReads.findOneBy({ + const read = await AnnouncementReads.countBy({ announcementId: ps.announcementId, userId: user.id, }); - if (read != null) return; + if (read) return; // Create read await AnnouncementReads.insert({ diff --git a/packages/backend/src/server/api/endpoints/mute/create.ts b/packages/backend/src/server/api/endpoints/mute/create.ts index 705fe9deb..ab013bade 100644 --- a/packages/backend/src/server/api/endpoints/mute/create.ts +++ b/packages/backend/src/server/api/endpoints/mute/create.ts @@ -43,12 +43,12 @@ export default define(meta, paramDef, async (ps, user) => { }); // Check if already muting - const exist = await Mutings.findOneBy({ + const exist = await Mutings.countBy({ muterId: muter.id, muteeId: mutee.id, }); - if (exist != null) throw new ApiError('ALREADY_MUTING'); + if (exist) throw new ApiError('ALREADY_MUTING'); if (ps.expiresAt && ps.expiresAt <= Date.now()) { return; diff --git a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts index ffcb9b9e2..4ae1f0830 100644 --- a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts @@ -31,12 +31,12 @@ export default define(meta, paramDef, async (ps, user) => { }); // if already favorited - const exist = await NoteFavorites.findOneBy({ + const exist = await NoteFavorites.countBy({ noteId: note.id, userId: user.id, }); - if (exist != null) throw new ApiError('ALREADY_FAVORITED'); + if (exist) throw new ApiError('ALREADY_FAVORITED'); // Create favorite await NoteFavorites.insert({ diff --git a/packages/backend/src/server/api/endpoints/pages/like.ts b/packages/backend/src/server/api/endpoints/pages/like.ts index 19b0d99ed..a3f8f3f3a 100644 --- a/packages/backend/src/server/api/endpoints/pages/like.ts +++ b/packages/backend/src/server/api/endpoints/pages/like.ts @@ -27,12 +27,12 @@ export default define(meta, paramDef, async (ps, user) => { if (page == null) throw new ApiError('NO_SUCH_PAGE'); // if already liked - const exist = await PageLikes.findOneBy({ + const exist = await PageLikes.countBy({ pageId: page.id, userId: user.id, }); - if (exist != null) throw new ApiError('ALREADY_LIKED'); + if (exist) throw new ApiError('ALREADY_LIKED'); // Create like await PageLikes.insert({ diff --git a/packages/backend/src/server/api/endpoints/renote-mute/create.ts b/packages/backend/src/server/api/endpoints/renote-mute/create.ts index 9320c4e2c..461312969 100644 --- a/packages/backend/src/server/api/endpoints/renote-mute/create.ts +++ b/packages/backend/src/server/api/endpoints/renote-mute/create.ts @@ -38,12 +38,12 @@ export default define(meta, paramDef, async (ps, user) => { }); // Check if already muting - const exist = await RenoteMutings.findOneBy({ + const exist = await RenoteMutings.countBy({ muterId: muter.id, muteeId: mutee.id, }); - if (exist != null) throw new ApiError('ALREADY_MUTING'); + if (exist) throw new ApiError('ALREADY_MUTING'); // Create mute await RenoteMutings.insert({ diff --git a/packages/backend/src/server/api/endpoints/sw/register.ts b/packages/backend/src/server/api/endpoints/sw/register.ts index 437f8874f..5ae858b99 100644 --- a/packages/backend/src/server/api/endpoints/sw/register.ts +++ b/packages/backend/src/server/api/endpoints/sw/register.ts @@ -40,7 +40,7 @@ export const paramDef = { // eslint-disable-next-line import/no-default-export export default define(meta, paramDef, async (ps, user) => { // if already subscribed - const exist = await SwSubscriptions.findOneBy({ + const exist = await SwSubscriptions.countBy({ userId: user.id, endpoint: ps.endpoint, auth: ps.auth, @@ -49,7 +49,7 @@ export default define(meta, paramDef, async (ps, user) => { const instance = await fetchMeta(true); - if (exist != null) { + if (exist) { return { state: 'already-subscribed' as const, key: instance.swPublicKey, diff --git a/packages/backend/src/services/add-note-to-antenna.ts b/packages/backend/src/services/add-note-to-antenna.ts index ecb57376c..e490eaf11 100644 --- a/packages/backend/src/services/add-note-to-antenna.ts +++ b/packages/backend/src/services/add-note-to-antenna.ts @@ -46,7 +46,7 @@ export async function addNoteToAntenna(antenna: Antenna, note: Note, noteUser: { // Notify if not read after 2 seconds setTimeout(async () => { - const unread = await AntennaNotes.findOneBy({ antennaId: antenna.id, read: false }); + const unread = await AntennaNotes.countBy({ antennaId: antenna.id, read: false }); if (unread) { publishMainStream(antenna.userId, 'unreadAntenna', antenna); } diff --git a/packages/backend/src/services/following/requests/create.ts b/packages/backend/src/services/following/requests/create.ts index 81fec5fe4..446f2de40 100644 --- a/packages/backend/src/services/following/requests/create.ts +++ b/packages/backend/src/services/following/requests/create.ts @@ -18,18 +18,18 @@ export async function createFollowRequest(follower: User, followee: User, reques // check blocking const [blocking, blocked] = await Promise.all([ - Blockings.findOneBy({ + Blockings.countBy({ blockerId: follower.id, blockeeId: followee.id, }), - Blockings.findOneBy({ + Blockings.countBy({ blockerId: followee.id, blockeeId: follower.id, }), ]); - if (blocking != null) throw new Error('blocking'); - if (blocked != null) throw new Error('blocked'); + if (blocking) throw new Error('blocking'); + if (blocked) throw new Error('blocked'); const followRequest = await FollowRequests.insert({ id: genId(),