diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 754519c1..ecaa4680 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -424,7 +424,7 @@ Here's an example: ```yaml name: "🧩 Plugin name (with emoji icon)" cost: Estimates how many GitHub requests is used during plugin execution ("N/A" for Third-Party services) -categorie: github # Plugin categorie ("github", "social" or "other") +category: github # Plugin category ("github", "social" or "other") index: ~ # Leave as it (this is used to order plugins on metrics README.md) supports: - user # Support users account diff --git a/source/app/metrics/metadata.mjs b/source/app/metrics/metadata.mjs index 6722a9ab..2569ecb0 100644 --- a/source/app/metrics/metadata.mjs +++ b/source/app/metrics/metadata.mjs @@ -30,7 +30,7 @@ export default async function metadata({log = true} = {}) { } //Reorder keys const {base, core, ...plugins} = Plugins //eslint-disable-line no-unused-vars - Plugins = Object.fromEntries(Object.entries(Plugins).sort(([_an, a], [_bn, b]) => a.categorie === b.categorie ? (a.index ?? Infinity) - (b.index ?? Infinity) : categories.indexOf(a.categorie) - categories.indexOf(b.categorie))) + Plugins = Object.fromEntries(Object.entries(Plugins).sort(([_an, a], [_bn, b]) => a.category === b.category ? (a.index ?? Infinity) - (b.index ?? Infinity) : categories.indexOf(a.category) - categories.indexOf(b.category))) logger(`metrics/metadata > loaded [${Object.keys(Plugins).join(", ")}]`) //Load templates metadata let Templates = {} @@ -64,9 +64,9 @@ metadata.plugin = async function({__plugins, name, logger}) { const raw = `${await fs.promises.readFile(path.join(__plugins, name, "metadata.yml"), "utf-8")}` const {inputs, ...meta} = yaml.load(raw) - //Categorie - if (!categories.includes(meta.categorie)) - meta.categorie = "other" + //category + if (!categories.includes(meta.category)) + meta.category = "other" //Inputs parser { diff --git a/source/app/web/instance.mjs b/source/app/web/instance.mjs index c77f42bb..395e7ca2 100644 --- a/source/app/web/instance.mjs +++ b/source/app/web/instance.mjs @@ -81,10 +81,10 @@ export default async function({mock, nosettings} = {}) { const limiter = ratelimit({max:debug ? Number.MAX_SAFE_INTEGER : 60, windowMs:60 * 1000, headers:false}) const metadata = Object.fromEntries( Object.entries(conf.metadata.plugins) - .map(([key, value]) => [key, Object.fromEntries(Object.entries(value).filter(([key]) => ["name", "icon", "categorie", "web", "supports"].includes(key)))]) + .map(([key, value]) => [key, Object.fromEntries(Object.entries(value).filter(([key]) => ["name", "icon", "category", "web", "supports"].includes(key)))]) .map(([key, value]) => [key, key === "core" ? {...value, web:Object.fromEntries(Object.entries(value.web).filter(([key]) => /^config[.]/.test(key)).map(([key, value]) => [key.replace(/^config[.]/, ""), value]))} : value]), ) - const enabled = Object.entries(metadata).filter(([_name, {categorie}]) => categorie !== "core").map(([name]) => ({name, enabled:plugins[name]?.enabled ?? false})) + const enabled = Object.entries(metadata).filter(([_name, {category}]) => category !== "core").map(([name]) => ({name, enabled:plugins[name]?.enabled ?? false})) const templates = Object.entries(Templates).map(([name]) => ({name, enabled:(conf.settings.templates.enabled.length ? conf.settings.templates.enabled.includes(name) : true) ?? false})) const actions = {flush:new Map()} let requests = {limit:0, used:0, remaining:0, reset:NaN} diff --git a/source/plugins/achievements/metadata.yml b/source/plugins/achievements/metadata.yml index 40582504..9eb5bdb9 100644 --- a/source/plugins/achievements/metadata.yml +++ b/source/plugins/achievements/metadata.yml @@ -1,6 +1,6 @@ name: "🏆 Achievements" cost: ~5 GraphQL request -categorie: github +category: github index: 17 supports: - user diff --git a/source/plugins/activity/metadata.yml b/source/plugins/activity/metadata.yml index 0aa80b2e..4ccdde6e 100644 --- a/source/plugins/activity/metadata.yml +++ b/source/plugins/activity/metadata.yml @@ -1,6 +1,6 @@ name: "📰 Recent activity" cost: 1 REST request per 100 events -categorie: github +category: github index: 16 supports: - user diff --git a/source/plugins/anilist/metadata.yml b/source/plugins/anilist/metadata.yml index 84edd810..7d6b43a5 100644 --- a/source/plugins/anilist/metadata.yml +++ b/source/plugins/anilist/metadata.yml @@ -1,6 +1,6 @@ name: "🌸 Anilist watch list and reading list" cost: N/A -categorie: social +category: social index: 4 supports: - user diff --git a/source/plugins/base/metadata.yml b/source/plugins/base/metadata.yml index c1d56109..3ac1b414 100644 --- a/source/plugins/base/metadata.yml +++ b/source/plugins/base/metadata.yml @@ -1,6 +1,6 @@ name: "🗃️ Base content" cost: 2 GraphQL requests + 1 GraphQL request per 100 repositories fetched -categorie: core +category: core supports: - user - organization diff --git a/source/plugins/contributors/metadata.yml b/source/plugins/contributors/metadata.yml index 6aa817a6..92f68b93 100644 --- a/source/plugins/contributors/metadata.yml +++ b/source/plugins/contributors/metadata.yml @@ -1,6 +1,6 @@ name: "🏅 Repository contributors" cost: N/A -categorie: github +category: github index: 5 supports: - repository diff --git a/source/plugins/core/metadata.yml b/source/plugins/core/metadata.yml index fa30588b..c23bb19c 100644 --- a/source/plugins/core/metadata.yml +++ b/source/plugins/core/metadata.yml @@ -1,6 +1,6 @@ name: "🧱 Core" cost: N/A -categorie: core +category: core supports: - user - organization diff --git a/source/plugins/followup/metadata.yml b/source/plugins/followup/metadata.yml index 9d41b53b..a0d75f8e 100644 --- a/source/plugins/followup/metadata.yml +++ b/source/plugins/followup/metadata.yml @@ -1,6 +1,6 @@ name: "🎟️ Follow-up of issues and pull requests" cost: 0 API request (1 GraphQL request if "user" section is enabled) -categorie: github +category: github index: 11 supports: - user @@ -22,4 +22,4 @@ inputs: default: repositories values: - repositories # Overall status of issues and pull requests on your repositories - - user # Overall status of issues and pull requests you have created on GitHub \ No newline at end of file + - user # Overall status of issues and pull requests you have created on GitHub diff --git a/source/plugins/gists/metadata.yml b/source/plugins/gists/metadata.yml index 607e91d1..acf66bd3 100644 --- a/source/plugins/gists/metadata.yml +++ b/source/plugins/gists/metadata.yml @@ -1,6 +1,6 @@ name: "🎫 Gists" cost: 1 GraphQL request per 100 gists -categorie: github +category: github index: 10 supports: - user diff --git a/source/plugins/habits/metadata.yml b/source/plugins/habits/metadata.yml index 4da802af..8192692a 100644 --- a/source/plugins/habits/metadata.yml +++ b/source/plugins/habits/metadata.yml @@ -1,6 +1,6 @@ name: "💡 Coding habits" cost: 1 REST request per 100 events + 1 REST request pet commit -categorie: github +category: github index: 3 supports: - user diff --git a/source/plugins/introduction/metadata.yml b/source/plugins/introduction/metadata.yml index a8fd988d..8e6113e9 100644 --- a/source/plugins/introduction/metadata.yml +++ b/source/plugins/introduction/metadata.yml @@ -1,6 +1,6 @@ name: "🙋 Introduction" cost: 1 GraphQL request -categorie: github +category: github index: 2 supports: - user diff --git a/source/plugins/isocalendar/metadata.yml b/source/plugins/isocalendar/metadata.yml index 1fcd790f..6f24f8de 100644 --- a/source/plugins/isocalendar/metadata.yml +++ b/source/plugins/isocalendar/metadata.yml @@ -1,6 +1,6 @@ name: "📅 Isometric commit calendar" cost: 2-3 REST requests -categorie: github +category: github index: 0 supports: - user diff --git a/source/plugins/languages/metadata.yml b/source/plugins/languages/metadata.yml index 91746959..b306b247 100644 --- a/source/plugins/languages/metadata.yml +++ b/source/plugins/languages/metadata.yml @@ -1,6 +1,6 @@ name: "🈷️ Most used languages" cost: 0 API request (1 per 100 events fetched when using recently-used section) -categorie: github +category: github index: 1 supports: - user @@ -106,4 +106,4 @@ inputs: type: number default: 14 min: 0 - max: 365 \ No newline at end of file + max: 365 diff --git a/source/plugins/licenses/index.mjs b/source/plugins/licenses/index.mjs index 4d2261b4..0a5fd3da 100644 --- a/source/plugins/licenses/index.mjs +++ b/source/plugins/licenses/index.mjs @@ -115,7 +115,7 @@ export default async function({login, q, imports, data, graphql, queries, accoun } } -/**Licenses colorizer (based on categorie) */ +/**Licenses colorizer (based on category) */ function colors(licenses) { for (const [license, value] of Object.entries(licenses)) { const [permissions, conditions] = [value.permissions, value.conditions].map(properties => properties.map(({key}) => key)) diff --git a/source/plugins/licenses/metadata.yml b/source/plugins/licenses/metadata.yml index 238e7adc..1ca049e6 100644 --- a/source/plugins/licenses/metadata.yml +++ b/source/plugins/licenses/metadata.yml @@ -1,6 +1,6 @@ name: "📜 Repository licenses" cost: N/A -categorie: github +category: github index: 4 supports: - repository diff --git a/source/plugins/lines/metadata.yml b/source/plugins/lines/metadata.yml index 5e0a4b46..a858c842 100644 --- a/source/plugins/lines/metadata.yml +++ b/source/plugins/lines/metadata.yml @@ -1,6 +1,6 @@ name: "👨‍💻 Lines of code changed" cost: 1 REST request per repository -categorie: github +category: github index: 12 supports: - user diff --git a/source/plugins/music/metadata.yml b/source/plugins/music/metadata.yml index 1e3c166b..796f31c9 100644 --- a/source/plugins/music/metadata.yml +++ b/source/plugins/music/metadata.yml @@ -1,6 +1,6 @@ name: "🎼 Music plugin" cost: N/A -categorie: social +category: social index: 2 supports: - user diff --git a/source/plugins/nightscout/metadata.yml b/source/plugins/nightscout/metadata.yml index 1dff71f5..f22a4580 100644 --- a/source/plugins/nightscout/metadata.yml +++ b/source/plugins/nightscout/metadata.yml @@ -1,6 +1,6 @@ name: "💉 Nightscout" cost: N/A -categorie: other +category: other index: 3 supports: - user diff --git a/source/plugins/notable/metadata.yml b/source/plugins/notable/metadata.yml index 7f7f9668..41588d31 100644 --- a/source/plugins/notable/metadata.yml +++ b/source/plugins/notable/metadata.yml @@ -1,6 +1,6 @@ name: "🎩 Notable contributions" cost: 1 GraphQL request per 100 repositories fetched -categorie: github +category: github index: 18 supports: - user diff --git a/source/plugins/pagespeed/metadata.yml b/source/plugins/pagespeed/metadata.yml index e695cb93..f6026bae 100644 --- a/source/plugins/pagespeed/metadata.yml +++ b/source/plugins/pagespeed/metadata.yml @@ -1,6 +1,6 @@ name: "⏱️ Website performances" cost: N/A -categorie: social +category: social index: 1 supports: - user diff --git a/source/plugins/people/metadata.yml b/source/plugins/people/metadata.yml index 1b5fab92..ec5d478b 100644 --- a/source/plugins/people/metadata.yml +++ b/source/plugins/people/metadata.yml @@ -1,6 +1,6 @@ name: "🧑‍🤝‍🧑 People plugin" cost: 1 GraphQL request per 100 users + 1 REST request per user in "plugin_people_thanks" -categorie: github +category: github index: 9 supports: - user @@ -79,4 +79,4 @@ inputs: plugin_people_shuffle: description: Shuffle users type: boolean - default: no \ No newline at end of file + default: no diff --git a/source/plugins/posts/metadata.yml b/source/plugins/posts/metadata.yml index f8639c5a..9af5132f 100644 --- a/source/plugins/posts/metadata.yml +++ b/source/plugins/posts/metadata.yml @@ -1,6 +1,6 @@ name: "✒️ Recent posts" cost: N/A -categorie: social +category: social index: 6 supports: - user diff --git a/source/plugins/projects/metadata.yml b/source/plugins/projects/metadata.yml index a22740ee..58ce8bde 100644 --- a/source/plugins/projects/metadata.yml +++ b/source/plugins/projects/metadata.yml @@ -1,6 +1,6 @@ name: "🗂️ Active projects" cost: 1 GraphQL request + 1 GraphQL request per repository project -categorie: github +category: github index: 15 supports: - user @@ -39,4 +39,4 @@ inputs: plugin_projects_descriptions: description: Display projects descriptions type: boolean - default: no \ No newline at end of file + default: no diff --git a/source/plugins/reactions/metadata.yml b/source/plugins/reactions/metadata.yml index f5d8f1d3..caa63bc9 100644 --- a/source/plugins/reactions/metadata.yml +++ b/source/plugins/reactions/metadata.yml @@ -1,6 +1,6 @@ name: "🎭 Comment reactions" cost: 1 GraphQL request per 100 issues and issues comments fetched -categorie: github +category: github index: 8 supports: - user diff --git a/source/plugins/rss/metadata.yml b/source/plugins/rss/metadata.yml index 5ed866a0..bfc4b1cb 100644 --- a/source/plugins/rss/metadata.yml +++ b/source/plugins/rss/metadata.yml @@ -1,6 +1,6 @@ name: "🗼 Rss feed" cost: N/A -categorie: social +category: social index: 6.5 supports: - user diff --git a/source/plugins/screenshot/metadata.yml b/source/plugins/screenshot/metadata.yml index 419b0537..48f5e899 100644 --- a/source/plugins/screenshot/metadata.yml +++ b/source/plugins/screenshot/metadata.yml @@ -1,6 +1,6 @@ name: "📸 Website screenshot" cost: N/A -categorie: other +category: other index: 2 supports: - user diff --git a/source/plugins/skyline/metadata.yml b/source/plugins/skyline/metadata.yml index f94b3673..24dd59d5 100644 --- a/source/plugins/skyline/metadata.yml +++ b/source/plugins/skyline/metadata.yml @@ -1,6 +1,6 @@ name: "🌇 GitHub Skyline 3D calendar" cost: N/A -categorie: github +category: github index: 20 supports: - user diff --git a/source/plugins/stackoverflow/metadata.yml b/source/plugins/stackoverflow/metadata.yml index 2fe68dd7..342e9cbf 100644 --- a/source/plugins/stackoverflow/metadata.yml +++ b/source/plugins/stackoverflow/metadata.yml @@ -1,6 +1,6 @@ name: "🗨️ Stackoverflow plugin" cost: N/A -categorie: social +category: social index: 5 supports: - user diff --git a/source/plugins/stargazers/metadata.yml b/source/plugins/stargazers/metadata.yml index bd29e290..950319b6 100644 --- a/source/plugins/stargazers/metadata.yml +++ b/source/plugins/stargazers/metadata.yml @@ -1,6 +1,6 @@ name: "✨ Stargazers over last weeks" cost: 1 GraphQL request per 100 stargazers -categorie: github +category: github index: 14 supports: - user diff --git a/source/plugins/stars/metadata.yml b/source/plugins/stars/metadata.yml index e82526c5..9ea8daae 100644 --- a/source/plugins/stars/metadata.yml +++ b/source/plugins/stars/metadata.yml @@ -1,6 +1,6 @@ name: "🌟 Recently starred repositories" cost: 1 GraphQL request -categorie: github +category: github index: 6 supports: - user diff --git a/source/plugins/stock/metadata.yml b/source/plugins/stock/metadata.yml index 7b51a35f..76b13103 100644 --- a/source/plugins/stock/metadata.yml +++ b/source/plugins/stock/metadata.yml @@ -1,6 +1,6 @@ name: "💹 Stock prices" cost: N/A -categorie: other +category: other index: 1 supports: - user diff --git a/source/plugins/support/metadata.yml b/source/plugins/support/metadata.yml index def7c992..2511597c 100644 --- a/source/plugins/support/metadata.yml +++ b/source/plugins/support/metadata.yml @@ -1,6 +1,6 @@ name: "💭 GitHub Community Support" cost: N/A -categorie: github +category: github index: 19 supports: - user diff --git a/source/plugins/topics/metadata.yml b/source/plugins/topics/metadata.yml index 800b7ca1..1a57a613 100644 --- a/source/plugins/topics/metadata.yml +++ b/source/plugins/topics/metadata.yml @@ -1,6 +1,6 @@ name: "📌 Starred topics" cost: N/A -categorie: github +category: github index: 7 supports: - user diff --git a/source/plugins/traffic/metadata.yml b/source/plugins/traffic/metadata.yml index 4393a0d7..44ee188c 100644 --- a/source/plugins/traffic/metadata.yml +++ b/source/plugins/traffic/metadata.yml @@ -1,6 +1,6 @@ name: "🧮 Repositories traffic" cost: 1 REST request per repository -categorie: github +category: github index: 13 supports: - user diff --git a/source/plugins/tweets/metadata.yml b/source/plugins/tweets/metadata.yml index c29e276f..f41ef78e 100644 --- a/source/plugins/tweets/metadata.yml +++ b/source/plugins/tweets/metadata.yml @@ -1,6 +1,6 @@ name: "🐤 Latest tweets" cost: N/A -categorie: social +category: social index: 3 supports: - user diff --git a/source/plugins/wakatime/metadata.yml b/source/plugins/wakatime/metadata.yml index becdb6e4..1f0f9917 100644 --- a/source/plugins/wakatime/metadata.yml +++ b/source/plugins/wakatime/metadata.yml @@ -1,6 +1,6 @@ name: "⏰ WakaTime plugin" cost: N/A -categorie: social +category: social index: 7 supports: - user diff --git a/source/templates/classic/partials/pagespeed.ejs b/source/templates/classic/partials/pagespeed.ejs index 7a978ca7..826b28e7 100644 --- a/source/templates/classic/partials/pagespeed.ejs +++ b/source/templates/classic/partials/pagespeed.ejs @@ -25,7 +25,7 @@
<% for (const {score, title} of plugins.pagespeed.scores) { %> -
+
<% if (!Number.isNaN(score)) { %> diff --git a/source/templates/classic/partials/reactions.ejs b/source/templates/classic/partials/reactions.ejs index e8ee68c3..ef74900d 100644 --- a/source/templates/classic/partials/reactions.ejs +++ b/source/templates/classic/partials/reactions.ejs @@ -15,7 +15,7 @@
<% for (const [reaction, icon] of Object.entries({HEART:"❤️", THUMBS_UP:"👍", THUMBS_DOWN:"👎", LAUGH:"😄", CONFUSED:"😕", EYES:"👀", ROCKET:"🚀", HOORAY:"🎉"})) { const {score = 0, value:count = 0} = plugins.reactions.list[reaction] ?? {} %> -
+
<% if (score > 0) { %> diff --git a/source/templates/classic/style.css b/source/templates/classic/style.css index affddea5..5bff10e8 100644 --- a/source/templates/classic/style.css +++ b/source/templates/classic/style.css @@ -246,7 +246,7 @@ justify-content: space-around; margin-top: 4px; } - .categorie { + .category { display: flex; flex-direction: column; align-items: center; diff --git a/source/templates/repository/partials/pagespeed.ejs b/source/templates/repository/partials/pagespeed.ejs index 7a978ca7..826b28e7 100644 --- a/source/templates/repository/partials/pagespeed.ejs +++ b/source/templates/repository/partials/pagespeed.ejs @@ -25,7 +25,7 @@
<% for (const {score, title} of plugins.pagespeed.scores) { %> -
+
<% if (!Number.isNaN(score)) { %>