aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/lint.yml12
-rw-r--r--src/commands/dev/eval.ts2
-rw-r--r--src/commands/skyblock-reborn/chooseColor.ts2
-rw-r--r--yarn.lock67
4 files changed, 33 insertions, 50 deletions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 89bd161..b37f0e0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -2,9 +2,9 @@ name: lint
on:
push:
- branches: '*'
+ branches: ['*']
pull_request:
- branches: '*'
+ branches: ['*']
workflow_dispatch:
@@ -14,10 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- - name: Use Node.js 14.x
+ - name: Use Node.js 16.x
uses: actions/setup-node@v1
with:
- node-version: 14.x
+ node-version: 16.x
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -46,10 +46,10 @@ jobs:
with:
persist-credentials: false
fetch-depth: 0
- - name: Use Node.js 14.x
+ - name: Use Node.js 16.x
uses: actions/setup-node@v1
with:
- node-version: 14.x
+ node-version: 16.x
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts
index 1475173..19667dd 100644
--- a/src/commands/dev/eval.ts
+++ b/src/commands/dev/eval.ts
@@ -59,7 +59,7 @@ export default class EvalCommand extends BushCommand {
if (!message.author.isOwner())
return await message.util.reply(`${util.emojis.error} Only my developers can run this command.`);
if (message.util.isSlash) {
- await (message as BushSlashMessage).interaction.defer({ ephemeral: args.silent });
+ await (message as BushSlashMessage).interaction.deferReply({ ephemeral: args.silent });
}
args.code = args.code.replace(/[“”]/g, '"').replace(/```*(?:js|ts)?/g, '');
diff --git a/src/commands/skyblock-reborn/chooseColor.ts b/src/commands/skyblock-reborn/chooseColor.ts
index a912954..4be2243 100644
--- a/src/commands/skyblock-reborn/chooseColor.ts
+++ b/src/commands/skyblock-reborn/chooseColor.ts
@@ -148,7 +148,7 @@ export default class ChooseColorCommand extends BushCommand {
ephemeral: true
});
}
- if (message.util.isSlash) await (message.interaction as CommandInteraction).defer();
+ if (message.util.isSlash) await (message.interaction as CommandInteraction).deferReply();
// new Array(
// roleColorMap.map(obj => obj.name.toLowerCase()),
// roleColorMap.map(obj => obj.value)
diff --git a/yarn.lock b/yarn.lock
index e02976f..f049527 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -51,16 +51,16 @@ __metadata:
languageName: node
linkType: hard
-"@discordjs/builders@npm:^0.3.0":
- version: 0.3.0
- resolution: "@discordjs/builders@npm:0.3.0"
+"@discordjs/builders@npm:^0.4.0":
+ version: 0.4.0
+ resolution: "@discordjs/builders@npm:0.4.0"
dependencies:
"@sindresorhus/is": ^4.0.1
discord-api-types: ^0.22.0
- ow: ^0.26.0
- ts-mixer: ^5.4.1
+ ow: ^0.27.0
+ ts-mixer: ^6.0.0
tslib: ^2.3.0
- checksum: 455682a4de07057e92f80513c533634be169af09ff272901582f6c00b004032b0bd8b000083e614d754f171911071bafe6011a443e558e831051a7204e918580
+ checksum: 7dd5fb4864f43786eaff77faa81422a2bc8ea3925a87f89312fee35b27f1f33b3d393fbeec4e28a398e4c65bed64a2654ea15bacc295e595770df276f8e87b72
languageName: node
linkType: hard
@@ -332,9 +332,9 @@ __metadata:
linkType: hard
"@types/node@npm:*":
- version: 16.4.12
- resolution: "@types/node@npm:16.4.12"
- checksum: 1489aeba890629ca2ed9b8f04fb77f185123810afd3d518cf87c2a18a43a43f7d954550ae3572f3dac7e634f7db67e259ceb7ca25cb584ba0bcc023b0bfca2c9
+ version: 16.4.13
+ resolution: "@types/node@npm:16.4.13"
+ checksum: 071e86a1d196cf72928a7109e99769dffed93db481032b9ca2f52e6f3ced432e2a179849c85e587e67409202e1ed37bffd0c7a31d38adf35a385d327dfe8bd72
languageName: node
linkType: hard
@@ -392,7 +392,7 @@ __metadata:
languageName: node
linkType: hard
-"@types/ws@npm:^7.4.4, @types/ws@npm:^7.4.5":
+"@types/ws@npm:^7.4.4, @types/ws@npm:^7.4.7":
version: 7.4.7
resolution: "@types/ws@npm:7.4.7"
dependencies:
@@ -507,15 +507,6 @@ __metadata:
languageName: node
linkType: hard
-"abort-controller@npm:^3.0.0":
- version: 3.0.0
- resolution: "abort-controller@npm:3.0.0"
- dependencies:
- event-target-shim: ^5.0.0
- checksum: 170bdba9b47b7e65906a28c8ce4f38a7a369d78e2271706f020849c1bfe0ee2067d4261df8bbb66eb84f79208fd5b710df759d64191db58cfba7ce8ef9c54b75
- languageName: node
- linkType: hard
-
"acorn-jsx@npm:^5.3.1":
version: 5.3.2
resolution: "acorn-jsx@npm:5.3.2"
@@ -1347,10 +1338,10 @@ discord-akairo-message-util@NotEnoughUpdates/discord-akairo-message-util:
discord-akairo@NotEnoughUpdates/discord-akairo:
version: 8.2.2
- resolution: "discord-akairo@https://github.com/NotEnoughUpdates/discord-akairo.git#commit=666f0cceda2956dd818e5db87e78938cbbeb52bb"
+ resolution: "discord-akairo@https://github.com/NotEnoughUpdates/discord-akairo.git#commit=6bd3a158eb424c177df34c12cd633fd4dd3e38bb"
dependencies:
discord-akairo-message-util: NotEnoughUpdates/discord-akairo-message-util
- checksum: f751769cd162f2c8500adad99d8149790825d239a4dc7e07a04b09f34916827b6cea7957a7f3dc84caf858410611bc21589d0c57744371b17c3c78f2c3328277
+ checksum: 281ec92100473f37add64e350b3f7bae229f84b1e80b0872445d9d324c02eb73ca19350bee102e05d2a84ec65890db575cd852cd53390dd461a16f8e37ba760f
languageName: node
linkType: hard
@@ -1376,19 +1367,18 @@ discord-akairo@NotEnoughUpdates/discord-akairo:
linkType: hard
discord.js@NotEnoughUpdates/discord.js:
- version: 13.0.0-dev
- resolution: "discord.js@https://github.com/NotEnoughUpdates/discord.js.git#commit=2fec427c7f5052e510e3a5684a45a53489570fed"
+ version: 13.0.0
+ resolution: "discord.js@https://github.com/NotEnoughUpdates/discord.js.git#commit=c510de9d608a8259099b98d6699412334a29dca2"
dependencies:
- "@discordjs/builders": ^0.3.0
+ "@discordjs/builders": ^0.4.0
"@discordjs/collection": ^0.2.1
"@discordjs/form-data": ^3.0.1
"@sapphire/async-queue": ^1.1.4
- "@types/ws": ^7.4.5
- abort-controller: ^3.0.0
+ "@types/ws": ^7.4.7
discord-api-types: ^0.22.0
node-fetch: ^2.6.1
ws: ^7.5.1
- checksum: 4353fb22b30db5c7f709cb8c4c11c25cd960d0975a4530988e806ecf1c2fdfa014ed8e3f8e88f001de7959fb222a9e18e90c958f82b7b3e1007e6c4bb5969a12
+ checksum: c1dcb0802e83013b8996bb20e2e9c1c6663db9c09eeee46b9778fbad9d68a88066aebd2c52f14e6e1ff2134a2629a0f80b641df20eb0813f699312fded69575f
languageName: node
linkType: hard
@@ -1689,13 +1679,6 @@ discord.js@NotEnoughUpdates/discord.js:
languageName: node
linkType: hard
-"event-target-shim@npm:^5.0.0":
- version: 5.0.1
- resolution: "event-target-shim@npm:5.0.1"
- checksum: 1ffe3bb22a6d51bdeb6bf6f7cf97d2ff4a74b017ad12284cc9e6a279e727dc30a5de6bb613e5596ff4dc3e517841339ad09a7eec44266eccb1aa201a30448166
- languageName: node
- linkType: hard
-
"fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
version: 3.1.3
resolution: "fast-deep-equal@npm:3.1.3"
@@ -2960,9 +2943,9 @@ discord.js@NotEnoughUpdates/discord.js:
languageName: node
linkType: hard
-"ow@npm:^0.26.0":
- version: 0.26.0
- resolution: "ow@npm:0.26.0"
+"ow@npm:^0.27.0":
+ version: 0.27.0
+ resolution: "ow@npm:0.27.0"
dependencies:
"@sindresorhus/is": ^4.0.1
callsites: ^3.1.0
@@ -2970,7 +2953,7 @@ discord.js@NotEnoughUpdates/discord.js:
lodash.isequal: ^4.5.0
type-fest: ^1.2.1
vali-date: ^1.0.0
- checksum: f8357d5180d3edfa3ddbc029e18aa1fd7d7e987e4c3cd22eaa924fa6a729595d7578332d79747b17ab094b9aee0269a5e1cb966c018a95fcb2490fd6b23a3efb
+ checksum: bffd6fa43d004163bab9821fae4d2eceee92d70059ba2a5dca1ad7497cd167554224a7efab3d41476112fbab4714afa99b8866506e8b9bad5d690cf967146332
languageName: node
linkType: hard
@@ -4017,10 +4000,10 @@ resolve@^1.19.0:
languageName: node
linkType: hard
-"ts-mixer@npm:^5.4.1":
- version: 5.4.1
- resolution: "ts-mixer@npm:5.4.1"
- checksum: 867b23ca960270214fe8a88c4f24447695998b015df770e4832525f24d3263c38f98201d9c8758bb70dbea2eb79b986305fb38f1f6f14404acf1629f96be08a1
+"ts-mixer@npm:^6.0.0":
+ version: 6.0.0
+ resolution: "ts-mixer@npm:6.0.0"
+ checksum: 791a513c9ca318a979928f5265fd6029858fa21595153a9386063c11239a6b1c352db1e277c19f0544d017a67cf78d120a7438b86b2c828b1115eb607538eff8
languageName: node
linkType: hard
generated by cgit (git 2.46.0) at 2024-11-27 09:19:34 +0000