From 44a9844e0c71a29b01034395ff5aa438403ad4fe Mon Sep 17 00:00:00 2001 From: hydrabolt Date: Sat, 15 Aug 2015 21:06:19 +0100 Subject: [PATCH] small fixes to hb --- hydrabot/commands.js | 8 ++++++-- index.js | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/hydrabot/commands.js b/hydrabot/commands.js index 64caa2b03..3d694de18 100644 --- a/hydrabot/commands.js +++ b/hydrabot/commands.js @@ -205,6 +205,8 @@ Commands[ "feedback" ] = { bot.getChannelLogs( message.channel, amount, function( err, logs ) { + console.log(logs); + if ( err ) { bot.reply( message, "an error occurred when grabbing the logs.", false, { selfDestruct: 3000 @@ -215,7 +217,7 @@ Commands[ "feedback" ] = { for ( msg of logs.contents ) { if ( ~msg.content.indexOf( "[request" ) || ~msg.content.indexOf( "[feature" || ~msg.content.indexOf( "[suggestion") ) ) { - if(msg.content.length > 15){ + if(msg.content.length > 10){ found.push( msg ); } } @@ -229,7 +231,9 @@ Commands[ "feedback" ] = { } ); - bot.reply( message, "I found " + found.length + " result(s) that matched this. I'll send it to you in a PM." ); + bot.reply( message, "I found " + found.length + " result(s) that matched this. I'll send it to you in a PM.", false, { + selfDestruct : 3000 + } ); function gothroughit() { for ( msg of found ) { diff --git a/index.js b/index.js index 0588ec9ac..16f3390c2 100644 --- a/index.js +++ b/index.js @@ -465,7 +465,7 @@ exports.Client.prototype.sendMessage = function( destination, toSend, callback, channel_id = destination.channel.id; } else if ( destination instanceof User ) { var destId = self.PMList.deepFilter( [ "user", "id" ], destination.id, true ); - + if ( destId ) { channel_id = destId.id; } else { @@ -532,6 +532,11 @@ exports.Client.prototype.getChannelLogs = function( channel, amount, callback ) Internal.XHR.getChannelLogs( self.token, channel.id, ( amount || 50 ), function( err, data ) { + if(err){ + callback(err); + return; + } + var logs = new List( "id" ); for ( message of data ) { logs.add( new Message( message, channel ) );