From 3fade63567ac7b0994685b47672869ea29acc87c Mon Sep 17 00:00:00 2001 From: Jesse Wierzbinski Date: Thu, 3 Oct 2024 13:41:58 +0200 Subject: [PATCH] refactor: :rotating_light: Use shortand property syntax for object literals --- api/api/v1/accounts/index.test.ts | 10 +++++----- api/api/v1/emojis/:id/index.test.ts | 2 +- api/oauth/sso/:issuer/callback/index.ts | 2 +- classes/functions/user.ts | 4 ++-- packages/database-interface/emoji.ts | 2 +- packages/database-interface/instance.ts | 2 +- packages/database-interface/oauth.ts | 8 ++++---- packages/database-interface/relationship.ts | 2 +- packages/database-interface/timeline.ts | 4 ++-- plugins/openid/routes/authorize.test.ts | 4 ++-- plugins/openid/routes/authorize.ts | 2 +- plugins/openid/routes/oauth/revoke.test.ts | 8 ++++---- plugins/openid/routes/oauth/token.test.ts | 8 ++++---- utils/loggers.ts | 2 +- utils/markdown.ts | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/api/api/v1/accounts/index.test.ts b/api/api/v1/accounts/index.test.ts index 6ec28ffd..fb1c0a1b 100644 --- a/api/api/v1/accounts/index.test.ts +++ b/api/api/v1/accounts/index.test.ts @@ -24,7 +24,7 @@ describe(meta.route, () => { "X-Challenge-Solution": await getSolvedChallenge(), }, body: JSON.stringify({ - username: username, + username, email: "bob@gamer.com", password: "password", agreement: "true", @@ -44,7 +44,7 @@ describe(meta.route, () => { "X-Challenge-Solution": await getSolvedChallenge(), }, body: JSON.stringify({ - username: username, + username, email: "bob", password: "password", agreement: "true", @@ -64,7 +64,7 @@ describe(meta.route, () => { "X-Challenge-Solution": await getSolvedChallenge(), }, body: JSON.stringify({ - username: username, + username, email: "contatc@bob.com", agreement: "true", locale: "en", @@ -83,7 +83,7 @@ describe(meta.route, () => { "X-Challenge-Solution": await getSolvedChallenge(), }, body: JSON.stringify({ - username: username, + username, email: "contact@george.com", password: "password", agreement: "true", @@ -119,7 +119,7 @@ describe(meta.route, () => { "X-Challenge-Solution": await getSolvedChallenge(), }, body: JSON.stringify({ - username: username, + username, email: "contact@george.com", password: "password", agreement: "true", diff --git a/api/api/v1/emojis/:id/index.test.ts b/api/api/v1/emojis/:id/index.test.ts index 2218cd84..4729045d 100644 --- a/api/api/v1/emojis/:id/index.test.ts +++ b/api/api/v1/emojis/:id/index.test.ts @@ -150,7 +150,7 @@ describe(meta.route, () => { expect(response2.ok).toBe(true); const emojis = await response2.json(); - expect(emojis).not.toContainEqual(expect.objectContaining({ id: id })); + expect(emojis).not.toContainEqual(expect.objectContaining({ id })); }); test("should delete the emoji", async () => { diff --git a/api/oauth/sso/:issuer/callback/index.ts b/api/oauth/sso/:issuer/callback/index.ts index 700c557f..1bad8535 100644 --- a/api/oauth/sso/:issuer/callback/index.ts +++ b/api/oauth/sso/:issuer/callback/index.ts @@ -250,7 +250,7 @@ export default apiRoute((app) => await db.insert(Tokens).values({ accessToken: randomString(64, "base64url"), - code: code, + code, scope: flow.application.scopes, tokenType: TokenType.Bearer, userId: user.id, diff --git a/classes/functions/user.ts b/classes/functions/user.ts index 30eaf392..1c4dbd12 100644 --- a/classes/functions/user.ts +++ b/classes/functions/user.ts @@ -277,7 +277,7 @@ export const followRequestToVersia = ( return { type: "Follow", - id: id, + id, author: follower.getUri(), followee: followee.getUri(), created_at: new Date().toISOString(), @@ -304,7 +304,7 @@ export const followAcceptToVersia = ( return { type: "FollowAccept", - id: id, + id, author: followee.getUri(), created_at: new Date().toISOString(), follower: follower.getUri(), diff --git a/packages/database-interface/emoji.ts b/packages/database-interface/emoji.ts index 0a702ddf..77a41a33 100644 --- a/packages/database-interface/emoji.ts +++ b/packages/database-interface/emoji.ts @@ -230,7 +230,7 @@ export class Emoji extends BaseInterface { alt: Object.entries(emoji.url)[0][1].description || undefined, contentType: Object.keys(emoji.url)[0], visibleInPicker: true, - instanceId: instanceId, + instanceId, }); } } diff --git a/packages/database-interface/instance.ts b/packages/database-interface/instance.ts index 67b97a42..dac70135 100644 --- a/packages/database-interface/instance.ts +++ b/packages/database-interface/instance.ts @@ -338,7 +338,7 @@ export class Instance extends BaseInterface { name: metadata.name, version: metadata.software.version, logo: metadata.logo, - protocol: protocol, + protocol, }); } diff --git a/packages/database-interface/oauth.ts b/packages/database-interface/oauth.ts index 2d03ce20..7d5d3798 100644 --- a/packages/database-interface/oauth.ts +++ b/packages/database-interface/oauth.ts @@ -140,7 +140,7 @@ export class OAuthManager { await db.insert(OpenIdAccounts).values({ serverId: sub, issuerId: this.issuer.id, - userId: userId, + userId, }); } @@ -273,9 +273,9 @@ export class OAuthManager { ); return { - userInfo: userInfo, - flow: flow, - claims: claims, + userInfo, + flow, + claims, }; } } diff --git a/packages/database-interface/relationship.ts b/packages/database-interface/relationship.ts index 64bf9342..dcfb091d 100644 --- a/packages/database-interface/relationship.ts +++ b/packages/database-interface/relationship.ts @@ -118,7 +118,7 @@ export class Relationship extends BaseInterface< for (const subjectId of missingSubjectsIds) { await Relationship.insert({ ownerId: owner.id, - subjectId: subjectId, + subjectId, languages: [], following: false, showingReblogs: false, diff --git a/packages/database-interface/timeline.ts b/packages/database-interface/timeline.ts index 49613044..11313751 100644 --- a/packages/database-interface/timeline.ts +++ b/packages/database-interface/timeline.ts @@ -167,12 +167,12 @@ export class Timeline { case TimelineType.Note: return { link, - objects: objects, + objects, }; case TimelineType.User: return { link, - objects: objects, + objects, }; } } diff --git a/plugins/openid/routes/authorize.test.ts b/plugins/openid/routes/authorize.test.ts index 5f45da85..1df837a1 100644 --- a/plugins/openid/routes/authorize.test.ts +++ b/plugins/openid/routes/authorize.test.ts @@ -22,8 +22,8 @@ const privateKey = await crypto.subtle.importKey( beforeAll(async () => { await db.insert(Applications).values({ - clientId: clientId, - redirectUri: redirectUri, + clientId, + redirectUri, scopes: scope, name: "Test Application", secret, diff --git a/plugins/openid/routes/authorize.ts b/plugins/openid/routes/authorize.ts index 0220da68..78c21d08 100644 --- a/plugins/openid/routes/authorize.ts +++ b/plugins/openid/routes/authorize.ts @@ -287,7 +287,7 @@ export default (plugin: PluginType) => await db.insert(Tokens).values({ accessToken: randomString(64, "base64url"), - code: code, + code, scope: scope ?? application.scopes, tokenType: TokenType.Bearer, applicationId: application.id, diff --git a/plugins/openid/routes/oauth/revoke.test.ts b/plugins/openid/routes/oauth/revoke.test.ts index 2fd53309..99a1ebf1 100644 --- a/plugins/openid/routes/oauth/revoke.test.ts +++ b/plugins/openid/routes/oauth/revoke.test.ts @@ -15,8 +15,8 @@ beforeAll(async () => { await db .insert(Applications) .values({ - clientId: clientId, - redirectUri: redirectUri, + clientId, + redirectUri, scopes: scope, name: "Test Application", secret, @@ -26,8 +26,8 @@ beforeAll(async () => { await db.insert(Tokens).values({ code: "test-code", - redirectUri: redirectUri, - clientId: clientId, + redirectUri, + clientId, accessToken: "test-access-token", expiresAt: new Date(Date.now() + 3600 * 1000).toISOString(), createdAt: new Date().toISOString(), diff --git a/plugins/openid/routes/oauth/token.test.ts b/plugins/openid/routes/oauth/token.test.ts index ec1c1dc4..d05e7c8a 100644 --- a/plugins/openid/routes/oauth/token.test.ts +++ b/plugins/openid/routes/oauth/token.test.ts @@ -12,8 +12,8 @@ const secret = "test-secret"; beforeAll(async () => { await db.insert(Applications).values({ - clientId: clientId, - redirectUri: redirectUri, + clientId, + redirectUri, scopes: scope, name: "Test Application", secret, @@ -21,8 +21,8 @@ beforeAll(async () => { await db.insert(Tokens).values({ code: "test-code", - redirectUri: redirectUri, - clientId: clientId, + redirectUri, + clientId, accessToken: "test-access-token", expiresAt: new Date(Date.now() + 3600 * 1000).toISOString(), createdAt: new Date().toISOString(), diff --git a/utils/loggers.ts b/utils/loggers.ts index d8596aee..d81e0777 100644 --- a/utils/loggers.ts +++ b/utils/loggers.ts @@ -144,7 +144,7 @@ export const nodeDriver: RotatingFileSinkDriver = { } return statSync(path); }, - renameSync: renameSync, + renameSync, }; export const configureLoggers = (silent = false) => diff --git a/utils/markdown.ts b/utils/markdown.ts index 32ad73d1..417a0b3e 100644 --- a/utils/markdown.ts +++ b/utils/markdown.ts @@ -26,7 +26,7 @@ export const renderMarkdownInPath = async ( } return { - content: content, + content, lastModified, }; };