fix

Author: gsanchietti

main_test.go

@@ -644,18 +644,18 @@ func TestIntegration_SendAndFetchImageMessages(t *testing.T) {
 		}
 
 		attachment := imageMsg.Attachments[0]
-		t.Logf("Attachment content-type: %s, url: %s, size: %d", attachment.ContentType, attachment.ContentURL, attachment.ContentSize)
+		t.Logf("Attachment type: %s, url: %s, size: %d", attachment.Type, attachment.URL, attachment.Size)
 
-		if attachment.ContentType == "" {
-			t.Errorf("attachment content-type is empty")
+		if attachment.Type == "" {
+			t.Errorf("attachment type is empty")
 		}
 
-		if attachment.ContentURL == "" {
-			t.Errorf("attachment content-url is empty")
+		if attachment.URL == "" {
+			t.Errorf("attachment url is empty")
 		}
 
-		if attachment.ContentSize == 0 {
-			t.Errorf("attachment content-size is 0")
+		if attachment.Size == 0 {
+			t.Errorf("attachment size is 0")
 		}
 
 		// Verify preview exists
@@ -671,8 +671,8 @@ func TestIntegration_SendAndFetchImageMessages(t *testing.T) {
 			}
 
 			preview := imageMsg.Attachments[0].Preview
-			if preview.ContentType != "image/jpeg" {
-				t.Errorf("preview content-type is %s, expected image/jpeg", preview.ContentType)
+			if preview.Type != "image/jpeg" {
+				t.Errorf("preview type is %s, expected image/jpeg", preview.Type)
 			}
 
 			if preview.Content == "" {
@@ -690,10 +690,10 @@ func TestIntegration_SendAndFetchImageMessages(t *testing.T) {
 			}
 
 			// Verify the attachment structure
-			t.Logf("Attachment structure verified: ContentType=%s, ContentURL=%s, ContentSize=%d, HasPreview=%v",
-				imageMsg.Attachments[0].ContentType,
-				imageMsg.Attachments[0].ContentURL,
-				imageMsg.Attachments[0].ContentSize,
+			t.Logf("Attachment structure verified: Type=%s, URL=%s, Size=%d, HasPreview=%v",
+				imageMsg.Attachments[0].Type,
+				imageMsg.Attachments[0].URL,
+				imageMsg.Attachments[0].Size,
 				imageMsg.Attachments[0].Preview != nil)
 		})
 	})

models/messages.go

@@ -47,20 +47,20 @@ type SMS struct {
 
 // Attachment represents a file attachment in the Acrobits x-acro-filetransfer format.
 type Attachment struct {
-	ContentType   string             `json:"content-type,omitempty"`
-	ContentURL    string             `json:"content-url"`
-	ContentSize   int                `json:"content-size,omitempty"`
+	Type          string             `json:"type,omitempty"`
+	URL           string             `json:"url"`
+	Size          int                `json:"size,omitempty"`
 	Filename      string             `json:"filename,omitempty"`
 	Description   string             `json:"description,omitempty"`
-	EncryptionKey string             `json:"encryption-key,omitempty"`
+	EncryptionKey string             `json:"encryption_key,omitempty"`
 	Hash          string             `json:"hash,omitempty"`
 	Preview       *AttachmentPreview `json:"preview,omitempty"`
 }
 
 // AttachmentPreview represents a low-quality preview of an attachment.
 type AttachmentPreview struct {
-	ContentType string `json:"content-type,omitempty"`
-	Content     string `json:"content"` // BASE64 encoded
+	Type    string `json:"type,omitempty"`
+	Content string `json:"content"` // BASE64 encoded
 }
 
 // Message is a helper struct for internal use.

service/messages.go

@@ -328,16 +328,16 @@ func (s *MessageService) FetchMessages(ctx context.Context, req *models.FetchMes
 						publicURL := s.buildMediaURL(mxcURL)
 
 						attachment := models.Attachment{
-							ContentType: contentType,
-							ContentURL:  publicURL,
-							ContentSize: contentSize,
-							Filename:    body, // Use body as filename if available
+							Type:     contentType,
+							URL:      publicURL,
+							Size:     contentSize,
+							Filename: body, // Use body as filename if available
 						}
 
 						if preview != "" {
 							attachment.Preview = &models.AttachmentPreview{
-								ContentType: "image/jpeg",
-								Content:     preview,
+								Type:    "image/jpeg",
+								Content: preview,
 							}
 						}