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

error proofed some things

Browse Source
This commit is contained in:
hydrabolt
2015-08-14 21:51:48 +01:00
parent 8409f6c5d6
commit 65713a869a
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
index.js
View File

@@ -60,7 +60,7 @@ exports.Client.prototype.off = function( name ) {
exports.Client.prototype.cacheServer = function( id, cb, members ) { exports.Client.prototype.cacheServer = function( id, cb, members ) {
var self = this; var self = this;
var serverInput; var serverInput = {};
if ( typeof id === 'string' || id instanceof String ) { if ( typeof id === 'string' || id instanceof String ) {
//actually an ID //actually an ID
@@ -111,7 +111,7 @@ exports.Client.prototype.cacheServer = function( id, cb, members ) {
var server; var server;
function makeServer( dat ) { 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 ); server = new Server( dat.region, dat.owner_id, dat.name, id, serverInput.members || dat.members, dat.icon, dat.afk_timeout, dat.afk_channel_id );
if ( dat.channels ) if ( dat.channels )
cacheChannels(dat.channels); cacheChannels(dat.channels);
else else
@@ -208,21 +208,13 @@ exports.Client.prototype.connectWebsocket = function( cb ) {
for ( x in _servers ) { for ( x in _servers ) {
_server = _servers[ x ]; _server = _servers[ x ];
/*var sID = "";
for ( role of _server.roles ) {
if ( role.name === "@everyone" ) {
sID = role.id;
break;
}
}*/
client.cacheServer( _server, function( server ) { client.cacheServer( _server, function( server ) {
console.log(server.name + " has " + server.members.length() + " members");
cached++; cached++;
if ( cached >= toCache ) { if ( cached >= toCache ) {
client.ready = true; client.ready = true;
client.triggerEvent( "ready" ); client.triggerEvent( "ready" );
} }
}, _server.members ); } );
} }
for ( x in data.private_channels ) { for ( x in data.private_channels ) {
@@ -268,9 +260,9 @@ exports.Client.prototype.connectWebsocket = function( cb ) {
} else if ( dat.t === "GUILD_CREATE" ) { } else if ( dat.t === "GUILD_CREATE" ) {
if ( !client.serverList.filter( "id", dat.d.id, true ) ) { if ( !client.serverList.filter( "id", dat.d.id, true ) ) {
client.cacheServer( dat.d.id, function( server ) { client.cacheServer( dat.d, function( server ) {
client.triggerEvent( "serverJoin", [ server ] ); client.triggerEvent( "serverJoin", [ server ] );
}, dat.d.members ); });
} }
} else if ( dat.t === "CHANNEL_CREATE" ) { } else if ( dat.t === "CHANNEL_CREATE" ) {