From 8409f6c5d6b488362995a42dcc0eb619675f67eb Mon Sep 17 00:00:00 2001
From: hydrabolt <amishshah.2k@gmail.com>
Date: Fri, 14 Aug 2015 21:43:10 +0100
Subject: [PATCH] turbo charged caching of servers - needs full implementation

no point making extra requests, servers are cached,  and they're cached
properly.
---
 index.js | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/index.js b/index.js
index bc0a7fab2..34629c082 100644
--- a/index.js
+++ b/index.js
@@ -58,10 +58,7 @@ exports.Client.prototype.off = function( name ) {
 	this.events[ name ] = function() {};
 }
 
-exports.Client.prototype.cacheServer = function( id, cb, members, channelInfo ) {
-
-	console.log("caching!");
-
+exports.Client.prototype.cacheServer = function( id, cb, members ) {
 	var self = this;
 	var serverInput;
 
@@ -72,8 +69,6 @@ exports.Client.prototype.cacheServer = function( id, cb, members, channelInfo )
 			return;
 		}
 
-		console.log("test");
-
 		request
 			.get( Endpoints.SERVERS + "/" + id )
 			.set( "authorization", self.token )
@@ -117,8 +112,9 @@ exports.Client.prototype.cacheServer = function( id, cb, members, channelInfo )
 
 	function makeServer( dat ) {
 		server = new Server( dat.region, dat.owner_id, dat.name, id, members || dat.members, dat.icon, dat.afk_timeout, dat.afk_channel_id );
-		console.log(server.id);
-		if ( !channelInfo )
+		if ( dat.channels )
+			cacheChannels(dat.channels);
+		else
 			channelsFromHTTP();
 	}
 
@@ -212,15 +208,15 @@ exports.Client.prototype.connectWebsocket = function( cb ) {
 					for ( x in _servers ) {
 						_server = _servers[ x ];
 
-						var sID = "";
+						/*var sID = "";
 						for ( role of _server.roles ) {
 							if ( role.name === "@everyone" ) {
 								sID = role.id;
 								break;
 							}
-						}
-
-						client.cacheServer( sID, function( server ) {
+						}*/
+						client.cacheServer( _server, function( server ) {
+							console.log(server.name + " has " + server.members.length() + " members");
 							cached++;
 							if ( cached >= toCache ) {
 								client.ready = true;