From 42527ea969f17cc2c42b99a3c24fe95ad60c6c15 Mon Sep 17 00:00:00 2001 From: Gus Caplan Date: Sat, 7 Jan 2017 02:38:23 -0600 Subject: [PATCH] fix message#isMemberMentioned (#1061) * fix this * e * Update Message.js --- src/structures/Message.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/structures/Message.js b/src/structures/Message.js index 7d6708f10..138169389 100644 --- a/src/structures/Message.js +++ b/src/structures/Message.js @@ -4,9 +4,7 @@ const MessageReaction = require('./MessageReaction'); const Collection = require('../util/Collection'); const Constants = require('../util/Constants'); const escapeMarkdown = require('../util/EscapeMarkdown'); - -// Done purely for GuildMember, which would cause a bad circular dependency -const Discord = require('..'); +let GuildMember; /** * Represents a message on Discord @@ -365,9 +363,11 @@ class Message { * @returns {boolean} */ 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.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; }