X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/02cdaff8be27f37f44db8892bb12554f2d702323..6b21fcf78372995c6d8130c63f2f8aa2609bf7fe:/telegram_test.go?ds=sidebyside

diff --git a/telegram_test.go b/telegram_test.go
index 2f944fa..cf46106 100644
--- a/telegram_test.go
+++ b/telegram_test.go
@@ -21,8 +21,8 @@ func TestOwnerTalksToTheAgentThroughTelegram(t *testing.T) {
 
 	telegram := newTelegramFake(t)
 	bot, _ := telegramStartTestBot(t, telegram)
-	socket := startTestDaemonWithBot(t, server, bot)
-	terminal := startTestClient(t, socket)
+	socket := daemonStartTestWithBot(t, server, bot)
+	terminal := terminalStartTestClient(t, socket)
 	terminal.WaitFor(t, "[connected to OneChat]")
 
 	telegram.Add(TelegramUpdate{
@@ -43,8 +43,8 @@ func TestOwnerTalksToTheAgentThroughTelegram(t *testing.T) {
 func TestBotIgnoresEveryoneButTheOwner(t *testing.T) {
 	telegram := newTelegramFake(t)
 	bot, logs := telegramStartTestBot(t, telegram)
-	socket := startTestDaemonWithBot(t, newModelFake(t), bot)
-	terminal := startTestClient(t, socket)
+	socket := daemonStartTestWithBot(t, newModelFake(t), bot)
+	terminal := terminalStartTestClient(t, socket)
 	terminal.WaitFor(t, "[connected to OneChat]")
 
 	group := telegramOwnerMessage("secret in a group")
@@ -81,7 +81,7 @@ func TestBotIgnoresEveryoneButTheOwner(t *testing.T) {
 func TestBotAnswersThatOnlyTextIsSupported(t *testing.T) {
 	telegram := newTelegramFake(t)
 	bot, _ := telegramStartTestBot(t, telegram)
-	startTestDaemonWithBot(t, newModelFake(t), bot)
+	daemonStartTestWithBot(t, newModelFake(t), bot)
 
 	telegram.Add(TelegramUpdate{
 		UpdateID: 1,
@@ -106,7 +106,7 @@ func TestStopFromTelegramInterruptsTheTurn(t *testing.T) {
 
 	telegram := newTelegramFake(t)
 	bot, _ := telegramStartTestBot(t, telegram)
-	startTestDaemonWithBot(t, server, bot)
+	daemonStartTestWithBot(t, server, bot)
 
 	telegram.Add(TelegramUpdate{
 		UpdateID: 1,
@@ -149,8 +149,8 @@ func TestBotStartsAtTheStoredOffset(t *testing.T) {
 		Message:  telegramOwnerMessage("new after the restart"),
 	})
 
-	socket := startTestDaemonWithBot(t, server, bot)
-	terminal := startTestClient(t, socket)
+	socket := daemonStartTestWithBot(t, server, bot)
+	terminal := terminalStartTestClient(t, socket)
 	terminal.WaitFor(t, "[connected to OneChat]")
 	telegramWaitForSent(t, telegram, "ok")
 
@@ -189,7 +189,7 @@ func TestBotTriesAgainAfterFailures(t *testing.T) {
 	}
 
 	bot, logs := telegramStartTestBot(t, telegram)
-	startTestDaemonWithBot(t, server, bot)
+	daemonStartTestWithBot(t, server, bot)
 
 	telegram.Add(TelegramUpdate{
 		UpdateID: 1,
@@ -236,8 +236,8 @@ func TestRepliesGoAsRichMessages(t *testing.T) {
 
 	telegram := newTelegramFake(t)
 	bot, _ := telegramStartTestBot(t, telegram)
-	socket := startTestDaemonWithBot(t, server, bot)
-	terminal := startTestClient(t, socket)
+	socket := daemonStartTestWithBot(t, server, bot)
+	terminal := terminalStartTestClient(t, socket)
 	terminal.WaitFor(t, "[connected to OneChat]")
 
 	terminal.Type("make **it** so")
@@ -390,6 +390,67 @@ func TestLongReplyGoesAsRichMessagesSplitBetweenBlocks(t *testing.T) {
 	require.Equal(t, []string{paragraphs, table}, telegram.Sent())
 }
 
+func TestReplyTagsGoAsText(t *testing.T) {
+	testCases := []struct {
+		name   string
+		status int
+		sent   []string
+	}{
+		{
+			name: "rich message escapes the tag outside code",
+			sent: []string{"a \\<details> tag and `<b>`"},
+		},
+		{
+			name:   "entity fallback shows the tag as written",
+			status: http.StatusBadRequest,
+			sent:   []string{"a <details> tag and <b>"},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			telegram := newTelegramFake(t)
+			telegram.fail = func(call TelegramFakeCall) (int, string) {
+				if call.method != "sendRichMessage" {
+					return 0, ""
+				}
+
+				return tc.status, "Bad Request"
+			}
+
+			bot, _ := telegramStartTestBot(t, telegram)
+			bot.post(t.Context(), Event{
+				Kind: "reply",
+				Text: "a <details> tag and `<b>`",
+			})
+
+			require.Equal(t, tc.sent, telegram.Sent())
+		})
+	}
+}
+
+func TestLongReplySplitCountsTheEscapedTags(t *testing.T) {
+	paragraph := "A <b> tag.\n\n"
+	count := telegramRichBytes / len(paragraph)
+	reply := strings.Repeat(paragraph, count)
+	require.LessOrEqual(t, len(reply), telegramRichBytes)
+
+	telegram := newTelegramFake(t)
+	bot, _ := telegramStartTestBot(t, telegram)
+	bot.post(t.Context(), Event{
+		Kind: "reply",
+		Text: reply,
+	})
+
+	sent := telegram.Sent()
+	require.Len(t, sent, 2)
+	require.Equal(t, telegramEscapeTags(reply), strings.Join(sent, ""))
+
+	for _, markdown := range sent {
+		require.LessOrEqual(t, len(markdown), telegramRichBytes)
+	}
+}
+
 func TestRefusedEntitiesGoAgainAsPlainText(t *testing.T) {
 	telegram := newTelegramFake(t)
 	telegram.fail = func(call TelegramFakeCall) (int, string) {
@@ -423,7 +484,7 @@ func TestBotLogsNoTokenWhenTheNetworkFails(t *testing.T) {
 	telegram.Close()
 
 	bot, logs := telegramStartTestBot(t, telegram)
-	startTestDaemonWithBot(t, newModelFake(t), bot)
+	daemonStartTestWithBot(t, newModelFake(t), bot)
 
 	require.Eventually(t, func() bool {
 		return strings.Count(logs.String(), "no valid answer") >= 2
@@ -653,10 +714,10 @@ func TestLoadBotConfig(t *testing.T) {
 // telegramStartTestBot returns a bot of telegramTestOwner on server, with its
 // offset file in a temporary directory and short waits, and the buffer of its
 // log.
-func telegramStartTestBot(t *testing.T, server *TelegramFake) (*TelegramBot, *syncBuffer) {
+func telegramStartTestBot(t *testing.T, server *TelegramFake) (*TelegramBot, *SyncBuffer) {
 	t.Helper()
 
-	logs := &syncBuffer{}
+	logs := &SyncBuffer{}
 	bot := newTelegramBot(newTelegramAPI(server.URL, telegramTestToken), telegramTestOwner, filepath.Join(t.TempDir(), telegramOffsetFileName), log.New(logs, "", 0))
 	bot.minWait = time.Millisecond
 	bot.maxWait = 10 * time.Millisecond