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

2.6.2, cache error handling

Browse Source
This commit is contained in:
hydrabolt
2015-08-19 21:35:10 +01:00
parent 5e511b9264
commit 14143f95b0
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hydrabot/commands.js
View File

@@ -240,7 +240,7 @@ Commands[ "avatar" ] = {
oplevel: 0, oplevel: 0,
fn: function( bot, params, message ) { fn: function( bot, params, message ) {
var user = getUser( message, params ); var user = getUser( message, params, bot );
if ( !user.avatar ) { if ( !user.avatar ) {
bot.sendMessage( message.channel, user.mention() + " does not have an avatar!" ); bot.sendMessage( message.channel, user.mention() + " does not have an avatar!" );
@@ -442,11 +442,15 @@ function setAuthLevel( user, level ) {
Authority.setLevel( user, level ); Authority.setLevel( user, level );
} }
function getUser( message, params ) { function getUser( message, params, bot ) {
var usr = false; var usr = false;
if ( !message.isPM() ) { if ( !message.isPM() ) {
var wantedUser = getKey( params, "user", false ) || getKey( params, "u", false ); var wantedUser = getKey( params, "user", false ) || getKey( params, "u", false );
if ( wantedUser ) { if ( wantedUser ) {
if(bot){
console.log(bot.getUsers().length());
return bot.getUsers().filter("username", wantedUser);
}
usr = message.channel.server.members.filter( Discord.isUserID( wantedUser ) ? "id" : "username", wantedUser, true ); usr = message.channel.server.members.filter( Discord.isUserID( wantedUser ) ? "id" : "username", wantedUser, true );
} }
} }

13
index.js
View File

@@ -280,9 +280,15 @@ exports.Client.prototype.login = function( email, password, callback, noCache )
self.connectWebsocket(); self.connectWebsocket();
if ( this.tokenManager.exists( email ) && !noCache ) { if ( this.tokenManager.exists( email ) && !noCache ) {
done( this.tokenManager.getToken( email, password ) );
self.debug("loaded token from caches in "+tp(globalLoginTime)); var token = this.tokenManager.getToken( email, password );
return; if(!token.match(/[^\w.-]+/g)){
done( this.tokenManager.getToken( email, password ) );
self.debug("loaded token from caches in "+tp(globalLoginTime));
return;
}else{
self.debug("error getting token from caches, using default auth");
}
} }
var time = Date.now(); var time = Date.now();
@@ -305,6 +311,7 @@ exports.Client.prototype.login = function( email, password, callback, noCache )
} ); } );
function done( token ) { function done( token ) {
self.debug("using token " + token);
self.token = token; self.token = token;
self.websocket.sendData(); self.websocket.sendData();
self.loggedIn = true; self.loggedIn = true;

6
lib/TokenManager.js
View File

@@ -14,11 +14,7 @@ exports.TokenManager = function( folder, file ) {
var fd = fs.openSync( self.path, "wx" ); var fd = fs.openSync( self.path, "wx" );
self.writeTokens(); self.writeTokens();
} catch ( e ) { } catch ( e ) {
if ( e.errno !== -4075 ) { self.readTokens();
throw e;
} else {
self.readTokens();
}
} }
} }

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "discord.js", "name": "discord.js",
"version": "2.6.1", "version": "2.6.2",
"description": "A way to interface with the Discord API", "description": "A way to interface with the Discord API",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {