From f7d450e27786efee6de39748ef3f93ca804f4337 Mon Sep 17 00:00:00 2001
From: Laurent Demailly <ldemailly@gmail.com>
Date: Mon, 29 Jul 2024 16:12:09 -0700
Subject: [PATCH] Only eval between triple ticks when present

---
 bot.go      | 37 ++++++++++++++++++++++++++++++-------
 bot_test.go | 34 ++++++++++++++++++++++++++++++++++
 go.mod      |  4 ++--
 go.sum      |  8 ++++----
 4 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/bot.go b/bot.go
index 4fbbe3a..8bfca8a 100644
--- a/bot.go
+++ b/bot.go
@@ -78,12 +78,35 @@ func handleDM(session *discordgo.Session, message *discordgo.Message, replyID st
 
 var growlVersion, _, _ = version.FromBuildInfoPath("grol.io/grol")
 
-func removeTripleBackticks(s string) string {
-	s = strings.TrimPrefix(s, "```grol")
-	s = strings.TrimPrefix(s, "```go")
-	s = strings.TrimPrefix(s, "```")
-	s = strings.TrimSuffix(s, "```")
-	return s
+func RemoveTripleBackticks(s string) string {
+	// Extract the code in between triple backticks, ignoring the language tag if any.
+	buf := strings.Builder{}
+	first := true
+	for {
+		i := strings.Index(s, "```")
+		if i == -1 {
+			if first {
+				buf.WriteString(s)
+			}
+			break
+		}
+		if first {
+			buf.WriteString("\n") // separate from previous
+		}
+		first = false
+		s = s[i:]
+		s = strings.TrimPrefix(s, "```grol")
+		s = strings.TrimPrefix(s, "```go")
+		s = strings.TrimPrefix(s, "```")
+		j := strings.Index(s, "```")
+		if j == -1 {
+			buf.WriteString(s)
+			break
+		}
+		buf.WriteString(s[:j])
+		s = s[j+3:]
+	}
+	return strings.TrimSpace(buf.String())
 }
 
 func UptimeString(startTime time.Time) string {
@@ -142,7 +165,7 @@ func eval(input string) string {
 		//   ```
 		//   look at the result of 1+1
 		// in a single message and not get errors on the extra text (meanwhile, add //).
-		input = removeTripleBackticks(input)
+		input = RemoveTripleBackticks(input)
 		var errs []string
 		res, errs, _ = repl.EvalString(input)
 		if len(errs) > 0 {
diff --git a/bot_test.go b/bot_test.go
index fcc71cc..375625b 100644
--- a/bot_test.go
+++ b/bot_test.go
@@ -28,3 +28,37 @@ func TestUptime(t *testing.T) {
 		t.Errorf("Expected %v, but got %v", expected, actual)
 	}
 }
+
+func TestRemoveBackticks(t *testing.T) {
+	// table driven inpute,expected
+	tests := []struct {
+		input, expected string
+	}{
+		{"   foo   \n   bar   ", "foo   \n   bar"},
+		{`
+this is before code
+` + "```go" + `
+a=1
+b=2
+` + "```" + `
+some stuff after code`,
+			"a=1\nb=2",
+		},
+		{`
+this is before code
+` + "```go" + `
+a=1
+b=2
+` + "```" + `
+some stuff after code
+` + "```c=3``` and ```d=4```",
+			"a=1\nb=2\nc=3",
+		},
+	}
+	for _, test := range tests {
+		actual := bot.RemoveTripleBackticks(test.input)
+		if actual != test.expected {
+			t.Errorf("---For---\n%s\n---Expected %q, but got %q", test.input, test.expected, actual)
+		}
+	}
+}
diff --git a/go.mod b/go.mod
index 3a3f40d..ec61fed 100644
--- a/go.mod
+++ b/go.mod
@@ -3,12 +3,12 @@ module grol.io/grol-discord-bot
 go 1.22.5
 
 require (
-	fortio.org/cli v1.7.0
+	fortio.org/cli v1.8.0
 	fortio.org/log v1.16.0
 	fortio.org/scli v1.15.1
 	fortio.org/version v1.0.4
 	github.com/bwmarrin/discordgo v0.28.1
-	grol.io/grol v0.26.0
+	grol.io/grol v0.27.0
 )
 
 require (
diff --git a/go.sum b/go.sum
index 0da806d..9d4f4aa 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,7 @@
 fortio.org/assert v1.2.1 h1:48I39urpeDj65RP1KguF7akCjILNeu6vICiYMEysR7Q=
 fortio.org/assert v1.2.1/go.mod h1:039mG+/iYDPO8Ibx8TrNuJCm2T2SuhwRI3uL9nHTTls=
-fortio.org/cli v1.7.0 h1:w+uXZLGi4t3Vn/BvbeMuSw84Z1pvNPG9HqeGfpP68cc=
-fortio.org/cli v1.7.0/go.mod h1:s4vxWz7P7T4cYOWdMF0NA693Nu1gK9OW4KoDj54/Do4=
+fortio.org/cli v1.8.0 h1:Mz1phmUwkQaXESGb1nIWBY+CHli/GYIlhwpktorh9sY=
+fortio.org/cli v1.8.0/go.mod h1:pk/JBE8LcXtNuo5Yj2bLsVbwPaHo8NWdbstSN0cpbFk=
 fortio.org/dflag v1.7.2 h1:lUhXFvDlw4CJj/q7hPv/TC+n/wVoQylzQO6bUg5GQa0=
 fortio.org/dflag v1.7.2/go.mod h1:6yO/NIgrWfQH195WbHJ3Y45SCx11ffivQjfx2C/FS1U=
 fortio.org/log v1.16.0 h1:GhU8/9NkYZmEIzvTN/DTMedDAStLJraWUUVUA2EbNDc=
@@ -39,5 +39,5 @@ golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-grol.io/grol v0.26.0 h1:rrsWd0EhnEr8V+hiEU8Zvb5DBaiBvv1jS+T0v36faQM=
-grol.io/grol v0.26.0/go.mod h1:rRHlaB49q2Qgf2Zz2SfbkFzk9h+acpFbe7oCXqI9PiM=
+grol.io/grol v0.27.0 h1:9x/hAyP3DhRkGSX24eqlPNI6aPBRCR+bfKHV+hMoOT4=
+grol.io/grol v0.27.0/go.mod h1:sZnaBD2XrNWV3t+wthpch957qOE7RkT1YIIID9ICMhQ=