fix: new file upload api (#8)

* fix: clean up after the robot

* Add comments

* Add image from urls

* Fix robot review comments

* Move sandbox to unit tests

* Update readme

Author: havebeenfitz

.gitignore

@@ -7,3 +7,6 @@ DerivedData/
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 .netrc
 .idea
+.swiftpm/xcode/xcshareddata/xcschemes/Slackito-Package.xcscheme
+.swiftpm/xcode/xcshareddata/xcschemes/Slackito.xcscheme
+.swiftpm/xcode/xcshareddata/xcschemes/slack-cli.xcscheme

Package.swift

@@ -9,7 +9,7 @@ let package = Package(
         .library(
             name: "Slackito",
             targets: ["Slackito"]
-        ),
+        )
     ],
     dependencies: [
         .package(url: "https://github.com/platacard/cronista.git", from: "1.0.3"),
@@ -25,6 +25,6 @@ let package = Package(
             name: "SlackitoTests",
             dependencies: ["Slackito"],
             path: "Tests/Slackito"
-        ),
+        )
     ]
 )

README.md

@@ -51,14 +51,23 @@ try await message.send(as: "slack_token")
 
 ### Attachments
 
-Slackito also supports sending attachments including images, CSV files, and other file types:
+Slackito also supports sending attachments including images, CSV files, and other file types. Use raw data to attach files to a message. For images use `ImageAccessory` in MarkdownSection/PlainSection or `Image` block for full-sized images.
 
 ```swift
 let message = SlackMessage(
     channel: "reports",
-    attachments: [imageAttachment, csvAttachment, csvDataAttachment]
+    attachments: [csvAttachment]
 ) {
     MarkdownSection("📊 Here's the monthly report with data!")
+
+    Image(url: "https://example.com/image.jpg", text: "Jack's avatar")
+        MarkdownSection(
+            "Author's avatar",
+            accessory: ImageAccessory(
+                url: "https://example.com/image.jpg",
+                text: "Avatar image"
+            )
+        )
     Context {
         "*Generated on*: \(Date())"
         "*Data source*: Internal systems"
@@ -68,18 +77,4 @@ let message = SlackMessage(
 try await message.send(as: "slack_token")
 ```
 
-#### Supported File Types
-
-- **Images**: JPEG, PNG, GIF
-- **Documents**: PDF, DOC, DOCX, XLS, XLSX, PPT, PPTX
-- **Data**: CSV, JSON, XML, TXT
-- **Archives**: ZIP
-- **Media**: MP4, MOV, MP3, WAV
-
-#### Attachment Types
-
-- **URL-based**: Attach files from web URLs
-- **Data-based**: Attach files from local data (automatically uploaded to Slack)
-- **Images**: Special handling for image attachments with alt text support
-
 > Author: [@havebeenfitz](https://github.com/havebeenfitz)

Sources/Slackito/Models/MessageBlocks.swift

@@ -42,30 +42,46 @@ public struct Header: BlockConvertible {
 /// Markdown text section. Used both inside `FieldsSection` and without it
 public struct MarkdownSection: MarkdownSectionConvertible, BlockConvertible {
     public var json: String {
-        """
-        { "type": "section", "text": { "type": "mrkdwn", "text": "\(markdown)" } }
-        """
+        if let accessory {
+            """
+            { "type": "section", "text": { "type": "mrkdwn", "text": "\(markdown)" } \(accessory.json) }
+            """
+        } else {
+            """
+            { "type": "section", "text": { "type": "mrkdwn", "text": "\(markdown)" } }
+            """
+        }
     }
 
     public let markdown: String
-    
-    public init(_ markdown: String) {
+    public let accessory: ImageAccessory?
+
+    public init(_ markdown: String, accessory: ImageAccessory? = nil) {
         self.markdown = markdown
+        self.accessory = accessory
     }
 }
 
 /// Plain text section, used in the message body to send a simple text
 public struct PlainSection: PlainSectionConvertible & BlockConvertible {
     public var json: String {
-        """
-        { "type": "section", "text": { "type": "plain_text", "text": "\(plainText)" } }
-        """
+        if let accessory {
+            """
+            { "type": "section", "text": { "type": "plain_text", "text": "\(plainText)" } \(accessory.json) }
+            """
+        } else {
+            """
+            { "type": "section", "text": { "type": "plain_text", "text": "\(plainText)" } }
+            """
+        }
     }
 
     public let plainText: String
-    
-    public init(_ plainText: String) {
+    public let accessory: ImageAccessory?
+
+    public init(_ plainText: String, accessory: ImageAccessory? = nil) {
         self.plainText = plainText
+        self.accessory = accessory
     }
 }
 
@@ -91,6 +107,51 @@ public struct FieldsSection: BlockConvertible {
     }
 }
 
+public struct Image: BlockConvertible {
+    public var json: String {
+        """
+            {
+            "type": "image",
+            "title": {
+                "type": "plain_text",
+                "text": "\(text)",
+                "emoji": true
+            },
+            "image_url": "\(url)",
+            "alt_text": "\(text)"
+            }
+        """
+    }
+
+    public let url: String
+    public let text: String
+
+    public init(url: String, text: String) {
+        self.url = url
+        self.text = text
+    }
+}
+
+public struct ImageAccessory {
+    public var json: String {
+        """
+        , "accessory": {
+            "type": "image",
+            "image_url": "\(url)",
+            "alt_text": "\(text)"
+        }
+        """
+    }
+
+    public let url: String
+    public let text: String
+
+    public init(url: String, text: String) {
+        self.url = url
+        self.text = text
+    }
+}
+
 /// Usually used at the bottom of the message to provide some kind of context, e.g. app version or branch
 public struct Context: BlockConvertible {
     public var json: String {

Sources/Slackito/Models/SlackAttachment.swift

@@ -5,131 +5,19 @@ import UniformTypeIdentifiers
 public struct SlackAttachment: Sendable {
     /// The type of attachment
     public let type: AttachmentType
-    /// Optional title for the attachment
-    public let title: String?
-    /// Optional fallback text for the attachment
-    public let fallback: String?
-    /// Optional color for the attachment (hex color code)
-    public let color: String?
-    /// Optional text content for the attachment
     public let text: String?
 
     public init(
         type: AttachmentType,
-        title: String? = nil,
-        fallback: String? = nil,
-        color: String? = nil,
         text: String? = nil
     ) {
         self.type = type
-        self.title = title
-        self.fallback = fallback
-        self.color = color
         self.text = text
     }
-
-    /// JSON representation of the attachment for Slack API
-    public var json: String {
-        var components: [String] = []
-
-        // Add title if present
-        if let title = title {
-            components.append("\"title\": \"\(title)\"")
-        }
-
-        // Add fallback if present
-        if let fallback = fallback {
-            components.append("\"fallback\": \"\(fallback)\"")
-        }
-
-        // Add color if present
-        if let color = color {
-            components.append("\"color\": \"\(color)\"")
-        }
-
-        // Add text if present
-        if let text = text {
-            components.append("\"text\": \"\(text)\"")
-        }
-
-        // Add type-specific fields
-        switch type {
-        case .image(let url, let altText):
-            components.append("\"image_url\": \"\(url)\"")
-            if let altText = altText {
-                components.append("\"alt_text\": \"\(altText)\"")
-            }
-        case .file(let url, let filename, let fileType):
-            components.append("\"file_url\": \"\(url)\"")
-            components.append("\"filename\": \"\(filename)\"")
-            components.append("\"filetype\": \"\(fileType.rawValue)\"")
-        case .fileData(_, let filename, let fileType):
-            components.append("\"filename\": \"\(filename)\"")
-            components.append("\"filetype\": \"\(fileType.rawValue)\"")
-        }
-
-        return "{ \(components.joined(separator: ", ")) }"
-    }
 }
 
 /// Types of attachments supported
 public enum AttachmentType: Sendable {
-    /// Image attachment from URL
-    case image(url: String, altText: String? = nil)
-    /// File attachment from URL
-    case file(url: String, filename: String, fileType: FileType)
     /// File attachment from local data
-    case fileData(data: Data, filename: String, fileType: FileType)
-}
-
-/// Supported file types for attachments
-public enum FileType: String, CaseIterable, Sendable {
-    case csv, pdf, txt, json, xml, zip, jpeg, png, gif, mp4, mov, mp3
-
-    /// MIME type for the file type
-    public var mimeType: String? {
-        switch self {
-        case .csv: UTType.commaSeparatedText.preferredMIMEType
-        case .pdf: UTType.pdf.preferredMIMEType
-        case .txt: UTType.plainText.preferredMIMEType
-        case .json: UTType.json.preferredMIMEType
-        case .xml: UTType.xml.preferredMIMEType
-        case .zip: UTType.zip.preferredMIMEType
-        case .jpeg: UTType.jpeg.preferredMIMEType
-        case .png: UTType.png.preferredMIMEType
-        case .gif: UTType.gif.preferredMIMEType
-        case .mp4: UTType.mpeg4Movie.preferredMIMEType
-        case .mov: UTType.quickTimeMovie.preferredMIMEType
-        case .mp3: UTType.mp3.preferredMIMEType
-        }
-    }
-}
-
-// MARK: - Convenience Initializers
-
-public extension SlackAttachment {
-
-    static func image(url: String, altText: String? = nil, title: String? = nil, fallback: String? = nil) -> SlackAttachment {
-        SlackAttachment(
-            type: .image(url: url, altText: altText),
-            title: title,
-            fallback: fallback
-        )
-    }
-
-    static func file(url: String, filename: String, fileType: FileType, title: String? = nil, fallback: String? = nil) -> SlackAttachment {
-        SlackAttachment(
-            type: .file(url: url, filename: filename, fileType: fileType),
-            title: title,
-            fallback: fallback
-        )
-    }
-
-    static func file(data: Data, filename: String, fileType: FileType, title: String? = nil, fallback: String? = nil) -> SlackAttachment {
-        SlackAttachment(
-            type: .fileData(data: data, filename: filename, fileType: fileType),
-            title: title,
-            fallback: fallback
-        )
-    }
+    case fileData(data: Data, filename: String)
 }

Sources/Slackito/Models/SlackMessage.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Cronista
 
 /// Root slack message entity holding a nested structure of DSL blocks
 @MainActor
@@ -17,18 +18,17 @@ public struct SlackMessage: BlockConvertible {
     let blocks: [BlockConvertible]
     /// File attachments for the message
     let attachments: [SlackAttachment]
-    
+
+    let logger = Cronista(module: "Slackito", category: "SlackMessage")
+
     public var json: String {
-        let blocksJson = blocks.json
-        let attachmentsJson = attachments.isEmpty ? "" : ", \"attachments\": [ \(attachments.map(\.json).joined(separator: ", ")) ]"
-        
         if let ts {
-            return """
-            { "channel": "\(channel)", "thread_ts": "\(ts)", "ts": "\(ts)", "blocks": [ \(blocksJson) ]\(attachmentsJson) }
+            """
+            { "channel": "\(channel)", "thread_ts": "\(ts)", "ts": "\(ts)", "blocks": [ \(blocks.json) ] }
             """
         } else {
-            return """
-            { "channel": "\(channel)", "blocks": [ \(blocksJson) ]\(attachmentsJson) }
+            """
+            { "channel": "\(channel)", "blocks": [ \(blocks.json) ] }
             """
         }
     }