diff --git a/src/lib/commandDispatcher.js b/src/lib/commandDispatcher.js index 6f00303..e16dcc5 100644 --- a/src/lib/commandDispatcher.js +++ b/src/lib/commandDispatcher.js @@ -89,10 +89,12 @@ async function CommandDispatcher(msg) { file = response.file; delete response.file; } - if (response.embed) { - response.embed.color = - response.embed.color || - getTopColor(msg, hf.bot.user.id, pastelize(hf.bot.user.id)); + if (response.embeds) { + for (const embed of response.embeds) { + embed.color = + embed.color || + getTopColor(msg, hf.bot.user.id, pastelize(hf.bot.user.id)); + } } if (response.reaction) { msg.addReaction(response.reaction); diff --git a/src/modules/utility.js b/src/modules/utility.js index b8c726a..e39e129 100644 --- a/src/modules/utility.js +++ b/src/modules/utility.js @@ -80,13 +80,15 @@ avatar.callback = async function (msg, line) { : "png?size=1024" }`; return { - embed: { - title: "Server Icon", - url, - image: { + embeds: [ + { + title: "Server Icon", url, + image: { + url, + }, }, - }, + ], }; } } else if (line) { @@ -103,13 +105,15 @@ avatar.callback = async function (msg, line) { avatar.startsWith("a_") ? "gif?size=1024&_=.gif" : "png?size=1024" }`; return { - embed: { - title: `Avatar for \`${user.username}#${user.discriminator}\``, - url, - image: { + embeds: [ + { + title: `Avatar for \`${user.username}#${user.discriminator}\``, url, + image: { + url, + }, }, - }, + ], }; } } else { @@ -118,13 +122,15 @@ avatar.callback = async function (msg, line) { avatar.startsWith("a_") ? "gif?size=1024&_=.gif" : "png?size=1024" }`; return { - embed: { - title: `Avatar for \`${msg.author.username}#${msg.author.discriminator}\``, - url, - image: { + embeds: [ + { + title: `Avatar for \`${msg.author.username}#${msg.author.discriminator}\``, url, + image: { + url, + }, }, - }, + ], }; } }; @@ -149,13 +155,15 @@ banner.callback = async function (msg, line) { : "png?size=1024" }`; return { - embed: { - title: "Server Banner", - url, - image: { + embeds: [ + { + title: "Server Banner", url, + image: { + url, + }, }, - }, + ], }; } } else if (line) { @@ -179,13 +187,15 @@ banner.callback = async function (msg, line) { user.banner.startsWith("a_") ? "gif?size=1024&_=.gif" : "png?size=1024" }`; return { - embed: { - title: `Banner for \`${user.username}#${user.discriminator}\``, - url, - image: { + embeds: [ + { + title: `Banner for \`${user.username}#${user.discriminator}\``, url, + image: { + url, + }, }, - }, + ], }; }; hf.registerCommand(banner); @@ -463,13 +473,15 @@ jumbo.callback = async function (msg, line) { const animated = animatedFlag === "a"; return { - embed: { - title: `:${name}: - \`${id}\``, - url: `${EMOTE_BASE}${id}.${animated ? "gif" : "png"}?v=1`, - image: { + embeds: [ + { + title: `:${name}: - \`${id}\``, url: `${EMOTE_BASE}${id}.${animated ? "gif" : "png"}?v=1`, + image: { + url: `${EMOTE_BASE}${id}.${animated ? "gif" : "png"}?v=1`, + }, }, - }, + ], }; } else { let setName = "twemoji"; @@ -506,13 +518,15 @@ jumbo.callback = async function (msg, line) { .toBuffer(); return { - embed: { - title: `${name} (${emoji.toUpperCase().replace(/[-_]/g, ", ")})`, - url, - image: { - url: "attachment://emoji.png", + embeds: [ + { + title: `${name} (${emoji.toUpperCase().replace(/[-_]/g, ", ")})`, + url, + image: { + url: "attachment://emoji.png", + }, }, - }, + ], file: { file: converted, name: "emoji.png", @@ -520,13 +534,15 @@ jumbo.callback = async function (msg, line) { }; } else { return { - embed: { - title: `${name} (${emoji.toUpperCase().replace(/[-_]/g, ", ")})`, - url, - image: { + embeds: [ + { + title: `${name} (${emoji.toUpperCase().replace(/[-_]/g, ", ")})`, url, + image: { + url, + }, }, - }, + ], }; } }