Merge pull request #145 from julwrites/staging

Reverting to use BotPlatform formatting

Author: julwrites

pkg/app/passage.go

@@ -12,6 +12,7 @@ import (
 	"golang.org/x/net/html"
 
 	"github.com/julwrites/BotPlatform/pkg/def"
+	"github.com/julwrites/BotPlatform/pkg/platform"
 	"github.com/julwrites/ScriptureBot/pkg/utils"
 )
 
@@ -36,24 +37,6 @@ func GetReference(doc *html.Node) string {
 	return utils.GetTextNode(refNode).Data
 }
 
-// Helper function to escape characters for Telegram MarkdownV2
-func escapeMarkdownV2(s string) string {
-	// According to Telegram API docs for MarkdownV2, characters to escape are:
-	// '_', '*', '[', ']', '(', ')', '~', '`', '>', '#', '+', '-', '=', '|', '{', '}', '.', '!'
-	// Note: '^' is not in this list. Let's assume it doesn't need escaping.
-	// The logic should be to escape these characters *only* when they are not part of a formatting tag.
-	// However, since we are processing raw text nodes, any special character should be escaped.
-	var sb strings.Builder
-	for _, r := range s {
-		switch r {
-		case '_', '*', '[', ']', '(', ')', '~', '`', '>', '#', '+', '-', '=', '|', '{', '}', '.', '!', '\\':
-			sb.WriteRune('\\')
-		}
-		sb.WriteRune(r)
-	}
-	return sb.String()
-}
-
 // Helper functions for parsing
 func isFormattingTag(tag string) bool {
 	return tag == "sup" || tag == "i" || tag == "b"
@@ -69,21 +52,20 @@ func wrapText(text, tag string) string {
 	}
 
 	if tag == "sup" {
-		// User-specified format for superscript
-		return fmt.Sprintf("^%s^", strings.Trim(text, " "))
+		return platform.TelegramSuperscript(strings.Trim(text, " "))
 	}
 	if tag == "i" {
-		return fmt.Sprintf("_%s_", text)
+		return platform.TelegramItalics(text)
 	}
 	if tag == "b" || isHeaderTag(tag) {
-		return fmt.Sprintf("*%s*", text)
+		return platform.TelegramBold(text)
 	}
 	return text
 }
 
 func parseNode(node *html.Node) string {
 	if node.Type == html.TextNode {
-		return escapeMarkdownV2(node.Data)
+		return node.Data
 	}
 
 	if node.Type != html.ElementNode {

pkg/app/passage_test.go

@@ -78,31 +78,31 @@ func TestGetBiblePassage(t *testing.T) {
 func TestParsePassageFromHtml(t *testing.T) {
 	t.Run("Valid HTML with superscript", func(t *testing.T) {
 		html := `<p><span><sup>12 </sup>But to all who did receive him, who believed in his name, he gave the right to become children of God,</span></p>`
-		expected := `^12^But to all who did receive him, who believed in his name, he gave the right to become children of God,`
+		expected := `¹²But to all who did receive him, who believed in his name, he gave the right to become children of God,`
 		if got := ParsePassageFromHtml(html); got != expected {
 			t.Errorf("ParsePassageFromHtml() = %v, want %v", got, expected)
 		}
 	})
 
 	t.Run("HTML with italics", func(t *testing.T) {
 		html := `<p><i>This is italic.</i></p>`
-		expected := `_This is italic\._`
+		expected := `_This is italic._`
 		if got := ParsePassageFromHtml(html); got != expected {
 			t.Errorf("ParsePassageFromHtml() = %v, want %v", got, expected)
 		}
 	})
 
 	t.Run("HTML with bold", func(t *testing.T) {
 		html := `<p><b>This is bold.</b></p>`
-		expected := `*This is bold\.*`
+		expected := `*This is bold.*`
 		if got := ParsePassageFromHtml(html); got != expected {
 			t.Errorf("ParsePassageFromHtml() = %v, want %v", got, expected)
 		}
 	})
 
 	t.Run("HTML with line breaks", func(t *testing.T) {
 		html := `<p>Line 1.<br>Line 2.</p>`
-		expected := "Line 1\\.\nLine 2\\."
+		expected := "Line 1.\nLine 2."
 		if got := ParsePassageFromHtml(html); got != expected {
 			t.Errorf("ParsePassageFromHtml() = %v, want %v", got, expected)
 		}
@@ -118,31 +118,35 @@ func TestParsePassageFromHtml(t *testing.T) {
 
 	t.Run("Nested HTML tags", func(t *testing.T) {
 		html := `<p><b>This is bold, <i>and this is italic.</i></b></p>`
-		expected := `*This is bold, *_and this is italic\._`
+		expected := `*This is bold, *_and this is italic._`
 		if got := ParsePassageFromHtml(html); got != expected {
 			t.Errorf("ParsePassageFromHtml() = %v, want %v", got, expected)
 		}
 	})
 
 	t.Run("MarkdownV2 escaping", func(t *testing.T) {
+		// Note: We no longer escape explicitly in ParsePassageFromHtml as we rely on the platform
+		// to handle it later (via PostTelegram).
+		// However, returning raw characters like * might cause issues if not handled by platform.
+		// For now, we expect them to be returned raw.
 		html := `<p>This has special characters: *_. [hello](world)!</p>`
-		expected := `This has special characters: \*\_\. \[hello\]\(world\)\!`
+		expected := `This has special characters: *_. [hello](world)!`
 		if got := ParsePassageFromHtml(html); got != expected {
 			t.Errorf("ParsePassageFromHtml() = %v, want %v", got, expected)
 		}
 	})
 
 	t.Run("Backslash escaping", func(t *testing.T) {
 		html := `added to you\.`
-		expected := `added to you\\\.`
+		expected := `added to you\.`
 		if got := ParsePassageFromHtml(html); got != expected {
 			t.Errorf("ParsePassageFromHtml() = %v, want %v", got, expected)
 		}
 	})
 
 	t.Run("Dot escaping", func(t *testing.T) {
 		html := `heaven.`
-		expected := `heaven\.`
+		expected := `heaven.`
 		if got := ParsePassageFromHtml(html); got != expected {
 			t.Errorf("ParsePassageFromHtml() = %v, want %v", got, expected)
 		}