From 2c763073d700ea3f00535b011b3090f393765b81 Mon Sep 17 00:00:00 2001 From: Will Nelson Date: Sun, 20 Aug 2017 14:26:13 -0700 Subject: [PATCH] add capture groups to MessageMentions and validate snowflake ranges (#1612) * add capture groups * update patterns to valid snowflake ranges --- src/structures/MessageMentions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/structures/MessageMentions.js b/src/structures/MessageMentions.js index 4d9c20f3e..f6144ae30 100644 --- a/src/structures/MessageMentions.js +++ b/src/structures/MessageMentions.js @@ -144,18 +144,18 @@ MessageMentions.EVERYONE_PATTERN = /@(everyone|here)/g; * Regular expression that globally matches user mentions like `<@81440962496172032>` * @type {RegExp} */ -MessageMentions.USERS_PATTERN = /<@!?[0-9]+>/g; +MessageMentions.USERS_PATTERN = /<@!?(1|\d{17,19})>/g; /** * Regular expression that globally matches role mentions like `<@&297577916114403338>` * @type {RegExp} */ -MessageMentions.ROLES_PATTERN = /<@&[0-9]+>/g; +MessageMentions.ROLES_PATTERN = /<@&(\d{17,19})>/g; /** * Regular expression that globally matches channel mentions like `<#222079895583457280>` * @type {RegExp} */ -MessageMentions.CHANNELS_PATTERN = /<#([0-9]+)>/g; +MessageMentions.CHANNELS_PATTERN = /<#(\d{17,19})>/g; module.exports = MessageMentions;