Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-18 20:43:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(Message): keep reply option when using an embed or attachment

Browse Source 
See #2651
This commit is contained in:
SpaceEEC
2018-07-08 21:12:30 +02:00
parent 95b2dd3fe6
commit 526832058e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/structures/shared/CreateMessage.js
View File

@@ -20,7 +20,7 @@ module.exports = async function createMessage(channel, options) {
if (isNaN(options.nonce) || options.nonce < 0) throw new RangeError('MESSAGE_NONCE_TYPE'); if (isNaN(options.nonce) || options.nonce < 0) throw new RangeError('MESSAGE_NONCE_TYPE');
} }
let { content } = options; let { content, reply } = options;
if (options instanceof MessageEmbed) options = webhook ? { embeds: [options] } : { embed: options }; if (options instanceof MessageEmbed) options = webhook ? { embeds: [options] } : { embed: options };
if (options instanceof MessageAttachment) options = { files: [options.file] }; if (options instanceof MessageAttachment) options = { files: [options.file] };
@@ -36,9 +36,9 @@ module.exports = async function createMessage(channel, options) {
} }
} }
if (options.reply && !(channel instanceof User || channel instanceof GuildMember) && channel.type !== 'dm') { if (reply && !(channel instanceof User || channel instanceof GuildMember) && channel.type !== 'dm') {
const id = channel.client.users.resolveID(options.reply); const id = channel.client.users.resolveID(reply);
const mention = `<@${options.reply instanceof GuildMember && options.reply.nickname ? '!' : ''}${id}>`; const mention = `<@${reply instanceof GuildMember && reply.nickname ? '!' : ''}${id}>`;
if (options.split) options.split.prepend = `${mention}, ${options.split.prepend || ''}`; if (options.split) options.split.prepend = `${mention}, ${options.split.prepend || ''}`;
content = `${mention}${typeof options.content !== 'undefined' ? `, ${options.content}` : ''}`; content = `${mention}${typeof options.content !== 'undefined' ? `, ${options.content}` : ''}`;
} }