fix: Post notifications now bypass decrypt-failure fallback.

Author: highesttt

pkg/connector/handle_message.go

@@ -372,6 +372,14 @@ func (lc *LineClient) convertLineMessage(ctx context.Context, portal *bridgev2.P
 	decryptedBody := bodyText
 	replyRelatesTo := lc.resolveReplyRelatesTo(ctx, &data)
 
+	// Handle LINE notes/albums before decryption failures and ordinary text
+	// conversion. Post metadata is unencrypted, so it remains useful even when
+	// a shared post's text fallback was marked as encrypted but could not be
+	// decrypted.
+	if isPostNotification(&data) {
+		return lc.newMessageHandler().ConvertPostNotification(data, replyRelatesTo)
+	}
+
 	if decryptionFailed && strings.TrimSpace(unwrappedText) == "" && ContentType(data.ContentType) == ContentText {
 		return &bridgev2.ConvertedMessage{
 			Parts: []*bridgev2.ConvertedMessagePart{
@@ -389,13 +397,6 @@ func (lc *LineClient) convertLineMessage(ctx context.Context, portal *bridgev2.P
 
 	h := lc.newMessageHandler()
 
-	// Handle LINE notes/albums before ordinary text conversion. Shared posts
-	// arrive as contentType 0 with LINE's unsupported-client fallback in Text,
-	// while the useful preview and link are in ContentMetadata.
-	if isPostNotification(&data) {
-		return h.ConvertPostNotification(data, replyRelatesTo)
-	}
-
 	// Handle call events (ORGCONTP == "CALL")
 	if data.ContentMetadata["ORGCONTP"] == "CALL" {
 		return h.ConvertCall(data, replyRelatesTo)

pkg/connector/handle_message_test.go

@@ -122,32 +122,54 @@ func TestConvertLineMessageDispatchesSharedPostBeforeTextFallback(t *testing.T)
 		},
 	}
 
-	converted, err := lc.convertLineMessage(
-		t.Context(),
-		nil,
-		nil,
-		data,
-		fallbackText,
-		fallbackText,
-		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.MsgType != event.MsgNotice {
-		t.Fatalf("MsgType = %s, want %s", content.MsgType, event.MsgNotice)
-	}
-	if strings.Contains(content.Body, fallbackText) {
-		t.Fatalf("Body = %q, must not contain LINE's unsupported-client fallback", content.Body)
-	}
 	expectedBody := "You received a LINE note.\n\nPreview:\nShared note preview\n\n" +
 		"Open in LINE: https://line.me/R/group/home/posts/post?example=shared"
-	if content.Body != expectedBody {
-		t.Fatalf("Body = %q, want %q", content.Body, expectedBody)
+
+	tests := []struct {
+		name             string
+		bodyText         string
+		unwrappedText    string
+		decryptionFailed bool
+	}{
+		{
+			name:          "unsupported text fallback",
+			bodyText:      fallbackText,
+			unwrappedText: fallbackText,
+		},
+		{
+			name:             "decryption failure",
+			decryptionFailed: true,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			converted, err := lc.convertLineMessage(
+				t.Context(),
+				nil,
+				nil,
+				data,
+				test.bodyText,
+				test.unwrappedText,
+				test.decryptionFailed,
+			)
+			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.MsgType != event.MsgNotice {
+				t.Fatalf("MsgType = %s, want %s", content.MsgType, event.MsgNotice)
+			}
+			if strings.Contains(content.Body, fallbackText) {
+				t.Fatalf("Body = %q, must not contain LINE's unsupported-client fallback", content.Body)
+			}
+			if content.Body != expectedBody {
+				t.Fatalf("Body = %q, want %q", content.Body, expectedBody)
+			}
+		})
 	}
 }
 

pkg/connector/handlers/post_notification.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"html"
 	"strings"
 
 	"maunium.net/go/mautrix/bridgev2"
@@ -46,15 +47,24 @@ func (*Handler) ConvertPostNotification(data line.Message, relatesTo *event.Rela
 		body.WriteString("\n\nOpen LINE for full details.")
 	}
 
+	content := &event.MessageEventContent{
+		MsgType:   event.MsgNotice,
+		Body:      body.String(),
+		RelatesTo: relatesTo,
+	}
+	if postURL != "" {
+		plainPrefix := strings.TrimSuffix(content.Body, postURL)
+		escapedURL := html.EscapeString(postURL)
+		content.Format = event.FormatHTML
+		content.FormattedBody = strings.ReplaceAll(html.EscapeString(plainPrefix), "\n", "<br>") +
+			`<a href="` + escapedURL + `">` + escapedURL + `</a>`
+	}
+
 	return &bridgev2.ConvertedMessage{
 		Parts: []*bridgev2.ConvertedMessagePart{
 			{
-				Type: event.EventMessage,
-				Content: &event.MessageEventContent{
-					MsgType:   event.MsgNotice,
-					Body:      body.String(),
-					RelatesTo: relatesTo,
-				},
+				Type:    event.EventMessage,
+				Content: content,
 			},
 		},
 	}, nil

pkg/connector/handlers/post_notification_test.go

@@ -12,9 +12,10 @@ import (
 func TestConvertPostNotification(t *testing.T) {
 	relatesTo := &event.RelatesTo{}
 	tests := []struct {
-		name     string
-		metadata map[string]string
-		expected string
+		name         string
+		metadata     map[string]string
+		expected     string
+		expectedHTML string
 	}{
 		{
 			name: "note with multiline preview and link",
@@ -25,16 +26,22 @@ func TestConvertPostNotification(t *testing.T) {
 			},
 			expected: "You received a LINE note.\n\nPreview:\nFirst line\nSecond line\n\n" +
 				"Open in LINE: https://line.me/R/group/home/posts/post?example=1",
+			expectedHTML: "You received a LINE note.<br><br>Preview:<br>First line<br>Second line<br><br>" +
+				`Open in LINE: <a href="https://line.me/R/group/home/posts/post?example=1">` +
+				"https://line.me/R/group/home/posts/post?example=1</a>",
 		},
 		{
-			name: "album with name and deep link",
+			name: "album with escaped name and deep link",
 			metadata: map[string]string{
 				"serviceType": "AB",
-				"albumName":   "Summer photos",
-				"postEndUrl":  "line://group/home/albums/album?example=1",
+				"albumName":   "Summer <photos>",
+				"postEndUrl":  "line://group/home/albums/album?example=1&source=chat",
 			},
-			expected: "LINE album update: Summer photos\n\n" +
-				"Open in LINE: line://group/home/albums/album?example=1",
+			expected: "LINE album update: Summer <photos>\n\n" +
+				"Open in LINE: line://group/home/albums/album?example=1&source=chat",
+			expectedHTML: "LINE album update: Summer &lt;photos&gt;<br><br>" +
+				`Open in LINE: <a href="line://group/home/albums/album?example=1&amp;source=chat">` +
+				"line://group/home/albums/album?example=1&amp;source=chat</a>",
 		},
 		{
 			name:     "missing metadata",
@@ -60,12 +67,12 @@ func TestConvertPostNotification(t *testing.T) {
 			if err != nil {
 				t.Fatalf("ConvertPostNotification returned error: %v", err)
 			}
-			assertPostNotificationContent(t, converted, test.expected, relatesTo)
+			assertPostNotificationContent(t, converted, test.expected, test.expectedHTML, relatesTo)
 		})
 	}
 }
 
-func assertPostNotificationContent(t *testing.T, converted *bridgev2.ConvertedMessage, expectedBody string, relatesTo *event.RelatesTo) {
+func assertPostNotificationContent(t *testing.T, converted *bridgev2.ConvertedMessage, expectedBody, expectedHTML string, relatesTo *event.RelatesTo) {
 	t.Helper()
 	if converted == nil || len(converted.Parts) != 1 || converted.Parts[0].Content == nil {
 		t.Fatalf("converted = %#v, want one message part", converted)
@@ -80,6 +87,18 @@ func assertPostNotificationContent(t *testing.T, converted *bridgev2.ConvertedMe
 	if part.Content.Body != expectedBody {
 		t.Fatalf("body = %q, want %q", part.Content.Body, expectedBody)
 	}
+	if expectedHTML == "" {
+		if part.Content.Format != "" || part.Content.FormattedBody != "" {
+			t.Fatalf("formatted message = %q / %q, want plain text only", part.Content.Format, part.Content.FormattedBody)
+		}
+	} else {
+		if part.Content.Format != event.FormatHTML {
+			t.Fatalf("format = %q, want %q", part.Content.Format, event.FormatHTML)
+		}
+		if part.Content.FormattedBody != expectedHTML {
+			t.Fatalf("formatted body = %q, want %q", part.Content.FormattedBody, expectedHTML)
+		}
+	}
 	if part.Content.RelatesTo != relatesTo {
 		t.Fatalf("relates_to = %#v, want original pointer %#v", part.Content.RelatesTo, relatesTo)
 	}