test: add missing utils tests

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -11,8 +11,6 @@ body:
     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

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -9,8 +9,6 @@ body:
       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

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

@@ -26,5 +26,5 @@ jobs:
 
       - run: npm run close-stale-theme-prs
         env:
-          STALE_DAYS: 20
+          STALE_DAYS: 15
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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,
@@ -61,12 +63,7 @@ export default async (req, res) => {
       CONSTANTS.ONE_DAY,
     );
 
-    res.setHeader(
-      "Cache-Control",
-      `max-age=${
-        cacheSeconds / 2
-      }, s-maxage=${cacheSeconds}, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-    );
+    res.setHeader("Cache-Control", `public, max-age=${cacheSeconds}`);
 
     return res.send(
       renderStatsCard(stats, {
@@ -79,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),
@@ -93,7 +89,7 @@ export default async (req, res) => {
       }),
     );
   } catch (err) {
-    res.setHeader("Cache-Control", `no-cache, no-store, must-revalidate`); // Don't cache error responses.
+    res.setHeader("Cache-Control", `no-store`); // 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(
-      "Cache-Control",
-      `max-age=${
-        cacheSeconds / 2
-      }, s-maxage=${cacheSeconds}, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-    );
+    res.setHeader("Cache-Control", `public, max-age=${cacheSeconds}`);
 
     return res.send(
       renderRepoCard(repoData, {
@@ -80,7 +75,7 @@ export default async (req, res) => {
       }),
     );
   } catch (err) {
-    res.setHeader("Cache-Control", `no-cache, no-store, must-revalidate`); // Don't cache error responses.
+    res.setHeader("Cache-Control", `no-store`); // Don't cache error responses.
     return res.send(renderError(err.message, err.secondaryMessage));
   }
 };

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,
@@ -29,7 +32,6 @@ export default async (req, res) => {
     locale,
     border_radius,
     border_color,
-    disable_animations,
   } = req.query;
   res.setHeader("Content-Type", "image/svg+xml");
 
@@ -53,12 +55,7 @@ export default async (req, res) => {
       CONSTANTS.ONE_DAY,
     );
 
-    res.setHeader(
-      "Cache-Control",
-      `max-age=${
-        cacheSeconds / 2
-      }, s-maxage=${cacheSeconds}, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-    );
+    res.setHeader("Cache-Control", `public, max-age=${cacheSeconds}`);
 
     return res.send(
       renderTopLanguages(topLangs, {
@@ -76,11 +73,10 @@ export default async (req, res) => {
         border_radius,
         border_color,
         locale: locale ? locale.toLowerCase() : null,
-        disable_animations: parseBoolean(disable_animations),
       }),
     );
   } catch (err) {
-    res.setHeader("Cache-Control", `no-cache, no-store, must-revalidate`); // Don't cache error responses.
+    res.setHeader("Cache-Control", `no-store`); // 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(
-      "Cache-Control",
-      `max-age=${
-        cacheSeconds / 2
-      }, s-maxage=${cacheSeconds}, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-    );
+    res.setHeader("Cache-Control", `public, max-age=${cacheSeconds}`);
 
     return res.send(
       renderWakatimeCard(stats, {
@@ -80,7 +78,7 @@ export default async (req, res) => {
       }),
     );
   } catch (err) {
-    res.setHeader("Cache-Control", `no-cache, no-store, must-revalidate`); // Don't cache error responses.
+    res.setHeader("Cache-Control", `no-store`); // Don't cache error responses.
     return res.send(renderError(err.message, err.secondaryMessage));
   }
 };

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">
@@ -72,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)
@@ -235,7 +235,7 @@ GitHub 저장소 여분 핀을 이용하면, 6개 이상의 저장소 핀을 여
 
 # 언어 사용량 통계
 
-언어 사용량 통계 카드는 GitHub 사용자가 가장 많이 사용한 언어가 표시됩니다.
+언어 사용량 통계 카드는 Github 사용자가 가장 많이 사용한 언어가 표시됩니다.
 
 _참고:
 언어 사용량 통계는 GitHub 에서 가장 많이 사용된 언어의 표기일 뿐입니다.

docs/readme_np.md

@@ -219,7 +219,7 @@ Use [show_owner](#customization) variable to include the repo's owner username
 
 टोप भाषाकार्डले github परयोग गर्नेहरुको प्रोग्रम्मिंग भाषाहरु देखाऊने गर्दछ |. 
 
-_NOTE: टोप भाषाहरुले आफ्नो सिपलाए संकेत गरेको होईन | योचै GitHub  Metricबाट धेरै कुन भाषा परयोग भाकोलाए संकेत गरेको हो |
+_NOTE: टोप भाषाहरुले आफ्नो सिपलाए संकेत गरेको होईन | योचै Github  Metricबाट धेरै कुन भाषा परयोग भाकोलाए संकेत गरेको हो |
 ### प्रयोग 
 
 कोदलाए  कपी- पेसेत  readme मा गर्नु होला र लिंक परिवतन गर्नु होला |
@@ -389,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!
@@ -144,7 +142,7 @@ Personalize a aparência do seu `Stats Card` ou `Repo Card` da maneira que desej
 - `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.
@@ -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.

readme.md

@@ -85,7 +85,6 @@ Visit <https://indiafightscorona.giveindia.org> and make a small donation to hel
 -   [Top Languages Card](#top-languages-card)
 -   [Wakatime Week Stats](#wakatime-week-stats)
 -   [Themes](#themes)
-    -   [Responsive Card Theme](#responsive-card-theme)
 -   [Customization](#customization)
     -   [Common Options](#common-options)
     -   [Stats Card Exclusive Options](#stats-card-exclusive-options)
@@ -93,7 +92,7 @@ Visit <https://indiafightscorona.giveindia.org> and make a small donation to hel
     -   [Language Card Exclusive Options](#language-card-exclusive-options)
     -   [Wakatime Card Exclusive Option](#wakatime-card-exclusive-options)
 -   [Deploy Yourself](#deploy-on-your-own-vercel-instance)
-    -   [Keep your fork up to date](#keep-your-fork-up-to-date)
+    - [Keep your fork up to date](#keep-your-fork-up-to-date)   
 
 # GitHub Stats Card
 
@@ -151,101 +150,12 @@ Use `&theme=THEME_NAME` parameter like so :
 
 #### All inbuilt themes
 
-GitHub readme stats comes with several built-in themes (e.g. `dark`, `radical`, `merko`, `gruvbox`, `tokyonight`, `onedark`, `cobalt`, `synthwave`, `highcontrast`, `dracula`).
+Github readme stats comes with several built-in themes (e.g. `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 colour 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.
@@ -259,12 +169,12 @@ You can customize the appearance of your `Stats Card` or `Repo Card` however you
 -   `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`
 -   `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`.
 -   `border_radius` - Corner rounding on the card. Default: `4.5`.
 
 > **Warning**
-> 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.
+> 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
 
@@ -283,10 +193,9 @@ You can provide multiple comma-separated values in the bg_color option to render
 -   `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`.
+-   `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.
 
 > **Note**
 > When hide_rank=`true`, the minimum card width is 270 px + the title length and padding.
@@ -304,7 +213,6 @@ You can provide multiple comma-separated values in the bg_color option to render
 -   `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`.
 
 > **Warning**
 > Language names should be URI-escaped, as specified in [Percent Encoding](https://en.wikipedia.org/wiki/Percent-encoding)
@@ -354,7 +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**
-> 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 is a new feature of github-readme-stats.
+> 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 is a new feature of github-readme-stats._
 
 ### Usage
 
@@ -498,7 +406,7 @@ By default, GitHub does not lay out the cards side by side. To do that, you can
 
 ## Deploy on your own Vercel instance
 
-#### :film_projector: [Check Out Step By Step Video Tutorial By @codeSTACKr](https://youtu.be/n6d4KHSKqGk?t=107)
+#### [Check Out Step By Step Video Tutorial By @codeSTACKr](https://youtu.be/n6d4KHSKqGk?t=107)
 
 > **Warning**
 > 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).

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(
-      pullRequest.reviews.nodes.sort((a, b) => (a < b ? 1 : -1))[0].submittedAt,
-    );
+    const lastReviewDate = new Date(pullRequest.reviews.nodes[0].updatedAt);
     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";
@@ -24,7 +25,7 @@ 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\
-  \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_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).
@@ -92,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 = {

scripts/push-theme-readme.sh

@@ -5,10 +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 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

src/calculateRank.js

@@ -9,7 +9,7 @@
  * @param {number} to The value to calculate the probability for.
  * @returns {number} Probability.
  */
-const normalcdf = (mean, sigma, to) => {
+function 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,7 +24,7 @@ const normalcdf = (mean, sigma, to) => {
     sign = -1;
   }
   return (1 / 2) * (1 + sign * erf);
-};
+}
 
 /**
  * Calculates the users rank.
@@ -38,7 +38,7 @@ const normalcdf = (mean, sigma, to) => {
  * @param {number} stargazers The number of stars.
  * @returns {{level: string, score: number}}} The users rank.
  */
-const calculateRank = ({
+function calculateRank({
   totalRepos,
   totalCommits,
   contributions,
@@ -46,7 +46,7 @@ const calculateRank = ({
   prs,
   issues,
   stargazers,
-}) => {
+}) {
   const COMMITS_OFFSET = 1.65;
   const CONTRIBS_OFFSET = 1.65;
   const ISSUES_OFFSET = 1;
@@ -70,11 +70,7 @@ const calculateRank = ({
   const RANK_B_VALUE = 100;
 
   const TOTAL_VALUES =
-    RANK_S_VALUE +
-    RANK_DOUBLE_A_VALUE +
-    RANK_A2_VALUE +
-    RANK_A3_VALUE +
-    RANK_B_VALUE;
+    RANK_S_VALUE + RANK_A2_VALUE + RANK_A3_VALUE + RANK_B_VALUE;
 
   // prettier-ignore
   const score = (
@@ -98,7 +94,7 @@ const calculateRank = ({
   })();
 
   return { level, score: normalizedScore };
-};
+}
 
 export { calculateRank };
 export default calculateRank;

src/cards/stats-card.js

@@ -89,7 +89,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,14 +104,13 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
   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,
     });
 
@@ -154,7 +152,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",
     },
@@ -172,7 +170,6 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
     "pl",
     "de",
     "nl",
-    "zh-tw",
   ];
   const isLongLocale = longLocales.includes(locale) === true;
 
@@ -185,7 +182,8 @@ 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,
       }),
     );
@@ -202,7 +200,6 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
   const progress = 100 - rank.score;
   const cssStyles = getStyles({
     titleColor,
-    ringColor,
     textColor,
     iconColor,
     show_icons,

src/cards/top-languages-card.js

@@ -39,53 +39,46 @@ const getLongestLang = (arr) =>
  * Creates a node to display usage of a programming language in percentage
  * using text and a horizontal progress bar.
  *
- * @param {object} props Function properties.
+ * @param {object[]} props Function properties.
  * @param {number} props.width The card width
  * @param {string} props.name Name of the programming language.
  * @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 staggerDelay = (index + 3) * 150;
+const createProgressTextNode = ({ width, color, name, progress }) => {
   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 x="${progressTextX}" y="34" class="lang-name">${progress}%</text>
-      ${createProgressNode({
-        x: 0,
-        y: 25,
-        color,
-        width: progressWidth,
-        progress,
-        progressBarBackgroundColor: "#ddd",
-        delay: staggerDelay + 300,
-      })}
-    </g>
+    <text data-testid="lang-name" x="2" y="15" class="lang-name">${name}</text>
+    <text x="${progressTextX}" y="34" class="lang-name">${progress}%</text>
+    ${createProgressNode({
+      x: 0,
+      y: 25,
+      color,
+      width: progressWidth,
+      progress,
+      progressBarBackgroundColor: "#ddd",
+    })}
   `;
 };
 
 /**
  * Creates a text only node to display usage of a programming language in percentage.
  *
- * @param {object} props Function properties.
+ * @param {object[]} props Function properties.
  * @param {Lang} props.lang Programming language object.
  * @param {number} props.totalSize Total size of all languages.
- * @param {number} props.index Index of the programming language.
  * @returns {string} Compact layout programming language SVG node.
  */
-const createCompactLangNode = ({ lang, totalSize, 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} ${percentage}%
@@ -111,6 +104,7 @@ const createLanguageTextNode = ({ langs, totalSize }) => {
       createCompactLangNode({
         lang,
         totalSize,
+        // @ts-ignore
         index,
       }),
     );
@@ -140,13 +134,12 @@ const createLanguageTextNode = ({ langs, totalSize }) => {
  */
 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,
@@ -194,7 +187,7 @@ const renderCompactLayout = (langs, width, totalLanguageSize) => {
 
   return `
     <mask id="rect-mask">
-      <rect x="0" y="0" width="${offsetWidth}" height="8" fill="white" rx="5"/>
+      <rect x="0" y="0" width="${offsetWidth}" height="8" fill="white" rx="5" />
     </mask>
     ${compactProgressBar}
 
@@ -283,7 +276,6 @@ const renderTopLanguages = (topLangs, options = {}) => {
     langs_count = DEFAULT_LANGS_COUNT,
     border_radius,
     border_color,
-    disable_animations,
   } = options;
 
   const i18n = new I18n({
@@ -332,43 +324,11 @@ const renderTopLanguages = (topLangs, options = {}) => {
     colors,
   });
 
-  if (disable_animations) card.disableAnimations();
-
+  card.disableAnimations();
   card.setHideBorder(hide_border);
   card.setHideTitle(hide_title);
   card.setCSS(
-    `
-    @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;
-    }
-    `,
+    `.lang-name { font: 400 11px 'Segoe UI', Ubuntu, Sans-Serif; fill: ${colors.textColor} }`,
   );
 
   return card.render(`

src/cards/types.d.ts

@@ -37,7 +37,6 @@ export type TopLangOptions = CommonOptions & {
   layout: "compact" | "normal";
   custom_title: string;
   langs_count: number;
-  disable_animations: boolean;
 };
 
 type WakaTimeOptions = CommonOptions & {

src/cards/wakatime-card.js

@@ -159,7 +159,7 @@ const recalculatePercentages = (languages) => {
  * @returns {string} WakaTime card SVG.
  */
 const renderWakatimeCard = (stats = {}, options = { hide: [] }) => {
-  let { languages = [] } = stats;
+  let { languages } = stats;
   const {
     hide_title = false,
     hide_border = false,
@@ -174,24 +174,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,
@@ -213,8 +209,10 @@ const renderWakatimeCard = (stats = {}, options = { hide: [] }) => {
     });
 
   const filteredLanguages = languages
-    .filter((language) => language.hours || language.minutes)
-    .slice(0, langsCount);
+    ? languages
+        .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`

src/common/createProgressNode.js

@@ -10,7 +10,6 @@ import { clampValue } from "./utils.js";
  * @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 = ({
@@ -20,22 +19,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
-            height="8"
-            fill="${color}"
-            rx="5" ry="5" x="0" y="0"
-            class="lang-progress"
-            style="animation-delay: ${delay}ms;"
-        />
-      </svg>
+      <rect
+          height="8"
+          fill="${color}"
+          rx="5" ry="5" x="0" y="0"
+          data-testid="lang-progress"
+          width="${progressPercentage}%"
+      >
+      </rect>
     </svg>
   `;
 };

src/common/retryer.js

@@ -1,11 +1,5 @@
 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.
  *
@@ -16,7 +10,7 @@ const RETRIES = PATs ? PATs : 7;
  * @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,11 +39,8 @@ 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

src/common/utils.js

@@ -42,13 +42,13 @@ const renderError = (message, secondaryMessage = "") => {
  * @param {string} str String to encode.
  * @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.
@@ -56,42 +56,41 @@ const encodeHTML = (str) => {
  * @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 String to check.
  * @returns {boolean} True if the given string is a valid hex color.
+ *
+ * @description: Tests color codes without the hash (#) prefix.
  */
-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 | boolean} value The value to parse.
- * @returns {boolean | undefined } The parsed value.
+ * @param {string} value The value to parse.
+ * @returns {boolean | string} The parsed value.
  */
-const parseBoolean = (value) => {
-  if (typeof value === "boolean") return value;
-
-  if (typeof value === "string") {
-    if (value.toLowerCase() === "true") {
-      return true;
-    } else if (value.toLowerCase() === "false") {
-      return false;
-    }
+function parseBoolean(value) {
+  if (value === "true") {
+    return true;
+  } else if (value === "false") {
+    return false;
+  } else {
+    return value;
   }
-  return undefined;
-};
+}
 
 /**
  * Parse string to array of strings.
@@ -99,10 +98,10 @@ const parseBoolean = (value) => {
  * @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.
@@ -112,11 +111,11 @@ const parseArray = (str) => {
  * @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.
@@ -124,9 +123,10 @@ const clampValue = (number, min, max) => {
  * @param {string[]} colors Array of colors.
  * @returns {boolean} True if the given string is a valid gradient.
  */
-const isValidGradient = (colors) => {
-  return isValidHexColor(colors[1]) && isValidHexColor(colors[2]);
-};
+function isValidGradient(colors) {
+  if (isNaN(colors[0])) return false;
+  return colors.slice(1).every((color) => isValidHexColor(color));
+}
 
 /**
  * Retrieves a gradient if color has more than one valid hex codes else a single color.
@@ -135,10 +135,10 @@ const isValidGradient = (colors) => {
  * @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,7 +147,7 @@ const fallbackColor = (color, fallbackColor) => {
     (gradient ? gradient : isValidHexColor(color) && `#${color}`) ||
     fallbackColor
   );
-};
+}
 
 /**
  * Send GraphQL request to GitHub API.
@@ -156,7 +156,7 @@ const fallbackColor = (color, fallbackColor) => {
  * @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,7 +164,7 @@ const request = (data, headers) => {
     headers,
     data,
   });
-};
+}
 
 /**
  * Auto layout utility, allows us to layout things vertically or horizontally with
@@ -173,11 +173,11 @@ const request = (data, headers) => {
  * @param {object} props Function properties.
  * @param {string[]} props.items Array of items to layout.
  * @param {number} props.gap Gap between items.
- * @param {number[]?=} props.sizes Array of sizes for each item.
  * @param {"column" | "row"?=} props.direction Direction to layout items.
+ * @param {number[]?=} props.sizes Array of sizes for each item.
  * @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,7 +189,7 @@ const flexLayout = ({ items, gap, direction, sizes = [] }) => {
     lastSize += size + gap;
     return `<g transform="${transform}">${item}</g>`;
   });
-};
+}
 
 /**
  * Returns theme based colors with proper overrides and defaults.
@@ -204,16 +204,15 @@ const flexLayout = ({ items, gap, direction, sizes = [] }) => {
  * @param {string} args.fallbackTheme Fallback theme.
  *
  */
-const getCardColors = ({
+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 +224,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,8 +242,8 @@ 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.
@@ -261,7 +253,7 @@ const getCardColors = ({
  * @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 +278,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
@@ -352,7 +344,7 @@ class MissingParamError extends Error {
  * @param {number} fontSize Font size.
  * @returns {number} Text length.
  */
-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 +376,20 @@ 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.
+ * Split array of languages in columns.
  *
  * @template T Langauge object.
  * @param {Array<T>} arr Array of languages.
  * @param {number} perChunk Number of languages per column.
- * @returns {Array<T>} Array of languages split in two columns.
+ * @returns {Array<T>} Array of languages split in columns.
  */
-const chunkArray = (arr, perChunk) => {
+function chunkArray(arr, perChunk) {
   return arr.reduce((resultArray, item, index) => {
     const chunkIndex = Math.floor(index / perChunk);
 
@@ -409,7 +401,7 @@ const chunkArray = (arr, perChunk) => {
 
     return resultArray;
   }, []);
-};
+}
 
 /**
  * Parse emoji from string.
@@ -417,12 +409,12 @@ const chunkArray = (arr, perChunk) => {
  * @param {string} str String to parse emoji from.
  * @returns {string} String with emoji parsed.
  */
-const parseEmojis = (str) => {
+function parseEmojis(str) {
   if (!str) throw new Error("[parseEmoji]: str argument not provided");
-  return str.replace(/:\w+:/gm, (emoji) => {
+  return str.replace(/:[\w+-]+:/gm, (emoji) => {
     return toEmoji.get(emoji) || "";
   });
-};
+}
 
 export {
   ERROR_CARD_LENGTH,

src/fetchers/repo-fetcher.js

@@ -6,7 +6,7 @@ import { MissingParamError, request } from "../common/utils.js";
  * Repo data fetcher.
  *
  * @param {import('Axios').AxiosRequestHeaders} variables Fetcher variables.
- * @param {string} token GitHub token.
+ * @param {string} token Github token.
  * @returns {Promise<import('Axios').AxiosResponse>} The response.
  */
 const fetcher = (variables, token) => {
@@ -56,11 +56,11 @@ const urlExample = "/api/pin?username=USERNAME&amp;repo=REPO_NAME";
 /**
  * Fetch repository data.
  *
- * @param {string} username GitHub username.
- * @param {string} reponame GitHub repository name.
+ * @param {string} username Github username.
+ * @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 +100,7 @@ const fetchRepo = async (username, reponame) => {
       starCount: data.organization.repository.stargazers.totalCount,
     };
   }
-};
+}
 
 export { fetchRepo };
 export default fetchRepo;

src/fetchers/stats-fetcher.js

@@ -14,72 +14,46 @@ import {
 
 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 Fetcher variables.
- * @param {string} token GitHub token.
- * @returns {Promise<import('../common/types').Fetcher>} Stats fetcher response.
+ * @param {string} token Github token.
+ * @returns {Promise<import('../common/types').StatsFetcherResponse>} 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(contributionTypes: [COMMIT, ISSUE, PULL_REQUEST, REPOSITORY]) {
+            totalCount
+          }
+          pullRequests {
+            totalCount
+          }
+          openIssues: issues(states: OPEN) {
+            totalCount
+          }
+          closedIssues: issues(states: CLOSED) {
+            totalCount
+          }
+          followers {
+            totalCount
+          }
+          repositories(ownerAffiliations: OWNER) {
+            totalCount
+          }
+        }
+      }
+      `,
       variables,
     },
     {
@@ -89,51 +63,48 @@ const fetcher = (variables, token) => {
 };
 
 /**
- * Fetch stats information for a given username.
+ * Fetch first 100 repositories for a given username.
  *
- * @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.
+ * @param {import('axios').AxiosRequestHeaders} variables Fetcher variables.
+ * @param {string} token Github token.
+ * @returns {Promise<import('../common/types').StatsFetcherResponse>} Repositories fetcher response.
  */
-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;
+const repositoriesFetcher = (variables, token) => {
+  return request(
+    {
+      query: `
+      query userInfo($login: String!, $after: String) {
+        user(login: $login) {
+          repositories(first: 100, ownerAffiliations: OWNER, orderBy: {direction: DESC, field: STARGAZERS}, after: $after) {
+            nodes {
+              name
+              stargazers {
+                totalCount
+              }
+            }
+            pageInfo {
+              hasNextPage
+              endCursor
+            }
+          }
+        }
+      }
+      `,
+      variables,
+    },
+    {
+      Authorization: `bearer ${token}`,
+    },
+  );
 };
 
 /**
  * Fetch all the commits for all the repositories of a given username.
  *
- * @param {*} username GitHub 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
+ * @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) => {
@@ -169,20 +140,60 @@ const totalCommitsFetcher = async (username) => {
   return 0;
 };
 
+/**
+ * Fetch all the stars for all the repositories of a given username.
+ *
+ * @param {string} username Github username.
+ * @param {array} repoToHide Repositories to hide.
+ * @returns {Promise<number>} Total stars.
+ */
+const totalStarsFetcher = async (username, repoToHide) => {
+  let nodes = [];
+  let hasNextPage = true;
+  let endCursor = null;
+  while (hasNextPage) {
+    const variables = { login: username, first: 100, after: endCursor };
+    let res = await retryer(repositoriesFetcher, variables);
+
+    if (res.data.errors) {
+      logger.error(res.data.errors);
+      throw new CustomError(
+        res.data.errors[0].message || "Could not fetch user",
+        CustomError.USER_NOT_FOUND,
+      );
+    }
+
+    const allNodes = res.data.data.user.repositories.nodes;
+    const nodesWithStars = allNodes.filter(
+      (node) => node.stargazers.totalCount !== 0,
+    );
+    nodes.push(...nodesWithStars);
+    // hasNextPage =
+    //   allNodes.length === nodesWithStars.length &&
+    //   res.data.data.user.repositories.pageInfo.hasNextPage;
+    hasNextPage = false; // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
+    endCursor = res.data.data.user.repositories.pageInfo.endCursor;
+  }
+
+  return nodes
+    .filter((data) => !repoToHide[data.name])
+    .reduce((prev, curr) => prev + curr.stargazers.totalCount, 0);
+};
+
 /**
  * Fetch stats for a given username.
  *
- * @param {string} username GitHub username.
+ * @param {string} username Github username.
  * @param {boolean} count_private Include private contributions.
  * @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,7 +206,7 @@ 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) {
@@ -251,15 +262,8 @@ const fetchStats = async (
   stats.contributedTo = user.repositoriesContributedTo.totalCount;
 
   // Retrieve stars while filtering out repositories to be hidden
-  stats.totalStars = user.repositories.nodes
-    .filter((data) => {
-      return !repoToHide[data.name];
-    })
-    .reduce((prev, curr) => {
-      return prev + curr.stargazers.totalCount;
-    }, 0);
+  stats.totalStars = await totalStarsFetcher(username, repoToHide);
 
-  // @ts-ignore // TODO: Fix this.
   stats.rank = calculateRank({
     totalCommits: stats.totalCommits,
     totalRepos: user.repositories.totalCount,
@@ -271,7 +275,7 @@ const fetchStats = async (
   });
 
   return stats;
-};
+}
 
 export { fetchStats };
 export default fetchStats;

src/fetchers/top-languages-fetcher.js

@@ -1,4 +1,5 @@
 // @ts-check
+import * as dotenv from "dotenv";
 import { retryer } from "../common/retryer.js";
 import {
   CustomError,
@@ -8,11 +9,13 @@ import {
   wrapTextMultiline,
 } from "../common/utils.js";
 
+dotenv.config();
+
 /**
  * Top languages fetcher object.
  *
  * @param {import('Axios').AxiosRequestHeaders} variables Fetcher variables.
- * @param {string} token GitHub token.
+ * @param {string} token Github token.
  * @returns {Promise<import('../common/types').StatsFetcherResponse>} Languages fetcher response.
  */
 const fetcher = (variables, token) => {
@@ -50,11 +53,11 @@ const fetcher = (variables, token) => {
 /**
  * Fetch top languages for a given username.
  *
- * @param {string} username GitHub username.
+ * @param {string} username Github username.
  * @param {string[]} exclude_repo List of repositories to exclude.
  * @returns {Promise<import("./types").TopLangData>} Top languages data.
  */
-const fetchTopLanguages = async (username, exclude_repo = []) => {
+async function fetchTopLanguages(username, exclude_repo = []) {
   if (!username) throw new MissingParamError(["username"]);
 
   const res = await retryer(fetcher, { login: username });
@@ -133,7 +136,7 @@ const fetchTopLanguages = async (username, exclude_repo = []) => {
     }, {});
 
   return topLangs;
-};
+}
 
 export { fetchTopLanguages };
 export default fetchTopLanguages;

src/getStyles.js

@@ -77,7 +77,6 @@ const getStyles = ({
   titleColor,
   textColor,
   iconColor,
-  ringColor,
   show_icons,
   progress,
 }) => {
@@ -106,13 +105,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/translations.js

@@ -37,7 +37,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 +67,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 +160,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 +322,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",
   },
@@ -367,9 +367,9 @@ const availableLocales = Object.keys(repoCardLocales["repocard.archived"]);
  * @param {string} locale The locale to check.
  * @returns {boolean} Boolean specifying whether the locale is available or not.
  */
-const isLocaleAvailable = (locale) => {
+function 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;
@@ -122,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"
           />
@@ -130,167 +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"
-            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;
-    }
-    
-  
-    .lang-name { font: 400 11px 'Segoe UI', Ubuntu, Sans-Serif; fill: #434d58 }
-    
-
-          
-          
-        </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"
+            width="0.465"
             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,
@@ -40,6 +40,15 @@ const data_stats = {
       followers: { totalCount: 0 },
       repositories: {
         totalCount: 1,
+      },
+    },
+  },
+};
+
+const repositoriesData = {
+  data: {
+    user: {
+      repositories: {
         nodes: [{ stargazers: { totalCount: 100 } }],
         pageInfo: {
           hasNextPage: false,
@@ -74,7 +83,11 @@ 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")
+    .replyOnce(200, data)
+    .onPost("https://api.github.com/graphql")
+    .replyOnce(200, repositoriesData);
 
   return { req, res };
 };
@@ -85,7 +98,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 +133,7 @@ describe("Test /api/", () => {
         text_color: "fff",
         bg_color: "fff",
       },
-      data_stats,
+      data,
     );
 
     await api(req, res);
@@ -141,33 +154,23 @@ describe("Test /api/", () => {
   });
 
   it("should have proper cache", async () => {
-    const { req, res } = faker({}, data_stats);
+    const { req, res } = faker({}, data);
 
     await api(req, res);
 
     expect(res.setHeader.mock.calls).toEqual([
       ["Content-Type", "image/svg+xml"],
-      [
-        "Cache-Control",
-        `max-age=${CONSTANTS.FOUR_HOURS / 2}, s-maxage=${
-          CONSTANTS.FOUR_HOURS
-        }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-      ],
+      ["Cache-Control", `public, max-age=${CONSTANTS.FOUR_HOURS}`],
     ]);
   });
 
   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",
-        `max-age=7500, s-maxage=${15000}, stale-while-revalidate=${
-          CONSTANTS.ONE_DAY
-        }`,
-      ],
+      ["Cache-Control", `public, max-age=${15000}`],
     ]);
   });
 
@@ -177,54 +180,39 @@ describe("Test /api/", () => {
 
     expect(res.setHeader.mock.calls).toEqual([
       ["Content-Type", "image/svg+xml"],
-      ["Cache-Control", `no-cache, no-store, must-revalidate`],
+      ["Cache-Control", `no-store`],
     ]);
   });
 
   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",
-          `max-age=${CONSTANTS.ONE_DAY / 2}, s-maxage=${
-            CONSTANTS.ONE_DAY
-          }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-        ],
+        ["Cache-Control", `public, max-age=${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",
-          `max-age=${CONSTANTS.FOUR_HOURS / 2}, s-maxage=${
-            CONSTANTS.FOUR_HOURS
-          }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-        ],
+        ["Cache-Control", `public, max-age=${CONSTANTS.FOUR_HOURS}`],
       ]);
     }
 
     {
-      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",
-          `max-age=${CONSTANTS.FOUR_HOURS / 2}, s-maxage=${
-            CONSTANTS.FOUR_HOURS
-          }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
-        ],
+        ["Cache-Control", `public, max-age=${CONSTANTS.FOUR_HOURS}`],
       ]);
     }
   });
@@ -235,7 +223,7 @@ describe("Test /api/", () => {
         username: "anuraghazra",
         count_private: true,
       },
-      data_stats,
+      data,
     );
 
     await api(req, res);
@@ -260,39 +248,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/card.test.js

@@ -145,6 +145,7 @@ describe("Card", () => {
       "#fff",
     );
   });
+
   it("should render gradient backgrounds", () => {
     const { titleColor, textColor, iconColor, bgColor } = getCardColors({
       title_color: "f00",

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";
-const USER = "catelinemnemosyne";
+const REPO = "dummy-cra";
+const USER = "grsdummy";
 const STATS_DATA = {
-  name: "Cateline Mnemosyne",
-  totalPRs: 1,
-  totalCommits: 7,
+  name: "grsdummy",
+  totalPRs: 2,
+  totalCommits: 2,
   totalIssues: 1,
   totalStars: 1,
-  contributedTo: 1,
+  contributedTo: 2,
   rank: {
     level: "A+",
-    score: 50.893750297869225,
+    score: 51.01013099671447,
   },
 };
 
 const LANGS_DATA = {
+  TypeScript: {
+    color: "#3178c6",
+    name: "TypeScript",
+    size: 2049,
+  },
   HTML: {
     color: "#e34c26",
     name: "HTML",
@@ -37,19 +42,19 @@ const LANGS_DATA = {
     name: "CSS",
     size: 930,
   },
-  JavaScript: {
-    color: "#f1e05a",
-    name: "JavaScript",
-    size: 1912,
+  Python: {
+    color: "#3572A5",
+    name: "Python",
+    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,24 +62,24 @@ const WAKATIME_DATA = {
   range: "last_7_days",
   status: "pending_update",
   timeout: 15,
-  username: USER,
+  username: "grsdummy",
   writes_only: false,
 };
 
 const REPOSITORY_DATA = {
-  name: REPO,
-  nameWithOwner: `${USER}/cra-test`,
+  name: "dummy-cra",
+  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",
-    id: "MDg6TGFuZ3VhZ2UxNDA=",
-    name: "JavaScript",
+    color: "#3178c6",
+    id: "MDg6TGFuZ3VhZ2UyODc=",
+    name: "TypeScript",
   },
   forkCount: 0,
   starCount: 1,

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_stats = {
+const data = {
   data: {
     user: {
       name: "Anurag Hazra",
@@ -20,6 +19,15 @@ const data_stats = {
       followers: { totalCount: 100 },
       repositories: {
         totalCount: 5,
+      },
+    },
+  },
+};
+
+const firstRepositoriesData = {
+  data: {
+    user: {
+      repositories: {
         nodes: [
           { name: "test-repo-1", stargazers: { totalCount: 100 } },
           { name: "test-repo-2", stargazers: { totalCount: 100 } },
@@ -34,7 +42,7 @@ const data_stats = {
   },
 };
 
-const data_repo = {
+const secondRepositoriesData = {
   data: {
     user: {
       repositories: {
@@ -51,7 +59,7 @@ const data_repo = {
   },
 };
 
-const data_repo_zero_stars = {
+const repositoriesWithZeroStarsData = {
   data: {
     user: {
       repositories: {
@@ -85,12 +93,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)
+    .replyOnce(200, data)
     .onPost("https://api.github.com/graphql")
-    .replyOnce(200, data_repo);
+    .replyOnce(200, firstRepositoriesData);
+  // .onPost("https://api.github.com/graphql") // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
+  // .replyOnce(200, secondRepositoriesData); // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
 });
 
 afterEach(() => {
@@ -105,7 +114,8 @@ describe("Test fetchStats", () => {
       totalRepos: 5,
       followers: 100,
       contributions: 61,
-      stargazers: 300,
+      // stargazers: 400, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
+      stargazers: 300, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
       prs: 300,
       issues: 200,
     });
@@ -116,7 +126,8 @@ describe("Test fetchStats", () => {
       totalCommits: 100,
       totalIssues: 200,
       totalPRs: 300,
-      totalStars: 300,
+      // totalStars: 400, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
+      totalStars: 300, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
       rank,
     });
   });
@@ -125,9 +136,9 @@ describe("Test fetchStats", () => {
     mock.reset();
     mock
       .onPost("https://api.github.com/graphql")
-      .replyOnce(200, data_stats)
+      .replyOnce(200, data)
       .onPost("https://api.github.com/graphql")
-      .replyOnce(200, data_repo_zero_stars);
+      .replyOnce(200, repositoriesWithZeroStarsData);
 
     let stats = await fetchStats("anuraghazra");
     const rank = calculateRank({
@@ -167,7 +178,8 @@ describe("Test fetchStats", () => {
       totalRepos: 5,
       followers: 100,
       contributions: 61,
-      stargazers: 300,
+      // stargazers: 400, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
+      stargazers: 300, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
       prs: 300,
       issues: 200,
     });
@@ -178,7 +190,8 @@ describe("Test fetchStats", () => {
       totalCommits: 150,
       totalIssues: 200,
       totalPRs: 300,
-      totalStars: 300,
+      // totalStars: 400, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
+      totalStars: 300, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
       rank,
     });
   });
@@ -194,7 +207,8 @@ describe("Test fetchStats", () => {
       totalRepos: 5,
       followers: 100,
       contributions: 61,
-      stargazers: 300,
+      // stargazers: 400, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
+      stargazers: 300, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
       prs: 300,
       issues: 200,
     });
@@ -205,7 +219,8 @@ describe("Test fetchStats", () => {
       totalCommits: 1050,
       totalIssues: 200,
       totalPRs: 300,
-      totalStars: 300,
+      // totalStars: 400, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
+      totalStars: 300, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
       rank,
     });
   });
@@ -221,7 +236,8 @@ describe("Test fetchStats", () => {
       totalRepos: 5,
       followers: 100,
       contributions: 61,
-      stargazers: 200,
+      // stargazers: 300, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
+      stargazers: 200, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
       prs: 300,
       issues: 200,
     });
@@ -232,82 +248,8 @@ describe("Test fetchStats", () => {
       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({
-      totalCommits: 100,
-      totalRepos: 5,
-      followers: 100,
-      contributions: 61,
-      stargazers: 400,
-      prs: 300,
-      issues: 200,
-    });
-
-    expect(stats).toStrictEqual({
-      contributedTo: 61,
-      name: "Anurag Hazra",
-      totalCommits: 100,
-      totalIssues: 200,
-      totalPRs: 300,
-      totalStars: 400,
-      rank,
-    });
-  });
-
-  it("should fetch one page of stars if 'FETCH_MULTI_PAGE_STARS' env variable is set to `false`", async () => {
-    process.env.FETCH_MULTI_PAGE_STARS = "false";
-
-    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 fetch one page of stars if 'FETCH_MULTI_PAGE_STARS' env variable is not set", async () => {
-    process.env.FETCH_MULTI_PAGE_STARS = undefined;
-
-    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,
+      // totalStars: 300, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
+      totalStars: 200, // NOTE: Temporarily disable fetching of multiple pages. Done because of #2130.
       rank,
     });
   });

tests/renderStatsCard.test.js

@@ -239,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,
@@ -329,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',
@@ -344,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", () => {

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"],

tests/utils.test.js

@@ -1,48 +1,25 @@
 import { queryByTestId } from "@testing-library/dom";
 import "@testing-library/jest-dom";
 import {
+  chunkArray,
+  clampValue,
   encodeHTML,
+  fallbackColor,
+  flexLayout,
   getCardColors,
+  isValidGradient,
+  isValidHexColor,
   kFormatter,
+  lowercaseTrim,
+  measureText,
+  parseArray,
   parseBoolean,
+  parseEmojis,
   renderError,
   wrapTextMultiline,
 } from "../src/common/utils.js";
 
 describe("Test utils.js", () => {
-  it("should test kFormatter", () => {
-    expect(kFormatter(1)).toBe(1);
-    expect(kFormatter(-1)).toBe(-1);
-    expect(kFormatter(500)).toBe(500);
-    expect(kFormatter(1000)).toBe("1k");
-    expect(kFormatter(10000)).toBe("10k");
-    expect(kFormatter(12345)).toBe("12.3k");
-    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;^@%!))",
-    );
-  });
-
   it("should test renderError", () => {
     document.body.innerHTML = renderError("Something went wrong");
     expect(
@@ -62,11 +39,115 @@ describe("Test utils.js", () => {
     ).toHaveTextContent(/Secondary Message/gim);
   });
 
+  it("should test encodeHTML", () => {
+    expect(encodeHTML(`<html>hello world<,.#4^&^@%!))`)).toBe(
+      "&#60;html&#62;hello world&#60;,.#4^&#38;^@%!))",
+    );
+  });
+
+  it("should test kFormatter", () => {
+    expect(kFormatter(1)).toBe(1);
+    expect(kFormatter(-1)).toBe(-1);
+    expect(kFormatter(500)).toBe(500);
+    expect(kFormatter(1000)).toBe("1k");
+    expect(kFormatter(10000)).toBe("10k");
+    expect(kFormatter(12345)).toBe("12.3k");
+    expect(kFormatter(9900000)).toBe("9900k");
+  });
+
+  it("should test isValidHexColor", () => {
+    expect(isValidHexColor("00f000")).toBe(true);
+    expect(isValidHexColor("00f0003f")).toBe(true);
+    expect(isValidHexColor("0f03")).toBe(true);
+    expect(isValidHexColor("0f0")).toBe(true);
+
+    expect(isValidHexColor("00f00X")).toBe(false);
+    expect(isValidHexColor("#")).toBe(false);
+    expect(isValidHexColor("")).toBe(false);
+    expect(isValidHexColor("0")).toBe(false);
+    expect(isValidHexColor("00")).toBe(false);
+    expect(isValidHexColor("00f00")).toBe(false);
+    expect(isValidHexColor("00f00")).toBe(false);
+  });
+
+  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(undefined)).toBe(undefined);
+  });
+
+  it("should test parseArray", () => {
+    expect(parseArray("1")).toEqual(["1"]);
+    expect(parseArray("1,2,3")).toEqual(["1", "2", "3"]);
+    expect(parseArray("test")).toEqual(["test"]);
+  });
+
+  it("should test clampValue", () => {
+    expect(clampValue(1, 0, 2)).toBe(1);
+    expect(clampValue(1, 2, 3)).toBe(2);
+    expect(clampValue(1, 0, 0)).toBe(0);
+    expect(clampValue(1, 0, -1)).toBe(0);
+  });
+
+  it("should test isValidGradient", () => {
+    expect(isValidGradient(["90", "fff", "000"])).toBe(true);
+    expect(isValidGradient(["90", "fff", "000", "fff"])).toBe(true);
+
+    expect(isValidGradient(["fff", "fff", "fxf"])).toBe(false);
+    expect(isValidGradient(["90", "fff", "fxf"])).toBe(false);
+    expect(isValidGradient(["90", "fxf", ""])).toBe(false);
+  });
+
+  it("should test fallbackColor", () => {
+    expect(fallbackColor("fff", "000")).toBe("#fff");
+    expect(fallbackColor("fxf", "#000")).toBe("#000");
+    expect(fallbackColor("90,fff,000", "#000")).toStrictEqual([
+      "90",
+      "fff",
+      "000",
+    ]);
+    expect(fallbackColor("90,fff,fxf", "#000")).toBe("#000");
+  });
+
+  it("should test flexLayout", () => {
+    const items = Array(2).fill(`<g></g>`);
+
+    const columnLayout = flexLayout({
+      items,
+      gap: 25,
+      direction: "column",
+      sizes: [],
+    });
+    expect(columnLayout[0]).toContain("translate(0, 0)");
+    expect(columnLayout[1]).toContain("translate(0, 25)");
+
+    const rowLayout = flexLayout({
+      items,
+      gap: 25,
+      direction: "row",
+      sizes: [],
+    });
+    expect(rowLayout[0]).toContain("translate(0, 0)");
+    expect(rowLayout[1]).toContain("translate(25, 0)");
+
+    const sizedLayout = flexLayout({
+      items,
+      gap: 25,
+      direction: "row",
+      sizes: [25, 0],
+    });
+    expect(sizedLayout[0]).toContain("translate(0, 0)");
+    expect(sizedLayout[1]).toContain("translate(50, 0)");
+  });
+
   it("getCardColors: should return expected values", () => {
     let colors = getCardColors({
       title_color: "f00",
       text_color: "0f0",
-      ring_color: "0000ff",
       icon_color: "00f",
       bg_color: "fff",
       border_color: "fff",
@@ -76,7 +157,6 @@ describe("Test utils.js", () => {
       titleColor: "#f00",
       textColor: "#0f0",
       iconColor: "#00f",
-      ringColor: "#0000ff",
       bgColor: "#fff",
       borderColor: "#fff",
     });
@@ -95,7 +175,6 @@ describe("Test utils.js", () => {
       titleColor: "#2f80ed",
       textColor: "#0f0",
       iconColor: "#00f",
-      ringColor: "#2f80ed",
       bgColor: "#fff",
       borderColor: "#e4e2e2",
     });
@@ -108,41 +187,20 @@ 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", () => {
-  it("should not wrap small texts", () => {
+  it("wrapTextMultiline: should not wrap small texts", () => {
     {
       let multiLineText = wrapTextMultiline("Small text should not wrap");
       expect(multiLineText).toEqual(["Small text should not wrap"]);
     }
   });
-  it("should wrap large texts", () => {
+
+  it("wrapTextMultiline: should wrap large texts", () => {
     let multiLineText = wrapTextMultiline(
       "Hello world long long long text",
       20,
@@ -150,7 +208,8 @@ describe("wrapTextMultiline", () => {
     );
     expect(multiLineText).toEqual(["Hello world long", "long long text"]);
   });
-  it("should wrap large texts and limit max lines", () => {
+
+  it("wrapTextMultiline: should wrap large texts and limit max lines", () => {
     let multiLineText = wrapTextMultiline(
       "Hello world long long long text",
       10,
@@ -158,11 +217,41 @@ describe("wrapTextMultiline", () => {
     );
     expect(multiLineText).toEqual(["Hello", "world long..."]);
   });
-  it("should wrap chinese by punctuation", () => {
+
+  it("wrapTextMultiline: should wrap chinese by punctuation", () => {
     let multiLineText = wrapTextMultiline(
       "专门为刚开始刷题的同学准备的算法基地，没有最细只有更细，立志用动画将晦涩难懂的算法说的通俗易懂！",
     );
     expect(multiLineText.length).toEqual(3);
     expect(multiLineText[0].length).toEqual(18 * 8); // &#xxxxx; x 8
   });
+
+  it("should test measureText", () => {
+    expect(measureText("test")).toEqual(16.078125);
+
+    expect(measureText("test", 12)).toEqual(19.293750000000003);
+  });
+
+  it("should test lowercaseTrim", () => {
+    expect(lowercaseTrim("test")).toEqual("test");
+    expect(lowercaseTrim(" test ")).toEqual("test");
+    expect(lowercaseTrim(" Test ")).toEqual("test");
+  });
+
+  it("should test chunkArray", () => {
+    expect(chunkArray([1, 2, 3], 1)).toEqual([[1], [2], [3]]);
+    expect(chunkArray([1, 2, 3, 4, 5], 2)).toEqual([[1, 2], [3, 4], [5]]);
+    expect(chunkArray([1, 2, 3, 4, 5, 6, 7], 3)).toEqual([
+      [1, 2, 3],
+      [4, 5, 6],
+      [7],
+    ]);
+  });
+
+  it("should test parseEmojis", () => {
+    expect(parseEmojis("test")).toEqual("test");
+    expect(parseEmojis("test :smile:")).toEqual("test 😄");
+    expect(parseEmojis("test :smile: :+1:")).toEqual("test 😄 👍");
+    expect(parseEmojis("test :smile: :+1: :smile:")).toEqual("test 😄 👍 😄");
+  });
 });

themes/index.js

@@ -367,13 +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",
-  },
 };
 
 export default themes;