Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(MessageEmbed): Skip validation of field when inside a message #3894

Merged
merged 10 commits into from
Mar 8, 2020
Merged

fix(MessageEmbed): Skip validation of field when inside a message #3894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3bfa5b0
fix(MessageEmbed): Add skipValidation flag to MessageEmbed
MattIPv4 Mar 4, 2020
c57cc94
fix(MessageEmbed): Use skipValidation flag in Message
MattIPv4 Mar 4, 2020
d82f794
fix(MessageEmbed): Restore static normalizeField(s) methods
MattIPv4 Mar 4, 2020
9a30047
fix(MessageEmbed): Update typings for constructor
MattIPv4 Mar 4, 2020
867f095
fix(MessageEmbed): Remove private docstrings/typings
MattIPv4 Mar 4, 2020
7f17f9c
fix(MessageEmbed): Use skipValidation without storing in instance
MattIPv4 Mar 5, 2020
21a2200
fix(MessageEmbed): skipValidation without modifying normalizeFields
MattIPv4 Mar 6, 2020
f00662a
fix(MessageEmbed): Revert indentation change in typings
MattIPv4 Mar 6, 2020
aff7f1f
fix(MessageEmbed): Clone logic from normalizeFields (duplicated code …
MattIPv4 Mar 6, 2020
eb8151f
revert(MessageEmbed): remove dead code / breaking change
SpaceEEC Mar 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/structures/Message.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class Message extends Base {
* A list of embeds in the message - e.g. YouTube Player
* @type {MessageEmbed[]}
*/
this.embeds = (data.embeds || []).map(e => new Embed(e));
this.embeds = (data.embeds || []).map(e => new Embed(e, true));

/**
* A collection of attachments in the message - e.g. Pictures - mapped by their ID
Expand Down Expand Up @@ -225,7 +225,7 @@ class Message extends Base {
if ('content' in data) this.content = data.content;
if ('pinned' in data) this.pinned = data.pinned;
if ('tts' in data) this.tts = data.tts;
if ('embeds' in data) this.embeds = data.embeds.map(e => new Embed(e));
if ('embeds' in data) this.embeds = data.embeds.map(e => new Embed(e, true));
else this.embeds = this.embeds.slice();

if ('attachments' in data) {
Expand Down
11 changes: 7 additions & 4 deletions src/structures/MessageEmbed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ const Util = require('../util/Util');
* Represents an embed in a message (image/video preview, rich embed, etc.)
*/
class MessageEmbed {
constructor(data = {}) {
this.setup(data);
constructor(data = {}, skipValidation = false) {
this.setup(data, skipValidation);
}

setup(data) {
setup(data, skipValidation) {
MattIPv4 marked this conversation as resolved.
Show resolved Hide resolved
/**
* The type of this embed, either:
* * `rich` - a rich embed
Expand Down Expand Up @@ -65,7 +65,10 @@ class MessageEmbed {
* The fields of this embed
* @type {EmbedField[]}
*/
this.fields = data.fields ? this.constructor.normalizeFields(data.fields) : [];
this.fields = [];
if (data.fields) {
this.fields = skipValidation ? data.fields.map(Util.cloneObject) : this.constructor.normalizeFields(data.fields);
}

/**
* @typedef {Object} MessageEmbedThumbnail
Expand Down