Merge branch 'master' into theme_preview_batch

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ""
+labels: ""
+assignees: ""
+---
+<!--PLEASE FIRST READ THE FAQ (#1770) AND COMMON ERROR CODES (#1772)!!!-->
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Expected behaviour**
+A clear and concise description of what you expected to happen.
+
+**Screenshots / Live demo link (paste the github-readme-stats link as markdown image)**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.
+
+<!-- FAQ
+Below are some questions that are found in the FAQ. The full FAQ can be found in #1770.
+
+Q: My card displays an error
+Ans: First, check the common error codes (i.e. https://github.com/anuraghazra/github-readme-stats/issues/1772) and existing issues before creating a new one. 
+
+Q: How to hide jupyter Notebook?
+Ans: &hide=jupyter%20notebook
+
+Q: I could not figure out how to deploy on my own vercel instance
+Ans:
+  - docs: https://github.com/anuraghazra/github-readme-stats/#deploy-on-your-own-vercel-instance
+  - YT tutorial by codeSTACKr: https://www.youtube.com/watch?v=n6d4KHSKqGk&feature=youtu.be&t=107
+
+Q: Language Card is incorrect
+Ans: Please read all the issues/comments before opening any issues regarding language card stats:
+    - https://github.com/anuraghazra/github-readme-stats/issues/136#issuecomment-665164174
+    - https://github.com/anuraghazra/github-readme-stats/issues/136#issuecomment-665172181
+
+Q: How to count private stats?
+Ans: We can only count private commits & we cannot access any other private info of any users, so it's impossible. The only way is to deploy on your own instance & use your own PAT (Personal Access Token)
+-->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,60 +0,0 @@
-name: Bug report
-description: Create a report to help us improve.
-labels:
-  - "bug"
-body:
-  - type: markdown
-    attributes:
-      value: |
-        :warning: PLEASE FIRST READ THE FAQ [(#1770)](https://github.com/anuraghazra/github-readme-stats/discussions/1770) AND COMMON ERROR CODES [(#1772)](https://github.com/anuraghazra/github-readme-stats/issues/1772)!!!
-  - type: textarea
-    attributes:
-      label: Describe the bug
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected behaviour
-      description:
-        A clear and concise description of what you expected to happen.
-  - type: textarea
-    attributes:
-      label: Screenshots / Live demo link
-      description: If applicable, add screenshots to help explain your problem.
-      placeholder: Paste the github-readme-stats link as markdown image
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
-  - type: markdown
-    attributes:
-      value: |
-        ---
-        ### FAQ (Snippet)
-
-        Below are some questions that are found in the FAQ. The full FAQ can be found in [#1770](https://github.com/anuraghazra/github-readme-stats/discussions/1770).
-
-        #### Q: My card displays an error
-
-        **Ans:** First, check the common error codes (i.e. https://github.com/anuraghazra/github-readme-stats/issues/1772) and existing issues before creating a new one. 
-
-        #### Q: How to hide jupyter Notebook?
-
-        **Ans:** `&hide=jupyter%20notebook`.
-
-        #### Q: I could not figure out how to deploy on my own vercel instance
-
-        **Ans:** Please check:
-          - Docs: https://github.com/anuraghazra/github-readme-stats/#deploy-on-your-own-vercel-instance
-          - YT tutorial by codeSTACKr: https://www.youtube.com/watch?v=n6d4KHSKqGk&feature=youtu.be&t=107
-
-        #### Q: Language Card is incorrect
-
-        **Ans:** Please read these issues/comments before opening any issues regarding language card stats:
-          - https://github.com/anuraghazra/github-readme-stats/issues/136#issuecomment-665164174
-          - https://github.com/anuraghazra/github-readme-stats/issues/136#issuecomment-665172181
-
-        #### Q: How to count private stats?
-
-        **Ans:** We can only count private commits & we cannot access any other private info of any users, so it's impossible. The only way is to deploy on your own instance & use your own PAT (Personal Access Token).

.github/ISSUE_TEMPLATE/config.yml

@@ -1,12 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: Question
-    url: https://github.com/anuraghazra/github-readme-stats/discussions
-    about: Please ask and answer questions here.
-  - name: Error
-    url: https://github.com/anuraghazra/github-readme-stats/issues/1772
-    about:
-      Before opening a bug report, please check the 'Common Error Codes' issue.
-  - name: FAQ
-    url: https://github.com/anuraghazra/github-readme-stats/discussions/1770
-    about: Please first check the FAQ before asking a question.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,41 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ""
+labels: ""
+assignees: ""
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+
+<!--
+
+PLEASE READ THE FAQs!!!
+
+Q: How to hide jupyter Notebook?
+Ans: &hide=jupyter%20notebook
+
+Q: I could not figure out how to deploy on my own vercel instance
+Ans:
+  - docs: https://github.com/anuraghazra/github-readme-stats/#deploy-on-your-own-vercel-instance
+  - YT tutorial by codeSTACKr: https://www.youtube.com/watch?v=n6d4KHSKqGk&feature=youtu.be&t=107
+
+Q: Language Card is incorrect
+Ans: Please read all the issues / comments before opening any issues regarding language card stats:
+    - https://github.com/anuraghazra/github-readme-stats/issues/136#issuecomment-665164174
+    - https://github.com/anuraghazra/github-readme-stats/issues/136#issuecomment-665172181
+
+Q: How to count private stats?
+Ans: We can only count private commits & we cannot access any other private info of any users, so it's not possible. only way is to deploy on your own instance & use your own PAT (Personal Access Token)
+
+-->

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,28 +0,0 @@
-name: Feature request
-description: Suggest an idea for this project.
-labels:
-  - "enhancement"
-body:
-  - type: textarea
-    attributes:
-      label: Is your feature request related to a problem? Please describe.
-      description:
-        A clear and concise description of what the problem is. Ex. I'm always
-        frustrated when [...]
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-  - type: textarea
-    attributes:
-      label: Describe alternatives you've considered
-      description:
-        A clear and concise description of any alternative solutions or features
-        you've considered.
-  - type: textarea
-    attributes:
-      label: Additional context
-      description:
-        Add any other context or screenshots about the feature request here.

.github/labeler.yml

@@ -1,4 +1,3 @@
 themes: themes/index.js
 doc-translation: docs/*
 card-i18n: src/translations.js
-documentation: readme.md

.github/workflows/deploy-prep.py

@@ -1,10 +0,0 @@
-import os
-
-file = open('./vercel.json', 'r')
-str = file.read()
-file = open('./vercel.json', 'w')
-
-str = str.replace('"maxDuration": 10', '"maxDuration": 30')
-
-file.write(str)
-file.close()

.github/workflows/deploy-prep.yml

@@ -1,20 +0,0 @@
-name: Deployment Prep
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-
-jobs:
-  config:
-    if: github.repository == 'anuraghazra/github-readme-stats'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Deployment Prep
-        run: python ./.github/workflows/deploy-prep.py
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          branch: vercel
-          create_branch: true
-          push_options: "--force"

.github/workflows/e2e-test.yml

@@ -5,7 +5,6 @@ on:
 jobs:
   e2eTests:
     if:
-      github.repository == 'anuraghazra/github-readme-stats' &&
       github.event_name == 'deployment_status' &&
       github.event.deployment_status.state == 'success'
     name: Perform 2e2 tests

.github/workflows/empty-issues-closer.yaml

@@ -8,7 +8,6 @@ on:
 
 jobs:
   closeEmptyIssuesAndTemplates:
-    if: github.repository == 'anuraghazra/github-readme-stats'
     name: Close empty issues
     runs-on: ubuntu-latest
     steps:

.github/workflows/generate-theme-doc.yml

@@ -23,10 +23,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: npm
 
-      # Fix the unsafe repo error which was introduced by the CVE-2022-24765 git patches.
-      - name: Fix unsafe repo error
-        run: git config --global --add safe.directory ${{ github.workspace }}
-
       - name: npm install, generate readme
         run: |
           npm ci

.github/workflows/label-pr.yml

@@ -4,7 +4,6 @@ on:
 
 jobs:
   triage:
-    if: github.repository == 'anuraghazra/github-readme-stats'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/labeler@v4

.github/workflows/stale-theme-pr-closer.yaml

@@ -5,7 +5,6 @@ on:
 
 jobs:
   closeOldThemePrs:
-    if: github.repository == 'anuraghazra/github-readme-stats'
     name: Close stale 'invalid' theme PRs
     runs-on: ubuntu-latest
     strategy:
@@ -27,5 +26,5 @@ jobs:
 
       - run: npm run close-stale-theme-prs
         env:
-          STALE_DAYS: 20
+          STALE_DAYS: 15
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/top-issues-dashboard.yml

@@ -5,7 +5,6 @@ on:
 
 jobs:
   showAndLabelTopIssues:
-    if: github.repository == 'anuraghazra/github-readme-stats'
     name: Update top issues Dashboard.
     runs-on: ubuntu-latest
     steps:

.github/workflows/update-langs.yaml

@@ -1,44 +0,0 @@
-name: Update supported languages
-on:
-  schedule:
-    - cron: "0 0 */30 * *"
-
-jobs:
-  updateLanguages:
-    if: github.repository == 'anuraghazra/github-readme-stats'
-    name: Update supported languages
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [16.x]
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: npm
-
-      - name: Install dependencies
-        run: npm ci
-        env:
-          CI: true
-
-      - name: Run update-languages-json.js script
-        run: npm run generate-langs-json
-
-      - name: Create Pull Request if upstream language file is changed
-        uses: peter-evans/create-pull-request@v4
-        with:
-          commit-message: "refactor: update languages JSON"
-          branch: "update_langs/patch"
-          delete-branch: true
-          title: Update languages JSON
-          body:
-            "The
-            [update-langs](https://github.com/anuraghazra/github-readme-stats/actions/workflows/update-langs.yaml)
-            action found new/updated languages in the [upstream languages JSON
-            file](https://raw.githubusercontent.com/github/linguist/master/lib/linguist/languages.yml)."
-          labels: "ci, lang-card"

.gitignore

@@ -10,5 +10,3 @@ vercel_token
 # IDE
 .vscode
 *.code-workspace
-
-.vercel

.husky/.gitignore

@@ -1 +0,0 @@
-_

.husky/pre-commit

@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npm test
-npx lint-staged

CONTRIBUTING.md

@@ -2,11 +2,11 @@
 
 We love your input! We want to make contributing to this project as easy and transparent as possible, whether it's:
 
--   Reporting [an issue](https://github.com/anuraghazra/github-readme-stats/issues/new?assignees=&labels=bug&template=bug_report.yml).
+-   Reporting an issue
--   [Discussing](https://github.com/anuraghazra/github-readme-stats/discussions) the current state of the code.
+-   Discussing the current state of the code
--   Submitting [a fix](https://github.com/anuraghazra/github-readme-stats/compare).
+-   Submitting a fix
--   Proposing [new features](https://github.com/anuraghazra/github-readme-stats/issues/new?assignees=&labels=enhancement&template=feature_request.yml).
+-   Proposing new features
--   Becoming a maintainer.
+-   Becoming a maintainer
 
 ## All Changes Happen Through Pull Requests
 
@@ -33,15 +33,11 @@ _(make sure you already have a [Vercel](https://vercel.com/) account)_
 1.  Install [Vercel CLI](https://vercel.com/download).
 2.  Fork the repository and clone the code to your local machine.
 3.  Run `npm install` in the repository root.
-4.  Run the command `vercel` in the root and follow the steps there.
+4.  Run the command "vercel" in the root and follow the steps there.
 5.  Open `vercel.json` and set the maxDuration to 10.
 6.  Create a `.env` file in the root of the directory.
-7.  In the .env file add a new variable named `PAT_1` with your [GitHub Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token).
+7.  In the .env file add a new variable named "PAT_1" with your [GitHub Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token).
-8.  Run the command `vercel dev` to start a development server at <https://localhost:3000>.
+8.  Run the command "vercel dev" to start a development server at <https://localhost:3000>.
-9.  The cards will then be available from this local endpoint (i.e. `https://localhost:3000/api?username=anuraghazra`).
-
-> **Note**
-> You can also debug any tests using the [VSCode Jest extension](https://marketplace.visualstudio.com/items?itemName=Orta.vscode-jest). For more information see https://github.com/jest-community/vscode-jest/issues/912.
 
 ## Themes Contribution
 

api/index.js

@@ -1,3 +1,4 @@
+import * as dotenv from "dotenv";
 import { renderStatsCard } from "../src/cards/stats-card.js";
 import { blacklist } from "../src/common/blacklist.js";
 import {
@@ -10,6 +11,8 @@ import {
 import { fetchStats } from "../src/fetchers/stats-fetcher.js";
 import { isLocaleAvailable } from "../src/translations.js";
 
+dotenv.config();
+
 export default async (req, res) => {
   const {
     username,
@@ -23,7 +26,6 @@ export default async (req, res) => {
     include_all_commits,
     line_height,
     title_color,
-    ring_color,
     icon_color,
     text_color,
     text_bold,
@@ -35,9 +37,7 @@ export default async (req, res) => {
     locale,
     disable_animations,
     border_radius,
-    number_format,
     border_color,
-    rank_icon,
   } = req.query;
   res.setHeader("Content-Type", "image/svg+xml");
 
@@ -63,12 +63,7 @@ export default async (req, res) => {
       CONSTANTS.ONE_DAY,
     );
 
-    res.setHeader(
+    res.setHeader("Cache-Control", `public, max-age=${cacheSeconds}`);
-      "Cache-Control",
-      `max-age=${
-        cacheSeconds / 2
-      }, s-maxage=${cacheSeconds}, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-    );
 
     return res.send(
       renderStatsCard(stats, {
@@ -81,7 +76,6 @@ export default async (req, res) => {
         include_all_commits: parseBoolean(include_all_commits),
         line_height,
         title_color,
-        ring_color,
         icon_color,
         text_color,
         text_bold: parseBoolean(text_bold),
@@ -90,14 +84,11 @@ export default async (req, res) => {
         custom_title,
         border_radius,
         border_color,
-        number_format,
         locale: locale ? locale.toLowerCase() : null,
         disable_animations: parseBoolean(disable_animations),
-        rank_icon,
       }),
     );
   } catch (err) {
-    res.setHeader("Cache-Control", `no-cache, no-store, must-revalidate`); // Don't cache error responses.
     return res.send(renderError(err.message, err.secondaryMessage));
   }
 };

api/pin.js

@@ -58,12 +58,7 @@ export default async (req, res) => {
       cacheSeconds = CONSTANTS.FOUR_HOURS;
     }
 
-    res.setHeader(
+    res.setHeader("Cache-Control", `public, max-age=${cacheSeconds}`);
-      "Cache-Control",
-      `max-age=${
-        cacheSeconds / 2
-      }, s-maxage=${cacheSeconds}, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-    );
 
     return res.send(
       renderRepoCard(repoData, {
@@ -80,7 +75,6 @@ export default async (req, res) => {
       }),
     );
   } catch (err) {
-    res.setHeader("Cache-Control", `no-cache, no-store, must-revalidate`); // Don't cache error responses.
     return res.send(renderError(err.message, err.secondaryMessage));
   }
 };

api/status/pat-info.js

@@ -1,139 +0,0 @@
-/**
- * @file Contains a simple cloud function that can be used to check which PATs are no
- * longer working. It returns a list of valid PATs, expired PATs and PATs with errors.
- *
- * @description This function is currently rate limited to 1 request per 5 minutes.
- */
-
-import { logger, request, dateDiff } from "../../src/common/utils.js";
-export const RATE_LIMIT_SECONDS = 60 * 5; // 1 request per 5 minutes
-
-/**
- * Simple uptime check fetcher for the PATs.
- *
- * @param {import('axios').AxiosRequestHeaders} variables
- * @param {string} token
- */
-const uptimeFetcher = (variables, token) => {
-  return request(
-    {
-      query: `
-        query {
-          rateLimit {
-            remaining
-            resetAt
-          },
-        }`,
-      variables,
-    },
-    {
-      Authorization: `bearer ${token}`,
-    },
-  );
-};
-
-const getAllPATs = () => {
-  return Object.keys(process.env).filter((key) => /PAT_\d*$/.exec(key));
-};
-
-/**
- * Check whether any of the PATs is expired.
- */
-const getPATInfo = async (fetcher, variables) => {
-  const details = {};
-  const PATs = getAllPATs();
-
-  for (const pat of PATs) {
-    try {
-      const response = await fetcher(variables, process.env[pat]);
-      const errors = response.data.errors;
-      const hasErrors = Boolean(errors);
-      const errorType = errors?.[0]?.type;
-      const isRateLimited =
-        (hasErrors && errorType === "RATE_LIMITED") ||
-        response.data.data?.rateLimit?.remaining === 0;
-
-      // Store PATs with errors.
-      if (hasErrors && errorType !== "RATE_LIMITED") {
-        details[pat] = {
-          status: "error",
-          error: {
-            type: errors[0].type,
-            message: errors[0].message,
-          },
-        };
-        continue;
-      } else if (isRateLimited) {
-        const date1 = new Date();
-        const date2 = new Date(response.data?.data?.rateLimit?.resetAt);
-        details[pat] = {
-          status: "exhausted",
-          remaining: 0,
-          resetIn: dateDiff(date2, date1) + " minutes",
-        };
-      } else {
-        details[pat] = {
-          status: "valid",
-          remaining: response.data.data.rateLimit.remaining,
-        };
-      }
-    } catch (err) {
-      // Store the PAT if it is expired.
-      const errorMessage = err.response?.data?.message?.toLowerCase();
-      if (errorMessage === "bad credentials") {
-        details[pat] = {
-          status: "expired",
-        };
-      } else if (errorMessage === "sorry. your account was suspended.") {
-        details[pat] = {
-          status: "suspended",
-        };
-      } else {
-        throw err;
-      }
-    }
-  }
-
-  const filterPATsByStatus = (status) => {
-    return Object.keys(details).filter((pat) => details[pat].status === status);
-  };
-
-  const sortedDetails = Object.keys(details)
-    .sort()
-    .reduce((obj, key) => {
-      obj[key] = details[key];
-      return obj;
-    }, {});
-
-  return {
-    validPATs: filterPATsByStatus("valid"),
-    expiredPATs: filterPATsByStatus("expired"),
-    exhaustedPATs: filterPATsByStatus("exhausted"),
-    suspendedPATs: filterPATsByStatus("suspended"),
-    errorPATs: filterPATsByStatus("error"),
-    details: sortedDetails,
-  };
-};
-
-/**
- * Cloud function that returns information about the used PATs.
- */
-export default async (_, res) => {
-  res.setHeader("Content-Type", "application/json");
-  try {
-    // Add header to prevent abuse.
-    const PATsInfo = await getPATInfo(uptimeFetcher, {});
-    if (PATsInfo) {
-      res.setHeader(
-        "Cache-Control",
-        `max-age=0, s-maxage=${RATE_LIMIT_SECONDS}`,
-      );
-    }
-    res.send(JSON.stringify(PATsInfo, null, 2));
-  } catch (err) {
-    // Throw error if something went wrong.
-    logger.error(err);
-    res.setHeader("Cache-Control", "no-store");
-    res.send("Something went wrong: " + err.message);
-  }
-};

api/status/up.js

@@ -1,103 +0,0 @@
-/**
- * @file Contains a simple cloud function that can be used to check if the PATs are still
- * functional.
- *
- * @description This function is currently rate limited to 1 request per 5 minutes.
- */
-
-import retryer from "../../src/common/retryer.js";
-import { logger, request } from "../../src/common/utils.js";
-
-export const RATE_LIMIT_SECONDS = 60 * 5; // 1 request per 5 minutes
-
-/**
- * Simple uptime check fetcher for the PATs.
- *
- * @param {import('axios').AxiosRequestHeaders} variables
- * @param {string} token
- */
-const uptimeFetcher = (variables, token) => {
-  return request(
-    {
-      query: `
-        query {
-          rateLimit {
-              remaining
-          }
-        }
-        `,
-      variables,
-    },
-    {
-      Authorization: `bearer ${token}`,
-    },
-  );
-};
-
-/**
- * Creates Json response that can be used for shields.io dynamic card generation.
- *
- * @param {*} up Whether the PATs are up or not.
- * @returns Dynamic shields.io JSON response object.
- *
- * @see https://shields.io/endpoint.
- */
-const shieldsUptimeBadge = (up) => {
-  const schemaVersion = 1;
-  const isError = true;
-  const label = "Public Instance";
-  const message = up ? "up" : "down";
-  const color = up ? "brightgreen" : "red";
-  return {
-    schemaVersion,
-    label,
-    message,
-    color,
-    isError,
-  };
-};
-
-/**
- * Cloud function that returns whether the PATs are still functional.
- */
-export default async (req, res) => {
-  let { type } = req.query;
-  type = type ? type.toLowerCase() : "boolean";
-
-  res.setHeader("Content-Type", "application/json");
-
-  try {
-    let PATsValid = true;
-    try {
-      await retryer(uptimeFetcher, {});
-    } catch (err) {
-      PATsValid = false;
-    }
-
-    if (PATsValid) {
-      res.setHeader(
-        "Cache-Control",
-        `max-age=0, s-maxage=${RATE_LIMIT_SECONDS}`,
-      );
-    } else {
-      res.setHeader("Cache-Control", "no-store");
-    }
-
-    switch (type) {
-      case "shields":
-        res.send(shieldsUptimeBadge(PATsValid));
-        break;
-      case "json":
-        res.send({ up: PATsValid });
-        break;
-      default:
-        res.send(PATsValid);
-        break;
-    }
-  } catch (err) {
-    // Return fail boolean if something went wrong.
-    logger.error(err);
-    res.setHeader("Cache-Control", "no-store");
-    res.send("Something went wrong: " + err.message);
-  }
-};

api/top-langs.js

@@ -1,3 +1,4 @@
+import * as dotenv from "dotenv";
 import { renderTopLanguages } from "../src/cards/top-languages-card.js";
 import { blacklist } from "../src/common/blacklist.js";
 import {
@@ -10,6 +11,8 @@ import {
 import { fetchTopLanguages } from "../src/fetchers/top-languages-fetcher.js";
 import { isLocaleAvailable } from "../src/translations.js";
 
+dotenv.config();
+
 export default async (req, res) => {
   const {
     username,
@@ -25,14 +28,10 @@ export default async (req, res) => {
     layout,
     langs_count,
     exclude_repo,
-    size_weight,
-    count_weight,
     custom_title,
     locale,
     border_radius,
     border_color,
-    disable_animations,
-    hide_progress,
   } = req.query;
   res.setHeader("Content-Type", "image/svg+xml");
 
@@ -48,8 +47,6 @@ export default async (req, res) => {
     const topLangs = await fetchTopLanguages(
       username,
       parseArray(exclude_repo),
-      size_weight,
-      count_weight,
     );
 
     const cacheSeconds = clampValue(
@@ -58,12 +55,7 @@ export default async (req, res) => {
       CONSTANTS.ONE_DAY,
     );
 
-    res.setHeader(
+    res.setHeader("Cache-Control", `public, max-age=${cacheSeconds}`);
-      "Cache-Control",
-      `max-age=${
-        cacheSeconds / 2
-      }, s-maxage=${cacheSeconds}, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-    );
 
     return res.send(
       renderTopLanguages(topLangs, {
@@ -81,12 +73,9 @@ export default async (req, res) => {
         border_radius,
         border_color,
         locale: locale ? locale.toLowerCase() : null,
-        disable_animations: parseBoolean(disable_animations),
-        hide_progress: parseBoolean(hide_progress),
       }),
     );
   } catch (err) {
-    res.setHeader("Cache-Control", `no-cache, no-store, must-revalidate`); // Don't cache error responses.
     return res.send(renderError(err.message, err.secondaryMessage));
   }
 };

api/wakatime.js

@@ -1,3 +1,4 @@
+import * as dotenv from "dotenv";
 import { renderWakatimeCard } from "../src/cards/wakatime-card.js";
 import {
   clampValue,
@@ -9,6 +10,8 @@ import {
 import { fetchWakatimeStats } from "../src/fetchers/wakatime-fetcher.js";
 import { isLocaleAvailable } from "../src/translations.js";
 
+dotenv.config();
+
 export default async (req, res) => {
   const {
     username,
@@ -52,12 +55,7 @@ export default async (req, res) => {
       cacheSeconds = CONSTANTS.FOUR_HOURS;
     }
 
-    res.setHeader(
+    res.setHeader("Cache-Control", `public, max-age=${cacheSeconds}`);
-      "Cache-Control",
-      `max-age=${
-        cacheSeconds / 2
-      }, s-maxage=${cacheSeconds}, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-    );
 
     return res.send(
       renderWakatimeCard(stats, {
@@ -80,7 +78,6 @@ export default async (req, res) => {
       }),
     );
   } catch (err) {
-    res.setHeader("Cache-Control", `no-cache, no-store, must-revalidate`); // Don't cache error responses.
     return res.send(renderError(err.message, err.secondaryMessage));
   }
 };

docs/readme_cn.md

@@ -53,8 +53,6 @@
     <a href="/docs/readme_nl.md">Nederlands</a>
     .
     <a href="/docs/readme_np.md">नेपाली</a>
-    .
-    <a href="/docs/readme_tr.md">Türkçe</a>
   </p>
 </p>
 <p align="center">喜欢这个项目？请考虑<a href="https://www.paypal.me/anuraghazra">捐赠</a>来帮助它完善！
@@ -140,7 +138,7 @@ dark, radical, merko, gruvbox, tokyonight, onedark, cobalt, synthwave, highcontr
 - `bg_color` - 卡片背景颜色 _（十六进制色码）_ **或者** 以 _angle,start,end_ 的形式渐变
 - `hide_border` - 隐藏卡的边框 _(布尔值)_
 - `theme` - 主题名称，从[所有可用主题](../themes/README.md)中选择
-- `cache_seconds` - 手动设置缓存头 _（最小值: 14400，最大值: 86400）_
+- `cache_seconds` - 手动设置缓存头 _（最小值: 1800，最大值: 86400）_
 - `locale` - 在卡片中设置语言 _(例如 cn, de, es, 等等)_
 
 ##### bg_color 渐变

docs/readme_de.md

@@ -54,8 +54,6 @@
     <a href="/docs/readme_nl.md">Nederlands</a>
     .
     <a href="/docs/readme_np.md">नेपाली</a>
-    .
-    <a href="/docs/readme_tr.md">Türkçe</a>
   </p>
 </p>
 <p align="center">Du magst das Projekt? Wie wäre es mit einer kleinen <a href="https://www.paypal.me/anuraghazra">Spende</a> um es weiterhin am Leben zu erhalten?
@@ -130,7 +128,7 @@ Du kannst das Erscheinungsbild deiner `Stats Card` oder `Repo Card`, mithilfe vo
 - `bg_color` - Hintergrundfarbe _(hex color)_ **oder** ein Farbverlauf in der Form von _winkel,start,ende_
 - `hide_border` - Blendet den Rand der Karte aus _(Boolean)_
 - `theme` - Name des Erscheinungsbildes/Themes [alle verfügbaren Themes](../themes/README.md)
-- `cache_seconds` - manuelles festlegen der Cachezeiten _(min: 14400, max: 86400)_
+- `cache_seconds` - manuelles festlegen der Cachezeiten _(min: 1800, max: 86400)_
 - `locale` - Stellen Sie die Sprache auf der Karte ein _(z.B. cn, de, es, etc.)_
 
 ##### Farbverlauf in bg_color

docs/readme_es.md

@@ -142,7 +142,7 @@ Puedes personalizar el aspecto de tu `Tarjeta de Estadísticas` o `Tarjeta de Re
 - `bg_color` - Color de fondo _(hex color)_
 - `hide_border` - Oculta el borde de la tarjeta _(booleano)_
 - `theme` - Nombre del tema, elige uno de [todos los temas disponible ](../themes/README.md)
-- `cache_seconds` - Cache _(min: 14400, max: 86400)_
+- `cache_seconds` - Cache _(min: 1800, max: 86400)_
 - `locale` - configurar el idioma en la tarjeta _(p.ej. cn, de, es, etc.)_
 
 ##### Gradiente en `bg_color`

docs/readme_fr.md

@@ -53,8 +53,6 @@
     <a href="/docs/readme_nl.md">Nederlands</a>
     .
     <a href="/docs/readme_np.md">नेपाली</a>
-    .
-    <a href="/docs/readme_tr.md">Türkçe</a>
   </p>
 </p>
 <p align="center">Vous aimez ce projet? Pensez <a href="https://www.paypal.me/anuraghazra">à faire un don</a> pour l'améliorer!
@@ -140,7 +138,7 @@ Vous pouvez personnaliser l'apparence de votre `Carte des stats` ou `Carte de d
 - `bg_color` - Couleur du fond de la carte _(hex color)_ **ou** un gradiant de la forme _angle,start,end_
 - `hide_border` - Cache la bordure de la carte _(booléen)_
 - `theme` - Nom du thème, parmis [tous les thèmes disponibles](../themes/README.md)
-- `cache_seconds` - Paramétrer le cache manuellement _(min: 14400, max: 86400)_
+- `cache_seconds` - Paramétrer le cache manuellement _(min: 1800, max: 86400)_
 - `locale` - définir la langue de la carte _(par exemple. cn, de, es, etc.)_
 
 ##### Gradient in bg_color

docs/readme_it.md

@@ -53,8 +53,6 @@
     <a href="/docs/readme_nl.md">Nederlands</a>
     .
     <a href="/docs/readme_np.md">नेपाली</a>
-    .
-    <a href="/docs/readme_tr.md">Türkçe</a>
   </p>
 </p>
 <p align="center">Se ti piace questo progetto, considera la possibilità di <a href="https://www.paypal.me/anuraghazra">donare</a> per aiutare a renderlo migliore!
@@ -140,7 +138,7 @@ Puoi personalizzare l'aspetto delle tue `Stats Card` o delle `Repo Card` in qual
 - `bg_color` - Colore dello sfondo _(in esadecimale)_ **oppure** un gradiente nella forma _angolo,inizio,fine_
 - `hide_border` - Nasconde il bordo della carta _(booleano)_
 - `theme` - Nome del tema, dai un'occhiata a [tutti i temi disponibili](../themes/README.md)
-- `cache_seconds` - Specifica manualmente il valore di cache, in secondi _(min: 14400, max: 86400)_
+- `cache_seconds` - Specifica manualmente il valore di cache, in secondi _(min: 1800, max: 86400)_
 - `locale` - Impostare la lingua nella scheda _(per esempio. cn, de, es, eccetera.)_
 
 ##### Gradiente nello sfondo

docs/readme_ja.md

@@ -53,8 +53,6 @@
     <a href="/docs/readme_nl.md">Nederlands</a>
     .
     <a href="/docs/readme_np.md">नेपाली</a>
-    .
-    <a href="/docs/readme_tr.md">Türkçe</a>
   </p>
 </p>
 <p align="center">このプロジェクトを気に入っていただけましたか？<br>もしよろしければ、プロジェクトのさらなる改善のために<a href="https://www.paypal.me/anuraghazra">寄付</a>を検討して頂けると嬉しいです！</p>
@@ -141,7 +139,7 @@ dark, radical, merko, gruvbox, tokyonight, onedark, cobalt, synthwave, highcontr
 - `bg_color` - 背景の色 _(16 進数カラーコード)_ **または** _angle,start,end_ の形式でグラデーションを指定することも可
 - `hide_border` - カードの境界線を非表示にします _(ブール値)_
 - `theme` - [使用可能なテーマ一覧](../themes/README.md) から選んだテーマ名
-- `cache_seconds` - キャッシュ時間の秒数 _(最小値: 14400, 最大値: 86400)_
+- `cache_seconds` - キャッシュ時間の秒数 _(最小値: 1800, 最大値: 86400)_
 - `locale` - カードに言語を設定する _(例えば cn, de, es, 等)_
 
 ##### bg_color の グラデーション指定

docs/readme_kr.md

@@ -1,7 +1,7 @@
 <p align="center">
  <img width="100px" src="https://res.cloudinary.com/anuraghazra/image/upload/v1594908242/logo_ccswme.svg" align="center" alt="GitHub Readme Stats" />
  <h2 align="center">GitHub Readme Stats</h2>
- <p align="center">동적으로 생성되는 GitHub 사용량 통계를 여러분의 README 에 추가해보세요!</p>
+ <p align="center">동적으로 생성되는 Github 사용량 통계를 여러분의 README 에 추가해보세요!</p>
 </p>
   <p align="center">
     <a href="https://github.com/anuraghazra/github-readme-stats/actions">
@@ -53,8 +53,6 @@
     <a href="/docs/readme_nl.md">Nederlands</a>
     .
     <a href="/docs/readme_np.md">नेपाली</a>
-    .
-    <a href="/docs/readme_tr.md">Türkçe</a>
   </p>
 </p>
 <p align="center">기능들이 마음에 드시나요? 괜찮으시다면, 서비스 개선을 위해 <a href="https://www.paypal.me/anuraghazra">기부</a>를 고려해주세요!
@@ -74,7 +72,7 @@
 
 아래 코드를 복사해서 마크다운 파일에 붙여넣으면 끝이에요, 아주 간단해요!
 
-`?username=` 속성의 값을 GitHub 계정의 사용자 명(닉네임)으로 바꿔주세요.
+`?username=` 속성의 값을 Github 계정의 사용자 명(닉네임)으로 바꿔주세요.
 
 ```md
 [![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra)](https://github.com/anuraghazra/github-readme-stats)
@@ -151,7 +149,7 @@ dark, radical, merko, gruvbox, tokyonight, onedark, cobalt, synthwave, highcontr
 - `bg_color` - 카드의 배경 색상 _(hex color)_ **혹은** 다음 양식으로 그라데이션 주기 _angle,start,end_
 - `hide_border` - 카드의 테두리 표시 여부 _(boolean)_
 - `theme` - 테마의 이름, [사용 가능한 모든 테마](../themes/README.md) 에서 선택
-- `cache_seconds` - 수동으로 캐시 헤더 설정 _(min: 14400, max: 86400)_
+- `cache_seconds` - 수동으로 캐시 헤더 설정 _(min: 1800, max: 86400)_
 - `locale` - 카드에 표시할 언어 _(e.g. kr, cn, de, es, etc.)_
 
 ##### 배경에 그라데이션 주기
@@ -237,7 +235,7 @@ GitHub 저장소 여분 핀을 이용하면, 6개 이상의 저장소 핀을 여
 
 # 언어 사용량 통계
 
-언어 사용량 통계 카드는 GitHub 사용자가 가장 많이 사용한 언어가 표시됩니다.
+언어 사용량 통계 카드는 Github 사용자가 가장 많이 사용한 언어가 표시됩니다.
 
 _참고:
 언어 사용량 통계는 GitHub 에서 가장 많이 사용된 언어의 표기일 뿐입니다.

docs/readme_nl.md

@@ -53,8 +53,6 @@
     <a href="/docs/readme_nl.md">Nederlands</a>
     .
     <a href="/docs/readme_np.md">नेपाली</a>
-    .
-    <a href="/docs/readme_tr.md">Türkçe</a>
   </p>
 </p>
 <p align="center">Bevalt het project? <a href="https://www.paypal.me/anuraghazra">Doneer</a> om het te verbeteren!
@@ -144,7 +142,7 @@ Je kan het uiterlijk van je `Statistieken kaart` of `Repo kaart` aanpassen hoe j
 - `bg_color` - Achtergrond kleur van de kaart _(hex kleur)_ **of** een verloop van kleuren in het formaat van _graden,start,einde_
 - `hide_border` - Verbergt de rand van de kaart _(boolean)_
 - `theme` - Naam van het thema, kies uit [alle beschikbare thema\'s](../themes/README.md)
-- `cache_seconds` - Stel de cache header handmatig in _(min: 14400, max: 86400)_
+- `cache_seconds` - Stel de cache header handmatig in _(min: 1800, max: 86400)_
 - `locale` - Stel taal van de kaart in _(e.g. cn, de, es, etc.)_
 
 ##### Kleurenverloop in bg_color (achtergrond kleur):

docs/readme_np.md

@@ -49,12 +49,8 @@
     <a href="/docs/readme_it.md">Italiano</a>
     ·
     <a href="/docs/readme_kr.md">한국어</a>
-    .
-    <a href="/docs/readme_nl.md">Nederlands</a>
     ·
     <a href="/docs/readme_np.md">नेपाली</a>
-    .
-    <a href="/docs/readme_tr.md">Türkçe</a>
   </p>
 </p>
 <p align="center">परियोजना मनपर्‍यो? तपाईं मद्दत गर्न सक्नुहुन्छ <a href="https://www.paypal.me/anuraghazra">यो परियोजना</a> बढ्न 
@@ -142,7 +138,7 @@ dark, radical, merko, gruvbox, tokyonight, onedark, cobalt, synthwave, highcontr
 - `bg_color` - Card's background color _(hex color)_ **or** a gradient in the form of _angle,start,end_
 - `hide_border` - Hides the card's border _(boolean)_
 - `theme` - name of the theme, choose from [all available themes](./themes/README.md)
-- `cache_seconds` - set the cache header manually _(min: 14400, max: 86400)_
+- `cache_seconds` - set the cache header manually _(min: 1800, max: 86400)_
 - `locale` - set the language in the card _(e.g. cn, de, es, etc.)_
 
 ##### Gradient in bg_color
@@ -223,7 +219,7 @@ Use [show_owner](#customization) variable to include the repo's owner username
 
 टोप भाषाकार्डले github परयोग गर्नेहरुको प्रोग्रम्मिंग भाषाहरु देखाऊने गर्दछ |. 
 
-_NOTE: टोप भाषाहरुले आफ्नो सिपलाए संकेत गरेको होईन | योचै GitHub  Metricबाट धेरै कुन भाषा परयोग भाकोलाए संकेत गरेको हो |
+_NOTE: टोप भाषाहरुले आफ्नो सिपलाए संकेत गरेको होईन | योचै Github  Metricबाट धेरै कुन भाषा परयोग भाकोलाए संकेत गरेको हो |
 ### प्रयोग 
 
 कोदलाए  कपी- पेसेत  readme मा गर्नु होला र लिंक परिवतन गर्नु होला |
@@ -393,7 +389,7 @@ NOTE: Since [#58](https://github.com/anuraghazra/github-readme-stats/pull/58) we
 येदि तपाइले यो प्रोजेक्ट चलाउनु बाकोक्ष बने र मलाई अझै प्रसंसा गर्ने हो बने तपाइले थुप्रै तरिका ले गर्नु सक्नु हुने छ :-
 
 - यो प्रोजेक्टमा तपाइले प्रहयोग गर्दा मलाई क्रेडिट दिन सक्नु हुनेक्ष ।
-- तपाइले GitHub ReadMe Stats स्तार्रेड गर्न सक्नु हुनेक्ष  :rocket:
+- तपाइले Github ReadMe Stats स्तार्रेड गर्न सक्नु हुनेक्ष  :rocket:
 - [![paypal.me/anuraghazra](https://ionicabizau.github.io/badges/paypal.svg)](https://www.paypal.me/anuraghazra) - तपाइले पेपाल बाट पनि सहयोग (डक्क्षिन) गर्न सक्नु हुनेक्ष | म  ~~कोफी ~~ चिया . :tea: किन्न सक्क्षु ।
 
 धन्याबाद! :heart:

docs/readme_pt-BR.md

@@ -53,8 +53,6 @@
     <a href="/docs/readme_nl.md">Nederlands</a>
     .
     <a href="/docs/readme_np.md">नेपाली</a>
-    .
-    <a href="/docs/readme_tr.md">Türkçe</a>
   </p>
 </p>
 <p align="center">Gostou do projeto? Por favor considere <a href="https://www.paypal.me/anuraghazra">fazer uma doação</a> para ajudar a melhorá-lo!
@@ -141,10 +139,10 @@ Personalize a aparência do seu `Stats Card` ou `Repo Card` da maneira que desej
 - `bg_color` - Cor de fundo do cartão _(hex color)_
 - `hide_border` - Esconde a borda do cartão _(boleano)_
 - `theme` - Nome do tema, escolha em [todos os temas disponíveis](../themes/README.md)
-- `cache_seconds` - Defina o cabeçalho do cache manualmente _(min: 14400, max: 86400)_
+- `cache_seconds` - Defina o cabeçalho do cache manualmente _(min: 1800, max: 86400)_
 - `locale` - defina o idioma no cartão _(por exemplo. cn, de, es, etc.)_
 
-> Nota sobre o cache: Cartões de repositório tem um cache padrão de 30 minutos (1800 segundos), se o número a contagem de forks e contagem de estrelas é menor que 1 mil o padrão é 2 horas (7200 segundos). Note também que o cache é limitado a um mínimo de 30 minutos e um máximo de 24 horas.
+> Nota sobre o cache: Cartões de repositório tem um cache padrão de 30 minutos (1800 segundos), se o número a contagem de forks e contagem de estrelas é menor que 1 mil o padrão é 2 horas (7200). Note também que o cache é limitado a um mínimo de 30 minutos e um máximo de 24 horas.
 
 #### Opções exclusivas do cartão de estatísticas:
 
@@ -169,7 +167,7 @@ Personalize a aparência do seu `Stats Card` ou `Repo Card` da maneira que desej
 
 > :warning: **Importante:**
 > Nomes de linguagens devem ser uma sequência escapada de URI, como específicado em [Codificação por cento](https://pt.wikipedia.org/wiki/Codificação_por_cento)
-> (Ou seja: `c++` deve se tornar `c%2B%2B`, `jupyter notebook` deve se tornar `jupyter%20notebook`, etc.)
+> (Isso é: `c++` deve se tornar `c%2B%2B`, `jupyter notebook` deve se tornar `jupyter%20notebook`, etc.)
 
 ---
 

docs/readme_tr.md

@@ -73,10 +73,10 @@
 
 Alt kısımdaki kodu Kopyalayın ve yapıştırın. İşte bu kadar. Çok basit!
 
-`?username=` değerini kendi GitHub kullanıcı adınız ile değiştirin.
+`?username=` değerini kendi Github kullanıcı adınız ile değiştirin.
 
 ```md
-[![Anurag'nın GitHub İstatistikleri](https://github-readme-stats.vercel.app/api?username=anuraghazra)](https://github.com/anuraghazra/github-readme-stats)
+[![Anurag'nın Github İstatistikleri](https://github-readme-stats.vercel.app/api?username=anuraghazra)](https://github.com/anuraghazra/github-readme-stats)
 ```
 _Not: Şu sıralamalar mevcut: S+ (en üst 1%), S (en üst 25%), A++ (en üst 45%), A+ (en üst 60%), and B+ (herkes).
 Buradaki değerler [cumulative distribution function](https://en.wikipedia.org/wiki/Cumulative_distribution_function) ile hesaplanırken; commitler, katkılar, hatalar, yıldızlar, çekme istekleri, takipçiler ve sahip olunan depolar (repository) göz önünde bulundurulamaktadır.
@@ -143,7 +143,7 @@ dark, radical, merko, gruvbox, tokyonight, onedark, cobalt, synthwave, highcontr
 - `bg_color` - Kartın arkaplan rengi _(hex color / hex rengi)_ **ya da** gradient şeklinde _açı,başlangıç,bitiş_
 - `hide_border` - Kartın çerçevelerini gizler _(boolean)_
 - `theme` - Temanın rengi [tüm temalar](./themes/README.md)
-- `cache_seconds` - Manuel olarak cache'i belirleyebilirsiniz _(en az: 14400, en fazla: 86400)_
+- `cache_seconds` - Manuel olarak cache'i belirleyebilirsiniz _(en az: 1800, en fazla: 86400)_
 - `locale` - Karttaki dili seçebilirsiniz _(örneğin; tr, cn, de, es, vb.)_
 
 ##### bg_color'da Gradient
@@ -199,7 +199,7 @@ bg_color içerisinde birden fazla rengi gradient olarak göstermek için virgül
 
 # GitHub Ekstra Pinler
 
-GitHub ekstra pinler profilinize 6'dan fazla repoyu / depoyu profilinizde pinleyebilirsiniz.
+Github ekstra pinler profilinize 6'dan fazla repoyu / depoyu profilinizde pinleyebilirsiniz.
 
 Hey! Artık 6 pin ile kısıtlı kalmayacaksınız!
 
@@ -225,7 +225,7 @@ Endpoint: `api/pin?username=mustafacagri&repo=github-readme-stats`
 
 En çok kullanılan diller kartı kullanıcının en çok kullandığı dilleri gösterir.
 
-_NOTE: En çok kullanılan dillerde yer alan bilgiler sizin yeteneğinizi ve benzeri şeyleri göstermek. Bu, kodlarınızda en çok kullandığınız dilleri gösteren bir GitHub metriğidir. Ayrıca, github-readme-stats'ın yeni özelliğidir.
+_NOTE: En çok kullanılan dillerde yer alan bilgiler sizin yeteneğinizi ve benzeri şeyleri göstermek. Bu, kodlarınızda en çok kullandığınız dilleri gösteren bir Github metriğidir. Ayrıca, github-readme-stats'ın yeni özelliğidir.
 
 ### Kullanım
 
@@ -365,7 +365,7 @@ Genellikle resimleri yan yana düzenleyemezsiniz. Bunu yapmak için şu yaklaş
 
 #### [@codeSTACKr'ın Yayınladığı Video Eğitimine Göz Atın](https://youtu.be/n6d4KHSKqGk?t=107)
 
-GitHub API saatte sadece 5.000 isteğe izin verdiği için `https://github-readme-stats.vercel.app/api` adresindeki API'm bu limite muhtemelen takılmış olabilir. Eğer projeyi kendi Vercel sunucunuzda yayınlarsanız, böyle bir sorun yaşamayabilirsiniz. Deploy butonuna tıkla ve deploy başlasın!
+Github API saatte sadece 5.000 isteğe izin verdiği için `https://github-readme-stats.vercel.app/api` adresindeki API'm bu limite muhtemelen takılmış olabilir. Eğer projeyi kendi Vercel sunucunuzda yayınlarsanız, böyle bir sorun yaşamayabilirsiniz. Deploy butonuna tıkla ve deploy başlasın!
 
 
 NOT: [#58](https://github.com/anuraghazra/github-readme-stats/pull/58) geliştirmesi sonrasında anlamadığımız bir şekilde 5.000 istek limitine takılmıyoruz :)
@@ -378,9 +378,9 @@ NOT: [#58](https://github.com/anuraghazra/github-readme-stats/pull/58) geliştir
 1. [vercel.com](https://vercel.com/) adresine gidin
 1. `Log in`'e tıklayın
    ![](https://files.catbox.moe/tct1wg.png)
-1. `Continue with GitHub`'e basarak GitHub ile giriş yapın
+1. `Continue with GitHub`'e basarak Github ile giriş yapın
    ![](https://files.catbox.moe/btd78j.jpeg)
-1. GitHub'a giriş yapın ve eğer çıkarsa tüm repolara izin verin.
+1. Github'a giriş yapın ve eğer çıkarsa tüm repolara izin verin.
 1. Bu repoyu fork'layın
 1. [Vercel dashboard](https://vercel.com/dashboard)'unuza geri dönün.
 1. `Import Project`'i seçin.
@@ -409,7 +409,7 @@ Teşekkürler! :heart:
 
 ---
 
-[![https://vercel.com?utm_source=github_readme_stats_team&utm_campaign=oss](../powered-by-vercel.svg)](https://vercel.com?utm_source=github_readme_stats_team&utm_campaign=oss)
+[![https://vercel.com?utm_source=github_readme_stats_team&utm_campaign=oss](./powered-by-vercel.svg)](https://vercel.com?utm_source=github_readme_stats_team&utm_campaign=oss)
 
 
 Katkılara açığız! <3

express.js

@@ -1,15 +0,0 @@
-import statsCard from "./api/index.js";
-import repoCard from "./api/pin.js";
-import langCard from "./api/top-langs.js";
-import wakatimeCard from "./api/wakatime.js";
-import express from "express";
-import dotenv from "dotenv";
-
-dotenv.config();
-const app = express();
-app.listen(process.env.port || 9000);
-
-app.get("/", statsCard);
-app.get("/pin", repoCard);
-app.get("/top-langs", langCard);
-app.get("/wakatime", wakatimeCard);

package.json

@@ -1,23 +1,9 @@
 {
   "name": "github-readme-stats",
   "version": "1.0.0",
-  "description": "Dynamically generate stats for your GitHub readme",
+  "description": "Dynamically generate stats for your github readmes",
-  "keywords": [
+  "main": "index.js",
-    "github-readme-stats",
-    "readme-stats",
-    "cards",
-    "card-generator"
-  ],
-  "main": "src/index.js",
   "type": "module",
-  "homepage": "https://github.com/anuraghazra/github-readme-stats",
-  "bugs": {
-    "url": "https://github.com/anuraghazra/github-readme-stats/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/anuraghazra/github-readme-stats.git"
-  },
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage",
     "test:watch": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch",
@@ -27,9 +13,8 @@
     "preview-theme": "node scripts/preview-theme",
     "close-stale-theme-prs": "node scripts/close-stale-theme-prs",
     "generate-langs-json": "node scripts/generate-langs-json",
-    "format": "prettier --write .",
+    "format": "./node_modules/.bin/prettier --write .",
-    "format:check": "prettier --check .",
+    "format:check": "./node_modules/.bin/prettier --check ."
-    "prepare": "husky install"
   },
   "author": "Anurag Hazra",
   "license": "MIT",
@@ -39,14 +24,13 @@
     "@testing-library/dom": "^8.17.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@uppercod/css-to-object": "^1.1.1",
-    "axios-mock-adapter": "^1.21.2",
+    "axios-mock-adapter": "^1.18.1",
     "color-contrast-checker": "^2.1.0",
     "hjson": "^3.2.2",
-    "husky": "^8.0.0",
+    "husky": "^4.2.5",
     "jest": "^29.0.3",
     "jest-environment-jsdom": "^29.0.3",
     "js-yaml": "^4.1.0",
-    "lint-staged": "^13.0.3",
     "lodash.snakecase": "^4.1.1",
     "parse-diff": "^0.7.0",
     "prettier": "^2.1.2"
@@ -59,7 +43,9 @@
     "upgrade": "^1.1.0",
     "word-wrap": "^1.2.3"
   },
-  "lint-staged": {
+  "husky": {
-    "*.{js,css,md}": "prettier --write"
+    "hooks": {
+      "pre-commit": "npm test"
+    }
   }
 }

readme.md

@@ -7,9 +7,6 @@
     <a href="https://github.com/anuraghazra/github-readme-stats/actions">
       <img alt="Tests Passing" src="https://github.com/anuraghazra/github-readme-stats/workflows/Test/badge.svg" />
     </a>
-    <a href="https://github.com/anuraghazra/github-readme-stats/graphs/contributors">
-      <img alt="GitHub Contributors" src="https://img.shields.io/github/contributors/anuraghazra/github-readme-stats" />
-    </a>
     <a href="https://codecov.io/gh/anuraghazra/github-readme-stats">
       <img src="https://codecov.io/gh/anuraghazra/github-readme-stats/branch/master/graph/badge.svg" />
     </a>
@@ -62,44 +59,42 @@
     <a href="/docs/readme_tr.md">Türkçe</a>
   </p>
 </p>
+<p align="center">Love the project? Please consider <a href="https://www.paypal.me/anuraghazra">donating</a> to help it improve!
 
-<p align="center">Love the project? Please consider <a href="https://www.paypal.me/anuraghazra">donating</a> to help it improve!</p>
 
+<p>
 <a href="https://indiafightscorona.giveindia.org">
-  <img src="https://cfstatic.give.do/logo.png" alt="Give india logo" width="200" />
+<img src="https://d2wvdrxmr8p0wf.cloudfront.net/static/giveindia.svg" alt="Give india logo" width="200" />
 </a>
 
-Are you considering supporting the project by donating? Please DO NOT!!
+Are you considering supporting the project by donating? Please DON'T!!
 
-Instead, Help India fight the second deadly wave of COVID-19.
+Instead, Help India fight the 2nd deadly wave of COVID-19.
 Thousands of people are dying in India because of a lack of Oxygen & also COVID-related infrastructure.
 
-Visit <https://indiafightscorona.giveindia.org> and make a small donation to help us fight COVID and overcome this crisis. A small donation goes a long way. :heart:
+Visit [https://indiafightscorona.giveindia.org](https://indiafightscorona.giveindia.org) and make a small donation to help us fight COVID and overcome this crisis.
-
+A small donation goes a long way. :heart:
 </p>
 
+
 # Features
 
--   [GitHub Stats Card](#github-stats-card)
+- [GitHub Stats Card](#github-stats-card)
--   [GitHub Extra Pins](#github-extra-pins)
+- [GitHub Extra Pins](#github-extra-pins)
--   [Top Languages Card](#top-languages-card)
+- [Top Languages Card](#top-languages-card)
--   [Wakatime Week Stats](#wakatime-week-stats)
+- [Wakatime Week Stats](#wakatime-week-stats)
--   [Themes](#themes)
+- [Themes](#themes)
-    -   [Responsive Card Theme](#responsive-card-theme)
+- [Customization](#customization)
--   [Customization](#customization)
+  - [Common Options](#common-options)
-    -   [Common Options](#common-options)
+  - [Stats Card Exclusive Options](#stats-card-exclusive-options)
-    -   [Stats Card Exclusive Options](#stats-card-exclusive-options)
+  - [Repo Card Exclusive Options](#repo-card-exclusive-options)
-    -   [Repo Card Exclusive Options](#repo-card-exclusive-options)
+  - [Language Card Exclusive Options](#language-card-exclusive-options)
-    -   [Language Card Exclusive Options](#language-card-exclusive-options)
+  - [Wakatime Card Exclusive Option](#wakatime-card-exclusive-options)
-    -   [Wakatime Card Exclusive Option](#wakatime-card-exclusive-options)
+- [Deploy Yourself](#deploy-on-your-own-vercel-instance)
--   [Deploy Yourself](#deploy-on-your-own)
-    -   [On Vercel](#on-vercel)
-    -   [On other platforms](#on-other-platforms)
-    -   [Keep your fork up to date](#keep-your-fork-up-to-date)
 
 # GitHub Stats Card
 
-Copy-paste this into your markdown content, and that is it. Simple!
+Copy-paste this into your markdown content, and that's it. Simple!
 
 Change the `?username=` value to your GitHub username.
 
@@ -107,12 +102,13 @@ Change the `?username=` value to your GitHub username.
 [![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra)](https://github.com/anuraghazra/github-readme-stats)
 ```
 
-> **Note**
+_Note: Available ranks are S+ (top 1%), S (top 25%), A++ (top 45%), A+ (top 60%), and B+ (everyone).
-> Available ranks are S+ (top 1%), S (top 25%), A++ (top 45%), A+ (top 60%), and B+ (everyone). The values are calculated by using the [cumulative distribution function](https://en.wikipedia.org/wiki/Cumulative_distribution_function) using commits, contributions, issues, stars, pull requests, followers, and owned repositories. The implementation can be investigated at [src/calculateRank.js](./src/calculateRank.js).
+The values are calculated by using the [cumulative distribution function](https://en.wikipedia.org/wiki/Cumulative_distribution_function) using commits, contributions, issues, stars, pull requests, followers, and owned repositories.
+The implementation can be investigated at [src/calculateRank.js](./src/calculateRank.js)._
 
 ### Hiding individual stats
 
-You can pass a query parameter `&hide=` to hide any specific stats with comma-separated values.
+To hide any specific stats, you can pass a query parameter `&hide=` with comma-separated values.
 
 > Options: `&hide=stars,commits,prs,issues,contribs`
 
@@ -124,8 +120,7 @@ You can pass a query parameter `&hide=` to hide any specific stats with comma-se
 
 You can add the count of all your private contributions to the total commits count by using the query parameter `&count_private=true`.
 
-> **Note**
+_Note: If you are deploying this project yourself, the private contributions will be counted by default. Otherwise, you need to choose to share your private contribution counts._
-> If you are deploying this project yourself, the private contributions will be counted by default. If you are using the public Vercel instance, you need to choose to [share your private contributions](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-github-profile/managing-contribution-settings-on-your-profile/showing-your-private-contributions-and-achievements-on-your-profile).
 
 > Options: `&count_private=true`
 
@@ -135,7 +130,7 @@ You can add the count of all your private contributions to the total commits cou
 
 ### Showing icons
 
-To enable icons, you can pass `&show_icons=true` in the query param, like so:
+To enable icons, you can pass `show_icons=true` in the query param, like so:
 
 ```md
 ![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true)
@@ -145,196 +140,103 @@ To enable icons, you can pass `&show_icons=true` in the query param, like so:
 
 With inbuilt themes, you can customize the look of the card without doing any [manual customization](#customization).
 
-Use `&theme=THEME_NAME` parameter like so :
+Use `&theme=THEME_NAME` parameter like so :-
 
 ```md
 ![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&theme=radical)
 ```
 
-#### All inbuilt themes
+#### All inbuilt themes:-
 
-GitHub readme stats comes with several built-in themes (e.g. `dark`, `radical`, `merko`, `gruvbox`, `tokyonight`, `onedark`, `cobalt`, `synthwave`, `highcontrast`, `dracula`).
+dark, radical, merko, gruvbox, tokyonight, onedark, cobalt, synthwave, highcontrast, dracula
 
 <img src="https://res.cloudinary.com/anuraghazra/image/upload/v1595174536/grs-themes_l4ynja.png" alt="GitHub Readme Stats Themes" width="600px"/>
 
 You can look at a preview for [all available themes](./themes/README.md) or checkout the [theme config file](./themes/index.js) & **you can also contribute new themes** if you like :D
 
-#### Responsive Card Theme
-
-[![Anurag's GitHub stats-Dark](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&theme=dark#gh-dark-mode-only)](https://github.com/anuraghazra/github-readme-stats#gh-dark-mode-only)
-[![Anurag's GitHub stats-Light](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&theme=default#gh-light-mode-only)](https://github.com/anuraghazra/github-readme-stats#gh-light-mode-only)
-
-Since GitHub will re-upload the cards and serve them from their [CDN](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/about-anonymized-urls), we can not infer the browser/GitHub theme on the server side. There are, however, four methods you can use to create dynamics themes on the client side.
-
-##### Use the transparent theme
-
-We have included a `transparent` theme that has a transparent background. This theme is optimized to look good on GitHub's dark and light default themes. You can enable this theme using the `&theme=transparent` parameter like so:
-
-```md
-![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&theme=transparent)
-```
-
-<details>
-<summary>:eyes: Show example</summary>
-
-![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&theme=transparent)
-
-</details>
-
-##### Add transparent alpha channel to a themes bg_color
-
-You can use the `bg_color` parameter to make any of [the available themes](./themes/README.md) transparent. This is done by setting the `bg_color` to a color with a transparent alpha channel (i.e. `bg_color=00000000`):
-
-```md
-![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&bg_color=00000000)
-```
-
-<details>
-<summary>:eyes: Show example</summary>
-
-![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&bg_color=00000000)
-
-</details>
-
-##### Use GitHub's theme context tag
-
-You can use [GitHub's theme context](https://github.blog/changelog/2021-11-24-specify-theme-context-for-images-in-markdown/) tags to switch the theme based on the user GitHub theme automatically. This is done by appending `#gh-dark-mode-only` or `#gh-light-mode-only` to the end of an image URL. This tag will define whether the image specified in the markdown is only shown to viewers using a light or a dark GitHub theme:
-
-```md
-[![Anurag's GitHub stats-Dark](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&theme=dark#gh-dark-mode-only)](https://github.com/anuraghazra/github-readme-stats#gh-dark-mode-only)
-[![Anurag's GitHub stats-Light](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&theme=default#gh-light-mode-only)](https://github.com/anuraghazra/github-readme-stats#gh-light-mode-only)
-```
-
-<details>
-<summary>:eyes: Show example</summary>
-
-[![Anurag's GitHub stats-Dark](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&theme=dark#gh-dark-mode-only)](https://github.com/anuraghazra/github-readme-stats#gh-dark-mode-only)
-[![Anurag's GitHub stats-Light](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&theme=default#gh-light-mode-only)](https://github.com/anuraghazra/github-readme-stats#gh-light-mode-only)
-
-</details>
-
-##### Use GitHub's new media feature
-
-You can use [GitHub's new media feature](https://github.blog/changelog/2022-05-19-specify-theme-context-for-images-in-markdown-beta/) in HTML to specify whether to display images for light or dark themes. This is done using the HTML `<picture>` element in combination with the `prefers-color-scheme` media feature.
-
-```html
-<picture>
-<source
-  srcset="https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&theme=dark"
-  media="(prefers-color-scheme: dark)"
-/>
-<source
-  srcset="https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true"
-  media="(prefers-color-scheme: light), (prefers-color-scheme: no-preference)"
-/>
-<img src="https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true" />
-</picture>
-```
-
-<details>
-<summary>:eyes: Show example</summary>
-
-<picture>
-<source
-  srcset="https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&theme=dark"
-  media="(prefers-color-scheme: dark)"
-/>
-<source
-  srcset="https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true"
-  media="(prefers-color-scheme: light), (prefers-color-scheme: no-preference)"
-/>
-<img src="https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true" />
-</picture>
-
-</details>
-
 ### Customization
 
-You can customize the appearance of your `Stats Card` or `Repo Card` however you wish with URL parameters.
+You can customize the appearance of your `Stats Card` or `Repo Card` however you wish with URL params.
 
-#### Common Options
+#### Common Options:
 
--   `title_color` - Card's title color _(hex color)_. Default: `2f80ed`.
+- `title_color` - Card's title color _(hex color)_. Default: `2f80ed`.
--   `text_color` - Body text color _(hex color)_. Default: `434d58`.
+- `text_color` - Body text color _(hex color)_. Default: `434d58`.
--   `icon_color` - Icons color if available _(hex color)_. Default: `4c71f2`.
+- `icon_color` - Icons color if available _(hex color)_. Default: `4c71f2`.
--   `border_color` - Card's border color _(hex color)_. Default: `e4e2e2` (Does not apply when `hide_border` is enabled).
+- `border_color` - Card's border color _(hex color)_. Default: `e4e2e2` (Does not apply when `hide_border` is enabled).
--   `bg_color` - Card's background color _(hex color)_ **or** a gradient in the form of _angle,start,end_. Default: `fffefe`
+- `bg_color` - Card's background color _(hex color)_ **or** a gradient in the form of _angle,start,end_. Default: `fffefe`
--   `hide_border` - Hides the card's border _(boolean)_. Default: `false`
+- `hide_border` - Hides the card's border _(boolean)_. Default: `false`
--   `theme` - name of the theme, choose from [all available themes](./themes/README.md). Default: `default` theme.
+- `theme` - name of the theme, choose from [all available themes](./themes/README.md). Default: `default` theme. 
--   `cache_seconds` - set the cache header manually _(min: 14400, max: 86400)_. Default: `14400 seconds (4 hours)`.
+- `cache_seconds` - set the cache header manually _(min: 7200, max: 86400)_. Default: `14400 seconds (4 hours)`.
--   `locale` - set the language in the card _(e.g. cn, de, es, etc.)_. Default: `en`.
+- `locale` - set the language in the card _(e.g. cn, de, es, etc.)_. Default: `en`.
--   `border_radius` - Corner rounding on the card. Default: `4.5`.
+- `border_radius` - Corner rounding on the card. Default: `4.5`.
 
-> **Warning**
+> Note: The minimum of cache_seconds is currently 4 hours as a temporary fix for PATs exhaustion.
-> We use caching to decrease the load on our servers (see <https://github.com/anuraghazra/github-readme-stats/issues/1471#issuecomment-1271551425>). Our cards have a default cache of 4 hours (14400 seconds). Also, note that the cache is clamped to a minimum of 4 hours and a maximum of 24 hours.
 
 ##### Gradient in bg_color
 
-You can provide multiple comma-separated values in the bg_color option to render a gradient with the following format:
+You can provide multiple comma-separated values in the bg_color option to render a gradient, with the following format:
 
-    &bg_color=DEG,COLOR1,COLOR2,COLOR3...COLOR10
+```
+&bg_color=DEG,COLOR1,COLOR2,COLOR3...COLOR10
+```
 
-#### Stats Card Exclusive Options
+> Note on cache: Repo cards have a default cache of 4 hours (14400 seconds) if the fork count & star count is less than 1k, otherwise, it's 2 hours (7200 seconds). Also, note that the cache is clamped to a minimum of 2 hours and a maximum of 24 hours.
 
--   `hide` - Hides the [specified items](#hiding-individual-stats) from stats _(Comma-separated values)_. Default: `[] (blank array)`.
+#### Stats Card Exclusive Options:
--   `hide_title` - _(boolean)_. Default: `false`.
--   `card_width` - Set the card's width manually _(number)_. Default: `500px  (approx.)`.
--   `hide_rank` - _(boolean)_ hides the rank and automatically resizes the card width. Default: `false`.
--   `rank_icon` - Shows alternative rank icon (i.e. `github` or `default`). Default: `default`.
--   `show_icons` - _(boolean)_. Default: `false`.
--   `include_all_commits` - Count total commits instead of just the current year commits _(boolean)_. Default: `false`.
--   `count_private` - Count private commits _(boolean)_. Default: `false`.
--   `line_height` - Sets the line height between text _(number)_. Default: `25`.
--   `exclude_repo` - Exclude stars from specified repositories _(Comma-separated values)_. Default: `[] (blank array)`.
--   `custom_title` - Sets a custom title for the card. Default:  `<username> GitHub Stats`.
--   `text_bold` - Use bold text _(boolean)_. Default: `true`.
--   `disable_animations` - Disables all animations in the card _(boolean)_. Default: `false`.
--   `ring_color` - Color of the rank circle _(hex color)_. Defaults to the theme ring color if it exists and otherwise the title color.
--   `number_format` - Switch between two available formats for displaying the card values `short` (i.e. `6.6k`) and `long` (i.e. `6626`). Default: `short`.
 
-> **Note**
+- `hide` - Hides the [specified items](#hiding-individual-stats) from stats _(Comma-separated values)_. Default: `[] (blank array)`.
-> When hide_rank=`true`, the minimum card width is 270 px + the title length and padding.
+- `hide_title` - _(boolean)_. Default: `false`.
+- `card_width` - Set the card's width manually _(number)_. Default: `500px  (approx.)`.
+- `hide_rank` - _(boolean)_ hides the rank and automatically resizes the card width. Default: `false`.
+- `show_icons` - _(boolean)_. Default: `false`.
+- `include_all_commits` - Count total commits instead of just the current year commits _(boolean)_. Default: `false`.
+- `count_private` - Count private commits _(boolean)_. Default: `false`.
+- `line_height` - Sets the line-height between text _(number)_.  Default: `25`.
+- `exclude_repo` - Exclude stars from specified repositories _(Comma-separated values)_. Default: `[] (blank array)`.
+- `custom_title` - Sets a custom title for the card. Default:  `<username> Github Stats`.
+- `text_bold` - Use bold text _(boolean)_. Default: `true`.
+- `disable_animations` - Disables all animations in the card _(boolean)_. Default: `false`.
 
-#### Repo Card Exclusive Options
+> Note on `hide_rank`:
+When hide_rank=`true`, the minimum card width is 270 px + the title length and padding.
 
--   `show_owner` - Show the repo's owner name _(boolean)_. Default: `false`.
+#### Repo Card Exclusive Options:
 
-#### Language Card Exclusive Options
+- `show_owner` - Show the repo's owner name _(boolean)_
 
--   `hide` - Hide the languages specified from the card _(Comma-separated values)_. Default: `[] (blank array)`.
+#### Language Card Exclusive Options:
--   `hide_title` - _(boolean)_. Default: `false`.
--   `layout` - Switch between two available layouts `default` & `compact`. Default: `default`.
--   `card_width` - Set the card's width manually _(number)_. Default `300`.
--   `langs_count` - Show more languages on the card, between 1-10 _(number)_. Default `5`.
--   `exclude_repo` - Exclude specified repositories _(Comma-separated values)_. Default: `[] (blank array)`.
--   `custom_title` - Sets a custom title for the card _(string)_. Default `Most Used Languages`.
--   `disable_animations` - Disables all animations in the card _(boolean)_. Default: `false`.
--   `hide_progress` - It uses the compact layout option, hides percentages, and removes the bars. Default: `false`.
--   `size_weight` - Configures language stats algorithm _(number)_ (see [Language stats algorithm](#Language-stats-algorithm)), defaults to 1.
--   `count_weight` - Configures language stats algorithm _(number)_ (see [Language stats algorithm](#Language-stats-algorithm)), defaults to 0.
 
-> **Warning**
+- `hide` - Hide the languages specified from the card _(Comma-separated values)_
-> Language names should be URI-escaped, as specified in [Percent Encoding](https://en.wikipedia.org/wiki/Percent-encoding)
+- `hide_title` - _(boolean)_
+- `layout` - Switch between two available layouts `default` & `compact`
+- `card_width` - Set the card's width manually _(number)_
+- `langs_count` - Show more languages on the card, between 1-10, defaults to 5 _(number)_
+- `exclude_repo` - Exclude specified repositories _(Comma-separated values)_
+- `custom_title` - Sets a custom title for the card
+
+> :warning: **Important:**
+> Language names should be uri-escaped, as specified in [Percent Encoding](https://en.wikipedia.org/wiki/Percent-encoding)
 > (i.e: `c++` should become `c%2B%2B`, `jupyter notebook` should become `jupyter%20notebook`, etc.) You can use
 > [urlencoder.org](https://www.urlencoder.org/) to help you do this automatically.
 
-#### Wakatime Card Exclusive Options
+#### Wakatime Card Exclusive Options:
 
--   `hide` - Hide the languages specified from the card _(Comma-separated values)_. Default: `[] (blank array)`.
+- `hide` - Hide the languages specified from the card _(Comma-separated values)_
--   `hide_title` - _(boolean)_. Default `false`.
+- `hide_title` - _(boolean)_
--   `line_height` - Sets the line height between text _(number)_. Default `25`.
+- `line_height` - Sets the line-height between text _(number)_
--   `hide_progress` - Hides the progress bar and percentage _(boolean)_. Default `false`.
+- `hide_progress` - Hides the progress bar and percentage _(boolean)_
--   `custom_title` - Sets a custom title for the card _(string)_. Default `Wakatime Stats`.
+- `custom_title` - Sets a custom title for the card
--   `layout` - Switch between two available layouts `default` & `compact`.  Default `default`.
+- `layout` - Switch between two available layouts `default` & `compact`
--   `langs_count` - Limit the number of languages on the card, defaults to all reported languages _(number)_.
+- `langs_count` - Limit the number of languages on the card, defaults to all reported languages
--   `api_domain` - Set a custom API domain for the card, e.g. to use services like [Hakatime](https://github.com/mujx/hakatime) or [Wakapi](https://github.com/muety/wakapi) _(string)_. Default `Waka API`.
+- `api_domain` - Set a custom API domain for the card, e.g. to use services like [Hakatime](https://github.com/mujx/hakatime) or [Wakapi](https://github.com/muety/wakapi)
--   `range` – Request a range different from your WakaTime default, e.g. `last_7_days`. See [WakaTime API docs](https://wakatime.com/developers#stats) for a list of available options. _(YYYY-MM, last_7_days, last_30_days, last_6_months, last_year, or all_time)_. Default `all_time`.
+- `range` – Request a range different from your WakaTime default, e.g. `last_7_days`. See [WakaTime API docs](https://wakatime.com/developers#stats) for a list of available options.
 
-* * *
+---
 
 # GitHub Extra Pins
 
-GitHub extra pins allow you to pin more than six repositories in your profile using a GitHub readme profile.
+GitHub extra pins allow you to pin more than 6 repositories in your profile using a GitHub readme profile.
 
 Yay! You are no longer limited to 6 pinned repositories.
 
@@ -360,8 +262,7 @@ Use [show_owner](#customization) variable to include the repo's owner username
 
 The top languages card shows a GitHub user's most frequently used top language.
 
-> **Note**
+_NOTE: Top Languages does not indicate my skill level or anything like that; it's a GitHub metric to determine which languages have the most code on GitHub. It's a new feature of github-readme-stats._
-> Top Languages does not indicate the user's skill level or anything like that; it's a GitHub metric to determine which languages have the most code on GitHub. It is a new feature of github-readme-stats.
 
 ### Usage
 
@@ -373,27 +274,9 @@ Endpoint: `api/top-langs?username=anuraghazra`
 [![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra)](https://github.com/anuraghazra/github-readme-stats)
 ```
 
-### Language stats algorithm
-
-We use the following algorithm to calculate the languages percentages on the language card:
-
-```js
-ranking_index = (byte_count ^ size_weight) * (repo_count ^ count_weight)
-```
-
-By default, only the byte count is used for determining the languages percentages shown on the language card (i.e. `size_weight=1` and `count_weight=0`). You can, however, use the `&size_weight=` and `&count_weight=` options to weight the language usage calculation. The values must be positive real numbers. [More details about the algorithm can be found here](https://github.com/anuraghazra/github-readme-stats/issues/1600#issuecomment-1046056305).
-
--   `&size_weight=1&count_weight=0` - _(default)_ Orders by byte count.
--   `&size_weight=0.5&count_weight=0.5` - _(recommended)_ Uses both byte and repo count for ranking
--   `&size_weight=0&count_weight=1` - Orders by repo count
-
-```md
-[![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra&size_weight=0.5&count_weight=0.5)](https://github.com/anuraghazra/github-readme-stats)
-```
-
 ### Exclude individual repositories
 
-You can use the `&exclude_repo=repo1,repo2` parameter to exclude individual repositories.
+You can use `&exclude_repo=repo1,repo2` parameter to exclude individual repositories.
 
 ```md
 [![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra&exclude_repo=github-readme-stats,anuraghazra.github.io)](https://github.com/anuraghazra/github-readme-stats)
@@ -423,26 +306,14 @@ You can use the `&layout=compact` option to change the card design.
 [![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra&layout=compact)](https://github.com/anuraghazra/github-readme-stats)
 ```
 
-### Hide Progress Bars
-
-You can use the `&hide_progress=true` option to hide the percentages and the progress bars (layout will be automatically set to `compact`).
-
-```md
-[![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra&hide_progress=true)](https://github.com/anuraghazra/github-readme-stats)
-```
-
 ### Demo
 
 [![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra)](https://github.com/anuraghazra/github-readme-stats)
 
--   Compact layout
+- Compact layout
 
 [![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra&layout=compact)](https://github.com/anuraghazra/github-readme-stats)
 
--   Hidden progress bars
-
-[![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra&hide_progress=true)](https://github.com/anuraghazra/github-readme-stats)
-
 # Wakatime Week Stats
 
 Change the `?username=` value to your [Wakatime](https://wakatime.com) username.
@@ -451,8 +322,7 @@ Change the `?username=` value to your [Wakatime](https://wakatime.com) username.
 [![willianrod's wakatime stats](https://github-readme-stats.vercel.app/api/wakatime?username=willianrod)](https://github.com/anuraghazra/github-readme-stats)
 ```
 
-> **Note**:
+> Note: Please be aware that we currently only show data from Wakatime profiles that are public.
-> Please be aware that we currently only show data from Wakatime profiles that are public.
 
 ### Demo
 
@@ -460,73 +330,69 @@ Change the `?username=` value to your [Wakatime](https://wakatime.com) username.
 
 [![willianrod's wakatime stats](https://github-readme-stats.vercel.app/api/wakatime?username=willianrod&hide_progress=true)](https://github.com/anuraghazra/github-readme-stats)
 
--   Compact layout
+- Compact layout
 
 [![willianrod's wakatime stats](https://github-readme-stats.vercel.app/api/wakatime?username=willianrod&layout=compact)](https://github.com/anuraghazra/github-readme-stats)
 
-* * *
+---
 
 ### All Demos
 
--   Default
+- Default
 
 ![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra)
 
--   Hiding specific stats
+- Hiding specific stats
 
 ![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&hide=contribs,issues)
 
--   Showing icons
+- Showing icons
 
 ![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&hide=issues&show_icons=true)
 
--   Shows Github logo instead rank level
+- Customize Border Color
-
-![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&rank_icon=github)
-
--   Customize Border Color
 
 ![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&border_color=2e4058)
 
--   Include All Commits
+- Include All Commits
 
 ![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&include_all_commits=true)
 
--   Themes
+- Themes
 
 Choose from any of the [default themes](#themes)
 
 ![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&theme=radical)
 
--   Gradient
+- Gradient
 
 ![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api?username=anuraghazra&bg_color=30,e96443,904e95&title_color=fff&text_color=fff)
 
--   Customizing stats card
+- Customizing stats card
 
 ![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api/?username=anuraghazra&show_icons=true&title_color=fff&icon_color=79ff97&text_color=9f9f9f&bg_color=151515)
 
--   Setting card locale
+- Setting card locale
 
 ![Anurag's GitHub stats](https://github-readme-stats.vercel.app/api/?username=anuraghazra&locale=es)
 
--   Customizing repo card
+- Customizing repo card
 
 ![Customized Card](https://github-readme-stats.vercel.app/api/pin?username=anuraghazra&repo=github-readme-stats&title_color=fff&icon_color=f9f9f9&text_color=9f9f9f&bg_color=151515)
 
--   Top languages
+- Top languages
 
 [![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra)](https://github.com/anuraghazra/github-readme-stats)
 
--   WakaTime card
+- Wakatime card
 
 [![willianrod's wakatime stats](https://github-readme-stats.vercel.app/api/wakatime?username=willianrod)](https://github.com/anuraghazra/github-readme-stats)
 
-* * *
+---
 
 ### Quick Tip (Align The Repo Cards)
 
-By default, GitHub does not lay out the cards side by side. To do that, you can use this approach:
+You usually won't be able to layout the images side by side. To do that you can use this approach:
 
 ```html
 <a href="https://github.com/anuraghazra/github-readme-stats">
@@ -537,83 +403,57 @@ By default, GitHub does not lay out the cards side by side. To do that, you can
 </a>
 ```
 
-## Deploy on your own
+## Deploy on your own Vercel instance
 
-### On Vercel
+#### [Check Out Step By Step Video Tutorial By @codeSTACKr](https://youtu.be/n6d4KHSKqGk?t=107)
 
-#### :film_projector: [Check Out Step By Step Video Tutorial By @codeSTACKr](https://youtu.be/n6d4KHSKqGk?t=107)
+Since the GitHub API only allows 5k requests per hour, my `https://github-readme-stats.vercel.app/api` could possibly hit the rate limiter. If you host it on your own Vercel server, then you don't have to worry about anything. Click on the deploy button to get started!
 
-> **Warning**
+NOTE: Since [#58](https://github.com/anuraghazra/github-readme-stats/pull/58) we should be able to handle more than 5k requests and have no issues with downtime :D
-> If you are on the [hobby (i.e. free)](https://vercel.com/pricing) Vercel plan, please make sure you change the `maxDuration` parameter in the [vercel.json](https://github.com/anuraghazra/github-readme-stats/blob/master/vercel.json) file from `30` to `10` (see [#1416](https://github.com/anuraghazra/github-readme-stats/issues/1416#issuecomment-950275476) for more information).
-
-Since the GitHub API only allows 5k requests per hour, my `https://github-readme-stats.vercel.app/api` could possibly hit the rate limiter. If you host it on your own Vercel server, then you do not have to worry about anything. Click on the deploy button to get started!
-
-> **Note**
-> Since [#58](https://github.com/anuraghazra/github-readme-stats/pull/58), we should be able to handle more than 5k requests and have fewer issues with downtime :grin:.
 
 [![Deploy to Vercel](https://vercel.com/button)](https://vercel.com/import/project?template=https://github.com/anuraghazra/github-readme-stats)
 
 <details>
- <summary><b>:hammer_and_wrench: Step-by-step guide on setting up your own Vercel instance</b></summary>
+ <summary><b> Guide on setting up Vercel  🔨 </b></summary>
 
-1.  Go to [vercel.com](https://vercel.com/).
+1. Go to [vercel.com](https://vercel.com/)
-2.  Click on `Log in`.
+1. Click on `Log in`
-    ![](https://files.catbox.moe/pcxk33.png)
+   ![](https://files.catbox.moe/tct1wg.png)
-3.  Sign in with GitHub by pressing `Continue with GitHub`.
+1. Sign in with GitHub by pressing `Continue with GitHub`
-    ![](https://files.catbox.moe/b9oxey.png)
+   ![](https://files.catbox.moe/btd78j.jpeg)
-4.  Sign in to GitHub and allow access to all repositories if prompted.
+1. Sign in to GitHub and allow access to all repositories, if prompted
-5.  Fork this repo.
+1. Fork this repo
-6.  After forking the repo, open the [`vercel.json`](https://github.com/anuraghazra/github-readme-stats/blob/master/vercel.json#L5) file and change the `maxDuration` field to `10`.
+1. After forking the repo, open the [`vercel.json`](https://github.com/anuraghazra/github-readme-stats/blob/master/vercel.json#L5) file and change the `maxDuration` field to `10`
-7.  Go back to your [Vercel dashboard](https://vercel.com/dashboard).
+1. Go back to your [Vercel dashboard](https://vercel.com/dashboard)
-8.  To import a project, click the `Add New...` button and select the `Project` option.
+1. Select `Import Project`
-    ![](https://files.catbox.moe/3n76fh.png)
+   ![](https://files.catbox.moe/qckos0.png)
-9.  Click the `Continue with GitHub` button, search for the required Git Repository and import it by clicking the `Import` button. Alternatively, you can import a Third-Party Git Repository using the `Import Third-Party Git Repository ->` link at the bottom of the page.
+1. Select `Import Git Repository`. Select root and keep everything as is.
-    ![](https://files.catbox.moe/mg5p04.png)
+   ![](https://files.catbox.moe/pqub9q.png)
-10. Create a personal access token (PAT) [here](https://github.com/settings/tokens/new) and enable the `repo` permissions (this allows access to see private repo stats).
+1. Create a personal access token (PAT) [here](https://github.com/settings/tokens/new) and enable the `repo` permissions (this allows access to see private repo stats)
-11. Add the PAT as an environment variable named `PAT_1` (as shown).
+1. Add the PAT as an environment variable named `PAT_1` (as shown).
-    ![](https://files.catbox.moe/0yclio.png)
+   ![](https://files.catbox.moe/0ez4g7.png)
-12. Click deploy, and you're good to go. See your domains to use the API!
+1. Click deploy, and you're good to go. See your domains to use the API!
 
 </details>
 
-### On other platforms
-
-> **Warning**
-> This way of using GRS is not officially supported and was added to cater to some particular use cases where Vercel could not be used (e.g. #2341). The support for this method, therefore, is limited.
-
-<details>
-<summary><b>:hammer_and_wrench: Step-by-step guide for deploying on other platforms</b></summary>
-
-1.  Fork or clone this repo as per your needs
-2.  Add `express` to the dependencies section of `package.json`
-    <https://github.com/anuraghazra/github-readme-stats/blob/ba7c2f8b55eac8452e479c8bd38b044d204d0424/package.json#L54-L61>
-3.  Run `npm i` if needed (initial setup)
-4.  Run `node express.js` to start the server, or set the entry point to `express.js` in `package.json` if you're deploying on a managed service
-    <https://github.com/anuraghazra/github-readme-stats/blob/ba7c2f8b55eac8452e479c8bd38b044d204d0424/package.json#L11>
-5.  You're done 🎉
-    </details>
-
-### Keep your fork up to date
-
-You can keep your fork, and thus your private Vercel instance up to date with the upstream using GitHubs' [Sync Fork button](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork). You can also use the [pull](https://github.com/wei/pull) package created by [@wei](https://github.com/wei) to automate this process.
-
 ## :sparkling_heart: Support the project
 
-I open-source almost everything I can and try to reply to everyone needing help using these projects. Obviously,
+I open-source almost everything I can, and I try to reply to everyone needing help using these projects. Obviously,
 this takes time. You can use this service for free.
 
-However, if you are using this project and are happy with it or just want to encourage me to continue creating stuff, there are a few ways you can do it:
+However, if you are using this project and are happy with it or just want to encourage me to continue creating stuff, there are a few ways you can do it:-
 
--   Giving proper credit when you use github-readme-stats on your readme, linking back to it :D
+- Giving proper credit when you use github-readme-stats on your readme, linking back to it :D
--   Starring and sharing the project :rocket:
+- Starring and sharing the project :rocket:
--   [![paypal.me/anuraghazra](https://ionicabizau.github.io/badges/paypal.svg)](https://www.paypal.me/anuraghazra) - You can make one-time donations via PayPal. I'll probably buy a ~~coffee~~ tea. :tea:
+- [![paypal.me/anuraghazra](https://ionicabizau.github.io/badges/paypal.svg)](https://www.paypal.me/anuraghazra) - You can make one-time donations via PayPal. I'll probably buy a ~~coffee~~ tea. :tea:
 
 Thanks! :heart:
 
-* * *
+---
 
 [![https://vercel.com?utm_source=github_readme_stats_team&utm_campaign=oss](./powered-by-vercel.svg)](https://vercel.com?utm_source=github_readme_stats_team&utm_campaign=oss)
 
-Contributions are welcome! &lt;3
+
+Contributions are welcome! <3
 
 Made with :heart: and JavaScript.

scripts/close-stale-theme-prs.js

@@ -9,28 +9,19 @@ import github from "@actions/github";
 import { RequestError } from "@octokit/request-error";
 import { getGithubToken, getRepoInfo } from "./helpers.js";
 
+// Script parameters
 const CLOSING_COMMENT = `
-	\rThis theme PR has been automatically closed due to inactivity. Please reopen it if you want to continue working on it.\
+	\rThis PR has been automatically closed due to inactivity. Please feel free to reopen it if you need to continue working on it.\
 	\rThank you for your contributions.
 `;
-const REVIEWER = "github-actions[bot]";
-
-/**
- * Retrieve the review user.
- * @returns {string} review user.
- */
-const getReviewer = () => {
-  return process.env.REVIEWER ? process.env.REVIEWER : REVIEWER;
-};
 
 /**
  * Fetch open PRs from a given repository.
  * @param user The user name of the repository owner.
  * @param repo The name of the repository.
- * @param reviewer The reviewer to filter by.
  * @returns The open PRs.
  */
-export const fetchOpenPRs = async (octokit, user, repo, reviewer) => {
+export const fetchOpenPRs = async (octokit, user, repo) => {
   const openPRs = [];
   let hasNextPage = true;
   let endCursor;
@@ -58,9 +49,9 @@ export const fetchOpenPRs = async (octokit, user, repo, reviewer) => {
 												name
                       }
                     }
-                    reviews(first: 100, states: CHANGES_REQUESTED, author: "${reviewer}") {
+                    reviews(first: 1, states: CHANGES_REQUESTED, author: "github-actions[bot]") {
 											nodes {
-                        submittedAt
+												updatedAt
 											}
                     }
                   }
@@ -108,13 +99,11 @@ const isStale = (pullRequest, staleDays) => {
     pullRequest.commits.nodes[0].commit.pushedDate,
   );
   if (pullRequest.reviews.nodes[0]) {
-    const lastReviewDate = new Date(
+    const lastReviewDate = new Date(pullRequest.reviews.nodes[0].updatedAt);
-      pullRequest.reviews.nodes.sort((a, b) => (a < b ? 1 : -1))[0].submittedAt,
-    );
     const lastUpdateDate =
       lastCommitDate >= lastReviewDate ? lastCommitDate : lastReviewDate;
     const now = new Date();
-    return (now - lastUpdateDate) / (1000 * 60 * 60 * 24) >= staleDays;
+    return now - lastUpdateDate > 1000 * 60 * 60 * 24 * staleDays;
   } else {
     return false;
   }
@@ -127,15 +116,14 @@ const run = async () => {
   try {
     // Create octokit client.
     const dryRun = process.env.DRY_RUN === "true" || false;
-    const staleDays = process.env.STALE_DAYS || 20;
+    const staleDays = process.env.STALE_DAYS || 15;
     debug("Creating octokit client...");
     const octokit = github.getOctokit(getGithubToken());
     const { owner, repo } = getRepoInfo(github.context);
-    const reviewer = getReviewer();
 
     // Retrieve all theme pull requests.
     debug("Retrieving all theme pull requests...");
-    const prs = await fetchOpenPRs(octokit, owner, repo, reviewer);
+    const prs = await fetchOpenPRs(octokit, owner, repo);
     const themePRs = pullsWithLabel(prs, "themes");
     const invalidThemePRs = pullsWithLabel(themePRs, "invalid");
     debug("Retrieving stale theme PRs...");

scripts/helpers.js

@@ -4,6 +4,7 @@
 
 import { getInput } from "@actions/core";
 
+// Script variables.
 const OWNER = "anuraghazra";
 const REPO = "github-readme-stats";
 
@@ -30,7 +31,7 @@ export const getRepoInfo = (ctx) => {
 /**
  * Retrieve github token and throw error if it is not found.
  *
- * @returns {string} GitHub token.
+ * @returns {string} Github token.
  */
 export const getGithubToken = () => {
   const token = getInput("github_token") || process.env.GITHUB_TOKEN;

scripts/preview-theme.js

@@ -16,6 +16,7 @@ import { isValidHexColor } from "../src/common/utils.js";
 import { themes } from "../themes/index.js";
 import { getGithubToken, getRepoInfo } from "./helpers.js";
 
+// Script variables.
 const COMMENTER = "github-actions[bot]";
 
 const COMMENT_TITLE = "Automated Theme Preview";
@@ -23,12 +24,12 @@ const THEME_PR_FAIL_TEXT = ":x: Theme PR does not adhere to our guidelines.";
 const THEME_PR_SUCCESS_TEXT =
   ":heavy_check_mark: Theme PR does adhere to our guidelines.";
 const FAIL_TEXT = `
-  \rUnfortunately, your theme PR contains an error or does not adhere to our [theme guidelines](https://github.com/anuraghazra/github-readme-stats/blob/master/CONTRIBUTING.md#themes-contribution). Please fix the issues below, and we will review your\
+  \rUnfortunately, your theme PR does not adhere to our [theme guidelines](https://github.com/anuraghazra/github-readme-stats/blob/master/CONTRIBUTING.md#themes-contribution). Please fix the issues below, and we will review your\
-  \r PR again. This pull request will **automatically close in 20 days** if no changes are made. After this time, you must re-open the PR for it to be reviewed.
+  \r PR again. This pull request will **automatically close in 15 days** if no changes are made. After this time, you must re-open the PR for it to be reviewed.
 `;
-const THEME_CONTRIB_GUIDELINES = `
+const THEME_CONTRIB_GUIDELINESS = `
   \rHi, thanks for the theme contribution. Please read our theme [contribution guidelines](https://github.com/anuraghazra/github-readme-stats/blob/master/CONTRIBUTING.md#themes-contribution).
-  \rWe are currently only accepting color combinations from any VSCode theme or themes with good color combinations to minimize bloating the themes collection.
+  \rWe are currently only accepting color combinations from any VSCode theme or themes with good colour combinations to minimize bloating the themes collection.
 
   \r> Also, note that if this theme is exclusively for your personal use, then instead of adding it to our theme collection, you can use card [customization options](https://github.com/anuraghazra/github-readme-stats#customization).
 `;
@@ -43,23 +44,6 @@ const ACCEPTED_COLOR_PROPS = Object.keys(COLOR_PROPS);
 const REQUIRED_COLOR_PROPS = ACCEPTED_COLOR_PROPS.slice(0, 4);
 const INVALID_REVIEW_COMMENT = (commentUrl) =>
   `Some themes are invalid. See the [Automated Theme Preview](${commentUrl}) comment above for more information.`;
-var OCTOKIT;
-var OWNER;
-var REPO;
-var PULL_REQUEST_ID;
-
-/**
- * Incorrect JSON format error.
- * @extends Error
- * @param {string} message Error message.
- * @returns {Error} IncorrectJsonFormatError.
- */
-class IncorrectJsonFormatError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "IncorrectJsonFormatError";
-  }
-}
 
 /**
  * Retrieve PR number from the event payload.
@@ -109,7 +93,7 @@ const isPreviewComment = (inputs, comment) => {
  * @param {number} issueNumber Issue number.
  * @param {string} repo Repository name.
  * @param {string} owner Owner of the repository.
- * @returns {Object} The GitHub comment object.
+ * @returns {Object} The Github comment object.
  */
 const findComment = async (octokit, issueNumber, owner, repo, commenter) => {
   const parameters = {
@@ -143,36 +127,15 @@ const findComment = async (octokit, issueNumber, owner, repo, commenter) => {
  * Create or update the preview comment.
  *
  * @param {Object} octokit Octokit instance.
- * @param {number} issueNumber Issue number.
+ * @param {Object} props Comment properties.
- * @param {Object} repo Repository name.
- * @param {Object} owner Owner of the repository.
- * @param {number} commentId Comment ID.
- * @param {string} body Comment body.
  * @return {string} The comment URL.
  */
-const upsertComment = async (
+const upsertComment = async (octokit, props) => {
-  octokit,
-  issueNumber,
-  repo,
-  owner,
-  commentId,
-  body,
-) => {
   let resp;
-  if (commentId !== undefined) {
+  if (props.comment_id !== undefined) {
-    resp = await octokit.issues.updateComment({
+    resp = await octokit.issues.updateComment(props);
-      owner,
-      repo,
-      comment_id: commentId,
-      body,
-    });
   } else {
-    resp = await octokit.issues.createComment({
+    resp = await octokit.issues.createComment(props);
-      owner,
-      repo,
-      issue_number: issueNumber,
-      body,
-    });
   }
   return resp.data.html_url;
 };
@@ -307,38 +270,22 @@ const parseJSON = (json) => {
     if (typeof parsedJson === "object") {
       return parsedJson;
     } else {
-      throw new IncorrectJsonFormatError(
+      throw new Error("PR diff is not a valid theme JSON object.");
-        "PR diff is not a valid theme JSON object.",
-      );
     }
   } catch (error) {
-    // Remove trailing commas (if any).
+    let parsedJson = json
-    let parsedJson = json.replace(/(,\s*})/g, "}");
-
-    // Remove JS comments (if any).
-    parsedJson = parsedJson.replace(/\/\/[A-z\s]*\s/g, "");
-
-    // Fix incorrect open bracket (if any).
-    const splitJson = parsedJson
       .split(/([\s\r\s]*}[\s\r\s]*,[\s\r\s]*)(?=[\w"-]+:)/)
-      .filter((x) => typeof x !== "string" || !!x.trim()); // Split json into array of strings and objects.
+      .filter((x) => typeof x !== "string" || !!x.trim());
-    if (splitJson[0].replace(/\s+/g, "") === "},") {
+    if (parsedJson[0].replace(/\s+/g, "") === "},") {
-      splitJson[0] = "},";
+      parsedJson[0] = "},";
-      if (!/\s*}\s*,?\s*$/.test(splitJson[1])) {
+      if (!/\s*}\s*,?\s*$/.test(parsedJson[1])) {
-        splitJson.push(splitJson.shift());
+        parsedJson.push(parsedJson.shift());
       } else {
-        splitJson.shift();
+        parsedJson.shift();
       }
-      parsedJson = splitJson.join("");
+      return Hjson.parse(parsedJson.join(""));
-    }
+    } else {
-
+      throw error;
-    // Try to parse the fixed json.
-    try {
-      return Hjson.parse(parsedJson);
-    } catch (error) {
-      throw new IncorrectJsonFormatError(
-        `Theme JSON file could not be parsed: ${error.message}`,
-      );
     }
   }
 };
@@ -352,64 +299,53 @@ const themeNameAlreadyExists = (name) => {
   return themes[name] !== undefined;
 };
 
-const DRY_RUN = process.env.DRY_RUN === "true" || false;
-
 /**
  * Main function.
  */
-export const run = async () => {
+export const run = async (prNumber) => {
   try {
+    const dryRun = process.env.DRY_RUN === "true" || false;
     debug("Retrieve action information from context...");
     debug(`Context: ${inspect(github.context)}`);
     let commentBody = `
       \r# ${COMMENT_TITLE}
-      \r${THEME_CONTRIB_GUIDELINES}
+      \r${THEME_CONTRIB_GUIDELINESS}
     `;
     const ccc = new ColorContrastChecker();
-    OCTOKIT = github.getOctokit(getGithubToken());
+    const octokit = github.getOctokit(getGithubToken());
-    PULL_REQUEST_ID = getPrNumber();
+    const pullRequestId = prNumber ? prNumber : getPrNumber();
-    const { owner, repo } = getRepoInfo(github.context);
-    OWNER = owner;
-    REPO = repo;
     const commenter = getCommenter();
-    PULL_REQUEST_ID = getPrNumber();
+    const { owner, repo } = getRepoInfo(github.context);
-    debug(`Owner: ${OWNER}`);
+    debug(`Owner: ${owner}`);
-    debug(`Repo: ${REPO}`);
+    debug(`Repo: ${repo}`);
     debug(`Commenter: ${commenter}`);
 
     // Retrieve the PR diff and preview-theme comment.
     debug("Retrieve PR diff...");
-    const res = await OCTOKIT.pulls.get({
+    const res = await octokit.pulls.get({
-      owner: OWNER,
+      owner,
-      repo: REPO,
+      repo,
-      pull_number: PULL_REQUEST_ID,
+      pull_number: pullRequestId,
       mediaType: {
         format: "diff",
       },
     });
     debug("Retrieve preview-theme comment...");
     const comment = await findComment(
-      OCTOKIT,
+      octokit,
-      PULL_REQUEST_ID,
+      pullRequestId,
-      OWNER,
+      owner,
-      REPO,
+      repo,
       commenter,
     );
 
     // Retrieve theme changes from the PR diff.
     debug("Retrieve themes...");
     const diff = parse(res.data);
-
-    // Retrieve all theme changes from the PR diff and convert to JSON.
-    debug("Retrieve theme changes...");
     const content = diff
       .find((file) => file.to === "themes/index.js")
-      .chunks.map((chunk) =>
+      .chunks[0].changes.filter((c) => c.type === "add")
-        chunk.changes
+      .map((c) => c.content.replace("+", ""))
-          .filter((c) => c.type === "add")
-          .map((c) => c.content.replace("+", ""))
-          .join(""),
-      )
       .join("");
     const themeObject = parseJSON(content);
     if (
@@ -578,15 +514,14 @@ export const run = async () => {
     // Create or update theme-preview comment.
     debug("Create or update theme-preview comment...");
     let comment_url;
-    if (!DRY_RUN) {
+    if (!dryRun) {
-      comment_url = await upsertComment(
+      comment_url = await upsertComment(octokit, {
-        OCTOKIT,
+        comment_id: comment?.id,
-        PULL_REQUEST_ID,
+        issue_number: pullRequestId,
-        REPO,
+        owner,
-        OWNER,
+        repo,
-        comment?.id,
+        body: commentBody,
-        commentBody,
+      });
-      );
     } else {
       info(`DRY_RUN: Comment body: ${commentBody}`);
       comment_url = "";
@@ -601,20 +536,20 @@ export const run = async () => {
     const reviewReason = themesValid
       ? undefined
       : INVALID_REVIEW_COMMENT(comment_url);
-    if (!DRY_RUN) {
+    if (!dryRun) {
       await addReview(
-        OCTOKIT,
+        octokit,
-        PULL_REQUEST_ID,
+        pullRequestId,
-        OWNER,
+        owner,
-        REPO,
+        repo,
         reviewState,
         reviewReason,
       );
       await addRemoveLabel(
-        OCTOKIT,
+        octokit,
-        PULL_REQUEST_ID,
+        pullRequestId,
-        OWNER,
+        owner,
-        REPO,
+        repo,
         "invalid",
         !themesValid,
       );
@@ -623,32 +558,10 @@ export const run = async () => {
       info(`DRY_RUN: Review reason: ${reviewReason}`);
     }
   } catch (error) {
-    debug("Set review state to `REQUEST_CHANGES` and add `invalid` label...");
-    if (!DRY_RUN) {
-      await addReview(
-        OCTOKIT,
-        PULL_REQUEST_ID,
-        OWNER,
-        REPO,
-        "REQUEST_CHANGES",
-        "**Something went wrong in the theme preview action:** `" +
-          error.message +
-          "`",
-      );
-      await addRemoveLabel(
-        OCTOKIT,
-        PULL_REQUEST_ID,
-        OWNER,
-        REPO,
-        "invalid",
-        true,
-      );
-    } else {
-      info(`DRY_RUN: Review state: REQUEST_CHANGES`);
-      info(`DRY_RUN: Review reason: ${error.message}`);
-    }
     setFailed(error.message);
   }
 };
 
-run();
+if (typeof require !== "undefined" && require.main === module) {
+  run();
+}

scripts/push-theme-readme.sh

@@ -5,11 +5,10 @@ set -e
 export BRANCH_NAME=updated-theme-readme
 git --version
 git config --global user.email "no-reply@githubreadmestats.com"
-git config --global user.name "GitHub Readme Stats Bot"
+git config --global user.name "Github Readme Stats Bot"
-git config --global --add safe.directory ${GITHUB_WORKSPACE}
 git branch -d $BRANCH_NAME || true
 git checkout -b $BRANCH_NAME
 git add --all
-git commit --no-verify --message "docs(theme): Auto update theme readme"
+git commit --message "docs(theme): Auto update theme readme" || exit 0
 git remote add origin-$BRANCH_NAME https://${PERSONAL_TOKEN}@github.com/${GH_REPO}.git
 git push --force --quiet --set-upstream origin-$BRANCH_NAME $BRANCH_NAME

scripts/theme-preview-batch.js

@@ -0,0 +1,54 @@
+/**
+ * @file Apply preview-theme script to all theme pull requests.
+ */
+
+import { debug, setFailed } from "@actions/core";
+import { getGithubToken, getRepoInfo } from "./helpers.js";
+import { run as previewTheme } from "./preview-theme.js";
+import github from "@actions/github";
+import { fetchOpenPRs, pullsWithLabel } from "./close-stale-theme-prs.js";
+
+/**
+ * Get all pull request that do not contain a given label.
+ * @param pull The pull requests to check.
+ * @param label The label to check for.
+ * @returns Whether the pull request contains the label.
+ */
+export const pullsWithoutLabel = (pulls, label) => {
+  return pulls.filter((pr) => {
+    return pr.labels.nodes.some((lab) => lab.name !== label);
+  });
+};
+
+/**
+ * Main function.
+ */
+const run = async () => {
+  try {
+    // Create octokit client.
+    const dryRun = process.env.DRY_RUN === "true" || false;
+    debug("Creating octokit client...");
+    const octokit = github.getOctokit(getGithubToken());
+    const { owner, repo } = getRepoInfo(github.context);
+
+    // Retrieve all theme pull requests.
+    debug("Retrieving all theme pull requests...");
+    const prs = await fetchOpenPRs(octokit, owner, repo);
+    let themePRs = pullsWithLabel(prs, "themes");
+    themePRs = pullsWithoutLabel(themePRs, "invalid");
+    debug(`Found ${themePRs.length} theme PRs`);
+
+    // Loop through all theme PR and execute the theme-preview script.
+    for (const pr of themePRs) {
+      debug(`Applying theme-preview to #${pr.number}...`);
+      console.log("Pull request number: ", pr.number);
+      if (!dryRun) {
+        await previewTheme(pr.number);
+      }
+    }
+  } catch (error) {
+    setFailed(error.message);
+  }
+};
+
+run();

src/calculateRank.js

@@ -1,15 +1,5 @@
-/**
+// https://stackoverflow.com/a/5263759/10629172
- * Calculates the probability of x taking on x or a value less than x in a normal distribution
+function normalcdf(mean, sigma, to) {
- * with mean and standard deviation.
- *
- * @see https://stackoverflow.com/a/5263759/10629172
- *
- * @param {string} mean The mean of the normal distribution.
- * @param {number} sigma The standard deviation of the normal distribution.
- * @param {number} to The value to calculate the probability for.
- * @returns {number} Probability.
- */
-const normalcdf = (mean, sigma, to) => {
   var z = (to - mean) / Math.sqrt(2 * sigma * sigma);
   var t = 1 / (1 + 0.3275911 * Math.abs(z));
   var a1 = 0.254829592;
@@ -24,22 +14,9 @@ const normalcdf = (mean, sigma, to) => {
     sign = -1;
   }
   return (1 / 2) * (1 + sign * erf);
-};
+}
 
-/**
+function calculateRank({
- * Calculates the users rank.
- *
- * @param {object} params Parameters on which the user's rank depends.
- * @param {number} params.totalRepos Total number of repos.
- * @param {number} params.totalCommits Total number of commits.
- * @param {number} params.contributions The number of contributions.
- * @param {number} params.followers The number of followers.
- * @param {number} params.prs The number of pull requests.
- * @param {number} params.issues The number of issues.
- * @param {number} params.stargazers The number of stars.
- * @returns {{level: string, score: number}}} The users rank.
- */
-const calculateRank = ({
   totalRepos,
   totalCommits,
   contributions,
@@ -47,7 +24,7 @@ const calculateRank = ({
   prs,
   issues,
   stargazers,
-}) => {
+}) {
   const COMMITS_OFFSET = 1.65;
   const CONTRIBS_OFFSET = 1.65;
   const ISSUES_OFFSET = 1;
@@ -71,11 +48,7 @@ const calculateRank = ({
   const RANK_B_VALUE = 100;
 
   const TOTAL_VALUES =
-    RANK_S_VALUE +
+    RANK_S_VALUE + RANK_A2_VALUE + RANK_A3_VALUE + RANK_B_VALUE;
-    RANK_DOUBLE_A_VALUE +
-    RANK_A2_VALUE +
-    RANK_A3_VALUE +
-    RANK_B_VALUE;
 
   // prettier-ignore
   const score = (
@@ -99,7 +72,7 @@ const calculateRank = ({
   })();
 
   return { level, score: normalizedScore };
-};
+}
 
 export { calculateRank };
 export default calculateRank;

src/cards/index.js

@@ -1,4 +0,0 @@
-export { renderRepoCard } from "./repo-card.js";
-export { renderStatsCard } from "./stats-card.js";
-export { renderTopLanguages } from "./top-languages-card.js";
-export { renderWakatimeCard } from "./wakatime-card.js";

src/cards/repo-card.js

@@ -14,11 +14,9 @@ import {
 import { repoCardLocales } from "../translations.js";
 
 /**
- * Retrieves the repository description and wraps it to fit the card width.
+ * @param {string} label
- *
+ * @param {string} textColor
- * @param {string} label The repository description.
+ * @returns {string}
- * @param {string} textColor The color of the text.
- * @returns {string} Wrapped repo description SVG object.
  */
 const getBadgeSVG = (label, textColor) => `
   <g data-testid="badge" class="badge" transform="translate(320, -18)">
@@ -36,11 +34,9 @@ const getBadgeSVG = (label, textColor) => `
 `;
 
 /**
- * Creates a node to display the primary programming language of the repository.
+ * @param {string} langName
- *
+ * @param {string} langColor
- * @param {string} langName Language name.
+ * @returns {string}
- * @param {string} langColor Language color.
- * @returns {string} Language display SVG object.
  */
 const createLanguageNode = (langName, langColor) => {
   return `
@@ -52,15 +48,6 @@ const createLanguageNode = (langName, langColor) => {
 };
 
 const ICON_SIZE = 16;
-
-/**
- * Creates an icon with label to display repository stats like forks, stars, etc.
- *
- * @param {string} icon The icon to display.
- * @param {number|string} label The label to display.
- * @param {string} testid The testid to assign to the label.
- * @returns {string} Icon with label SVG object.
- */
 const iconWithLabel = (icon, label, testid) => {
   if (label <= 0) return "";
   const iconSvg = `
@@ -80,11 +67,9 @@ const iconWithLabel = (icon, label, testid) => {
 };
 
 /**
- * Renders repository card details.
+ * @param {import('../fetchers/types').RepositoryData} repo
- *
+ * @param {Partial<import("./types").RepoCardOptions>} options
- * @param {import('../fetchers/types').RepositoryData} repo Repository data.
+ * @returns {string}
- * @param {Partial<import("./types").RepoCardOptions>} options Card options.
- * @returns {string} Repository card SVG object.
  */
 const renderRepoCard = (repo, options = {}) => {
   const {
@@ -103,7 +88,7 @@ const renderRepoCard = (repo, options = {}) => {
     icon_color,
     text_color,
     bg_color,
-    show_owner = false,
+    show_owner,
     theme = "default_repocard",
     border_radius,
     border_color,

src/cards/stats-card.js

@@ -1,7 +1,7 @@
 // @ts-check
 import { Card } from "../common/Card.js";
 import { I18n } from "../common/I18n.js";
-import { icons, rankIcon } from "../common/icons.js";
+import { icons } from "../common/icons.js";
 import {
   clampValue,
   flexLayout,
@@ -12,24 +12,6 @@ import {
 import { getStyles } from "../getStyles.js";
 import { statCardLocales } from "../translations.js";
 
-const CARD_MIN_WIDTH = 287;
-const CARD_DEFAULT_WIDTH = 287;
-const RANK_CARD_MIN_WIDTH = 420;
-const RANK_CARD_DEFAULT_WIDTH = 450;
-
-/**
- * Create a stats card text item.
- *
- * @param {object[]} createTextNodeParams Object that contains the createTextNode parameters.
- * @param {string} createTextNodeParams.label The label to display.
- * @param {string} createTextNodeParams.value The value to display.
- * @param {string} createTextNodeParams.id The id of the stat.
- * @param {number} createTextNodeParams.index The index of the stat.
- * @param {boolean} createTextNodeParams.showIcons Whether to show icons.
- * @param {number} createTextNodeParams.shiftValuePos Number of pixels the value has to be shifted to the right.
- * @param {boolean} createTextNodeParams.bold Whether to bold the label.
- * @returns
- */
 const createTextNode = ({
   icon,
   label,
@@ -39,10 +21,8 @@ const createTextNode = ({
   showIcons,
   shiftValuePos,
   bold,
-  number_format,
 }) => {
-  const kValue =
+  const kValue = kFormatter(value);
-    number_format.toLowerCase() === "long" ? value : kFormatter(value);
   const staggerDelay = (index + 3) * 150;
 
   const labelOffset = showIcons ? `x="25"` : "";
@@ -70,11 +50,9 @@ const createTextNode = ({
 };
 
 /**
- * Renders the stats card.
+ * @param {Partial<import('../fetchers/types').StatsData>} stats
- *
+ * @param {Partial<import("./types").StatCardOptions>} options
- * @param {Partial<import('../fetchers/types').StatsData>} stats The stats data.
+ * @returns {string}
- * @param {Partial<import("./types").StatCardOptions>} options The card options.
- * @returns {string} The stats card SVG object.
  */
 const renderStatsCard = (stats = {}, options = { hide: [] }) => {
   const {
@@ -96,7 +74,6 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
     include_all_commits = false,
     line_height = 25,
     title_color,
-    ring_color,
     icon_color,
     text_color,
     text_bold = true,
@@ -105,23 +82,20 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
     custom_title,
     border_radius,
     border_color,
-    number_format = "short",
     locale,
     disable_animations = false,
-    rank_icon = "default",
   } = options;
 
   const lheight = parseInt(String(line_height), 10);
 
   // returns theme based colors with proper overrides and defaults
-  const { titleColor, iconColor, textColor, bgColor, borderColor, ringColor } =
+  const { titleColor, textColor, iconColor, bgColor, borderColor } =
     getCardColors({
       title_color,
-      text_color,
       icon_color,
+      text_color,
       bg_color,
       border_color,
-      ring_color,
       theme,
     });
 
@@ -163,7 +137,7 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
     },
     contribs: {
       icon: icons.contribs,
-      label: i18n.t("statcard.contribs") + " (last year)",
+      label: i18n.t("statcard.contribs"),
       value: contributedTo,
       id: "contribs",
     },
@@ -181,9 +155,8 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
     "pl",
     "de",
     "nl",
-    "zh-tw",
   ];
-  const isLongLocale = longLocales.includes(locale);
+  const isLongLocale = longLocales.includes(locale) === true;
 
   // filter out hidden stats defined by user & create the text nodes
   const statItems = Object.keys(STATS)
@@ -194,9 +167,9 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
         ...STATS[key],
         index,
         showIcons: show_icons,
-        shiftValuePos: 79.01 + (isLongLocale ? 50 : 0),
+        shiftValuePos:
+          (!include_all_commits ? 50 : 35) + (isLongLocale ? 50 : 0),
         bold: text_bold,
-        number_format,
       }),
     );
 
@@ -212,7 +185,6 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
   const progress = 100 - rank.score;
   const cssStyles = getStyles({
     titleColor,
-    ringColor,
     textColor,
     iconColor,
     show_icons,
@@ -228,17 +200,11 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
     When hide_rank=false, the minimum card_width is 340 px + the icon width (if show_icons=true).
     Numbers are picked by looking at existing dimensions on production.
   */
-  const iconWidth = show_icons ? 16 + /* padding */ 1 : 0;
+  const iconWidth = show_icons ? 16 : 0;
-  const minCardWidth =
+  const minCardWidth = hide_rank
-    (hide_rank
+    ? clampValue(50 /* padding */ + calculateTextWidth() * 2, 270, Infinity)
-      ? clampValue(
+    : 340 + iconWidth;
-          50 /* padding */ + calculateTextWidth() * 2,
+  const defaultCardWidth = hide_rank ? 270 : 495;
-          CARD_MIN_WIDTH,
-          Infinity,
-        )
-      : RANK_CARD_MIN_WIDTH) + iconWidth;
-  const defaultCardWidth =
-    (hide_rank ? CARD_DEFAULT_WIDTH : RANK_CARD_DEFAULT_WIDTH) + iconWidth;
   let width = isNaN(card_width) ? defaultCardWidth : card_width;
   if (width < minCardWidth) {
     width = minCardWidth;
@@ -267,21 +233,18 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
 
   /**
    * Calculates the right rank circle translation values such that the rank circle
-   * keeps respecting the following padding:
+   * keeps respecting the padding.
    *
-   * width > RANK_CARD_DEFAULT_WIDTH: The default right padding of 70 px will be used.
+   * width > 450: The default left padding of 50 px will be used.
-   * width < RANK_CARD_DEFAULT_WIDTH: The left and right padding will be enlarged
+   * width < 450: The left and right padding will shrink equally.
-   *   equally from a certain minimum at RANK_CARD_MIN_WIDTH.
    *
    * @returns {number} - Rank circle translation value.
    */
   const calculateRankXTranslation = () => {
-    const minXTranslation = RANK_CARD_MIN_WIDTH + iconWidth - 70;
+    if (width < 450) {
-    if (width > RANK_CARD_DEFAULT_WIDTH) {
+      return width - 95 + (45 * (450 - 340)) / 110;
-      const xMaxExpansion = minXTranslation + (450 - minCardWidth) / 2;
-      return xMaxExpansion + width - RANK_CARD_DEFAULT_WIDTH;
     } else {
-      return minXTranslation + (width - minCardWidth) / 2;
+      return width - 95;
     }
   };
 
@@ -295,7 +258,15 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
         <circle class="rank-circle-rim" cx="-10" cy="8" r="40" />
         <circle class="rank-circle" cx="-10" cy="8" r="40" />
         <g class="rank-text">
-          ${rankIcon(rank_icon, rank?.level)}
+          <text
+            x="-5"
+            y="3"
+            alignment-baseline="central"
+            dominant-baseline="central"
+            text-anchor="middle"
+          >
+            ${rank.level}
+          </text>
         </g>
       </g>`;
 

src/cards/top-languages-card.js

@@ -13,7 +13,7 @@ import {
 import { langCardLocales } from "../translations.js";
 
 const DEFAULT_CARD_WIDTH = 300;
-const MIN_CARD_WIDTH = 280;
+const MIN_CARD_WIDTH = 230;
 const DEFAULT_LANGS_COUNT = 5;
 const DEFAULT_LANG_COLOR = "#858585";
 const CARD_PADDING = 25;
@@ -23,10 +23,7 @@ const CARD_PADDING = 25;
  */
 
 /**
- * Retrieves the programming language whose name is the longest.
+ * @param {Lang[]} arr
- *
- * @param {Lang[]} arr Array of programming languages.
- * @returns {Object} Longest programming language object.
  */
 const getLongestLang = (arr) =>
   arr.reduce(
@@ -36,75 +33,53 @@ const getLongestLang = (arr) =>
   );
 
 /**
- * Creates a node to display usage of a programming language in percentage
+ * @param {{
- * using text and a horizontal progress bar.
+ *  width: number,
- *
+ *  color: string,
- * @param {object} props Function properties.
+ *  name: string,
- * @param {number} props.width The card width
+ *  progress: string
- * @param {string} props.name Name of the programming language.
+ * }} props
- * @param {string} props.color Color of the programming language.
- * @param {string} props.progress Usage of the programming language in percentage.
- * @param {number} props.index Index of the programming language.
- * @returns {string} Programming language SVG node.
  */
-const createProgressTextNode = ({ width, color, name, progress, index }) => {
+const createProgressTextNode = ({ width, color, name, progress }) => {
-  const staggerDelay = (index + 3) * 150;
   const paddingRight = 95;
   const progressTextX = width - paddingRight + 10;
   const progressWidth = width - paddingRight;
 
   return `
-    <g class="stagger" style="animation-delay: ${staggerDelay}ms">
+    <text data-testid="lang-name" x="2" y="15" class="lang-name">${name}</text>
-      <text data-testid="lang-name" x="2" y="15" class="lang-name">${name}</text>
+    <text x="${progressTextX}" y="34" class="lang-name">${progress}%</text>
-      <text x="${progressTextX}" y="34" class="lang-name">${progress}%</text>
+    ${createProgressNode({
-      ${createProgressNode({
+      x: 0,
-        x: 0,
+      y: 25,
-        y: 25,
+      color,
-        color,
+      width: progressWidth,
-        width: progressWidth,
+      progress,
-        progress,
+      progressBarBackgroundColor: "#ddd",
-        progressBarBackgroundColor: "#ddd",
+    })}
-        delay: staggerDelay + 300,
-      })}
-    </g>
   `;
 };
 
 /**
- * Creates a text only node to display usage of a programming language in percentage.
+ * @param {{ lang: Lang, totalSize: number }} props
- *
- * @param {object} props Function properties.
- * @param {Lang} props.lang Programming language object.
- * @param {number} props.totalSize Total size of all languages.
- * @param {boolean} props.hideProgress Whether to hide percentage.
- * @param {number} props.index Index of the programming language.
- * @returns {string} Compact layout programming language SVG node.
  */
-const createCompactLangNode = ({ lang, totalSize, hideProgress, index }) => {
+const createCompactLangNode = ({ lang, totalSize }) => {
   const percentage = ((lang.size / totalSize) * 100).toFixed(2);
-  const staggerDelay = (index + 3) * 150;
   const color = lang.color || "#858585";
 
   return `
-    <g class="stagger" style="animation-delay: ${staggerDelay}ms">
+    <g>
       <circle cx="5" cy="6" r="5" fill="${color}" />
       <text data-testid="lang-name" x="15" y="10" class='lang-name'>
-        ${lang.name} ${hideProgress ? "" : percentage + "%"}
+        ${lang.name} ${percentage}%
       </text>
     </g>
   `;
 };
 
 /**
- * Creates compact layout of text only language nodes.
+ * @param {{ langs: Lang[], totalSize: number }} props
- *
- * @param {object[]} props Function properties.
- * @param {Lang[]} props.langs Array of programming languages.
- * @param {number} props.totalSize Total size of all languages.
- * @param {boolean} props.hideProgress Whether to hide percentage.
- * @returns {string} Programming languages SVG node.
  */
-const createLanguageTextNode = ({ langs, totalSize, hideProgress }) => {
+const createLanguageTextNode = ({ langs, totalSize }) => {
   const longestLang = getLongestLang(langs);
   const chunked = chunkArray(langs, langs.length / 2);
   const layouts = chunked.map((array) => {
@@ -113,7 +88,7 @@ const createLanguageTextNode = ({ langs, totalSize, hideProgress }) => {
       createCompactLangNode({
         lang,
         totalSize,
-        hideProgress,
+        // @ts-ignore
         index,
       }),
     );
@@ -134,22 +109,19 @@ const createLanguageTextNode = ({ langs, totalSize, hideProgress }) => {
 };
 
 /**
- * Renders layout to display user's most frequently used programming languages.
+ * @param {Lang[]} langs
- *
+ * @param {number} width
- * @param {Lang[]} langs Array of programming languages.
+ * @param {number} totalLanguageSize
- * @param {number} width Card width.
+ * @returns {string}
- * @param {number} totalLanguageSize Total size of all languages.
- * @returns {string} Normal layout card SVG object.
  */
 const renderNormalLayout = (langs, width, totalLanguageSize) => {
   return flexLayout({
-    items: langs.map((lang, index) => {
+    items: langs.map((lang) => {
       return createProgressTextNode({
-        width,
+        width: width,
         name: lang.name,
         color: lang.color || DEFAULT_LANG_COLOR,
         progress: ((lang.size / totalLanguageSize) * 100).toFixed(2),
-        index,
       });
     }),
     gap: 40,
@@ -158,15 +130,12 @@ const renderNormalLayout = (langs, width, totalLanguageSize) => {
 };
 
 /**
- * Renders compact layout to display user's most frequently used programming languages.
+ * @param {Lang[]} langs
- *
+ * @param {number} width
- * @param {Lang[]} langs Array of programming languages.
+ * @param {number} totalLanguageSize
- * @param {number} width Card width.
+ * @returns {string}
- * @param {number} totalLanguageSize Total size of all languages.
- * @param {boolean} hideProgress Whether to hide progress bar.
- * @returns {string} Compact layout card SVG object.
  */
-const renderCompactLayout = (langs, width, totalLanguageSize, hideProgress) => {
+const renderCompactLayout = (langs, width, totalLanguageSize) => {
   const paddingRight = 50;
   const offsetWidth = width - paddingRight;
   // progressOffset holds the previous language's width and used to offset the next language
@@ -197,52 +166,41 @@ const renderCompactLayout = (langs, width, totalLanguageSize, hideProgress) => {
     .join("");
 
   return `
-  ${
+    <mask id="rect-mask">
-    !hideProgress
+      <rect x="0" y="0" width="${offsetWidth}" height="8" fill="white" rx="5" />
-      ? `
-  <mask id="rect-mask">
-      <rect x="0" y="0" width="${offsetWidth}" height="8" fill="white" rx="5"/>
     </mask>
     ${compactProgressBar}
-  `
+
-      : ""
+    <g transform="translate(0, 25)">
-  }
-    <g transform="translate(0, ${hideProgress ? "0" : "25"})">
       ${createLanguageTextNode({
         langs,
         totalSize: totalLanguageSize,
-        hideProgress: hideProgress,
       })}
     </g>
   `;
 };
 
 /**
- * Calculates height for the compact layout.
+ * @param {number} totalLangs
- *
+ * @returns {number}
- * @param {number} totalLangs Total number of languages.
- * @returns {number} Card height.
  */
 const calculateCompactLayoutHeight = (totalLangs) => {
   return 90 + Math.round(totalLangs / 2) * 25;
 };
 
 /**
- * Calculates height for the normal layout.
+ * @param {number} totalLangs
- *
+ * @returns {number}
- * @param {number} totalLangs Total number of languages.
- * @returns {number} Card height.
  */
 const calculateNormalLayoutHeight = (totalLangs) => {
   return 45 + (totalLangs + 1) * 40;
 };
 
 /**
- *  Hides languages and trims the list to show only the top N languages.
  *
- * @param {Record<string, Lang>} topLangs Top languages.
+ * @param {Record<string, Lang>} topLangs
- * @param {string[]} hide Languages to hide.
+ * @param {string[]} hide
- * @param {string} langs_count Number of languages to show.
+ * @param {string} langs_count
  */
 const useLanguages = (topLangs, hide, langs_count) => {
   let langs = Object.values(topLangs);
@@ -271,22 +229,19 @@ const useLanguages = (topLangs, hide, langs_count) => {
 };
 
 /**
- * Renders card to display user's most frequently used programming languages.
+ * @param {import('../fetchers/types').TopLangData} topLangs
- *
+ * @param {Partial<import("./types").TopLangOptions>} options
- * @param {import('../fetchers/types').TopLangData} topLangs User's most frequently used programming languages.
+ * @returns {string}
- * @param {Partial<import("./types").TopLangOptions>} options Card options.
- * @returns {string} Language card SVG object.
  */
 const renderTopLanguages = (topLangs, options = {}) => {
   const {
-    hide_title = false,
+    hide_title,
     hide_border,
     card_width,
     title_color,
     text_color,
     bg_color,
     hide,
-    hide_progress,
     theme,
     layout,
     custom_title,
@@ -294,7 +249,6 @@ const renderTopLanguages = (topLangs, options = {}) => {
     langs_count = DEFAULT_LANGS_COUNT,
     border_radius,
     border_color,
-    disable_animations,
   } = options;
 
   const i18n = new I18n({
@@ -316,16 +270,11 @@ const renderTopLanguages = (topLangs, options = {}) => {
   let height = calculateNormalLayoutHeight(langs.length);
 
   let finalLayout = "";
-  if (layout === "compact" || hide_progress == true) {
+  if (layout === "compact") {
-    height =
+    width = width + 50; // padding
-      calculateCompactLayoutHeight(langs.length) + (hide_progress ? -25 : 0);
+    height = calculateCompactLayoutHeight(langs.length);
 
-    finalLayout = renderCompactLayout(
+    finalLayout = renderCompactLayout(langs, width, totalLanguageSize);
-      langs,
-      width,
-      totalLanguageSize,
-      hide_progress,
-    );
   } else {
     finalLayout = renderNormalLayout(langs, width, totalLanguageSize);
   }
@@ -348,43 +297,11 @@ const renderTopLanguages = (topLangs, options = {}) => {
     colors,
   });
 
-  if (disable_animations) card.disableAnimations();
+  card.disableAnimations();
-
   card.setHideBorder(hide_border);
   card.setHideTitle(hide_title);
   card.setCSS(
-    `
+    `.lang-name { font: 400 11px 'Segoe UI', Ubuntu, Sans-Serif; fill: ${colors.textColor} }`,
-    @keyframes slideInAnimation {
-      from {
-        width: 0;
-      }
-      to {
-        width: calc(100%-100px);
-      }
-    }
-    @keyframes growWidthAnimation {
-      from {
-        width: 0;
-      }
-      to {
-        width: 100%;
-      }
-    }
-    .lang-name {
-      font: 400 11px "Segoe UI", Ubuntu, Sans-Serif;
-      fill: ${colors.textColor};
-    }
-    .stagger {
-      opacity: 0;
-      animation: fadeInAnimation 0.3s ease-in-out forwards;
-    }
-    #rect-mask rect{
-      animation: slideInAnimation 1s ease-in-out forwards;
-    }
-    .lang-progress{
-      animation: growWidthAnimation 0.6s ease-in-out forwards;
-    }
-    `,
   );
 
   return card.render(`

src/cards/types.d.ts

@@ -1,5 +1,4 @@
 type ThemeNames = keyof typeof import("../../themes/index.js");
-type RankIcon = "default" | "github";
 
 export type CommonOptions = {
   title_color: string;
@@ -23,10 +22,6 @@ export type StatCardOptions = CommonOptions & {
   line_height: number | string;
   custom_title: string;
   disable_animations: boolean;
-  number_format: string;
-  ring_color: string;
-  text_bold: boolean;
-  rank_icon: RankIcon;
 };
 
 export type RepoCardOptions = CommonOptions & {
@@ -42,8 +37,6 @@ export type TopLangOptions = CommonOptions & {
   layout: "compact" | "normal";
   custom_title: string;
   langs_count: number;
-  disable_animations: boolean;
-  hide_progress: boolean;
 };
 
 type WakaTimeOptions = CommonOptions & {

src/cards/wakatime-card.js

@@ -23,9 +23,7 @@ const require = createRequire(import.meta.url);
 const languageColors = require("../common/languageColors.json"); // now works
 
 /**
- * Creates the no coding activity SVG node.
+ * @param {{color: string, text: string}} param0
- *
- * @param {{color: string, text: string}} The function prop
  */
 const noCodingActivityNode = ({ color, text }) => {
   return `
@@ -34,13 +32,13 @@ const noCodingActivityNode = ({ color, text }) => {
 };
 
 /**
- * Create compact WakaTime layout.
  *
- * @param {Object[]} args The function arguments.
+ * @param {{
- * @param {import("../fetchers/types").WakaTimeLang[]} languages The languages array.
+ *  lang: import("../fetchers/types").WakaTimeLang,
- * @param {number} totalSize The total size of the languages.
+ *  totalSize: number,
- * @param {number} x The x position of the language node.
+ *  x: number,
- * @param {number} y The y position of the language node.
+ *  y: number
+ * }} props
  */
 const createCompactLangNode = ({ lang, totalSize, x, y }) => {
   const color = languageColors[lang.name] || "#858585";
@@ -56,13 +54,12 @@ const createCompactLangNode = ({ lang, totalSize, x, y }) => {
 };
 
 /**
- * Create WakaTime language text node item.
+ * @param {{
- *
+ *  langs: import("../fetchers/types").WakaTimeLang[],
- * @param {Object[]} args The function arguments.
+ *  totalSize: number,
- * @param {import("../fetchers/types").WakaTimeLang} lang The language object.
+ *  x: number,
- * @param {number} totalSize The total size of the languages.
+ *  y: number
- * @param {number} x The x position of the language node.
+ * }} props
- * @param {number} y The y position of the language node.
  */
 const createLanguageTextNode = ({ langs, totalSize, x, y }) => {
   return langs.map((lang, index) => {
@@ -84,16 +81,17 @@ const createLanguageTextNode = ({ langs, totalSize, x, y }) => {
 };
 
 /**
- * Create WakaTime text item.
  *
- * @param {Object[]} args The function arguments.
+ * @param {{
- * @param {string} id The id of the text node item.
+ *  id: string;
- * @param {string} label The label of the text node item.
+ *  label: string;
- * @param {string} value The value of the text node item.
+ *  value: string;
- * @param {number} index The index of the text node item.
+ *  index: number;
- * @param {percent} percent Percentage of the text node item.
+ *  percent: number;
- * @param {boolean} hideProgress Whether to hide the progress bar.
+ *  hideProgress: boolean;
- * @param {string} progressBarBackgroundColor The color of the progress bar background.
+ *  progressBarColor: string;
+ *  progressBarBackgroundColor: string
+ * }} props
  */
 const createTextNode = ({
   id,
@@ -118,7 +116,6 @@ const createTextNode = ({
         // @ts-ignore
         name: label,
         progressBarBackgroundColor,
-        delay: staggerDelay + 300,
       });
 
   return `
@@ -135,13 +132,11 @@ const createTextNode = ({
 };
 
 /**
- * Recalculating percentages so that, compact layout's progress bar does not break when
+ * @param {import("../fetchers/types").WakaTimeLang[]} languages
- * hiding languages.
- *
- * @param {import("../fetchers/types").WakaTimeLang[]} languages The languages array.
- * @return {import("../fetchers/types").WakaTimeLang[]} The recalculated languages array.
  */
 const recalculatePercentages = (languages) => {
+  // recalculating percentages so that,
+  // compact layout's progress bar does not break when hiding languages
   const totalSum = languages.reduce(
     (totalSum, language) => totalSum + language.percent,
     0,
@@ -153,14 +148,12 @@ const recalculatePercentages = (languages) => {
 };
 
 /**
- * Renders WakaTime card.
+ * @param {Partial<import('../fetchers/types').WakaTimeData>} stats
- *
+ * @param {Partial<import('./types').WakaTimeOptions>} options
- * @param {Partial<import('../fetchers/types').WakaTimeData>} stats WakaTime stats.
+ * @returns {string}
- * @param {Partial<import('./types').WakaTimeOptions>} options Card options.
- * @returns {string} WakaTime card SVG.
  */
 const renderWakatimeCard = (stats = {}, options = { hide: [] }) => {
-  let { languages = [] } = stats;
+  let { languages } = stats;
   const {
     hide_title = false,
     hide_border = false,
@@ -175,24 +168,20 @@ const renderWakatimeCard = (stats = {}, options = { hide: [] }) => {
     custom_title,
     locale,
     layout,
-    langs_count = languages.length,
+    langs_count = languages ? languages.length : 0,
     border_radius,
     border_color,
   } = options;
 
   const shouldHideLangs = Array.isArray(hide) && hide.length > 0;
-  if (shouldHideLangs) {
+  if (shouldHideLangs && languages !== undefined) {
     const languagesToHide = new Set(hide.map((lang) => lowercaseTrim(lang)));
     languages = languages.filter(
       (lang) => !languagesToHide.has(lowercaseTrim(lang.name)),
     );
+    recalculatePercentages(languages);
   }
 
-  // Since the percentages are sorted in descending order, we can just
-  // slice from the beginning without sorting.
-  languages = languages.slice(0, langs_count);
-  recalculatePercentages(languages);
-
   const i18n = new I18n({
     locale,
     translations: wakatimeCardLocales,
@@ -214,8 +203,10 @@ const renderWakatimeCard = (stats = {}, options = { hide: [] }) => {
     });
 
   const filteredLanguages = languages
-    .filter((language) => language.hours || language.minutes)
+    ? languages
-    .slice(0, langsCount);
+        .filter((language) => language.hours || language.minutes)
+        .slice(0, langsCount)
+    : [];
 
   // Calculate the card height depending on how many items there are
   // but if rank circle is visible clamp the minimum height to `150`
@@ -277,12 +268,11 @@ const renderWakatimeCard = (stats = {}, options = { hide: [] }) => {
   } else {
     finalLayout = flexLayout({
       items: filteredLanguages.length
-        ? filteredLanguages.map((language, index) => {
+        ? filteredLanguages.map((language) => {
             return createTextNode({
               id: language.name,
               label: language.name,
               value: language.text,
-              index: index,
               percent: language.percent,
               // @ts-ignore
               progressBarColor: titleColor,
@@ -323,29 +313,7 @@ const renderWakatimeCard = (stats = {}, options = { hide: [] }) => {
   card.setCSS(
     `
     ${cssStyles}
-    @keyframes slideInAnimation {
-      from {
-        width: 0;
-      }
-      to {
-        width: calc(100%-100px);
-      }
-    }
-    @keyframes growWidthAnimation {
-      from {
-        width: 0;
-      }
-      to {
-        width: 100%;
-      }
-    }
     .lang-name { font: 400 11px 'Segoe UI', Ubuntu, Sans-Serif; fill: ${textColor} }
-    #rect-mask rect{
-      animation: slideInAnimation 1s ease-in-out forwards;
-    }
-    .lang-progress{
-      animation: growWidthAnimation 0.6s ease-in-out forwards;
-    }
     `,
   );
 

src/common/Card.js

@@ -3,16 +3,14 @@ import { encodeHTML, flexLayout } from "./utils.js";
 
 class Card {
   /**
-   * Creates a new card instance.
+   * @param {object} args
-   *
+   * @param {number?=} args.width
-   * @param {object} args Card arguments.
+   * @param {number?=} args.height
-   * @param {number?=} args.width Card width.
+   * @param {number?=} args.border_radius
-   * @param {number?=} args.height Card height.
+   * @param {string?=} args.customTitle
-   * @param {number?=} args.border_radius Card border radius.
+   * @param {string?=} args.defaultTitle
-   * @param {string?=} args.customTitle Card custom title.
+   * @param {string?=} args.titlePrefixIcon
-   * @param {string?=} args.defaultTitle Card default title.
+   * @param {ReturnType<import('../common/utils.js').getCardColors>?=} args.colors
-   * @param {string?=} args.titlePrefixIcon Card title prefix icon.
-   * @returns {Card} Card instance.
    */
   constructor({
     width = 100,

src/common/I18n.js

@@ -1,6 +1,3 @@
-/**
- * I18n translation class.
- */
 class I18n {
   constructor({ locale, translations }) {
     this.locale = locale;

src/common/createProgressNode.js

@@ -1,18 +1,5 @@
 import { clampValue } from "./utils.js";
 
-/**
- * Create a node to indicate progress in percentage along a horizontal line.
- *
- * @param {Object} createProgressNodeParams Object that contains the createProgressNode parameters.
- * @param {number} createProgressNodeParams.x X-axis position.
- * @param {number} createProgressNodeParams.y Y-axis position.
- * @param {number} createProgressNodeParams.width Width of progress bar.
- * @param {string} createProgressNodeParams.color Progress color.
- * @param {string} createProgressNodeParams.progress Progress value.
- * @param {string} createProgressNodeParams.progressBarBackgroundColor Progress bar bg color.
- * @param {number} createProgressNodeParams.delay Delay before animation starts.
- * @returns {string} Progress node.
- */
 const createProgressNode = ({
   x,
   y,
@@ -20,22 +7,20 @@ const createProgressNode = ({
   color,
   progress,
   progressBarBackgroundColor,
-  delay,
 }) => {
   const progressPercentage = clampValue(progress, 2, 100);
 
   return `
     <svg width="${width}" x="${x}" y="${y}">
       <rect rx="5" ry="5" x="0" y="0" width="${width}" height="8" fill="${progressBarBackgroundColor}"></rect>
-      <svg data-testid="lang-progress" width="${progressPercentage}%">
+      <rect
-        <rect
+          height="8"
-            height="8"
+          fill="${color}"
-            fill="${color}"
+          rx="5" ry="5" x="0" y="0"
-            rx="5" ry="5" x="0" y="0"
+          data-testid="lang-progress"
-            class="lang-progress"
+          width="${progressPercentage}%"
-            style="animation-delay: ${delay}ms;"
+      >
-        />
+      </rect>
-      </svg>
     </svg>
   `;
 };

src/common/icons.js

@@ -8,28 +8,5 @@ const icons = {
   fork: `<path fill-rule="evenodd" d="M5 3.25a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm0 2.122a2.25 2.25 0 10-1.5 0v.878A2.25 2.25 0 005.75 8.5h1.5v2.128a2.251 2.251 0 101.5 0V8.5h1.5a2.25 2.25 0 002.25-2.25v-.878a2.25 2.25 0 10-1.5 0v.878a.75.75 0 01-.75.75h-4.5A.75.75 0 015 6.25v-.878zm3.75 7.378a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm3-8.75a.75.75 0 100-1.5.75.75 0 000 1.5z"></path>`,
 };
 
-/**
+export { icons };
- * Get rank icon
- *
- * @returns {string} - The SVG code of the rank icon
- */
-const rankIcon = (rankIcon, rankLevel) => {
-  switch (rankIcon) {
-    case "github":
-      return `
-        <svg x="-38" y="-30" height="66" width="66" aria-hidden="true" viewBox="0 0 16 16" version="1.1" data-view-component="true" data-testid="github-rank-icon">
-          <path d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"></path>
-        </svg>
-      `;
-    case "default":
-    default:
-      return `
-        <text x="-5" y="3" alignment-baseline="central" dominant-baseline="central" text-anchor="middle" data-testid="level-rank-icon">
-          ${rankLevel}
-        </text>
-      `;
-  }
-};
-
-export { icons, rankIcon };
 export default icons;

src/common/index.js

@@ -1,30 +0,0 @@
-export { blacklist } from "./blacklist.js";
-export { Card } from "./Card.js";
-export { createProgressNode } from "./createProgressNode.js";
-export { I18n } from "./I18n.js";
-export { icons } from "./icons.js";
-export { retryer } from "./retryer.js";
-export {
-  ERROR_CARD_LENGTH,
-  renderError,
-  encodeHTML,
-  kFormatter,
-  isValidHexColor,
-  parseBoolean,
-  parseArray,
-  clampValue,
-  isValidGradient,
-  fallbackColor,
-  request,
-  flexLayout,
-  getCardColors,
-  wrapTextMultiline,
-  logger,
-  CONSTANTS,
-  CustomError,
-  MissingParamError,
-  measureText,
-  lowercaseTrim,
-  chunkArray,
-  parseEmojis,
-} from "./utils.js";

src/common/languageColors.json

@@ -79,7 +79,6 @@
     "Ceylon": "#dfa535",
     "Chapel": "#8dc63f",
     "ChucK": "#3f8000",
-    "Circom": "#707575",
     "Cirru": "#ccccff",
     "Clarion": "#db901e",
     "Clarity": "#5546ff",
@@ -103,7 +102,6 @@
     "Csound Score": "#1a1a1a",
     "Cuda": "#3A4E3A",
     "Curry": "#531242",
-    "Cypher": "#34c0eb",
     "Cython": "#fedf5b",
     "D": "#ba595e",
     "DM": "#447265",
@@ -117,7 +115,6 @@
     "DirectX 3D File": "#aace60",
     "Dockerfile": "#384d54",
     "Dogescript": "#cca760",
-    "Dotenv": "#e5d559",
     "Dylan": "#6c616e",
     "E": "#ccce35",
     "ECL": "#8a1267",
@@ -127,13 +124,11 @@
     "Earthly": "#2af0ff",
     "Easybuild": "#069406",
     "Ecere Projects": "#913960",
-    "Ecmarkup": "#eb8131",
     "EditorConfig": "#fff1f2",
     "Eiffel": "#4d6977",
     "Elixir": "#6e4a7e",
     "Elm": "#60B5CC",
     "Elvish": "#55BB55",
-    "Elvish Transcript": "#55BB55",
     "Emacs Lisp": "#c065db",
     "EmberScript": "#FFF4F3",
     "Erlang": "#B83998",
@@ -152,7 +147,7 @@
     "Forth": "#341708",
     "Fortran": "#4d41b1",
     "Fortran Free Form": "#4d41b1",
-    "FreeBasic": "#141AC9",
+    "FreeBasic": "#867db1",
     "FreeMarker": "#0050b2",
     "Frege": "#00cafe",
     "Futhark": "#5f021f",
@@ -185,7 +180,6 @@
     "Go": "#00ADD8",
     "Go Checksums": "#00ADD8",
     "Go Module": "#00ADD8",
-    "Godot Resource": "#355570",
     "Golo": "#88562A",
     "Gosu": "#82937f",
     "Grace": "#615f8b",
@@ -196,7 +190,6 @@
     "Groovy": "#4298b8",
     "Groovy Server Pages": "#4298b8",
     "HAProxy": "#106da9",
-    "HCL": "#844FBA",
     "HLSL": "#aace60",
     "HOCON": "#9ff8ee",
     "HTML": "#e34c26",
@@ -222,7 +215,6 @@
     "Idris": "#b30000",
     "Ignore List": "#000000",
     "ImageJ Macro": "#99AAFF",
-    "Imba": "#16cec6",
     "Inno Setup": "#264b99",
     "Io": "#a9188d",
     "Ioke": "#078193",
@@ -230,7 +222,6 @@
     "Isabelle ROOT": "#FEFE00",
     "J": "#9EEDFF",
     "JAR Manifest": "#b07219",
-    "JCL": "#d90e09",
     "JFlex": "#DBCA00",
     "JSON": "#292929",
     "JSON with Comments": "#292929",
@@ -253,11 +244,9 @@
     "Jsonnet": "#0064bd",
     "Julia": "#a270ba",
     "Jupyter Notebook": "#DA5B0B",
-    "Just": "#384d54",
     "KRL": "#28430A",
     "Kaitai Struct": "#773b37",
     "KakouneScript": "#6f8042",
-    "KerboScript": "#41adf0",
     "KiCad Layout": "#2f4aab",
     "KiCad Legacy Layout": "#2f4aab",
     "KiCad Schematic": "#2f4aab",
@@ -297,7 +286,6 @@
     "Mathematica": "#dd1100",
     "Max": "#c4a79c",
     "Mercury": "#ff2b2b",
-    "Mermaid": "#ff3670",
     "Meson": "#007800",
     "Metal": "#8f14e9",
     "MiniYAML": "#ff1111",
@@ -330,10 +318,6 @@
     "Nu": "#c9df40",
     "NumPy": "#9C8AF9",
     "Nunjucks": "#3d8137",
-    "OASv2-json": "#85ea2d",
-    "OASv2-yaml": "#85ea2d",
-    "OASv3-json": "#85ea2d",
-    "OASv3-yaml": "#85ea2d",
     "OCaml": "#3be133",
     "ObjectScript": "#424893",
     "Objective-C": "#438eff",
@@ -343,18 +327,14 @@
     "Omgrofl": "#cabbff",
     "Opal": "#f7ede0",
     "Open Policy Agent": "#7d9199",
-    "OpenAPI Specification v2": "#85ea2d",
-    "OpenAPI Specification v3": "#85ea2d",
     "OpenCL": "#ed2e2d",
     "OpenEdge ABL": "#5ce600",
     "OpenQASM": "#AA70FF",
     "OpenSCAD": "#e5cd45",
-    "Option List": "#476732",
     "Org": "#77aa99",
     "Oxygene": "#cdd0e3",
     "Oz": "#fab738",
     "P4": "#7055b5",
-    "PDDL": "#0d00ff",
     "PEG.js": "#234d6b",
     "PHP": "#4F5D95",
     "PLSQL": "#dad8d8",
@@ -370,9 +350,7 @@
     "PicoLisp": "#6067af",
     "PigLatin": "#fcd7de",
     "Pike": "#005390",
-    "PlantUML": "#fbbd16",
     "PogoScript": "#d80074",
-    "Polar": "#ae81ff",
     "Portugol": "#f8bd00",
     "PostCSS": "#dc3a0c",
     "PostScript": "#da291c",
@@ -388,7 +366,6 @@
     "Puppet": "#302B6D",
     "PureBasic": "#5a6986",
     "PureScript": "#1D222D",
-    "Pyret": "#ee1e10",
     "Python": "#3572A5",
     "Python console": "#3572A5",
     "Python traceback": "#3572A5",
@@ -437,7 +414,6 @@
     "Sass": "#a53b70",
     "Scala": "#c22d40",
     "Scaml": "#bd181a",
-    "Scenic": "#fdc700",
     "Scheme": "#1e4aec",
     "Scilab": "#ca0f21",
     "Self": "#0579aa",
@@ -445,7 +421,6 @@
     "Shell": "#89e051",
     "ShellCheck Config": "#cecfcb",
     "Shen": "#120F14",
-    "Simple File Verification": "#C9BFED",
     "Singularity": "#64E6AD",
     "Slash": "#007eff",
     "Slice": "#003fa2",
@@ -453,8 +428,6 @@
     "SmPL": "#c94949",
     "Smalltalk": "#596706",
     "Smarty": "#f0c040",
-    "Smithy": "#c44536",
-    "Snakemake": "#419179",
     "Solidity": "#AA6746",
     "SourcePawn": "#f69e1d",
     "Squirrel": "#800000",
@@ -468,7 +441,6 @@
     "SugarSS": "#2fcc9f",
     "SuperCollider": "#46390b",
     "Svelte": "#ff3e00",
-    "Sway": "#dea584",
     "Swift": "#F05138",
     "SystemVerilog": "#DAE1C2",
     "TI Program": "#A0AA87",
@@ -506,7 +478,6 @@
     "Vim Script": "#199f4b",
     "Vim Snippet": "#199f4b",
     "Visual Basic .NET": "#945db7",
-    "Visual Basic 6.0": "#2c6353",
     "Volt": "#1F1F1F",
     "Vue": "#41b883",
     "Vyper": "#2980b9",

src/common/retryer.js

@@ -1,22 +1,7 @@
 import { CustomError, logger } from "./utils.js";
 
-// Script variables.
-const PATs = Object.keys(process.env).filter((key) =>
-  /PAT_\d*$/.exec(key),
-).length;
-const RETRIES = PATs ? PATs : 7;
-
-/**
- * Try to execute the fetcher function until it succeeds or the max number of retries is reached.
- *
- * @param {object[]} retryerParams Object that contains the createTextNode parameters.
- * @param {object[]} retryerParams.fetcher The fetcher function.
- * @param {object[]} retryerParams.variables Object with arguments to pass to the fetcher function.
- * @param {number} retryerParams.retries How many times to retry.
- * @returns Promise<retryer>
- */
 const retryer = async (fetcher, variables, retries = 0) => {
-  if (retries > RETRIES) {
+  if (retries > 7) {
     throw new CustomError("Maximum retries exceeded", CustomError.MAX_RETRY);
   }
   try {
@@ -45,17 +30,12 @@ const retryer = async (fetcher, variables, retries = 0) => {
     // prettier-ignore
     // also checking for bad credentials if any tokens gets invalidated
     const isBadCredential = err.response.data && err.response.data.message === "Bad credentials";
-    const isAccountSuspended =
-      err.response.data &&
-      err.response.data.message === "Sorry. Your account was suspended.";
 
-    if (isBadCredential || isAccountSuspended) {
+    if (isBadCredential) {
       logger.log(`PAT_${retries + 1} Failed`);
       retries++;
       // directly return from the function
       return retryer(fetcher, variables, retries);
-    } else {
-      return err.response;
     }
   }
 };

src/common/utils.js

@@ -4,27 +4,20 @@ import toEmoji from "emoji-name-map";
 import wrap from "word-wrap";
 import { themes } from "../../themes/index.js";
 
-// Script parameters.
-const ERROR_CARD_LENGTH = 576.5;
-
 /**
- * Renders error message on the card.
+ * @param {string} message
- *
+ * @param {string} secondaryMessage
- * @param {string} message Main error message.
+ * @returns {string}
- * @param {string} secondaryMessage The secondary error message.
- * @returns {string} The SVG markup.
  */
 const renderError = (message, secondaryMessage = "") => {
   return `
-    <svg width="${ERROR_CARD_LENGTH}" height="120" viewBox="0 0 ${ERROR_CARD_LENGTH} 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <svg width="495" height="120" viewBox="0 0 495 120" fill="none" xmlns="http://www.w3.org/2000/svg">
     <style>
     .text { font: 600 16px 'Segoe UI', Ubuntu, Sans-Serif; fill: #2F80ED }
     .small { font: 600 12px 'Segoe UI', Ubuntu, Sans-Serif; fill: #252525 }
     .gray { fill: #858585 }
     </style>
-    <rect x="0.5" y="0.5" width="${
+    <rect x="0.5" y="0.5" width="494" height="99%" rx="4.5" fill="#FFFEFE" stroke="#E4E2E2"/>
-      ERROR_CARD_LENGTH - 1
-    }" height="99%" rx="4.5" fill="#FFFEFE" stroke="#E4E2E2"/>
     <text x="25" y="45" class="text">Something went wrong! file an issue at https://tiny.one/readme-stats</text>
     <text data-testid="message" x="25" y="55" class="text small">
       <tspan x="25" dy="18">${encodeHTML(message)}</tspan>
@@ -35,110 +28,86 @@ const renderError = (message, secondaryMessage = "") => {
 };
 
 /**
- * Encode string as HTML.
- *
  * @see https://stackoverflow.com/a/48073476/10629172
- *
+ * @param {string} str
- * @param {string} str String to encode.
+ * @returns {string}
- * @returns {string} Encoded string.
  */
-const encodeHTML = (str) => {
+function encodeHTML(str) {
   return str
     .replace(/[\u00A0-\u9999<>&](?!#)/gim, (i) => {
       return "&#" + i.charCodeAt(0) + ";";
     })
     .replace(/\u0008/gim, "");
-};
+}
 
 /**
- * Retrieves num with suffix k(thousands) precise to 1 decimal if greater than 999.
+ * @param {number} num
- *
- * @param {number} num The number to format.
- * @returns {string|number} The formatted number.
  */
-const kFormatter = (num) => {
+function kFormatter(num) {
   return Math.abs(num) > 999
     ? Math.sign(num) * parseFloat((Math.abs(num) / 1000).toFixed(1)) + "k"
     : Math.sign(num) * Math.abs(num);
-};
+}
 
 /**
- * Checks if a string is a valid hex color.
+ * @param {string} hexColor
- *
+ * @returns {boolean}
- * @param {string} hexColor String to check.
- * @returns {boolean} True if the given string is a valid hex color.
  */
-const isValidHexColor = (hexColor) => {
+function isValidHexColor(hexColor) {
   return new RegExp(
     /^([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}|[A-Fa-f0-9]{4})$/,
   ).test(hexColor);
-};
+}
 
 /**
- * Returns boolean if value is either "true" or "false" else the value as it is.
+ * @param {string} value
- *
+ * @returns {boolean | string}
- * @param {string | boolean} value The value to parse.
- * @returns {boolean | undefined } The parsed value.
  */
-const parseBoolean = (value) => {
+function parseBoolean(value) {
-  if (typeof value === "boolean") return value;
+  if (value === "true") {
-
+    return true;
-  if (typeof value === "string") {
+  } else if (value === "false") {
-    if (value.toLowerCase() === "true") {
+    return false;
-      return true;
+  } else {
-    } else if (value.toLowerCase() === "false") {
+    return value;
-      return false;
-    }
   }
-  return undefined;
+}
-};
 
 /**
- * Parse string to array of strings.
+ * @param {string} str
- *
- * @param {string} str The string to parse.
- * @returns {string[]} The array of strings.
  */
-const parseArray = (str) => {
+function parseArray(str) {
   if (!str) return [];
   return str.split(",");
-};
+}
 
 /**
- * Clamp the given number between the given range.
+ * @param {number} number
- *
+ * @param {number} min
- * @param {number} number The number to clamp.
+ * @param {number} max
- * @param {number} min The minimum value.
- * @param {number} max The maximum value.
- * returns {number} The clamped number.
  */
-const clampValue = (number, min, max) => {
+function clampValue(number, min, max) {
   // @ts-ignore
   if (Number.isNaN(parseInt(number))) return min;
   return Math.max(min, Math.min(number, max));
-};
+}
 
 /**
- * Check if the given string is a valid gradient.
+ * @param {string[]} colors
- *
- * @param {string[]} colors Array of colors.
- * @returns {boolean} True if the given string is a valid gradient.
  */
-const isValidGradient = (colors) => {
+function isValidGradient(colors) {
   return isValidHexColor(colors[1]) && isValidHexColor(colors[2]);
-};
+}
 
 /**
- * Retrieves a gradient if color has more than one valid hex codes else a single color.
+ * @param {string} color
- *
+ * @param {string} fallbackColor
- * @param {string} color The color to parse.
+ * @returns {string | string[]}
- * @param {string} fallbackColor The fallback color.
- * @returns {string | string[]} The gradient or color.
  */
-const fallbackColor = (color, fallbackColor) => {
+function fallbackColor(color, fallbackColor) {
+  let colors = color.split(",");
   let gradient = null;
 
-  let colors = color ? color.split(",") : [];
   if (colors.length > 1 && isValidGradient(colors)) {
     gradient = colors;
   }
@@ -147,16 +116,13 @@ const fallbackColor = (color, fallbackColor) => {
     (gradient ? gradient : isValidHexColor(color) && `#${color}`) ||
     fallbackColor
   );
-};
+}
 
 /**
- * Send GraphQL request to GitHub API.
+ * @param {import('axios').AxiosRequestConfig['data']} data
- *
+ * @param {import('axios').AxiosRequestConfig['headers']} headers
- * @param {import('axios').AxiosRequestConfig['data']} data Request data.
- * @param {import('axios').AxiosRequestConfig['headers']} headers Request headers.
- * @returns {Promise<any>} Request response.
  */
-const request = (data, headers) => {
+function request(data, headers) {
   // @ts-ignore
   return axios({
     url: "https://api.github.com/graphql",
@@ -164,20 +130,22 @@ const request = (data, headers) => {
     headers,
     data,
   });
-};
+}
 
 /**
- * Auto layout utility, allows us to layout things vertically or horizontally with
+ * @param {object} props
- * proper gaping.
+ * @param {string[]} props.items
+ * @param {number} props.gap
+ * @param {number[]?=} props.sizes
+ * @param {"column" | "row"?=} props.direction
  *
- * @param {object} props Function properties.
+ * @returns {string[]}
- * @param {string[]} props.items Array of items to layout.
+ *
- * @param {number} props.gap Gap between items.
+ * @description
- * @param {number[]?=} props.sizes Array of sizes for each item.
+ * Auto layout utility, allows us to layout things
- * @param {"column" | "row"?=} props.direction Direction to layout items.
+ * vertically or horizontally with proper gaping
- * @returns {string[]} Array of items with proper layout.
  */
-const flexLayout = ({ items, gap, direction, sizes = [] }) => {
+function flexLayout({ items, gap, direction, sizes = [] }) {
   let lastSize = 0;
   // filter() for filtering out empty strings
   return items.filter(Boolean).map((item, i) => {
@@ -189,31 +157,31 @@ const flexLayout = ({ items, gap, direction, sizes = [] }) => {
     lastSize += size + gap;
     return `<g transform="${transform}">${item}</g>`;
   });
-};
+}
 
 /**
- * Returns theme based colors with proper overrides and defaults.
+ * @typedef {object} CardColors
- *
+ * @prop {string?=} title_color
- * @param {Object[]} args Function arguments.
+ * @prop {string?=} text_color
- * @param {string} args.title_color Card title color.
+ * @prop {string?=} icon_color
- * @param {string} args.text_color Card text color.
+ * @prop {string?=} bg_color
- * @param {string} args.icon_color Card icon color.
+ * @prop {string?=} border_color
- * @param {string} args.bg_color Card background color.
+ * @prop {keyof typeof import('../../themes')?=} fallbackTheme
- * @param {string} args.border_color Card border color.
+ * @prop {keyof typeof import('../../themes')?=} theme
- * @param {string} args.theme Card theme.
- * @param {string} args.fallbackTheme Fallback theme.
- *
  */
-const getCardColors = ({
+/**
+ * returns theme based colors with proper overrides and defaults
+ * @param {CardColors} options
+ */
+function getCardColors({
   title_color,
   text_color,
   icon_color,
   bg_color,
   border_color,
-  ring_color,
   theme,
   fallbackTheme = "default",
-}) => {
+}) {
   const defaultTheme = themes[fallbackTheme];
   const selectedTheme = themes[theme] || defaultTheme;
   const defaultBorderColor =
@@ -225,13 +193,6 @@ const getCardColors = ({
     title_color || selectedTheme.title_color,
     "#" + defaultTheme.title_color,
   );
-
-  // get the color provided by the user else the theme color
-  // finally if both colors are invalid we use the titleColor
-  const ringColor = fallbackColor(
-    ring_color || selectedTheme.ring_color,
-    titleColor,
-  );
   const iconColor = fallbackColor(
     icon_color || selectedTheme.icon_color,
     "#" + defaultTheme.icon_color,
@@ -250,18 +211,16 @@ const getCardColors = ({
     "#" + defaultBorderColor,
   );
 
-  return { titleColor, iconColor, textColor, bgColor, borderColor, ringColor };
+  return { titleColor, iconColor, textColor, bgColor, borderColor };
-};
+}
 
 /**
- * Split text over multiple lines based on the card width.
+ * @param {string} text
- *
+ * @param {number} width
- * @param {string} text Text to split.
+ * @param {number} maxLines
- * @param {number} width Line width in number of characters.
+ * @returns {string[]}
- * @param {number} maxLines Maximum number of lines.
- * @returns {string[]} Array of lines.
  */
-const wrapTextMultiline = (text, width = 59, maxLines = 3) => {
+function wrapTextMultiline(text, width = 59, maxLines = 3) {
   const fullWidthComma = "，";
   const encoded = encodeHTML(text);
   const isChinese = encoded.includes(fullWidthComma);
@@ -286,7 +245,7 @@ const wrapTextMultiline = (text, width = 59, maxLines = 3) => {
   // Remove empty lines if text fits in less than maxLines lines
   const multiLineText = lines.filter(Boolean);
   return multiLineText;
-};
+}
 
 const noop = () => {};
 // return console instance based on the environment
@@ -304,16 +263,12 @@ const SECONDARY_ERROR_MESSAGES = {
   MAX_RETRY:
     "Please add an env variable called PAT_1 with your github token in vercel",
   USER_NOT_FOUND: "Make sure the provided username is not an organization",
-  GRAPHQL_ERROR: "Please try again later",
 };
 
-/**
- * Custom error class to handle custom GRS errors.
- */
 class CustomError extends Error {
   /**
-   * @param {string} message Error message.
+   * @param {string} message
-   * @param {string} type Error type.
+   * @param {string} type
    */
   constructor(message, type) {
     super(message);
@@ -323,12 +278,8 @@ class CustomError extends Error {
 
   static MAX_RETRY = "MAX_RETRY";
   static USER_NOT_FOUND = "USER_NOT_FOUND";
-  static GRAPHQL_ERROR = "GRAPHQL_ERROR";
 }
 
-/**
- * Missing query parameter class.
- */
 class MissingParamError extends Error {
   /**
    * @param {string[]} missedParams
@@ -345,14 +296,12 @@ class MissingParamError extends Error {
 }
 
 /**
- * Retrieve text length.
- *
  * @see https://stackoverflow.com/a/48172630/10629172
- * @param {string} str String to measure.
+ * @param {string} str
- * @param {number} fontSize Font size.
+ * @param {number} fontSize
- * @returns {number} Text length.
+ * @returns
  */
-const measureText = (str, fontSize = 10) => {
+function measureText(str, fontSize = 10) {
   // prettier-ignore
   const widths = [
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -384,20 +333,18 @@ const measureText = (str, fontSize = 10) => {
       )
       .reduce((cur, acc) => acc + cur) * fontSize
   );
-};
+}
 
 /** @param {string} name */
 const lowercaseTrim = (name) => name.toLowerCase().trim();
 
 /**
- * Split array of languages in two columns.
+ * @template T
- *
+ * @param {Array<T>} arr
- * @template T Language object.
+ * @param {number} perChunk
- * @param {Array<T>} arr Array of languages.
+ * @returns {Array<T>}
- * @param {number} perChunk Number of languages per column.
- * @returns {Array<T>} Array of languages split in two columns.
  */
-const chunkArray = (arr, perChunk) => {
+function chunkArray(arr, perChunk) {
   return arr.reduce((resultArray, item, index) => {
     const chunkIndex = Math.floor(index / perChunk);
 
@@ -409,56 +356,39 @@ const chunkArray = (arr, perChunk) => {
 
     return resultArray;
   }, []);
-};
+}
 
 /**
- * Parse emoji from string.
  *
- * @param {string} str String to parse emoji from.
+ * @param {string} str
- * @returns {string} String with emoji parsed.
+ * @returns {string}
  */
-const parseEmojis = (str) => {
+function parseEmojis(str) {
   if (!str) throw new Error("[parseEmoji]: str argument not provided");
   return str.replace(/:\w+:/gm, (emoji) => {
     return toEmoji.get(emoji) || "";
   });
-};
+}
-
-/**
- * Get diff in minutes
- * @param {Date} d1
- * @param {Date} d2
- * @returns {number}
- */
-const dateDiff = (d1, d2) => {
-  const date1 = new Date(d1);
-  const date2 = new Date(d2);
-  const diff = date1.getTime() - date2.getTime();
-  return Math.round(diff / (1000 * 60));
-};
 
 export {
-  ERROR_CARD_LENGTH,
   renderError,
-  encodeHTML,
   kFormatter,
+  encodeHTML,
   isValidHexColor,
-  parseBoolean,
-  parseArray,
-  clampValue,
-  isValidGradient,
-  fallbackColor,
   request,
+  parseArray,
+  parseBoolean,
+  fallbackColor,
   flexLayout,
   getCardColors,
+  clampValue,
   wrapTextMultiline,
+  measureText,
   logger,
   CONSTANTS,
   CustomError,
   MissingParamError,
-  measureText,
   lowercaseTrim,
   chunkArray,
   parseEmojis,
-  dateDiff,
 };

src/fetchers/repo-fetcher.js

@@ -3,11 +3,8 @@ import { retryer } from "../common/retryer.js";
 import { MissingParamError, request } from "../common/utils.js";
 
 /**
- * Repo data fetcher.
+ * @param {import('Axios').AxiosRequestHeaders} variables
- *
+ * @param {string} token
- * @param {import('Axios').AxiosRequestHeaders} variables Fetcher variables.
- * @param {string} token GitHub token.
- * @returns {Promise<import('Axios').AxiosResponse>} The response.
  */
 const fetcher = (variables, token) => {
   return request(
@@ -54,13 +51,11 @@ const fetcher = (variables, token) => {
 const urlExample = "/api/pin?username=USERNAME&amp;repo=REPO_NAME";
 
 /**
- * Fetch repository data.
+ * @param {string} username
- *
+ * @param {string} reponame
- * @param {string} username GitHub username.
+ * @returns {Promise<import("./types").RepositoryData>}
- * @param {string} reponame GitHub repository name.
- * @returns {Promise<import("./types").RepositoryData>} Repository data.
  */
-const fetchRepo = async (username, reponame) => {
+async function fetchRepo(username, reponame) {
   if (!username && !reponame) {
     throw new MissingParamError(["username", "repo"], urlExample);
   }
@@ -100,7 +95,7 @@ const fetchRepo = async (username, reponame) => {
       starCount: data.organization.repository.stargazers.totalCount,
     };
   }
-};
+}
 
 export { fetchRepo };
 export default fetchRepo;

src/fetchers/stats-fetcher.js

@@ -9,77 +9,53 @@ import {
   logger,
   MissingParamError,
   request,
-  wrapTextMultiline,
 } from "../common/utils.js";
 
 dotenv.config();
 
-// GraphQL queries.
-const GRAPHQL_REPOS_FIELD = `
-  repositories(first: 100, ownerAffiliations: OWNER, orderBy: {direction: DESC, field: STARGAZERS}, after: $after) {
-    totalCount
-    nodes {
-      name
-      stargazers {
-        totalCount
-      }
-    }
-    pageInfo {
-      hasNextPage
-      endCursor
-    }
-  }
-`;
-
-const GRAPHQL_REPOS_QUERY = `
-  query userInfo($login: String!, $after: String) {
-    user(login: $login) {
-      ${GRAPHQL_REPOS_FIELD}
-    }
-  }
-`;
-
-const GRAPHQL_STATS_QUERY = `
-  query userInfo($login: String!, $after: String) {
-    user(login: $login) {
-      name
-      login
-      contributionsCollection {
-        totalCommitContributions
-        restrictedContributionsCount
-      }
-      repositoriesContributedTo(first: 1, contributionTypes: [COMMIT, ISSUE, PULL_REQUEST, REPOSITORY]) {
-        totalCount
-      }
-      pullRequests(first: 1) {
-        totalCount
-      }
-      openIssues: issues(states: OPEN) {
-        totalCount
-      }
-      closedIssues: issues(states: CLOSED) {
-        totalCount
-      }
-      followers {
-        totalCount
-      }
-      ${GRAPHQL_REPOS_FIELD}
-    }
-  }
-`;
-
 /**
- * Stats fetcher object.
+ * @param {import('axios').AxiosRequestHeaders} variables
- *
+ * @param {string} token
- * @param {import('axios').AxiosRequestHeaders} variables Fetcher variables.
- * @param {string} token GitHub token.
- * @returns {Promise<import('../common/types').Fetcher>} Stats fetcher response.
  */
 const fetcher = (variables, token) => {
-  const query = !variables.after ? GRAPHQL_STATS_QUERY : GRAPHQL_REPOS_QUERY;
   return request(
     {
-      query,
+      query: `
+      query userInfo($login: String!) {
+        user(login: $login) {
+          name
+          login
+          contributionsCollection {
+            totalCommitContributions
+            restrictedContributionsCount
+          }
+          repositoriesContributedTo(first: 1, contributionTypes: [COMMIT, ISSUE, PULL_REQUEST, REPOSITORY]) {
+            totalCount
+          }
+          pullRequests(first: 1) {
+            totalCount
+          }
+          openIssues: issues(states: OPEN) {
+            totalCount
+          }
+          closedIssues: issues(states: CLOSED) {
+            totalCount
+          }
+          followers {
+            totalCount
+          }
+          repositories(first: 100, ownerAffiliations: OWNER, orderBy: {direction: DESC, field: STARGAZERS}) {
+            totalCount
+            nodes {
+              name
+              stargazers {
+                totalCount
+              }
+            }
+          }
+        }
+      }
+      `,
       variables,
     },
     {
@@ -88,54 +64,8 @@ const fetcher = (variables, token) => {
   );
 };
 
-/**
+// https://github.com/anuraghazra/github-readme-stats/issues/92#issuecomment-661026467
- * Fetch stats information for a given username.
+// https://github.com/anuraghazra/github-readme-stats/pull/211/
- *
- * @param {string} username Github username.
- * @returns {Promise<import('../common/types').StatsFetcher>} GraphQL Stats object.
- *
- * @description This function supports multi-page fetching if the 'FETCH_MULTI_PAGE_STARS' environment variable is set to true.
- */
-const statsFetcher = async (username) => {
-  let stats;
-  let hasNextPage = true;
-  let endCursor = null;
-  while (hasNextPage) {
-    const variables = { login: username, first: 100, after: endCursor };
-    let res = await retryer(fetcher, variables);
-    if (res.data.errors) return res;
-
-    // Store stats data.
-    const repoNodes = res.data.data.user.repositories.nodes;
-    if (!stats) {
-      stats = res;
-    } else {
-      stats.data.data.user.repositories.nodes.push(...repoNodes);
-    }
-
-    // Disable multi page fetching on public Vercel instance due to rate limits.
-    const repoNodesWithStars = repoNodes.filter(
-      (node) => node.stargazers.totalCount !== 0,
-    );
-    hasNextPage =
-      process.env.FETCH_MULTI_PAGE_STARS === "true" &&
-      repoNodes.length === repoNodesWithStars.length &&
-      res.data.data.user.repositories.pageInfo.hasNextPage;
-    endCursor = res.data.data.user.repositories.pageInfo.endCursor;
-  }
-
-  return stats;
-};
-
-/**
- * Fetch all the commits for all the repositories of a given username.
- *
- * @param {*} username GitHub username.
- * @returns {Promise<number>} Total commits.
- *
- * @description Done like this because the GitHub API does not provide a way to fetch all the commits. See
- * #92#issuecomment-661026467 and #211 for more information.
- */
 const totalCommitsFetcher = async (username) => {
   if (!githubUsernameRegex.test(username)) {
     logger.log("Invalid username");
@@ -170,19 +100,17 @@ const totalCommitsFetcher = async (username) => {
 };
 
 /**
- * Fetch stats for a given username.
+ * @param {string} username
- *
+ * @param {boolean} count_private
- * @param {string} username GitHub username.
+ * @param {boolean} include_all_commits
- * @param {boolean} count_private Include private contributions.
+ * @returns {Promise<import("./types").StatsData>}
- * @param {boolean} include_all_commits Include all commits.
- * @returns {Promise<import("./types").StatsData>} Stats data.
  */
-const fetchStats = async (
+async function fetchStats(
   username,
   count_private = false,
   include_all_commits = false,
   exclude_repo = [],
-) => {
+) {
   if (!username) throw new MissingParamError(["username"]);
 
   const stats = {
@@ -195,26 +123,13 @@ const fetchStats = async (
     rank: { level: "C", score: 0 },
   };
 
-  let res = await statsFetcher(username);
+  let res = await retryer(fetcher, { login: username });
 
-  // Catch GraphQL errors.
   if (res.data.errors) {
     logger.error(res.data.errors);
-    if (res.data.errors[0].type === "NOT_FOUND") {
-      throw new CustomError(
-        res.data.errors[0].message || "Could not fetch user.",
-        CustomError.USER_NOT_FOUND,
-      );
-    }
-    if (res.data.errors[0].message) {
-      throw new CustomError(
-        wrapTextMultiline(res.data.errors[0].message, 90, 1)[0],
-        res.statusText,
-      );
-    }
     throw new CustomError(
-      "Something went wrong while trying to retrieve the stats data using the GraphQL API.",
+      res.data.errors[0].message || "Could not fetch user",
-      CustomError.GRAPHQL_ERROR,
+      CustomError.USER_NOT_FOUND,
     );
   }
 
@@ -270,7 +185,7 @@ const fetchStats = async (
   });
 
   return stats;
-};
+}
 
 export { fetchStats };
 export default fetchStats;

src/fetchers/top-languages-fetcher.js

@@ -1,19 +1,13 @@
 // @ts-check
+import * as dotenv from "dotenv";
 import { retryer } from "../common/retryer.js";
-import {
+import { logger, MissingParamError, request } from "../common/utils.js";
-  CustomError,
+
-  logger,
+dotenv.config();
-  MissingParamError,
-  request,
-  wrapTextMultiline,
-} from "../common/utils.js";
 
 /**
- * Top languages fetcher object.
+ * @param {import('Axios').AxiosRequestHeaders} variables
- *
+ * @param {string} token
- * @param {import('Axios').AxiosRequestHeaders} variables Fetcher variables.
- * @param {string} token GitHub token.
- * @returns {Promise<import('../common/types').StatsFetcherResponse>} Languages fetcher response.
  */
 const fetcher = (variables, token) => {
   return request(
@@ -48,18 +42,11 @@ const fetcher = (variables, token) => {
 };
 
 /**
- * Fetch top languages for a given username.
+ * @param {string} username
- *
+ * @param {string[]} exclude_repo
- * @param {string} username GitHub username.
+ * @returns {Promise<import("./types").TopLangData>}
- * @param {string[]} exclude_repo List of repositories to exclude.
- * @returns {Promise<import("./types").TopLangData>} Top languages data.
  */
-const fetchTopLanguages = async (
+async function fetchTopLanguages(username, exclude_repo = []) {
-  username,
-  exclude_repo = [],
-  size_weight = 1,
-  count_weight = 0,
-) => {
   if (!username) throw new MissingParamError(["username"]);
 
   const res = await retryer(fetcher, { login: username });
@@ -69,27 +56,6 @@ const fetchTopLanguages = async (
     throw Error(res.data.errors[0].message || "Could not fetch user");
   }
 
-  // Catch GraphQL errors.
-  if (res.data.errors) {
-    logger.error(res.data.errors);
-    if (res.data.errors[0].type === "NOT_FOUND") {
-      throw new CustomError(
-        res.data.errors[0].message || "Could not fetch user.",
-        CustomError.USER_NOT_FOUND,
-      );
-    }
-    if (res.data.errors[0].message) {
-      throw new CustomError(
-        wrapTextMultiline(res.data.errors[0].message, 90, 1)[0],
-        res.statusText,
-      );
-    }
-    throw new CustomError(
-      "Something went while trying to retrieve the language data using the GraphQL API.",
-      CustomError.GRAPHQL_ERROR,
-    );
-  }
-
   let repoNodes = res.data.data.user.repositories.nodes;
   let repoToHide = {};
 
@@ -106,8 +72,6 @@ const fetchTopLanguages = async (
     .sort((a, b) => b.size - a.size)
     .filter((name) => !repoToHide[name.name]);
 
-  let repoCount = 0;
-
   repoNodes = repoNodes
     .filter((node) => node.languages.edges.length > 0)
     // flatten the list of language nodes
@@ -118,14 +82,9 @@ const fetchTopLanguages = async (
 
       // if we already have the language in the accumulator
       // & the current language name is same as previous name
-      // add the size to the language size and increase repoCount.
+      // add the size to the language size.
       if (acc[prev.node.name] && prev.node.name === acc[prev.node.name].name) {
         langSize = prev.size + acc[prev.node.name].size;
-        repoCount += 1;
-      } else {
-        // reset repoCount to 1
-        // language must exist in at least one repo to be detected
-        repoCount = 1;
       }
       return {
         ...acc,
@@ -133,18 +92,10 @@ const fetchTopLanguages = async (
           name: prev.node.name,
           color: prev.node.color,
           size: langSize,
-          count: repoCount,
         },
       };
     }, {});
 
-  Object.keys(repoNodes).forEach((name) => {
-    // comparison index calculation
-    repoNodes[name].size =
-      Math.pow(repoNodes[name].size, size_weight) *
-      Math.pow(repoNodes[name].count, count_weight);
-  });
-
   const topLangs = Object.keys(repoNodes)
     .sort((a, b) => repoNodes[b].size - repoNodes[a].size)
     .reduce((result, key) => {
@@ -153,7 +104,7 @@ const fetchTopLanguages = async (
     }, {});
 
   return topLangs;
-};
+}
 
 export { fetchTopLanguages };
 export default fetchTopLanguages;

src/fetchers/wakatime-fetcher.js

@@ -2,10 +2,8 @@ import axios from "axios";
 import { MissingParamError } from "../common/utils.js";
 
 /**
- * WakaTime data fetcher.
+ * @param {{username: string, api_domain: string, range: string}} props
- *
+ * @returns {Promise<WakaTimeData>}
- * @param {{username: string, api_domain: string, range: string}} props Fetcher props.
- * @returns {Promise<WakaTimeData>} WakaTime data response.
  */
 const fetchWakatimeStats = async ({ username, api_domain, range }) => {
   if (!username) throw new MissingParamError(["username"]);

src/getStyles.js

@@ -1,9 +1,6 @@
 // @ts-check
 /**
- * Calculates progress along the boundary of the circle i.e it's circumference.
+ * @param {number} value
- *
- * @param {number} value The rank value to calculate progress for.
- * @returns {number} Progress value.
  */
 const calculateCircleProgress = (value) => {
   const radius = 40;
@@ -16,11 +13,9 @@ const calculateCircleProgress = (value) => {
 };
 
 /**
- * Retrieves the animation to display progress along the circumference of circle
- * from the beginning to the given value in a clockwise direction.
  *
- * @param {{progress: number}} progress The progress value to animate to.
+ * @param {{progress: number}} param0
- * @returns {string} Progress animation css.
+ * @returns
  */
 const getProgressAnimation = ({ progress }) => {
   return `
@@ -35,11 +30,6 @@ const getProgressAnimation = ({ progress }) => {
   `;
 };
 
-/**
- * Retrieves css animations for a card.
- *
- * @returns {string} Animation css.
- */
 const getAnimations = () => {
   return `
     /* Animations */
@@ -63,21 +53,18 @@ const getAnimations = () => {
 };
 
 /**
- * Retrieves CSS styles for a card.
+ * @param {{
- *
+ *  titleColor?: string | string[]
- * @param {Object[]} colors The colors to use for the card.
+ *  textColor?: string | string[]
- * @param {string} colors.titleColor The title color.
+ *  iconColor?: string | string[]
- * @param {string} colors.textColor The text color.
+ *  show_icons?: boolean;
- * @param {string} colors.iconColor The icon color.
+ *  progress?: number;
- * @param {boolean} colors.show_icons Whether to show icons.
+ * }} args
- * @param {number} colors.progress The progress value to animate to.
- * @returns {string} Card CSS styles.
  */
 const getStyles = ({
   titleColor,
   textColor,
   iconColor,
-  ringColor,
   show_icons,
   progress,
 }) => {
@@ -106,13 +93,13 @@ const getStyles = ({
     }
 
     .rank-circle-rim {
-      stroke: ${ringColor};
+      stroke: ${titleColor};
       fill: none;
       stroke-width: 6;
       opacity: 0.2;
     }
     .rank-circle {
-      stroke: ${ringColor};
+      stroke: ${titleColor};
       stroke-dasharray: 250;
       fill: none;
       stroke-width: 6;

src/index.js

@@ -1,3 +0,0 @@
-export * from "./common/index.js";
-export * from "./cards/index.js";
-export { getStyles, getAnimations } from "./getStyles.js";

src/translations.js

@@ -1,12 +1,5 @@
 import { encodeHTML } from "./common/utils.js";
 
-/**
- * Retrieves stat card labels in the available locales.
- *
- * @param {string} name The name of the locale.
- * @param {string} apostrophe Whether to use apostrophe or not.
- * @returns {Object} The locales object.
- */
 const statCardLocales = ({ name, apostrophe }) => {
   const encodedName = encodeHTML(name);
   return {
@@ -37,7 +30,7 @@ const statCardLocales = ({ name, apostrophe }) => {
       sk: `GitHub štatistiky používateľa ${encodedName}`,
       tr: `${encodedName} Hesabının GitHub Yıldızları`,
       pl: `Statystyki GitHub użytkownika ${encodedName}`,
-      uz: `${encodedName}ning GitHub'dagi statistikasi`,
+      uz: `${encodedName}ning Github'dagi statistikasi`,
       vi: `Thống Kê GitHub ${encodedName}`,
       se: `GitHubstatistik för ${encodedName}`,
     },
@@ -67,7 +60,7 @@ const statCardLocales = ({ name, apostrophe }) => {
       my: "Jumlah Bintang",
       sk: "Hviezdy",
       tr: "Toplam Yıldız",
-      pl: "Liczba otrzymanych gwiazdek",
+      pl: "Liczba Gwiazdek dostanych",
       uz: "Yulduzchalar",
       vi: "Tổng Số Sao",
       se: "Antal intjänade stjärnor",
@@ -160,7 +153,7 @@ const statCardLocales = ({ name, apostrophe }) => {
       my: "Jumlah Isu Dilaporkan",
       sk: "Všetky problémy",
       tr: "Toplam Hata",
-      pl: "Wszystkie problemy",
+      pl: "Wszystkie Issues",
       uz: "'Issue'lar",
       vi: "Tổng Số Vấn Đề",
       se: "Total antal issues",
@@ -322,7 +315,7 @@ const wakatimeCardLocales = {
     my: "Statistik Wakatime",
     sk: "Wakatime štatistika",
     tr: "Waketime İstatistikler",
-    pl: "Statystyki Wakatime",
+    pl: "statystyki Wakatime",
     vi: "Thống Kê Wakatime",
     se: "Wakatime statistik",
   },
@@ -361,15 +354,9 @@ const wakatimeCardLocales = {
 
 const availableLocales = Object.keys(repoCardLocales["repocard.archived"]);
 
-/**
+function isLocaleAvailable(locale) {
- * Checks whether the locale is available or not.
- *
- * @param {string} locale The locale to check.
- * @returns {boolean} Boolean specifying whether the locale is available or not.
- */
-const isLocaleAvailable = (locale) => {
   return availableLocales.includes(locale.toLowerCase());
-};
+}
 
 export {
   isLocaleAvailable,

tests/__snapshots__/renderWakatimeCard.test.js.snap

@@ -51,13 +51,13 @@ exports[`Test Render Wakatime Card should render correctly with compact layout 1
     }
 
     .rank-circle-rim {
-      stroke: undefined;
+      stroke: #2f80ed;
       fill: none;
       stroke-width: 6;
       opacity: 0.2;
     }
     .rank-circle {
-      stroke: undefined;
+      stroke: #2f80ed;
       stroke-dasharray: 250;
       fill: none;
       stroke-width: 6;
@@ -69,29 +69,7 @@ exports[`Test Render Wakatime Card should render correctly with compact layout 1
     }
     
   
-    @keyframes slideInAnimation {
-      from {
-        width: 0;
-      }
-      to {
-        width: calc(100%-100px);
-      }
-    }
-    @keyframes growWidthAnimation {
-      from {
-        width: 0;
-      }
-      to {
-        width: 100%;
-      }
-    }
     .lang-name { font: 400 11px 'Segoe UI', Ubuntu, Sans-Serif; fill: #434d58 }
-    #rect-mask rect{
-      animation: slideInAnimation 1s ease-in-out forwards;
-    }
-    .lang-progress{
-      animation: growWidthAnimation 0.6s ease-in-out forwards;
-    }
     
 
           
@@ -144,7 +122,7 @@ exports[`Test Render Wakatime Card should render correctly with compact layout 1
             data-testid="lang-progress"
             x="0"
             y="0"
-            width="415.61699999999996"
+            width="6.6495"
             height="8"
             fill="#858585"
           />
@@ -152,189 +130,9 @@ exports[`Test Render Wakatime Card should render correctly with compact layout 1
           <rect
             mask="url(#rect-mask)"
             data-testid="lang-progress"
-            x="415.61699999999996"
+            x="6.6495"
             y="0"
-            width="29.0625"
+            width="0.465"
-            height="8"
-            fill="#3178c6"
-          />
-        
-      
-    <g transform="translate(25, 25)">
-      <circle cx="5" cy="6" r="5" fill="#858585" />
-      <text data-testid="lang-name" x="15" y="10" class='lang-name'>
-        Other - 19 mins
-      </text>
-    </g>
-  
-    <g transform="translate(230, 25)">
-      <circle cx="5" cy="6" r="5" fill="#3178c6" />
-      <text data-testid="lang-name" x="15" y="10" class='lang-name'>
-        TypeScript - 1 min
-      </text>
-    </g>
-  
-    
-    </svg>
-  
-        </g>
-      </svg>
-    "
-`;
-
-exports[`Test Render Wakatime Card should render correctly with compact layout when langs_count is set 1`] = `
-"
-      <svg
-        width="495"
-        height="115"
-        viewBox="0 0 495 115"
-        fill="none"
-        xmlns="http://www.w3.org/2000/svg"
-        role="img"
-        aria-labelledby="descId"
-      >
-        <title id="titleId"></title>
-        <desc id="descId"></desc>
-        <style>
-          .header {
-            font: 600 18px 'Segoe UI', Ubuntu, Sans-Serif;
-            fill: #2f80ed;
-            animation: fadeInAnimation 0.8s ease-in-out forwards;
-          }
-          @supports(-moz-appearance: auto) {
-            /* Selector detects Firefox */
-            .header { font-size: 15.5px; }
-          }
-          
-    
-    .stat {
-      font: 600 14px 'Segoe UI', Ubuntu, "Helvetica Neue", Sans-Serif; fill: #434d58;
-    }
-    @supports(-moz-appearance: auto) {
-      /* Selector detects Firefox */
-      .stat { font-size:12px; }
-    }
-    .stagger {
-      opacity: 0;
-      animation: fadeInAnimation 0.3s ease-in-out forwards;
-    }
-    .rank-text {
-      font: 800 24px 'Segoe UI', Ubuntu, Sans-Serif; fill: #434d58;
-      animation: scaleInAnimation 0.3s ease-in-out forwards;
-    }
-    
-    .not_bold { font-weight: 400 }
-    .bold { font-weight: 700 }
-    .icon {
-      fill: #4c71f2;
-      display: none;
-    }
-
-    .rank-circle-rim {
-      stroke: undefined;
-      fill: none;
-      stroke-width: 6;
-      opacity: 0.2;
-    }
-    .rank-circle {
-      stroke: undefined;
-      stroke-dasharray: 250;
-      fill: none;
-      stroke-width: 6;
-      stroke-linecap: round;
-      opacity: 0.8;
-      transform-origin: -10px 8px;
-      transform: rotate(-90deg);
-      animation: rankAnimation 1s forwards ease-in-out;
-    }
-    
-  
-    @keyframes slideInAnimation {
-      from {
-        width: 0;
-      }
-      to {
-        width: calc(100%-100px);
-      }
-    }
-    @keyframes growWidthAnimation {
-      from {
-        width: 0;
-      }
-      to {
-        width: 100%;
-      }
-    }
-    .lang-name { font: 400 11px 'Segoe UI', Ubuntu, Sans-Serif; fill: #434d58 }
-    #rect-mask rect{
-      animation: slideInAnimation 1s ease-in-out forwards;
-    }
-    .lang-progress{
-      animation: growWidthAnimation 0.6s ease-in-out forwards;
-    }
-    
-
-          
-          
-        </style>
-
-        
-
-        <rect
-          data-testid="card-bg"
-          x="0.5"
-          y="0.5"
-          rx="4.5"
-          height="99%"
-          stroke="#e4e2e2"
-          width="494"
-          fill="#fffefe"
-          stroke-opacity="1"
-        />
-
-        
-      <g
-        data-testid="card-title"
-        transform="translate(25, 35)"
-      >
-        <g transform="translate(0, 0)">
-      <text
-        x="0"
-        y="0"
-        class="header"
-        data-testid="header"
-      >Wakatime Stats</text>
-    </g>
-      </g>
-    
-
-        <g
-          data-testid="main-card-body"
-          transform="translate(0, 55)"
-        >
-          
-    <svg x="0" y="0" width="100%">
-      
-      <mask id="rect-mask">
-      <rect x="25" y="0" width="440" height="8" fill="white" rx="5" />
-      </mask>
-      
-          <rect
-            mask="url(#rect-mask)"
-            data-testid="lang-progress"
-            x="0"
-            y="0"
-            width="436.4025"
-            height="8"
-            fill="#858585"
-          />
-        
-          <rect
-            mask="url(#rect-mask)"
-            data-testid="lang-progress"
-            x="436.4025"
-            y="0"
-            width="30.503999999999998"
             height="8"
             fill="#3178c6"
           />

tests/api.test.js

@@ -25,7 +25,7 @@ stats.rank = calculateRank({
   issues: stats.totalIssues,
 });
 
-const data_stats = {
+const data = {
   data: {
     user: {
       name: stats.name,
@@ -41,10 +41,6 @@ const data_stats = {
       repositories: {
         totalCount: 1,
         nodes: [{ stargazers: { totalCount: 100 } }],
-        pageInfo: {
-          hasNextPage: false,
-          cursor: "cursor",
-        },
       },
     },
   },
@@ -74,7 +70,7 @@ const faker = (query, data) => {
     setHeader: jest.fn(),
     send: jest.fn(),
   };
-  mock.onPost("https://api.github.com/graphql").replyOnce(200, data);
+  mock.onPost("https://api.github.com/graphql").reply(200, data);
 
   return { req, res };
 };
@@ -85,7 +81,7 @@ afterEach(() => {
 
 describe("Test /api/", () => {
   it("should test the request", async () => {
-    const { req, res } = faker({}, data_stats);
+    const { req, res } = faker({}, data);
 
     await api(req, res);
 
@@ -120,7 +116,7 @@ describe("Test /api/", () => {
         text_color: "fff",
         bg_color: "fff",
       },
-      data_stats,
+      data,
     );
 
     await api(req, res);
@@ -141,90 +137,56 @@ describe("Test /api/", () => {
   });
 
   it("should have proper cache", async () => {
-    const { req, res } = faker({}, data_stats);
+    const { req, res } = faker({}, data);
+    mock.onPost("https://api.github.com/graphql").reply(200, data);
 
     await api(req, res);
 
     expect(res.setHeader.mock.calls).toEqual([
       ["Content-Type", "image/svg+xml"],
-      [
+      ["Cache-Control", `public, max-age=${CONSTANTS.FOUR_HOURS}`],
-        "Cache-Control",
-        `max-age=${CONSTANTS.FOUR_HOURS / 2}, s-maxage=${
-          CONSTANTS.FOUR_HOURS
-        }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-      ],
     ]);
   });
 
   it("should set proper cache", async () => {
-    const { req, res } = faker({ cache_seconds: 15000 }, data_stats);
+    const { req, res } = faker({ cache_seconds: 15000 }, data);
     await api(req, res);
 
     expect(res.setHeader.mock.calls).toEqual([
       ["Content-Type", "image/svg+xml"],
-      [
+      ["Cache-Control", `public, max-age=${15000}`],
-        "Cache-Control",
-        `max-age=7500, s-maxage=${15000}, stale-while-revalidate=${
-          CONSTANTS.ONE_DAY
-        }`,
-      ],
-    ]);
-  });
-
-  it("should not store cache when error", async () => {
-    const { req, res } = faker({}, error);
-    await api(req, res);
-
-    expect(res.setHeader.mock.calls).toEqual([
-      ["Content-Type", "image/svg+xml"],
-      ["Cache-Control", `no-cache, no-store, must-revalidate`],
     ]);
   });
 
   it("should set proper cache with clamped values", async () => {
     {
-      let { req, res } = faker({ cache_seconds: 200000 }, data_stats);
+      let { req, res } = faker({ cache_seconds: 200000 }, data);
       await api(req, res);
 
       expect(res.setHeader.mock.calls).toEqual([
         ["Content-Type", "image/svg+xml"],
-        [
+        ["Cache-Control", `public, max-age=${CONSTANTS.ONE_DAY}`],
-          "Cache-Control",
-          `max-age=${CONSTANTS.ONE_DAY / 2}, s-maxage=${
-            CONSTANTS.ONE_DAY
-          }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-        ],
       ]);
     }
 
     // note i'm using block scoped vars
     {
-      let { req, res } = faker({ cache_seconds: 0 }, data_stats);
+      let { req, res } = faker({ cache_seconds: 0 }, data);
       await api(req, res);
 
       expect(res.setHeader.mock.calls).toEqual([
         ["Content-Type", "image/svg+xml"],
-        [
+        ["Cache-Control", `public, max-age=${CONSTANTS.FOUR_HOURS}`],
-          "Cache-Control",
-          `max-age=${CONSTANTS.FOUR_HOURS / 2}, s-maxage=${
-            CONSTANTS.FOUR_HOURS
-          }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-        ],
       ]);
     }
 
     {
-      let { req, res } = faker({ cache_seconds: -10000 }, data_stats);
+      let { req, res } = faker({ cache_seconds: -10000 }, data);
       await api(req, res);
 
       expect(res.setHeader.mock.calls).toEqual([
         ["Content-Type", "image/svg+xml"],
-        [
+        ["Cache-Control", `public, max-age=${CONSTANTS.FOUR_HOURS}`],
-          "Cache-Control",
-          `max-age=${CONSTANTS.FOUR_HOURS / 2}, s-maxage=${
-            CONSTANTS.FOUR_HOURS
-          }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-        ],
       ]);
     }
   });
@@ -235,7 +197,7 @@ describe("Test /api/", () => {
         username: "anuraghazra",
         count_private: true,
       },
-      data_stats,
+      data,
     );
 
     await api(req, res);
@@ -260,39 +222,4 @@ describe("Test /api/", () => {
       ),
     );
   });
-
-  it("should allow changing ring_color", async () => {
-    const { req, res } = faker(
-      {
-        username: "anuraghazra",
-        hide: "issues,prs,contribs",
-        show_icons: true,
-        hide_border: true,
-        line_height: 100,
-        title_color: "fff",
-        ring_color: "0000ff",
-        icon_color: "fff",
-        text_color: "fff",
-        bg_color: "fff",
-      },
-      data_stats,
-    );
-
-    await api(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "image/svg+xml");
-    expect(res.send).toBeCalledWith(
-      renderStatsCard(stats, {
-        hide: ["issues", "prs", "contribs"],
-        show_icons: true,
-        hide_border: true,
-        line_height: 100,
-        title_color: "fff",
-        ring_color: "0000ff",
-        icon_color: "fff",
-        text_color: "fff",
-        bg_color: "fff",
-      }),
-    );
-  });
 });

tests/calculateRank.test.js

@@ -13,6 +13,6 @@ describe("Test calculateRank", () => {
         prs: 300,
         issues: 200,
       }),
-    ).toStrictEqual({ level: "A+", score: 49.25629684876535 });
+    ).toStrictEqual({ level: "A+", score: 49.16605417270399 });
   });
 });

tests/e2e/e2e.test.js

@@ -11,22 +11,27 @@ import { renderStatsCard } from "../../src/cards/stats-card.js";
 import { renderTopLanguages } from "../../src/cards/top-languages-card.js";
 import { renderWakatimeCard } from "../../src/cards/wakatime-card.js";
 
-const REPO = "curly-fiesta";
+// Script variables
-const USER = "catelinemnemosyne";
+const REPO = "dummy-cra";
+const USER = "grsdummy";
 const STATS_DATA = {
-  name: "Cateline Mnemosyne",
+  name: "grsdummy",
   totalPRs: 2,
-  totalCommits: 8,
+  totalCommits: 2,
   totalIssues: 1,
   totalStars: 1,
-  contributedTo: 1,
+  contributedTo: 2,
   rank: {
     level: "A+",
-    score: 50.88831151384285,
+    score: 51.01013099671447,
   },
 };
-
 const LANGS_DATA = {
+  TypeScript: {
+    color: "#3178c6",
+    name: "TypeScript",
+    size: 2049,
+  },
   HTML: {
     color: "#e34c26",
     name: "HTML",
@@ -37,19 +42,18 @@ const LANGS_DATA = {
     name: "CSS",
     size: 930,
   },
-  JavaScript: {
+  Python: {
-    color: "#f1e05a",
+    color: "#3572A5",
-    name: "JavaScript",
+    name: "Python",
-    size: 1912,
+    size: 671,
   },
 };
-
 const WAKATIME_DATA = {
   human_readable_range: "last week",
   is_already_updating: false,
-  is_coding_activity_visible: true,
+  is_coding_activity_visible: false,
   is_including_today: false,
-  is_other_usage_visible: true,
+  is_other_usage_visible: false,
   is_stuck: false,
   is_up_to_date: false,
   is_up_to_date_pending_future: false,
@@ -57,31 +61,28 @@ const WAKATIME_DATA = {
   range: "last_7_days",
   status: "pending_update",
   timeout: 15,
-  username: USER,
+  username: "grsdummy",
   writes_only: false,
 };
-
 const REPOSITORY_DATA = {
-  name: REPO,
+  name: "dummy-cra",
-  nameWithOwner: `${USER}/cra-test`,
+  nameWithOwner: "grsdummy/dummy-cra",
   isPrivate: false,
   isArchived: false,
   isTemplate: false,
   stargazers: {
     totalCount: 1,
   },
-  description: "Simple cra test repo.",
+  description: "Dummy create react app.",
   primaryLanguage: {
-    color: "#f1e05a",
+    color: "#3178c6",
-    id: "MDg6TGFuZ3VhZ2UxNDA=",
+    id: "MDg6TGFuZ3VhZ2UyODc=",
-    name: "JavaScript",
+    name: "TypeScript",
   },
   forkCount: 0,
   starCount: 1,
 };
 
-const CACHE_BURST_STRING = `v=${new Date().getTime()}`;
-
 describe("Fetch Cards", () => {
   let VERCEL_PREVIEW_URL;
 
@@ -103,24 +104,19 @@ describe("Fetch Cards", () => {
 
     // Get the Vercel preview stats card response.
     const serverStatsSvg = await axios.get(
-      `${VERCEL_PREVIEW_URL}/api?username=${USER}&${CACHE_BURST_STRING}`,
+      `${VERCEL_PREVIEW_URL}/api?username=${USER}`,
     );
 
     // Check if stats card from deployment matches the stats card from local.
     expect(serverStatsSvg.data).toEqual(localStatsCardSVG);
-  }, 7000);
+  });
 
   test("retrieve language card", async () => {
     expect(VERCEL_PREVIEW_URL).toBeDefined();
 
     // Check if the Vercel preview instance language card function is up and running.
-    console.log(
-      `${VERCEL_PREVIEW_URL}/api/top-langs/?username=${USER}&${CACHE_BURST_STRING}`,
-    );
     await expect(
-      axios.get(
+      axios.get(`${VERCEL_PREVIEW_URL}/api/top-langs/?username=${USER}`),
-        `${VERCEL_PREVIEW_URL}/api/top-langs/?username=${USER}&${CACHE_BURST_STRING}`,
-      ),
     ).resolves.not.toThrow();
 
     // Get local language card.
@@ -128,7 +124,7 @@ describe("Fetch Cards", () => {
 
     // Get the Vercel preview language card response.
     const severLanguageSVG = await axios.get(
-      `${VERCEL_PREVIEW_URL}/api/top-langs/?username=${USER}&${CACHE_BURST_STRING}`,
+      `${VERCEL_PREVIEW_URL}/api/top-langs/?username=${USER}`,
     );
 
     // Check if language card from deployment matches the local language card.
@@ -148,7 +144,7 @@ describe("Fetch Cards", () => {
 
     // Get the Vercel preview WakaTime card response.
     const serverWakaTimeSvg = await axios.get(
-      `${VERCEL_PREVIEW_URL}/api/wakatime?username=${USER}&${CACHE_BURST_STRING}`,
+      `${VERCEL_PREVIEW_URL}/api/wakatime?username=${USER}`,
     );
 
     // Check if WakaTime card from deployment matches the local WakaTime card.
@@ -160,9 +156,7 @@ describe("Fetch Cards", () => {
 
     // Check if the Vercel preview instance Repo function is up and running.
     await expect(
-      axios.get(
+      axios.get(`${VERCEL_PREVIEW_URL}/api/pin/?username=${USER}&repo=${REPO}`),
-        `${VERCEL_PREVIEW_URL}/api/pin/?username=${USER}&repo=${REPO}&${CACHE_BURST_STRING}`,
-      ),
     ).resolves.not.toThrow();
 
     // Get local repo card.
@@ -170,7 +164,7 @@ describe("Fetch Cards", () => {
 
     // Get the Vercel preview repo card response.
     const serverRepoSvg = await axios.get(
-      `${VERCEL_PREVIEW_URL}/api/pin/?username=${USER}&repo=${REPO}&${CACHE_BURST_STRING}`,
+      `${VERCEL_PREVIEW_URL}/api/pin/?username=${USER}&repo=${REPO}`,
     );
 
     // Check if Repo card from deployment matches the local Repo card.

tests/fetchRepo.test.js

@@ -23,7 +23,6 @@ const data_user = {
     organization: null,
   },
 };
-
 const data_org = {
   data: {
     user: null,

tests/fetchStats.test.js

@@ -4,8 +4,7 @@ import MockAdapter from "axios-mock-adapter";
 import { calculateRank } from "../src/calculateRank.js";
 import { fetchStats } from "../src/fetchers/stats-fetcher.js";
 
-// Test parameters.
+const data = {
-const data_stats = {
   data: {
     user: {
       name: "Anurag Hazra",
@@ -24,48 +23,9 @@ const data_stats = {
           { name: "test-repo-1", stargazers: { totalCount: 100 } },
           { name: "test-repo-2", stargazers: { totalCount: 100 } },
           { name: "test-repo-3", stargazers: { totalCount: 100 } },
-        ],
-        pageInfo: {
-          hasNextPage: true,
-          cursor: "cursor",
-        },
-      },
-    },
-  },
-};
-
-const data_repo = {
-  data: {
-    user: {
-      repositories: {
-        nodes: [
           { name: "test-repo-4", stargazers: { totalCount: 50 } },
           { name: "test-repo-5", stargazers: { totalCount: 50 } },
         ],
-        pageInfo: {
-          hasNextPage: false,
-          cursor: "cursor",
-        },
-      },
-    },
-  },
-};
-
-const data_repo_zero_stars = {
-  data: {
-    user: {
-      repositories: {
-        nodes: [
-          { name: "test-repo-1", stargazers: { totalCount: 100 } },
-          { name: "test-repo-2", stargazers: { totalCount: 100 } },
-          { name: "test-repo-3", stargazers: { totalCount: 100 } },
-          { name: "test-repo-4", stargazers: { totalCount: 0 } },
-          { name: "test-repo-5", stargazers: { totalCount: 0 } },
-        ],
-        pageInfo: {
-          hasNextPage: true,
-          cursor: "cursor",
-        },
       },
     },
   },
@@ -84,161 +44,13 @@ const error = {
 
 const mock = new MockAdapter(axios);
 
-beforeEach(() => {
-  process.env.FETCH_MULTI_PAGE_STARS = "false"; // Set to `false` to fetch only one page of stars.
-  mock
-    .onPost("https://api.github.com/graphql")
-    .replyOnce(200, data_stats)
-    .onPost("https://api.github.com/graphql")
-    .replyOnce(200, data_repo);
-});
-
 afterEach(() => {
   mock.reset();
 });
 
 describe("Test fetchStats", () => {
   it("should fetch correct stats", async () => {
-    let stats = await fetchStats("anuraghazra");
+    mock.onPost("https://api.github.com/graphql").reply(200, data);
-    const rank = calculateRank({
-      totalCommits: 100,
-      totalRepos: 5,
-      followers: 100,
-      contributions: 61,
-      stargazers: 300,
-      prs: 300,
-      issues: 200,
-    });
-
-    expect(stats).toStrictEqual({
-      contributedTo: 61,
-      name: "Anurag Hazra",
-      totalCommits: 100,
-      totalIssues: 200,
-      totalPRs: 300,
-      totalStars: 300,
-      rank,
-    });
-  });
-
-  it("should stop fetching when there are repos with zero stars", async () => {
-    mock.reset();
-    mock
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(200, data_stats)
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(200, data_repo_zero_stars);
-
-    let stats = await fetchStats("anuraghazra");
-    const rank = calculateRank({
-      totalCommits: 100,
-      totalRepos: 5,
-      followers: 100,
-      contributions: 61,
-      stargazers: 300,
-      prs: 300,
-      issues: 200,
-    });
-
-    expect(stats).toStrictEqual({
-      contributedTo: 61,
-      name: "Anurag Hazra",
-      totalCommits: 100,
-      totalIssues: 200,
-      totalPRs: 300,
-      totalStars: 300,
-      rank,
-    });
-  });
-
-  it("should throw error", async () => {
-    mock.reset();
-    mock.onPost("https://api.github.com/graphql").reply(200, error);
-
-    await expect(fetchStats("anuraghazra")).rejects.toThrow(
-      "Could not resolve to a User with the login of 'noname'.",
-    );
-  });
-
-  it("should fetch and add private contributions", async () => {
-    let stats = await fetchStats("anuraghazra", true);
-    const rank = calculateRank({
-      totalCommits: 150,
-      totalRepos: 5,
-      followers: 100,
-      contributions: 61,
-      stargazers: 300,
-      prs: 300,
-      issues: 200,
-    });
-
-    expect(stats).toStrictEqual({
-      contributedTo: 61,
-      name: "Anurag Hazra",
-      totalCommits: 150,
-      totalIssues: 200,
-      totalPRs: 300,
-      totalStars: 300,
-      rank,
-    });
-  });
-
-  it("should fetch total commits", async () => {
-    mock
-      .onGet("https://api.github.com/search/commits?q=author:anuraghazra")
-      .reply(200, { total_count: 1000 });
-
-    let stats = await fetchStats("anuraghazra", true, true);
-    const rank = calculateRank({
-      totalCommits: 1050,
-      totalRepos: 5,
-      followers: 100,
-      contributions: 61,
-      stargazers: 300,
-      prs: 300,
-      issues: 200,
-    });
-
-    expect(stats).toStrictEqual({
-      contributedTo: 61,
-      name: "Anurag Hazra",
-      totalCommits: 1050,
-      totalIssues: 200,
-      totalPRs: 300,
-      totalStars: 300,
-      rank,
-    });
-  });
-
-  it("should exclude stars of the `test-repo-1` repository", async () => {
-    mock
-      .onGet("https://api.github.com/search/commits?q=author:anuraghazra")
-      .reply(200, { total_count: 1000 });
-
-    let stats = await fetchStats("anuraghazra", true, true, ["test-repo-1"]);
-    const rank = calculateRank({
-      totalCommits: 1050,
-      totalRepos: 5,
-      followers: 100,
-      contributions: 61,
-      stargazers: 200,
-      prs: 300,
-      issues: 200,
-    });
-
-    expect(stats).toStrictEqual({
-      contributedTo: 61,
-      name: "Anurag Hazra",
-      totalCommits: 1050,
-      totalIssues: 200,
-      totalPRs: 300,
-      totalStars: 200,
-      rank,
-    });
-  });
-
-  it("should fetch two pages of stars if 'FETCH_MULTI_PAGE_STARS' env variable is set to `true`", async () => {
-    process.env.FETCH_MULTI_PAGE_STARS = true;
 
     let stats = await fetchStats("anuraghazra");
     const rank = calculateRank({
@@ -262,16 +74,24 @@ describe("Test fetchStats", () => {
     });
   });
 
-  it("should fetch one page of stars if 'FETCH_MULTI_PAGE_STARS' env variable is set to `false`", async () => {
+  it("should throw error", async () => {
-    process.env.FETCH_MULTI_PAGE_STARS = "false";
+    mock.onPost("https://api.github.com/graphql").reply(200, error);
 
-    let stats = await fetchStats("anuraghazra");
+    await expect(fetchStats("anuraghazra")).rejects.toThrow(
+      "Could not resolve to a User with the login of 'noname'.",
+    );
+  });
+
+  it("should fetch and add private contributions", async () => {
+    mock.onPost("https://api.github.com/graphql").reply(200, data);
+
+    let stats = await fetchStats("anuraghazra", true);
     const rank = calculateRank({
-      totalCommits: 100,
+      totalCommits: 150,
       totalRepos: 5,
       followers: 100,
       contributions: 61,
-      stargazers: 300,
+      stargazers: 400,
       prs: 300,
       issues: 200,
     });
@@ -279,20 +99,51 @@ describe("Test fetchStats", () => {
     expect(stats).toStrictEqual({
       contributedTo: 61,
       name: "Anurag Hazra",
-      totalCommits: 100,
+      totalCommits: 150,
       totalIssues: 200,
       totalPRs: 300,
-      totalStars: 300,
+      totalStars: 400,
       rank,
     });
   });
 
-  it("should fetch one page of stars if 'FETCH_MULTI_PAGE_STARS' env variable is not set", async () => {
+  it("should fetch total commits", async () => {
-    process.env.FETCH_MULTI_PAGE_STARS = undefined;
+    mock.onPost("https://api.github.com/graphql").reply(200, data);
+    mock
+      .onGet("https://api.github.com/search/commits?q=author:anuraghazra")
+      .reply(200, { total_count: 1000 });
 
-    let stats = await fetchStats("anuraghazra");
+    let stats = await fetchStats("anuraghazra", true, true);
     const rank = calculateRank({
-      totalCommits: 100,
+      totalCommits: 1050,
+      totalRepos: 5,
+      followers: 100,
+      contributions: 61,
+      stargazers: 400,
+      prs: 300,
+      issues: 200,
+    });
+
+    expect(stats).toStrictEqual({
+      contributedTo: 61,
+      name: "Anurag Hazra",
+      totalCommits: 1050,
+      totalIssues: 200,
+      totalPRs: 300,
+      totalStars: 400,
+      rank,
+    });
+  });
+
+  it("should exclude stars of the `test-repo-1` repository", async () => {
+    mock.onPost("https://api.github.com/graphql").reply(200, data);
+    mock
+      .onGet("https://api.github.com/search/commits?q=author:anuraghazra")
+      .reply(200, { total_count: 1000 });
+
+    let stats = await fetchStats("anuraghazra", true, true, ["test-repo-1"]);
+    const rank = calculateRank({
+      totalCommits: 1050,
       totalRepos: 5,
       followers: 100,
       contributions: 61,
@@ -304,7 +155,7 @@ describe("Test fetchStats", () => {
     expect(stats).toStrictEqual({
       contributedTo: 61,
       name: "Anurag Hazra",
-      totalCommits: 100,
+      totalCommits: 1050,
       totalIssues: 200,
       totalPRs: 300,
       totalStars: 300,

tests/fetchTopLanguages.test.js

@@ -60,22 +60,20 @@ const error = {
 };
 
 describe("FetchTopLanguages", () => {
-  it("should fetch correct language data while using the new calculation", async () => {
+  it("should fetch correct language data", async () => {
     mock.onPost("https://api.github.com/graphql").reply(200, data_langs);
 
-    let repo = await fetchTopLanguages("anuraghazra", [], 0.5, 0.5);
+    let repo = await fetchTopLanguages("anuraghazra");
     expect(repo).toStrictEqual({
       HTML: {
         color: "#0f0",
-        count: 2,
         name: "HTML",
-        size: 20.000000000000004,
+        size: 200,
       },
       javascript: {
         color: "#0ff",
-        count: 2,
         name: "javascript",
-        size: 20.000000000000004,
+        size: 200,
       },
     });
   });
@@ -87,59 +85,17 @@ describe("FetchTopLanguages", () => {
     expect(repo).toStrictEqual({
       HTML: {
         color: "#0f0",
-        count: 1,
         name: "HTML",
         size: 100,
       },
       javascript: {
         color: "#0ff",
-        count: 2,
         name: "javascript",
         size: 200,
       },
     });
   });
 
-  it("should fetch correct language data while using the old calculation", async () => {
-    mock.onPost("https://api.github.com/graphql").reply(200, data_langs);
-
-    let repo = await fetchTopLanguages("anuraghazra", [], 1, 0);
-    expect(repo).toStrictEqual({
-      HTML: {
-        color: "#0f0",
-        count: 2,
-        name: "HTML",
-        size: 200,
-      },
-      javascript: {
-        color: "#0ff",
-        count: 2,
-        name: "javascript",
-        size: 200,
-      },
-    });
-  });
-
-  it("should rank languages by the number of repositories they appear in", async () => {
-    mock.onPost("https://api.github.com/graphql").reply(200, data_langs);
-
-    let repo = await fetchTopLanguages("anuraghazra", [], 0, 1);
-    expect(repo).toStrictEqual({
-      HTML: {
-        color: "#0f0",
-        count: 2,
-        name: "HTML",
-        size: 2,
-      },
-      javascript: {
-        color: "#0ff",
-        count: 2,
-        name: "javascript",
-        size: 2,
-      },
-    });
-  });
-
   it("should throw error", async () => {
     mock.onPost("https://api.github.com/graphql").reply(200, error);
 

tests/pat-info.test.js

@@ -1,244 +0,0 @@
-/**
- * @file Tests for the status/pat-info cloud function.
- */
-import dotenv from "dotenv";
-dotenv.config();
-
-import { jest } from "@jest/globals";
-import axios from "axios";
-import MockAdapter from "axios-mock-adapter";
-import patInfo, { RATE_LIMIT_SECONDS } from "../api/status/pat-info.js";
-
-const mock = new MockAdapter(axios);
-
-const successData = {
-  data: {
-    rateLimit: {
-      remaining: 4986,
-    },
-  },
-};
-
-const faker = (query) => {
-  const req = {
-    query: { ...query },
-  };
-  const res = {
-    setHeader: jest.fn(),
-    send: jest.fn(),
-  };
-
-  return { req, res };
-};
-
-const rate_limit_error = {
-  errors: [
-    {
-      type: "RATE_LIMITED",
-      message: "API rate limit exceeded for user ID.",
-    },
-  ],
-  data: {
-    rateLimit: {
-      resetAt: Date.now(),
-    },
-  },
-};
-
-const other_error = {
-  errors: [
-    {
-      type: "SOME_ERROR",
-      message: "This is a error",
-    },
-  ],
-};
-
-const bad_credentials_error = {
-  message: "Bad credentials",
-};
-
-afterEach(() => {
-  mock.reset();
-});
-
-describe("Test /api/status/pat-info", () => {
-  beforeAll(() => {
-    // reset patenv first so that dotenv doesn't populate them with local envs
-    process.env = {};
-    process.env.PAT_1 = "testPAT1";
-    process.env.PAT_2 = "testPAT2";
-    process.env.PAT_3 = "testPAT3";
-    process.env.PAT_4 = "testPAT4";
-  });
-
-  it("should return only 'validPATs' if all PATs are valid", async () => {
-    mock
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(200, rate_limit_error)
-      .onPost("https://api.github.com/graphql")
-      .reply(200, successData);
-
-    const { req, res } = faker({}, {});
-    await patInfo(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(
-      JSON.stringify(
-        {
-          validPATs: ["PAT_2", "PAT_3", "PAT_4"],
-          expiredPATs: [],
-          exhaustedPATs: ["PAT_1"],
-          suspendedPATs: [],
-          errorPATs: [],
-          details: {
-            PAT_1: {
-              status: "exhausted",
-              remaining: 0,
-              resetIn: "0 minutes",
-            },
-            PAT_2: {
-              status: "valid",
-              remaining: 4986,
-            },
-            PAT_3: {
-              status: "valid",
-              remaining: 4986,
-            },
-            PAT_4: {
-              status: "valid",
-              remaining: 4986,
-            },
-          },
-        },
-        null,
-        2,
-      ),
-    );
-  });
-
-  it("should return `errorPATs` if a PAT causes an error to be thrown", async () => {
-    mock
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(200, other_error)
-      .onPost("https://api.github.com/graphql")
-      .reply(200, successData);
-
-    const { req, res } = faker({}, {});
-    await patInfo(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(
-      JSON.stringify(
-        {
-          validPATs: ["PAT_2", "PAT_3", "PAT_4"],
-          expiredPATs: [],
-          exhaustedPATs: [],
-          suspendedPATs: [],
-          errorPATs: ["PAT_1"],
-          details: {
-            PAT_1: {
-              status: "error",
-              error: {
-                type: "SOME_ERROR",
-                message: "This is a error",
-              },
-            },
-            PAT_2: {
-              status: "valid",
-              remaining: 4986,
-            },
-            PAT_3: {
-              status: "valid",
-              remaining: 4986,
-            },
-            PAT_4: {
-              status: "valid",
-              remaining: 4986,
-            },
-          },
-        },
-        null,
-        2,
-      ),
-    );
-  });
-
-  it("should return `expiredPaths` if a PAT returns a 'Bad credentials' error", async () => {
-    mock
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(404, bad_credentials_error)
-      .onPost("https://api.github.com/graphql")
-      .reply(200, successData);
-
-    const { req, res } = faker({}, {});
-    await patInfo(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(
-      JSON.stringify(
-        {
-          validPATs: ["PAT_2", "PAT_3", "PAT_4"],
-          expiredPATs: ["PAT_1"],
-          exhaustedPATs: [],
-          suspendedPATs: [],
-          errorPATs: [],
-          details: {
-            PAT_1: {
-              status: "expired",
-            },
-            PAT_2: {
-              status: "valid",
-              remaining: 4986,
-            },
-            PAT_3: {
-              status: "valid",
-              remaining: 4986,
-            },
-            PAT_4: {
-              status: "valid",
-              remaining: 4986,
-            },
-          },
-        },
-        null,
-        2,
-      ),
-    );
-  });
-
-  it("should throw an error if something goes wrong", async () => {
-    mock.onPost("https://api.github.com/graphql").networkError();
-
-    const { req, res } = faker({}, {});
-    await patInfo(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith("Something went wrong: Network Error");
-  });
-
-  it("should have proper cache when no error is thrown", async () => {
-    mock.onPost("https://api.github.com/graphql").reply(200, successData);
-
-    const { req, res } = faker({}, {});
-    await patInfo(req, res);
-
-    expect(res.setHeader.mock.calls).toEqual([
-      ["Content-Type", "application/json"],
-      ["Cache-Control", `max-age=0, s-maxage=${RATE_LIMIT_SECONDS}`],
-    ]);
-  });
-
-  it("should have proper cache when error is thrown", async () => {
-    mock.reset();
-    mock.onPost("https://api.github.com/graphql").networkError();
-
-    const { req, res } = faker({}, {});
-    await patInfo(req, res);
-
-    expect(res.setHeader.mock.calls).toEqual([
-      ["Content-Type", "application/json"],
-      ["Cache-Control", "no-store"],
-    ]);
-  });
-});

tests/renderStatsCard.test.js

@@ -10,17 +10,17 @@ import "@testing-library/jest-dom";
 
 import { themes } from "../themes/index.js";
 
-const stats = {
-  name: "Anurag Hazra",
-  totalStars: 100,
-  totalCommits: 200,
-  totalIssues: 300,
-  totalPRs: 400,
-  contributedTo: 500,
-  rank: { level: "A+", score: 40 },
-};
-
 describe("Test renderStatsCard", () => {
+  const stats = {
+    name: "Anurag Hazra",
+    totalStars: 100,
+    totalCommits: 200,
+    totalIssues: 300,
+    totalPRs: 400,
+    contributedTo: 500,
+    rank: { level: "A+", score: 40 },
+  };
+
   it("should render correctly", () => {
     document.body.innerHTML = renderStatsCard(stats);
 
@@ -78,17 +78,16 @@ describe("Test renderStatsCard", () => {
 
   it("should render with custom width set", () => {
     document.body.innerHTML = renderStatsCard(stats);
-    expect(document.querySelector("svg")).toHaveAttribute("width", "450");
+    expect(document.querySelector("svg")).toHaveAttribute("width", "495");
 
-    document.body.innerHTML = renderStatsCard(stats, { card_width: 500 });
+    document.body.innerHTML = renderStatsCard(stats, { card_width: 400 });
-    expect(document.querySelector("svg")).toHaveAttribute("width", "500");
+    expect(document.querySelector("svg")).toHaveAttribute("width", "400");
   });
 
   it("should render with custom width set and limit minimum width", () => {
     document.body.innerHTML = renderStatsCard(stats, { card_width: 1 });
-    expect(document.querySelector("svg")).toHaveAttribute("width", "420");
+    expect(document.querySelector("svg")).toHaveAttribute("width", "340");
 
-    // Test default minimum card width without rank circle.
     document.body.innerHTML = renderStatsCard(stats, {
       card_width: 1,
       hide_rank: true,
@@ -98,7 +97,6 @@ describe("Test renderStatsCard", () => {
       "305.81250000000006",
     );
 
-    // Test minimum card width with rank and icons.
     document.body.innerHTML = renderStatsCard(stats, {
       card_width: 1,
       hide_rank: true,
@@ -106,24 +104,22 @@ describe("Test renderStatsCard", () => {
     });
     expect(document.querySelector("svg")).toHaveAttribute(
       "width",
-      "322.81250000000006",
+      "305.81250000000006",
     );
 
-    // Test minimum card width with icons but without rank.
     document.body.innerHTML = renderStatsCard(stats, {
       card_width: 1,
       hide_rank: false,
       show_icons: true,
     });
-    expect(document.querySelector("svg")).toHaveAttribute("width", "437");
+    expect(document.querySelector("svg")).toHaveAttribute("width", "356");
 
-    // Test minimum card width without icons or rank.
     document.body.innerHTML = renderStatsCard(stats, {
       card_width: 1,
       hide_rank: false,
       show_icons: false,
     });
-    expect(document.querySelector("svg")).toHaveAttribute("width", "420");
+    expect(document.querySelector("svg")).toHaveAttribute("width", "340");
   });
 
   it("should render default colors properly", () => {
@@ -243,39 +239,6 @@ describe("Test renderStatsCard", () => {
     );
   });
 
-  it("should render custom ring_color properly", () => {
-    const customColors = {
-      title_color: "5a0",
-      ring_color: "0000ff",
-      icon_color: "1b998b",
-      text_color: "9991",
-      bg_color: "252525",
-    };
-
-    document.body.innerHTML = renderStatsCard(stats, { ...customColors });
-
-    const styleTag = document.querySelector("style");
-    const stylesObject = cssToObject(styleTag.innerHTML);
-
-    const headerClassStyles = stylesObject[":host"][".header "];
-    const statClassStyles = stylesObject[":host"][".stat "];
-    const iconClassStyles = stylesObject[":host"][".icon "];
-    const rankCircleStyles = stylesObject[":host"][".rank-circle "];
-    const rankCircleRimStyles = stylesObject[":host"][".rank-circle-rim "];
-
-    expect(headerClassStyles.fill.trim()).toBe(`#${customColors.title_color}`);
-    expect(statClassStyles.fill.trim()).toBe(`#${customColors.text_color}`);
-    expect(iconClassStyles.fill.trim()).toBe(`#${customColors.icon_color}`);
-    expect(rankCircleStyles.stroke.trim()).toBe(`#${customColors.ring_color}`);
-    expect(rankCircleRimStyles.stroke.trim()).toBe(
-      `#${customColors.ring_color}`,
-    );
-    expect(queryByTestId(document.body, "card-bg")).toHaveAttribute(
-      "fill",
-      "#252525",
-    );
-  });
-
   it("should render icons correctly", () => {
     document.body.innerHTML = renderStatsCard(stats, {
       show_icons: true,
@@ -316,7 +279,7 @@ describe("Test renderStatsCard", () => {
 
     expect(
       document.body.getElementsByTagName("svg")[0].getAttribute("width"),
-    ).toBe("287");
+    ).toBe("270");
   });
 
   it("should render translations", () => {
@@ -333,7 +296,7 @@ describe("Test renderStatsCard", () => {
       document.querySelector(
         'g[transform="translate(0, 25)"]>.stagger>.stat.bold',
       ).textContent,
-    ).toMatchInlineSnapshot(`"累计提交数（commit） (2023):"`);
+    ).toMatchInlineSnapshot(`"累计提交数（commit） (2022):"`);
     expect(
       document.querySelector(
         'g[transform="translate(0, 50)"]>.stagger>.stat.bold',
@@ -348,7 +311,7 @@ describe("Test renderStatsCard", () => {
       document.querySelector(
         'g[transform="translate(0, 100)"]>.stagger>.stat.bold',
       ).textContent,
-    ).toMatchInlineSnapshot(`"参与项目数 (last year):"`);
+    ).toMatchInlineSnapshot(`"参与项目数:"`);
   });
 
   it("should render without rounding", () => {
@@ -357,30 +320,4 @@ describe("Test renderStatsCard", () => {
     document.body.innerHTML = renderStatsCard(stats, {});
     expect(document.querySelector("rect")).toHaveAttribute("rx", "4.5");
   });
-
-  it("should shorten values", () => {
-    stats["totalCommits"] = 1999;
-
-    document.body.innerHTML = renderStatsCard(stats);
-    expect(getByTestId(document.body, "commits").textContent).toBe("2k");
-    document.body.innerHTML = renderStatsCard(stats, { number_format: "long" });
-    expect(getByTestId(document.body, "commits").textContent).toBe("1999");
-  });
-
-  it("should render default rank icon with level A+", () => {
-    document.body.innerHTML = renderStatsCard(stats, {
-      rank_icon: "default",
-    });
-    expect(queryByTestId(document.body, "level-rank-icon")).toBeDefined();
-    expect(
-      queryByTestId(document.body, "level-rank-icon").textContent.trim(),
-    ).toBe("A+");
-  });
-
-  it("should render github rank icon", () => {
-    document.body.innerHTML = renderStatsCard(stats, {
-      rank_icon: "github",
-    });
-    expect(queryByTestId(document.body, "github-rank-icon")).toBeDefined();
-  });
 });

tests/renderTopLanguages.test.js

@@ -9,25 +9,25 @@ import "@testing-library/jest-dom";
 
 import { themes } from "../themes/index.js";
 
-const langs = {
-  HTML: {
-    color: "#0f0",
-    name: "HTML",
-    size: 200,
-  },
-  javascript: {
-    color: "#0ff",
-    name: "javascript",
-    size: 200,
-  },
-  css: {
-    color: "#ff0",
-    name: "css",
-    size: 100,
-  },
-};
-
 describe("Test renderTopLanguages", () => {
+  const langs = {
+    HTML: {
+      color: "#0f0",
+      name: "HTML",
+      size: 200,
+    },
+    javascript: {
+      color: "#0ff",
+      name: "javascript",
+      size: 200,
+    },
+    css: {
+      color: "#ff0",
+      name: "css",
+      size: 100,
+    },
+  };
+
   it("should render correctly", () => {
     document.body.innerHTML = renderTopLanguages(langs);
 
@@ -216,7 +216,7 @@ describe("Test renderTopLanguages", () => {
     );
     expect(queryAllByTestId(document.body, "lang-progress")[0]).toHaveAttribute(
       "width",
-      "100",
+      "120",
     );
 
     expect(queryAllByTestId(document.body, "lang-name")[1]).toHaveTextContent(
@@ -224,7 +224,7 @@ describe("Test renderTopLanguages", () => {
     );
     expect(queryAllByTestId(document.body, "lang-progress")[1]).toHaveAttribute(
       "width",
-      "100",
+      "120",
     );
 
     expect(queryAllByTestId(document.body, "lang-name")[2]).toHaveTextContent(
@@ -232,7 +232,7 @@ describe("Test renderTopLanguages", () => {
     );
     expect(queryAllByTestId(document.body, "lang-progress")[2]).toHaveAttribute(
       "width",
-      "50",
+      "60",
     );
   });
 

tests/renderWakatimeCard.test.js

@@ -16,15 +16,6 @@ describe("Test Render Wakatime Card", () => {
     expect(card).toMatchSnapshot();
   });
 
-  it("should render correctly with compact layout when langs_count is set", () => {
-    const card = renderWakatimeCard(wakaTimeData.data, {
-      layout: "compact",
-      langs_count: 2,
-    });
-
-    expect(card).toMatchSnapshot();
-  });
-
   it("should hide languages when hide is passed", () => {
     document.body.innerHTML = renderWakatimeCard(wakaTimeData.data, {
       hide: ["YAML", "Other"],
@@ -55,7 +46,7 @@ describe("Test Render Wakatime Card", () => {
     expect(document.querySelector("rect")).toHaveAttribute("rx", "4.5");
   });
 
-  it('should show "no coding activity this week" message when there has not been activity', () => {
+  it('should show "no coding activitiy this week" message when there hasn not been activity', () => {
     document.body.innerHTML = renderWakatimeCard(
       {
         ...wakaTimeData.data,

tests/status.up.test.js

@@ -1,194 +0,0 @@
-/**
- * @file Tests for the status/up cloud function.
- */
-import { jest } from "@jest/globals";
-import axios from "axios";
-import MockAdapter from "axios-mock-adapter";
-import up, { RATE_LIMIT_SECONDS } from "../api/status/up.js";
-
-const mock = new MockAdapter(axios);
-
-const successData = {
-  rateLimit: {
-    remaining: 4986,
-  },
-};
-
-const faker = (query) => {
-  const req = {
-    query: { ...query },
-  };
-  const res = {
-    setHeader: jest.fn(),
-    send: jest.fn(),
-  };
-
-  return { req, res };
-};
-
-const rate_limit_error = {
-  errors: [
-    {
-      type: "RATE_LIMITED",
-    },
-  ],
-};
-
-const bad_credentials_error = {
-  message: "Bad credentials",
-};
-
-const shields_up = {
-  schemaVersion: 1,
-  label: "Public Instance",
-  isError: true,
-  message: "up",
-  color: "brightgreen",
-};
-const shields_down = {
-  schemaVersion: 1,
-  label: "Public Instance",
-  isError: true,
-  message: "down",
-  color: "red",
-};
-
-afterEach(() => {
-  mock.reset();
-});
-
-describe("Test /api/status/up", () => {
-  it("should return `true` if request was successful", async () => {
-    mock.onPost("https://api.github.com/graphql").replyOnce(200, successData);
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(true);
-  });
-
-  it("should return `false` if all PATs are rate limited", async () => {
-    mock.onPost("https://api.github.com/graphql").reply(200, rate_limit_error);
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(false);
-  });
-
-  it("should return JSON `true` if request was successful and type='json'", async () => {
-    mock.onPost("https://api.github.com/graphql").replyOnce(200, successData);
-
-    const { req, res } = faker({ type: "json" }, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith({ up: true });
-  });
-
-  it("should return JSON `false` if all PATs are rate limited and type='json'", async () => {
-    mock.onPost("https://api.github.com/graphql").reply(200, rate_limit_error);
-
-    const { req, res } = faker({ type: "json" }, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith({ up: false });
-  });
-
-  it("should return UP shields.io config if request was successful and type='shields'", async () => {
-    mock.onPost("https://api.github.com/graphql").replyOnce(200, successData);
-
-    const { req, res } = faker({ type: "shields" }, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(shields_up);
-  });
-
-  it("should return DOWN shields.io config if all PATs are rate limited and type='shields'", async () => {
-    mock.onPost("https://api.github.com/graphql").reply(200, rate_limit_error);
-
-    const { req, res } = faker({ type: "shields" }, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(shields_down);
-  });
-
-  it("should return `true` if the first PAT is rate limited but the second PATs works", async () => {
-    mock
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(200, rate_limit_error)
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(200, successData);
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(true);
-  });
-
-  it("should return `true` if the first PAT has 'Bad credentials' but the second PAT works", async () => {
-    mock
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(404, bad_credentials_error)
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(200, successData);
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(true);
-  });
-
-  it("should return `false` if all pats have 'Bad credentials'", async () => {
-    mock
-      .onPost("https://api.github.com/graphql")
-      .reply(404, bad_credentials_error);
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(false);
-  });
-
-  it("should throw an error if the request fails", async () => {
-    mock.onPost("https://api.github.com/graphql").networkError();
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(false);
-  });
-
-  it("should have proper cache when no error is thrown", async () => {
-    mock.onPost("https://api.github.com/graphql").replyOnce(200, successData);
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader.mock.calls).toEqual([
-      ["Content-Type", "application/json"],
-      ["Cache-Control", `max-age=0, s-maxage=${RATE_LIMIT_SECONDS}`],
-    ]);
-  });
-
-  it("should have proper cache when error is thrown", async () => {
-    mock.onPost("https://api.github.com/graphql").networkError();
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader.mock.calls).toEqual([
-      ["Content-Type", "application/json"],
-      ["Cache-Control", "no-store"],
-    ]);
-  });
-});

tests/utils.test.js

@@ -4,7 +4,6 @@ import {
   encodeHTML,
   getCardColors,
   kFormatter,
-  parseBoolean,
   renderError,
   wrapTextMultiline,
 } from "../src/common/utils.js";
@@ -20,23 +19,6 @@ describe("Test utils.js", () => {
     expect(kFormatter(9900000)).toBe("9900k");
   });
 
-  it("should test parseBoolean", () => {
-    expect(parseBoolean(true)).toBe(true);
-    expect(parseBoolean(false)).toBe(false);
-
-    expect(parseBoolean("true")).toBe(true);
-    expect(parseBoolean("false")).toBe(false);
-    expect(parseBoolean("True")).toBe(true);
-    expect(parseBoolean("False")).toBe(false);
-    expect(parseBoolean("TRUE")).toBe(true);
-    expect(parseBoolean("FALSE")).toBe(false);
-
-    expect(parseBoolean("1")).toBe(undefined);
-    expect(parseBoolean("0")).toBe(undefined);
-    expect(parseBoolean("")).toBe(undefined);
-    expect(parseBoolean(undefined)).toBe(undefined);
-  });
-
   it("should test encodeHTML", () => {
     expect(encodeHTML(`<html>hello world<,.#4^&^@%!))`)).toBe(
       "&#60;html&#62;hello world&#60;,.#4^&#38;^@%!))",
@@ -66,7 +48,6 @@ describe("Test utils.js", () => {
     let colors = getCardColors({
       title_color: "f00",
       text_color: "0f0",
-      ring_color: "0000ff",
       icon_color: "00f",
       bg_color: "fff",
       border_color: "fff",
@@ -76,7 +57,6 @@ describe("Test utils.js", () => {
       titleColor: "#f00",
       textColor: "#0f0",
       iconColor: "#00f",
-      ringColor: "#0000ff",
       bgColor: "#fff",
       borderColor: "#fff",
     });
@@ -95,7 +75,6 @@ describe("Test utils.js", () => {
       titleColor: "#2f80ed",
       textColor: "#0f0",
       iconColor: "#00f",
-      ringColor: "#2f80ed",
       bgColor: "#fff",
       borderColor: "#e4e2e2",
     });
@@ -108,31 +87,11 @@ describe("Test utils.js", () => {
     expect(colors).toStrictEqual({
       titleColor: "#fff",
       textColor: "#9f9f9f",
-      ringColor: "#fff",
       iconColor: "#79ff97",
       bgColor: "#151515",
       borderColor: "#e4e2e2",
     });
   });
-
-  it("getCardColors: should return ring color equal to title color if not ring color is defined", () => {
-    let colors = getCardColors({
-      title_color: "f00",
-      text_color: "0f0",
-      icon_color: "00f",
-      bg_color: "fff",
-      border_color: "fff",
-      theme: "dark",
-    });
-    expect(colors).toStrictEqual({
-      titleColor: "#f00",
-      textColor: "#0f0",
-      iconColor: "#00f",
-      ringColor: "#f00",
-      bgColor: "#fff",
-      borderColor: "#fff",
-    });
-  });
 });
 
 describe("wrapTextMultiline", () => {

themes/README.md

@@ -32,11 +32,10 @@ Use `?theme=THEME_NAME` parameter like so :-
 | `jolly` ![jolly][jolly] | `maroongold` ![maroongold][maroongold] | `yeblu` ![yeblu][yeblu] |
 | `blueberry` ![blueberry][blueberry] | `slateorange` ![slateorange][slateorange] | `kacho_ga` ![kacho_ga][kacho_ga] |
 | `outrun` ![outrun][outrun] | `ocean_dark` ![ocean_dark][ocean_dark] | `city_lights` ![city_lights][city_lights] |
-| `github_dark` ![github_dark][github_dark] | `github_dark_dimmed` ![github_dark_dimmed][github_dark_dimmed] | `discord_old_blurple` ![discord_old_blurple][discord_old_blurple] |
+| `github_dark` ![github_dark][github_dark] | `discord_old_blurple` ![discord_old_blurple][discord_old_blurple] | `aura_dark` ![aura_dark][aura_dark] |
 | `panda` ![panda][panda] | `noctis_minimus` ![noctis_minimus][noctis_minimus] | `cobalt2` ![cobalt2][cobalt2] |
 | `swift` ![swift][swift] | `aura` ![aura][aura] | `apprentice` ![apprentice][apprentice] |
 | `moltack` ![moltack][moltack] | `codeSTACKr` ![codeSTACKr][codeSTACKr] | `rose_pine` ![rose_pine][rose_pine] |
-|  `aura_dark` ![aura_dark][aura_dark] | | |
 | [Add your theme][add-theme] | | |
 
 ## Repo Card
@@ -61,11 +60,10 @@ Use `?theme=THEME_NAME` parameter like so :-
 | `jolly` ![jolly][jolly_repo] | `maroongold` ![maroongold][maroongold_repo] | `yeblu` ![yeblu][yeblu_repo] |
 | `blueberry` ![blueberry][blueberry_repo] | `slateorange` ![slateorange][slateorange_repo] | `kacho_ga` ![kacho_ga][kacho_ga_repo] |
 | `outrun` ![outrun][outrun_repo] | `ocean_dark` ![ocean_dark][ocean_dark_repo] | `city_lights` ![city_lights][city_lights_repo] |
-| `github_dark` ![github_dark][github_dark_repo] | `github_dark_dimmed` ![github_dark_dimmed][github_dark_dimmed_repo] | `discord_old_blurple` ![discord_old_blurple][discord_old_blurple_repo] |
+| `github_dark` ![github_dark][github_dark_repo] | `discord_old_blurple` ![discord_old_blurple][discord_old_blurple_repo] | `aura_dark` ![aura_dark][aura_dark_repo] |
 | `panda` ![panda][panda_repo] | `noctis_minimus` ![noctis_minimus][noctis_minimus_repo] | `cobalt2` ![cobalt2][cobalt2_repo] |
 | `swift` ![swift][swift_repo] | `aura` ![aura][aura_repo] | `apprentice` ![apprentice][apprentice_repo] |
 | `moltack` ![moltack][moltack_repo] | `codeSTACKr` ![codeSTACKr][codeSTACKr_repo] | `rose_pine` ![rose_pine][rose_pine_repo] |
-| `aura_dark` ![aura_dark][aura_dark_repo] | | |
 | [Add your theme][add-theme] | | |
 
 
@@ -119,8 +117,8 @@ Use `?theme=THEME_NAME` parameter like so :-
 [ocean_dark]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=ocean_dark
 [city_lights]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=city_lights
 [github_dark]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=github_dark
-[github_dark_dimmed]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=github_dark_dimmed
 [discord_old_blurple]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=discord_old_blurple
+[aura_dark]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=aura_dark
 [panda]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=panda
 [noctis_minimus]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=noctis_minimus
 [cobalt2]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=cobalt2
@@ -130,7 +128,7 @@ Use `?theme=THEME_NAME` parameter like so :-
 [moltack]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=moltack
 [codeSTACKr]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=codeSTACKr
 [rose_pine]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=rose_pine
-[aura_dark]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=aura_dark
+
 
 [default_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=default
 [default_repocard_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=default_repocard
@@ -182,8 +180,8 @@ Use `?theme=THEME_NAME` parameter like so :-
 [ocean_dark_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=ocean_dark
 [city_lights_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=city_lights
 [github_dark_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=github_dark
-[github_dark_dimmed_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=github_dark_dimmed
 [discord_old_blurple_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=discord_old_blurple
+[aura_dark_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=aura_dark
 [panda_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=panda
 [noctis_minimus_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=noctis_minimus
 [cobalt2_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=cobalt2
@@ -193,7 +191,7 @@ Use `?theme=THEME_NAME` parameter like so :-
 [moltack_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=moltack
 [codeSTACKr_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=codeSTACKr
 [rose_pine_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=rose_pine
-[aura_dark_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=aura_dark
+
 
 [add-theme]: https://github.com/anuraghazra/github-readme-stats/edit/master/themes/index.js
 

themes/index.js

@@ -18,27 +18,6 @@ export const themes = {
     text_color: "417E87",
     bg_color: "ffffff00",
   },
-  shadow_red: {
-    title_color: "9A0000",
-    text_color: "444",
-    icon_color: "4F0000",
-    border_color: "4F0000",
-    bg_color: "ffffff00",
-  },
-  shadow_green: {
-    title_color: "007A00",
-    text_color: "444",
-    icon_color: "003D00",
-    border_color: "003D00",
-    bg_color: "ffffff00",
-  },
-  shadow_blue: {
-    title_color: "00779A",
-    text_color: "444",
-    icon_color: "004450",
-    border_color: "004490",
-    bg_color: "ffffff00",
-  },
   dark: {
     title_color: "fff",
     icon_color: "79ff97",
@@ -321,13 +300,6 @@ export const themes = {
     text_color: "C3D1D9",
     bg_color: "0D1117",
   },
-  github_dark_dimmed: {
-    title_color: "539bf5",
-    icon_color: "539bf5",
-    text_color: "ADBAC7",
-    bg_color: "24292F",
-    border_color: "373E47",
-  },
   discord_old_blurple: {
     title_color: "7289DA",
     icon_color: "7289DA",
@@ -395,34 +367,6 @@ export const themes = {
     text_color: "e0def4",
     bg_color: "191724",
   },
-  date_night: {
-    title_color: "DA7885",
-    text_color: "E1B2A2",
-    icon_color: "BB8470",
-    border_color: "170F0C",
-    bg_color: "170F0C",
-  },
-  one_dark_pro: {
-    title_color: "61AFEF",
-    text_color: "E5C06E",
-    icon_color: "C678DD",
-    border_color: "3B4048",
-    bg_color: "23272E",
-  },
-  rose: {
-    title_color: "8d192b",
-    text_color: "862931",
-    icon_color: "B71F36",
-    border_color: "e9d8d4",
-    bg_color: "e9d8d4",
-  },
-  holi: {
-    title_color: "5FABEE",
-    text_color: "D6E7FF",
-    icon_color: "5FABEE",
-    border_color: "85A4C0",
-    bg_color: "030314",
-  },
 };
 
 export default themes;

vercel.json

@@ -2,7 +2,7 @@
   "functions": {
     "api/*.js": {
       "memory": 128,
-      "maxDuration": 10
+      "maxDuration": 30
     }
   },
   "redirects": [