Merge pull request #215 from lunakv/regex-update-fix

Actual roll command fix
Fryyyyy · Nov 21, 2023 · 73d05e3 · 73d05e3
2 parents 4bc2b75 + 19e30c7
commit 73d05e3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/dice_test.go b/dice_test.go
@@ -31,7 +31,6 @@ func TestRollDice(t *testing.T) {
 		{"2d6+e", plannedFailure},
 		{"2e6?_", plannedFailure},
 		{"-3d8", plannedFailure},
-		{"kd4", plannedError},
 		{"3d1", plannedError},
 		{"2d112", plannedError},
 		{"4d0", plannedError},

diff --git a/utils.go b/utils.go
@@ -27,7 +27,7 @@ var (
 	wordEndingInBang     = regexp.MustCompile(`!["'] |\n+`)
 	wordStartingWithBang = regexp.MustCompile(`\s+! *\S+`)
 
-	diceRegex = regexp.MustCompile(`^(?:roll )?\s*(.*?)d(\d+)([+-]\d+)?`)
+	diceRegex = regexp.MustCompile(`^(?:roll\s+)?(\d*)d(\d+)([+-]\d+)?`)
 
 	cardMetadataRegex = regexp.MustCompile(`(?i)^(?:rulings?|reminder|flavou?r) `)