From 5c9575f23a3821eb6dbe0fa4ea3865195c5e2bed Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Sat, 16 Jul 2022 17:54:44 +0100 Subject: [PATCH] fix: someeeeone didn't run the linter huh --- server/src/external/mongo/db.ts | 15 +++++++++------ server/src/lib/database-seeds/repo.ts | 7 +++++-- server/src/scripts/sync-database.ts | 4 ++-- server/src/server/server.ts | 2 -- server/src/utils/db.ts | 4 ++-- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/server/src/external/mongo/db.ts b/server/src/external/mongo/db.ts index 652f97f6d..bd601ec90 100644 --- a/server/src/external/mongo/db.ts +++ b/server/src/external/mongo/db.ts @@ -165,8 +165,9 @@ const db = { "api-clients": monkDB.get("api-clients"), // i've inlined this one because i don't see it appearing anywhere else. - "oauth2-auth-codes": - monkDB.get<{ code: string; userID: integer; createdOn: number }>("oauth2-auth-codes"), + "oauth2-auth-codes": monkDB.get<{ code: string; userID: integer; createdOn: number }>( + "oauth2-auth-codes" + ), "fer-settings": monkDB.get("fer-settings"), "orphan-chart-queue": monkDB.get("orphan-chart-queue"), @@ -176,10 +177,12 @@ const db = { createdOn: number; }>("password-reset-codes"), "class-achievements": monkDB.get("class-achievements"), - "score-blacklist": - monkDB.get<{ scoreID: string; userID: integer; score: ScoreDocument }>("score-blacklist"), - "verify-email-codes": - monkDB.get<{ userID: integer; code: string; email: string }>("verify-email-codes"), + "score-blacklist": monkDB.get<{ scoreID: string; userID: integer; score: ScoreDocument }>( + "score-blacklist" + ), + "verify-email-codes": monkDB.get<{ userID: integer; code: string; email: string }>( + "verify-email-codes" + ), "recent-folder-views": monkDB.get("recent-folder-views"), "milestone-sets": monkDB.get("milestone-sets"), migrations: monkDB.get("migrations"), diff --git a/server/src/lib/database-seeds/repo.ts b/server/src/lib/database-seeds/repo.ts index abce5cdc3..59e5ae032 100644 --- a/server/src/lib/database-seeds/repo.ts +++ b/server/src/lib/database-seeds/repo.ts @@ -1,3 +1,4 @@ +import { VERSION_INFO } from "lib/constants/version"; import CreateLogCtx from "lib/logger/logger"; import { Environment, ServerConfig } from "lib/setup/config"; import { asyncExec } from "utils/misc"; @@ -5,7 +6,6 @@ import fs from "fs/promises"; import os from "os"; import path from "path"; import type { Game } from "tachi-common"; -import { VERSION_INFO } from "lib/constants/version"; const logger = CreateLogCtx(__filename); @@ -189,12 +189,15 @@ export async function PullDatabaseSeeds() { // there were expletives below this comment, but I have removed them. const { stdout } = await asyncExec( `git clone --sparse --depth=1 "${ServerConfig.SEEDS_CONFIG.REPO_URL}" -b "${ - Environment.nodeEnv === "production" ? `release/${VERSION_INFO.major}.${VERSION_INFO.minor}` : "staging" + Environment.nodeEnv === "production" + ? `release/${VERSION_INFO.major}.${VERSION_INFO.minor}` + : "staging" }" '${seedsDir}'; cd '${seedsDir}'; git sparse-checkout add database-seeds` + // ^ now that we're in a monorepo, we only want the seeds. ); diff --git a/server/src/scripts/sync-database.ts b/server/src/scripts/sync-database.ts index c1830faa0..363ad6afa 100644 --- a/server/src/scripts/sync-database.ts +++ b/server/src/scripts/sync-database.ts @@ -389,7 +389,7 @@ if (require.main === module) { .then(() => process.exit(0)) .catch((err) => { logger.error(err, () => { - process.exit(1) - }) + process.exit(1); + }); }); } diff --git a/server/src/server/server.ts b/server/src/server/server.ts index 45823ba35..d47779182 100644 --- a/server/src/server/server.ts +++ b/server/src/server/server.ts @@ -52,8 +52,6 @@ const userSessionMiddleware = expressSession({ const app: Express = express(); - - if (Environment.nodeEnv !== "production" && IsNonEmptyString(ServerConfig.CLIENT_DEV_SERVER)) { logger.warn(`Enabling CORS requests from ${ServerConfig.CLIENT_DEV_SERVER}.`, { bootInfo: true, diff --git a/server/src/utils/db.ts b/server/src/utils/db.ts index 7268a793f..d05806fc4 100644 --- a/server/src/utils/db.ts +++ b/server/src/utils/db.ts @@ -89,7 +89,7 @@ export async function UpdateGameSongIDCounter(game: "bms" | "pms") { sort: { id: -1 }, projection: { id: 1 }, } - ) + ); if (!latestSong) { logger.warn( @@ -97,7 +97,7 @@ export async function UpdateGameSongIDCounter(game: "bms" | "pms") { ); } - let largestSongID = latestSong?.id ?? 0; + const largestSongID = latestSong?.id ?? 0; await db.counters.update( {