fix

Author: gsanchietti

matrix/client.go

@@ -281,3 +281,26 @@ func (mc *MatrixClient) SetPusher(ctx context.Context, userID id.UserID, req *mo
 		Msg("matrix: pusher set successfully")
 	return nil
 }
+
+// ResolveMXC converts an MXC URI (mxc://server/mediaId) to a downloadable HTTP URL.
+// It uses the configured homeserver URL to construct the download link.
+func (mc *MatrixClient) ResolveMXC(mxcURI string) string {
+	if !strings.HasPrefix(mxcURI, "mxc://") {
+		return mxcURI
+	}
+
+	// Parse the MXC URI
+	// Format: mxc://<server-name>/<media-id>
+	trimmed := strings.TrimPrefix(mxcURI, "mxc://")
+	parts := strings.SplitN(trimmed, "/", 2)
+	if len(parts) != 2 {
+		return mxcURI
+	}
+	serverName := parts[0]
+	mediaID := parts[1]
+
+	// Construct the download URL
+	// Format: /_matrix/media/v3/download/<server-name>/<media-id>
+	baseURL := strings.TrimSuffix(mc.homeserverURL, "/")
+	return fmt.Sprintf("%s/_matrix/media/v3/download/%s/%s", baseURL, serverName, mediaID)
+}

models/filetransfer_convert.go

@@ -131,6 +131,11 @@ func FileTransferToMatrixEventContent(ftMsg *FileTransferMessage) (msgType strin
 		"url":     att.ContentURL,
 	}
 
+	// Include filename when present so clients can render proper disposition
+	if att.Filename != "" {
+		content["filename"] = att.Filename
+	}
+
 	// Add info block
 	info := map[string]interface{}{}
 	if contentType != "" {

service/messages.go

@@ -441,18 +441,96 @@ func (s *MessageService) FetchMessages(ctx context.Context, req *models.FetchMes
 
 			logger.Debug().Str("event_id", string(evt.ID)).Str("room_id", string(eventRoomID)).Msg("processing message event")
 
-			body := ""
+			// Extract content fields
+			var msgType string
+			var body string
+			var url string
+			var info map[string]interface{}
+			var filename string
+
+			if t, ok := evt.Content.Raw["msgtype"].(string); ok {
+				msgType = t
+			}
 			if b, ok := evt.Content.Raw["body"].(string); ok {
 				body = b
 			}
+			if fn, ok := evt.Content.Raw["filename"].(string); ok {
+				filename = fn
+			}
+			if u, ok := evt.Content.Raw["url"].(string); ok {
+				url = u
+			}
+			if i, ok := evt.Content.Raw["info"].(map[string]interface{}); ok {
+				info = i
+			}
+
 			sms := models.SMS{
 				SMSID:       string(evt.ID),
 				SendingDate: time.UnixMilli(evt.Timestamp).UTC().Format(time.RFC3339),
-				SMSText:     body,
-				ContentType: "text/plain",
 				StreamID:    string(roomID),
 			}
 
+			// Check if it's a media message
+			if msgType == "m.image" || msgType == "m.video" || msgType == "m.audio" || msgType == "m.file" {
+				// Convert to Acrobits file transfer format
+				// Resolve MXC URI to HTTP URL
+				httpURL := s.matrixClient.ResolveMXC(url)
+				if httpURL == "" {
+					logger.Warn().Str("event_id", string(evt.ID)).Msg("media event missing URL, falling back to text")
+					sms.SMSText = body
+					sms.ContentType = "text/plain"
+				} else {
+					// Extract metadata
+					mimetype := ""
+					var size int64
+					thumbnailURL := ""
+					thumbnailMime := ""
+
+					if info != nil {
+						if m, ok := info["mimetype"].(string); ok {
+							mimetype = m
+						}
+						if sVal, ok := info["size"].(float64); ok { // JSON numbers are float64
+							size = int64(sVal)
+						} else if sVal, ok := info["size"].(int64); ok {
+							size = sVal
+						} else if sVal, ok := info["size"].(int); ok {
+							size = int64(sVal)
+						}
+						if tURL, ok := info["thumbnail_url"].(string); ok {
+							thumbnailURL = s.matrixClient.ResolveMXC(tURL)
+						}
+						if tInfo, ok := info["thumbnail_info"].(map[string]interface{}); ok {
+							if tm, ok := tInfo["mimetype"].(string); ok {
+								thumbnailMime = tm
+							}
+						}
+					}
+
+					// Convert to JSON
+					// Prefer explicit filename if present; fall back to body
+					effectiveFilename := filename
+					if effectiveFilename == "" {
+						effectiveFilename = body
+					}
+
+					ftJSON, err := models.MatrixMediaToFileTransfer(msgType, body, httpURL, mimetype, effectiveFilename, size, thumbnailURL, thumbnailMime)
+					if err != nil {
+						logger.Warn().Err(err).Msg("failed to convert matrix media to file transfer")
+						// Fallback to text
+						sms.SMSText = body
+						sms.ContentType = "text/plain"
+					} else {
+						sms.SMSText = ftJSON
+						sms.ContentType = models.FileTransferContentType
+					}
+				}
+			} else {
+				// Regular text message
+				sms.SMSText = body
+				sms.ContentType = "text/plain"
+			}
+
 			// Determine if I sent the message
 			senderMatrixID := string(evt.Sender)
 			isSent := isSentBy(senderMatrixID, string(userID))