cordo 1.13.4 → 1.14.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/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/manager/components.js +1 -1
- package/dist/manager/components.js.map +1 -1
- package/dist/manager/states.d.ts +6 -0
- package/dist/manager/states.js +23 -0
- package/dist/manager/states.js.map +1 -1
- package/dist/replies.js +11 -7
- package/dist/replies.js.map +1 -1
- package/dist/types/custom.d.ts +7 -2
- package/package.json +1 -1
- package/src/index.ts +1 -0
- package/src/manager/components.ts +1 -1
- package/src/manager/states.ts +29 -1
- package/src/replies.ts +11 -7
- package/src/types/custom.ts +8 -2
- package/v2/_test/command.ts +14 -1
- package/v2/components/select-component.ts +140 -0
- package/v2/types/const.ts +12 -6
package/dist/index.d.ts
CHANGED
|
@@ -19,6 +19,7 @@ export default class Cordo {
|
|
|
19
19
|
componentHandlers: Map<string, InteractionComponentHandler>;
|
|
20
20
|
slottedComponentHandlers: Set<import("./types/custom").SlottedComponentHandler>;
|
|
21
21
|
uiStates: Map<string, InteractionUIState>;
|
|
22
|
+
slottedUiStates: Set<import("./types/custom").SlottedUIState>;
|
|
22
23
|
middlewares: {
|
|
23
24
|
interactionCallback: InteractionCallbackMiddleware[];
|
|
24
25
|
fetchGuildData: GuildDataMiddleware;
|
package/dist/index.js
CHANGED
|
@@ -180,6 +180,7 @@ Cordo.__data = {
|
|
|
180
180
|
componentHandlers: components_1.default.componentHandlers,
|
|
181
181
|
slottedComponentHandlers: components_1.default.slottedComponentHandlers,
|
|
182
182
|
uiStates: states_1.default.uiStates,
|
|
183
|
+
slottedUiStates: states_1.default.slottedUiStates,
|
|
183
184
|
middlewares: {
|
|
184
185
|
interactionCallback: [],
|
|
185
186
|
fetchGuildData: null,
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAA0D;AAE1D,yCAAwE;AAGxE,+BAA4B;AAC5B,yDAAgD;AAChD,iDAAqD;AACrD,qDAAyD;AACzD,6CAAiD;AAEjD,2DAA+D;AAG/D,wCAAqB;AACrB,4CAAyB;AACzB,uDAAoC;AACpC,2DAAwC;AACxC,+CAA4B;AAC5B,oDAAiC;AACjC,gDAA6B;AAC7B,iDAA8B;AAC9B,qDAAkC;AAElC,MAAqB,KAAK;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ class CordoComponentsManager {
|
|
|
35
35
|
CordoComponentsManager.componentHandlers.set(id, handler);
|
|
36
36
|
if (id.includes('$')) {
|
|
37
37
|
const regex = new RegExp('^' + id.replace(/\$[a-zA-Z0-9]+/g, '[a-zA-Z0-9]+') + '$');
|
|
38
|
-
|
|
38
|
+
CordoComponentsManager.slottedComponentHandlers.add({ id, regex, handler });
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
//
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/manager/components.ts"],"names":[],"mappings":";;AAAA,yBAAwB;AACxB,6BAA4B;AAC5B,0BAAsB;AACtB,gCAA6B;AAC7B,wCAAqC;AAErC,0CAAkF;AAElF,gEAAuD;AACvD,wCAA0C;AAC1C,qCAAyC;AAGzC,MAAqB,sBAAsB;IAKzC,EAAE;IAEK,MAAM,CAAC,qBAAqB,CAAC,GAAsB,EAAE,MAAe;QACzE,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAA;QACpD,KAAK,MAAM,IAAI,IAAI,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;YACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;YACrC,IAAI,QAAQ,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;YAChE,OAAO,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YAEpF,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;oBAAE,SAAQ;gBACnC,sBAAsB,CAAC,wBAAwB,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAA;aACrF;iBAAM;gBACL,sBAAsB,CAAC,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;aACjE;SACF;IACH,CAAC;IAEM,MAAM,CAAC,wBAAwB,CAAC,EAAU,EAAE,OAAoC;QACrF,IAAI,sBAAsB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;YAClD,WAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,kCAAkC,CAAC,CAAA;QAExF,sBAAsB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;QAEzD,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACpB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,cAAc,CAAC,GAAG,GAAG,CAAC,CAAA;YACnF,
|
|
1
|
+
{"version":3,"file":"components.js","sourceRoot":"","sources":["../../src/manager/components.ts"],"names":[],"mappings":"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"}
|
package/dist/manager/states.d.ts
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
|
+
import { SlottedUIState } from '..';
|
|
1
2
|
import { InteractionUIState } from '../types/custom';
|
|
2
3
|
export default class CordoStatesManager {
|
|
3
4
|
static readonly uiStates: Map<string, InteractionUIState>;
|
|
5
|
+
static readonly slottedUiStates: Set<SlottedUIState>;
|
|
4
6
|
static findUiStates(dir: string | string[], prefix?: string): void;
|
|
5
7
|
static registerUiState(id: string, state: InteractionUIState): void;
|
|
8
|
+
static getStateById(id: string): {
|
|
9
|
+
state: InteractionUIState;
|
|
10
|
+
params: Record<string, string>;
|
|
11
|
+
};
|
|
6
12
|
}
|
package/dist/manager/states.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const fs = require("fs");
|
|
4
4
|
const path = require("path");
|
|
5
5
|
const __1 = require("..");
|
|
6
|
+
const utils_1 = require("../lib/utils");
|
|
6
7
|
class CordoStatesManager {
|
|
7
8
|
//
|
|
8
9
|
static findUiStates(dir, prefix) {
|
|
@@ -27,8 +28,30 @@ class CordoStatesManager {
|
|
|
27
28
|
if (CordoStatesManager.uiStates.has(id))
|
|
28
29
|
__1.default._data.logger.warn(`UI State for ${id} already exists. Overriding.`);
|
|
29
30
|
CordoStatesManager.uiStates.set(id, state);
|
|
31
|
+
if (id.includes('$')) {
|
|
32
|
+
const regex = new RegExp('^' + id.replace(/\$[a-zA-Z0-9]+/g, '[a-zA-Z0-9]+') + '$');
|
|
33
|
+
CordoStatesManager.slottedUiStates.add({ id, regex, state });
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
static getStateById(id) {
|
|
37
|
+
if (CordoStatesManager.uiStates.has(id)) {
|
|
38
|
+
return {
|
|
39
|
+
state: CordoStatesManager.uiStates.get(id),
|
|
40
|
+
params: {}
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
const regexSearchResult = [...CordoStatesManager.slottedUiStates.values()]
|
|
44
|
+
.find(h => h.regex.test(id));
|
|
45
|
+
if (regexSearchResult) {
|
|
46
|
+
return {
|
|
47
|
+
state: CordoStatesManager.uiStates.get(id),
|
|
48
|
+
params: (0, utils_1.parseParams)(regexSearchResult.id, id)
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
return null;
|
|
30
52
|
}
|
|
31
53
|
}
|
|
32
54
|
exports.default = CordoStatesManager;
|
|
33
55
|
CordoStatesManager.uiStates = new Map();
|
|
56
|
+
CordoStatesManager.slottedUiStates = new Set();
|
|
34
57
|
//# sourceMappingURL=states.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"states.js","sourceRoot":"","sources":["../../src/manager/states.ts"],"names":[],"mappings":";;AAAA,yBAAwB;AACxB,6BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"states.js","sourceRoot":"","sources":["../../src/manager/states.ts"],"names":[],"mappings":";;AAAA,yBAAwB;AACxB,6BAA4B;AAC5B,0BAA0C;AAE1C,wCAA0C;AAG1C,MAAqB,kBAAkB;IAKrC,EAAE;IAEK,MAAM,CAAC,YAAY,CAAC,GAAsB,EAAE,MAAe;QAChE,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAA;QACpD,KAAK,MAAM,IAAI,IAAI,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;YACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;YACrC,IAAI,QAAQ,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;YAChE,OAAO,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YAEpF,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;oBAAE,SAAQ;gBACnC,kBAAkB,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAA;aACxE;iBAAM;gBACL,kBAAkB,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;aACpD;SACF;IACH,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,EAAU,EAAE,KAAyB;QACjE,IAAI,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACrC,WAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,8BAA8B,CAAC,CAAA;QAE3E,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QAE1C,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACpB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,cAAc,CAAC,GAAG,GAAG,CAAC,CAAA;YACnF,kBAAkB,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;SAC7D;IACH,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,EAAU;QACnC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACvC,OAAO;gBACL,KAAK,EAAE,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1C,MAAM,EAAE,EAAE;aACX,CAAA;SACF;QAED,MAAM,iBAAiB,GAAG,CAAE,GAAG,kBAAkB,CAAC,eAAe,CAAC,MAAM,EAAE,CAAE;aACzE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;QAE9B,IAAI,iBAAiB,EAAE;YACrB,OAAO;gBACL,KAAK,EAAE,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1C,MAAM,EAAE,IAAA,mBAAW,EAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,CAAC;aAC9C,CAAA;SACF;QAED,OAAO,IAAI,CAAA;IACb,CAAC;;AAtDH,qCAwDC;AAtDwB,2BAAQ,GAAoC,IAAI,GAAG,EAAE,CAAA;AACrD,kCAAe,GAAwB,IAAI,GAAG,EAAE,CAAA"}
|
package/dist/replies.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const const_1 = require("./types/const");
|
|
4
4
|
const api_1 = require("./api");
|
|
5
|
+
const states_1 = require("./manager/states");
|
|
5
6
|
const index_1 = require("./index");
|
|
6
7
|
class CordoReplies {
|
|
7
8
|
//
|
|
@@ -45,11 +46,12 @@ class CordoReplies {
|
|
|
45
46
|
async state(state, ...args) {
|
|
46
47
|
if (!state)
|
|
47
48
|
state = i.data.name;
|
|
48
|
-
|
|
49
|
+
const stateItem = states_1.default.getStateById(state);
|
|
50
|
+
if (!stateItem) {
|
|
49
51
|
index_1.default._data.logger.warn(`Command ${i.data.name} tried to apply state non-existent ${state}`);
|
|
50
52
|
return;
|
|
51
53
|
}
|
|
52
|
-
let data =
|
|
54
|
+
let data = stateItem.state({ ...i, params: stateItem.params }, args);
|
|
53
55
|
if (data.then)
|
|
54
56
|
data = await data;
|
|
55
57
|
api_1.default.interactionCallback(i, const_1.InteractionCallbackType.CHANNEL_MESSAGE_WITH_SOURCE, data);
|
|
@@ -105,11 +107,12 @@ class CordoReplies {
|
|
|
105
107
|
async state(state, ...args) {
|
|
106
108
|
if (!state)
|
|
107
109
|
state = i.data.custom_id;
|
|
108
|
-
|
|
110
|
+
const stateItem = states_1.default.getStateById(state);
|
|
111
|
+
if (!stateItem) {
|
|
109
112
|
index_1.default._data.logger.warn(`Component ${i.data.custom_id} tried to apply state non-existent ${state}`);
|
|
110
113
|
return;
|
|
111
114
|
}
|
|
112
|
-
let data =
|
|
115
|
+
let data = stateItem.state({ ...i, params: stateItem.params }, args);
|
|
113
116
|
if (data.then)
|
|
114
117
|
data = await data;
|
|
115
118
|
api_1.default.interactionCallback(i, const_1.InteractionCallbackType.UPDATE_MESSAGE, data);
|
|
@@ -151,11 +154,12 @@ class CordoReplies {
|
|
|
151
154
|
async state(state, ...args) {
|
|
152
155
|
if (!state)
|
|
153
156
|
state = context.interaction.id;
|
|
154
|
-
|
|
155
|
-
|
|
157
|
+
const stateItem = states_1.default.getStateById(state);
|
|
158
|
+
if (!stateItem) {
|
|
159
|
+
index_1.default._data.logger.warn(`Janitor tried to apply state non-existent ${state}`);
|
|
156
160
|
return;
|
|
157
161
|
}
|
|
158
|
-
let data =
|
|
162
|
+
let data = stateItem.state({ ...context.interaction, params: stateItem.params }, args);
|
|
159
163
|
if (data.then)
|
|
160
164
|
data = await data;
|
|
161
165
|
api_1.default.interactionCallback(context.interaction, const_1.InteractionCallbackType.UPDATE_MESSAGE, data);
|
package/dist/replies.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replies.js","sourceRoot":"","sources":["../src/replies.ts"],"names":[],"mappings":";;AACA,yCAAiF;AAEjF,+BAA4B;AAC5B,mCAAyD;AAGzD,MAAqB,YAAY;IAM/B,EAAE;IAEK,MAAM,CAAC,0BAA0B,CAAC,CAAqB,EAAE,QAAiB;QAC/E,MAAM,OAAO,GAA4B;YACvC,EAAE,EAAE,QAAQ,IAAI,CAAC,CAAC,EAAE;YACpB,WAAW,EAAE,CAAC;YACd,OAAO,EAAE,CAAC,CAAC;YACX,cAAc,EAAE,IAAI;YACpB,aAAa,EAAE,IAAI;YACnB,aAAa,EAAE,WAAW;YAC1B,QAAQ,EAAE,IAAI,GAAG,EAAE;YACnB,eAAe,EAAE,IAAI,GAAG,EAAE;SAC3B,CAAA;QAED,IAAI,CAAC,8BAA8B,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;QAC5D,UAAU,CACR,CAAC,EAAU,EAAE,EAAE,CAAC,YAAY,CAAC,8BAA8B,CAAC,MAAM,CAAC,EAAE,CAAC,EACtE,EAAE,GAAG,IAAI,EACT,OAAO,CAAC,EAAE,CACX,CAAA;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;IAEM,MAAM,CAAC,gCAAgC,CAAC,CAAqB,EAAE,WAA2B;QAC/F,IAAI,WAAW;YAAG,CAAwC,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAA;QACtF,OAAO;YACL,GAAG,CAAC;YACJ,KAAK,CAAC,SAAS,GAAG,KAAK;gBACrB,OAAO,aAAQ,CAAC,mBAAmB,CACjC,CAAC,EACD,+BAAuB,CAAC,oCAAoC,EAC5D,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,gCAAwB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CACjE,CAAA;YACH,CAAC;YACD,KAAK,CAAC,IAA+C;gBACnD,OAAO,aAAQ,CAAC,mBAAmB,CAAC,CAAC,EAAE,+BAAuB,CAAC,2BAA2B,EAAE,IAAI,CAAC,CAAA;YACnG,CAAC;YACD,gBAAgB,CAAC,IAA+C;gBAC9D,MAAM,OAAO,GAAG,YAAY,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAA;gBAC1D,aAAQ,CAAC,mBAAmB,CAAC,CAAC,EAAE,+BAAuB,CAAC,2BAA2B,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;gBACtG,OAAO,YAAY,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;YACpD,CAAC;YACD,cAAc,CAAC,IAA+C;gBAC5D,aAAQ,CAAC,mBAAmB,CAAC,CAAC,EAAE,+BAAuB,CAAC,2BAA2B,EAAE,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,gCAAwB,CAAC,SAAS,EAAE,CAAC,CAAA;YAC9I,CAAC;YACD,SAAS,CAAC,IAA8B;gBACtC,aAAQ,CAAC,mBAAmB,CAAC,CAAC,EAAE,+BAAuB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;YACtE,CAAC;YACD,KAAK,CAAC,KAAK,CAAC,KAAc,EAAE,GAAG,IAAS;gBACtC,IAAI,CAAC,KAAK;oBAAE,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;gBAE/B,
|
|
1
|
+
{"version":3,"file":"replies.js","sourceRoot":"","sources":["../src/replies.ts"],"names":[],"mappings":"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"}
|
package/dist/types/custom.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { InteractionMessage } from '..';
|
|
3
|
-
import { GenericInteraction, InteractionJanitor, ReplyableCommandInteraction, ReplyableComponentInteraction, MessageEmbed, ReplyableCommandAutocompleteInteraction, CommandArgumentChoice } from './base';
|
|
3
|
+
import { GenericInteraction, InteractionJanitor, ReplyableCommandInteraction, ReplyableComponentInteraction, MessageEmbed, ReplyableCommandAutocompleteInteraction, CommandArgumentChoice, SlotedContext } from './base';
|
|
4
4
|
import { MessageComponent } from './component';
|
|
5
5
|
import { InteractionResponseFlags } from './const';
|
|
6
6
|
export type LocalisationContext = {
|
|
@@ -74,4 +74,9 @@ export type InteractionCallbackFollowup = {
|
|
|
74
74
|
getMessage(): Promise<InteractionMessage>;
|
|
75
75
|
edit(data: InteractionApplicationCommandCallbackData, useRaw?: boolean): void;
|
|
76
76
|
};
|
|
77
|
-
export type InteractionUIState = (i: GenericInteraction
|
|
77
|
+
export type InteractionUIState = (i: GenericInteraction & Partial<SlotedContext>, ...args: any) => InteractionApplicationCommandCallbackData | Promise<InteractionApplicationCommandCallbackData>;
|
|
78
|
+
export type SlottedUIState = {
|
|
79
|
+
regex: RegExp;
|
|
80
|
+
id: string;
|
|
81
|
+
state: InteractionUIState;
|
|
82
|
+
};
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -45,6 +45,7 @@ export default class Cordo {
|
|
|
45
45
|
componentHandlers: CordoComponentsManager.componentHandlers,
|
|
46
46
|
slottedComponentHandlers: CordoComponentsManager.slottedComponentHandlers,
|
|
47
47
|
uiStates: CordoStatesManager.uiStates,
|
|
48
|
+
slottedUiStates: CordoStatesManager.slottedUiStates,
|
|
48
49
|
middlewares: {
|
|
49
50
|
interactionCallback: [] as InteractionCallbackMiddleware[],
|
|
50
51
|
fetchGuildData: null as GuildDataMiddleware,
|
|
@@ -42,7 +42,7 @@ export default class CordoComponentsManager {
|
|
|
42
42
|
|
|
43
43
|
if (id.includes('$')) {
|
|
44
44
|
const regex = new RegExp('^' + id.replace(/\$[a-zA-Z0-9]+/g, '[a-zA-Z0-9]+') + '$')
|
|
45
|
-
|
|
45
|
+
CordoComponentsManager.slottedComponentHandlers.add({ id, regex, handler })
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
|
package/src/manager/states.ts
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import * as fs from 'fs'
|
|
2
2
|
import * as path from 'path'
|
|
3
|
-
import Cordo from '..'
|
|
3
|
+
import Cordo, { SlottedUIState } from '..'
|
|
4
4
|
import { InteractionUIState } from '../types/custom'
|
|
5
|
+
import { parseParams } from '../lib/utils'
|
|
5
6
|
|
|
6
7
|
|
|
7
8
|
export default class CordoStatesManager {
|
|
8
9
|
|
|
9
10
|
public static readonly uiStates: Map<string, InteractionUIState> = new Map()
|
|
11
|
+
public static readonly slottedUiStates: Set<SlottedUIState> = new Set()
|
|
10
12
|
|
|
11
13
|
//
|
|
12
14
|
|
|
@@ -31,6 +33,32 @@ export default class CordoStatesManager {
|
|
|
31
33
|
Cordo._data.logger.warn(`UI State for ${id} already exists. Overriding.`)
|
|
32
34
|
|
|
33
35
|
CordoStatesManager.uiStates.set(id, state)
|
|
36
|
+
|
|
37
|
+
if (id.includes('$')) {
|
|
38
|
+
const regex = new RegExp('^' + id.replace(/\$[a-zA-Z0-9]+/g, '[a-zA-Z0-9]+') + '$')
|
|
39
|
+
CordoStatesManager.slottedUiStates.add({ id, regex, state })
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
public static getStateById(id: string): { state: InteractionUIState, params: Record<string, string> } {
|
|
44
|
+
if (CordoStatesManager.uiStates.has(id)) {
|
|
45
|
+
return {
|
|
46
|
+
state: CordoStatesManager.uiStates.get(id),
|
|
47
|
+
params: {}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
const regexSearchResult = [ ...CordoStatesManager.slottedUiStates.values() ]
|
|
52
|
+
.find(h => h.regex.test(id))
|
|
53
|
+
|
|
54
|
+
if (regexSearchResult) {
|
|
55
|
+
return {
|
|
56
|
+
state: CordoStatesManager.uiStates.get(id),
|
|
57
|
+
params: parseParams(regexSearchResult.id, id)
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
return null
|
|
34
62
|
}
|
|
35
63
|
|
|
36
64
|
}
|
package/src/replies.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { InteractionApplicationCommandCallbackData, InteractionComponentHandler,
|
|
|
2
2
|
import { InteractionCallbackType, InteractionResponseFlags } from './types/const'
|
|
3
3
|
import { CommandInteraction, ComponentInteraction, GenericInteraction, InteractionJanitor, ReplyableCommandInteraction, ReplyableComponentInteraction, SlotedContext, ReplyableCommandAutocompleteInteraction, CommandAutocompleteInteraction, CommandArgumentChoice } from './types/base'
|
|
4
4
|
import CordoAPI from './api'
|
|
5
|
+
import CordoStatesManager from './manager/states'
|
|
5
6
|
import Cordo, { InteractionOpenModalData } from './index'
|
|
6
7
|
|
|
7
8
|
|
|
@@ -63,12 +64,13 @@ export default class CordoReplies {
|
|
|
63
64
|
async state(state?: string, ...args: any) {
|
|
64
65
|
if (!state) state = i.data.name
|
|
65
66
|
|
|
66
|
-
|
|
67
|
+
const stateItem = CordoStatesManager.getStateById(state)
|
|
68
|
+
if (!stateItem) {
|
|
67
69
|
Cordo._data.logger.warn(`Command ${i.data.name} tried to apply state non-existent ${state}`)
|
|
68
70
|
return
|
|
69
71
|
}
|
|
70
72
|
|
|
71
|
-
let data =
|
|
73
|
+
let data = stateItem.state({ ...i, params: stateItem.params }, args)
|
|
72
74
|
if ((data as any).then) data = await data
|
|
73
75
|
CordoAPI.interactionCallback(i, InteractionCallbackType.CHANNEL_MESSAGE_WITH_SOURCE, data as InteractionApplicationCommandCallbackData)
|
|
74
76
|
}
|
|
@@ -123,12 +125,13 @@ export default class CordoReplies {
|
|
|
123
125
|
async state(state?: string, ...args: any) {
|
|
124
126
|
if (!state) state = i.data.custom_id
|
|
125
127
|
|
|
126
|
-
|
|
128
|
+
const stateItem = CordoStatesManager.getStateById(state)
|
|
129
|
+
if (!stateItem) {
|
|
127
130
|
Cordo._data.logger.warn(`Component ${i.data.custom_id} tried to apply state non-existent ${state}`)
|
|
128
131
|
return
|
|
129
132
|
}
|
|
130
133
|
|
|
131
|
-
let data =
|
|
134
|
+
let data = stateItem.state({ ...i, params: stateItem.params }, args)
|
|
132
135
|
if ((data as any).then) data = await data
|
|
133
136
|
CordoAPI.interactionCallback(i, InteractionCallbackType.UPDATE_MESSAGE, data as InteractionApplicationCommandCallbackData)
|
|
134
137
|
}
|
|
@@ -180,12 +183,13 @@ export default class CordoReplies {
|
|
|
180
183
|
async state(state?: string, ...args: any) {
|
|
181
184
|
if (!state) state = context.interaction.id
|
|
182
185
|
|
|
183
|
-
|
|
184
|
-
|
|
186
|
+
const stateItem = CordoStatesManager.getStateById(state)
|
|
187
|
+
if (!stateItem) {
|
|
188
|
+
Cordo._data.logger.warn(`Janitor tried to apply state non-existent ${state}`)
|
|
185
189
|
return
|
|
186
190
|
}
|
|
187
191
|
|
|
188
|
-
let data =
|
|
192
|
+
let data = stateItem.state({ ...context.interaction, params: stateItem.params }, args)
|
|
189
193
|
if ((data as any).then) data = await data
|
|
190
194
|
CordoAPI.interactionCallback(context.interaction, InteractionCallbackType.UPDATE_MESSAGE, data as InteractionApplicationCommandCallbackData)
|
|
191
195
|
}
|
package/src/types/custom.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable camelcase */
|
|
2
2
|
|
|
3
3
|
import { InteractionMessage } from '..'
|
|
4
|
-
import { GenericInteraction, InteractionJanitor, ReplyableCommandInteraction, ReplyableComponentInteraction, MessageEmbed, ReplyableCommandAutocompleteInteraction, CommandArgumentChoice } from './base'
|
|
4
|
+
import { GenericInteraction, InteractionJanitor, ReplyableCommandInteraction, ReplyableComponentInteraction, MessageEmbed, ReplyableCommandAutocompleteInteraction, CommandArgumentChoice, SlotedContext } from './base'
|
|
5
5
|
import { MessageComponent } from './component'
|
|
6
6
|
import { InteractionResponseFlags } from './const'
|
|
7
7
|
|
|
@@ -107,4 +107,10 @@ export type InteractionCallbackFollowup = {
|
|
|
107
107
|
|
|
108
108
|
// States
|
|
109
109
|
|
|
110
|
-
export type InteractionUIState = (i: GenericInteraction
|
|
110
|
+
export type InteractionUIState = (i: GenericInteraction & Partial<SlotedContext>, ...args: any) => InteractionApplicationCommandCallbackData | Promise<InteractionApplicationCommandCallbackData>
|
|
111
|
+
|
|
112
|
+
export type SlottedUIState = {
|
|
113
|
+
regex: RegExp
|
|
114
|
+
id: string
|
|
115
|
+
state: InteractionUIState
|
|
116
|
+
}
|
package/v2/_test/command.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { button } from "../components/button-component"
|
|
2
|
+
import { select } from "../components/select-component"
|
|
2
3
|
import { Interaction } from "../interactions/$interaction"
|
|
3
4
|
|
|
4
5
|
|
|
@@ -14,6 +15,17 @@ export default function handle(i: Interaction<'COMMAND'>) {
|
|
|
14
15
|
button({
|
|
15
16
|
customId: 'hi2',
|
|
16
17
|
label: 'Gaming'
|
|
18
|
+
}),
|
|
19
|
+
select({
|
|
20
|
+
customId: 'pick_channels',
|
|
21
|
+
options: 'CHANNELS'
|
|
22
|
+
}),
|
|
23
|
+
select({
|
|
24
|
+
customId: 'pick_custom',
|
|
25
|
+
options: [
|
|
26
|
+
{ label: 'hi', value: 'gaming' },
|
|
27
|
+
{ label: 'pog', value: 'nice' }
|
|
28
|
+
]
|
|
17
29
|
})
|
|
18
30
|
]
|
|
19
31
|
})
|
|
@@ -26,7 +38,8 @@ export default function handle(i: Interaction<'COMMAND'>) {
|
|
|
26
38
|
i.edit({
|
|
27
39
|
components: [
|
|
28
40
|
button('gaming', 'hi'),
|
|
29
|
-
button.link('https://gaming', 'Gaming')
|
|
41
|
+
button.link('https://gaming', 'Gaming'),
|
|
42
|
+
select.users('nice')
|
|
30
43
|
]
|
|
31
44
|
})
|
|
32
45
|
})
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import { MessageComponentSelectOption } from "../../types/component"
|
|
2
|
+
import { ComponentType, InteractionComponentFlag } from "../../types/const"
|
|
3
|
+
import CordoAPI from "../api"
|
|
4
|
+
import { ExactlyOne } from "../types/helper"
|
|
5
|
+
import { MessageComponent, SerializionContext } from "./$component"
|
|
6
|
+
|
|
7
|
+
export type SelectOptionsPresets
|
|
8
|
+
= 'USERS'
|
|
9
|
+
| 'ROLES'
|
|
10
|
+
| 'MENTIONABLES'
|
|
11
|
+
| 'CHANNELS'
|
|
12
|
+
|
|
13
|
+
export type AutoSelectTypes
|
|
14
|
+
= ComponentType.USER_SELECT
|
|
15
|
+
| ComponentType.ROLE_SELECT
|
|
16
|
+
| ComponentType.MENTIONABLE_SELECT
|
|
17
|
+
| ComponentType.CHANNEL_SELECT
|
|
18
|
+
|
|
19
|
+
export type AllSelectTypes
|
|
20
|
+
= ComponentType.SELECT
|
|
21
|
+
| AutoSelectTypes
|
|
22
|
+
|
|
23
|
+
type HelperSelectData = ExactlyOne<
|
|
24
|
+
{ options: MessageComponentSelectOption[] },
|
|
25
|
+
{ options: SelectOptionsPresets }
|
|
26
|
+
>
|
|
27
|
+
|
|
28
|
+
export type CreateSelectOptions<CustomId extends string>
|
|
29
|
+
= {
|
|
30
|
+
/** the custom id of this component */
|
|
31
|
+
customId: CustomId
|
|
32
|
+
/** the select will render on screen but will not be clickable */
|
|
33
|
+
disabled?: boolean
|
|
34
|
+
/** the select will be hidden completely and will not count towards the maximum component amount */
|
|
35
|
+
visible?: boolean
|
|
36
|
+
/** placeholder text when no option is selected */
|
|
37
|
+
placeholder?: string
|
|
38
|
+
/** minimum amount of values a user has to select */
|
|
39
|
+
minValues?: number
|
|
40
|
+
/** maximum amount of values a user can select */
|
|
41
|
+
maxValues?: number
|
|
42
|
+
/** flags to control who can interact how */
|
|
43
|
+
flags?: InteractionComponentFlag[]
|
|
44
|
+
}
|
|
45
|
+
& HelperSelectData
|
|
46
|
+
|
|
47
|
+
/*
|
|
48
|
+
*
|
|
49
|
+
*
|
|
50
|
+
*
|
|
51
|
+
*/
|
|
52
|
+
|
|
53
|
+
function withOptions([ options ]: any[]): MessageComponent<AllSelectTypes, string> {
|
|
54
|
+
return {
|
|
55
|
+
customId: options.customId,
|
|
56
|
+
doRender: !!options.visible,
|
|
57
|
+
serialize: (context?: SerializionContext) => ({
|
|
58
|
+
...parseOptionsPreset(options.options),
|
|
59
|
+
disabled: options.disabled ?? undefined,
|
|
60
|
+
placeholder: options.placeholder ?? undefined,
|
|
61
|
+
min_values: options.minValues ?? undefined,
|
|
62
|
+
max_values: options.maxValues ?? undefined,
|
|
63
|
+
custom_id: generateCustomId(options.customId, options.flags, context)
|
|
64
|
+
})
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
function withCustomId([ customId, options, placeholder, disabled, rawFlags ]: any[]): MessageComponent<AllSelectTypes, string> {
|
|
69
|
+
return {
|
|
70
|
+
customId,
|
|
71
|
+
doRender: true,
|
|
72
|
+
serialize: (context?: SerializionContext) => ({
|
|
73
|
+
type: ComponentType.SELECT,
|
|
74
|
+
disabled: disabled ?? undefined,
|
|
75
|
+
placeholder: placeholder ?? undefined,
|
|
76
|
+
options: options ?? undefined,
|
|
77
|
+
min_values: undefined,
|
|
78
|
+
max_values: undefined,
|
|
79
|
+
custom_id: generateCustomId(customId, rawFlags, context)
|
|
80
|
+
})
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
//
|
|
85
|
+
|
|
86
|
+
export function select<ID extends string>(options: CreateSelectOptions<ID>): MessageComponent<AllSelectTypes, ID>
|
|
87
|
+
export function select<ID extends string>(customId: ID, options?: MessageComponentSelectOption[], placeholder?: string, disabled?: boolean, flags?: InteractionComponentFlag | InteractionComponentFlag[]): MessageComponent<ComponentType.SELECT, ID>
|
|
88
|
+
export function select<ID extends string>(...args: any[]): MessageComponent<AllSelectTypes, ID> {
|
|
89
|
+
if (args.length === 1)
|
|
90
|
+
return withOptions(args) as MessageComponent<AllSelectTypes, ID>
|
|
91
|
+
|
|
92
|
+
return withCustomId(args) as MessageComponent<ComponentType.SELECT, ID>
|
|
93
|
+
}
|
|
94
|
+
select.users = function <ID extends string> (customId: ID, disabled?: boolean): MessageComponent<ComponentType.USER_SELECT, ID> {
|
|
95
|
+
return withOptions([
|
|
96
|
+
{ type: ComponentType.USER_SELECT, customId, disabled }
|
|
97
|
+
]) as MessageComponent<ComponentType.USER_SELECT, ID>
|
|
98
|
+
}
|
|
99
|
+
select.roles = function <ID extends string> (customId: ID, disabled?: boolean): MessageComponent<ComponentType.ROLE_SELECT, ID> {
|
|
100
|
+
return withOptions([
|
|
101
|
+
{ type: ComponentType.ROLE_SELECT, customId, disabled }
|
|
102
|
+
]) as MessageComponent<ComponentType.ROLE_SELECT, ID>
|
|
103
|
+
}
|
|
104
|
+
select.mentionable = function <ID extends string> (customId: ID, disabled?: boolean): MessageComponent<ComponentType.MENTIONABLE_SELECT, ID> {
|
|
105
|
+
return withOptions([
|
|
106
|
+
{ type: ComponentType.MENTIONABLE_SELECT, customId, disabled }
|
|
107
|
+
]) as MessageComponent<ComponentType.MENTIONABLE_SELECT, ID>
|
|
108
|
+
}
|
|
109
|
+
select.channel = function <ID extends string> (customId: ID, disabled?: boolean): MessageComponent<ComponentType.CHANNEL_SELECT, ID> {
|
|
110
|
+
return withOptions([
|
|
111
|
+
{ type: ComponentType.CHANNEL_SELECT, customId, disabled }
|
|
112
|
+
]) as MessageComponent<ComponentType.CHANNEL_SELECT, ID>
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
//
|
|
116
|
+
|
|
117
|
+
function parseOptionsPreset(type: SelectOptionsPresets | MessageComponentSelectOption): { type: AllSelectTypes, options?: MessageComponentSelectOption } {
|
|
118
|
+
if (typeof type !== 'string') {
|
|
119
|
+
return {
|
|
120
|
+
type: ComponentType.SELECT,
|
|
121
|
+
options: type
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
switch (type) {
|
|
126
|
+
case 'USERS':
|
|
127
|
+
return { type: ComponentType.USER_SELECT }
|
|
128
|
+
case 'ROLES':
|
|
129
|
+
return { type: ComponentType.ROLE_SELECT }
|
|
130
|
+
case 'MENTIONABLES':
|
|
131
|
+
return { type: ComponentType.MENTIONABLE_SELECT }
|
|
132
|
+
case 'CHANNELS':
|
|
133
|
+
return { type: ComponentType.CHANNEL_SELECT }
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
function generateCustomId(customId: string, flags: InteractionComponentFlag[], context: SerializionContext): string {
|
|
138
|
+
if (!customId) return undefined
|
|
139
|
+
return CordoAPI.compileCustomId(customId, flags, context.id)
|
|
140
|
+
}
|
package/v2/types/const.ts
CHANGED
|
@@ -27,14 +27,20 @@ export namespace Const {
|
|
|
27
27
|
export type InteractionTypeMapping = typeof InteractionType
|
|
28
28
|
export type InteractionTypeNames = keyof InteractionTypeMapping
|
|
29
29
|
|
|
30
|
-
export
|
|
30
|
+
export const ComponentType = {
|
|
31
31
|
/** negative number => custom */
|
|
32
|
-
LINE_BREAK
|
|
33
|
-
ROW
|
|
34
|
-
BUTTON
|
|
35
|
-
SELECT
|
|
36
|
-
TEXT
|
|
32
|
+
LINE_BREAK: -5 as -5,
|
|
33
|
+
ROW: 1 as 1,
|
|
34
|
+
BUTTON: 2 as 2,
|
|
35
|
+
SELECT: 3 as 3,
|
|
36
|
+
TEXT: 4 as 4,
|
|
37
|
+
USER_SELECT: 5 as 5,
|
|
38
|
+
ROLE_SELECT: 6 as 6,
|
|
39
|
+
MENTIONABLE_SELECT: 7 as 7,
|
|
40
|
+
CHANNEL_SELECT: 8 as 8
|
|
37
41
|
}
|
|
42
|
+
export type ComponentTypeMapping = typeof ComponentType
|
|
43
|
+
export type ComponentTypeNames = keyof ComponentTypeMapping
|
|
38
44
|
|
|
39
45
|
export enum InteractionCommandType {
|
|
40
46
|
CHAT_INPUT = 1,
|