From 3b7c5aa96ac6b1062d0167aedcf2367b8376574d Mon Sep 17 00:00:00 2001
From: Amish Shah <amishshah.2k@gmail.com>
Date: Sat, 26 Dec 2015 18:05:31 +0000
Subject: [PATCH] Rename voiceconnection.speaking to voiceconnection.memberd

---
 docs/docs_voicechannel.rst     | 4 ++--
 lib/Structures/Server.js       | 6 +++---
 lib/Structures/VoiceChannel.js | 2 +-
 src/Structures/Server.js       | 6 +++---
 src/Structures/VoiceChannel.js | 2 +-
 test/msgbot.js                 | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/docs_voicechannel.rst b/docs/docs_voicechannel.rst
index 19067a850..3bd478550 100644
--- a/docs/docs_voicechannel.rst
+++ b/docs/docs_voicechannel.rst
@@ -13,7 +13,7 @@ A voice channel of a server. Currently, the voice channel class has no differenc
 Attributes
 ----------
 
-speaking
+members
 ~~~~~~~~
 
-A Cache_ of Users_ that are speaking in the voice channel
\ No newline at end of file
+A Cache_ of Users_ that are connected to the voice channel
\ No newline at end of file
diff --git a/lib/Structures/Server.js b/lib/Structures/Server.js
index 674a427b8..d947ad081 100644
--- a/lib/Structures/Server.js
+++ b/lib/Structures/Server.js
@@ -181,7 +181,7 @@ var Server = (function (_Equality) {
 			// removes from other speaking channels first
 			this.eventStopSpeaking(user);
 
-			channel.speaking.add(user);
+			channel.members.add(user);
 			user.voiceChannel = channel;
 			return true;
 		} else {
@@ -205,8 +205,8 @@ var Server = (function (_Equality) {
 
 			var chan = _ref3;
 
-			if (chan.speaking.has(user)) {
-				chan.speaking.remove(user);
+			if (chan.members.has(user)) {
+				chan.members.remove(user);
 				user.voiceChannel = null;
 				return chan;
 			}
diff --git a/lib/Structures/VoiceChannel.js b/lib/Structures/VoiceChannel.js
index 3bc2dae29..f6bc62a49 100644
--- a/lib/Structures/VoiceChannel.js
+++ b/lib/Structures/VoiceChannel.js
@@ -25,7 +25,7 @@ var VoiceChannel = (function (_ServerChannel) {
 		_classCallCheck(this, VoiceChannel);
 
 		_ServerChannel.call(this, data, client, server);
-		this.speaking = new _UtilCache2["default"]();
+		this.members = new _UtilCache2["default"]();
 	}
 
 	VoiceChannel.prototype.join = function join() {
diff --git a/src/Structures/Server.js b/src/Structures/Server.js
index 4a2f1edb6..cc2519dbd 100644
--- a/src/Structures/Server.js
+++ b/src/Structures/Server.js
@@ -149,7 +149,7 @@ export default class Server extends Equality {
 			// removes from other speaking channels first
 			this.eventStopSpeaking(user);
 
-			channel.speaking.add(user);
+			channel.members.add(user);
 			user.voiceChannel = channel;
 			return true;
 		}else{
@@ -160,8 +160,8 @@ export default class Server extends Equality {
 
 	eventStopSpeaking(user){
 		for(let chan of this.channels.getAll("type", "voice")){
-			if(chan.speaking.has(user)){
-				chan.speaking.remove(user);
+			if(chan.members.has(user)){
+				chan.members.remove(user);
 				user.voiceChannel = null;
 				return chan;
 			}
diff --git a/src/Structures/VoiceChannel.js b/src/Structures/VoiceChannel.js
index 8f556e321..aafa83022 100644
--- a/src/Structures/VoiceChannel.js
+++ b/src/Structures/VoiceChannel.js
@@ -7,7 +7,7 @@ import {reg} from "../Util/ArgumentRegulariser";
 export default class VoiceChannel extends ServerChannel{
 	constructor(data, client, server){
 		super(data, client, server);
-		this.speaking = new Cache();
+		this.members = new Cache();
 	}
 
 	join(callback = function () { }) {
diff --git a/test/msgbot.js b/test/msgbot.js
index f983a6265..41e236890 100644
--- a/test/msgbot.js
+++ b/test/msgbot.js
@@ -44,7 +44,7 @@ client.on("message", msg => {
 
 	if (msg.content === "who is speaking") {
 		for (var chan of msg.channel.server.channels.getAll("type", "voice")) {
-			msg.channel.send(`${chan} : ${chan.speaking}`);
+			msg.channel.send(`${chan} : ${chan.members}`);
 		}
 	}