From b9efd093a686046f6ffcf92933f51a72c72f673d Mon Sep 17 00:00:00 2001 From: Jesse Wierzbinski Date: Sun, 19 Nov 2023 16:42:40 -1000 Subject: [PATCH] Remove useless async from functions --- .eslintrc.cjs | 2 +- database/entities/Application.ts | 5 +---- database/entities/Emoji.ts | 3 +-- database/entities/Relationship.ts | 5 +---- database/entities/Status.ts | 8 +++----- database/entities/User.ts | 7 +++---- server/api/api/v1/accounts/[id]/block.ts | 2 +- server/api/api/v1/accounts/[id]/follow.ts | 2 +- server/api/api/v1/accounts/[id]/index.ts | 2 +- server/api/api/v1/accounts/[id]/mute.ts | 2 +- server/api/api/v1/accounts/[id]/note.ts | 2 +- server/api/api/v1/accounts/[id]/pin.ts | 2 +- server/api/api/v1/accounts/[id]/remove_from_followers.ts | 2 +- server/api/api/v1/accounts/[id]/unblock.ts | 2 +- server/api/api/v1/accounts/[id]/unfollow.ts | 2 +- server/api/api/v1/accounts/[id]/unmute.ts | 2 +- server/api/api/v1/accounts/[id]/unpin.ts | 2 +- server/api/api/v1/accounts/relationships/index.ts | 6 +----- server/api/api/v1/accounts/update_credentials/index.ts | 2 +- server/api/api/v1/accounts/verify_credentials/index.ts | 2 +- server/api/api/v1/profile/avatar.ts | 2 +- server/api/api/v1/profile/header.ts | 2 +- server/api/api/v1/statuses/[id]/favourited_by.ts | 2 +- server/api/api/v1/statuses/[id]/reblogged_by.ts | 2 +- 24 files changed, 28 insertions(+), 42 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index df531c9f..a8f1a26c 100644 --- a/.eslintrc.cjs +++ b/.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", }, }; diff --git a/database/entities/Application.ts b/database/entities/Application.ts index 94a79cf6..dca8dad5 100644 --- a/database/entities/Application.ts +++ b/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 ( - app: Application - // eslint-disable-next-line @typescript-eslint/require-await -): Promise => { +export const applicationToAPI = (app: Application): APIApplication => { return { name: app.name, website: app.website, diff --git a/database/entities/Emoji.ts b/database/entities/Emoji.ts index 04fad36e..b9ebfac5 100644 --- a/database/entities/Emoji.ts +++ b/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 = async (emoji: Emoji): Promise => { +export const emojiToAPI = (emoji: Emoji): APIEmoji => { return { shortcode: emoji.shortcode, static_url: emoji.url, // TODO: Add static version diff --git a/database/entities/Relationship.ts b/database/entities/Relationship.ts index 36ccd525..ea932329 100644 --- a/database/entities/Relationship.ts +++ b/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 ( - rel: Relationship - // eslint-disable-next-line @typescript-eslint/require-await -): Promise => { +export const relationshipToAPI = (rel: Relationship): APIRelationship => { return { blocked_by: rel.blockedBy, blocking: rel.blocking, diff --git a/database/entities/Status.ts b/database/entities/Status.ts index 9ea2192c..6a37f894 100644 --- a/database/entities/Status.ts +++ b/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( - status.emojis.map(emoji => emojiToAPI(emoji)) - ), + emojis: status.emojis.map(emoji => emojiToAPI(emoji)), // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition favourited: !!(status.likes ?? []).find( like => like.likerId === user?.id diff --git a/database/entities/User.ts b/database/entities/User.ts index 7ba8af39..694e96ce 100644 --- a/database/entities/User.ts +++ b/database/entities/User.ts @@ -343,11 +343,10 @@ export const generateUserKeys = async () => { }; }; -// eslint-disable-next-line @typescript-eslint/require-await -export const userToAPI = async ( +export const userToAPI = ( user: UserWithRelations, isOwnAccount = false -): Promise => { +): 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, diff --git a/server/api/api/v1/accounts/[id]/block.ts b/server/api/api/v1/accounts/[id]/block.ts index 291866a7..9b04e1c6 100644 --- a/server/api/api/v1/accounts/[id]/block.ts +++ b/server/api/api/v1/accounts/[id]/block.ts @@ -83,5 +83,5 @@ export default async ( }, }); - return jsonResponse(await relationshipToAPI(relationship)); + return jsonResponse(relationshipToAPI(relationship)); }; diff --git a/server/api/api/v1/accounts/[id]/follow.ts b/server/api/api/v1/accounts/[id]/follow.ts index 95e353b9..62da3cf8 100644 --- a/server/api/api/v1/accounts/[id]/follow.ts +++ b/server/api/api/v1/accounts/[id]/follow.ts @@ -102,5 +102,5 @@ export default async ( }, }); - return jsonResponse(await relationshipToAPI(relationship)); + return jsonResponse(relationshipToAPI(relationship)); }; diff --git a/server/api/api/v1/accounts/[id]/index.ts b/server/api/api/v1/accounts/[id]/index.ts index f6eadb3c..12bfc986 100644 --- a/server/api/api/v1/accounts/[id]/index.ts +++ b/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)); }; diff --git a/server/api/api/v1/accounts/[id]/mute.ts b/server/api/api/v1/accounts/[id]/mute.ts index b1b85f06..455b849f 100644 --- a/server/api/api/v1/accounts/[id]/mute.ts +++ b/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)); }; diff --git a/server/api/api/v1/accounts/[id]/note.ts b/server/api/api/v1/accounts/[id]/note.ts index 5aa005af..37659fd9 100644 --- a/server/api/api/v1/accounts/[id]/note.ts +++ b/server/api/api/v1/accounts/[id]/note.ts @@ -86,5 +86,5 @@ export default async ( }, }); - return jsonResponse(await relationshipToAPI(relationship)); + return jsonResponse(relationshipToAPI(relationship)); }; diff --git a/server/api/api/v1/accounts/[id]/pin.ts b/server/api/api/v1/accounts/[id]/pin.ts index 84b76611..1909b927 100644 --- a/server/api/api/v1/accounts/[id]/pin.ts +++ b/server/api/api/v1/accounts/[id]/pin.ts @@ -83,5 +83,5 @@ export default async ( }, }); - return jsonResponse(await relationshipToAPI(relationship)); + return jsonResponse(relationshipToAPI(relationship)); }; diff --git a/server/api/api/v1/accounts/[id]/remove_from_followers.ts b/server/api/api/v1/accounts/[id]/remove_from_followers.ts index d6bddd9b..3f7fd3a9 100644 --- a/server/api/api/v1/accounts/[id]/remove_from_followers.ts +++ b/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)); }; diff --git a/server/api/api/v1/accounts/[id]/unblock.ts b/server/api/api/v1/accounts/[id]/unblock.ts index 0aeb007d..c4833405 100644 --- a/server/api/api/v1/accounts/[id]/unblock.ts +++ b/server/api/api/v1/accounts/[id]/unblock.ts @@ -83,5 +83,5 @@ export default async ( }, }); - return jsonResponse(await relationshipToAPI(relationship)); + return jsonResponse(relationshipToAPI(relationship)); }; diff --git a/server/api/api/v1/accounts/[id]/unfollow.ts b/server/api/api/v1/accounts/[id]/unfollow.ts index 1ca9ea20..1ef88df3 100644 --- a/server/api/api/v1/accounts/[id]/unfollow.ts +++ b/server/api/api/v1/accounts/[id]/unfollow.ts @@ -83,5 +83,5 @@ export default async ( }, }); - return jsonResponse(await relationshipToAPI(relationship)); + return jsonResponse(relationshipToAPI(relationship)); }; diff --git a/server/api/api/v1/accounts/[id]/unmute.ts b/server/api/api/v1/accounts/[id]/unmute.ts index ed46b8ad..3cdf3709 100644 --- a/server/api/api/v1/accounts/[id]/unmute.ts +++ b/server/api/api/v1/accounts/[id]/unmute.ts @@ -85,5 +85,5 @@ export default async ( }, }); - return jsonResponse(await relationshipToAPI(relationship)); + return jsonResponse(relationshipToAPI(relationship)); }; diff --git a/server/api/api/v1/accounts/[id]/unpin.ts b/server/api/api/v1/accounts/[id]/unpin.ts index c941ba0f..bcc86ce8 100644 --- a/server/api/api/v1/accounts/[id]/unpin.ts +++ b/server/api/api/v1/accounts/[id]/unpin.ts @@ -83,5 +83,5 @@ export default async ( }, }); - return jsonResponse(await relationshipToAPI(relationship)); + return jsonResponse(relationshipToAPI(relationship)); }; diff --git a/server/api/api/v1/accounts/relationships/index.ts b/server/api/api/v1/accounts/relationships/index.ts index b32628a5..89b32f0e 100644 --- a/server/api/api/v1/accounts/relationships/index.ts +++ b/server/api/api/v1/accounts/relationships/index.ts @@ -63,9 +63,5 @@ export default async (req: Request): Promise => { (a, b) => ids.indexOf(a.subjectId) - ids.indexOf(b.subjectId) ); - return jsonResponse( - await Promise.all( - relationships.map(async r => await relationshipToAPI(r)) - ) - ); + return jsonResponse(relationships.map(r => relationshipToAPI(r))); }; diff --git a/server/api/api/v1/accounts/update_credentials/index.ts b/server/api/api/v1/accounts/update_credentials/index.ts index 1e415df1..ee54270f 100644 --- a/server/api/api/v1/accounts/update_credentials/index.ts +++ b/server/api/api/v1/accounts/update_credentials/index.ts @@ -242,5 +242,5 @@ export default async (req: Request): Promise => { }, }); - return jsonResponse(await userToAPI(user)); + return jsonResponse(userToAPI(user)); }; diff --git a/server/api/api/v1/accounts/verify_credentials/index.ts b/server/api/api/v1/accounts/verify_credentials/index.ts index a82e0069..49964db5 100644 --- a/server/api/api/v1/accounts/verify_credentials/index.ts +++ b/server/api/api/v1/accounts/verify_credentials/index.ts @@ -22,7 +22,7 @@ export default async (req: Request): Promise => { if (!user) return errorResponse("Unauthorized", 401); return jsonResponse({ - ...(await userToAPI(user, true)), + ...userToAPI(user, true), // TODO: Add role support role: { id: 0, diff --git a/server/api/api/v1/profile/avatar.ts b/server/api/api/v1/profile/avatar.ts index 70f3caa2..c3a8380b 100644 --- a/server/api/api/v1/profile/avatar.ts +++ b/server/api/api/v1/profile/avatar.ts @@ -39,5 +39,5 @@ export default async (req: Request): Promise => { include: userRelations, }); - return jsonResponse(await userToAPI(newUser)); + return jsonResponse(userToAPI(newUser)); }; diff --git a/server/api/api/v1/profile/header.ts b/server/api/api/v1/profile/header.ts index b6105315..6d5c8543 100644 --- a/server/api/api/v1/profile/header.ts +++ b/server/api/api/v1/profile/header.ts @@ -39,5 +39,5 @@ export default async (req: Request): Promise => { include: userRelations, }); - return jsonResponse(await userToAPI(newUser)); + return jsonResponse(userToAPI(newUser)); }; diff --git a/server/api/api/v1/statuses/[id]/favourited_by.ts b/server/api/api/v1/statuses/[id]/favourited_by.ts index 70cf33b3..16a5b15c 100644 --- a/server/api/api/v1/statuses/[id]/favourited_by.ts +++ b/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(", "), diff --git a/server/api/api/v1/statuses/[id]/reblogged_by.ts b/server/api/api/v1/statuses/[id]/reblogged_by.ts index 3fd55f3b..2401c666 100644 --- a/server/api/api/v1/statuses/[id]/reblogged_by.ts +++ b/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(", "),