Merge branch 'master' of github.com:Dragory/modmailbot

cshd
Dragory 2020-11-04 23:17:17 +02:00
commit 5d01bd067b
No known key found for this signature in database
GPG Key ID: 5F387BA66DF8AAC1
1 changed files with 3 additions and 2 deletions

View File

@ -90,6 +90,7 @@ class Thread {
let firstMessage; let firstMessage;
const textContent = typeof content === "string" ? content : content.content; const textContent = typeof content === "string" ? content : content.content;
const contentObj = typeof content === "string" ? {} : content;
if (textContent) { if (textContent) {
// Text content is included, chunk it and send it as individual messages. // Text content is included, chunk it and send it as individual messages.
// Files (attachments) are only sent with the last message. // Files (attachments) are only sent with the last message.
@ -97,8 +98,8 @@ class Thread {
for (const [i, chunk] of chunks.entries()) { for (const [i, chunk] of chunks.entries()) {
// Only send embeds, files, etc. with the last message // Only send embeds, files, etc. with the last message
const msg = (i === chunks.length - 1) const msg = (i === chunks.length - 1)
? await bot.createMessage(this.channel_id, chunk, file) ? await bot.createMessage(this.channel_id, { ...contentObj, content: chunk }, file)
: await bot.createMessage(this.channel_id, chunk); : await bot.createMessage(this.channel_id, { ...contentObj, content: chunk, embed: null });
firstMessage = firstMessage || msg; firstMessage = firstMessage || msg;
} }