infra: getPrNumber fix

Corrects the Japanese language into more natural sentences.

.github/labeler.yml

@@ -1 +1,2 @@
 themes: themes/index.js
+doc-translation: docs/*

.github/workflows/preview-theme.yml

@@ -26,5 +26,3 @@ jobs:
         env:
           CI: true
           PERSONAL_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}

api/index.js

@@ -38,12 +38,7 @@ module.exports = async (req, res) => {
       parseBoolean(include_all_commits)
     );
   } catch (err) {
-    return res.send(
-      renderError(
-        err.message,
-        "Make sure the provided username is not an organization"
-      )
-    );
+    return res.send(renderError(err.message, err.secondaryMessage));
   }
 
   const cacheSeconds = clampValue(

api/pin.js

@@ -4,7 +4,6 @@ const {
   parseBoolean,
   clampValue,
   CONSTANTS,
-  logger,
 } = require("../src/common/utils");
 const fetchRepo = require("../src/fetchers/repo-fetcher");
 const renderRepoCard = require("../src/cards/repo-card");
@@ -29,8 +28,7 @@ module.exports = async (req, res) => {
   try {
     repoData = await fetchRepo(username, repo);
   } catch (err) {
-    logger.error(err);
-    return res.send(renderError(err.message));
+    return res.send(renderError(err.message, err.secondaryMessage));
   }
 
   let cacheSeconds = clampValue(

api/top-langs.js

@@ -30,7 +30,7 @@ module.exports = async (req, res) => {
   try {
     topLangs = await fetchTopLanguages(username);
   } catch (err) {
-    return res.send(renderError(err.message));
+    return res.send(renderError(err.message, err.secondaryMessage));
   }
 
   const cacheSeconds = clampValue(

docs/readme_ja.md

@@ -290,14 +290,14 @@ NOTE: [#58](https://github.com/anuraghazra/github-readme-stats/pull/58) 以降
 
 ## :sparkling_heart: Support the project
 
-私はできる限りのことをオープンソースで行い、これらのプロジェクトを利用して支援を必要としている皆さんに返信するようにしています。もちろんです。
-これは時間がかかります。無料でご利用いただけます。
+私はできる限りのことをオープンソースで行い、これらのプロジェクトを利用して支援を必要としている皆さんに返信するようにしています。
+もちろんそれには時間が掛かる場合がありますが、無料でご利用いただけます。
 
 しかし、もしあなたがこのプロジェクトを使っていて、それに満足しているのであれば、あるいは単に私にものを作り続けることを奨励したいのであれば、いくつかの方法があります。
 
 - あなたの readme で github-readme-stats を使用して適切なクレジットを付与し、それにリンクします (´∀` )
-- 主演とプロジェクトの共有 :rocket:
-- [![paypal.me/anuraghazra](https://ionicabizau.github.io/badges/paypal.svg)](https://www.paypal.me/anuraghazra) - PayPal を介して 1 回限りの寄付を行うことができます。私はおそらく ~~コーヒー~~ お茶買うでしょう。 :tea:
+- このプロジェクトにスターを贈り、他の人達にもシェアしてください :rocket:
+- [![paypal.me/anuraghazra](https://ionicabizau.github.io/badges/paypal.svg)](https://www.paypal.me/anuraghazra) - PayPal を介して 1 回限りの寄付を行うことができます。私はおそらく ~~コーヒー~~ お茶を買うでしょう。 :tea:
 
 Thanks! :heart:
 

scripts/preview-theme.js

@@ -3,21 +3,25 @@ const github = require("@actions/github");
 const parse = require("parse-diff");
 require("dotenv").config();
 
-const parsePullRequestId = (githubRef) => {
-  const result = /refs\/pull\/(\d+)\/merge/g.exec(githubRef);
-  if (!result) {
-    console.log("Reference not found.");
-    return 297;
+function getPrNumber() {
+  const pullRequest = github.context.payload.pull_request;
+  if (!pullRequest) {
+    return undefined;
   }
-  const [, pullRequestId] = result;
-  return pullRequestId;
-};
+
+  return pullRequest.number;
+}
 
 async function run() {
   try {
     const token = core.getInput("token");
     const octokit = github.getOctokit(token || process.env.PERSONAL_TOKEN);
-    const pullRequestId = parsePullRequestId(process.env.GITHUB_REF);
+    const pullRequestId = getPrNumber();
+
+    if (!pullRequestId) {
+      console.log("PR not found");
+      return;
+    }
 
     let res = await octokit.pulls.get({
       owner: "anuraghazra",

src/common/retryer.js

@@ -1,8 +1,8 @@
-const { logger } = require("../common/utils");
+const { logger, CustomError } = require("../common/utils");
 
 const retryer = async (fetcher, variables, retries = 0) => {
   if (retries > 7) {
-    throw new Error("Maximum retries exceeded");
+    throw new CustomError("Maximum retries exceeded", CustomError.MAX_RETRY);
   }
   try {
     logger.log(`Trying PAT_${retries + 1}`);

src/common/utils.js

@@ -14,7 +14,7 @@ const renderError = (message, secondaryMessage = "") => {
     <text x="25" y="45" class="text">Something went wrong! file an issue at https://git.io/JJmN9</text>
     <text data-testid="message" x="25" y="55" class="text small">
       <tspan x="25" dy="18">${encodeHTML(message)}</tspan>
-      <tspan x="25" dy="18"  class="gray">${secondaryMessage}</tspan>
+      <tspan x="25" dy="18" class="gray">${secondaryMessage}</tspan>
     </text>
     </svg>
   `;
@@ -170,6 +170,23 @@ const CONSTANTS = {
   ONE_DAY: 86400,
 };
 
+const SECONDARY_ERROR_MESSAGES = {
+  MAX_RETRY:
+    "Please add an env variable called PAT_1 with your github token in vercel",
+  USER_NOT_FOUND: "Make sure the provided username is not an organization",
+};
+
+class CustomError extends Error {
+  constructor(message, type) {
+    super(message);
+    this.type = type;
+    this.secondaryMessage = SECONDARY_ERROR_MESSAGES[type] || "adsad";
+  }
+
+  static MAX_RETRY = "MAX_RETRY";
+  static USER_NOT_FOUND = "USER_NOT_FOUND";
+}
+
 module.exports = {
   renderError,
   kFormatter,
@@ -185,4 +202,5 @@ module.exports = {
   wrapTextMultiline,
   logger,
   CONSTANTS,
+  CustomError,
 };

src/fetchers/stats-fetcher.js

@@ -1,4 +1,4 @@
-const { request, logger } = require("../common/utils");
+const { request, logger, CustomError } = require("../common/utils");
 const axios = require("axios");
 const retryer = require("../common/retryer");
 const calculateRank = require("../calculateRank");
@@ -109,7 +109,10 @@ async function fetchStats(
 
   if (res.data.errors) {
     logger.error(res.data.errors);
-    throw Error(res.data.errors[0].message || "Could not fetch user");
+    throw new CustomError(
+      res.data.errors[0].message || "Could not fetch user",
+      CustomError.USER_NOT_FOUND
+    );
   }
 
   const user = res.data.data.user;

themes/README.md

@@ -22,10 +22,10 @@ Use `?theme=THEME_NAME` parameter like so :-
 | `highcontrast` ![highcontrast][highcontrast] | `dracula` ![dracula][dracula] | `prussian` ![prussian][prussian] |
 | `monokai` ![monokai][monokai] | `vue` ![vue][vue] | `shades-of-purple` ![shades-of-purple][shades-of-purple] |
 | `nightowl` ![nightowl][nightowl] | `buefy` ![buefy][buefy] | `blue-green` ![blue-green][blue-green] |
-| `algolia` ![algolia][algolia] | `great-gatsby` ![great-gatsby][great-gatsby] | `bear` ![bear][bear] |
-| `solarized-dark` ![solarized-dark][solarized-dark] | `solarized-light` ![solarized-light][solarized-light] | `nord` ![nord][nord] |
-| `gotham` ![gotham][gotham] | `material-palenight` ![material-palenight][material-palenight] | `graywhite` ![graywhite][graywhite] |
-| `vue-dark` ![vue-dark][vue-dark] |  | [Add your theme][add-theme] |
+| `algolia` ![algolia][algolia] | `great-gatsby` ![great-gatsby][great-gatsby] | `darcula` ![darcula][darcula] |
+| `bear` ![bear][bear] | `solarized-dark` ![solarized-dark][solarized-dark] | `solarized-light` ![solarized-light][solarized-light] |
+| `nord` ![nord][nord] | `gotham` ![gotham][gotham] | `material-palenight` ![material-palenight][material-palenight] |
+| `graywhite` ![graywhite][graywhite] | `vue-dark` ![vue-dark][vue-dark] | [Add your theme][add-theme] |
 
 ## Repo Card
 
@@ -39,10 +39,10 @@ Use `?theme=THEME_NAME` parameter like so :-
 | `highcontrast` ![highcontrast][highcontrast_repo] | `dracula` ![dracula][dracula_repo] | `prussian` ![prussian][prussian_repo] |
 | `monokai` ![monokai][monokai_repo] | `vue` ![vue][vue_repo] | `shades-of-purple` ![shades-of-purple][shades-of-purple_repo] |
 | `nightowl` ![nightowl][nightowl_repo] | `buefy` ![buefy][buefy_repo] | `blue-green` ![blue-green][blue-green_repo] |
-| `algolia` ![algolia][algolia_repo] | `great-gatsby` ![great-gatsby][great-gatsby_repo] | `bear` ![bear][bear_repo] |
-| `solarized-dark` ![solarized-dark][solarized-dark_repo] | `solarized-light` ![solarized-light][solarized-light_repo] | `nord` ![nord][nord_repo] |
-| `gotham` ![gotham][gotham_repo] | `material-palenight` ![material-palenight][material-palenight_repo] | `graywhite` ![graywhite][graywhite_repo] |
-| `vue-dark` ![vue-dark][vue-dark_repo] |  | [Add your theme][add-theme] |
+| `algolia` ![algolia][algolia_repo] | `great-gatsby` ![great-gatsby][great-gatsby_repo] | `darcula` ![darcula][darcula_repo] |
+| `bear` ![bear][bear_repo] | `solarized-dark` ![solarized-dark][solarized-dark_repo] | `solarized-light` ![solarized-light][solarized-light_repo] |
+| `nord` ![nord][nord_repo] | `gotham` ![gotham][gotham_repo] | `material-palenight` ![material-palenight][material-palenight_repo] |
+| `graywhite` ![graywhite][graywhite_repo] | `vue-dark` ![vue-dark][vue-dark_repo] | [Add your theme][add-theme] |
 
 
 [default]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=default
@@ -66,6 +66,7 @@ Use `?theme=THEME_NAME` parameter like so :-
 [blue-green]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=blue-green
 [algolia]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=algolia
 [great-gatsby]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=great-gatsby
+[darcula]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=darcula
 [bear]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=bear
 [solarized-dark]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=solarized-dark
 [solarized-light]: https://github-readme-stats.vercel.app/api?username=anuraghazra&show_icons=true&hide=contribs,prs&cache_seconds=86400&theme=solarized-light
@@ -97,6 +98,7 @@ Use `?theme=THEME_NAME` parameter like so :-
 [blue-green_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=blue-green
 [algolia_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=algolia
 [great-gatsby_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=great-gatsby
+[darcula_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=darcula
 [bear_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=bear
 [solarized-dark_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=solarized-dark
 [solarized-light_repo]: https://github-readme-stats.vercel.app/api/pin/?username=anuraghazra&repo=github-readme-stats&cache_seconds=86400&theme=solarized-light