@pikokr/command.ts 3.2.3 → 3.2.4-dev.e21af4d
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.
- package/dist/builtinModules/BuiltinCommandConverters.d.ts +1 -1
- package/dist/builtinModules/BuiltinSlashCommandConverters.d.ts +1 -1
- package/dist/builtinModules/BuiltinSlashCommandConverters.js.map +1 -1
- package/dist/builtinModules/CommandHandler.js +7 -4
- package/dist/builtinModules/CommandHandler.js.map +1 -1
- package/dist/command/decorator.d.ts +1 -0
- package/dist/command/decorator.js +2 -1
- package/dist/command/decorator.js.map +1 -1
- package/dist/slashCommand/decorator.d.ts +1 -0
- package/dist/slashCommand/decorator.js +2 -1
- package/dist/slashCommand/decorator.js.map +1 -1
- package/dist/structures/CommandClient.d.ts +1 -0
- package/dist/structures/CommandClient.js +1 -0
- package/dist/structures/CommandClient.js.map +1 -1
- package/dist/typings.d.ts +1 -1
- package/package.json +3 -3
- package/src/builtinModules/BuiltinSlashCommandConverters.ts +1 -1
- package/src/builtinModules/CommandHandler.ts +8 -4
- package/src/command/decorator.ts +2 -1
- package/src/slashCommand/decorator.ts +2 -1
- package/src/structures/CommandClient.ts +2 -0
- package/src/typings.ts +1 -1
- package/test/modules/test.ts +9 -0
|
@@ -5,7 +5,7 @@ export declare class BuiltinCommandConverters extends BuiltInModule {
|
|
|
5
5
|
private cts;
|
|
6
6
|
client: Client;
|
|
7
7
|
constructor(cts: CommandClient);
|
|
8
|
-
message(msg: Message): Message
|
|
8
|
+
message(msg: Message): Message<boolean>;
|
|
9
9
|
string(msg: Message, arg: string): string;
|
|
10
10
|
getUserIDByMention(mention: string): `${bigint}` | undefined;
|
|
11
11
|
user(msg: Message, value: string): User | null;
|
|
@@ -5,6 +5,6 @@ export declare class BuiltinSlashCommandConverters extends BuiltInModule {
|
|
|
5
5
|
private cts;
|
|
6
6
|
client: Client;
|
|
7
7
|
constructor(cts: CommandClient);
|
|
8
|
-
message(interaction: CommandInteraction): CommandInteraction
|
|
8
|
+
message(interaction: CommandInteraction): CommandInteraction<import("discord.js").CacheType>;
|
|
9
9
|
optionResolver(interaction: CommandInteraction): CommandInteractionOptionResolver;
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuiltinSlashCommandConverters.js","sourceRoot":"","sources":["../../src/builtinModules/BuiltinSlashCommandConverters.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA+C;AAC/C,wCAAmD;AACnD,2CAAyF;AAGzF,MAAa,6BAA8B,SAAQ,6BAAa;IAG9D,YAAoB,GAAkB;QACpC,KAAK,EAAE,CAAA;QADW,QAAG,GAAH,GAAG,CAAe;QAEpC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;IAC1B,CAAC;IAGD,OAAO,CAAC,WAA+B;QACrC,OAAO,WAAW,CAAA;IACpB,CAAC;IAGD,cAAc,CAAC,WAA+B;QAC5C,OAAO,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"BuiltinSlashCommandConverters.js","sourceRoot":"","sources":["../../src/builtinModules/BuiltinSlashCommandConverters.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA+C;AAC/C,wCAAmD;AACnD,2CAAyF;AAGzF,MAAa,6BAA8B,SAAQ,6BAAa;IAG9D,YAAoB,GAAkB;QACpC,KAAK,EAAE,CAAA;QADW,QAAG,GAAH,GAAG,CAAe;QAEpC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;IAC1B,CAAC;IAGD,OAAO,CAAC,WAA+B;QACrC,OAAO,WAAW,CAAA;IACpB,CAAC;IAGD,cAAc,CAAC,WAA+B;QAC5C,OAAO,WAAW,CAAC,OAA2C,CAAA;IAChE,CAAC;CACF;AARC;IADC,gCAAsB,CAAC,+BAAkB,CAAC;;qCACtB,+BAAkB;;4DAEtC;AAGD;IADC,gCAAsB,CAAC,6CAAgC,CAAC;;qCAC7B,+BAAkB;oCAAG,6CAAgC;mEAEhF;AAhBH,sEAiBC"}
|
|
@@ -58,18 +58,19 @@ class CommandHandler extends BuiltInModule_1.BuiltInModule {
|
|
|
58
58
|
if (!command)
|
|
59
59
|
return;
|
|
60
60
|
let cmd = null;
|
|
61
|
+
const globalAliases = yield this.client.options.command.globalAliases(command, msg);
|
|
61
62
|
for (const c of this.registry.commands) {
|
|
62
|
-
|
|
63
|
+
const globalAliases2 = yield this.client.options.command.globalAliases(c.name, msg);
|
|
64
|
+
const aliases = typeof c.aliases === 'function' ? yield c.aliases(msg) : c.aliases;
|
|
65
|
+
if ([...aliases, c.name].some((x) => x === command)) {
|
|
63
66
|
cmd = c;
|
|
64
67
|
break;
|
|
65
68
|
}
|
|
66
|
-
if ((
|
|
69
|
+
if (globalAliases.every((x, i) => globalAliases2[i] === x)) {
|
|
67
70
|
cmd = c;
|
|
68
71
|
break;
|
|
69
72
|
}
|
|
70
73
|
}
|
|
71
|
-
if (!cmd)
|
|
72
|
-
return error(new CommandNotFound_1.CommandNotFound(command, msg, args));
|
|
73
74
|
msg.data = {
|
|
74
75
|
cts: this.client,
|
|
75
76
|
command: cmd,
|
|
@@ -78,6 +79,8 @@ class CommandHandler extends BuiltInModule_1.BuiltInModule {
|
|
|
78
79
|
if (!(yield this.client.options.command.check(msg))) {
|
|
79
80
|
return;
|
|
80
81
|
}
|
|
82
|
+
if (!cmd)
|
|
83
|
+
return error(new CommandNotFound_1.CommandNotFound(command, msg, args));
|
|
81
84
|
const module = this.registry.modules.find((x) => x.commands.includes(cmd));
|
|
82
85
|
if (!module)
|
|
83
86
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandHandler.js","sourceRoot":"","sources":["../../src/builtinModules/CommandHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,mDAA+C;AAE/C,0CAAsC;AACtC,2CAA8F;AAG9F,oCAAsJ;AACtJ,8DAA0D;AAE1D,MAAa,cAAe,SAAQ,6BAAa;IAG/C,YAAoB,QAAkB;QACpC,KAAK,EAAE,CAAA;QADW,aAAQ,GAAR,QAAQ,CAAU;QAEpC,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;IAC/B,CAAC;IAGK,OAAO,CAAC,GAAY;;YACxB,MAAM,KAAK,GAAG,CAAC,KAAY,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,EAAE,GAAG,CAAC,CAAA;YAEnF,IAAI;gBACF,MAAM,UAAU,GACd,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,QAAQ;oBACpD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM;oBACpC,CAAC,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU;wBAC1D,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC;wBAC/C,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAA;gBACxC,IAAI,MAAc,CAAA;gBAClB,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;oBAClC,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;oBAE3D,IAAI,CAAC,GAAG;wBAAE,OAAM;oBAEhB,MAAM,GAAG,GAAG,CAAA;iBACb;qBAAM;oBACL,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;wBAAE,OAAM;oBAC7C,MAAM,GAAG,UAAU,CAAA;iBACpB;gBAED,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;oBAAE,OAAM;gBAE3C,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAExD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAA;gBAE5B,IAAI,CAAC,OAAO;oBAAE,OAAM;gBAEpB,IAAI,GAAG,GAAmB,IAAI,CAAA;gBAE9B,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;oBACtC,IAAI,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"CommandHandler.js","sourceRoot":"","sources":["../../src/builtinModules/CommandHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { Message, PermissionResolvable } from 'discord.js';
|
|
|
2
2
|
declare type CommandOptions = {
|
|
3
3
|
name: string;
|
|
4
4
|
aliases: string[] | ((msg: Message) => string[]);
|
|
5
|
+
optionTypes?: any[];
|
|
5
6
|
};
|
|
6
7
|
export declare const command: (options?: Partial<CommandOptions>) => (target: Object, propertyKey: string) => void;
|
|
7
8
|
export declare const argumentConverter: (type: object, requireParameter?: boolean) => (target: Object, propertyKey: string) => void;
|
|
@@ -10,9 +10,10 @@ const discord_js_1 = require("discord.js");
|
|
|
10
10
|
const error_1 = require("../error");
|
|
11
11
|
const command = (options = {}) => {
|
|
12
12
|
return (target, propertyKey) => {
|
|
13
|
+
var _a;
|
|
13
14
|
utils_1.checkTarget(target);
|
|
14
15
|
let properties = Reflect.getMetadata(constants_1.KCommands, target);
|
|
15
|
-
const params = Reflect.getMetadata('design:paramtypes', target, propertyKey);
|
|
16
|
+
const params = (_a = options.optionTypes) !== null && _a !== void 0 ? _a : Reflect.getMetadata('design:paramtypes', target, propertyKey);
|
|
16
17
|
const optionals = Reflect.getMetadata(constants_1.KOptionals, target, propertyKey) || -1;
|
|
17
18
|
const rest = Reflect.getMetadata(constants_1.KRest, target, propertyKey) || -1;
|
|
18
19
|
const command = new Command_1.Command(Reflect.get(target, propertyKey), params.map((x, i) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorator.js","sourceRoot":"","sources":["../../src/command/decorator.ts"],"names":[],"mappings":";;;AAAA,4CAA0G;AAC1G,uCAAmC;AACnC,oCAAsC;AACtC,2DAA+E;AAE/E,mCAA8C;AAC9C,2CAAiG;AACjG,oCAA6I;
|
|
1
|
+
{"version":3,"file":"decorator.js","sourceRoot":"","sources":["../../src/command/decorator.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { Snowflake } from 'discord.js';
|
|
|
2
2
|
import { SlashCommandBuilder } from '@discordjs/builders';
|
|
3
3
|
declare type SlashOptions = {
|
|
4
4
|
guild: Snowflake | Snowflake[];
|
|
5
|
+
optionTypes?: any[];
|
|
5
6
|
};
|
|
6
7
|
export declare const slashCommand: (opt: Partial<SlashOptions> & {
|
|
7
8
|
command: SlashCommandBuilder | Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>;
|
|
@@ -7,9 +7,10 @@ const constants_1 = require("../constants");
|
|
|
7
7
|
const SlashCommand_1 = require("./SlashCommand");
|
|
8
8
|
const slashCommand = (opt) => {
|
|
9
9
|
return (target, propertyKey) => {
|
|
10
|
+
var _a;
|
|
10
11
|
utils_1.checkTarget(target);
|
|
11
12
|
let properties = Reflect.getMetadata(constants_1.KSlashCommands, target);
|
|
12
|
-
const params = Reflect.getMetadata('design:paramtypes', target, propertyKey);
|
|
13
|
+
const params = (_a = opt.optionTypes) !== null && _a !== void 0 ? _a : Reflect.getMetadata('design:paramtypes', target, propertyKey);
|
|
13
14
|
const options = Reflect.getMetadata(constants_1.KSlashCommandOptions, target, propertyKey) || new discord_js_1.Collection();
|
|
14
15
|
const command = new SlashCommand_1.SlashCommand(opt.command, Reflect.get(target, propertyKey), target, params.map((x, i) => ({
|
|
15
16
|
type: x,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorator.js","sourceRoot":"","sources":["../../src/slashCommand/decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAkD;AAClD,oCAAsC;AACtC,4CAAmE;AAEnE,iDAA6C;
|
|
1
|
+
{"version":3,"file":"decorator.js","sourceRoot":"","sources":["../../src/slashCommand/decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAkD;AAClD,oCAAsC;AACtC,4CAAmE;AAEnE,iDAA6C;AAQtC,MAAM,YAAY,GAAG,CAAC,GAAiI,EAAE,EAAE;IAChK,OAAO,CACL,MAAc,EACd,WAAmB,EAEnB,EAAE;;QACF,mBAAW,CAAC,MAAM,CAAC,CAAA;QAEnB,IAAI,UAAU,GAAmB,OAAO,CAAC,WAAW,CAAC,0BAAc,EAAE,MAAM,CAAC,CAAA;QAE5E,MAAM,MAAM,GAAU,MAAA,GAAG,CAAC,WAAW,mCAAI,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAA;QAEtG,MAAM,OAAO,GAA+B,OAAO,CAAC,WAAW,CAAC,gCAAoB,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,IAAI,uBAAU,EAAkB,CAAA;QAE9I,MAAM,OAAO,GAAG,IAAI,2BAAY,CAC9B,GAAG,CAAC,OAAO,EACX,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAChC,MAAgB,EAChB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACpB,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;SACrB,CAAC,CAAC,EACH,GAAG,CAAC,KAAK,EACT,WAAW,CACZ,CAAA;QAED,IAAI,UAAU,EAAE;YACd,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACzB;aAAM;YACL,UAAU,GAAG,CAAC,OAAO,CAAC,CAAA;YACtB,OAAO,CAAC,cAAc,CAAC,0BAAc,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;SAC3D;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAjCY,QAAA,YAAY,gBAiCxB;AAEM,MAAM,MAAM,GAAG,CAAC,GAAW,EAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE;IACjG,mBAAW,CAAC,MAAM,CAAC,CAAA;IAEnB,IAAI,UAAU,GAA+B,OAAO,CAAC,WAAW,CAAC,gCAAoB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAA;IAE3G,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,IAAI,uBAAU,EAAkB,CAAA;QAC7C,OAAO,CAAC,cAAc,CAAC,gCAAoB,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,CAAA;KAC9E;IAED,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,CAAA;AACrC,CAAC,CAAA;AAXY,QAAA,MAAM,UAWlB"}
|
|
@@ -6,6 +6,7 @@ import { Logger } from 'tslog';
|
|
|
6
6
|
export interface CommandOptions {
|
|
7
7
|
prefix: string | ((msg: any) => string | Promise<string | string[]> | string[]) | string[];
|
|
8
8
|
check: (msg: Message) => boolean | Promise<boolean>;
|
|
9
|
+
globalAliases: (cmd: string, msg: Message) => string[] | Promise<string[]>;
|
|
9
10
|
}
|
|
10
11
|
export interface SlashCommandOptions {
|
|
11
12
|
guild?: Snowflake | Snowflake[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandClient.js","sourceRoot":"","sources":["../../src/structures/CommandClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAsB;AACtB,yCAAqC;AACrC,2CAA6D;AAC7D,sDAA2G;AAC3G,wCAAoE;AACpE,0CAAsC;AACtC,iCAA8B;
|
|
1
|
+
{"version":3,"file":"CommandClient.js","sourceRoot":"","sources":["../../src/structures/CommandClient.ts"],"names":[],"mappings":"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"}
|
package/dist/typings.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pikokr/command.ts",
|
|
3
3
|
"description": "Discord.js command framework for typescript.",
|
|
4
|
-
"version": "3.2.
|
|
4
|
+
"version": "3.2.4-dev.e21af4d",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"license": "MIT",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"@discordjs/rest": "^0.1.0-canary.0",
|
|
11
11
|
"@types/lodash": "^4.14.172",
|
|
12
12
|
"all-contributors-cli": "^6.20.0",
|
|
13
|
-
"discord.js": "^13.
|
|
13
|
+
"discord.js": "^13.6.0",
|
|
14
14
|
"prettier": "^2.2.1",
|
|
15
15
|
"ts-node": "^10.1.0",
|
|
16
16
|
"typedoc": "^0.20.35"
|
|
@@ -33,4 +33,4 @@
|
|
|
33
33
|
"docs:dev": "typedoc",
|
|
34
34
|
"docs:build": "typedoc"
|
|
35
35
|
}
|
|
36
|
-
}
|
|
36
|
+
}
|
|
@@ -18,6 +18,6 @@ export class BuiltinSlashCommandConverters extends BuiltInModule {
|
|
|
18
18
|
|
|
19
19
|
@slashArgumentConverter(CommandInteractionOptionResolver)
|
|
20
20
|
optionResolver(interaction: CommandInteraction): CommandInteractionOptionResolver {
|
|
21
|
-
return interaction.options
|
|
21
|
+
return interaction.options as CommandInteractionOptionResolver
|
|
22
22
|
}
|
|
23
23
|
}
|
|
@@ -48,19 +48,21 @@ export class CommandHandler extends BuiltInModule {
|
|
|
48
48
|
|
|
49
49
|
let cmd: Command | null = null
|
|
50
50
|
|
|
51
|
+
const globalAliases = await this.client.options.command.globalAliases(command, msg)
|
|
52
|
+
|
|
51
53
|
for (const c of this.registry.commands) {
|
|
52
|
-
|
|
54
|
+
const globalAliases2 = await this.client.options.command.globalAliases(c.name, msg)
|
|
55
|
+
const aliases = typeof c.aliases === 'function' ? await c.aliases(msg) : c.aliases
|
|
56
|
+
if ([...aliases, c.name].some((x) => x === command)) {
|
|
53
57
|
cmd = c
|
|
54
58
|
break
|
|
55
59
|
}
|
|
56
|
-
if ((
|
|
60
|
+
if (globalAliases.every((x, i) => globalAliases2[i] === x)) {
|
|
57
61
|
cmd = c
|
|
58
62
|
break
|
|
59
63
|
}
|
|
60
64
|
}
|
|
61
65
|
|
|
62
|
-
if (!cmd) return error(new CommandNotFound(command, msg, args))
|
|
63
|
-
|
|
64
66
|
msg.data = {
|
|
65
67
|
cts: this.client,
|
|
66
68
|
command: cmd,
|
|
@@ -71,6 +73,8 @@ export class CommandHandler extends BuiltInModule {
|
|
|
71
73
|
return
|
|
72
74
|
}
|
|
73
75
|
|
|
76
|
+
if (!cmd) return error(new CommandNotFound(command, msg, args))
|
|
77
|
+
|
|
74
78
|
const module = this.registry.modules.find((x) => x.commands.includes(cmd!))
|
|
75
79
|
|
|
76
80
|
if (!module) return
|
package/src/command/decorator.ts
CHANGED
|
@@ -10,6 +10,7 @@ import { ClientPermissionRequired, DMOnlyCommandError, GuildOnlyCommandError, Ow
|
|
|
10
10
|
type CommandOptions = {
|
|
11
11
|
name: string
|
|
12
12
|
aliases: string[] | ((msg: Message) => string[])
|
|
13
|
+
optionTypes?: any[]
|
|
13
14
|
}
|
|
14
15
|
|
|
15
16
|
export const command = (options: Partial<CommandOptions> = {}) => {
|
|
@@ -22,7 +23,7 @@ export const command = (options: Partial<CommandOptions> = {}) => {
|
|
|
22
23
|
|
|
23
24
|
let properties: Command[] = Reflect.getMetadata(KCommands, target)
|
|
24
25
|
|
|
25
|
-
const params: any[] = Reflect.getMetadata('design:paramtypes', target, propertyKey)
|
|
26
|
+
const params: any[] = options.optionTypes ?? Reflect.getMetadata('design:paramtypes', target, propertyKey)
|
|
26
27
|
|
|
27
28
|
const optionals: number = Reflect.getMetadata(KOptionals, target, propertyKey) || -1
|
|
28
29
|
|
|
@@ -7,6 +7,7 @@ import { SlashCommandBuilder } from '@discordjs/builders'
|
|
|
7
7
|
|
|
8
8
|
type SlashOptions = {
|
|
9
9
|
guild: Snowflake | Snowflake[]
|
|
10
|
+
optionTypes?: any[]
|
|
10
11
|
}
|
|
11
12
|
|
|
12
13
|
export const slashCommand = (opt: Partial<SlashOptions> & { command: SlashCommandBuilder | Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'> }) => {
|
|
@@ -19,7 +20,7 @@ export const slashCommand = (opt: Partial<SlashOptions> & { command: SlashComman
|
|
|
19
20
|
|
|
20
21
|
let properties: SlashCommand[] = Reflect.getMetadata(KSlashCommands, target)
|
|
21
22
|
|
|
22
|
-
const params: any[] = Reflect.getMetadata('design:paramtypes', target, propertyKey)
|
|
23
|
+
const params: any[] = opt.optionTypes ?? Reflect.getMetadata('design:paramtypes', target, propertyKey)
|
|
23
24
|
|
|
24
25
|
const options: Collection<number, string> = Reflect.getMetadata(KSlashCommandOptions, target, propertyKey) || new Collection<number, string>()
|
|
25
26
|
|
|
@@ -9,6 +9,7 @@ import { Logger } from 'tslog'
|
|
|
9
9
|
export interface CommandOptions {
|
|
10
10
|
prefix: string | ((msg: any) => string | Promise<string | string[]> | string[]) | string[]
|
|
11
11
|
check: (msg: Message) => boolean | Promise<boolean>
|
|
12
|
+
globalAliases: (cmd: string, msg: Message) => string[] | Promise<string[]>
|
|
12
13
|
}
|
|
13
14
|
|
|
14
15
|
export interface SlashCommandOptions {
|
|
@@ -70,6 +71,7 @@ export class CommandClient {
|
|
|
70
71
|
command: {
|
|
71
72
|
prefix: '!',
|
|
72
73
|
check: () => true,
|
|
74
|
+
globalAliases: () => [],
|
|
73
75
|
},
|
|
74
76
|
owners: 'auto',
|
|
75
77
|
slashCommands: {
|
package/src/typings.ts
CHANGED
package/test/modules/test.ts
CHANGED
|
@@ -52,6 +52,15 @@ class Test extends Module {
|
|
|
52
52
|
msg.reply(asdf)
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
+
@slashCommand({
|
|
56
|
+
command: new SlashCommandBuilder()
|
|
57
|
+
.setName('sans')
|
|
58
|
+
.setDescription('test')
|
|
59
|
+
.addStringOption((builder) => builder.setName('asdf').setDescription('sans')),
|
|
60
|
+
})
|
|
61
|
+
@coolDown(CoolDownType.USER, 10)
|
|
62
|
+
coolDownSlash(i: CommandInteraction, @option('asdf') asdf: string = 'wa sans') {}
|
|
63
|
+
|
|
55
64
|
@slashCommand({
|
|
56
65
|
command: new SlashCommandBuilder()
|
|
57
66
|
.setName('test')
|