diff --git a/server/src/lib/delete-scores/delete-scores.ts b/server/src/lib/delete-scores/delete-scores.ts index 48e7e9995..2b24b4b2d 100644 --- a/server/src/lib/delete-scores/delete-scores.ts +++ b/server/src/lib/delete-scores/delete-scores.ts @@ -110,7 +110,7 @@ export async function DeleteScore(score: ScoreDocument, blacklist = false) { } export async function DeleteMultipleScores(scores: ScoreDocument[], blacklist = false) { - logger.info(`Recieved request to delete ${scores.length} (Blacklist: ${blacklist}).`); + logger.info(`received request to delete ${scores.length} (Blacklist: ${blacklist}).`); const scoreIDs = scores.map((e) => e.scoreID); diff --git a/server/src/lib/email/formats.ts b/server/src/lib/email/formats.ts index 9d98d0b54..760c6a974 100644 --- a/server/src/lib/email/formats.ts +++ b/server/src/lib/email/formats.ts @@ -6,9 +6,9 @@ import { ServerConfig, TachiConfig } from "lib/setup/config"; export function EmailFormatResetPassword(username: string, resetCode: string, ipAddr: string) { return { html: MainHTMLWrapper( - `Hey ${username}, you've recieved a password reset request.
Click here to perform the reset.
If you did not request this reset, report this! This reset request was made by ${ipAddr}.` + `Hey ${username}, you've received a password reset request.
Click here to perform the reset.
If you did not request this reset, report this! This reset request was made by ${ipAddr}.` ), - text: `Hey ${username}, you've recieved a password reset request. This link + text: `Hey ${username}, you've received a password reset request. This link ${ServerConfig.OUR_URL}/reset-password?code=${resetCode} will perform the reset. If you did not request this reset, report this! This reset request was made by ${ipAddr}.`, }; diff --git a/server/src/lib/orphan-queue/orphan-queue.ts b/server/src/lib/orphan-queue/orphan-queue.ts index 916929346..50fb1a6a3 100644 --- a/server/src/lib/orphan-queue/orphan-queue.ts +++ b/server/src/lib/orphan-queue/orphan-queue.ts @@ -35,7 +35,7 @@ export async function HandleOrphanQueue( userID: integer, chartName: string ) { - logger.debug(`Recieved orphanqueue request for ${chartName}.`); + logger.debug(`received orphanqueue request for ${chartName}.`); const orphanChart = await db["orphan-chart-queue"].findOne( Object.assign({ idString }, orphanMatchCriteria), @@ -45,7 +45,7 @@ export async function HandleOrphanQueue( ); if (!orphanChart) { - logger.verbose(`Recieved unknown chart ${chartName}, orphaning.`); + logger.verbose(`received unknown chart ${chartName}, orphaning.`); await db["orphan-chart-queue"].insert({ idString, diff --git a/server/src/lib/score-import/framework/orphans/orphans.ts b/server/src/lib/score-import/framework/orphans/orphans.ts index 297765b49..5b5df0c80 100644 --- a/server/src/lib/score-import/framework/orphans/orphans.ts +++ b/server/src/lib/score-import/framework/orphans/orphans.ts @@ -112,7 +112,7 @@ export async function ReprocessOrphan( return false; } else if (res instanceof ConverterFailure) { logger.warn( - `Recieved ConverterFailure ${res.message} on orphan ${orphan.orphanID}. Removing orphan.` + `received ConverterFailure ${res.message} on orphan ${orphan.orphanID}. Removing orphan.` ); // @danger - This could go terribly, if there's a mistake in the converterFN we might accidentally diff --git a/server/src/lib/score-import/framework/score-importing/score-importing.ts b/server/src/lib/score-import/framework/score-importing/score-importing.ts index c962fcd86..372d3b2cd 100644 --- a/server/src/lib/score-import/framework/score-importing/score-importing.ts +++ b/server/src/lib/score-import/framework/score-importing/score-importing.ts @@ -98,7 +98,7 @@ export async function ImportAllIterableData( logger.debug(`Removed null from results.`); - logger.verbose(`Recieved ${datapoints.length} returns, from ${processedResults.length} data.`); + logger.verbose(`received ${datapoints.length} returns, from ${processedResults.length} data.`); // Flush the score queue out after finishing most of the import. This ensures no scores get left in the // queue. diff --git a/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts b/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts index 944bdd1f6..c21bb8d5f 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts @@ -75,10 +75,10 @@ export async function* TraverseKaiAPI( }, }); } catch (err) { - logger.error(`Recieved invalid response from ${url}.`, { err }); + logger.error(`received invalid response from ${url}.`, { err }); throw new ScoreImportFatalError( 500, - `Recieved invalid response from their API. Are they down?` + `received invalid response from their API. Are they down?` ); } @@ -113,21 +113,21 @@ export async function* TraverseKaiAPI( json = await res.json(); } catch (err) { logger.error( - `Recieved invalid (non-json) response from ${url}. Status code was ${res.status}.`, + `received invalid (non-json) response from ${url}. Status code was ${res.status}.`, { err } ); throw new ScoreImportFatalError( 500, - `Recieved invalid response from their API. Are they down?` + `received invalid response from their API. Are they down?` ); } if (json._links === null || typeof json._links !== "object") { - logger.error(`Recieved invalid JSON from ${url}. Invalid _links.`, { body: json }); + logger.error(`received invalid JSON from ${url}. Invalid _links.`, { body: json }); throw new ScoreImportFatalError( 500, - `Recieved no _links prop from their API. This is not an error with ${TachiConfig.NAME}.` + `received no _links prop from their API. This is not an error with ${TachiConfig.NAME}.` ); } @@ -149,22 +149,22 @@ export async function* TraverseKaiAPI( // exit the loop after this, we're on the last page. fetchMoreData = false; } else { - logger.error(`Recieved invalid response from ${url}. Invalid _links._next.`, { + logger.error(`received invalid response from ${url}. Invalid _links._next.`, { body: json, }); throw new ScoreImportFatalError( 500, - `Recieved invalid _links._next prop from their API.` + `received invalid _links._next prop from their API.` ); } if (!Array.isArray(json._items)) { - logger.error(`Recieved invalid response from ${url}. Invalid _items.`, { + logger.error(`received invalid response from ${url}. Invalid _items.`, { body: json, }); - throw new ScoreImportFatalError(500, `Recieved invalid _items from their API.`); + throw new ScoreImportFatalError(500, `received invalid _items from their API.`); } // yield everything out of the score array diff --git a/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts index f7ba128d8..ecdc9f70d 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts @@ -43,7 +43,7 @@ t.test("#ParserFn", (t) => { () => ParserFn(false, "file/batch-manual", logger), new ScoreImportFatalError( 400, - "Invalid BATCH-MANUAL (Not an object, recieved boolean.)" + "Invalid BATCH-MANUAL (Not an object, received boolean.)" ), "Should throw an error." ); diff --git a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts index e6f17a03b..90e8fdb5a 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts @@ -197,7 +197,7 @@ export function ParseBatchManualFromObject( if (typeof object !== "object" || object === null) { throw new ScoreImportFatalError( 400, - `Invalid BATCH-MANUAL (Not an object, recieved ${ + `Invalid BATCH-MANUAL (Not an object, received ${ object === null ? "null" : typeof object }.)` ); diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts index d8f22adf8..6a3339f01 100644 --- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts @@ -82,7 +82,7 @@ t.test("#ParseEamusementCSV", (t) => { t.equal( version, "27", - "Should pick largest version regardless of order scores are recieved in." + "Should pick largest version regardless of order scores are received in." ); t.end(); diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts index ad1c1d6df..967c6c5d5 100644 --- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts @@ -74,12 +74,12 @@ const HV_HEADER_COUNT = 41; export function ResolveHeaders(headers: string[], logger: KtLogger) { if (headers.length === PRE_HV_HEADER_COUNT) { - logger.verbose("PRE_HV csv recieved."); + logger.verbose("PRE_HV csv received."); return { hasBeginnerAndLegg: false, }; } else if (headers.length === HV_HEADER_COUNT) { - logger.verbose("HV+ csv recieved."); + logger.verbose("HV+ csv received."); return { hasBeginnerAndLegg: true, }; diff --git a/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.ts index 1a5c25243..40183a854 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.ts @@ -21,7 +21,7 @@ export function CreateFerStaticClassHandler(body: Record): Clas } if (!Number.isInteger(index)) { - logger.info(`Recieved invalid fer-static class of ${index} (${playtype}).`, { body }); + logger.info(`received invalid fer-static class of ${index} (${playtype}).`, { body }); return; } diff --git a/server/src/lib/score-import/worker/worker.ts b/server/src/lib/score-import/worker/worker.ts index a04f8524a..b45c893e1 100644 --- a/server/src/lib/score-import/worker/worker.ts +++ b/server/src/lib/score-import/worker/worker.ts @@ -77,7 +77,7 @@ export const worker = new Worker( job.data.parserArguments = processedArgs; - logger.debug(`Recieved score import job ${job.id}`, { job }); + logger.debug(`received score import job ${job.id}`, { job }); const InputParser = GetInputParser(job.data); diff --git a/server/src/server/middleware/prudence-validate.test.ts b/server/src/server/middleware/prudence-validate.test.ts index f038fb484..38c272df9 100644 --- a/server/src/server/middleware/prudence-validate.test.ts +++ b/server/src/server/middleware/prudence-validate.test.ts @@ -36,7 +36,7 @@ t.test("#PrudenceMiddleware", (t) => { t.equal( json.description, "[foo] example error message (Received nothing)", - "Should return error message with recieved nothing" + "Should return error message with received nothing" ); t.end(); diff --git a/server/src/server/router/api/v1/auth/router.ts b/server/src/server/router/api/v1/auth/router.ts index 02b80b7b7..eda1eadf7 100644 --- a/server/src/server/router/api/v1/auth/router.ts +++ b/server/src/server/router/api/v1/auth/router.ts @@ -68,7 +68,7 @@ router.post( }); } - logger.verbose(`Recieved login request with username ${req.body.username} (${req.ip})`); + logger.verbose(`received login request with username ${req.body.username} (${req.ip})`); /* istanbul ignore next */ if (Environment.nodeEnv === "production" || Environment.nodeEnv === "staging") { @@ -181,7 +181,7 @@ router.post( "verbose" ), async (req, res) => { - logger.verbose(`Recieved register request with username ${req.body.username} (${req.ip})`); + logger.verbose(`received register request with username ${req.body.username} (${req.ip})`); /* istanbul ignore next */ if (Environment.nodeEnv === "production" || Environment.nodeEnv === "staging") { @@ -433,7 +433,7 @@ router.post( }); } - logger.debug(`Recieved password reset request for ${req.body.email}.`); + logger.debug(`received password reset request for ${req.body.email}.`); // For timing attack and infosec reasons, we can't do anything but **immediately** return here. res.status(202).json({ success: true, diff --git a/server/src/server/router/api/v1/clients/router.ts b/server/src/server/router/api/v1/clients/router.ts index bafefc351..1d927cf00 100644 --- a/server/src/server/router/api/v1/clients/router.ts +++ b/server/src/server/router/api/v1/clients/router.ts @@ -275,7 +275,7 @@ router.post( const client = req[SYMBOL_TachiData]!.apiClientDoc!; const clientName = `${client.name} (${client.clientID})`; - logger.info(`Recieved request to reset client secret for ${clientName}`); + logger.info(`received request to reset client secret for ${clientName}`); const newSecret = Random20Hex(); @@ -308,7 +308,7 @@ router.delete("/:clientID", GetClientFromID, RequireOwnershipOfClient, async (re const clientName = `${client.name} (${client.clientID})`; - logger.info(`Recieved request to destroy API Client ${client.name} (${client.clientID})`); + logger.info(`received request to destroy API Client ${client.name} (${client.clientID})`); logger.verbose(`Removing API Client ${clientName}.`); await db["api-clients"].remove({ diff --git a/server/src/server/router/api/v1/users/_userID/api-tokens/router.ts b/server/src/server/router/api/v1/users/_userID/api-tokens/router.ts index 106f23532..98e1ce9ca 100644 --- a/server/src/server/router/api/v1/users/_userID/api-tokens/router.ts +++ b/server/src/server/router/api/v1/users/_userID/api-tokens/router.ts @@ -152,7 +152,7 @@ router.delete("/:token", async (req, res) => { const user = req[SYMBOL_TachiData]!.requestedUser!; logger.info( - `Recieved request from ${FormatUserDoc(user)} to delete token ${req.params.token}.` + `received request from ${FormatUserDoc(user)} to delete token ${req.params.token}.` ); const token = await db["api-tokens"].findOne({ diff --git a/server/src/server/router/api/v1/users/_userID/banner/router.test.ts b/server/src/server/router/api/v1/users/_userID/banner/router.test.ts index 37442e1eb..2d06b8533 100644 --- a/server/src/server/router/api/v1/users/_userID/banner/router.test.ts +++ b/server/src/server/router/api/v1/users/_userID/banner/router.test.ts @@ -29,7 +29,7 @@ t.test("GET /api/v1/users/:userID/banner", (t) => { t.equal(res.statusCode, 200, "Should return 200."); if (res.statusCode !== 200) { - rootLogger.info("Unexpected non-200 in CDN tests, Recieved this as a body.", { + rootLogger.info("Unexpected non-200 in CDN tests, received this as a body.", { body: res.body, }); } diff --git a/server/src/server/router/ir/kshook/sv3c/router.ts b/server/src/server/router/ir/kshook/sv3c/router.ts index 521e3be7c..ee7b24e8e 100644 --- a/server/src/server/router/ir/kshook/sv3c/router.ts +++ b/server/src/server/router/ir/kshook/sv3c/router.ts @@ -40,7 +40,7 @@ const ValidateHeaders: RequestHandler = (req, res, next) => { if (!softID) { logger.debug( - `Recieved request without X-Software-Model from ${req[SYMBOL_TachiAPIAuth].userID!}.` + `received request without X-Software-Model from ${req[SYMBOL_TachiAPIAuth].userID!}.` ); return res.status(400).json({ success: false, @@ -53,7 +53,7 @@ const ValidateHeaders: RequestHandler = (req, res, next) => { if (modelInfo.model !== MODEL_SDVX3_KONASTE) { logger.info( - `Recieved unexpected softID ${softID}. Expected ${MODEL_SDVX3_KONASTE} as model.` + `received unexpected softID ${softID}. Expected ${MODEL_SDVX3_KONASTE} as model.` ); return res.status(400).json({ success: false,