From 3319ab78a2ed08da8dee8dfee26fb867ab56235d Mon Sep 17 00:00:00 2001
From: simpleauthority <jacob@algorithmjunkie.com>
Date: Sun, 3 Jun 2018 12:47:21 -0700
Subject: [PATCH] [JDA] Fix User context resolution (#138)

When @ mentioning someone in Discord, if you manually click the user's name then the ID will be in the chat field as "<@!...>". However, one can _also_ mention a user like so "<@...>".

This PR handles both cases.
---
 jda/src/main/java/co/aikar/commands/JDACommandContexts.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jda/src/main/java/co/aikar/commands/JDACommandContexts.java b/jda/src/main/java/co/aikar/commands/JDACommandContexts.java
index 8462eda7..1066bd2c 100644
--- a/jda/src/main/java/co/aikar/commands/JDACommandContexts.java
+++ b/jda/src/main/java/co/aikar/commands/JDACommandContexts.java
@@ -68,7 +68,9 @@ public class JDACommandContexts extends CommandContexts<JDACommandExecutionConte
             }
             String arg = c.popFirstArg(); // we pop because we are only issuer aware if we are annotated
             User user = null;
-            if (arg.startsWith("<@")) {
+            if (arg.startsWith("<@!")) { // for some reason a ! is added when @'ing and clicking their name.
+                user = jda.getUserById(arg.substring(3, arg.length() - 1));
+            } else if (arg.startsWith("<@")) { // users can /also/ be mentioned like this...
                 user = jda.getUserById(arg.substring(2, arg.length() - 1));
             } else {
                 List<User> users = jda.getUsersByName(arg, true);