fix

Author: gsanchietti

service/messages.go

@@ -197,17 +197,24 @@ func (s *MessageService) SendMessage(ctx context.Context, req *models.SendMessag
 
 	var content *event.MessageEventContent
 
-	// Check if this is a file transfer message
-	if models.IsFileTransferContentType(req.ContentType) {
-		logger.Debug().Str("content_type", req.ContentType).Msg("processing file transfer message")
+	// Always expect file transfer format
+	logger.Debug().Str("content_type", req.ContentType).Msg("processing file transfer message")
 
-		// Parse the file transfer JSON from the body
-		ftMsg, err := models.ParseFileTransferMessage(req.Body)
-		if err != nil {
-			logger.Warn().Err(err).Str("body", req.Body).Msg("failed to parse file transfer message")
-			return nil, fmt.Errorf("invalid file transfer message: %w", err)
-		}
+	// Parse the file transfer JSON from the body
+	ftMsg, err := models.ParseFileTransferMessage(req.Body)
+	if err != nil {
+		logger.Warn().Err(err).Str("body", req.Body).Msg("failed to parse file transfer message")
+		return nil, fmt.Errorf("invalid file transfer message: %w", err)
+	}
 
+	// Check if attachments are empty - if so, treat as text message
+	if len(ftMsg.Attachments) == 0 {
+		logger.Debug().Msg("file transfer message has empty attachments, sending as text message")
+		content = &event.MessageEventContent{
+			MsgType: event.MsgText,
+			Body:    ftMsg.Body,
+		}
+	} else {
 		// Convert to Matrix event content
 		msgType, rawContent, err := models.FileTransferToMatrixEventContent(ftMsg)
 		if err != nil {
@@ -253,12 +260,6 @@ func (s *MessageService) SendMessage(ctx context.Context, req *models.SendMessag
 		}
 
 		logger.Debug().Str("msg_type", msgType).Str("url", string(content.URL)).Msg("converted file transfer to Matrix media message")
-	} else {
-		// Regular text message
-		content = &event.MessageEventContent{
-			MsgType: event.MsgText,
-			Body:    req.Body,
-		}
 	}
 
 	resp, err := s.matrixClient.SendMessage(ctx, senderMatrix, roomID, content)
@@ -353,53 +354,18 @@ 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")
 
-			// Get message type from content
-			msgType := ""
-			if mt, ok := evt.Content.Raw["msgtype"].(string); ok {
-				msgType = mt
+			body := ""
+			if b, ok := evt.Content.Raw["body"].(string); ok {
+				body = b
 			}
-
-			// Initialize SMS with common fields
 			sms := models.SMS{
 				SMSID:       string(evt.ID),
 				SendingDate: time.UnixMilli(evt.Timestamp).UTC().Format(time.RFC3339),
+				SMSText:     body,
+				ContentType: "text/plain",
 				StreamID:    string(roomID),
 			}
 
-			// Handle different message types
-			switch msgType {
-			case "m.image", "m.video", "m.audio", "m.file":
-				// Convert Matrix media message to Acrobits file transfer format
-				body := ""
-				if b, ok := evt.Content.Raw["body"].(string); ok {
-					body = b
-				}
-
-				url, mimeType, filename, size, thumbnailURL, thumbnailMimeType := models.ExtractMatrixMediaInfo(evt.Content.Raw)
-
-				// Convert to file transfer JSON
-				ftJSON, err := models.MatrixMediaToFileTransfer(msgType, body, url, mimeType, filename, size, thumbnailURL, thumbnailMimeType)
-				if err != nil {
-					logger.Warn().Err(err).Str("event_id", string(evt.ID)).Msg("failed to convert Matrix media to file transfer")
-					// Fall back to text message with URL
-					sms.SMSText = url
-					sms.ContentType = "text/plain"
-				} else {
-					sms.SMSText = ftJSON
-					sms.ContentType = models.FileTransferContentType
-					logger.Debug().Str("event_id", string(evt.ID)).Str("msg_type", msgType).Str("url", url).Msg("converted Matrix media message to file transfer")
-				}
-
-			default:
-				// Regular text message
-				body := ""
-				if b, ok := evt.Content.Raw["body"].(string); ok {
-					body = b
-				}
-				sms.SMSText = body
-				sms.ContentType = "text/plain"
-			}
-
 			// Determine if I sent the message
 			senderMatrixID := string(evt.Sender)
 			isSent := isSentBy(senderMatrixID, string(userID))
@@ -423,7 +389,6 @@ func (s *MessageService) FetchMessages(ctx context.Context, req *models.FetchMes
 				Str("sender", sms.Sender).
 				Str("recipient", sms.Recipient).
 				Bool("is_sent", isSent).
-				Str("content_type", sms.ContentType).
 				Interface("sms", sms).
 				Msg("processed message from sync")