Fix not being able to share images from Shortcuts actions that have public.image and public.file-url representations

Closes #420

Packages/ComposeUI/Sources/ComposeUI/API/PostService.swift

@@ -77,7 +77,8 @@ class PostService: ObservableObject {
                 pollOptions: draft.poll?.pollOptions.map(\.text),
                 pollExpiresIn: draft.poll == nil ? nil : Int(draft.poll!.duration),
                 pollMultiple: draft.poll?.multiple,
-                localOnly: mastodonController.instanceFeatures.localOnlyPosts ? draft.localOnly : nil
+                localOnly: mastodonController.instanceFeatures.localOnlyPosts ? draft.localOnly : nil,
+                idempotencyKey: draft.id.uuidString
             )
         }
         

Packages/Pachyderm/Sources/Pachyderm/Client.swift

@@ -113,6 +113,9 @@ public class Client {
         var urlRequest = URLRequest(url: url, timeoutInterval: timeoutInterval)
         urlRequest.httpMethod = request.method.name
         urlRequest.httpBody = request.body.data
+        for (name, value) in request.headers {
+            urlRequest.setValue(value, forHTTPHeaderField: name)
+        }
         if let mimeType = request.body.mimeType {
             urlRequest.setValue(mimeType, forHTTPHeaderField: "Content-Type")
         }
@@ -397,19 +400,22 @@ public class Client {
                                     pollOptions: [String]? = nil,
                                     pollExpiresIn: Int? = nil,
                                     pollMultiple: Bool? = nil,
-                                    localOnly: Bool? = nil /* hometown only, not glitch */) -> Request<Status> {
+                                    localOnly: Bool? = nil, /* hometown only, not glitch */
-        return Request<Status>(method: .post, path: "/api/v1/statuses", body: ParametersBody([
+                                    idempotencyKey: String) -> Request<Status> {
-                "status" => text,
+        var req = Request<Status>(method: .post, path: "/api/v1/statuses", body: ParametersBody([
-                "content_type" => contentType.mimeType,
+            "status" => text,
-                "in_reply_to_id" => inReplyTo,
+            "content_type" => contentType.mimeType,
-                "sensitive" => sensitive,
+            "in_reply_to_id" => inReplyTo,
-                "spoiler_text" => spoilerText,
+            "sensitive" => sensitive,
-                "visibility" => visibility?.rawValue,
+            "spoiler_text" => spoilerText,
-                "language" => language,
+            "visibility" => visibility?.rawValue,
-                "poll[expires_in]" => pollExpiresIn,
+            "language" => language,
-                "poll[multiple]" => pollMultiple,
+            "poll[expires_in]" => pollExpiresIn,
-                "local_only" => localOnly,
+            "poll[multiple]" => pollMultiple,
-            ] + "media_ids" => mediaIDs + "poll[options]" => pollOptions))
+            "local_only" => localOnly,
+        ] + "media_ids" => mediaIDs + "poll[options]" => pollOptions))
+        req.headers["Idempotency-Key"] = idempotencyKey
+        return req
     }
     
     public static func editStatus(

Packages/Pachyderm/Sources/Pachyderm/Request/Request.swift

@@ -13,6 +13,7 @@ public struct Request<ResultType: Decodable>: Sendable {
     let endpoint: Endpoint
     let body: Body
     var queryParameters: [Parameter]
+    var headers: [String: String] = [:]
     var additionalAcceptableHTTPCodes: [Int] = []
     
     init(method: Method, path: Endpoint, body: Body = EmptyBody(), queryParameters: [Parameter] = []) {

ShareExtension/ShareViewController.swift

@@ -79,7 +79,14 @@ class ShareViewController: UIViewController {
         var attachments: [DraftAttachment] = []
         
         for itemProvider in inputItem.attachments ?? [] {
-            if let attached: NSURL = await getObject(from: itemProvider) {
+            // attachments have the highest priority, but only given this heuristic
+            // otherwise attachment decoding ends up being overzealous
+            let likelyAttachment = [UTType.image, .movie].contains(where: { itemProvider.hasItemConformingToTypeIdentifier($0.identifier) })
+            
+            if likelyAttachment,
+               let attachment: DraftAttachment = await getObject(from: itemProvider) {
+                attachments.append(attachment)
+            } else if let attached: NSURL = await getObject(from: itemProvider) {
                 if url == nil {
                     url = attached as URL
                 }
@@ -87,8 +94,6 @@ class ShareViewController: UIViewController {
                 if text.isEmpty {
                     text = s as String
                 }
-            } else if let attachment: DraftAttachment = await getObject(from: itemProvider) {
-                attachments.append(attachment)
             }
         }