From 23fba8cdcf6668fcf11225a50aa2cd47e5e86ead Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Tue, 26 Oct 2021 22:37:26 +0300 Subject: [PATCH] fix: check for snowflake before username match in resolveUserId --- backend/src/utils.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/utils.ts b/backend/src/utils.ts index fd14070d..f6ea6c91 100644 --- a/backend/src/utils.ts +++ b/backend/src/utils.ts @@ -1280,6 +1280,11 @@ export function resolveUserId(bot: Client, value: string) { return null; } + // Just a user ID? + if (isValidSnowflake(value)) { + return value; + } + // A user mention? const mentionMatch = value.match(/^<@!?(\d+)>$/); if (mentionMatch) { @@ -1293,11 +1298,6 @@ export function resolveUserId(bot: Client, value: string) { if (user) return user.id; } - // Just a user ID? - if (isValidSnowflake(value)) { - return value; - } - return null; }