Work around Node's module loading

This commit is contained in:
Schuyler Cebulskie
2016-12-02 22:55:37 -05:00
parent 6adc8a9d0d
commit c0aa6bd30f

View File

@@ -1,11 +1,13 @@
const Attachment = require('./MessageAttachment');
const Embed = require('./MessageEmbed');
const MessageReaction = require('./MessageReaction');
const GuildMember = require('./GuildMember');
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('..');
/**
* Represents a message on Discord
*/
@@ -359,7 +361,7 @@ class Message {
isMemberMentioned(member) {
if (this.mentions.everyone) return true;
if (this.mentions.users.has(member.id)) return true;
if (member instanceof GuildMember && member.roles.some(r => this.mentions.roles.has(r.id))) return true;
if (member instanceof Discord.GuildMember && member.roles.some(r => this.mentions.roles.has(r.id))) return true;
return false;
}