Merge branch 'dev' into modules-proxy-patches

src/plugins/_core/supportHelper.tsx

@@ -16,24 +16,33 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { addAccessory } from "@api/MessageAccessories";
+import { getUserSettingLazy } from "@api/UserSettings";
 import ErrorBoundary from "@components/ErrorBoundary";
+import { Flex } from "@components/Flex";
 import { Link } from "@components/Link";
 import { openUpdaterModal } from "@components/VencordSettings/UpdaterTab";
 import { Devs, SUPPORT_CHANNEL_ID } from "@utils/constants";
+import { sendMessage } from "@utils/discord";
+import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
-import { isPluginDev } from "@utils/misc";
+import { isPluginDev, tryOrElse } from "@utils/misc";
 import { relaunch } from "@utils/native";
+import { onlyOnce } from "@utils/onlyOnce";
 import { makeCodeblock } from "@utils/text";
 import definePlugin from "@utils/types";
-import { isOutdated, update } from "@utils/updater";
+import { checkForUpdates, isOutdated, update } from "@utils/updater";
-import { Alerts, Card, ChannelStore, Forms, GuildMemberStore, NavigationRouter, Parser, RelationshipStore, UserStore } from "@webpack/common";
+import { Alerts, Button, Card, ChannelStore, Forms, GuildMemberStore, Parser, RelationshipStore, showToast, Toasts, UserStore } from "@webpack/common";
 
 import gitHash from "~git-hash";
-import plugins from "~plugins";
+import plugins, { PluginMeta } from "~plugins";
 
 import settings from "./settings";
 
 const VENCORD_GUILD_ID = "1015060230222131221";
+const VENBOT_USER_ID = "1017176847865352332";
+const KNOWN_ISSUES_CHANNEL_ID = "1222936386626129920";
+const CodeBlockRe = /```js\n(.+?)```/s;
 
 const AllowedChannelIds = [
     SUPPORT_CHANNEL_ID,
@@ -47,12 +56,88 @@ const TrustedRolesIds = [
     "1042507929485586532", // donor
 ];
 
+const AsyncFunction = async function () { }.constructor;
+
+const ShowCurrentGame = getUserSettingLazy<boolean>("status", "showCurrentGame")!;
+
+async function forceUpdate() {
+    const outdated = await checkForUpdates();
+    if (outdated) {
+        await update();
+        relaunch();
+    }
+
+    return outdated;
+}
+
+async function generateDebugInfoMessage() {
+    const { RELEASE_CHANNEL } = window.GLOBAL_ENV;
+
+    const client = (() => {
+        if (IS_DISCORD_DESKTOP) return `Discord Desktop v${DiscordNative.app.getVersion()}`;
+        if (IS_VESKTOP) return `Vesktop v${VesktopNative.app.getVersion()}`;
+        if ("armcord" in window) return `ArmCord v${window.armcord.version}`;
+
+        // @ts-expect-error
+        const name = typeof unsafeWindow !== "undefined" ? "UserScript" : "Web";
+        return `${name} (${navigator.userAgent})`;
+    })();
+
+    const info = {
+        Vencord:
+            `v${VERSION} • [${gitHash}](<https://github.com/Vendicated/Vencord/commit/${gitHash}>)` +
+            `${settings.additionalInfo} - ${Intl.DateTimeFormat("en-GB", { dateStyle: "medium" }).format(BUILD_TIMESTAMP)}`,
+        Client: `${RELEASE_CHANNEL} ~ ${client}`,
+        Platform: window.navigator.platform
+    };
+
+    if (IS_DISCORD_DESKTOP) {
+        info["Last Crash Reason"] = (await tryOrElse(() => DiscordNative.processUtils.getLastCrash(), undefined))?.rendererCrashReason ?? "N/A";
+    }
+
+    const commonIssues = {
+        "NoRPC enabled": Vencord.Plugins.isPluginEnabled("NoRPC"),
+        "Activity Sharing disabled": tryOrElse(() => !ShowCurrentGame.getSetting(), false),
+        "Vencord DevBuild": !IS_STANDALONE,
+        "Has UserPlugins": Object.values(PluginMeta).some(m => m.userPlugin),
+        "More than two weeks out of date": BUILD_TIMESTAMP < Date.now() - 12096e5,
+    };
+
+    let content = `>>> ${Object.entries(info).map(([k, v]) => `**${k}**: ${v}`).join("\n")}`;
+    content += "\n" + Object.entries(commonIssues)
+        .filter(([, v]) => v).map(([k]) => `⚠️ ${k}`)
+        .join("\n");
+
+    return content.trim();
+}
+
+function generatePluginList() {
+    const isApiPlugin = (plugin: string) => plugin.endsWith("API") || plugins[plugin].required;
+
+    const enabledPlugins = Object.keys(plugins)
+        .filter(p => Vencord.Plugins.isPluginEnabled(p) && !isApiPlugin(p));
+
+    const enabledStockPlugins = enabledPlugins.filter(p => !PluginMeta[p].userPlugin);
+    const enabledUserPlugins = enabledPlugins.filter(p => PluginMeta[p].userPlugin);
+
+
+    let content = `**Enabled Plugins (${enabledStockPlugins.length}):**\n${makeCodeblock(enabledStockPlugins.join(", "))}`;
+
+    if (enabledUserPlugins.length) {
+        content += `**Enabled UserPlugins (${enabledUserPlugins.length}):**\n${makeCodeblock(enabledUserPlugins.join(", "))}`;
+    }
+
+    return content;
+}
+
+const checkForUpdatesOnce = onlyOnce(checkForUpdates);
+
 export default definePlugin({
     name: "SupportHelper",
     required: true,
     description: "Helps us provide support to you",
     authors: [Devs.Ven],
-    dependencies: ["CommandsAPI"],
+    dependencies: ["CommandsAPI", "UserSettingsAPI"],
 
     patches: [{
         find: ".BEGINNING_DM.format",
@@ -62,51 +147,20 @@ export default definePlugin({
         }
     }],
 
-    commands: [{
+    commands: [
-        name: "vencord-debug",
+        {
-        description: "Send Vencord Debug info",
+            name: "vencord-debug",
-        predicate: ctx => isPluginDev(UserStore.getCurrentUser()?.id) || AllowedChannelIds.includes(ctx.channel.id),
+            description: "Send Vencord debug info",
-        async execute() {
+            predicate: ctx => isPluginDev(UserStore.getCurrentUser()?.id) || AllowedChannelIds.includes(ctx.channel.id),
-            const { RELEASE_CHANNEL } = window.GLOBAL_ENV;
+            execute: async () => ({ content: await generateDebugInfoMessage() })
-
+        },
-            const client = (() => {
+        {
-                if (IS_DISCORD_DESKTOP) return `Discord Desktop v${DiscordNative.app.getVersion()}`;
+            name: "vencord-plugins",
-                if (IS_VESKTOP) return `Vesktop v${VesktopNative.app.getVersion()}`;
+            description: "Send Vencord plugin list",
-                if ("armcord" in window) return `ArmCord v${window.armcord.version}`;
+            predicate: ctx => isPluginDev(UserStore.getCurrentUser()?.id) || AllowedChannelIds.includes(ctx.channel.id),
-
+            execute: () => ({ content: generatePluginList() })
-                // @ts-expect-error
-                const name = typeof unsafeWindow !== "undefined" ? "UserScript" : "Web";
-                return `${name} (${navigator.userAgent})`;
-            })();
-
-            const isApiPlugin = (plugin: string) => plugin.endsWith("API") || plugins[plugin].required;
-
-            const enabledPlugins = Object.keys(plugins).filter(p => Vencord.Plugins.isPluginEnabled(p) && !isApiPlugin(p));
-
-            const info = {
-                Vencord:
-                    `v${VERSION} • [${gitHash}](<https://github.com/Vendicated/Vencord/commit/${gitHash}>)` +
-                    `${settings.additionalInfo} - ${Intl.DateTimeFormat("en-GB", { dateStyle: "medium" }).format(BUILD_TIMESTAMP)}`,
-                Client: `${RELEASE_CHANNEL} ~ ${client}`,
-                Platform: window.navigator.platform
-            };
-
-            if (IS_DISCORD_DESKTOP) {
-                info["Last Crash Reason"] = (await DiscordNative.processUtils.getLastCrash())?.rendererCrashReason ?? "N/A";
-            }
-
-            const debugInfo = `
->>> ${Object.entries(info).map(([k, v]) => `**${k}**: ${v}`).join("\n")}
-
-Enabled Plugins (${enabledPlugins.length}):
-${makeCodeblock(enabledPlugins.join(", "))}
-`;
-
-            return {
-                content: debugInfo.trim().replaceAll("```\n", "```")
-            };
         }
-    }],
+    ],
 
     flux: {
         async CHANNEL_SELECT({ channelId }) {
@@ -115,24 +169,25 @@ ${makeCodeblock(enabledPlugins.join(", "))}
             const selfId = UserStore.getCurrentUser()?.id;
             if (!selfId || isPluginDev(selfId)) return;
 
-            if (isOutdated) {
+            if (!IS_UPDATER_DISABLED) {
-                return Alerts.show({
+                await checkForUpdatesOnce().catch(() => { });
-                    title: "Hold on!",
+
-                    body: <div>
+                if (isOutdated) {
-                        <Forms.FormText>You are using an outdated version of Vencord! Chances are, your issue is already fixed.</Forms.FormText>
+                    return Alerts.show({
-                        <Forms.FormText className={Margins.top8}>
+                        title: "Hold on!",
-                            Please first update before asking for support!
+                        body: <div>
-                        </Forms.FormText>
+                            <Forms.FormText>You are using an outdated version of Vencord! Chances are, your issue is already fixed.</Forms.FormText>
-                    </div>,
+                            <Forms.FormText className={Margins.top8}>
-                    onCancel: () => openUpdaterModal!(),
+                                Please first update before asking for support!
-                    cancelText: "View Updates",
+                            </Forms.FormText>
-                    confirmText: "Update & Restart Now",
+                        </div>,
-                    async onConfirm() {
+                        onCancel: () => openUpdaterModal!(),
-                        await update();
+                        cancelText: "View Updates",
-                        relaunch();
+                        confirmText: "Update & Restart Now",
-                    },
+                        onConfirm: forceUpdate,
-                    secondaryConfirmText: "I know what I'm doing or I can't update"
+                        secondaryConfirmText: "I know what I'm doing or I can't update"
-                });
+                    });
+                }
             }
 
             // @ts-ignore outdated type
@@ -148,8 +203,7 @@ ${makeCodeblock(enabledPlugins.join(", "))}
                             Please either switch to an <Link href="https://vencord.dev/download">officially supported version of Vencord</Link>, or
                             contact your package maintainer for support instead.
                         </Forms.FormText>
-                    </div>,
+                    </div>
-                    onCloseCallback: () => setTimeout(() => NavigationRouter.back(), 50)
                 });
             }
 
@@ -163,8 +217,7 @@ ${makeCodeblock(enabledPlugins.join(", "))}
                             Please either switch to an <Link href="https://vencord.dev/download">officially supported version of Vencord</Link>, or
                             contact your package maintainer for support instead.
                         </Forms.FormText>
-                    </div>,
+                    </div>
-                    onCloseCallback: () => setTimeout(() => NavigationRouter.back(), 50)
                 });
             }
         }
@@ -172,7 +225,7 @@ ${makeCodeblock(enabledPlugins.join(", "))}
 
     ContributorDmWarningCard: ErrorBoundary.wrap(({ userId }) => {
         if (!isPluginDev(userId)) return null;
-        if (RelationshipStore.isFriend(userId)) return null;
+        if (RelationshipStore.isFriend(userId) || isPluginDev(UserStore.getCurrentUser()?.id)) return null;
 
         return (
             <Card className={`vc-plugins-restart-card ${Margins.top8}`}>
@@ -182,5 +235,86 @@ ${makeCodeblock(enabledPlugins.join(", "))}
                 {!ChannelStore.getChannel(SUPPORT_CHANNEL_ID) && " (Click the link to join)"}
             </Card>
         );
-    }, { noop: true })
+    }, { noop: true }),
+
+    start() {
+        addAccessory("vencord-debug", props => {
+            const buttons = [] as JSX.Element[];
+
+            const shouldAddUpdateButton =
+                !IS_UPDATER_DISABLED
+                && (
+                    (props.channel.id === KNOWN_ISSUES_CHANNEL_ID) ||
+                    (props.channel.id === SUPPORT_CHANNEL_ID && props.message.author.id === VENBOT_USER_ID)
+                )
+                && props.message.content?.includes("update");
+
+            if (shouldAddUpdateButton) {
+                buttons.push(
+                    <Button
+                        key="vc-update"
+                        color={Button.Colors.GREEN}
+                        onClick={async () => {
+                            try {
+                                if (await forceUpdate())
+                                    showToast("Success! Restarting...", Toasts.Type.SUCCESS);
+                                else
+                                    showToast("Already up to date!", Toasts.Type.MESSAGE);
+                            } catch (e) {
+                                new Logger(this.name).error("Error while updating:", e);
+                                showToast("Failed to update :(", Toasts.Type.FAILURE);
+                            }
+                        }}
+                    >
+                        Update Now
+                    </Button>
+                );
+            }
+
+            if (props.channel.id === SUPPORT_CHANNEL_ID) {
+                if (props.message.content.includes("/vencord-debug") || props.message.content.includes("/vencord-plugins")) {
+                    buttons.push(
+                        <Button
+                            key="vc-dbg"
+                            onClick={async () => sendMessage(props.channel.id, { content: await generateDebugInfoMessage() })}
+                        >
+                            Run /vencord-debug
+                        </Button>,
+                        <Button
+                            key="vc-plg-list"
+                            onClick={async () => sendMessage(props.channel.id, { content: generatePluginList() })}
+                        >
+                            Run /vencord-plugins
+                        </Button>
+                    );
+                }
+
+                if (props.message.author.id === VENBOT_USER_ID) {
+                    const match = CodeBlockRe.exec(props.message.content || props.message.embeds[0]?.rawDescription || "");
+                    if (match) {
+                        buttons.push(
+                            <Button
+                                key="vc-run-snippet"
+                                onClick={async () => {
+                                    try {
+                                        await AsyncFunction(match[1])();
+                                        showToast("Success!", Toasts.Type.SUCCESS);
+                                    } catch (e) {
+                                        new Logger(this.name).error("Error while running snippet:", e);
+                                        showToast("Failed to run snippet :(", Toasts.Type.FAILURE);
+                                    }
+                                }}
+                            >
+                                Run Snippet
+                            </Button>
+                        );
+                    }
+                }
+            }
+
+            return buttons.length
+                ? <Flex>{buttons}</Flex>
+                : null;
+        });
+    },
 });

src/plugins/gameActivityToggle/style.css

@@ -1,3 +1,3 @@
-[class*="withTagAsButton"] {
+[class*="panels"] [class*="avatarWrapper"] {
-    min-width: 88px !important;
+    min-width: 88px;
 }

src/plugins/index.ts

@@ -169,7 +169,18 @@ export function subscribePluginFluxEvents(p: Plugin, fluxDispatcher: typeof Flux
 
         logger.debug("Subscribing to flux events of plugin", p.name);
         for (const [event, handler] of Object.entries(p.flux)) {
-            fluxDispatcher.subscribe(event as FluxEvents, handler);
+            const wrappedHandler = p.flux[event] = function () {
+                try {
+                    const res = handler.apply(p, arguments as any);
+                    return res instanceof Promise
+                        ? res.catch(e => logger.error(`${p.name}: Error while handling ${event}\n`, e))
+                        : res;
+                } catch (e) {
+                    logger.error(`${p.name}: Error while handling ${event}\n`, e);
+                }
+            };
+
+            fluxDispatcher.subscribe(event as FluxEvents, wrappedHandler);
         }
     }
 }

src/plugins/seeSummaries/index.tsx

@@ -12,7 +12,7 @@ import { findByCodeLazy, findByPropsLazy } from "@webpack";
 import { ChannelStore, GuildStore } from "@webpack/common";
 
 const SummaryStore = findByPropsLazy("allSummaries", "findSummary");
-const createSummaryFromServer = findByCodeLazy(".people)),startId:");
+const createSummaryFromServer = findByCodeLazy(".people)),startId:", ".type}");
 
 const settings = definePluginSettings({
     summaryExpiryThresholdDays: {

src/plugins/xsOverlay.desktop/index.ts

@@ -154,104 +154,99 @@ export default definePlugin({
             }
         },
         MESSAGE_CREATE({ message, optimistic }: { message: Message; optimistic: boolean; }) {
-            // Apparently without this try/catch, discord's socket connection dies if any part of this errors
+            if (optimistic) return;
-            try {
+            const channel = ChannelStore.getChannel(message.channel_id);
-                if (optimistic) return;
+            if (!shouldNotify(message, message.channel_id)) return;
-                const channel = ChannelStore.getChannel(message.channel_id);
-                if (!shouldNotify(message, message.channel_id)) return;
 
-                const pingColor = settings.store.pingColor.replaceAll("#", "").trim();
+            const pingColor = settings.store.pingColor.replaceAll("#", "").trim();
-                const channelPingColor = settings.store.channelPingColor.replaceAll("#", "").trim();
+            const channelPingColor = settings.store.channelPingColor.replaceAll("#", "").trim();
-                let finalMsg = message.content;
+            let finalMsg = message.content;
-                let titleString = "";
+            let titleString = "";
 
-                if (channel.guild_id) {
+            if (channel.guild_id) {
-                    const guild = GuildStore.getGuild(channel.guild_id);
+                const guild = GuildStore.getGuild(channel.guild_id);
-                    titleString = `${message.author.username} (${guild.name}, #${channel.name})`;
+                titleString = `${message.author.username} (${guild.name}, #${channel.name})`;
-                }
-
-
-                switch (channel.type) {
-                    case ChannelTypes.DM:
-                        titleString = message.author.username.trim();
-                        break;
-                    case ChannelTypes.GROUP_DM:
-                        const channelName = channel.name.trim() ?? channel.rawRecipients.map(e => e.username).join(", ");
-                        titleString = `${message.author.username} (${channelName})`;
-                        break;
-                }
-
-                if (message.referenced_message) {
-                    titleString += " (reply)";
-                }
-
-                if (message.embeds.length > 0) {
-                    finalMsg += " [embed] ";
-                    if (message.content === "") {
-                        finalMsg = "sent message embed(s)";
-                    }
-                }
-
-                if (message.sticker_items) {
-                    finalMsg += " [sticker] ";
-                    if (message.content === "") {
-                        finalMsg = "sent a sticker";
-                    }
-                }
-
-                const images = message.attachments.filter(e =>
-                    typeof e?.content_type === "string"
-                    && e?.content_type.startsWith("image")
-                );
-
-
-                images.forEach(img => {
-                    finalMsg += ` [image: ${img.filename}] `;
-                });
-
-                message.attachments.filter(a => a && !a.content_type?.startsWith("image")).forEach(a => {
-                    finalMsg += ` [attachment: ${a.filename}] `;
-                });
-
-                // make mentions readable
-                if (message.mentions.length > 0) {
-                    finalMsg = finalMsg.replace(/<@!?(\d{17,20})>/g, (_, id) => `<color=#${pingColor}><b>@${UserStore.getUser(id)?.username || "unknown-user"}</color></b>`);
-                }
-
-                // color role mentions (unity styling btw lol)
-                if (message.mention_roles.length > 0) {
-                    for (const roleId of message.mention_roles) {
-                        const role = GuildStore.getRole(channel.guild_id, roleId);
-                        if (!role) continue;
-                        const roleColor = role.colorString ?? `#${pingColor}`;
-                        finalMsg = finalMsg.replace(`<@&${roleId}>`, `<b><color=${roleColor}>@${role.name}</color></b>`);
-                    }
-                }
-
-                // make emotes and channel mentions readable
-                const emoteMatches = finalMsg.match(new RegExp("(<a?:\\w+:\\d+>)", "g"));
-                const channelMatches = finalMsg.match(new RegExp("<(#\\d+)>", "g"));
-
-                if (emoteMatches) {
-                    for (const eMatch of emoteMatches) {
-                        finalMsg = finalMsg.replace(new RegExp(`${eMatch}`, "g"), `:${eMatch.split(":")[1]}:`);
-                    }
-                }
-
-                // color channel mentions
-                if (channelMatches) {
-                    for (const cMatch of channelMatches) {
-                        let channelId = cMatch.split("<#")[1];
-                        channelId = channelId.substring(0, channelId.length - 1);
-                        finalMsg = finalMsg.replace(new RegExp(`${cMatch}`, "g"), `<b><color=#${channelPingColor}>#${ChannelStore.getChannel(channelId).name}</color></b>`);
-                    }
-                }
-
-                if (shouldIgnoreForChannelType(channel)) return;
-                sendMsgNotif(titleString, finalMsg, message);
-            } catch (err) {
-                XSLog.error(`Failed to catch MESSAGE_CREATE: ${err}`);
             }
+
+
+            switch (channel.type) {
+                case ChannelTypes.DM:
+                    titleString = message.author.username.trim();
+                    break;
+                case ChannelTypes.GROUP_DM:
+                    const channelName = channel.name.trim() ?? channel.rawRecipients.map(e => e.username).join(", ");
+                    titleString = `${message.author.username} (${channelName})`;
+                    break;
+            }
+
+            if (message.referenced_message) {
+                titleString += " (reply)";
+            }
+
+            if (message.embeds.length > 0) {
+                finalMsg += " [embed] ";
+                if (message.content === "") {
+                    finalMsg = "sent message embed(s)";
+                }
+            }
+
+            if (message.sticker_items) {
+                finalMsg += " [sticker] ";
+                if (message.content === "") {
+                    finalMsg = "sent a sticker";
+                }
+            }
+
+            const images = message.attachments.filter(e =>
+                typeof e?.content_type === "string"
+                && e?.content_type.startsWith("image")
+            );
+
+
+            images.forEach(img => {
+                finalMsg += ` [image: ${img.filename}] `;
+            });
+
+            message.attachments.filter(a => a && !a.content_type?.startsWith("image")).forEach(a => {
+                finalMsg += ` [attachment: ${a.filename}] `;
+            });
+
+            // make mentions readable
+            if (message.mentions.length > 0) {
+                finalMsg = finalMsg.replace(/<@!?(\d{17,20})>/g, (_, id) => `<color=#${pingColor}><b>@${UserStore.getUser(id)?.username || "unknown-user"}</color></b>`);
+            }
+
+            // color role mentions (unity styling btw lol)
+            if (message.mention_roles.length > 0) {
+                for (const roleId of message.mention_roles) {
+                    const role = GuildStore.getRole(channel.guild_id, roleId);
+                    if (!role) continue;
+                    const roleColor = role.colorString ?? `#${pingColor}`;
+                    finalMsg = finalMsg.replace(`<@&${roleId}>`, `<b><color=${roleColor}>@${role.name}</color></b>`);
+                }
+            }
+
+            // make emotes and channel mentions readable
+            const emoteMatches = finalMsg.match(new RegExp("(<a?:\\w+:\\d+>)", "g"));
+            const channelMatches = finalMsg.match(new RegExp("<(#\\d+)>", "g"));
+
+            if (emoteMatches) {
+                for (const eMatch of emoteMatches) {
+                    finalMsg = finalMsg.replace(new RegExp(`${eMatch}`, "g"), `:${eMatch.split(":")[1]}:`);
+                }
+            }
+
+            // color channel mentions
+            if (channelMatches) {
+                for (const cMatch of channelMatches) {
+                    let channelId = cMatch.split("<#")[1];
+                    channelId = channelId.substring(0, channelId.length - 1);
+                    finalMsg = finalMsg.replace(new RegExp(`${cMatch}`, "g"), `<b><color=#${channelPingColor}>#${ChannelStore.getChannel(channelId).name}</color></b>`);
+                }
+            }
+
+            if (shouldIgnoreForChannelType(channel)) return;
+            sendMsgNotif(titleString, finalMsg, message);
         }
     }
 });

src/utils/misc.ts

@@ -107,3 +107,14 @@ export function interpolateIfDefined(strings: TemplateStringsArray, ...args: any
     if (args.some(arg => arg == null)) return "";
     return strings.reduce((acc, str, i) => `${acc}${str}${args[i] ?? ""}`, "");
 }
+
+export function tryOrElse<T>(func: () => T, fallback: T): T {
+    try {
+        const res = func();
+        return res instanceof Promise
+            ? res.catch(() => fallback) as T
+            : res;
+    } catch {
+        return fallback;
+    }
+}

src/utils/text.ts

@@ -131,3 +131,18 @@ export function makeCodeblock(text: string, language?: string) {
     const chars = "```";
     return `${chars}${language || ""}\n${text.replaceAll("```", "\\`\\`\\`")}\n${chars}`;
 }
+
+export function stripIndent(strings: TemplateStringsArray, ...values: any[]) {
+    const string = String.raw({ raw: strings }, ...values);
+
+    const match = string.match(/^[ \t]*(?=\S)/gm);
+    if (!match) return string.trim();
+
+    const minIndent = match.reduce((r, a) => Math.min(r, a.length), Infinity);
+    return string.replace(new RegExp(`^[ \\t]{${minIndent}}`, "gm"), "").trim();
+}
+
+export const ZWSP = "\u200b";
+export function toInlineCode(s: string) {
+    return "``" + ZWSP + s.replaceAll("`", ZWSP + "`" + ZWSP) + ZWSP + "``";
+}

src/utils/types.ts

@@ -128,7 +128,7 @@ export interface PluginDef {
      * Allows you to subscribe to Flux events
      */
     flux?: {
-        [E in FluxEvents]?: (event: any) => void;
+        [E in FluxEvents]?: (event: any) => void | Promise<void>;
     };
     /**
      * Allows you to manipulate context menus