mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-18 04:23:31 +01:00
Merge branch 'master' into hydrabot
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -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
|
||||||
|
|||||||
4
index.js
4
index.js
@@ -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 ) {
|
||||||
|
|||||||
Reference in New Issue
Block a user