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

fixed MessageEmbed#timestamp and changed attachFile to attachFiles (#1670)

Browse Source 
* fixed MessageEmbed#timestamp and changed attachFile to attachFiles
as well as a few doc changes

* Embed#files shouldn't be a nested array
This commit is contained in:
SpaceEEC
2017-07-16 14:11:49 +02:00
committed by Crawl
parent a965b3709a
commit 8580380541
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/errors/Messages.js
View File

@@ -32,7 +32,6 @@ const Messages = {
EMBED_FIELD_COUNT: 'MessageEmbeds may not exceed 25 fields.', EMBED_FIELD_COUNT: 'MessageEmbeds may not exceed 25 fields.',
EMBED_FIELD_NAME: 'MessageEmbed field names may not exceed 256 characters or be empty.', EMBED_FIELD_NAME: 'MessageEmbed field names may not exceed 256 characters or be empty.',
EMBED_FIELD_VALUE: 'MessageEmbed field values may not exceed 1024 characters or be empty.', EMBED_FIELD_VALUE: 'MessageEmbed field values may not exceed 1024 characters or be empty.',
EMBED_FILE_LIMIT: 'You may not upload more than one file at once.',
EMBED_DESCRIPTION: 'MessageEmbed descriptions may not exceed 2048 characters.', EMBED_DESCRIPTION: 'MessageEmbed descriptions may not exceed 2048 characters.',
EMBED_FOOTER_TEXT: 'MessageEmbed footer text may not exceed 2048 characters.', EMBED_FOOTER_TEXT: 'MessageEmbed footer text may not exceed 2048 characters.',
EMBED_TITLE: 'MessageEmbed titles may not exceed 256 characters.', EMBED_TITLE: 'MessageEmbed titles may not exceed 256 characters.',

18
src/structures/MessageEmbed.js
View File

@@ -44,11 +44,11 @@ class MessageEmbed {
* The timestamp of this embed * The timestamp of this embed
* @type {?number} * @type {?number}
*/ */
this.timestamp = new Date(data.timestamp); this.timestamp = data.timestamp ? new Date(data.timestamp).getTime() : null;
/** /**
* The fields of this embed * The fields of this embed
* @type {?Object[]} * @type {Object[]}
* @property {string} name The name of this field * @property {string} name The name of this field
* @property {string} value The value of this field * @property {string} value The value of this field
* @property {boolean} inline If this field will be displayed inline * @property {boolean} inline If this field will be displayed inline
@@ -133,11 +133,11 @@ class MessageEmbed {
/** /**
* The date this embed was created * The date this embed was created
* @type {Date} * @type {?Date}
* @readonly * @readonly
*/ */
get createdAt() { get createdAt() {
return !isNaN(this.timestamp) ? this.timestamp : null; return this.timestamp ? new Date(this.timestamp) : null;
} }
/** /**
@@ -178,12 +178,12 @@ class MessageEmbed {
/** /**
* Sets the file to upload alongside the embed. This file can be accessed via `attachment://fileName.extension` when * Sets the file to upload alongside the embed. This file can be accessed via `attachment://fileName.extension` when
* setting an embed image or author/footer icons. Only one file may be attached. * setting an embed image or author/footer icons. Only one file may be attached.
* @param {FileOptions|string} file Local path or URL to the file to attach, or valid FileOptions for a file to attach * @param {Array<FileOptions|string>} files Files to attach
* @returns {MessageEmbed} This embed * @returns {MessageEmbed} This embed
*/ */
attachFile(file) { attachFiles(files) {
if (this.file) throw new RangeError('EMBED_FILE_LIMIT'); if (this.files) this.files = this.files.concat(files);
this.file = file; else this.files = files;
return this; return this;
} }
@@ -295,7 +295,7 @@ class MessageEmbed {
timestamp: this.timestamp, timestamp: this.timestamp,
color: this.color, color: this.color,
fields: this.fields, fields: this.fields,
file: this.file, files: this.files,
thumbnail: this.thumbnail, thumbnail: this.thumbnail,
image: this.image, image: this.image,
author: this.author ? { author: this.author ? {

6
src/structures/interfaces/TextBasedChannel.js
View File

@@ -82,9 +82,9 @@ class TextBasedChannel {
if (!options.content) options.content = content; if (!options.content) options.content = content;
if (options.embed && options.embed.file) { if (options.embed && options.embed.files) {
if (options.files) options.files.push(options.embed.file); if (options.files) options.files = options.files.concat(options.embed.files);
else options.files = [options.embed.file]; else options.files = options.embed.files;
} }
if (options.files) { if (options.files) {