Fix merging plaintext caption with media already including HTML caption

mautrix · Jun 12, 2024 · 147c31a · 147c31a
1 parent 0ec720c
commit 147c31a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/msgconv/from-meta.go b/msgconv/from-meta.go
@@ -62,7 +62,8 @@ func (cm *ConvertedMessage) MergeCaption() {
 	mediaContent := cm.Parts[0].Content
 	textContent := cm.Parts[1].Content
 	if mediaContent.FileName != "" && mediaContent.FileName != mediaContent.Body {
-		if textContent.FormattedBody != "" {
+		if textContent.FormattedBody != "" || mediaContent.FormattedBody != "" {
+			textContent.EnsureHasHTML()
 			mediaContent.EnsureHasHTML()
 			mediaContent.FormattedBody = fmt.Sprintf("%s<br><br>%s", mediaContent.FormattedBody, textContent.FormattedBody)
 		}