lit

devoxin · Apr 6, 2019 · 5ffc295 · 5ffc295
1 parent b281c2b
commit 5ffc295
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/kotlin/me/devoxin/flight/parsers/EmojiParser.kt b/src/main/kotlin/me/devoxin/flight/parsers/EmojiParser.kt
@@ -22,7 +22,7 @@ class EmojiParser : Parser<Emoji> {
     }
 
     companion object {
-        public val EMOJI_REGEX = Pattern.compile("<(a)?:(\\w+):(\\d{17,21})")
+        public val EMOJI_REGEX = Pattern.compile("<(a)?:(\\w+):(\\d{17,21})")!!
     }
 
 }
diff --git a/src/main/kotlin/me/devoxin/flight/parsers/SnowflakeParser.kt b/src/main/kotlin/me/devoxin/flight/parsers/SnowflakeParser.kt
@@ -9,15 +9,16 @@ class SnowflakeParser : Parser<Long> {
     override fun parse(ctx: Context, param: String): Optional<Long> {
         val match = snowflakeMatch.matcher(param)
 
-        if (match.matches()) { // TODO: Monitor this, revert to .find() if issues.
-            return Optional.of(match.group().toLong())
+        if (match.matches()) {
+            val id = match.group("sid") ?: match.group("id")
+            return Optional.of(id.toLong())
         }
 
         return Optional.empty()
     }
 
     companion object {
-        private val snowflakeMatch = Pattern.compile("[0-9]{17,21}")
+        private val snowflakeMatch = Pattern.compile("^(?:<(?:@!?|@&|#)(?<sid>[0-9]{17,21})>|(?<id>[0-9]{17,21}))$")
     }
 
 }