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

In-order + duplicate mentions, cleanContent in Messages

Browse Source
This commit is contained in:
abalabahaha
2016-01-29 22:05:01 -08:00
parent 8b392f359a
commit e3173d1561
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Client/Resolver/Resolver.js
View File

@@ -155,7 +155,7 @@ var Resolver = (function () {
// resource is a string
var _mentions = [];
var changed = resource;
for (var _iterator2 = resource.match(/<@[^>]*>/g) || [], _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
for (var _iterator2 = resource.match(/<@[0-9]+>/g) || [], _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
var _ref2;
if (_isArray2) {
@@ -170,8 +170,11 @@ var Resolver = (function () {
var mention = _ref2;
var userID = mention.substring(2, mention.length - 1);
_mentions.push(userID);
changed = changed.replace(new RegExp(mention, "g"), "@" + this.internal.client.users.get("id", userID).username);
var user = this.internal.client.users.get("id", userID);
if (user) {
_mentions.push(user);
changed = changed.replace(new RegExp(mention, "g"), "@" + user.username);
}
}
return [_mentions, changed];
};