From 7a53a2da55c72c8aec2bb6bfada0206cc85f9d8a Mon Sep 17 00:00:00 2001 From: lowlighter <22963968+lowlighter@users.noreply.github.com> Date: Sun, 28 Aug 2022 12:32:57 -0400 Subject: [PATCH] feat(app): improved errors and warning for disabled features --- .../partials/templated/plugins.community.md | 2 +- .github/scripts/quickstart/plugin/index.mjs | 2 +- source/app/metrics/metadata.mjs | 15 +++++++++++++-- source/app/metrics/utils.mjs | 4 ++-- source/plugins/achievements/index.mjs | 2 +- source/plugins/activity/index.mjs | 2 +- source/plugins/anilist/index.mjs | 2 +- source/plugins/calendar/index.mjs | 2 +- source/plugins/code/index.mjs | 2 +- source/plugins/community/fortune/index.mjs | 2 +- source/plugins/community/nightscout/index.mjs | 2 +- source/plugins/community/poopmap/index.mjs | 2 +- source/plugins/community/screenshot/index.mjs | 2 +- source/plugins/community/stock/index.mjs | 2 +- source/plugins/contributors/index.mjs | 2 +- source/plugins/core/index.mjs | 2 +- source/plugins/discussions/index.mjs | 2 +- source/plugins/followup/index.mjs | 2 +- source/plugins/gists/index.mjs | 2 +- source/plugins/habits/index.mjs | 2 +- source/plugins/introduction/index.mjs | 2 +- source/plugins/isocalendar/index.mjs | 2 +- source/plugins/languages/index.mjs | 2 +- source/plugins/licenses/index.mjs | 2 +- source/plugins/lines/index.mjs | 2 +- source/plugins/music/index.mjs | 2 +- source/plugins/notable/index.mjs | 2 +- source/plugins/pagespeed/index.mjs | 2 +- source/plugins/people/index.mjs | 2 +- source/plugins/posts/index.mjs | 2 +- source/plugins/projects/index.mjs | 2 +- source/plugins/reactions/index.mjs | 2 +- source/plugins/repositories/index.mjs | 2 +- source/plugins/rss/index.mjs | 2 +- source/plugins/skyline/index.mjs | 2 +- source/plugins/sponsors/index.mjs | 2 +- source/plugins/stackoverflow/index.mjs | 2 +- source/plugins/stargazers/index.mjs | 2 +- source/plugins/starlists/index.mjs | 2 +- source/plugins/stars/index.mjs | 2 +- source/plugins/support/index.mjs | 2 +- source/plugins/topics/index.mjs | 2 +- source/plugins/traffic/index.mjs | 2 +- source/plugins/tweets/index.mjs | 2 +- source/plugins/wakatime/index.mjs | 2 +- 45 files changed, 58 insertions(+), 47 deletions(-) diff --git a/.github/readme/partials/templated/plugins.community.md b/.github/readme/partials/templated/plugins.community.md index 5406cad3..f558e781 100644 --- a/.github/readme/partials/templated/plugins.community.md +++ b/.github/readme/partials/templated/plugins.community.md @@ -226,7 +226,7 @@ export default async function( //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled)||(!q.my_plugin)) + if ((!q.my_plugin)||(imports.metadata.plugins.my_plugin.enabled(enabled, {extras}))) return null //Automatically validate user inputs diff --git a/.github/scripts/quickstart/plugin/index.mjs b/.github/scripts/quickstart/plugin/index.mjs index 7f956c21..487eb718 100644 --- a/.github/scripts/quickstart/plugin/index.mjs +++ b/.github/scripts/quickstart/plugin/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, computed, rest, graphql, //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.<%= name %>) || (!imports.metadata.plugins.<%= name %>.extras("enabled", {extras}))) + if ((!q.<%= name %>) || (!imports.metadata.plugins.<%= name %>.enabled(enabled, {extras}))) return null //Results return {} diff --git a/source/app/metrics/metadata.mjs b/source/app/metrics/metadata.mjs index b32f247b..c5624b22 100644 --- a/source/app/metrics/metadata.mjs +++ b/source/app/metrics/metadata.mjs @@ -217,9 +217,20 @@ metadata.plugin = async function({__plugins, __templates, name, logger}) { Object.assign(meta.inputs, inputs, Object.fromEntries(Object.entries(inputs).map(([key, value]) => [metadata.to.query(key, {name}), value]))) } + //Enable state handler + { + meta.enabled = function(enabled, {extras = {}, error = true} = {}) { + if ((process.env.GITHUB_ACTIONS)&&(!enabled)) + console.warn(`::warning::Plugin "${name}" is currently disabled. Add "plugin_${name}: yes" to your workflow to enable it.`) + if ((error)&&(!enabled)) + throw Object.assign(new Error(`Plugin "${name}" is disabled${process.env.GITHUB_ACTIONS ? "" : " on this server"}`), {enabled: true}) + return (enabled) && (meta.extras("enabled", {extras, error})) + } + } + //Extra features parser { - meta.extras = function(input, {extras = {}, error = true}) { + meta.extras = function(input, {extras = {}, error = true} = {}) { const key = metadata.to.yaml(input, {name}) try { //Required permissions @@ -270,7 +281,7 @@ metadata.plugin = async function({__plugins, __templates, name, logger}) { console.debug(`metrics/extras > ${name} > ${key} > skipping (no error mode)`) return false } - throw Object.assign(new Error(`Unsupported option "${key}"`), {extras: true}) + throw Object.assign(new Error(`Option "${key}" is disabled on this server`), {extras: true}) } } } diff --git a/source/app/metrics/utils.mjs b/source/app/metrics/utils.mjs index 1888fef0..ca5426cd 100644 --- a/source/app/metrics/utils.mjs +++ b/source/app/metrics/utils.mjs @@ -130,8 +130,8 @@ export function formatters({timeZone} = {}) { /**Error formatter */ format.error = function(error, {descriptions = {}, ...attributes} = {}) { try { - //Extras features error - if (error.extras) + //Extras features or enable state error + if ((error.extras)||(error.enabled)) throw {error: {message: error.message, instance: error}} //Already formatted error if (error.error?.message) diff --git a/source/plugins/achievements/index.mjs b/source/plugins/achievements/index.mjs index 67cfef70..60cab4bf 100644 --- a/source/plugins/achievements/index.mjs +++ b/source/plugins/achievements/index.mjs @@ -6,7 +6,7 @@ export default async function({login, q, imports, data, computed, graphql, queri //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.achievements) || (!imports.metadata.plugins.achievements.extras("enabled", {extras}))) + if ((!q.achievements) || (!imports.metadata.plugins.achievements.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/activity/index.mjs b/source/plugins/activity/index.mjs index 0d166d20..6cfbf8f6 100644 --- a/source/plugins/activity/index.mjs +++ b/source/plugins/activity/index.mjs @@ -3,7 +3,7 @@ export default async function({login, data, rest, q, account, imports}, {enabled //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.activity) || (!imports.metadata.plugins.activity.extras("enabled", {extras}))) + if ((!q.activity) || (!imports.metadata.plugins.activity.enabled(enabled, {extras}))) return null //Context diff --git a/source/plugins/anilist/index.mjs b/source/plugins/anilist/index.mjs index 368a086c..5211493b 100644 --- a/source/plugins/anilist/index.mjs +++ b/source/plugins/anilist/index.mjs @@ -3,7 +3,7 @@ export default async function({login, data, queries, imports, q, account}, {enab //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.anilist) || (!imports.metadata.plugins.anilist.extras("enabled", {extras}))) + if ((!q.anilist) || (!imports.metadata.plugins.anilist.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/calendar/index.mjs b/source/plugins/calendar/index.mjs index ac4e7be5..d6b1c69d 100644 --- a/source/plugins/calendar/index.mjs +++ b/source/plugins/calendar/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, data, imports, graphql, queries, accoun //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.calendar) || (!imports.metadata.plugins.calendar.extras("enabled", {extras}))) + if ((!q.calendar) || (!imports.metadata.plugins.calendar.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/code/index.mjs b/source/plugins/code/index.mjs index 6588b499..b83918a6 100644 --- a/source/plugins/code/index.mjs +++ b/source/plugins/code/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, rest, account}, {enabled //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.code) || (!imports.metadata.plugins.code.extras("enabled", {extras}))) + if ((!q.code) || (!imports.metadata.plugins.code.enabled(enabled, {extras}))) return null //Context diff --git a/source/plugins/community/fortune/index.mjs b/source/plugins/community/fortune/index.mjs index b3909e18..922f84d1 100644 --- a/source/plugins/community/fortune/index.mjs +++ b/source/plugins/community/fortune/index.mjs @@ -3,7 +3,7 @@ export default async function({q, data, imports, account}, {enabled = false, ext //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.fortune) || (!imports.metadata.plugins.fortune.extras("enabled", {extras}))) + if ((!q.fortune) || (!imports.metadata.plugins.fortune.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/community/nightscout/index.mjs b/source/plugins/community/nightscout/index.mjs index 4bbcbba4..d04b7cfa 100644 --- a/source/plugins/community/nightscout/index.mjs +++ b/source/plugins/community/nightscout/index.mjs @@ -3,7 +3,7 @@ export default async function({q, imports, data, account}, {enabled = false, ext //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.nightscout) || (!imports.metadata.plugins.nightscout.extras("enabled", {extras}))) + if ((!q.nightscout) || (!imports.metadata.plugins.nightscout.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/community/poopmap/index.mjs b/source/plugins/community/poopmap/index.mjs index 2480dcda..ec096000 100644 --- a/source/plugins/community/poopmap/index.mjs +++ b/source/plugins/community/poopmap/index.mjs @@ -3,7 +3,7 @@ export default async function({q, imports, data, account}, {enabled = false, tok //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.poopmap) || (!imports.metadata.plugins.poopmap.extras("enabled", {extras}))) + if ((!q.poopmap) || (!imports.metadata.plugins.poopmap.enabled(enabled, {extras}))) return null if (!token) diff --git a/source/plugins/community/screenshot/index.mjs b/source/plugins/community/screenshot/index.mjs index 7ce63a0c..6c5d7259 100644 --- a/source/plugins/community/screenshot/index.mjs +++ b/source/plugins/community/screenshot/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, account}, {enabled = fal //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.screenshot) || (!imports.metadata.plugins.screenshot.extras("enabled", {extras}))) + if ((!q.screenshot) || (!imports.metadata.plugins.screenshot.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/community/stock/index.mjs b/source/plugins/community/stock/index.mjs index 0e19d2fd..d34b55d9 100644 --- a/source/plugins/community/stock/index.mjs +++ b/source/plugins/community/stock/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, account}, {enabled = fal //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.stock) || (!imports.metadata.plugins.stock.extras("enabled", {extras}))) + if ((!q.stock) || (!imports.metadata.plugins.stock.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/contributors/index.mjs b/source/plugins/contributors/index.mjs index e4d4bbd3..2a2f7397 100644 --- a/source/plugins/contributors/index.mjs +++ b/source/plugins/contributors/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, rest, graphql, queries, //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.contributors) || (!imports.metadata.plugins.contributors.extras("enabled", {extras}))) + if ((!q.contributors) || (!imports.metadata.plugins.contributors.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/core/index.mjs b/source/plugins/core/index.mjs index a86201b1..f5aae8ba 100644 --- a/source/plugins/core/index.mjs +++ b/source/plugins/core/index.mjs @@ -59,7 +59,7 @@ export default async function({login, q}, {conf, data, rest, graphql, plugins, q //Plugins for (const name of Object.keys(imports.plugins)) { - if ((!plugins[name]?.enabled) || (!q[name])) + if (!q[name]) continue pending.push((async () => { try { diff --git a/source/plugins/discussions/index.mjs b/source/plugins/discussions/index.mjs index 91574048..7cc7d14f 100644 --- a/source/plugins/discussions/index.mjs +++ b/source/plugins/discussions/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, graphql, queries, data, accoun //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.discussions) || (!imports.metadata.plugins.discussions.extras("enabled", {extras}))) + if ((!q.discussions) || (!imports.metadata.plugins.discussions.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/followup/index.mjs b/source/plugins/followup/index.mjs index 306cfd98..1ee064ab 100644 --- a/source/plugins/followup/index.mjs +++ b/source/plugins/followup/index.mjs @@ -3,7 +3,7 @@ export default async function({login, data, computed, imports, q, graphql, queri //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.followup) || (!imports.metadata.plugins.followup.extras("enabled", {extras}))) + if ((!q.followup) || (!imports.metadata.plugins.followup.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/gists/index.mjs b/source/plugins/gists/index.mjs index 73c5166a..63166757 100644 --- a/source/plugins/gists/index.mjs +++ b/source/plugins/gists/index.mjs @@ -3,7 +3,7 @@ export default async function({login, data, graphql, q, imports, queries, accoun //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.gists) || (!imports.metadata.plugins.gists.extras("enabled", {extras}))) + if ((!q.gists) || (!imports.metadata.plugins.gists.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/habits/index.mjs b/source/plugins/habits/index.mjs index a331f14e..15dbb8c4 100644 --- a/source/plugins/habits/index.mjs +++ b/source/plugins/habits/index.mjs @@ -6,7 +6,7 @@ export default async function({login, data, rest, imports, q, account}, {enabled //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.habits) || (!imports.metadata.plugins.habits.extras("enabled", {extras}))) + if ((!q.habits) || (!imports.metadata.plugins.habits.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/introduction/index.mjs b/source/plugins/introduction/index.mjs index 23bbbf91..e339e168 100644 --- a/source/plugins/introduction/index.mjs +++ b/source/plugins/introduction/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, graphql, queries, accoun //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.introduction) || (!imports.metadata.plugins.introduction.extras("enabled", {extras}))) + if ((!q.introduction) || (!imports.metadata.plugins.introduction.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/isocalendar/index.mjs b/source/plugins/isocalendar/index.mjs index 7f9609d2..1b6b1711 100644 --- a/source/plugins/isocalendar/index.mjs +++ b/source/plugins/isocalendar/index.mjs @@ -3,7 +3,7 @@ export default async function({login, data, graphql, q, imports, queries, accoun //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.isocalendar) || (!imports.metadata.plugins.isocalendar.extras("enabled", {extras}))) + if ((!q.isocalendar) || (!imports.metadata.plugins.isocalendar.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/languages/index.mjs b/source/plugins/languages/index.mjs index e4c27d73..6f5217ab 100644 --- a/source/plugins/languages/index.mjs +++ b/source/plugins/languages/index.mjs @@ -6,7 +6,7 @@ export default async function({login, data, imports, q, rest, account}, {enabled //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.languages) || (!imports.metadata.plugins.languages.extras("enabled", {extras}))) + if ((!q.languages) || (!imports.metadata.plugins.languages.enabled(enabled, {extras}))) return null //Context diff --git a/source/plugins/licenses/index.mjs b/source/plugins/licenses/index.mjs index 3fb4a6ea..ba8d8c56 100644 --- a/source/plugins/licenses/index.mjs +++ b/source/plugins/licenses/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, graphql, queries, accoun //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.licenses) || (!imports.metadata.plugins.licenses.extras("enabled", {extras}))) + if ((!q.licenses) || (!imports.metadata.plugins.licenses.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/lines/index.mjs b/source/plugins/lines/index.mjs index 77f24f6c..8a766530 100644 --- a/source/plugins/lines/index.mjs +++ b/source/plugins/lines/index.mjs @@ -3,7 +3,7 @@ export default async function({login, data, imports, rest, q, account}, {enabled //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.lines) || (!imports.metadata.plugins.lines.extras("enabled", {extras}))) + if ((!q.lines) || (!imports.metadata.plugins.lines.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/music/index.mjs b/source/plugins/music/index.mjs index 1ac147f7..8da2adb4 100644 --- a/source/plugins/music/index.mjs +++ b/source/plugins/music/index.mjs @@ -32,7 +32,7 @@ export default async function({login, imports, data, q, account}, {enabled = fal //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.music) || (!imports.metadata.plugins.music.extras("enabled", {extras}))) + if ((!q.music) || (!imports.metadata.plugins.music.enabled(enabled, {extras}))) return null //Initialization diff --git a/source/plugins/notable/index.mjs b/source/plugins/notable/index.mjs index fa60adbb..07bd8e23 100644 --- a/source/plugins/notable/index.mjs +++ b/source/plugins/notable/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, rest, graphql, data, account, //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.notable) || (!imports.metadata.plugins.notable.extras("enabled", {extras}))) + if ((!q.notable) || (!imports.metadata.plugins.notable.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/pagespeed/index.mjs b/source/plugins/pagespeed/index.mjs index bcc44f5e..9ea00ae4 100644 --- a/source/plugins/pagespeed/index.mjs +++ b/source/plugins/pagespeed/index.mjs @@ -3,7 +3,7 @@ export default async function({login, imports, data, q, account}, {enabled = fal //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.pagespeed) || (!imports.metadata.plugins.pagespeed.extras("enabled", {extras}))) + if ((!q.pagespeed) || (!imports.metadata.plugins.pagespeed.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/people/index.mjs b/source/plugins/people/index.mjs index 7ae4c9c3..6385772d 100644 --- a/source/plugins/people/index.mjs +++ b/source/plugins/people/index.mjs @@ -3,7 +3,7 @@ export default async function({login, data, graphql, rest, q, queries, imports, //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.people) || (!imports.metadata.plugins.people.extras("enabled", {extras}))) + if ((!q.people) || (!imports.metadata.plugins.people.enabled(enabled, {extras}))) return null //Context diff --git a/source/plugins/posts/index.mjs b/source/plugins/posts/index.mjs index b3a6af57..a8a669c6 100644 --- a/source/plugins/posts/index.mjs +++ b/source/plugins/posts/index.mjs @@ -3,7 +3,7 @@ export default async function({login, data, imports, q, queries, account}, {enab //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.posts) || (!imports.metadata.plugins.posts.extras("enabled", {extras}))) + if ((!q.posts) || (!imports.metadata.plugins.posts.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/projects/index.mjs b/source/plugins/projects/index.mjs index e47e02df..98dfe1ef 100644 --- a/source/plugins/projects/index.mjs +++ b/source/plugins/projects/index.mjs @@ -3,7 +3,7 @@ export default async function({login, data, imports, graphql, q, queries, accoun //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.projects) || (!imports.metadata.plugins.projects.extras("enabled", {extras}))) + if ((!q.projects) || (!imports.metadata.plugins.projects.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/reactions/index.mjs b/source/plugins/reactions/index.mjs index a62df3cf..fdee838b 100644 --- a/source/plugins/reactions/index.mjs +++ b/source/plugins/reactions/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, graphql, queries, accoun //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.reactions) || (!imports.metadata.plugins.reactions.extras("enabled", {extras}))) + if ((!q.reactions) || (!imports.metadata.plugins.reactions.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/repositories/index.mjs b/source/plugins/repositories/index.mjs index 57cc0b12..7981c8ff 100644 --- a/source/plugins/repositories/index.mjs +++ b/source/plugins/repositories/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, graphql, queries, data, accoun //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.repositories) || (!imports.metadata.plugins.repositories.extras("enabled", {extras}))) + if ((!q.repositories) || (!imports.metadata.plugins.repositories.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/rss/index.mjs b/source/plugins/rss/index.mjs index bcee77af..fc4fec5a 100644 --- a/source/plugins/rss/index.mjs +++ b/source/plugins/rss/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, account}, {enabled = fal //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.rss) || (!imports.metadata.plugins.rss.extras("enabled", {extras}))) + if ((!q.rss) || (!imports.metadata.plugins.rss.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/skyline/index.mjs b/source/plugins/skyline/index.mjs index d0be3af5..9a0f4a89 100644 --- a/source/plugins/skyline/index.mjs +++ b/source/plugins/skyline/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, account}, {enabled = fal //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.skyline) || (!imports.metadata.plugins.skyline.extras("enabled", {extras}))) + if ((!q.skyline) || (!imports.metadata.plugins.skyline.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/sponsors/index.mjs b/source/plugins/sponsors/index.mjs index a1615b11..b92a50b4 100644 --- a/source/plugins/sponsors/index.mjs +++ b/source/plugins/sponsors/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, graphql, queries, accoun //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.sponsors) || (!imports.metadata.plugins.sponsors.extras("enabled", {extras}))) + if ((!q.sponsors) || (!imports.metadata.plugins.sponsors.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/stackoverflow/index.mjs b/source/plugins/stackoverflow/index.mjs index 4855d7a8..d87c3667 100644 --- a/source/plugins/stackoverflow/index.mjs +++ b/source/plugins/stackoverflow/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, account}, {enabled = fal //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.stackoverflow) || (!imports.metadata.plugins.stackoverflow.extras("enabled", {extras}))) + if ((!q.stackoverflow) || (!imports.metadata.plugins.stackoverflow.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/stargazers/index.mjs b/source/plugins/stargazers/index.mjs index ee713b05..5e035c3a 100644 --- a/source/plugins/stargazers/index.mjs +++ b/source/plugins/stargazers/index.mjs @@ -3,7 +3,7 @@ export default async function({login, graphql, data, imports, q, queries, accoun //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.stargazers) || (!imports.metadata.plugins.stargazers.extras("enabled", {extras}))) + if ((!q.stargazers) || (!imports.metadata.plugins.stargazers.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/starlists/index.mjs b/source/plugins/starlists/index.mjs index 1ee91dbf..6ba8a518 100644 --- a/source/plugins/starlists/index.mjs +++ b/source/plugins/starlists/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, account}, {enabled = fal //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.starlists) || (!imports.metadata.plugins.starlists.extras("enabled", {extras}))) + if ((!q.starlists) || (!imports.metadata.plugins.starlists.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/stars/index.mjs b/source/plugins/stars/index.mjs index 5b3d7b33..58dd64e3 100644 --- a/source/plugins/stars/index.mjs +++ b/source/plugins/stars/index.mjs @@ -3,7 +3,7 @@ export default async function({login, data, graphql, q, queries, imports, accoun //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.stars) || (!imports.metadata.plugins.stars.extras("enabled", {extras}))) + if ((!q.stars) || (!imports.metadata.plugins.stars.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/support/index.mjs b/source/plugins/support/index.mjs index d2d9984b..0c7cf329 100644 --- a/source/plugins/support/index.mjs +++ b/source/plugins/support/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, account}, {enabled = fal //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.support) || (!imports.metadata.plugins.support.extras("enabled", {extras}))) + if ((!q.support) || (!imports.metadata.plugins.support.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/topics/index.mjs b/source/plugins/topics/index.mjs index 0d3be773..18661a9e 100644 --- a/source/plugins/topics/index.mjs +++ b/source/plugins/topics/index.mjs @@ -3,7 +3,7 @@ export default async function({login, data, imports, q, account}, {enabled = fal //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.topics) || (!imports.metadata.plugins.topics.extras("enabled", {extras}))) + if ((!q.topics) || (!imports.metadata.plugins.topics.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/traffic/index.mjs b/source/plugins/traffic/index.mjs index ae848aa8..167eca3e 100644 --- a/source/plugins/traffic/index.mjs +++ b/source/plugins/traffic/index.mjs @@ -3,7 +3,7 @@ export default async function({login, imports, data, rest, q, account}, {enabled //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.traffic) || (!imports.metadata.plugins.traffic.extras("enabled", {extras}))) + if ((!q.traffic) || (!imports.metadata.plugins.traffic.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/tweets/index.mjs b/source/plugins/tweets/index.mjs index 4406ae9c..3098c170 100644 --- a/source/plugins/tweets/index.mjs +++ b/source/plugins/tweets/index.mjs @@ -3,7 +3,7 @@ export default async function({login, imports, data, q, account}, {enabled = fal //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.tweets) || (!imports.metadata.plugins.tweets.extras("enabled", {extras}))) + if ((!q.tweets) || (!imports.metadata.plugins.tweets.enabled(enabled, {extras}))) return null //Load inputs diff --git a/source/plugins/wakatime/index.mjs b/source/plugins/wakatime/index.mjs index f3ad6955..b0decd7d 100644 --- a/source/plugins/wakatime/index.mjs +++ b/source/plugins/wakatime/index.mjs @@ -3,7 +3,7 @@ export default async function({login, q, imports, data, account}, {enabled = fal //Plugin execution try { //Check if plugin is enabled and requirements are met - if ((!enabled) || (!q.wakatime) || (!imports.metadata.plugins.wakatime.extras("enabled", {extras}))) + if ((!q.wakatime) || (!imports.metadata.plugins.wakatime.enabled(enabled, {extras}))) return null //Load inputs