refactor(backend): Use exist to check existence

* refactor(backend): 存在確認の`findOneBy`を`exist`に置き換え

* cleanup

packages/backend/src/server/api/endpoints/admin/promo/create.ts

@@ -40,9 +40,9 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw err;
 	});
 
-	const exist = await PromoNotes.findOneBy({ noteId: note.id });
+	const exist = await PromoNotes.exist({ where: { noteId: note.id } });
 
-	if (exist != null) {
+	if (exist) {
 		throw new ApiError(meta.errors.alreadyPromoted);
 	}
 

packages/backend/src/server/api/endpoints/auth/accept.ts

@@ -41,12 +41,14 @@ export default define(meta, paramDef, async (ps, user) => {
 	const accessToken = secureRndstr(32, true);
 
 	// Fetch exist access token
-	const exist = await AccessTokens.findOneBy({
+	const exist = await AccessTokens.exist({
-		appId: session.appId,
+		where: {
-		userId: user.id,
+			appId: session.appId,
+			userId: user.id,
+		},
 	});
 
-	if (exist == null) {
+	if (!exist) {
 		// Lookup app
 		const app = await Apps.findOneByOrFail({ id: session.appId });
 

packages/backend/src/server/api/endpoints/blocking/create.ts

@@ -69,12 +69,14 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Check if already blocking
-	const exist = await Blockings.findOneBy({
+	const exist = await Blockings.exist({
-		blockerId: blocker.id,
+		where: {
-		blockeeId: blockee.id,
+			blockerId: blocker.id,
+			blockeeId: blockee.id,
+		},
 	});
 
-	if (exist != null) {
+	if (exist) {
 		throw new ApiError(meta.errors.alreadyBlocking);
 	}
 

packages/backend/src/server/api/endpoints/blocking/delete.ts

@@ -69,12 +69,14 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Check not blocking
-	const exist = await Blockings.findOneBy({
+	const exist = await Blockings.exist({
-		blockerId: blocker.id,
+		where: {
-		blockeeId: blockee.id,
+			blockerId: blocker.id,
+			blockeeId: blockee.id,
+		},
 	});
 
-	if (exist == null) {
+	if (!exist) {
 		throw new ApiError(meta.errors.notBlocking);
 	}
 

packages/backend/src/server/api/endpoints/clips/add-note.ts

@@ -57,12 +57,14 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw err;
 	});
 
-	const exist = await ClipNotes.findOneBy({
+	const exist = await ClipNotes.exist({
-		noteId: note.id,
+		where: {
-		clipId: clip.id,
+			noteId: note.id,
+			clipId: clip.id,
+		},
 	});
 
-	if (exist != null) {
+	if (exist) {
 		throw new ApiError(meta.errors.alreadyClipped);
 	}
 

packages/backend/src/server/api/endpoints/drive/files/check-existence.ts

@@ -26,10 +26,12 @@ export const paramDef = {
 } as const;
 
 export default define(meta, paramDef, async (ps, user) => {
-	const file = await DriveFiles.findOneBy({
+	const exist = await DriveFiles.exist({
-		md5: ps.md5,
+		where: {
-		userId: user.id,
+			md5: ps.md5,
+			userId: user.id,
+		},
 	});
 
-	return file != null;
+	return exist;
 });

packages/backend/src/server/api/endpoints/following/create.ts

@@ -82,12 +82,14 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Check if already following
-	const exist = await Followings.findOneBy({
+	const exist = await Followings.exist({
-		followerId: follower.id,
+		where: {
-		followeeId: followee.id,
+			followerId: follower.id,
+			followeeId: followee.id,
+		},
 	});
 
-	if (exist != null) {
+	if (exist) {
 		throw new ApiError(meta.errors.alreadyFollowing);
 	}
 

packages/backend/src/server/api/endpoints/following/delete.ts

@@ -69,12 +69,14 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Check not following
-	const exist = await Followings.findOneBy({
+	const exist = await Followings.exist({
-		followerId: follower.id,
+		where: {
-		followeeId: followee.id,
+			followerId: follower.id,
+			followeeId: followee.id,
+		},
 	});
 
-	if (exist == null) {
+	if (!exist) {
 		throw new ApiError(meta.errors.notFollowing);
 	}
 

packages/backend/src/server/api/endpoints/gallery/posts/like.ts

@@ -40,12 +40,14 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// if already liked
-	const exist = await GalleryLikes.findOneBy({
+	const exist = await GalleryLikes.exist({
-		postId: post.id,
+		where: {
-		userId: user.id,
+			postId: post.id,
+			userId: user.id,
+		},
 	});
 
-	if (exist != null) {
+	if (exist) {
 		throw new ApiError(meta.errors.alreadyLiked);
 	}
 

packages/backend/src/server/api/endpoints/i/read-announcement.ts

@@ -30,9 +30,11 @@ export const paramDef = {
 
 export default define(meta, paramDef, async (ps, user) => {
 	// Check if announcement exists
-	const announcement = await Announcements.findOneBy({ id: ps.announcementId });
+	const exist = await Announcements.findOneBy({
+		where: { id: ps.announcementId },
+	});
 
-	if (announcement == null) {
+	if (!exist) {
 		throw new ApiError(meta.errors.noSuchAnnouncement);
 	}
 

packages/backend/src/server/api/endpoints/i/revoke-token.ts

@@ -17,9 +17,9 @@ export const paramDef = {
 } as const;
 
 export default define(meta, paramDef, async (ps, user) => {
-	const token = await AccessTokens.findOneBy({ id: ps.tokenId });
+	const exist = await AccessTokens.exist({ where: { id: ps.tokenId } });
 
-	if (token) {
+	if (exist) {
 		await AccessTokens.delete({
 			id: ps.tokenId,
 			userId: user.id,

packages/backend/src/server/api/endpoints/mute/create.ts

@@ -64,12 +64,14 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Check if already muting
-	const exist = await Mutings.findOneBy({
+	const exist = await Mutings.exist({
-		muterId: muter.id,
+		where: {
-		muteeId: mutee.id,
+			muterId: muter.id,
+			muteeId: mutee.id,
+		},
 	});
 
-	if (exist != null) {
+	if (exist) {
 		throw new ApiError(meta.errors.alreadyMuting);
 	}
 

packages/backend/src/server/api/endpoints/notes/create.ts

@@ -224,11 +224,13 @@ export default define(meta, paramDef, async (ps, user) => {
 
 		// Check blocking
 		if (renote.userId !== user.id) {
-			const block = await Blockings.findOneBy({
+			const isBlocked = await Blockings.exist({
-				blockerId: renote.userId,
+				where: {
-				blockeeId: user.id,
+					blockerId: renote.userId,
+					blockeeId: user.id,
+				},
 			});
-			if (block) {
+			if (isBlocked) {
 				throw new ApiError(meta.errors.youHaveBeenBlocked);
 			}
 		}
@@ -249,11 +251,13 @@ export default define(meta, paramDef, async (ps, user) => {
 
 		// Check blocking
 		if (reply.userId !== user.id) {
-			const block = await Blockings.findOneBy({
+			const isBlocked = await Blockings.exist({
-				blockerId: reply.userId,
+				where: {
-				blockeeId: user.id,
+					blockerId: reply.userId,
+					blockeeId: user.id,
+				},
 			});
-			if (block) {
+			if (isBlocked) {
 				throw new ApiError(meta.errors.youHaveBeenBlocked);
 			}
 		}

packages/backend/src/server/api/endpoints/notes/favorites/create.ts

@@ -43,12 +43,14 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// if already favorited
-	const exist = await NoteFavorites.findOneBy({
+	const exist = await NoteFavorites.exist({
-		noteId: note.id,
+		where: {
-		userId: user.id,
+			noteId: note.id,
+			userId: user.id,
+		},
 	});
 
-	if (exist != null) {
+	if (exist) {
 		throw new ApiError(meta.errors.alreadyFavorited);
 	}
 

packages/backend/src/server/api/endpoints/pages/like.ts

@@ -40,12 +40,14 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// if already liked
-	const exist = await PageLikes.findOneBy({
+	const exist = await PageLikes.exist({
-		pageId: page.id,
+		where: {
-		userId: user.id,
+			pageId: page.id,
+			userId: user.id,
+		},
 	});
 
-	if (exist != null) {
+	if (exist) {
 		throw new ApiError(meta.errors.alreadyLiked);
 	}
 

packages/backend/src/server/api/endpoints/promo/read.ts

@@ -33,12 +33,14 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw err;
 	});
 
-	const exist = await PromoReads.findOneBy({
+	const exist = await PromoReads.exist({
-		noteId: note.id,
+		where: {
-		userId: user.id,
+			noteId: note.id,
+			userId: user.id,
+		},
 	});
 
-	if (exist != null) {
+	if (exist) {
 		return;
 	}
 

packages/backend/src/server/api/endpoints/users/followers.ts

@@ -98,11 +98,13 @@ export default define(meta, paramDef, async (ps, me) => {
 		if (me == null) {
 			throw new ApiError(meta.errors.forbidden);
 		} else if (me.id !== user.id) {
-			const following = await Followings.findOneBy({
+			const isFollowed = await Followings.exist({
-				followeeId: user.id,
+				where: {
-				followerId: me.id,
+					followeeId: user.id,
+					followerId: me.id,
+				},
 			});
-			if (following == null) {
+			if (!isFollowed) {
 				throw new ApiError(meta.errors.nullFollowers);
 			}
 		}

packages/backend/src/server/api/endpoints/users/following.ts

@@ -97,11 +97,13 @@ export default define(meta, paramDef, async (ps, me) => {
 		if (me == null) {
 			throw new ApiError(meta.errors.forbidden);
 		} else if (me.id !== user.id) {
-			const following = await Followings.findOneBy({
+			const isFollowing = await Followings.exist({
-				followeeId: user.id,
+				where: {
-				followerId: me.id,
+					followeeId: user.id,
+					followerId: me.id,
+				},
 			});
-			if (following == null) {
+			if (!isFollowing) {
 				throw new ApiError(meta.errors.cannot_find);
 			}
 		}

packages/backend/src/server/api/endpoints/users/lists/push.ts

@@ -52,12 +52,14 @@ export const paramDef = {
 
 export default define(meta, paramDef, async (ps, me) => {
 	// Fetch the list
-	const userList = await UserLists.findOneBy({
+	const userList = await UserLists.exist({
-		id: ps.listId,
+		where: {
-		userId: me.id,
+			id: ps.listId,
+			userId: me.id,
+		},
 	});
 
-	if (userList == null) {
+	if (!exist) {
 		throw new ApiError(meta.errors.noSuchList);
 	}
 

packages/backend/src/server/api/endpoints/users/lists/show.ts

@@ -37,12 +37,14 @@ export const paramDef = {
 
 export default define(meta, paramDef, async (ps, me) => {
 	// Fetch the list
-	const userList = await UserLists.findOneBy({
+	const exist = await UserLists.exist({
-		id: ps.listId,
+		where: {
-		userId: me.id,
+			id: ps.listId,
+			userId: me.id,
+		},
 	});
 
-	if (userList == null) {
+	if (!exist) {
 		throw new ApiError(meta.errors.noSuchList);
 	}
 

packages/backend/src/server/api/stream/channels/user-list.ts

@@ -22,11 +22,13 @@ export default class extends Channel {
 		this.listId = params.listId as string;
 
 		// Check existence and owner
-		const list = await UserLists.findOneBy({
+		const exist = await UserLists.exist({
-			id: this.listId,
+			where: {
-			userId: this.user!.id,
+				id: this.listId,
+				userId: this.user!.id,
+			},
 		});
-		if (!list) return;
+		if (!exist) return;
 
 		// Subscribe stream
 		this.subscriber.on(`userListStream:${this.listId}`, this.send);