diff --git a/src/client/actions/GuildDelete.js b/src/client/actions/GuildDelete.js index 7c61ebacd..193abc47c 100644 --- a/src/client/actions/GuildDelete.js +++ b/src/client/actions/GuildDelete.js @@ -37,7 +37,7 @@ class GuildDeleteAction extends Action { } for (const channel of guild.channels.values()) this.client.channels.remove(channel.id); - if (guild.voiceConnection) guild.voiceConnection.disconnect(); + if (guild.voice && guild.voice.connection) guild.voice.connection.disconnect(); // Delete guild client.guilds.remove(guild.id); diff --git a/src/client/voice/VoiceBroadcast.js b/src/client/voice/VoiceBroadcast.js index e8751c05e..6b5da074f 100644 --- a/src/client/voice/VoiceBroadcast.js +++ b/src/client/voice/VoiceBroadcast.js @@ -13,7 +13,7 @@ const PlayInterface = require('./util/PlayInterface'); * const broadcast = client.voice.createBroadcast(); * broadcast.play('./music.mp3'); * // Play "music.mp3" in all voice connections that the client is in - * for (const connection of client.voiceConnections.values()) { + * for (const connection of client.voice.connections.values()) { * connection.play(broadcast); * } * ``` diff --git a/src/structures/Guild.js b/src/structures/Guild.js index 4f5f02c5b..6f86dc14a 100644 --- a/src/structures/Guild.js +++ b/src/structures/Guild.js @@ -5,7 +5,7 @@ const Integration = require('./Integration'); const GuildAuditLogs = require('./GuildAuditLogs'); const Webhook = require('./Webhook'); const VoiceRegion = require('./VoiceRegion'); -const { ChannelTypes, DefaultMessageNotifications, PartialTypes, browser } = require('../util/Constants'); +const { ChannelTypes, DefaultMessageNotifications, PartialTypes } = require('../util/Constants'); const Collection = require('../util/Collection'); const Util = require('../util/Util'); const DataResolver = require('../util/DataResolver'); @@ -368,16 +368,6 @@ class Guild extends Base { return this.client.channels.get(this.systemChannelID) || null; } - /** - * If the client is connected to any voice channel in this guild, this will be the relevant VoiceConnection - * @type {?VoiceConnection} - * @readonly - */ - get voiceConnection() { - if (browser) return null; - return this.client.voice.connections.get(this.id) || null; - } - /** * The `@everyone` role of the guild * @type {?Role} diff --git a/src/structures/VoiceChannel.js b/src/structures/VoiceChannel.js index 860241e9c..15f2e496f 100644 --- a/src/structures/VoiceChannel.js +++ b/src/structures/VoiceChannel.js @@ -42,17 +42,6 @@ class VoiceChannel extends GuildChannel { return coll; } - /** - * The voice connection for this voice channel, if the client is connected - * @type {?VoiceConnection} - * @readonly - */ - get connection() { - const connection = this.guild.voiceConnection; - if (connection && connection.channel.id === this.id) return connection; - return null; - } - /** * Checks if the voice channel is full * @type {boolean}