Add Web/Desktop specific plugin capabilities; misc fixes

scripts/build/common.mjs

@@ -33,6 +33,8 @@ export const banner = {
 `.trim()
 };
 
+const isWeb = process.argv.slice(0, 2).some(f => f.endsWith("buildWeb.mjs"));
+
 // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
 /**
  * @type {import("esbuild").Plugin}
@@ -70,7 +72,13 @@ export const globPlugins = {
                 for (const file of files) {
                     if (file.startsWith(".")) continue;
                     if (file === "index.ts") continue;
-                    if (!watch && (file.endsWith(".dev.ts") || file.endsWith(".dev.tsx"))) continue;
+                    const fileBits = file.split(".");
+                    if (fileBits.length > 2 && ["ts", "tsx"].includes(fileBits.at(-1))) {
+                        const mod = fileBits.at(-2);
+                        if (mod === "dev" && !watch) continue;
+                        if (mod === "web" && !isWeb) continue;
+                        if (mod === "desktop" && isWeb) continue;
+                    }
 
                     const mod = `p${i}`;
                     code += `import ${mod} from "./${dir}/${file.replace(/\.tsx?$/, "")}";\n`;

src/globals.d.ts

@@ -51,8 +51,7 @@ declare global {
      * Only available when running in Electron, undefined on web.
      * Thus, avoid using this or only use it inside an {@link IS_WEB} guard.
      *
-     * If you really must use it, mark your plugin as Desktop App only via
-     * `target: "DESKTOP"`
+     * If you really must use it, mark your plugin as Desktop App only by naming it Foo.desktop.ts(x)
      */
     export var DiscordNative: any;
 

src/plugins/arRPC.web.tsx

@@ -48,7 +48,6 @@ export default definePlugin({
     name: "WebRichPresence (arRPC)",
     description: "Client plugin for arRPC to enable RPC on Discord Web (experimental)",
     authors: [Devs.Ducko],
-    target: "WEB",
 
     settingsAboutComponent: () => (
         <>
@@ -60,6 +59,9 @@ export default definePlugin({
     ),
 
     async start() {
+        // ArmCord comes with its own arRPC implementation, so this plugin just confuses users
+        if ("armcord" in window) return;
+
         if (ws) ws.close();
         ws = new WebSocket("ws://127.0.0.1:1337"); // try to open WebSocket
 

src/plugins/consoleShortcuts.ts

@@ -32,14 +32,14 @@ export default definePlugin({
     authors: [Devs.Ven],
 
     getShortcuts() {
-        function newFindWrapper(filterFactory: (props: any) => Webpack.FilterFn) {
-            const cache = new Map<string, any>();
+        function newFindWrapper(filterFactory: (...props: any[]) => Webpack.FilterFn) {
+            const cache = new Map<string, unknown>();
 
-            return function (filterProps: any) {
+            return function (...filterProps: unknown[]) {
                 const cacheKey = String(filterProps);
                 if (cache.has(cacheKey)) return cache.get(cacheKey);
 
-                const matches = findAll(filterFactory(filterProps));
+                const matches = findAll(filterFactory(...filterProps));
 
                 const result = (() => {
                     switch (matches.length) {

src/plugins/devCompanion.dev.tsx

@@ -112,7 +112,7 @@ function initWs(isManual = false) {
     });
 
     ws.addEventListener("close", e => {
-        if (!wasConnected && !hasErrored) return;
+        if (!wasConnected || hasErrored) return;
 
         logger.info("Dev Companion Disconnected:", e.code, e.reason);
 
@@ -204,8 +204,9 @@ function initWs(isManual = false) {
                             return reply("Unknown Find Type " + type);
                     }
 
-                    if (results.length === 0) throw "No results";
-                    if (results.length > 1) throw "Found more than one result! Make this filter more specific";
+                    const uniqueResultsCount = new Set(results).size;
+                    if (uniqueResultsCount === 0) throw "No results";
+                    if (uniqueResultsCount > 1) throw "Found more than one result! Make this filter more specific";
                 } catch (err) {
                     return reply("Failed to find: " + err);
                 }

src/plugins/noRPC.desktop.ts

@@ -25,7 +25,6 @@ export default definePlugin({
     name: "NoRPC",
     description: "Disables Discord's RPC server.",
     authors: [Devs.Cyn],
-    target: "DESKTOP",
     patches: [
         {
             find: '.ensureModule("discord_rpc")',

src/plugins/noSystemBadge.desktop.ts

@@ -23,7 +23,6 @@ export default definePlugin({
     name: "NoSystemBadge",
     description: "Disables the taskbar and system tray unread count badge.",
     authors: [Devs.rushii],
-    target: "DESKTOP",
     patches: [
         {
             find: "setSystemTrayApplications:function",

src/plugins/webContextMenus.web.ts

@@ -23,7 +23,7 @@ export default definePlugin({
     name: "WebContextMenus",
     description: "Re-adds some of context menu items missing on the web version of Discord, namely Copy/Open Link",
     authors: [Devs.Ven],
-    target: "WEB",
+    enabledByDefault: true,
 
     patches: [{
         // There is literally no reason for Discord to make this Desktop only.

src/utils/types.ts

@@ -79,10 +79,6 @@ export interface PluginDef {
      * Whether this plugin should be enabled by default, but can be disabled
      */
     enabledByDefault?: boolean;
-    /**
-     * Set this if your plugin only works on Browser or Desktop, not both
-     */
-    target?: "WEB" | "DESKTOP" | "BOTH";
     /**
      * Optionally provide settings that the user can configure in the Plugins tab of settings.
      * @deprecated Use `settings` instead