Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-16 03:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into indev-prism

Browse Source
This commit is contained in:
Amish Shah
2017-01-15 14:20:32 +00:00
parent 098ad195bd 8c220e76ec
commit ba465bc680
8 changed files with 82 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/voice/ClientVoiceManager.js
View File

@@ -79,7 +79,13 @@ class ClientVoiceManager {
joinChannel(channel) {
return new Promise((resolve, reject) => {
if (this.pending.get(channel.guild.id)) throw new Error('Already connecting to this guild\'s voice server.');
if (!channel.joinable) throw new Error('You do not have permission to join this voice channel.');
if (!channel.joinable) {
if (channel.full) {
throw new Error('You do not have permission to join this voice channel; it is full.');
} else {
throw new Error('You do not have permission to join this voice channel.');
}
}
const existingConnection = this.connections.get(channel.guild.id);
if (existingConnection) {