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

Clean up and add comments

Browse Source
This commit is contained in:
Schuyler Cebulskie
2017-03-22 01:16:30 -04:00
parent cff7069275
commit c73b9483f4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/structures/Message.js
View File

@@ -128,24 +128,27 @@ class Message {
everyone: data.mention_everyone, everyone: data.mention_everyone,
}; };
// Add user mentions
for (const mention of data.mentions) { for (const mention of data.mentions) {
let user = this.client.users.get(mention.id); let user = this.client.users.get(mention.id);
if (!user) user = this.client.dataManager.newUser(mention); if (!user) user = this.client.dataManager.newUser(mention);
this.mentions.users.set(user.id, user); this.mentions.users.set(user.id, user);
} }
// Add getter for member mentions
Object.defineProperty(this.mentions, 'members', { Object.defineProperty(this.mentions, 'members', {
get: () => { get: () => {
if (this.channel.type !== 'text') return null; if (this.channel.type !== 'text') return null;
const members = new Collection(); const members = new Collection();
this.mentions.users.forEach(user => { this.mentions.users.forEach(user => {
const member = this.client.resolver.resolveGuildMember(this.guild, user); const member = this.client.resolver.resolveGuildMember(this.channel.guild, user);
if (member) members.set(member.id, member); if (member) members.set(member.id, member);
}); });
return members; return members;
}, },
}); });
// Add role mentions
if (data.mention_roles) { if (data.mention_roles) {
for (const mention of data.mention_roles) { for (const mention of data.mention_roles) {
const role = this.channel.guild.roles.get(mention); const role = this.channel.guild.roles.get(mention);
@@ -153,7 +156,8 @@ class Message {
} }
} }
if (this.channel.guild) { // Add channel mentions
if (this.channel.type === 'text') {
const channMentionsRaw = data.content.match(/<#([0-9]{14,20})>/g) || []; const channMentionsRaw = data.content.match(/<#([0-9]{14,20})>/g) || [];
for (const raw of channMentionsRaw) { for (const raw of channMentionsRaw) {
const chan = this.channel.guild.channels.get(raw.match(/([0-9]{14,20})/g)[0]); const chan = this.channel.guild.channels.get(raw.match(/([0-9]{14,20})/g)[0]);