Fixes: - Webpack Patcher: incorrect patch error handling could lead to some functional patches not being applied - CommandsAPI: subcommands were impossible to unregister - useAwaiter: on error, the value was set to null even if a fallbackValue was specified, violating the type contract - Patcher: build check boolean logic was grouped incorrectly due to missing parantheses - CustomCommands: commands weren't unregistered on stop, leading to error when enabling, disabling & re-renabling the plugin - Notification Log: delete was by timestamp instead of ID and non-atomic - FixSpotifyEmbeds: settings listener was registered inside browser-window-created event handler, leading to duplicate listeners - CustomRPC: changing activity type or timestamp didn't update the RPC - CopyStickerLinks: message patch had non-sense code, just removed it - XSOverlay: UDP socket wasn't closed on stop - VoiceMessages: Web recorder never closed the mic media stream, which continues showing the OS mic indicator - PictureInPicture: Video clone wasn't properly cleaned up, which leaked memory - Themes (Extension version): theme object urls were never cleaned up, which leaked memory on theme change - Themes (Extension version): Upload Theme button hitbox was only the text, not the whole button. Also added Drag & Drop from file manager support - Dearrow: toggling for one embed flipped the global dearrow by default setting - Extension Installer: the zip extract function was vulnerable to path traversal, although we only ever used this for React DevTools obtained via https so it has low impact - FileWatchers: ensure always properly cleaned up - components/Link: mutated props which is a very bad practice All fixes are human written, only the audit was done by Claude Fable (thanks for ur tokens, Zere).
192 lines
6.6 KiB
TypeScript
192 lines
6.6 KiB
TypeScript
/*
|
|
* Vencord, a modification for Discord's desktop app
|
|
* Copyright (c) 2022 Vendicated and contributors
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
import { Logger } from "@utils/Logger";
|
|
import { makeCodeblock } from "@utils/text";
|
|
import { CommandArgument, CommandContext, CommandOption } from "@vencord/discord-types";
|
|
|
|
import { sendBotMessage } from "./commandHelpers";
|
|
import { ApplicationCommandInputType, ApplicationCommandOptionType, ApplicationCommandType, VencordCommand } from "./types";
|
|
|
|
export * from "./commandHelpers";
|
|
export * from "./types";
|
|
|
|
export let BUILT_IN: VencordCommand[];
|
|
export const commands = {} as Record<string, VencordCommand>;
|
|
|
|
// hack for plugins being evaluated before we can grab these from webpack
|
|
const OptPlaceholder = Symbol("OptionalMessageOption") as any as CommandOption;
|
|
const ReqPlaceholder = Symbol("RequiredMessageOption") as any as CommandOption;
|
|
|
|
/**
|
|
* Optional message option named "message" you can use in commands.
|
|
* Used in "tableflip" or "shrug"
|
|
* @see {@link RequiredMessageOption}
|
|
*/
|
|
export let OptionalMessageOption: CommandOption = OptPlaceholder;
|
|
/**
|
|
* Required message option named "message" you can use in commands.
|
|
* Used in "me"
|
|
* @see {@link OptionalMessageOption}
|
|
*/
|
|
export let RequiredMessageOption: CommandOption = ReqPlaceholder;
|
|
|
|
let idCounter = 99;
|
|
|
|
export const _init = function (cmds: VencordCommand[]) {
|
|
try {
|
|
BUILT_IN = cmds;
|
|
OptionalMessageOption = cmds.find(c => (c.untranslatedName || c.displayName) === "shrug")!.options![0];
|
|
RequiredMessageOption = cmds.find(c => (c.untranslatedName || c.displayName) === "me")!.options![0];
|
|
idCounter = Math.abs(BUILT_IN.map(x => Number(x.id)).sort((x, y) => x - y)[0]) + 1;
|
|
} catch (e) {
|
|
new Logger("CommandsAPI").error("Failed to load CommandsApi", e, " - cmds is", cmds);
|
|
}
|
|
return cmds;
|
|
} as never;
|
|
|
|
export const _handleCommand = function (cmd: VencordCommand, args: CommandArgument[], ctx: CommandContext) {
|
|
if (!cmd.isVencordCommand)
|
|
return cmd.execute(args, ctx);
|
|
|
|
const handleError = (err: any) => {
|
|
// TODO: cancel send if cmd.inputType === BUILT_IN_TEXT
|
|
const msg = `An Error occurred while executing command "${cmd.name}"`;
|
|
const reason = err instanceof Error ? err.stack || err.message : String(err);
|
|
|
|
console.error(msg, err);
|
|
sendBotMessage(ctx.channel.id, {
|
|
content: `${msg}:\n${makeCodeblock(reason)}`,
|
|
author: {
|
|
username: "Vencord"
|
|
}
|
|
});
|
|
};
|
|
|
|
try {
|
|
const res = cmd.execute(args, ctx);
|
|
return res instanceof Promise ? res.catch(handleError) : res;
|
|
} catch (err) {
|
|
return handleError(err);
|
|
}
|
|
} as never;
|
|
|
|
|
|
/**
|
|
* Prepare a Command Option for Discord by filling missing fields
|
|
* @param opt
|
|
*/
|
|
export function prepareOption<O extends CommandOption | VencordCommand>(opt: O): O {
|
|
opt.displayName ||= opt.name;
|
|
opt.displayDescription ||= opt.description;
|
|
opt.options?.forEach((opt, i, opts) => {
|
|
// See comment above Placeholders
|
|
if (opt === OptPlaceholder) opts[i] = OptionalMessageOption;
|
|
else if (opt === ReqPlaceholder) opts[i] = RequiredMessageOption;
|
|
opt.choices?.forEach(x => x.displayName ||= x.name);
|
|
|
|
prepareOption(opts[i]);
|
|
});
|
|
return opt;
|
|
}
|
|
|
|
const isSubCommandParent = (cmd: VencordCommand) => cmd.options?.[0]?.type === ApplicationCommandOptionType.SUB_COMMAND;
|
|
const getSubCommandName = (cmd: VencordCommand, option: CommandOption) => `${cmd.name} ${option.name}`;
|
|
|
|
// Yes, Discord registers individual commands for each subcommand
|
|
function registerSubCommands(cmd: VencordCommand, plugin: string) {
|
|
cmd.options?.forEach(o => {
|
|
if (o.type !== ApplicationCommandOptionType.SUB_COMMAND)
|
|
throw new Error("When specifying sub-command options, all options must be sub-commands.");
|
|
|
|
const subCmd = {
|
|
...cmd,
|
|
...o,
|
|
options: o.options !== undefined ? o.options : undefined,
|
|
type: ApplicationCommandType.CHAT_INPUT,
|
|
id: `${o.name}-${cmd.id}`,
|
|
name: getSubCommandName(cmd, o),
|
|
displayName: getSubCommandName(cmd, o),
|
|
subCommandPath: [{
|
|
name: o.name,
|
|
type: o.type,
|
|
displayName: o.name
|
|
}],
|
|
rootCommand: cmd
|
|
};
|
|
registerCommand(subCmd, plugin);
|
|
});
|
|
}
|
|
|
|
function unregisterSubCommands(cmd: VencordCommand): boolean {
|
|
const results = BUILT_IN
|
|
.filter(c => c.rootCommand === cmd)
|
|
.map(c => unregisterCommand(c.name));
|
|
|
|
return results.length > 0 && results.every(x => x);
|
|
}
|
|
|
|
export function registerCommand<C extends VencordCommand>(command: C, plugin: string) {
|
|
if (!BUILT_IN) {
|
|
console.warn(
|
|
"[CommandsAPI]",
|
|
`Not registering ${command.name} as the CommandsAPI hasn't been initialised.`,
|
|
"Please restart to use commands"
|
|
);
|
|
return;
|
|
}
|
|
|
|
if (BUILT_IN.some(c => c.name === command.name))
|
|
throw new Error(`Command '${command.name}' already exists.`);
|
|
|
|
command.isVencordCommand = true;
|
|
command.untranslatedName ??= command.name;
|
|
command.untranslatedDescription ??= command.description;
|
|
command.id ??= `-${idCounter++}`;
|
|
command.applicationId ??= "-1"; // BUILT_IN;
|
|
command.type ??= ApplicationCommandType.CHAT_INPUT;
|
|
command.inputType ??= ApplicationCommandInputType.BUILT_IN_TEXT;
|
|
command.plugin ||= plugin;
|
|
|
|
prepareOption(command);
|
|
commands[command.name] = command;
|
|
|
|
if (isSubCommandParent(command)) {
|
|
registerSubCommands(command, plugin);
|
|
return;
|
|
}
|
|
|
|
BUILT_IN.push(command);
|
|
}
|
|
|
|
export function unregisterCommand(name: string, isSubCommands = false) {
|
|
const cmd = commands[name];
|
|
if (cmd && isSubCommandParent(cmd)) {
|
|
delete commands[name];
|
|
return unregisterSubCommands(cmd);
|
|
}
|
|
|
|
const idx = BUILT_IN.findIndex(c => c.name === name);
|
|
if (idx === -1)
|
|
return false;
|
|
|
|
BUILT_IN.splice(idx, 1);
|
|
delete commands[name];
|
|
|
|
return true;
|
|
}
|