Webpack build for branch master: a30fc87816

This commit is contained in:
Travis CI 2017-08-04 07:20:30 +00:00
parent 9be6458931
commit 96c587790d
2 changed files with 9 additions and 9 deletions

View file

@ -24637,6 +24637,14 @@ module.exports = function sendMessage(channel, options) { // eslint-disable-line
if (isNaN(nonce) || nonce < 0) throw new RangeError('MESSAGE_NONCE_TYPE');
}
// Add the reply prefix
if (reply && !(channel instanceof User || channel instanceof GuildMember) && channel.type !== 'dm') {
const id = channel.client.resolver.resolveUserID(reply);
const mention = `<@${reply instanceof GuildMember && reply.nickname ? '!' : ''}${id}>`;
if (split) split.prepend = `${mention}, ${split.prepend || ''}`;
content = `${mention}${typeof content !== 'undefined' ? `, ${content}` : ''}`;
}
if (content) {
content = Util.resolveString(content);
if (split && typeof split !== 'object') split = {};
@ -24658,14 +24666,6 @@ module.exports = function sendMessage(channel, options) { // eslint-disable-line
if (split) content = Util.splitMessage(content, split);
}
// Add the reply prefix
if (reply && !(channel instanceof User || channel instanceof GuildMember) && channel.type !== 'dm') {
const id = channel.client.resolver.resolveUserID(reply);
const mention = `<@${reply instanceof GuildMember && reply.nickname ? '!' : ''}${id}>`;
if (split) split.prepend = `${mention}, ${split.prepend || ''}`;
content = `${mention}${typeof content !== 'undefined' ? `, ${content}` : ''}`;
}
if (content instanceof Array) {
return new Promise((resolve, reject) => {
const messages = [];

File diff suppressed because one or more lines are too long