From b805b8708e813fc98a2a07fd8074dac8bbb2433f Mon Sep 17 00:00:00 2001
From: lowlighter <22963968+lowlighter@users.noreply.github.com>
Date: Mon, 26 Oct 2020 21:04:45 +0100
Subject: [PATCH] Rename pagespeed plugin and handle music token correctly

---
 README.md                   |  8 ++++----
 action.yml                  |  2 +-
 action/dist/index.js        | 22 +++++++++++-----------
 action/index.mjs            |  8 ++++----
 src/plugins/music/index.mjs | 14 +++++++-------
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 0fbaebf9..2409186f 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Generates your own GitHub metrics as an SVG image to put them on your profile pa
 
 But there's more with [plugins](https://github.com/lowlighter/metrics/tree/master/src/plugins) and [templates](https://github.com/lowlighter/metrics/tree/master/src/templates) !
 
-| PageSpeed plugin      | Music plugin          | Languages plugin      | 
+| PageSpeed plugin      | Music plugin          | Languages plugin      |
 | :-------------------: | :-------------------: | :-------------------: |
 |[<img src="https://github.com/lowlighter/lowlighter/blob/master/metrics.plugin.pagespeed.svg" alt="" width="240">](https://github.com/lowlighter/lowlighter/blob/master/metrics.plugin.pagespeed.svg)|[<img src="https://github.com/lowlighter/lowlighter/blob/master/metrics.plugin.music.svg" alt="" width="240">](https://github.com/lowlighter/lowlighter/blob/master/metrics.plugin.music.svg)|[<img src="https://github.com/lowlighter/lowlighter/blob/master/metrics.plugin.languages.svg" alt="" width="240">](https://github.com/lowlighter/lowlighter/blob/master/metrics.plugin.languages.svg)|
 | **Follow-up plugin**  | **Habits plugin**     | **Other plugins**     |
@@ -68,7 +68,7 @@ Go to the `Settings` of your personal repository to create a new secret and past
 
 #### 3. Create a new GitHub Action workflow on your personal repo
 
-Create a new workflow from the `Actions` tab of your personal repository and paste the following : 
+Create a new workflow from the `Actions` tab of your personal repository and paste the following :
 
 ```yaml
 name: GitHub metrics as SVG image
@@ -275,7 +275,7 @@ Plugins are disabled by default, but you can pass `?<plugin>=1` to enable a spec
 For example, to enable `music` plugin, pass `?music=1` to url.
 
 Plugin options can be passed with `?<plugin>.<option>=<value>`.
-For example, to configure `music` plugin, you could add the following to url : `?music=1&music.provider=spotify&music.mode=recent&music.limit=4`. 
+For example, to configure `music` plugin, you could add the following to url : `?music=1&music.provider=spotify&music.mode=recent&music.limit=4`.
 
 </details>
 
@@ -344,7 +344,7 @@ Add the following to your workflow :
   with:
     # ... other options
     plugin_pagespeed: yes
-    pagespeed_token: ${{ secrets.PAGESPEED_TOKEN }}
+    plugin_pagespeed_token: ${{ secrets.PAGESPEED_TOKEN }}
 ```
 
 </details>
diff --git a/action.yml b/action.yml
index 6d0d1846..fd4ca92c 100644
--- a/action.yml
+++ b/action.yml
@@ -77,7 +77,7 @@ inputs:
 
   # When PageSpeed plugin is enabled, it is advised to generate a token to avoid the rate-limiter
   # See https://developers.google.com/speed/docs/insights/v5/get-started for more informations
-  pagespeed_token:
+  plugin_pagespeed_token:
     description: Google Pagespeed Personal Token
     default: ""
 
diff --git a/action/dist/index.js b/action/dist/index.js
index 10e3b6eb..66e8373f 100644
--- a/action/dist/index.js
+++ b/action/dist/index.js
@@ -335,13 +335,13 @@ var E_Users_lecoq_Documents_GitHub_gitstats_node_modules_axios_index_default = /
           //Mode
             if (!(mode in modes))
               throw {error:{message:`Unsupported mode "${mode}"`}, ...raw}
-            //Playlist mode
-              if (mode === "playlist") {
-                if (!playlist)
-                  throw {error:{message:`Missing playlist url`}, ...raw}
-                if (!providers[provider].embed.test(playlist))
-                  throw {error:{message:`Unsupported playlist url format`}, ...raw}
-              }
+          //Playlist mode
+            if (mode === "playlist") {
+              if (!playlist)
+                throw {error:{message:`Missing playlist url`}, ...raw}
+              if (!providers[provider].embed.test(playlist))
+                throw {error:{message:`Unsupported playlist url format`}, ...raw}
+            }
           //Limit
             limit = Math.max(1, Math.min(100, Number(limit)))
 
@@ -880,18 +880,19 @@ var E_Users_lecoq_Documents_GitHub_gitstats_node_modules_actions_github_lib_gith
       //Additional plugins options
         //Pagespeed
           if (plugins.pagespeed.enabled) {
-            plugins.pagespeed.token = core.getInput("pagespeed_token")
+            plugins.pagespeed.token = core.getInput("plugin_pagespeed_token")
             console.log(`Pagespeed token     | ${plugins.pagespeed.token ? "provided" : "missing"}`)
           }
         //Music
           if (plugins.music.enabled) {
-            for (const option of ["provider", "token", "mode", "playlist", "limit"])
+            for (const option of ["provider", "mode", "playlist", "limit"])
               q[`music.${option}`] = core.getInput(`plugin_music_${option}`) || ""
             console.log(`Music provider      | ${q["music.provider"]}`)
-            console.log(`Music token         | ${q["music.token"] ? "provided" : "missing"}`)
             console.log(`Music plugin mode   | ${q["music.mode"]}`)
             console.log(`Music playlist      | ${q["music.playlist"]}`)
             console.log(`Music tracks limit  | ${q["music.limit"]}`)
+            plugins.music.token = core.getInput("plugin_music_token") || ""
+            console.log(`Music token         | ${plugins.music.token ? "provided" : "missing"}`)
           }
 
       //Repositories to use
@@ -904,7 +905,6 @@ var E_Users_lecoq_Documents_GitHub_gitstats_node_modules_actions_github_lib_gith
 
       //Built query
         q = {...q, ...base, repositories, template}
-        console.debug(JSON.stringify(q))
 
       //Render metrics
         const rendered = await metrics({login:user, q}, {graphql, rest, plugins, conf, die})
diff --git a/action/index.mjs b/action/index.mjs
index 24f64b24..9299fdba 100644
--- a/action/index.mjs
+++ b/action/index.mjs
@@ -86,18 +86,19 @@
       //Additional plugins options
         //Pagespeed
           if (plugins.pagespeed.enabled) {
-            plugins.pagespeed.token = core.getInput("pagespeed_token")
+            plugins.pagespeed.token = core.getInput("plugin_pagespeed_token")
             console.log(`Pagespeed token     | ${plugins.pagespeed.token ? "provided" : "missing"}`)
           }
         //Music
           if (plugins.music.enabled) {
-            for (const option of ["provider", "token", "mode", "playlist", "limit"])
+            for (const option of ["provider", "mode", "playlist", "limit"])
               q[`music.${option}`] = core.getInput(`plugin_music_${option}`) || ""
             console.log(`Music provider      | ${q["music.provider"]}`)
-            console.log(`Music token         | ${q["music.token"] ? "provided" : "missing"}`)
             console.log(`Music plugin mode   | ${q["music.mode"]}`)
             console.log(`Music playlist      | ${q["music.playlist"]}`)
             console.log(`Music tracks limit  | ${q["music.limit"]}`)
+            plugins.music.token = core.getInput("plugin_music_token") || ""
+            console.log(`Music token         | ${plugins.music.token ? "provided" : "missing"}`)
           }
 
       //Repositories to use
@@ -110,7 +111,6 @@
 
       //Built query
         q = {...q, ...base, repositories, template}
-        console.debug(JSON.stringify(q))
 
       //Render metrics
         const rendered = await metrics({login:user, q}, {graphql, rest, plugins, conf, die})
diff --git a/src/plugins/music/index.mjs b/src/plugins/music/index.mjs
index 2d2415bc..a59e75cd 100644
--- a/src/plugins/music/index.mjs
+++ b/src/plugins/music/index.mjs
@@ -48,13 +48,13 @@
           //Mode
             if (!(mode in modes))
               throw {error:{message:`Unsupported mode "${mode}"`}, ...raw}
-            //Playlist mode
-              if (mode === "playlist") {
-                if (!playlist)
-                  throw {error:{message:`Missing playlist url`}, ...raw}
-                if (!providers[provider].embed.test(playlist))
-                  throw {error:{message:`Unsupported playlist url format`}, ...raw}
-              }
+          //Playlist mode
+            if (mode === "playlist") {
+              if (!playlist)
+                throw {error:{message:`Missing playlist url`}, ...raw}
+              if (!providers[provider].embed.test(playlist))
+                throw {error:{message:`Unsupported playlist url format`}, ...raw}
+            }
           //Limit
             limit = Math.max(1, Math.min(100, Number(limit)))