Merge branch 'master' into convert-quotes-correctly-in-british-english

Author: Leonabcd123

.github/pull_request_template.md

@@ -4,6 +4,8 @@
 
 ### Checks
 
+- [ ] Adding/modifying Typescript code?
+  - [ ] I have used `qs`,`qsa` or `qsr` instead of JQuery selectors.
 - [ ] Adding quotes?
   - [ ] Make sure to include translations for the quotes in the description (or another comment) so we can verify their content.
 - [ ] Adding a language?

.husky/pre-push

@@ -9,7 +9,7 @@ export NVM_DIR="$HOME/.nvm"
 if [ $(git branch --no-color | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/') = "master" ] && [ $(git remote get-url origin) = "https://github.com/monkeytypegame/monkeytype" ]; then
   nvm install
   echo "Running a full check before pushing to master..."
-  npm run full-check
+  pnpm run full-check
   if [ $? -ne 0 ]; then
     echo "Full check failed, aborting push."
     exit 1

backend/__tests__/__testData__/auth.ts

@@ -12,8 +12,9 @@ export async function mockAuthenticateWithApeKey(
   uid: string,
   config: Configuration,
 ): Promise<string> {
-  if (!config.apeKeys.acceptKeys)
+  if (!config.apeKeys.acceptKeys) {
     throw Error("config.apeKeys.acceptedKeys needs to be set to true");
+  }
   const { apeKeyBytes, apeKeySaltRounds } = config.apeKeys;
 
   const apiKey = randomBytes(apeKeyBytes).toString("base64url");

backend/src/api/controllers/dev.ts

@@ -96,8 +96,9 @@ async function createTestResults(
     const results = createArray(day.amount, () =>
       createResult(user, day.timestamp),
     );
-    if (results.length > 0)
+    if (results.length > 0) {
       await ResultDal.getResultCollection().insertMany(results);
+    }
   }
 }
 
@@ -221,9 +222,10 @@ async function updateUser(uid: string): Promise<void> {
       { sort: { wpm: -1, timestamp: 1 } },
     )) as DBResult;
 
-    if (personalBests[mode.mode] === undefined) personalBests[mode.mode] = {};
-    if (personalBests[mode.mode][mode.mode2] === undefined)
+    personalBests[mode.mode] ??= {};
+    if (personalBests[mode.mode][mode.mode2] === undefined) {
       personalBests[mode.mode][mode.mode2] = [];
+    }
 
     const entry = {
       acc: best.acc,
@@ -241,8 +243,9 @@ async function updateUser(uid: string): Promise<void> {
     (personalBests[mode.mode][mode.mode2] as PersonalBest[]).push(entry);
 
     if (mode.mode === "time") {
-      if (lbPersonalBests[mode.mode][mode.mode2] === undefined)
+      if (lbPersonalBests[mode.mode][mode.mode2] === undefined) {
         lbPersonalBests[mode.mode][mode.mode2] = {};
+      }
 
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       lbPersonalBests[mode.mode][mode.mode2][mode.language] = entry;

backend/src/api/controllers/quote.ts

@@ -125,9 +125,7 @@ export async function submitRating(
     shouldUpdateRating,
   );
 
-  if (!userQuoteRatings[language]) {
-    userQuoteRatings[language] = {};
-  }
+  userQuoteRatings[language] ??= {};
   userQuoteRatings[language][quoteId] = rating;
 
   await updateQuoteRatings(uid, userQuoteRatings);

backend/src/api/controllers/result.ts

@@ -170,24 +170,12 @@ export async function updateTags(
   await ResultDAL.updateTags(uid, resultId, tagIds);
   const result = await ResultDAL.getResult(uid, resultId);
 
-  if (!result.difficulty) {
-    result.difficulty = "normal";
-  }
-  if (!(result.language ?? "")) {
-    result.language = "english";
-  }
-  if (result.funbox === undefined) {
-    result.funbox = [];
-  }
-  if (!result.lazyMode) {
-    result.lazyMode = false;
-  }
-  if (!result.punctuation) {
-    result.punctuation = false;
-  }
-  if (!result.numbers) {
-    result.numbers = false;
-  }
+  result.difficulty ??= "normal";
+  result.language ??= "english";
+  result.funbox ??= [];
+  result.lazyMode ??= false;
+  result.punctuation ??= false;
+  result.numbers ??= false;
 
   const user = await UserDAL.getPartialUser(uid, "update tags", ["tags"]);
   const tagPbs = await UserDAL.checkIfTagPb(uid, user, result);

backend/src/api/controllers/user.ts

@@ -1207,8 +1207,9 @@ export function generateCurrentTestActivity(
   let thisYearData = testActivity?.[thisYear.getFullYear().toString()];
   let lastYearData = testActivity?.[lastYear.getFullYear().toString()];
 
-  if (lastYearData === undefined && thisYearData === undefined)
+  if (lastYearData === undefined && thisYearData === undefined) {
     return undefined;
+  }
 
   lastYearData = lastYearData ?? [];
   thisYearData = thisYearData ?? [];

backend/src/api/controllers/webhooks.ts

@@ -11,8 +11,9 @@ export async function githubRelease(
 
   if (action === "published") {
     const releaseId = req.body.release?.id;
-    if (releaseId === undefined)
+    if (releaseId === undefined) {
       throw new MonkeyError(422, 'Missing property "release.id".');
+    }
 
     await GeorgeQueue.sendReleaseAnnouncement(releaseId);
     return new MonkeyResponse("Added release announcement task to queue", null);

backend/src/dal/connections.ts

@@ -20,8 +20,9 @@ export async function getConnections(options: {
 }): Promise<DBConnection[]> {
   const { initiatorUid, receiverUid, status } = options;
 
-  if (initiatorUid === undefined && receiverUid === undefined)
+  if (initiatorUid === undefined && receiverUid === undefined) {
     throw new Error("Missing filter");
+  }
 
   let filter: Filter<DBConnection> = { $or: [] };
 

backend/src/dal/result.ts

@@ -21,7 +21,7 @@ export async function addResult(
   const { data: user } = await tryCatch(getUser(uid, "add result"));
 
   if (!user) throw new MonkeyError(404, "User not found", "add result");
-  if (result.uid === undefined) result.uid = uid;
+  result.uid ??= uid;
   // result.ir = true;
   const res = await getResultCollection().insertOne(result);
   return {