Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-16 03:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move message.mentionEveryone to message.mentions.everyone

Browse Source
This commit is contained in:
Amish Shah
2016-08-31 21:42:08 +01:00
parent e8c1c228d0
commit 5f5ee18543
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/docs.json
View File

File diff suppressed because one or more lines are too long

15
src/structures/Message.js
View File

@@ -70,11 +70,6 @@ class Message {
* @type {Boolean} * @type {Boolean}
*/ */
this.tts = data.tts; this.tts = data.tts;
/**
* Whether the message mentioned @everyone or not
* @type {Boolean}
*/
this.mentionEveryone = data.mention_everyone;
/** /**
* A random number used for checking message delivery * A random number used for checking message delivery
* @type {String} * @type {String}
@@ -100,11 +95,13 @@ class Message {
* @property {Collection<String, Role>} mentions.roles Mentioned roles, maps their ID to the role object. * @property {Collection<String, Role>} mentions.roles Mentioned roles, maps their ID to the role object.
* @property {Collection<String, GuildChannel>} * @property {Collection<String, GuildChannel>}
* mentions.channels Mentioned channels, maps their ID to the channel object. * mentions.channels Mentioned channels, maps their ID to the channel object.
* @property {Boolean} mentions.everyone whether or not @everyone was mentioned.
*/ */
this.mentions = { this.mentions = {
users: new Collection(), users: new Collection(),
roles: new Collection(), roles: new Collection(),
channels: new Collection(), channels: new Collection(),
everyone: data.mention_everyone,
}; };
/** /**
* The ID of the message (unique in the channel it was sent) * The ID of the message (unique in the channel it was sent)
@@ -167,11 +164,11 @@ class Message {
if (data.edited_timestamp) { if (data.edited_timestamp) {
this.editedTimestamp = data.edited_timestamp ? new Date(data.edited_timestamp) : null; this.editedTimestamp = data.edited_timestamp ? new Date(data.edited_timestamp) : null;
} }
if (data.tts) { if ('tts' in data) {
this.tts = data.tts; this.tts = data.tts;
} }
if (data.mention_everyone) { if ('mention_everyone' in data) {
this.mentionEveryone = data.mention_everyone; this.mentions.everyone = data.mention_everyone;
} }
if (data.nonce) { if (data.nonce) {
this.nonce = data.nonce; this.nonce = data.nonce;
@@ -249,7 +246,7 @@ class Message {
this.attachments.length === message.attachments.length; this.attachments.length === message.attachments.length;
if (base && rawData) { if (base && rawData) {
base = this.mentionEveryone === message.mentionEveryone && base = this.mentions.everyone === message.mentions.everyone &&
this.timestamp.getTime() === new Date(rawData.timestamp).getTime() && this.timestamp.getTime() === new Date(rawData.timestamp).getTime() &&
this.editedTimestamp === new Date(rawData.edited_timestamp).getTime(); this.editedTimestamp === new Date(rawData.edited_timestamp).getTime();
} }