@pikokr/command.ts 3.1.5-dev.9ab81df β 3.1.7
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/.all-contributorsrc +3 -14
- package/README.md +1 -19
- package/dist/builtinModules/BuiltinCommandConverters.js +2 -2
- package/dist/builtinModules/BuiltinCommandConverters.js.map +1 -1
- package/dist/builtinModules/CommandHandler.js +1 -1
- package/dist/builtinModules/CommandHandler.js.map +1 -1
- package/package.json +2 -3
- package/src/builtinModules/BuiltinCommandConverters.ts +12 -13
- package/src/builtinModules/CommandHandler.ts +1 -1
package/.all-contributorsrc
CHANGED
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
"imageSize": 100,
|
|
6
6
|
"contributorsPerLine": 7,
|
|
7
7
|
"contributorsSortAlphabetically": false,
|
|
8
|
+
"badgeTemplate": "[](#contributors)",
|
|
9
|
+
"contributorTemplate": "<a href=\"<%= contributor.profile %>\"><img src=\"<%= contributor.avatar_url %>\" width=\"<%= options.imageSize %>px;\" alt=\"\"/><br /><sub><b><%= contributor.name %></b></sub></a>",
|
|
8
10
|
"types": {
|
|
9
11
|
"custom": {
|
|
10
12
|
"symbol": "π",
|
|
@@ -19,18 +21,6 @@
|
|
|
19
21
|
"name": "νλ§",
|
|
20
22
|
"avatar_url": "https://avatars.githubusercontent.com/u/68010770?v=4",
|
|
21
23
|
"profile": "https://pikokr.dev",
|
|
22
|
-
"contributions": [
|
|
23
|
-
"code",
|
|
24
|
-
"maintenance",
|
|
25
|
-
"ideas",
|
|
26
|
-
"doc"
|
|
27
|
-
]
|
|
28
|
-
},
|
|
29
|
-
{
|
|
30
|
-
"login": "PyBsh",
|
|
31
|
-
"name": "RootPi",
|
|
32
|
-
"avatar_url": "https://avatars.githubusercontent.com/u/59782214?v=4",
|
|
33
|
-
"profile": "https://github.com/PyBsh",
|
|
34
24
|
"contributions": [
|
|
35
25
|
"code"
|
|
36
26
|
]
|
|
@@ -39,6 +29,5 @@
|
|
|
39
29
|
"projectName": "command.ts",
|
|
40
30
|
"projectOwner": "pikokr",
|
|
41
31
|
"repoType": "github",
|
|
42
|
-
"repoHost": "https://github.com"
|
|
43
|
-
"commitConvention": "none"
|
|
32
|
+
"repoHost": "https://github.com"
|
|
44
33
|
}
|
package/README.md
CHANGED
|
@@ -1,27 +1,9 @@
|
|
|
1
1
|
# Command.TS
|
|
2
2
|
|
|
3
|
-
[](https://github.com/pikokr/command.ts/actions/workflows/publish.yml)
|
|
4
|
-
[](#contributors-)
|
|
5
|
-
<!-- ALL-CONTRIBUTORS-BADGE:END -->
|
|
3
|
+
[](https://github.com/pikokr/command.ts/actions/workflows/publish.yml)
|
|
6
4
|
|
|
7
5
|
|
|
8
6
|
|
|
9
7
|
Command framework for discord.js
|
|
10
8
|
|
|
11
9
|
[Discord](https://discord.gg/EEhcPzsGHV) / [λ¬Έμ](https://v3.cts.pikokr.dev) / [V2 λ¬Έμ](https://command-ts-docs-ezojnktwv-pikokr.vercel.app/)
|
|
12
|
-
|
|
13
|
-
## Contributors
|
|
14
|
-
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
|
|
15
|
-
<!-- prettier-ignore-start -->
|
|
16
|
-
<!-- markdownlint-disable -->
|
|
17
|
-
<table>
|
|
18
|
-
<tr>
|
|
19
|
-
<td align="center"><a href="https://pikokr.dev"><img src="https://avatars.githubusercontent.com/u/68010770?v=4?s=100" width="100px;" alt=""/><br /><sub><b>νλ§</b></sub></a><br /><a href="https://github.com/pikokr/command.ts/commits?author=pikokr" title="Code">π»</a> <a href="#maintenance-pikokr" title="Maintenance">π§</a> <a href="#ideas-pikokr" title="Ideas, Planning, & Feedback">π€</a> <a href="https://github.com/pikokr/command.ts/commits?author=pikokr" title="Documentation">π</a></td>
|
|
20
|
-
<td align="center"><a href="https://github.com/PyBsh"><img src="https://avatars.githubusercontent.com/u/59782214?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RootPi</b></sub></a><br /><a href="https://github.com/pikokr/command.ts/commits?author=PyBsh" title="Code">π»</a></td>
|
|
21
|
-
</tr>
|
|
22
|
-
</table>
|
|
23
|
-
|
|
24
|
-
<!-- markdownlint-restore -->
|
|
25
|
-
<!-- prettier-ignore-end -->
|
|
26
|
-
|
|
27
|
-
<!-- ALL-CONTRIBUTORS-LIST:END -->
|
|
@@ -40,7 +40,7 @@ class BuiltinCommandConverters extends BuiltInModule_1.BuiltInModule {
|
|
|
40
40
|
let user = this.client.users.cache.get(value);
|
|
41
41
|
if (user)
|
|
42
42
|
return user;
|
|
43
|
-
user = this.client.users.cache.find(x => x.tag === value);
|
|
43
|
+
user = this.client.users.cache.find((x) => x.tag === value || x.username === value);
|
|
44
44
|
if (user)
|
|
45
45
|
return user;
|
|
46
46
|
const id = this.getUserIDByMention(value);
|
|
@@ -54,7 +54,7 @@ class BuiltinCommandConverters extends BuiltInModule_1.BuiltInModule {
|
|
|
54
54
|
let user = (_a = msg.guild) === null || _a === void 0 ? void 0 : _a.members.cache.get(value);
|
|
55
55
|
if (!user)
|
|
56
56
|
return user;
|
|
57
|
-
user = (_b = msg.guild) === null || _b === void 0 ? void 0 : _b.members.cache.find(x => x.user.tag === value);
|
|
57
|
+
user = (_b = msg.guild) === null || _b === void 0 ? void 0 : _b.members.cache.find((x) => x.user.tag === value);
|
|
58
58
|
if (user)
|
|
59
59
|
return user;
|
|
60
60
|
const id = this.getUserIDByMention(value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuiltinCommandConverters.js","sourceRoot":"","sources":["../../src/builtinModules/BuiltinCommandConverters.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA+C;AAC/C,wCAA8C;AAC9C,2CAAqE;AAGrE,MAAa,wBAAyB,SAAQ,6BAAa;IAGzD,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,GAAY;QAClB,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,MAAM,CAAC,GAAY,EAAE,GAAW;QAC9B,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,kBAAkB,CAAC,OAAe;QAChC,IAAI,CAAC,OAAO;YAAE,OAAM;QACpB,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACrD,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YAC9B,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAC3B,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;aAC3B;YACD,OAAO,OAAsB,CAAA;SAC9B;IACH,CAAC;IAGD,IAAI,CAAC,GAAY,EAAE,KAAa;QAC9B,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAC7C,IAAI,IAAI;YAAE,OAAO,IAAI,CAAA;QACrB,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"BuiltinCommandConverters.js","sourceRoot":"","sources":["../../src/builtinModules/BuiltinCommandConverters.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,7 +113,7 @@ class CommandHandler extends BuiltInModule_1.BuiltInModule {
|
|
|
113
113
|
return error(new error_1.ArgumentNotProvided(i, cmd, msg));
|
|
114
114
|
}
|
|
115
115
|
const executed = yield converter.execute(converterModule, msg, arg);
|
|
116
|
-
if (
|
|
116
|
+
if ((executed === undefined || executed === null) && !argType.optional) {
|
|
117
117
|
return error(new error_1.ArgumentNotProvided(i, cmd, msg));
|
|
118
118
|
}
|
|
119
119
|
argList.push(executed);
|
|
@@ -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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"}
|
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.1.
|
|
4
|
+
"version": "3.1.7",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"license": "MIT",
|
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
"@discordjs/builders": "^0.6.0",
|
|
10
10
|
"@discordjs/rest": "^0.1.0-canary.0",
|
|
11
11
|
"@types/lodash": "^4.14.172",
|
|
12
|
-
"all-contributors-cli": "^6.20.0",
|
|
13
12
|
"discord.js": "^13.1.0",
|
|
14
13
|
"prettier": "^2.2.1",
|
|
15
14
|
"ts-node": "^10.1.0",
|
|
@@ -33,4 +32,4 @@
|
|
|
33
32
|
"docs:dev": "typedoc",
|
|
34
33
|
"docs:build": "typedoc"
|
|
35
34
|
}
|
|
36
|
-
}
|
|
35
|
+
}
|
|
@@ -36,7 +36,7 @@ export class BuiltinCommandConverters extends BuiltInModule {
|
|
|
36
36
|
user(msg: Message, value: string): User | null {
|
|
37
37
|
let user = this.client.users.cache.get(value)
|
|
38
38
|
if (user) return user
|
|
39
|
-
user = this.client.users.cache.find(x=>x.tag === value)
|
|
39
|
+
user = this.client.users.cache.find((x) => x.tag === value || x.username === value)
|
|
40
40
|
if (user) return user
|
|
41
41
|
const id = this.getUserIDByMention(value)
|
|
42
42
|
if (!id) return null
|
|
@@ -48,7 +48,7 @@ export class BuiltinCommandConverters extends BuiltInModule {
|
|
|
48
48
|
member(msg: Message, value: string): GuildMember | undefined {
|
|
49
49
|
let user = msg.guild?.members.cache.get(value)
|
|
50
50
|
if (!user) return user
|
|
51
|
-
user = msg.guild?.members.cache.find(x=>x.user.tag===value)
|
|
51
|
+
user = msg.guild?.members.cache.find((x) => x.user.tag === value)
|
|
52
52
|
if (user) return user
|
|
53
53
|
const id = this.getUserIDByMention(value)
|
|
54
54
|
if (!id) return
|
|
@@ -65,20 +65,19 @@ export class BuiltinCommandConverters extends BuiltInModule {
|
|
|
65
65
|
getRoleIDByMention(mention: string): `${bigint}` | undefined {
|
|
66
66
|
if (!mention) return
|
|
67
67
|
if (mention.startsWith('<@') && mention.endsWith('>')) {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
68
|
+
mention = mention.slice(2, -1)
|
|
69
|
+
if (mention.startsWith('&')) {
|
|
70
|
+
mention = mention.slice(1)
|
|
71
|
+
}
|
|
72
|
+
return mention as `${bigint}`
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
|
|
76
76
|
@argumentConverter(Role)
|
|
77
|
-
role(msg: Message, value: string): Role | undefined{
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
77
|
+
role(msg: Message, value: string): Role | undefined {
|
|
78
|
+
const id = this.getRoleIDByMention(value)
|
|
79
|
+
if (!id) return
|
|
80
|
+
const role = msg.guild?.roles.cache.get(id)
|
|
81
|
+
return role || undefined
|
|
82
82
|
}
|
|
83
|
-
|
|
84
83
|
}
|
|
@@ -110,7 +110,7 @@ export class CommandHandler extends BuiltInModule {
|
|
|
110
110
|
return error(new ArgumentNotProvided(i, cmd, msg))
|
|
111
111
|
}
|
|
112
112
|
const executed = await converter.execute(converterModule, msg, arg)
|
|
113
|
-
if (
|
|
113
|
+
if ((executed === undefined || executed === null) && !argType.optional) {
|
|
114
114
|
return error(new ArgumentNotProvided(i, cmd, msg))
|
|
115
115
|
}
|
|
116
116
|
argList.push(executed)
|