Skip ampersand unless previous command was valid

Author: Fryyyyy

main.go

@@ -163,12 +163,12 @@ func tokeniseAndDispatchInput(fp *fryatogParams, cardGetFunction CardGetter, dum
 	}
 
 	// Only start processing from the first ! or [[, not from the first &
-	if strings.Contains(input, "&") {
-		firstCmdIdx := max(cappedMin(strings.Index(input, "!"), strings.Index(input, "[["), -1), -1)
-		if strings.Index(input, "&") < firstCmdIdx {
-			input = input[firstCmdIdx:]
-		}
-	}
+	//if strings.Contains(input, "&") {
+	//	firstCmdIdx := max(cappedMin(strings.Index(input, "!"), strings.Index(input, "[["), -1), -1)
+	//	if strings.Index(input, "&") < firstCmdIdx {
+	//		input = input[firstCmdIdx:]
+	//	}
+	//}
 
 	// Little bit of hackery for PMs
 	if !strings.Contains(input, "!") && !strings.Contains(input, "[[") {
@@ -227,31 +227,23 @@ func tokeniseAndDispatchInput(fp *fryatogParams, cardGetFunction CardGetter, dum
 		}
 	}
 
-	skipNext := false
+	previousCommandWasValidBang := false
 	for _, message := range commandList {
 		log.Debug("Processing:", "Command", message)
-		if skipNext {
-			log.Info("Double Iffy NextAmpersand Skip")
-			skipNext = false
-			continue
-		}
+
 		totalQueries.Add(1)
 		if isIRC {
 			ircQueries.Add(1)
 		} else {
 			slackQueries.Add(1)
 		}
-		if nonTextRegex.MatchString(message) || strings.HasPrefix(message, "  ") {
-			log.Info("Iffy skip", "Message", message)
-			continue
-		}
+
 		if strings.HasPrefix(message, "! ") {
 			log.Info("Double Iffy Skip", "Message", message)
-			whereWereAt := strings.Index(input, message)
-			nextAnd := strings.Index(input[whereWereAt:], "&")
-			if nextAnd > -1 {
-				skipNext = true
-			}
+			continue
+		}
+		if strings.HasPrefix(message, "&") && !previousCommandWasValidBang {
+			log.Info("Triple Iffy Skip", "Message", message)
 			continue
 		}
 		if wordEndingInBang.MatchString(message) && !wordStartingWithBang.MatchString(message) {
@@ -261,6 +253,7 @@ func tokeniseAndDispatchInput(fp *fryatogParams, cardGetFunction CardGetter, dum
 		message = strings.TrimSpace(message)
 		// Strip the command prefix
 		if strings.HasPrefix(message, "!") || strings.HasPrefix(message, "&") {
+			previousCommandWasValidBang = true
 			message = message[1:]
 		}
 		if strings.HasPrefix(message, "[[") && strings.HasSuffix(message, "]]") {
@@ -271,6 +264,7 @@ func tokeniseAndDispatchInput(fp *fryatogParams, cardGetFunction CardGetter, dum
 			message = message[1 : len(message)-1]
 		}
 		if message == "" {
+			previousCommandWasValidBang = false
 			continue
 		}
 		message = strings.TrimPrefix(message, "card ")

main_test.go

@@ -109,13 +109,16 @@ func TestPolicy(t *testing.T) {
 
 func TestTokens(t *testing.T) {
 	var emptyStringSlice []string
+	nilStringSlice := []string{}
 	var testCardExpected = "\x02CARD\x0F ·  · · TESTSET-T · "
 	var testRandomCardExpected = "\x02RANDOMCARD\x0F ·  · · RANDOMTESTSET-R · "
+	var tarmogoyfRulesText = "\x02Tarmogoyf\x0f {1}{G} · Creature — Lhurgoyf · */1+* · Tarmogoyf's power is equal to the number of card types among cards in all graveyards and its toughness is equal to that number plus 1. · UMA-M · Vin,Cmr,Leg,Mod"
 	tables := []struct {
 		input  string
 		output []string
 	}{
 		{"Hello! ", emptyStringSlice},
+		{"Hello!  ", emptyStringSlice},
 		{"!  ", emptyStringSlice},
 		{"Test!", emptyStringSlice},
 		{"'Test!'", emptyStringSlice},
@@ -149,11 +152,14 @@ func TestTokens(t *testing.T) {
 		{"!search o:test", []string{testRandomCardExpected + "\n" + testRandomCardExpected}},
 		{"Player != Planeswalker", emptyStringSlice},
 		{"Trying to bring = up a !Planeswalker =card", []string{testCardExpected}},
-		{"https://scryfall.com/search?q=cmc%3D9+f%3Avintage&unique=cards&as=grid&order=name It can go grab any of this fun stuff!", emptyStringSlice},
+		{"https://scryfall.com/search?q=cmc%3D9+f%3Avintage&unique=cards&as=grid&order=name It can go grab any of this fun stuff!", nilStringSlice},
 		{"B&R today!", emptyStringSlice},
 		{"!wc WrongPlaceUser", []string{"WrongPlaceUser: Rules questions belong in the rules channel, not in here. Click #magicjudges-rules or type '/join #magicjudges-rules' (without the quotes) to get there"}},
 		{"!wc", []string{"Rules questions belong in the rules channel, not in here. Click #magicjudges-rules or type '/join #magicjudges-rules' (without the quotes) to get there"}},
 		{"Met a retired realtor who suggested doing what he did and buying with a sibling! So I might approach my sisters & brothers-in-law about lending me a hand financially...", emptyStringSlice},
+		{"Hello! Me & John & Tim are playing a game...", emptyStringSlice},
+		{"Hello! I control !island & swamp ..", []string{testCardExpected, testCardExpected}},
+		{"Hello! I saw [[Tarmogoyf]] & I was wondering...", []string{tarmogoyfRulesText}},
 	}
 	for _, table := range tables {
 		got := tokeniseAndDispatchInput(&fryatogParams{m: &hbot.Message{Content: table.input}}, fakeGetCard, fakeGetCard, fakeGetRandomCard, fakeFindCards)