From c3a86c8e390211a1f9cf5c694ce5466115c06f7f Mon Sep 17 00:00:00 2001 From: Toast <96593068+AnxietyisReal@users.noreply.github.com> Date: Sun, 13 Aug 2023 03:18:46 +1000 Subject: [PATCH] Temporarily switching to D.JS 14.13 --- .pnp.cjs | 12 ++++++------ package.json | 2 +- src/commands/dev.ts | 3 ++- src/config.json | 4 ++-- yarn.lock | 10 +++++----- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.pnp.cjs b/.pnp.cjs index 46613b5..1308763 100644 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -37,7 +37,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["axios", "npm:1.4.0"],\ ["canvas", "npm:2.11.2"],\ ["discord-player", "virtual:20c353e2d6536e37339997f03975c6a660f4d296e664d291bd43620c6162cca8eb5ef90b0998dc9db75ff6862e5da587d0530bae26805f5fadc8f17aaa4ff794#npm:6.6.2"],\ - ["discord.js", "npm:14.12.1"],\ + ["discord.js", "npm:14.13.0-dev.1691841828-9ed1b59df.0"],\ ["libsodium-wrappers", "npm:0.7.11"],\ ["moment", "npm:2.29.4"],\ ["mongoose", "npm:7.4.3"],\ @@ -945,7 +945,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["axios", "npm:1.4.0"],\ ["canvas", "npm:2.11.2"],\ ["discord-player", "virtual:20c353e2d6536e37339997f03975c6a660f4d296e664d291bd43620c6162cca8eb5ef90b0998dc9db75ff6862e5da587d0530bae26805f5fadc8f17aaa4ff794#npm:6.6.2"],\ - ["discord.js", "npm:14.12.1"],\ + ["discord.js", "npm:14.13.0-dev.1691841828-9ed1b59df.0"],\ ["libsodium-wrappers", "npm:0.7.11"],\ ["moment", "npm:2.29.4"],\ ["mongoose", "npm:7.4.3"],\ @@ -1076,7 +1076,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/discord-player__extractor", null],\ ["@types/discord.js", null],\ ["@types/youtube-sr", null],\ - ["discord.js", "npm:14.12.1"],\ + ["discord.js", "npm:14.13.0-dev.1691841828-9ed1b59df.0"],\ ["libsodium-wrappers", "npm:0.7.11"],\ ["youtube-sr", "npm:4.3.4"]\ ],\ @@ -1092,10 +1092,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["discord.js", [\ - ["npm:14.12.1", {\ - "packageLocation": "./.yarn/cache/discord.js-npm-14.12.1-859120127f-059c6c2fde.zip/node_modules/discord.js/",\ + ["npm:14.13.0-dev.1691841828-9ed1b59df.0", {\ + "packageLocation": "./.yarn/cache/discord.js-npm-14.13.0-dev.1691841828-9ed1b59df.0-5205132e1c-c584c642a6.zip/node_modules/discord.js/",\ "packageDependencies": [\ - ["discord.js", "npm:14.12.1"],\ + ["discord.js", "npm:14.13.0-dev.1691841828-9ed1b59df.0"],\ ["@discordjs/builders", "npm:1.6.4"],\ ["@discordjs/collection", "npm:1.5.2"],\ ["@discordjs/formatters", "npm:0.3.1"],\ diff --git a/package.json b/package.json index 7d865b1..d05952d 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "axios": "1.4.0", "canvas": "2.11.2", "discord-player": "6.6.2", - "discord.js": "14.12.1", + "discord.js": "dev", "libsodium-wrappers": "0.7.11", "moment": "2.29.4", "mongoose": "7.4.3", diff --git a/src/commands/dev.ts b/src/commands/dev.ts index 0eed7b0..ece4a30 100644 --- a/src/commands/dev.ts +++ b/src/commands/dev.ts @@ -91,7 +91,7 @@ export default { case 1: return 'Streaming'; case 2: return 'Listening to'; case 3: return 'Watching'; - //case 4: return 'Custom Status'; // Will be enabled once PR #9743 on D.JS repo merges in. + case 4: return 'Custom Status'; // Will be enabled once PR #9743 on D.JS repo merges in. case 5: return 'Competing in'; } }; @@ -182,6 +182,7 @@ export default { {name: 'Streaming', value: Discord.ActivityType.Streaming}, {name: 'Listening to', value: Discord.ActivityType.Listening}, {name: 'Watching', value: Discord.ActivityType.Watching}, + {name: 'Custom Status', value: Discord.ActivityType.Custom}, {name: 'Competing in', value: Discord.ActivityType.Competing} )) .addStringOption(x=>x diff --git a/src/config.json b/src/config.json index a0b5e09..e5b9af1 100644 --- a/src/config.json +++ b/src/config.json @@ -26,8 +26,8 @@ "autores": true }, "botPresence": { - "activities": [ - {"name": "the fish", "url": "https://www.youtube.com/watch?v=HVMc1ANfeMw", "type": 1} + "activities": [ + {"name": "Custom Status", "state": "funni custom status", "url": "https://www.youtube.com/watch?v=HVMc1ANfeMw", "type": 4} ], "status": "online" }, diff --git a/yarn.lock b/yarn.lock index 4e48323..12e1191 100644 --- a/yarn.lock +++ b/yarn.lock @@ -761,7 +761,7 @@ __metadata: axios: 1.4.0 canvas: 2.11.2 discord-player: 6.6.2 - discord.js: 14.12.1 + discord.js: dev libsodium-wrappers: 0.7.11 moment: 2.29.4 mongoose: 7.4.3 @@ -862,9 +862,9 @@ __metadata: languageName: node linkType: hard -"discord.js@npm:14.12.1": - version: 14.12.1 - resolution: "discord.js@npm:14.12.1" +"discord.js@npm:dev": + version: 14.13.0-dev.1691841828-9ed1b59df.0 + resolution: "discord.js@npm:14.13.0-dev.1691841828-9ed1b59df.0" dependencies: "@discordjs/builders": ^1.6.4 "@discordjs/collection": ^1.5.2 @@ -880,7 +880,7 @@ __metadata: tslib: ^2.6.1 undici: ^5.22.1 ws: ^8.13.0 - checksum: 059c6c2fdec22319e8aa8d5f54392db0066e959a7418440d1dab3b0e7814b0c4a7311ed15500147e959f9409e63e2dbe0b1f159f9c2693d8cd321a216b92fdaf + checksum: c584c642a6ddb971d5059b44a01ec3b184fe4280e62d5b14261389514ddf897d3398f84bb7fd6eeeb6115c4eaf45c2fce0077182c5f9bc073f516310281b9b07 languageName: node linkType: hard