@sapphire/plugin-pattern-commands 3.1.2-next.d55295f.0 → 4.0.0-next.c64d41e.0
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/lib/structures/PaternCommandStore.js.map +1 -1
- package/dist/lib/structures/PatternCommand.d.ts +10 -10
- package/dist/lib/structures/PatternCommand.d.ts.map +1 -1
- package/dist/lib/structures/PatternCommand.js.map +1 -1
- package/dist/listeners/PluginCommandAccepted.d.ts.map +1 -1
- package/dist/listeners/PluginCommandAccepted.js +4 -6
- package/dist/listeners/PluginCommandAccepted.js.map +1 -1
- package/dist/listeners/PluginPreCommandRun.d.ts.map +1 -1
- package/dist/listeners/PluginPreCommandRun.js +6 -6
- package/dist/listeners/PluginPreCommandRun.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaternCommandStore.js","sourceRoot":"","sources":["../../../src/lib/structures/PaternCommandStore.ts"],"names":[],"mappings":";;;AAAA,6CAA8C;AAC9C,qDAAkD;AAElD,MAAa,mBAAoB,SAAQ,mBAA0B;IAClE;QACC,KAAK,CAAC,+
|
|
1
|
+
{"version":3,"file":"PaternCommandStore.js","sourceRoot":"","sources":["../../../src/lib/structures/PaternCommandStore.ts"],"names":[],"mappings":";;;AAAA,6CAA8C;AAC9C,qDAAkD;AAElD,MAAa,mBAAoB,SAAQ,mBAA0B;IAClE;QACC,KAAK,CAAC,+BAAc,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;IACrD,CAAC;CACD;AAJD,kDAIC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Args, Command } from '@sapphire/framework';
|
|
1
|
+
import { Args, Command, MessageCommand } from '@sapphire/framework';
|
|
2
2
|
import type { Awaitable, Message } from 'discord.js';
|
|
3
3
|
export declare abstract class PatternCommand extends Command<Args, PatternCommand.Options> {
|
|
4
4
|
readonly chance: number;
|
|
@@ -10,7 +10,7 @@ export declare abstract class PatternCommand extends Command<Args, PatternComman
|
|
|
10
10
|
*/
|
|
11
11
|
abstract messageRun(message: Message): Awaitable<unknown>;
|
|
12
12
|
}
|
|
13
|
-
export interface PatternCommandOptions extends
|
|
13
|
+
export interface PatternCommandOptions extends MessageCommand.Options {
|
|
14
14
|
/**
|
|
15
15
|
* The chance that the pattern command is triggered.
|
|
16
16
|
* @default 100
|
|
@@ -24,14 +24,14 @@ export interface PatternCommandOptions extends Command.Options {
|
|
|
24
24
|
matchFullName?: boolean;
|
|
25
25
|
}
|
|
26
26
|
export declare namespace PatternCommand {
|
|
27
|
-
/** Re-export of {@link
|
|
28
|
-
type Context =
|
|
29
|
-
/** Re-export of {@link
|
|
30
|
-
type RunContext =
|
|
31
|
-
/** Re-export of {@link
|
|
32
|
-
type JSON =
|
|
33
|
-
/** Re-export of {@link
|
|
34
|
-
type RunInTypes =
|
|
27
|
+
/** Re-export of {@link MessageCommand.Context} */
|
|
28
|
+
type Context = MessageCommand.Context;
|
|
29
|
+
/** Re-export of {@link MessageCommand.RunContext} */
|
|
30
|
+
type RunContext = MessageCommand.RunContext;
|
|
31
|
+
/** Re-export of {@link MessageCommand.JSON} */
|
|
32
|
+
type JSON = MessageCommand.JSON;
|
|
33
|
+
/** Re-export of {@link MessageCommand.RunInTypes} */
|
|
34
|
+
type RunInTypes = MessageCommand.RunInTypes;
|
|
35
35
|
/**
|
|
36
36
|
* The PatternCommand Options
|
|
37
37
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PatternCommand.d.ts","sourceRoot":"","sources":["../../../src/lib/structures/PatternCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"PatternCommand.d.ts","sourceRoot":"","sources":["../../../src/lib/structures/PatternCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErD,8BAAsB,cAAe,SAAQ,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC;IACjF,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,aAAa,EAAE,OAAO,CAAC;gBACpB,OAAO,EAAE,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,OAAO;IAMnF;;;OAGG;aACa,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;CAChE;AAED,MAAM,WAAW,qBAAsB,SAAQ,cAAc,CAAC,OAAO;IACpE;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,yBAAiB,cAAc,CAAC;IAC/B,kDAAkD;IAClD,KAAY,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC;IAE7C,qDAAqD;IACrD,KAAY,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;IAEnD,+CAA+C;IAC/C,KAAY,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;IAEvC,qDAAqD;IACrD,KAAY,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;IAEnD;;OAEG;IACH,KAAY,OAAO,GAAG,qBAAqB,CAAC;CAC5C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PatternCommand.js","sourceRoot":"","sources":["../../../src/lib/structures/PatternCommand.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"PatternCommand.js","sourceRoot":"","sources":["../../../src/lib/structures/PatternCommand.ts"],"names":[],"mappings":";;;AAAA,mDAAoE;AAGpE,MAAsB,cAAe,SAAQ,mBAAqC;IAGjF,YAAmB,OAA+B,EAAE,OAA+B;QAClF,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAHzB;;;;;WAA+B;QAC/B;;;;;WAAuC;QAGtC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,GAAG,CAAC;QACpC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,KAAK,CAAC;IACrD,CAAC;CAOD;AAdD,wCAcC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PluginCommandAccepted.d.ts","sourceRoot":"","sources":["../../src/listeners/PluginCommandAccepted.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"PluginCommandAccepted.d.ts","sourceRoot":"","sources":["../../src/listeners/PluginCommandAccepted.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uCAAuC,CAAC;AAE3F,qBAAa,uBAAwB,SAAQ,QAAQ,CAAC,OAAO,oBAAoB,CAAC,eAAe,CAAC;gBAC9E,OAAO,EAAE,YAAY;IAI3B,GAAG,CAAC,OAAO,EAAE,6BAA6B;IAU1C,iBAAiB,CAAC,OAAO,EAAE,6BAA6B;CAuBrE"}
|
|
@@ -19,7 +19,7 @@ class CommandAcceptedListener extends framework_1.Listener {
|
|
|
19
19
|
}
|
|
20
20
|
async runPatternCommand(payload) {
|
|
21
21
|
const { message, command } = payload;
|
|
22
|
-
const result = await
|
|
22
|
+
const result = await framework_1.Result.fromAsync(async () => {
|
|
23
23
|
message.client.emit(PaternCommandEvents_1.PatternCommandEvents.CommandRun, message, command, payload);
|
|
24
24
|
const stopwatch = new stopwatch_1.Stopwatch();
|
|
25
25
|
const result = await command.messageRun(message);
|
|
@@ -27,13 +27,11 @@ class CommandAcceptedListener extends framework_1.Listener {
|
|
|
27
27
|
message.client.emit(PaternCommandEvents_1.PatternCommandEvents.CommandSuccess, { ...payload, result, duration });
|
|
28
28
|
return duration;
|
|
29
29
|
});
|
|
30
|
-
|
|
31
|
-
message.client.emit(PaternCommandEvents_1.PatternCommandEvents.CommandError, result.error, { ...payload, duration: result.value ?? -1 });
|
|
32
|
-
}
|
|
30
|
+
result.inspectErr((error) => message.client.emit(PaternCommandEvents_1.PatternCommandEvents.CommandError, error, { ...payload, duration: -1 }));
|
|
33
31
|
message.client.emit(PaternCommandEvents_1.PatternCommandEvents.CommandFinished, message, command, {
|
|
34
32
|
...payload,
|
|
35
|
-
success:
|
|
36
|
-
duration: result.
|
|
33
|
+
success: result.isOk(),
|
|
34
|
+
duration: result.unwrapOr(-1)
|
|
37
35
|
});
|
|
38
36
|
}
|
|
39
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PluginCommandAccepted.js","sourceRoot":"","sources":["../../src/listeners/PluginCommandAccepted.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"PluginCommandAccepted.js","sourceRoot":"","sources":["../../src/listeners/PluginCommandAccepted.ts"],"names":[],"mappings":";;;AAAA,mDAAuD;AAEvD,mDAAgD;AAChD,0EAAwE;AAGxE,MAAa,uBAAwB,SAAQ,oBAAqD;IACjG,YAAmB,OAAqB;QACvC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,0CAAoB,CAAC,eAAe,EAAE,CAAC,CAAC;IACjE,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,OAAsC;QACtD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAE5C,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE;YACzD,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;SACtC;aAAM;YACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAoB,CAAC,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;SACjF;IACF,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,OAAsC;QACpE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAErC,MAAM,MAAM,GAAG,MAAM,kBAAM,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;YAChD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAEhF,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;YAClC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACjD,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;YAEtC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAoB,CAAC,cAAc,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YAE3F,OAAO,QAAQ,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAoB,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAE1H,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAoB,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE;YAC3E,GAAG,OAAO;YACV,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE;YACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC7B,CAAC,CAAC;IACJ,CAAC;CACD;AAtCD,0DAsCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PluginPreCommandRun.d.ts","sourceRoot":"","sources":["../../src/listeners/PluginPreCommandRun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA0B,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,uCAAuC,CAAC;AAEzF,qBAAa,qBAAsB,SAAQ,QAAQ,CAAC,OAAO,oBAAoB,CAAC,aAAa,CAAC;gBAC1E,OAAO,EAAE,YAAY;IAI3B,GAAG,CAAC,OAAO,EAAE,2BAA2B;
|
|
1
|
+
{"version":3,"file":"PluginPreCommandRun.d.ts","sourceRoot":"","sources":["../../src/listeners/PluginPreCommandRun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA0B,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,uCAAuC,CAAC;AAEzF,qBAAa,qBAAsB,SAAQ,QAAQ,CAAC,OAAO,oBAAoB,CAAC,aAAa,CAAC;gBAC1E,OAAO,EAAE,YAAY;IAI3B,GAAG,CAAC,OAAO,EAAE,2BAA2B;CAwBrD"}
|
|
@@ -10,15 +10,15 @@ class PreCommandRunListener extends framework_1.Listener {
|
|
|
10
10
|
async run(payload) {
|
|
11
11
|
const { message, command } = payload;
|
|
12
12
|
// Run global preconditions:
|
|
13
|
-
const globalResult = await this.container.stores.get('preconditions').
|
|
14
|
-
if (
|
|
15
|
-
message.client.emit(PaternCommandEvents_1.PatternCommandEvents.CommandDenied, globalResult.
|
|
13
|
+
const globalResult = await this.container.stores.get('preconditions').messageRun(message, command, payload);
|
|
14
|
+
if (globalResult.isErr()) {
|
|
15
|
+
message.client.emit(PaternCommandEvents_1.PatternCommandEvents.CommandDenied, globalResult.unwrapErr(), payload);
|
|
16
16
|
return;
|
|
17
17
|
}
|
|
18
18
|
// Run command-specific preconditions:
|
|
19
|
-
const localResult = await command.preconditions.
|
|
20
|
-
if (
|
|
21
|
-
message.client.emit(PaternCommandEvents_1.PatternCommandEvents.CommandDenied, localResult.
|
|
19
|
+
const localResult = await command.preconditions.messageRun(message, command, payload);
|
|
20
|
+
if (localResult.isErr()) {
|
|
21
|
+
message.client.emit(PaternCommandEvents_1.PatternCommandEvents.CommandDenied, localResult.unwrapErr(), payload);
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
24
24
|
message.client.emit(PaternCommandEvents_1.PatternCommandEvents.CommandAccepted, payload);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PluginPreCommandRun.js","sourceRoot":"","sources":["../../src/listeners/PluginPreCommandRun.ts"],"names":[],"mappings":";;;AAAA,mDAAuE;AAEvE,0EAAwE;AAGxE,MAAa,qBAAsB,SAAQ,oBAAmD;IAC7F,YAAmB,OAAqB;QACvC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,0CAAoB,CAAC,aAAa,EAAE,CAAC,CAAC;IAC/D,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,OAAoC;QACpD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAErC,4BAA4B;QAC5B,MAAM,YAAY,GAAG,MAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAkC,CAAC,
|
|
1
|
+
{"version":3,"file":"PluginPreCommandRun.js","sourceRoot":"","sources":["../../src/listeners/PluginPreCommandRun.ts"],"names":[],"mappings":";;;AAAA,mDAAuE;AAEvE,0EAAwE;AAGxE,MAAa,qBAAsB,SAAQ,oBAAmD;IAC7F,YAAmB,OAAqB;QACvC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,0CAAoB,CAAC,aAAa,EAAE,CAAC,CAAC;IAC/D,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,OAAoC;QACpD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAErC,4BAA4B;QAC5B,MAAM,YAAY,GAAG,MAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAkC,CAAC,UAAU,CACjH,OAAO,EACP,OAAO,EACP,OAAc,CACd,CAAC;QAEF,IAAI,YAAY,CAAC,KAAK,EAAE,EAAE;YACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAoB,CAAC,aAAa,EAAE,YAAY,CAAC,SAAS,EAAE,EAAE,OAAO,CAAC,CAAC;YAC3F,OAAO;SACP;QAED,sCAAsC;QACtC,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,OAAc,CAAC,CAAC;QAC7F,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE;YACxB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAoB,CAAC,aAAa,EAAE,WAAW,CAAC,SAAS,EAAE,EAAE,OAAO,CAAC,CAAC;YAC1F,OAAO;SACP;QAED,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAoB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;CACD;AA7BD,sDA6BC"}
|
package/package.json
CHANGED