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

merge fix

Browse Source
This commit is contained in:
Amish Shah
2017-02-22 20:39:21 +00:00
parent 8a2ec437e5
commit b55e6927e9
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,4 @@
const Collection = require('../../util/Collection'); const Collection = require('../../util/Collection');
const Constants = require('../../util/Constants');
const Util = require('../../util/Util');
const VoiceConnection = require('./VoiceConnection'); const VoiceConnection = require('./VoiceConnection');
/** /**
@@ -36,18 +34,6 @@ class ClientVoiceManager {
connection.channel = this.client.channels.get(channel_id); connection.channel = this.client.channels.get(channel_id);
connection.setSessionID(session_id); connection.setSessionID(session_id);
} }
options = Util.mergeDefault({
guild_id: channel.guild.id,
channel_id: channel.id,
self_mute: false,
self_deaf: false,
}, options);
this.client.ws.send({
op: Constants.OPCodes.VOICE_STATE_UPDATE,
d: options,
});
} }
/** /**

2
typings

Submodule typings updated: 997abfd2d5...3dbeb51fd2