@pikokr/command.ts 3.2.2-dev.519a303 → 3.2.4-dev.26dca6f

Sign up to get free protection for your applications and to get access to all the features.
@@ -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,OAAO,CAAA;IAC5B,CAAC;CACF;AARC;IADC,gCAAsB,CAAC,+BAAkB,CAAC;;qCACtB,+BAAkB;;4DAEtC;AAGD;IADC,gCAAsB,CAAC,6CAAgC,CAAC;;qCAC7B,+BAAkB;oCAAG,6CAAgC;mEAEhF;AAhBH,sEAiBC"}
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
- if (c.name === command) {
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 ((typeof c.aliases === 'function' ? yield c.aliases(msg) : c.aliases).includes(command)) {
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":"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"}
1
+ {"version":3,"file":"CommandHandler.js","sourceRoot":"","sources":["../../src/builtinModules/CommandHandler.ts"],"names":[],"mappings":"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"}
@@ -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[];
@@ -46,6 +46,7 @@ class CommandClient {
46
46
  command: {
47
47
  prefix: '!',
48
48
  check: () => true,
49
+ globalAliases: () => [],
49
50
  },
50
51
  owners: 'auto',
51
52
  slashCommands: {
@@ -1 +1 @@
1
- {"version":3,"file":"CommandClient.js","sourceRoot":"","sources":["../../src/structures/CommandClient.ts"],"names":[],"mappings":"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"}
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;AAyB9B,MAAa,aAAa;IAkCxB,YAAY,EAA4J;YAA5J,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,OAA2H,EAAtH,OAAO,cAA7C,uCAA+C,CAAF;QAhCzD,WAAM,GAAa,EAAE,CAAA;QACrB,aAAQ,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,CAAA;QAG7B,SAAI,GAAG,IAAI,WAAI,CAAC;YACd,OAAO,EAAE,GAAG;SACb,CAAC,CAAA;QAGM,aAAQ,GAAG,KAAK,CAAA;QAwBtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,eAAe,IAAI,IAAI,gCAAsB,EAAE,CAAA;QACtE,IAAI,CAAC,OAAO,GAAG,gBAAC,CAAC,KAAK,CACpB;YACE,OAAO,EAAE;gBACP,MAAM,EAAE,GAAG;gBACX,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI;gBACjB,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE;aACxB;YACD,MAAM,EAAE,MAAM;YACd,aAAa,EAAE;gBACb,QAAQ,EAAE,IAAI;aACf;SACF,EACD,OAAO,CACR,CAAA;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,cAAM,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;QAE1D,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YAClC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAA;SAClC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;QAC7C,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,+BAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC/D,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,yCAAwB,CAAC,IAAI,CAAC,CAAC,CAAA;QAChE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,8CAA6B,CAAC,IAAI,CAAC,CAAC,CAAA;IACvE,CAAC;IAjDa,WAAW;;;YACvB,MAAM,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,0CAAE,KAAK,EAAE,CAAA,CAAA;YACtC,MAAM,CAAC,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,0CAAE,KAAK,CAAA;YACxC,IAAI,CAAC,CAAC;gBAAE,OAAO,EAAE,CAAA;YACjB,IAAI,CAAC,YAAY,iBAAI;gBAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;;gBAC/B,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;;KACvC;IAEK,KAAK;;YACT,IAAI,IAAI,CAAC,QAAQ;gBAAE,OAAM;YACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,KAAM,CAAC,CAAA;YACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;YACpB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;gBAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;gBACvC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;aAC5B;YACD,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,EAAE;gBACvC,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAA;aACnC;QACH,CAAC;KAAA;CA+BF;AA/DD,sCA+DC"}
package/dist/typings.d.ts CHANGED
@@ -4,7 +4,7 @@ import { SlashCommand } from './slashCommand';
4
4
  declare module 'discord.js' {
5
5
  interface Message {
6
6
  data: {
7
- command: Command;
7
+ command: Command | null;
8
8
  prefix: string;
9
9
  cts: CommandClient;
10
10
  };
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.2-dev.519a303",
4
+ "version": "3.2.4-dev.26dca6f",
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.1.0",
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"
@@ -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
- if (c.name === command) {
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 ((typeof c.aliases === 'function' ? await c.aliases(msg) : c.aliases).includes(command)) {
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
@@ -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
@@ -5,7 +5,7 @@ import { SlashCommand } from './slashCommand'
5
5
  declare module 'discord.js' {
6
6
  interface Message {
7
7
  data: {
8
- command: Command
8
+ command: Command | null
9
9
  prefix: string
10
10
  cts: CommandClient
11
11
  }
@@ -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')