From 9f4c4f30ab1834ec1b8eb37b27f1d9832067e902 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:35:13 -0400 Subject: [PATCH] Bob The Fixer --- scripts/build/build.mjs | 2 ++ scripts/build/common.mjs | 5 +++-- scripts/generateEquicordPluginList.ts | 4 ++-- scripts/generatePluginList.ts | 4 ++-- src/components/PluginSettings/index.tsx | 3 ++- src/modules.d.ts | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs index 0258604e..50bf5be9 100644 --- a/scripts/build/build.mjs +++ b/scripts/build/build.mjs @@ -186,6 +186,7 @@ await Promise.all([ sourcemap, plugins: [ globPlugins("vencordDesktop"), + globPlugins("fullcordDesktop"), ...commonOpts.plugins ], define: { @@ -238,6 +239,7 @@ await Promise.all([ sourcemap, plugins: [ globPlugins("equicordDesktop"), + globPlugins("fullcordDesktop"), ...commonOpts.plugins ], define: { diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs index 4df03885..e280f4eb 100644 --- a/scripts/build/common.mjs +++ b/scripts/build/common.mjs @@ -98,7 +98,7 @@ export const makeAllPackagesExternalPlugin = { }; /** - * @type {(kind: "web" | "discordDesktop" | "vencordDesktop" | "equicordDesktop") => import("esbuild").Plugin} + * @type {(kind: "web" | "discordDesktop" | "vencordDesktop" | "equicordDesktop" | "fullcordDesktop") => import("esbuild").Plugin} */ export const globPlugins = kind => ({ name: "glob-plugins", @@ -138,7 +138,8 @@ export const globPlugins = kind => ({ (target === "desktop" && kind === "web") || (target === "discordDesktop" && kind !== "discordDesktop") || (target === "vencordDesktop" && kind !== "vencordDesktop") || - (target === "equicordDesktop" && kind !== "equicordDesktop"); + (target === "equicordDesktop" && kind !== "equicordDesktop") || + (target === "fullcordDesktop" && kind !== "fullcordDesktop"); if (excluded) { const name = await resolvePluginName(fullDir, file); diff --git a/scripts/generateEquicordPluginList.ts b/scripts/generateEquicordPluginList.ts index b806d7a9..aa63adc5 100644 --- a/scripts/generateEquicordPluginList.ts +++ b/scripts/generateEquicordPluginList.ts @@ -39,7 +39,7 @@ interface PluginData { hasCommands: boolean; required: boolean; enabledByDefault: boolean; - target: "discordDesktop" | "vencordDesktop" | "equicordDesktop" | "desktop" | "web" | "dev"; + target: "discordDesktop" | "vencordDesktop" | "equicordDesktop" | "fullcordDesktop" | "desktop" | "web" | "dev"; filePath: string; } @@ -195,7 +195,7 @@ async function parseFile(fileName: string) { const target = getPluginTarget(fileName); if (target) { - if (!["web", "discordDesktop", "vencordDesktop", "equicordDesktop", "desktop", "dev"].includes(target)) throw fail(`invalid target ${target}`); + if (!["web", "discordDesktop", "vencordDesktop", "equicordDesktop", "fullcordDesktop", "desktop", "dev"].includes(target)) throw fail(`invalid target ${target}`); data.target = target as any; } diff --git a/scripts/generatePluginList.ts b/scripts/generatePluginList.ts index 5c4efc83..ea975349 100644 --- a/scripts/generatePluginList.ts +++ b/scripts/generatePluginList.ts @@ -39,7 +39,7 @@ interface PluginData { hasCommands: boolean; required: boolean; enabledByDefault: boolean; - target: "discordDesktop" | "vencordDesktop" | "equicordDesktop" | "desktop" | "web" | "dev"; + target: "discordDesktop" | "vencordDesktop" | "equicordDesktop" | "fullcordDesktop" | "desktop" | "web" | "dev"; filePath: string; } @@ -195,7 +195,7 @@ async function parseFile(fileName: string) { const target = getPluginTarget(fileName); if (target) { - if (!["web", "discordDesktop", "vencordDesktop", "equicordDesktop", "desktop", "dev"].includes(target)) throw fail(`invalid target ${target}`); + if (!["web", "discordDesktop", "vencordDesktop", "equicordDesktop", "fullcordDesktop", "desktop", "dev"].includes(target)) throw fail(`invalid target ${target}`); data.target = target as any; } diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx index b8ebff50..d4bab1f5 100644 --- a/src/components/PluginSettings/index.tsx +++ b/src/components/PluginSettings/index.tsx @@ -176,11 +176,12 @@ function ExcludedPluginsList({ search }: { search: string; }) { const matchingExcludedPlugins = Object.entries(ExcludedPlugins) .filter(([name]) => name.toLowerCase().includes(search)); - const ExcludedReasons: Record<"web" | "discordDesktop" | "vencordDesktop" | "equicordDesktop" | "desktop" | "dev", string> = { + const ExcludedReasons: Record<"web" | "discordDesktop" | "vencordDesktop" | "equicordDesktop" | "fullcordDesktop" | "desktop" | "dev", string> = { desktop: "Discord Desktop app or Vesktop", discordDesktop: "Discord Desktop app", vencordDesktop: "Vesktop app", equicordDesktop: "Equibop app", + fullcordDesktop: "Equibop and Vesktop apps", web: "Vesktop app and the Web version of Discord", dev: "Developer version of Equicord" }; diff --git a/src/modules.d.ts b/src/modules.d.ts index 698ff2ab..48c9c733 100644 --- a/src/modules.d.ts +++ b/src/modules.d.ts @@ -25,7 +25,7 @@ declare module "~plugins" { folderName: string; userPlugin: boolean; }>; - export const ExcludedPlugins: Record; + export const ExcludedPlugins: Record; } declare module "~pluginNatives" {