Merge branch 'master' into feature/reusable-backend-migrations

Author: fehmer

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -86,7 +86,7 @@ body:
       value: |
         # Issue details
         ```
-        Please provide a detailed decription of what's happening, and most importantly - solid steps to reproduce the issue. This will help us find it quicker.
+        Please provide a detailed description of what's happening, and most importantly - solid steps to reproduce the issue. This will help us find it quicker.
         ```
 
   - type: textarea

.github/pull_request_template.md

@@ -6,10 +6,21 @@
 
 - [ ] 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 or a theme?
-  - [ ] If is a language, did you edit `_list.json`, `_groups.json` and add `languages.json`?
-  - [ ] If is a theme, did you add the theme.css?
-    - Also please add a screenshot of the theme, it would be extra awesome if you do so!
+- [ ] Adding a language?
+  - Make sure to follow the [languages documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/LANGUAGES.md)
+  - [ ] Add language to `packages/contracts/src/schemas/languages.ts`
+  - [ ] Add language to exactly one group in `frontend/src/ts/constants/languages.ts`
+  - [ ] Add language json file to `frontend/static/languages` 
+- [ ] Adding a theme?
+  - Make sure to follow the [themes documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/THEMES.md)
+  - [ ] Add theme to `packages/contracts/src/schemas/themes.ts`
+  - [ ] Add theme to `frontend/src/ts/constants/themes.ts`
+  - [ ] Add theme css file to `frontend/static/themes`
+  - Also please add a screenshot of the theme, it would be extra awesome if you do so!
+- [ ] Adding a layout?
+  - [ ] Make sure to follow the [layouts documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/LAYOUTS.md)
+  - [ ] Add layout to `packages/contracts/src/schemas/layouts.ts`
+  - [ ] Add layout json file to `frontend/static/layouts` 
 - [ ] Check if any open issues are related to this PR; if so, be sure to tag them below.
 - [ ] Make sure the PR title follows the Conventional Commits standard. (https://www.conventionalcommits.org for more info)
 - [ ] Make sure to include your GitHub username prefixed with @ inside parentheses at the end of the PR title.

.gitignore

@@ -127,3 +127,4 @@ frontend/src/webfonts-generated
 frontend/static/webfonts-preview
 
 .turbo
+frontend/.env.sentry-build-plugin

backend/.oxlintrc.json

@@ -6,7 +6,16 @@
   "overrides": [
     {
       "files": ["__tests__/**"],
-      "plugins": ["jest", "vitest"],
+      "plugins": [
+        "typescript",
+        "unicorn",
+        "oxc",
+        "import",
+        "node",
+        "promise",
+        "jest",
+        "vitest"
+      ],
       "rules": {
         "no-explicit-any": "allow",
         "explicit-function-return-type": "off",

backend/__tests__/api/controllers/admin.spec.ts

@@ -194,6 +194,95 @@ describe("AdminController", () => {
       ).toBeRateLimited({ max: 1, windowMs: 5000 });
     });
   });
+
+  describe("clear streak hour offset", () => {
+    const clearStreakHourOffset = vi.spyOn(UserDal, "clearStreakHourOffset");
+
+    beforeEach(() => {
+      [clearStreakHourOffset].forEach((it) => it.mockReset());
+    });
+
+    it("should clear streak hour offset for user", async () => {
+      //GIVEN
+      const victimUid = new ObjectId().toHexString();
+
+      //WHEN
+      const { body } = await mockApp
+        .post("/admin/clearStreakHourOffset")
+        .send({ uid: victimUid })
+        .set("Authorization", `Bearer ${uid}`)
+        .expect(200);
+
+      //THEN
+      expect(body).toEqual({
+        message: "Streak hour offset cleared",
+        data: null,
+      });
+      expect(clearStreakHourOffset).toHaveBeenCalledWith(victimUid);
+    });
+    it("should fail without mandatory properties", async () => {
+      //GIVEN
+
+      //WHEN
+      const { body } = await mockApp
+        .post("/admin/clearStreakHourOffset")
+        .send({})
+        .set("Authorization", `Bearer ${uid}`)
+        .expect(422);
+
+      //THEN
+      expect(body).toEqual({
+        message: "Invalid request data schema",
+        validationErrors: ['"uid" Required'],
+      });
+    });
+    it("should fail with unknown properties", async () => {
+      //GIVEN
+
+      //WHEN
+      const { body } = await mockApp
+        .post("/admin/clearStreakHourOffset")
+        .send({ uid: new ObjectId().toHexString(), extra: "value" })
+        .set("Authorization", `Bearer ${uid}`)
+        .expect(422);
+
+      //THEN
+      expect(body).toEqual({
+        message: "Invalid request data schema",
+        validationErrors: ["Unrecognized key(s) in object: 'extra'"],
+      });
+    });
+    it("should fail if user is no admin", async () => {
+      await expectFailForNonAdmin(
+        mockApp
+          .post("/admin/clearStreakHourOffset")
+          .send({ uid: new ObjectId().toHexString() })
+          .set("Authorization", `Bearer ${uid}`)
+      );
+    });
+    it("should fail if admin endpoints are disabled", async () => {
+      //GIVEN
+      await expectFailForDisabledEndpoint(
+        mockApp
+          .post("/admin/clearStreakHourOffset")
+          .send({ uid: new ObjectId().toHexString() })
+          .set("Authorization", `Bearer ${uid}`)
+      );
+    });
+    it("should be rate limited", async () => {
+      //GIVEN
+      const victimUid = new ObjectId().toHexString();
+
+      //WHEN
+      await expect(
+        mockApp
+          .post("/admin/clearStreakHourOffset")
+          .send({ uid: victimUid })
+          .set("Authorization", `Bearer ${uid}`)
+      ).toBeRateLimited({ max: 1, windowMs: 5000 });
+    });
+  });
+
   describe("accept reports", () => {
     const getReportsMock = vi.spyOn(ReportDal, "getReports");
     const deleteReportsMock = vi.spyOn(ReportDal, "deleteReports");

backend/__tests__/api/controllers/leaderboard.spec.ts

@@ -188,7 +188,7 @@ describe("Loaderboard Controller", () => {
       expect(body).toEqual({
         message: "Invalid query schema",
         validationErrors: [
-          '"language" Can only contain letters [a-zA-Z0-9_+]',
+          '"language" Invalid enum value. Must be a supported language',
           `"mode" Invalid enum value. Expected 'time' | 'words' | 'quote' | 'custom' | 'zen', received 'unknownMode'`,
           '"mode2" Needs to be a number or a number represented as a string e.g. "10".',
           '"page" Number must be greater than or equal to 0',
@@ -344,7 +344,7 @@ describe("Loaderboard Controller", () => {
       expect(body).toEqual({
         message: "Invalid query schema",
         validationErrors: [
-          '"language" Can only contain letters [a-zA-Z0-9_+]',
+          '"language" Invalid enum value. Must be a supported language',
           `"mode" Invalid enum value. Expected 'time' | 'words' | 'quote' | 'custom' | 'zen', received 'unknownMode'`,
           '"mode2" Needs to be a number or a number represented as a string e.g. "10".',
         ],
@@ -652,7 +652,7 @@ describe("Loaderboard Controller", () => {
       expect(body).toEqual({
         message: "Invalid query schema",
         validationErrors: [
-          '"language" Can only contain letters [a-zA-Z0-9_+]',
+          '"language" Invalid enum value. Must be a supported language',
           `"mode" Invalid enum value. Expected 'time' | 'words' | 'quote' | 'custom' | 'zen', received 'unknownMode'`,
           '"mode2" Needs to be a number or a number represented as a string e.g. "10".',
         ],
@@ -830,7 +830,7 @@ describe("Loaderboard Controller", () => {
       expect(body).toEqual({
         message: "Invalid query schema",
         validationErrors: [
-          '"language" Can only contain letters [a-zA-Z0-9_+]',
+          '"language" Invalid enum value. Must be a supported language',
           `"mode" Invalid enum value. Expected 'time' | 'words' | 'quote' | 'custom' | 'zen', received 'unknownMode'`,
           '"mode2" Needs to be a number or a number represented as a string e.g. "10".',
         ],

backend/__tests__/api/controllers/public.spec.ts

@@ -88,7 +88,7 @@ describe("PublicController", () => {
       expect(body).toEqual({
         message: "Invalid query schema",
         validationErrors: [
-          '"language" Can only contain letters [a-zA-Z0-9_+]',
+          '"language" Invalid enum value. Must be a supported language',
           `"mode" Invalid enum value. Expected 'time' | 'words' | 'quote' | 'custom' | 'zen', received 'unknownMode'`,
           '"mode2" Needs to be a number or a number represented as a string e.g. "10".',
         ],

backend/__tests__/dal/user.spec.ts

@@ -2011,4 +2011,23 @@ describe("UserDal", () => {
       });
     });
   });
+
+  describe("clearStreakHourOffset", () => {
+    it("should clear streak hour offset", async () => {
+      // given
+      const { uid } = await UserTestData.createUser({
+        //@ts-expect-error
+        streak: {
+          hourOffset: 1,
+        },
+      });
+
+      // when
+      await UserDAL.clearStreakHourOffset(uid);
+
+      //then
+      const read = await UserDAL.getUser(uid, "read");
+      expect(read.streak?.hourOffset).toBeUndefined();
+    });
+  });
 });

backend/package.json

@@ -28,18 +28,19 @@
     "@monkeytype/contracts": "workspace:*",
     "@monkeytype/funbox": "workspace:*",
     "@monkeytype/util": "workspace:*",
-    "@ts-rest/core": "3.51.0",
-    "@ts-rest/express": "3.51.0",
-    "@ts-rest/open-api": "3.51.0",
+    "@ts-rest/core": "3.52.1",
+    "@ts-rest/express": "3.52.1",
+    "@ts-rest/open-api": "3.52.1",
     "bcrypt": "5.1.1",
     "bullmq": "1.91.1",
     "chalk": "4.1.2",
     "cors": "2.8.5",
     "cron": "2.3.0",
     "date-fns": "3.6.0",
     "dotenv": "16.4.5",
-    "express": "4.21.1",
-    "express-rate-limit": "7.4.0",
+    "etag": "1.8.1",
+    "express": "5.1.0",
+    "express-rate-limit": "7.5.1",
     "firebase-admin": "12.0.0",
     "helmet": "4.6.0",
     "ioredis": "4.28.5",
@@ -71,7 +72,7 @@
     "@types/bcrypt": "5.0.2",
     "@types/cors": "2.8.12",
     "@types/cron": "1.7.3",
-    "@types/express": "4.17.21",
+    "@types/express": "5.0.3",
     "@types/ioredis": "4.28.10",
     "@types/lodash": "4.14.178",
     "@types/mjml": "4.7.4",
@@ -92,7 +93,7 @@
     "eslint-watch": "8.0.0",
     "ioredis-mock": "7.4.0",
     "openapi3-ts": "2.0.2",
-    "oxlint": "0.16.7",
+    "oxlint": "1.1.0",
     "readline-sync": "1.4.10",
     "supertest": "6.2.3",
     "tsx": "4.16.2",

backend/src/api/controllers/admin.ts

@@ -6,6 +6,7 @@ import GeorgeQueue from "../../queues/george-queue";
 import { sendForgotPasswordEmail as authSendForgotPasswordEmail } from "../../utils/auth";
 import {
   AcceptReportsRequest,
+  ClearStreakHourOffsetRequest,
   RejectReportsRequest,
   SendForgotPasswordEmailRequest,
   ToggleBanRequest,
@@ -42,6 +43,17 @@ export async function toggleBan(
   });
 }
 
+export async function clearStreakHourOffset(
+  req: MonkeyRequest<undefined, ClearStreakHourOffsetRequest>
+): Promise<MonkeyResponse> {
+  const { uid } = req.body;
+
+  await UserDAL.clearStreakHourOffset(uid);
+  void addImportantLog("admin_streak_hour_offset_cleared_by", {}, uid);
+
+  return new MonkeyResponse("Streak hour offset cleared", null);
+}
+
 export async function acceptReports(
   req: MonkeyRequest<undefined, AcceptReportsRequest>
 ): Promise<MonkeyResponse> {