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

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,
fn: function( bot, params, message ) {
var user = getUser( message, params );
var user = getUser( message, params, bot );
if ( !user.avatar ) {
bot.sendMessage( message.channel, user.mention() + " does not have an avatar!" );
@@ -442,11 +442,15 @@ function setAuthLevel( user, level ) {
Authority.setLevel( user, level );
}
function getUser( message, params ) {
function getUser( message, params, bot ) {
var usr = false;
if ( !message.isPM() ) {
var wantedUser = getKey( params, "user", false ) || getKey( params, "u", false );
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 );
}
}