Merge pull request #218 from beeper/highest/plat-37984

fix: preserve multibyte text around LINE sticons

Author: highesttt

pkg/connector/handle_message.go

@@ -402,32 +402,38 @@ func (lc *LineClient) convertLineMessage(ctx context.Context, portal *bridgev2.P
 		return h.ConvertDeviceContact(ctx, portal, intent, data, unwrappedText, replyRelatesTo)
 	}
 
+	var converted *bridgev2.ConvertedMessage
+	var err error
+
 	// Handle inline emoji/stamp embedded in text messages
 	if data.ContentMetadata["STKID"] != "" || data.ContentMetadata["STKPKGID"] != "" ||
-		data.ContentMetadata["STICON_OWNERSHIP"] != "" {
+		data.ContentMetadata["STICON_OWNERSHIP"] != "" ||
+		handlers.HasSticonBody(bodyText) ||
+		handlers.ContainsLineSticonPlaceholder(unwrappedText) {
 		if data.ContentMetadata["STICON_OWNERSHIP"] != "" {
 			h.Log.Debug().
-				Str("body_text", bodyText).
-				Str("unwrapped_text", unwrappedText).
-				Interface("content_metadata", data.ContentMetadata).
+				Int("body_length", len(bodyText)).
+				Int("unwrapped_length", len(unwrappedText)).
+				Int("metadata_count", len(data.ContentMetadata)).
 				Msg("STICON_OWNERSHIP: full message body")
 		}
-		return h.ConvertInlineEmoji(ctx, portal, intent, data, unwrappedText, bodyText, replyRelatesTo)
-	}
+		converted, err = h.ConvertInlineEmoji(ctx, portal, intent, data, unwrappedText, bodyText, replyRelatesTo)
+	} else {
+		// Skip empty/whitespace-only text messages (system messages that fell through)
+		if strings.TrimSpace(unwrappedText) == "" {
+			return nil, nil
+		}
 
-	// Skip empty/whitespace-only text messages (system messages that fell through)
-	if strings.TrimSpace(unwrappedText) == "" {
-		return nil, nil
+		// Default to text
+		converted, err = h.ConvertText(unwrappedText, replyRelatesTo)
 	}
-
-	// Default to text
-	converted, err := h.ConvertText(unwrappedText, replyRelatesTo)
 	if err != nil {
 		return nil, err
 	}
 
-	if mentionStr := data.ContentMetadata["MENTION"]; mentionStr != "" && len(converted.Parts) > 0 {
+	if mentionStr := data.ContentMetadata["MENTION"]; mentionStr != "" && converted != nil && len(converted.Parts) > 0 && converted.Parts[0].Content != nil {
 		lc.UserLogin.Bridge.Log.Debug().Str("raw_mention", mentionStr).Msg("Processing inbound LINE MENTION metadata")
+		canFormatMentions := converted.Parts[0].Content.Body == unwrappedText && converted.Parts[0].Content.FormattedBody == ""
 		var mentionData struct {
 			MENTIONEES []struct {
 				M string `json:"M,omitempty"`
@@ -472,17 +478,21 @@ func (lc *LineClient) convertLineMessage(ctx context.Context, portal *bridgev2.P
 					}
 					lc.UserLogin.Bridge.Log.Debug().Str("mxid", string(mxid)).Msg("Formatted MXID from LINE MID")
 					mentions.UserIDs = append(mentions.UserIDs, mxid)
-					if s, errS := strconv.Atoi(ment.S); errS == nil && s >= 0 {
-						if e, errE := strconv.Atoi(ment.E); errE == nil && e <= len(unwrappedText) && e > s {
-							entries = append(entries, mentionEntry{start: s, end: e, mxid: string(mxid)})
+					if canFormatMentions {
+						if s, errS := strconv.Atoi(ment.S); errS == nil && s >= 0 {
+							if e, errE := strconv.Atoi(ment.E); errE == nil && e <= len(unwrappedText) && e > s {
+								entries = append(entries, mentionEntry{start: s, end: e, mxid: string(mxid)})
+							}
 						}
 					}
 				}
 				if ment.A == "1" {
 					mentions.Room = true
-					if s, errS := strconv.Atoi(ment.S); errS == nil && s >= 0 {
-						if e, errE := strconv.Atoi(ment.E); errE == nil && e <= len(unwrappedText) && e > s {
-							entries = append(entries, mentionEntry{start: s, end: e, mxid: "@room"})
+					if canFormatMentions {
+						if s, errS := strconv.Atoi(ment.S); errS == nil && s >= 0 {
+							if e, errE := strconv.Atoi(ment.E); errE == nil && e <= len(unwrappedText) && e > s {
+								entries = append(entries, mentionEntry{start: s, end: e, mxid: "@room"})
+							}
 						}
 					}
 				}

pkg/connector/handle_message_test.go

@@ -1,13 +1,56 @@
 package connector
 
 import (
+	"io"
+	"strings"
 	"testing"
 
+	"github.com/rs/zerolog"
+	"maunium.net/go/mautrix/bridgev2"
+	"maunium.net/go/mautrix/bridgev2/database"
 	"maunium.net/go/mautrix/event"
+	"maunium.net/go/mautrix/id"
 
 	"github.com/highesttt/matrix-line-messenger/pkg/line"
 )
 
+func TestConvertLineMessagePreservesMentionsForSticonFallback(t *testing.T) {
+	const placeholder = "\U00100084"
+	text := "hello " + placeholder
+	userMXID := id.UserID("@user:example.com")
+	lc := &LineClient{
+		Mid: "self-mid",
+		UserLogin: &bridgev2.UserLogin{
+			UserLogin: &database.UserLogin{UserMXID: userMXID},
+			Bridge:    &bridgev2.Bridge{Log: zerolog.New(io.Discard)},
+		},
+	}
+	data := line.Message{
+		ContentType: int(ContentText),
+		ContentMetadata: map[string]string{
+			"MENTION": `{"MENTIONEES":[{"M":"self-mid","S":"0","E":"5"}]}`,
+		},
+	}
+
+	converted, err := lc.convertLineMessage(t.Context(), nil, nil, data, text, text, false)
+	if err != nil {
+		t.Fatalf("convertLineMessage returned error: %v", err)
+	}
+	if converted == nil || len(converted.Parts) != 1 || converted.Parts[0].Content == nil {
+		t.Fatalf("convertLineMessage returned %#v, want one message part", converted)
+	}
+	content := converted.Parts[0].Content
+	if content.Body != "hello [Emoji]" {
+		t.Fatalf("Body = %q, want cleaned sticon fallback", content.Body)
+	}
+	if content.Mentions == nil || len(content.Mentions.UserIDs) != 1 || content.Mentions.UserIDs[0] != userMXID {
+		t.Fatalf("Mentions = %#v, want user %s", content.Mentions, userMXID)
+	}
+	if strings.Contains(content.FormattedBody, placeholder) {
+		t.Fatalf("FormattedBody still contains LINE placeholder: %q", content.FormattedBody)
+	}
+}
+
 func TestDecryptMessageBodySkipsGeneratedFallbackWhenDecryptUnavailable(t *testing.T) {
 	msg := &line.Message{
 		Text:   "",