Эх сурвалжийг харах

Fix formatting not being parsed in incoming messages

Tulir Asokan 3 жил өмнө
parent
commit
eee404c62d
1 өөрчлөгдсөн 8 нэмэгдсэн , 14 устгасан
  1. 8 14
      portal.go

+ 8 - 14
portal.go

@@ -1509,23 +1509,17 @@ func (portal *Portal) convertTextMessage(intent *appservice.IntentAPI, source *U
 		Body:    msg.GetConversation(),
 		MsgType: event.MsgText,
 	}
-	var replyTo types.MessageID
-	var expiresIn uint32
-	extraAttrs := map[string]interface{}{}
-
-	if msg.GetExtendedTextMessage() != nil {
+	if len(msg.GetExtendedTextMessage().GetText()) > 0 {
 		content.Body = msg.GetExtendedTextMessage().GetText()
-
-		contextInfo := msg.GetExtendedTextMessage().GetContextInfo()
-		if contextInfo != nil {
-			portal.bridge.Formatter.ParseWhatsApp(content, contextInfo.GetMentionedJid())
-			replyTo = contextInfo.GetStanzaId()
-		}
-		expiresIn = contextInfo.GetExpiration()
-
-		extraAttrs["com.beeper.linkpreviews"] = portal.convertURLPreviewToBeeper(intent, source, msg.GetExtendedTextMessage())
 	}
 
+	contextInfo := msg.GetExtendedTextMessage().GetContextInfo()
+	portal.bridge.Formatter.ParseWhatsApp(content, contextInfo.GetMentionedJid())
+	replyTo := contextInfo.GetStanzaId()
+	expiresIn := contextInfo.GetExpiration()
+	extraAttrs := map[string]interface{}{}
+	extraAttrs["com.beeper.linkpreviews"] = portal.convertURLPreviewToBeeper(intent, source, msg.GetExtendedTextMessage())
+
 	return &ConvertedMessage{
 		Intent:    intent,
 		Type:      event.EventMessage,