trivious 1.6.16 → 1.6.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -44,20 +44,18 @@ async function handleSlashCommand(client, command, interaction) {
|
|
|
44
44
|
command.permission || PermissionLevel.USER,
|
|
45
45
|
true
|
|
46
46
|
);
|
|
47
|
+
if (command.flags?.includes("DeferReply")) {
|
|
48
|
+
await interactionReply({
|
|
49
|
+
flags: command.flags,
|
|
50
|
+
interaction,
|
|
51
|
+
options: { content: "Processing command..." }
|
|
52
|
+
});
|
|
53
|
+
}
|
|
47
54
|
if ("run" in command && command.run && hasPerm) {
|
|
48
55
|
await command.run(client, interaction);
|
|
49
56
|
}
|
|
50
57
|
if (!hasPerm) return;
|
|
51
|
-
if (!options.getSubcommand(false) || !("subcommands" in command))
|
|
52
|
-
if (command.flags?.includes("DeferReply")) {
|
|
53
|
-
await interactionReply({
|
|
54
|
-
flags: command.flags,
|
|
55
|
-
interaction,
|
|
56
|
-
options: { content: "Processing command..." }
|
|
57
|
-
});
|
|
58
|
-
}
|
|
59
|
-
return;
|
|
60
|
-
}
|
|
58
|
+
if (!options.getSubcommand(false) || !("subcommands" in command)) return;
|
|
61
59
|
const subcommandName = options.getSubcommand();
|
|
62
60
|
const subcommand = command.subcommands.get(subcommandName);
|
|
63
61
|
if (!subcommand) {
|
|
@@ -72,7 +70,7 @@ async function handleSlashCommand(client, command, interaction) {
|
|
|
72
70
|
}
|
|
73
71
|
if (subcommand.flags?.includes("DeferReply") && !subcommand.flags.includes("ModalResponse")) {
|
|
74
72
|
await interactionReply({
|
|
75
|
-
flags:
|
|
73
|
+
flags: subcommand.flags,
|
|
76
74
|
interaction,
|
|
77
75
|
options: { content: "Processing command..." }
|
|
78
76
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/core/commands/methods.command.ts"],"names":[],"mappings":";;;AA6BA,eAAsB,iBAAiB,IAAA,EAIpC;AACF,EAAA,MAAM,EAAE,WAAA,EAAa,KAAA,EAAO,OAAA,EAAQ,GAAI,IAAA;AACxC,EAAA,IAAI,EAAE,WAAW,WAAA,CAAA,EAAc;AAC9B,IAAA,MAAM,IAAI,KAAA,CAAM,CAAA,iCAAA,EAAoC,OAAO,WAAW,CAAA,CAAE,CAAA;AAAA,EACzE;AAEA,EAAA,MAAM,SAAA,GAAY,KAAA,EAAO,QAAA,CAAS,gBAAgB,CAAA;AAClD,EAAA,MAAM,QAAA,GAAW,KAAA,EAAO,QAAA,CAAS,UAAU,CAAA;AAE3C,EAAA,MAAM,UAAA,GAAa,OAAA;AACnB,EAAA,IAAI,SAAA,EAAW,UAAA,CAAW,KAAA,GAAQ,CAAC,WAAW,CAAA;AAE9C,EAAA,IAAI,WAAA,CAAY,OAAA,IAAW,WAAA,CAAY,QAAA,EAAU;AAChD,IAAA,IAAI,QAAA,EAAU,MAAM,WAAA,CAAY,QAAA,CAAS,UAAU,CAAA;AAAA,SAC9C,MAAM,WAAA,CAAY,SAAA,CAAU,OAAsC,CAAA;AAAA,EACxE,CAAA,MAAO;AACN,IAAA,MAAM,WAAA,CAAY,MAAM,UAAU,CAAA;AAAA,EACnC;AACD;AAcA,eAAsB,sBACrB,MAAA,EACA,WAAA,EACA,OAAA,EACA,kBAAA,EACA,UAAmB,IAAA,EAClB;AACD,EAAA,IAAI,CAAC,WAAA,CAAY,OAAA,EAAQ,EAAG,OAAO,IAAA;AAEnC,EAAA,IAAI,QAAQ,KAAA,IAAS,OAAA,CAAQ,KAAA,CAAM,QAAA,CAAS,WAAW,CAAA,EAAG;AACzD,IAAA,kBAAA,GAAqB,eAAA,CAAgB,SAAA;AAAA,EACtC;AAEA,EAAA,MAAM,SAAS,WAAA,CAAY,MAAA;AAC3B,EAAA,MAAM,sBAAsB,aAAA,CAAc,MAAA,EAAQ,EAAE,UAAA,EAAY,kBAAA,EAAoB,QAAQ,CAAA;AAE5F,EAAA,IAAI,CAAC,uBAAuB,OAAA,EAAS;AACpC,IAAA,MAAM,gBAAA,CAAiB;AAAA,MACtB,OAAO,OAAA,CAAQ,KAAA;AAAA,MACf,WAAA;AAAA,MACA,OAAA,EAAS;AAAA,QACR,OAAA,EAAS,CAAA,uEAAA,EAA0E,eAAA,CAAgB,kBAAkB,CAAC,CAAA,EAAA;AAAA;AACvH,KACA,CAAA;AAAA,EACF;AAEA,EAAA,OAAO,mBAAA;AACR;AAYA,eAAsB,kBAAA,CACrB,MAAA,EACA,OAAA,EACA,WAAA,EACC;AACD,EAAA,MAAM,EAAE,SAAQ,GAAI,WAAA;AAEpB,EAAA,MAAM,UAAU,MAAM,qBAAA;AAAA,IACrB,MAAA;AAAA,IACA,WAAA;AAAA,IACA,OAAA;AAAA,IACA,OAAA,CAAQ,cAAc,eAAA,CAAgB,IAAA;AAAA,IACtC;AAAA,GACD;AAEA,EAAA,IAAI,KAAA,IAAS,OAAA,IAAW,OAAA,CAAQ,GAAA,IAAO,OAAA,EAAS;AAC/C,IAAA,MAAM,OAAA,CAAQ,GAAA,CAAI,MAAA,EAAQ,WAAW,CAAA;AAAA,EACtC;AAEA,EAAA,IAAI,CAAC,OAAA,EAAS;AAGd,EAAA,IAAI,CAAC,OAAA,CAAQ,aAAA,CAAc,KAAK,CAAA,IAAK,EAAE,iBAAiB,OAAA,CAAA,EAAU;
|
|
1
|
+
{"version":3,"sources":["../../../src/core/commands/methods.command.ts"],"names":[],"mappings":"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","file":"methods.command.js","sourcesContent":["import {\n\tCacheType,\n\tChatInputCommandInteraction,\n\tGuildMember,\n\tInteraction,\n\tInteractionEditReplyOptions,\n\tInteractionReplyOptions,\n\tMessagePayload,\n} from \"discord.js\";\nimport {\n\tCommand,\n\tCommandFlags,\n\tPermissionLevel,\n\tSlashCommand,\n\tSlashSubcommand,\n\tTriviousClient,\n} from \"src/index.js\";\nimport { hasPermission } from \"src/shared/utility/functions.js\";\n\n/**\n * Reply to a command, respecting whether it has been deferred or already replied to.\n *\n * @export\n * @async\n * @param {Command} command\n * @param {ChatInputCommandInteraction | ContextMenuCommandInteraction} interaction\n * @param {(MessagePayload | InteractionEditReplyOptions | InteractionReplyOptions)} options\n * @returns {*}\n */\nexport async function interactionReply(data: {\n\tflags?: (\"FollowUp\" | CommandFlags)[];\n\tinteraction: Interaction<CacheType>;\n\toptions: MessagePayload | InteractionEditReplyOptions | InteractionReplyOptions;\n}) {\n\tconst { interaction, flags, options } = data;\n\tif (!(\"reply\" in interaction)) {\n\t\tthrow new Error(`Cannot reply to interaction type ${typeof interaction}`);\n\t}\n\n\tconst ephemeral = flags?.includes(\"EphemeralReply\");\n\tconst followUp = flags?.includes(\"FollowUp\");\n\n\tconst newOptions = options as InteractionReplyOptions;\n\tif (ephemeral) newOptions.flags = [\"Ephemeral\"];\n\n\tif (interaction.replied || interaction.deferred) {\n\t\tif (followUp) await interaction.followUp(newOptions);\n\t\telse await interaction.editReply(options as InteractionEditReplyOptions);\n\t} else {\n\t\tawait interaction.reply(newOptions);\n\t}\n}\n\n/**\n * Compare a permission level to the guild member's permission level.\n *\n * @export\n * @async\n * @param {TriviousClient} client\n * @param {ChatInputCommandInteraction | ContextMenuCommandInteraction} interaction\n * @param {Command} command\n * @param {PermissionLevel} requiredPermission\n * @param {boolean} [doReply=true]\n * @returns {unknown}\n */\nexport async function verifyGuildPermission(\n\tclient: TriviousClient,\n\tinteraction: Interaction<CacheType>,\n\tcommand: Command,\n\trequiredPermission: PermissionLevel,\n\tdoReply: boolean = true\n) {\n\tif (!interaction.inGuild()) return true;\n\n\tif (command.flags && command.flags.includes(\"OwnerOnly\")) {\n\t\trequiredPermission = PermissionLevel.BOT_OWNER;\n\t}\n\n\tconst member = interaction.member as GuildMember;\n\tconst memberHasPermission = hasPermission(client, { permission: requiredPermission, member });\n\n\tif (!memberHasPermission && doReply) {\n\t\tawait interactionReply({\n\t\t\tflags: command.flags,\n\t\t\tinteraction,\n\t\t\toptions: {\n\t\t\t\tcontent: `You do not have permission to run this command, required permission: \\`${PermissionLevel[requiredPermission]}\\``,\n\t\t\t},\n\t\t});\n\t}\n\n\treturn memberHasPermission;\n}\n\n/**\n * Handle execution of a slash command.\n *\n * @export\n * @async\n * @param {TriviousClient} client\n * @param {(SlashCommand | SlashSubcommand)} command\n * @param {ChatInputCommandInteraction} interaction\n * @returns {*}\n */\nexport async function handleSlashCommand(\n\tclient: TriviousClient,\n\tcommand: SlashCommand,\n\tinteraction: ChatInputCommandInteraction\n) {\n\tconst { options } = interaction;\n\n\tconst hasPerm = await verifyGuildPermission(\n\t\tclient,\n\t\tinteraction,\n\t\tcommand,\n\t\tcommand.permission || PermissionLevel.USER,\n\t\ttrue\n\t);\n\n\tif (command.flags?.includes(\"DeferReply\")) {\n\t\tawait interactionReply({\n\t\t\tflags: command.flags,\n\t\t\tinteraction,\n\t\t\toptions: { content: \"Processing command...\" },\n\t\t});\n\t}\n\n\tif (\"run\" in command && command.run && hasPerm) {\n\t\tawait command.run(client, interaction);\n\t}\n\n\tif (!hasPerm) return;\n\n\t// skip subcommand processing and respect command flags\n\tif (!options.getSubcommand(false) || !(\"subcommands\" in command)) return;\n\n\tconst subcommandName = options.getSubcommand();\n\tconst subcommand = command.subcommands!.get(subcommandName) as SlashSubcommand | undefined;\n\n\tif (!subcommand) {\n\t\tawait interactionReply({\n\t\t\tflags: command.flags,\n\t\t\tinteraction,\n\t\t\toptions: {\n\t\t\t\tcontent: \"This subcommand no longer exists or is not registered.\",\n\t\t\t},\n\t\t});\n\t\treturn;\n\t}\n\n\t// respect subcommand flags over command flags\n\tif (subcommand.flags?.includes(\"DeferReply\") && !subcommand.flags.includes(\"ModalResponse\")) {\n\t\tawait interactionReply({\n\t\t\tflags: subcommand.flags,\n\t\t\tinteraction,\n\t\t\toptions: { content: \"Processing command...\" },\n\t\t});\n\t}\n\n\tawait subcommand.execute(client, interaction);\n}\n"]}
|