Remove useless async from functions

.eslintrc.cjs

@@ -15,6 +15,6 @@ module.exports = {
 	rules: {
 		"@typescript-eslint/no-unsafe-assignment": "off",
 		"@typescript-eslint/no-unsafe-argument": "off",
-		"@typescript-eslint/no-explicit-any": "off"
+		"@typescript-eslint/no-explicit-any": "off",
 	},
 };

database/entities/Application.ts

@@ -30,10 +30,7 @@ export const getFromToken = async (
  * Converts this application to an API application.
  * @returns The API application representation of this application.
  */
-export const applicationToAPI = async (
+export const applicationToAPI = (app: Application): APIApplication => {
-	app: Application
-	// eslint-disable-next-line @typescript-eslint/require-await
-): Promise<APIApplication> => {
 	return {
 		name: app.name,
 		website: app.website,

database/entities/Emoji.ts

@@ -54,8 +54,7 @@ export const addEmojiIfNotExists = async (emoji: LysandEmoji) => {
  * Converts the emoji to an APIEmoji object.
  * @returns The APIEmoji object.
  */
-// eslint-disable-next-line @typescript-eslint/require-await
+export const emojiToAPI = (emoji: Emoji): APIEmoji => {
-export const emojiToAPI = async (emoji: Emoji): Promise<APIEmoji> => {
 	return {
 		shortcode: emoji.shortcode,
 		static_url: emoji.url, // TODO: Add static version

database/entities/Relationship.ts

@@ -41,10 +41,7 @@ export const createNewRelationship = async (
  * Converts the relationship to an API-friendly format.
  * @returns The API-friendly relationship.
  */
-export const relationshipToAPI = async (
+export const relationshipToAPI = (rel: Relationship): APIRelationship => {
-	rel: Relationship
-	// eslint-disable-next-line @typescript-eslint/require-await
-): Promise<APIRelationship> => {
 	return {
 		blocked_by: rel.blockedBy,
 		blocking: rel.blocking,

database/entities/Status.ts

@@ -450,16 +450,14 @@ export const statusToAPI = async (
 		id: status.id,
 		in_reply_to_id: status.inReplyToPostId || null,
 		in_reply_to_account_id: status.inReplyToPost?.authorId || null,
-		account: await userToAPI(status.author),
+		account: userToAPI(status.author),
 		created_at: new Date(status.createdAt).toISOString(),
 		application: status.application
-			? await applicationToAPI(status.application)
+			? applicationToAPI(status.application)
 			: null,
 		card: null,
 		content: status.content,
-		emojis: await Promise.all(
+		emojis: status.emojis.map(emoji => emojiToAPI(emoji)),
-			status.emojis.map(emoji => emojiToAPI(emoji))
-		),
 		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		favourited: !!(status.likes ?? []).find(
 			like => like.likerId === user?.id

database/entities/User.ts

@@ -343,11 +343,10 @@ export const generateUserKeys = async () => {
 	};
 };
 
-// eslint-disable-next-line @typescript-eslint/require-await
+export const userToAPI = (
-export const userToAPI = async (
 	user: UserWithRelations,
 	isOwnAccount = false
-): Promise<APIAccount> => {
+): APIAccount => {
 	const config = getConfig();
 
 	return {
@@ -364,7 +363,7 @@ export const userToAPI = async (
 			.length,
 		following_count: user.relationships.filter(r => r.following).length,
 		statuses_count: user._count.statuses,
-		emojis: await Promise.all(user.emojis.map(emoji => emojiToAPI(emoji))),
+		emojis: user.emojis.map(emoji => emojiToAPI(emoji)),
 		// TODO: Add fields
 		fields: [],
 		bot: user.isBot,

server/api/api/v1/accounts/[id]/block.ts

@@ -83,5 +83,5 @@ export default async (
 		},
 	});
 
-	return jsonResponse(await relationshipToAPI(relationship));
+	return jsonResponse(relationshipToAPI(relationship));
 };

server/api/api/v1/accounts/[id]/follow.ts

@@ -102,5 +102,5 @@ export default async (
 		},
 	});
 
-	return jsonResponse(await relationshipToAPI(relationship));
+	return jsonResponse(relationshipToAPI(relationship));
 };

server/api/api/v1/accounts/[id]/index.ts

@@ -44,5 +44,5 @@ export default async (
 
 	if (!foundUser) return errorResponse("User not found", 404);
 
-	return jsonResponse(await userToAPI(foundUser, user?.id === foundUser.id));
+	return jsonResponse(userToAPI(foundUser, user?.id === foundUser.id));
 };

server/api/api/v1/accounts/[id]/mute.ts

@@ -96,5 +96,5 @@ export default async (
 
 	// TODO: Implement duration
 
-	return jsonResponse(await relationshipToAPI(relationship));
+	return jsonResponse(relationshipToAPI(relationship));
 };

server/api/api/v1/accounts/[id]/note.ts

@@ -86,5 +86,5 @@ export default async (
 		},
 	});
 
-	return jsonResponse(await relationshipToAPI(relationship));
+	return jsonResponse(relationshipToAPI(relationship));
 };

server/api/api/v1/accounts/[id]/pin.ts

@@ -83,5 +83,5 @@ export default async (
 		},
 	});
 
-	return jsonResponse(await relationshipToAPI(relationship));
+	return jsonResponse(relationshipToAPI(relationship));
 };

server/api/api/v1/accounts/[id]/remove_from_followers.ts

@@ -97,5 +97,5 @@ export default async (
 		});
 	}
 
-	return jsonResponse(await relationshipToAPI(relationship));
+	return jsonResponse(relationshipToAPI(relationship));
 };

server/api/api/v1/accounts/[id]/unblock.ts

@@ -83,5 +83,5 @@ export default async (
 		},
 	});
 
-	return jsonResponse(await relationshipToAPI(relationship));
+	return jsonResponse(relationshipToAPI(relationship));
 };

server/api/api/v1/accounts/[id]/unfollow.ts

@@ -83,5 +83,5 @@ export default async (
 		},
 	});
 
-	return jsonResponse(await relationshipToAPI(relationship));
+	return jsonResponse(relationshipToAPI(relationship));
 };

server/api/api/v1/accounts/[id]/unmute.ts

@@ -85,5 +85,5 @@ export default async (
 		},
 	});
 
-	return jsonResponse(await relationshipToAPI(relationship));
+	return jsonResponse(relationshipToAPI(relationship));
 };

server/api/api/v1/accounts/[id]/unpin.ts

@@ -83,5 +83,5 @@ export default async (
 		},
 	});
 
-	return jsonResponse(await relationshipToAPI(relationship));
+	return jsonResponse(relationshipToAPI(relationship));
 };

server/api/api/v1/accounts/relationships/index.ts

@@ -63,9 +63,5 @@ export default async (req: Request): Promise<Response> => {
 		(a, b) => ids.indexOf(a.subjectId) - ids.indexOf(b.subjectId)
 	);
 
-	return jsonResponse(
+	return jsonResponse(relationships.map(r => relationshipToAPI(r)));
-		await Promise.all(
-			relationships.map(async r => await relationshipToAPI(r))
-		)
-	);
 };

server/api/api/v1/accounts/update_credentials/index.ts

@@ -242,5 +242,5 @@ export default async (req: Request): Promise<Response> => {
 		},
 	});
 
-	return jsonResponse(await userToAPI(user));
+	return jsonResponse(userToAPI(user));
 };

server/api/api/v1/accounts/verify_credentials/index.ts

@@ -22,7 +22,7 @@ export default async (req: Request): Promise<Response> => {
 	if (!user) return errorResponse("Unauthorized", 401);
 
 	return jsonResponse({
-		...(await userToAPI(user, true)),
+		...userToAPI(user, true),
 		// TODO: Add role support
 		role: {
 			id: 0,

server/api/api/v1/profile/avatar.ts

@@ -39,5 +39,5 @@ export default async (req: Request): Promise<Response> => {
 		include: userRelations,
 	});
 
-	return jsonResponse(await userToAPI(newUser));
+	return jsonResponse(userToAPI(newUser));
 };

server/api/api/v1/profile/header.ts

@@ -39,5 +39,5 @@ export default async (req: Request): Promise<Response> => {
 		include: userRelations,
 	});
 
-	return jsonResponse(await userToAPI(newUser));
+	return jsonResponse(userToAPI(newUser));
 };

server/api/api/v1/statuses/[id]/favourited_by.ts

@@ -105,7 +105,7 @@ export default async (
 	}
 
 	return jsonResponse(
-		await Promise.all(objects.map(async user => userToAPI(user))),
+		objects.map(user => userToAPI(user)),
 		200,
 		{
 			Link: linkHeader.join(", "),

server/api/api/v1/statuses/[id]/reblogged_by.ts

@@ -106,7 +106,7 @@ export default async (
 	}
 
 	return jsonResponse(
-		await Promise.all(objects.map(async user => userToAPI(user))),
+		objects.map(user => userToAPI(user)),
 		200,
 		{
 			Link: linkHeader.join(", "),