Strip tmux window

bot/session.go

@@ -104,11 +104,6 @@ const (
 )
 
 var (
-	// consoleCodeRegex is a regex describing console escape sequences that we're stripping out. This regex
-	// only matches ECMA-48 CSI sequences (ESC [ ... <char>), which is enough since, we're using tmux's capture-pane.
-	// See https://man7.org/linux/man-pages/man4/console_codes.4.html
-	consoleCodeRegex = regexp.MustCompile(`\x1b\[[0-9;]*[a-zA-Z]`)
-
 	// sendKeysMapping is a translation table that translates input commands "!<command>" to something that can be
 	// send via tmux's send-keys command, see https://man7.org/linux/man-pages/man1/tmux.1.html#KEY_BINDINGS
 	sendKeysMapping = map[string]string{
@@ -399,7 +394,7 @@ func (s *session) commandOutputLoop() error {
 		select {
 		case <-s.ctx.Done():
 			if lastID != "" {
-				_ = s.conn.Update(s.conf.terminal, lastID, util.FormatMarkdownCode(addExitedMessage(sanitizeWindow(last)))) // Show "(REPL exited.)" in terminal
+				_ = s.conn.Update(s.conf.terminal, lastID, util.FormatMarkdownCode(addExitedMessage(sanitizeWindow(removeTmuxBorder(last))))) // Show "(REPL exited.)" in terminal
 			}
 			return errExit
 		case <-s.forceResend:
@@ -420,11 +415,11 @@ func (s *session) maybeRefreshTerminal(last, lastID string) (string, string, err
 	current, err := s.tmux.Capture()
 	if err != nil {
 		if lastID != "" {
-			_ = s.conn.Update(s.conf.terminal, lastID, util.FormatMarkdownCode(addExitedMessage(sanitizeWindow(last)))) // Show "(REPL exited.)" in terminal
+			_ = s.conn.Update(s.conf.terminal, lastID, util.FormatMarkdownCode(addExitedMessage(sanitizeWindow(removeTmuxBorder(last))))) // Show "(REPL exited.)" in terminal
 		}
 		return "", "", errExit // The command may have ended, gracefully exit
 	}
-	current = s.maybeAddCursor(s.maybeTrimWindow(sanitizeWindow(current)))
+	current = s.maybeAddCursor(s.maybeTrimWindow(sanitizeWindow(removeTmuxBorder(current))))
 	if current == last {
 		return last, lastID, nil
 	}

bot/util.go

@@ -9,16 +9,24 @@ import (
 	"os"
 	"regexp"
 	"strings"
+	"unicode"
 )
 
 var (
+	// consoleCodeRegex is a regex describing console escape sequences that we're stripping out. This regex
+	// only matches ECMA-48 CSI sequences (ESC [ ... <char>), which is enough since, we're using tmux's capture-pane.
+	// See https://man7.org/linux/man-pages/man4/console_codes.4.html
+	consoleCodeRegex = regexp.MustCompile(`\x1b\[[0-9;]*[a-zA-Z]`)
+
 	unquoteReplacer = strings.NewReplacer(
 		"\\n", "\n", // new line
 		"\\r", "\r", // line feed
 		"\\t", "\t", // tab
 		"\\b", "\b", // backspace
 	)
 	unquoteHexCharRegex = regexp.MustCompile(`\\x[a-fA-F0-9]{2}`)
+
+	tmuxWindowRegex = regexp.MustCompile(`│·*$|─+$|─*┘·*$|·+$|·*\(size \d+x\d+ from a smaller client\)\s*$`)
 )
 
 func addCursor(window string, x, y int) string {
@@ -99,6 +107,14 @@ func sanitizeWindow(window string) string {
 	return sanitized
 }
 
+func removeTmuxBorder(window string) string {
+	lines := strings.Split(window, "\n")
+	for i := range lines {
+		lines[i] = strings.TrimRightFunc(tmuxWindowRegex.ReplaceAllString(lines[i], ""), unicode.IsSpace)
+	}
+	return strings.Join(lines, "\n")
+}
+
 func zipAppendFile(zw *zip.Writer, name string, filename string) error {
 	f, err := os.Open(filename)
 	if err != nil {

bot/util_test.go

@@ -129,3 +129,60 @@ func TestCropWindow(t *testing.T) {
 	actual := cropWindow(before, 500)
 	assert.Equal(t, expected, actual)
 }
+
+func TestRemoveTmuxBorder(t *testing.T) {
+	before := `
+pheckel@plep ~/Code/replbot(main*) »                                      │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+                                                                          │·····
+──────────────────────────────────────────────────────────────────────────┘·····
+················································································
+················································································
+················································································
+················································································
+··············································(size 74x18 from a smaller client)
+`
+	expected := `
+pheckel@plep ~/Code/replbot(main*) »
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`
+	actual := removeTmuxBorder(before)
+	assert.Equal(t, expected, actual)
+}