From 4ec01ddef56272f6bed23dd0eced8ea9851127b7 Mon Sep 17 00:00:00 2001 From: SpaceEEC Date: Sun, 23 Feb 2020 20:42:47 +0100 Subject: [PATCH] feat(MessageEmbed): change toJSON method to return an api-compatible object (#3813) --- src/structures/APIMessage.js | 2 +- src/structures/MessageEmbed.js | 9 ++------- typings/index.d.ts | 2 -- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/structures/APIMessage.js b/src/structures/APIMessage.js index d68ed0563..b05fb68f9 100644 --- a/src/structures/APIMessage.js +++ b/src/structures/APIMessage.js @@ -152,7 +152,7 @@ class APIMessage { } else if (this.options.embed) { embedLikes.push(this.options.embed); } - const embeds = embedLikes.map(e => new MessageEmbed(e)._apiTransform()); + const embeds = embedLikes.map(e => new MessageEmbed(e).toJSON()); let username; let avatarURL; diff --git a/src/structures/MessageEmbed.js b/src/structures/MessageEmbed.js index 89664af1e..19a93c346 100644 --- a/src/structures/MessageEmbed.js +++ b/src/structures/MessageEmbed.js @@ -317,16 +317,11 @@ class MessageEmbed { return this; } - toJSON() { - return Util.flatten(this, { hexColor: true }); - } - /** - * Transforms the embed object to be processed. + * Transforms the embed to a plain object. * @returns {Object} The raw data of this embed - * @private */ - _apiTransform() { + toJSON() { return { title: this.title, type: 'rich', diff --git a/typings/index.d.ts b/typings/index.d.ts index c15391eaf..3a046059a 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -1051,8 +1051,6 @@ declare module 'discord.js' { export class MessageEmbed { constructor(data?: MessageEmbed | MessageEmbedOptions); - private _apiTransform(): MessageEmbedOptions; - public author: { name?: string; url?: string; iconURL?: string; proxyIconURL?: string } | null; public color: number; public readonly createdAt: Date | null;