mirror of
https://github.com/discordjs/discord.js.git
synced 2024-08-20 21:34:47 +12:00
Merge branch 'master' into hydrabot
This commit is contained in:
commit
986b55e2c3
2 changed files with 5 additions and 0 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,6 +1,7 @@
|
|||
# Created by https://www.gitignore.io
|
||||
|
||||
hydrabot/config.json
|
||||
hydrabot/authority.json
|
||||
|
||||
### Node ###
|
||||
# Logs
|
||||
|
|
4
index.js
4
index.js
|
@ -397,6 +397,10 @@ exports.Client.prototype.sendMessage = function( channel, message, cb, _mentions
|
|||
|
||||
options = options || {};
|
||||
|
||||
if(message instanceof Array){
|
||||
message = message.join("\n");
|
||||
}
|
||||
|
||||
var thisLoopId = Math.floor( Math.random() * 1000 );
|
||||
|
||||
if ( channel instanceof User ) {
|
||||
|
|
Loading…
Reference in a new issue