[pull] master from monkeytypegame:master

.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.

.github/workflows/ci-failure-comment.yml

@@ -13,15 +13,14 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'failure' }}
     steps:
       - name: Download workflow artifact
-        uses: dawidd6/action-download-artifact@v6
+        uses: actions/download-artifact@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          workflow: peek_icons.yml
-          run_id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
 
       - name: Read the pr_num file
         id: pr_num_reader
-        uses: juliangruber/read-file-action@v1.0.0
+        uses: juliangruber/read-file-action@v1
         with:
           path: ./pr_num/pr_num.txt
 
@@ -31,3 +30,10 @@ jobs:
           issue-number: ${{ steps.pr_num_reader.outputs.content }}
           body: |
             Continuous integration check(s) failed. Please review the [failing check\'s logs](${{ github.event.workflow_run.html_url }}) and make the necessary changes.
+
+      - name: Apply label changes
+        uses: PauMAVA/add-remove-label-action@v1.0.3
+        with:
+          issue_number:  ${{ steps.pr_num_reader.outputs.content }}
+          add: "waiting for update"
+          remove: "waiting for review"

.github/workflows/monkey-ci.yml

@@ -353,7 +353,7 @@ jobs:
         run: echo $PR_NUM > pr_num.txt
 
       - name: Upload the PR number
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pr_num
           path: ./pr_num.txt

.github/workflows/pretty-fix.yml

@@ -20,7 +20,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name}}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
@@ -62,7 +63,6 @@ jobs:
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: "prettier fix"
-          branch: ${{ github.event.pull_request.head.ref }}
 
       - name: Remove label
         uses: actions-ecosystem/action-remove-labels@v1

.github/workflows/publish-docker-images.yml

@@ -49,7 +49,7 @@ jobs:
           tags: ${{ env.BE_REPO }}:latest,${{ steps.bemeta.outputs.tags }}
           labels: ${{ steps.bemeta.outputs.labels }}
           build-args: |
-            server_version: {{version}}
+            server_version: ${{ github.event.release.tag_name }}
 
       - name: Backend publish description
         uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae

.github/workflows/semantic-pr-title.yml

@@ -42,12 +42,7 @@ jobs:
             Title "{title}"
             didn't match the configured pattern. Please ensure that the title
             contains your name so that you can be credited in our changelog.
-            A correct version would look something like: 
-
-            feat: add new feature (@github-username)
-            impr(quotes): add english quotes (@github-username)
-            fix: resolve bug (@github-username)
-
+
       - uses: marocchino/sticky-pull-request-comment@v2
         # When the previous steps fails, the workflow would stop. By adding this
         # condition you can continue the execution with the populated error message.
@@ -66,9 +61,9 @@ jobs:
             ```
             A correct version would look something like: 
 
-            feat: add new feature (@github-username)
-            impr(quotes): add english quotes (@github-username)
-            fix: resolve bug (@github-username)
+            feat: add new feature (@github_username)
+            impr(quotes): add english quotes (@username)
+            fix(leaderboard): show user rank correctly (@user1, @user2, @user3)
 
       # Delete a previous comment when the issue has been resolved
       - if: ${{ steps.lint_pr_title.outputs.error_message == null }}

.github/workflows/write-labels.yml

@@ -23,7 +23,7 @@ jobs:
 
       - name: Read json file
         id: json_reader
-        uses: juliangruber/read-file-action@v1.1.7
+        uses: juliangruber/read-file-action@v1
         with:
           path: ./labels/write-labels.json
 

.gitignore

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

README.md

@@ -9,6 +9,7 @@
 ![HTML5](https://img.shields.io/badge/html5-%23E34F26.svg?style=for-the-badge&logo=html5&logoColor=white)
 ![JQuery](https://img.shields.io/badge/jQuery-0769AD?style=for-the-badge&logo=jquery&logoColor=white)
 ![MongoDB](https://img.shields.io/badge/-MongoDB-13aa52?style=for-the-badge&logo=mongodb&logoColor=white)
+![OXLint](https://img.shields.io/badge/%E2%9A%93%20oxlint-2b3c5a?style=for-the-badge&logoColor=white)
 ![PNPM](https://img.shields.io/badge/pnpm-F69220?style=for-the-badge&logo=pnpm&logoColor=white)
 ![Redis](https://img.shields.io/badge/Redis-DC382D?style=for-the-badge&logo=redis&logoColor=white)
 ![SASS](https://img.shields.io/badge/SASS-hotpink.svg?style=for-the-badge&logo=SASS&logoColor=white)

backend/.oxlintrc.json

@@ -0,0 +1,26 @@
+{
+  "extends": [
+    "../packages/oxlint-config/index.json"
+    // "@monkeytype/oxlint-config"
+  ],
+  "overrides": [
+    {
+      "files": ["__tests__/**"],
+      "plugins": [
+        "typescript",
+        "unicorn",
+        "oxc",
+        "import",
+        "node",
+        "promise",
+        "jest",
+        "vitest"
+      ],
+      "rules": {
+        "no-explicit-any": "allow",
+        "explicit-function-return-type": "off",
+        "ban-ts-comment": "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

@@ -139,28 +139,29 @@ describe("Loaderboard Controller", () => {
       );
     });
 
-    it("should get for mode", async () => {
-      getLeaderboardMock.mockResolvedValue([]);
-      for (const mode of ["time", "words", "quote", "zen", "custom"]) {
-        const response = await mockApp
-          .get("/leaderboards")
-          .query({ language: "english", mode, mode2: "custom" });
-        expect(response.status, "for mode " + mode).toEqual(200);
-      }
-    });
-
-    it("should get for mode2", async () => {
-      getLeaderboardMock.mockResolvedValue([]);
-      for (const mode2 of allModes) {
-        const response = await mockApp.get("/leaderboards").query({
-          language: "english",
-          mode: "words",
-          mode2,
-        });
+    describe("should get for modes", async () => {
+      beforeEach(() => {
+        getLeaderboardMock.mockResolvedValue([]);
+      });
 
-        expect(response.status, "for mode2 " + mode2).toEqual(200);
-      }
+      const testCases = [
+        { mode: "time", mode2: "15", language: "english", expectStatus: 200 },
+        { mode: "time", mode2: "60", language: "english", expectStatus: 200 },
+        { mode: "time", mode2: "30", language: "english", expectStatus: 404 },
+        { mode: "words", mode2: "15", language: "english", expectStatus: 404 },
+        { mode: "time", mode2: "15", language: "spanish", expectStatus: 404 },
+      ];
+      it.for(testCases)(
+        `expect $expectStatus for mode $mode, mode2 $mode2, lang $language`,
+        async ({ mode, mode2, language, expectStatus }) => {
+          await mockApp
+            .get("/leaderboards")
+            .query({ language, mode, mode2 })
+            .expect(expectStatus);
+        }
+      );
     });
+
     it("fails for missing query", async () => {
       const { body } = await mockApp.get("/leaderboards").expect(422);
 
@@ -188,7 +189,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 +345,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 +653,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 +831,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".',
         ],