Merge branch 'master' into hydrabot

This commit is contained in:
hydrabolt
2015-08-14 16:07:27 +01:00
2 changed files with 5 additions and 0 deletions

1
.gitignore vendored
View File

@@ -1,6 +1,7 @@
# Created by https://www.gitignore.io # Created by https://www.gitignore.io
hydrabot/config.json hydrabot/config.json
hydrabot/authority.json
### Node ### ### Node ###
# Logs # Logs

View File

@@ -397,6 +397,10 @@ exports.Client.prototype.sendMessage = function( channel, message, cb, _mentions
options = options || {}; options = options || {};
if(message instanceof Array){
message = message.join("\n");
}
var thisLoopId = Math.floor( Math.random() * 1000 ); var thisLoopId = Math.floor( Math.random() * 1000 );
if ( channel instanceof User ) { if ( channel instanceof User ) {