@notenoughupdates/discord-akairo
Advanced tools
Comparing version 9.1.3-dev.1653308752.2fb8165 to 9.1.3-dev.1653439069.b53d9e1
{ | ||
"name": "@notenoughupdates/discord-akairo", | ||
"version": "9.1.3-dev.1653308752.2fb8165", | ||
"version": "9.1.3-dev.1653439069.b53d9e1", | ||
"description": "A highly customizable bot framework for Discord.js.", | ||
@@ -5,0 +5,0 @@ "main": "./dist/src/index.js", |
@@ -605,3 +605,3 @@ "use strict"; | ||
// Makes options that are not found to be null so that it matches the behavior normal commands. | ||
(() => { | ||
out: { | ||
if (convertedOptions.subcommand || convertedOptions.subcommandGroup) { | ||
@@ -611,3 +611,3 @@ const usedSubcommandOrGroup = commandModule.slashOptions?.find(o => o.name === convertedOptions.subcommand); | ||
this.client.emit("akairoDebug", "[handleSlash] Unable to find subcommand"); | ||
return; | ||
break out; | ||
} | ||
@@ -617,3 +617,3 @@ if (usedSubcommandOrGroup.type === discord_js_1.ApplicationCommandOptionType.Subcommand) { | ||
this.client.emit("akairoDebug", "[handleSlash] Unable to find subcommand options"); | ||
return; | ||
break out; | ||
} | ||
@@ -626,7 +626,7 @@ handleOptions(usedSubcommandOrGroup.options); | ||
this.client.emit("akairoDebug", "[handleSlash] Unable to find subcommand"); | ||
return; | ||
break out; | ||
} | ||
else if (!usedSubCommand.options) { | ||
this.client.emit("akairoDebug", "[handleSlash] Unable to find subcommand options"); | ||
return; | ||
break out; | ||
} | ||
@@ -642,2 +642,3 @@ handleOptions(usedSubCommand.options); | ||
} | ||
// eslint-disable-next-line no-inner-declarations | ||
function handleOptions(options) { | ||
@@ -662,3 +663,3 @@ for (const option of options) { | ||
} | ||
})(); | ||
} | ||
let key; | ||
@@ -995,3 +996,3 @@ try { | ||
return false; | ||
const missing = message.channel?.permissionsFor(message.guild.me)?.missing(command.clientPermissions); | ||
const missing = message.channel?.permissionsFor(message.guild.members.me)?.missing(command.clientPermissions); | ||
if (missing?.length) { | ||
@@ -998,0 +999,0 @@ this.emit(event, message, command, "client", missing); |
@@ -67,3 +67,3 @@ "use strict"; | ||
this.position = 0; | ||
this.state = 0 /* Default */; | ||
this.state = 0 /* TokenizerState.Default */; | ||
this.tokens = []; | ||
@@ -104,3 +104,3 @@ } | ||
runFlags() { | ||
if (this.state === 0 /* Default */) { | ||
if (this.state === 0 /* TokenizerState.Default */) { | ||
for (const word of this.flagWords) { | ||
@@ -117,3 +117,3 @@ if (this.startsWith(word)) { | ||
runOptionFlags() { | ||
if (this.state === 0 /* Default */) { | ||
if (this.state === 0 /* TokenizerState.Default */) { | ||
for (const word of this.optionFlagWords) { | ||
@@ -131,7 +131,7 @@ if (this.startsWith(word)) { | ||
if (this.separator == null && this.quoted && this.startsWith('"')) { | ||
if (this.state === 1 /* Quotes */) { | ||
this.state = 0 /* Default */; | ||
if (this.state === 1 /* TokenizerState.Quotes */) { | ||
this.state = 0 /* TokenizerState.Default */; | ||
} | ||
else if (this.state === 0 /* Default */) { | ||
this.state = 1 /* Quotes */; | ||
else if (this.state === 0 /* TokenizerState.Default */) { | ||
this.state = 1 /* TokenizerState.Quotes */; | ||
} | ||
@@ -146,4 +146,4 @@ this.addToken("Quote", '"'); | ||
if (this.separator == null && this.quoted && this.startsWith('"')) { | ||
if (this.state === 0 /* Default */) { | ||
this.state = 1 /* SpecialQuotes */; | ||
if (this.state === 0 /* TokenizerState.Default */) { | ||
this.state = 1 /* TokenizerState.SpecialQuotes */; | ||
} | ||
@@ -158,4 +158,4 @@ this.addToken("OpenQuote", '"'); | ||
if (this.separator == null && this.quoted && this.startsWith("”")) { | ||
if (this.state === 1 /* SpecialQuotes */) { | ||
this.state = 0 /* Default */; | ||
if (this.state === 1 /* TokenizerState.SpecialQuotes */) { | ||
this.state = 0 /* TokenizerState.Default */; | ||
} | ||
@@ -177,3 +177,3 @@ this.addToken("EndQuote", "”"); | ||
runWord() { | ||
const wordRegex = this.state === 0 /* Default */ ? /^\S+/ : this.state === 1 /* Quotes */ ? /^[^\s"]+/ : /^[^\s”]+/; | ||
const wordRegex = this.state === 0 /* TokenizerState.Default */ ? /^\S+/ : this.state === 1 /* TokenizerState.Quotes */ ? /^[^\s"]+/ : /^[^\s”]+/; | ||
const wordMatch = this.match(wordRegex); | ||
@@ -180,0 +180,0 @@ if (wordMatch) { |
@@ -36,5 +36,4 @@ "use strict"; | ||
this.client.on("interactionCreate", i => { | ||
if (!i.isUserContextMenuCommand()) | ||
return; | ||
this.handle(i); | ||
if (i.isUserContextMenuCommand() || i.isMessageContextMenuCommand()) | ||
this.handle(i); | ||
}); | ||
@@ -41,0 +40,0 @@ }); |
{ | ||
"name": "@notenoughupdates/discord-akairo", | ||
"version": "9.1.3-dev.1653308752.2fb8165", | ||
"version": "9.1.3-dev.1653439069.b53d9e1", | ||
"description": "A highly customizable bot framework for Discord.js.", | ||
@@ -5,0 +5,0 @@ "main": "./dist/src/index.js", |
@@ -865,3 +865,3 @@ import { | ||
// Makes options that are not found to be null so that it matches the behavior normal commands. | ||
(() => { | ||
out: { | ||
type SubCommand = AkairoApplicationCommandSubCommandData; | ||
@@ -878,3 +878,3 @@ type SubCommandGroup = AkairoApplicationCommandSubGroupData; | ||
this.client.emit("akairoDebug", "[handleSlash] Unable to find subcommand"); | ||
return; | ||
break out; | ||
} | ||
@@ -884,3 +884,3 @@ if (usedSubcommandOrGroup.type === ApplicationCommandOptionType.Subcommand) { | ||
this.client.emit("akairoDebug", "[handleSlash] Unable to find subcommand options"); | ||
return; | ||
break out; | ||
} | ||
@@ -894,6 +894,6 @@ handleOptions((<SubCommand>usedSubcommandOrGroup).options!); | ||
this.client.emit("akairoDebug", "[handleSlash] Unable to find subcommand"); | ||
return; | ||
break out; | ||
} else if (!usedSubCommand.options) { | ||
this.client.emit("akairoDebug", "[handleSlash] Unable to find subcommand options"); | ||
return; | ||
break out; | ||
} | ||
@@ -909,2 +909,3 @@ | ||
// eslint-disable-next-line no-inner-declarations | ||
function handleOptions(options: NonSubSlashOptions[]) { | ||
@@ -929,3 +930,3 @@ for (const option of options) { | ||
} | ||
})(); | ||
} | ||
@@ -1290,3 +1291,3 @@ let key; | ||
if (!message.channel || message.channel.isDMBased()) return false; | ||
const missing = message.channel?.permissionsFor(message.guild.me!)?.missing(command.clientPermissions); | ||
const missing = message.channel?.permissionsFor(message.guild.members.me!)?.missing(command.clientPermissions); | ||
if (missing?.length) { | ||
@@ -1293,0 +1294,0 @@ this.emit(event, message, command, "client", missing); |
@@ -80,5 +80,3 @@ import type { Awaitable, Collection, ContextMenuCommandInteraction } from "discord.js"; | ||
this.client.on("interactionCreate", i => { | ||
if (!i.isUserContextMenuCommand()) return; | ||
this.handle(i); | ||
if (i.isUserContextMenuCommand() || i.isMessageContextMenuCommand()) this.handle(i); | ||
}); | ||
@@ -85,0 +83,0 @@ }); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
43674526
429