From b0fa95473878f59791f5ac373b747d9cf0592f08 Mon Sep 17 00:00:00 2001 From: Snowflake107 <46562212+Snowflake107@users.noreply.github.com> Date: Sun, 4 Jul 2021 18:57:27 +0545 Subject: [PATCH] temporarily fix typings issue --- package.json | 4 ++-- src/Structures/Queue.ts | 17 ++++++++------- yarn.lock | 46 ++++++++++++++--------------------------- 3 files changed, 27 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index cf46d21..4347a49 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ }, "homepage": "https://discord-player.js.org", "dependencies": { - "@discordjs/voice": "^0.5.1", + "@discordjs/voice": "0.5.0", "discord-ytdl-core": "^5.0.4", "libsodium-wrappers": "^0.7.9", "soundcloud-scraper": "^5.0.0", @@ -74,7 +74,7 @@ "@typescript-eslint/eslint-plugin": "^4.28.1", "@typescript-eslint/parser": "^4.28.1", "discord-api-types": "^0.18.1", - "discord.js": "^13.0.0-dev.610b0b4.1625357028", + "discord.js": "13.0.0-dev.6d3d00b44577a70e840f0187d6894043677c5329", "eslint": "^7.30.0", "jsdoc-babel": "^0.5.0", "prettier": "^2.3.2", diff --git a/src/Structures/Queue.ts b/src/Structures/Queue.ts index a94aad8..3d90a77 100644 --- a/src/Structures/Queue.ts +++ b/src/Structures/Queue.ts @@ -1,4 +1,4 @@ -import { Collection, Guild, StageChannel, VoiceChannel, Snowflake, SnowflakeUtil } from "discord.js"; +import { Collection, Guild, StageChannel, VoiceChannel, Snowflake, SnowflakeUtil, GuildChannelResolvable } from "discord.js"; import { Player } from "../Player"; import { StreamDispatcher } from "../VoiceInterface/StreamDispatcher"; import Track from "./Track"; @@ -133,20 +133,21 @@ class Queue { /** * Connects to a voice channel - * @param {StageChannel|VoiceChannel} channel The voice/stage channel + * @param {GuildChannelResolvable} channel The voice/stage channel * @returns {Promise} */ - async connect(channel: StageChannel | VoiceChannel) { + async connect(channel: GuildChannelResolvable) { this.#watchDestroyed(); - if (!["stage", "voice"].includes(channel?.type)) throw new TypeError(`Channel type must be voice or stage, got ${channel?.type}!`); - const connection = await this.player.voiceUtils.connect(channel, { + const _channel = this.guild.channels.resolve(channel) as StageChannel | VoiceChannel; + if (!["stage", "voice"].includes(_channel?.type)) throw new TypeError(`Channel type must be voice or stage, got ${_channel?.type}!`); + const connection = await this.player.voiceUtils.connect(_channel, { deaf: this.options.autoSelfDeaf }); this.connection = connection; - if (channel.type === "stage") { - await channel.guild.me.voice.setSuppressed(false).catch(async () => { - return await channel.guild.me.voice.setRequestToSpeak(true).catch(Util.noop); + if (_channel.type === "stage") { + await _channel.guild.me.voice.setSuppressed(false).catch(async () => { + return await _channel.guild.me.voice.setRequestToSpeak(true).catch(Util.noop); }); } diff --git a/yarn.lock b/yarn.lock index cce9891..4193f43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -936,14 +936,6 @@ node-fetch "^2.6.1" reverbnation-scraper "^2.0.0" -"@discordjs/builders@^0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-0.2.0.tgz#832c8d894aad13362db7a99f11a7826b21e4cd94" - integrity sha512-TVq7NZBCJrrTRc3CfxOr3IdgY5nrtqVxZ7qDUF1mN6LgxIiOldmFxsSwMrQBzLFVmOwqFyNLKCeblley8UpEuw== - dependencies: - discord-api-types "^0.18.1" - tslib "^2.3.0" - "@discordjs/collection@^0.1.6": version "0.1.6" resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-0.1.6.tgz#9e9a7637f4e4e0688fd8b2b5c63133c91607682c" @@ -981,10 +973,10 @@ "@discordjs/node-pre-gyp" "^0.4.0" node-addon-api "^3.2.1" -"@discordjs/voice@0.5.1": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@discordjs/voice/-/voice-0.5.1.tgz#265b05712196bbbb5b082b073807ef4582f067c7" - integrity sha512-51NrtmfkGe6xJVMULjxXdQ9apPsqNyV1vZ/Qa57x6qM3TzWWQNyMfrLkjD+YvQtesZZpKZcQZI8NIknWUYiBNQ== +"@discordjs/voice@0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@discordjs/voice/-/voice-0.5.0.tgz#238d6f8c1dc7e30ff781edb08fb0540bca5aa23d" + integrity sha512-YPfY8ium1lExmRETz+vC4d3gGvHhGvWQMWLTOkNBoUkN6VyEpO/RVrL5EI+0qUefKAWwv2Gus/c7QM1xhAUwow== dependencies: "@types/ws" "^7.4.4" discord-api-types "^0.18.1" @@ -1059,7 +1051,7 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@sapphire/async-queue@^1.1.4": +"@sapphire/async-queue@^1.1.2": version "1.1.4" resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.1.4.tgz#ae431310917a8880961cebe8e59df6ffa40f2957" integrity sha512-fFrlF/uWpGOX5djw5Mu2Hnnrunao75WGey0sP0J3jnhmrJ5TAPzHYOmytD5iN/+pMxS+f+u/gezqHa9tPhRHEA== @@ -1099,7 +1091,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.0.0.tgz#067a6c49dc7a5c2412a505628e26902ae967bf6f" integrity sha512-TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg== -"@types/ws@^7.4.4", "@types/ws@^7.4.5", "@types/ws@^7.4.6": +"@types/ws@^7.4.4", "@types/ws@^7.4.6": version "7.4.6" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.6.tgz#c4320845e43d45a7129bb32905e28781c71c1fff" integrity sha512-ijZ1vzRawI7QoWnTNL8KpHixd2b2XVb9I9HAqI3triPsh1EC0xH0Eg6w2O3TKbDCgiNNlJqfrof6j4T2I+l9vw== @@ -2018,11 +2010,6 @@ discord-api-types@^0.18.1: resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.18.1.tgz#5d08ed1263236be9c21a22065d0e6b51f790f492" integrity sha512-hNC38R9ZF4uaujaZQtQfm5CdQO58uhdkoHQAVvMfIL0LgOSZeW575W8H6upngQOuoxWd8tiRII3LLJm9zuQKYg== -discord-api-types@^0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e: - version "0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e.tgz#d5f36f5712ec8fe2fe928b5c37618c94a3969d6a" - integrity sha512-ttRA/8e/WKHDbGFfED5WlS7gID+kalmNr6iMiWBCvkphQ7kFHiTOVbnj/zX9ksaRaYXp/I38SCQ+qZvLu8DJZg== - discord-ytdl-core@^5.0.4: version "5.0.4" resolved "https://registry.yarnpkg.com/discord-ytdl-core/-/discord-ytdl-core-5.0.4.tgz#84a2af1a8e8c235b4fc109b23350d12782ab66cd" @@ -2030,20 +2017,19 @@ discord-ytdl-core@^5.0.4: dependencies: prism-media "^1.2.9" -discord.js@^13.0.0-dev.610b0b4.1625357028: - version "13.0.0-dev.610b0b4.1625357028" - resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-13.0.0-dev.610b0b4.1625357028.tgz#7e5f40b15980d05f42568a78290e166aab7597a3" - integrity sha512-uNHDkPSeVZ1HeXwagtEvDGqbUS8Hvtz2s39pwlkn6p9iQuDF+093mhvQSDiooGVSsWoU9sR2CHTwMSlZoRNIhg== +discord.js@13.0.0-dev.6d3d00b44577a70e840f0187d6894043677c5329: + version "13.0.0-dev.6d3d00b44577a70e840f0187d6894043677c5329" + resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-13.0.0-dev.6d3d00b44577a70e840f0187d6894043677c5329.tgz#7593fc7d86651f65c4e1f6a67802b7b72c532695" + integrity sha512-K2jlMXX4cB8+/6CYh/QywULgUcMSJcR6CycEGnONeCskrejtArCUmiV8dKu20ABv3CeHWgTVN261BQWRTTelRg== dependencies: - "@discordjs/builders" "^0.2.0" "@discordjs/collection" "^0.1.6" "@discordjs/form-data" "^3.0.1" - "@sapphire/async-queue" "^1.1.4" - "@types/ws" "^7.4.5" + "@sapphire/async-queue" "^1.1.2" + "@types/ws" "^7.4.4" abort-controller "^3.0.0" - discord-api-types "^0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e" + discord-api-types "^0.18.1" node-fetch "^2.6.1" - ws "^7.5.1" + ws "^7.4.6" dmd@^4.0.5: version "4.0.6" @@ -4589,7 +4575,7 @@ tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.2.0, tslib@^2.3.0: +tslib@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== @@ -4873,7 +4859,7 @@ ws@^7.4.4, ws@^7.4.5: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.1.tgz#44fc000d87edb1d9c53e51fbc69a0ac1f6871d66" integrity sha512-2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow== -ws@^7.5.1: +ws@^7.4.6: version "7.5.2" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.2.tgz#09cc8fea3bec1bc5ed44ef51b42f945be36900f6" integrity sha512-lkF7AWRicoB9mAgjeKbGqVUekLnSNO4VjKVnuPHpQeOxZOErX6BPXwJk70nFslRCEEA8EVW7ZjKwXaP9N+1sKQ==