Merge pull request andersfylling#286 from Kelwing/develop

implement extremely relaxed emoji matching in hash calculation
scott-mitchell · Apr 25, 2020 · de75008 · de75008
2 parents 39ba986 + 52fec09
commit de75008
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/internal/httd/client.go b/internal/httd/client.go
@@ -21,7 +21,7 @@ const (
 
 	RegexpSnowflakes     = `([0-9]+)`
 	RegexpURLSnowflakes  = `\/` + RegexpSnowflakes + `\/?`
-	RegexpEmoji          = `(\x{D83C}-\x{DFFF}|\x{1F600}-\x{1F6FF}|[\x{2600}-\x{26FF}]|\:[a-zA-Z0-9_]+\:|[a-zA-Z0-9_]+\:[0-9]+)\s?`
+	RegexpEmoji          = `([.^/]+)\s?`
 	RegexpReactionPrefix = `\/channels\/([0-9]+)\/messages\/\{id\}\/reactions\/`
 
 	// Header

diff --git a/internal/httd/request_test.go b/internal/httd/request_test.go
@@ -36,6 +36,7 @@ func TestRequest_RateLimitID(t *testing.T) {
 		"/channels/540519296640614416/messages/540519319814275089/reactions/🥰/@me":                                                               "GET:/channels/540519296640614416/messages/{id}/reactions/{emoji}/@me",
 		"/channels/486833611564253186/messages/540519319814275089/reactions/🥺/@me":                                                               "GET:/channels/486833611564253186/messages/{id}/reactions/{emoji}/@me",
 		"/channels/486833611564253186/messages/540519319814275089/reactions/🥺 /@me":                                                              "GET:/channels/486833611564253186/messages/{id}/reactions/{emoji}/@me",
+		"/channels/486833611564253186/messages/540519319814275089/reactions/♀️/@me":                                                              "GET:/channels/486833611564253186/messages/{id}/reactions/{emoji}/@me",
 		"/channels/486833611564253186/messages/540519319814275089/reactions/:smiling_face_with_3_hearts:/@me":                                    "GET:/channels/486833611564253186/messages/{id}/reactions/{emoji}/@me",
 		"/channels/486833611564253186/messages/540519319814275089/reactions/:smiling_face_with_3_hearts:":                                        "GET:/channels/486833611564253186/messages/{id}/reactions/{emoji}",
 		"/channels/486833611564253186/messages/540519319814275089/reactions/:smiling_face_with_3_hearts:/":                                       "GET:/channels/486833611564253186/messages/{id}/reactions/{emoji}",