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

fix message#isMemberMentioned (#1061)

Browse Source 
* fix this

* e

* Update Message.js
This commit is contained in:
Gus Caplan
2017-01-07 02:38:23 -06:00
committed by Schuyler Cebulskie
parent e5e36d9111
commit 42527ea969
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/structures/Message.js
View File

@@ -4,9 +4,7 @@ const MessageReaction = require('./MessageReaction');
const Collection = require('../util/Collection'); const Collection = require('../util/Collection');
const Constants = require('../util/Constants'); const Constants = require('../util/Constants');
const escapeMarkdown = require('../util/EscapeMarkdown'); const escapeMarkdown = require('../util/EscapeMarkdown');
let GuildMember;
// Done purely for GuildMember, which would cause a bad circular dependency
const Discord = require('..');
/** /**
* Represents a message on Discord * Represents a message on Discord
@@ -365,9 +363,11 @@ class Message {
* @returns {boolean} * @returns {boolean}
*/ */
isMemberMentioned(member) { isMemberMentioned(member) {
// Lazy-loading is used here to get around a circular dependency that breaks things
if (!GuildMember) GuildMember = require('./GuildMember');
if (this.mentions.everyone) return true; if (this.mentions.everyone) return true;
if (this.mentions.users.has(member.id)) return true; if (this.mentions.users.has(member.id)) return true;
if (member instanceof Discord.GuildMember && member.roles.some(r => this.mentions.roles.has(r.id))) return true; if (member instanceof GuildMember && member.roles.some(r => this.mentions.roles.has(r.id))) return true;
return false; return false;
} }