From 5921376382831a06434dc7b56248e7830670c59c Mon Sep 17 00:00:00 2001 From: Lux <135403604+Spl0itable@users.noreply.github.com> Date: Tue, 1 Oct 2024 13:15:36 +0930 Subject: [PATCH 1/2] Added NostrMedia.com --- damus/Models/MediaUploader.swift | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/damus/Models/MediaUploader.swift b/damus/Models/MediaUploader.swift index 987f12433..c657b8e66 100644 --- a/damus/Models/MediaUploader.swift +++ b/damus/Models/MediaUploader.swift @@ -11,6 +11,7 @@ enum MediaUploader: String, CaseIterable, Identifiable, StringCodable { var id: String { self.rawValue } case nostrBuild case nostrcheck + case nostrMedia // New case for nostrMedia init?(from string: String) { guard let mu = MediaUploader(rawValue: string) else { @@ -35,9 +36,7 @@ enum MediaUploader: String, CaseIterable, Identifiable, StringCodable { var supportsVideo: Bool { switch self { - case .nostrBuild: - return true - case .nostrcheck: + case .nostrBuild, .nostrcheck, .nostrMedia: return true } } @@ -55,6 +54,8 @@ enum MediaUploader: String, CaseIterable, Identifiable, StringCodable { return .init(index: -1, tag: "nostrBuild", displayName: "nostr.build") case .nostrcheck: return .init(index: 0, tag: "nostrcheck", displayName: "nostrcheck.me") + case .nostrMedia: + return .init(index: 1, tag: "nostrMedia", displayName: "NostrMedia.com") } } @@ -64,6 +65,8 @@ enum MediaUploader: String, CaseIterable, Identifiable, StringCodable { return "https://nostr.build/api/v2/nip96/upload" case .nostrcheck: return "https://nostrcheck.me/api/v2/media" + case .nostrMedia: + return "https://nostrmedia.com/upload" } } From bf60df50840ac02ebd7542a19ffc458839cae7c8 Mon Sep 17 00:00:00 2001 From: Lux <135403604+Spl0itable@users.noreply.github.com> Date: Tue, 1 Oct 2024 13:19:14 +0930 Subject: [PATCH 2/2] Added NostrMedia.com --- damus/Views/AttachMediaUtility.swift | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/damus/Views/AttachMediaUtility.swift b/damus/Views/AttachMediaUtility.swift index 668623028..31688dcd1 100644 --- a/damus/Views/AttachMediaUtility.swift +++ b/damus/Views/AttachMediaUtility.swift @@ -16,38 +16,38 @@ enum ImageUploadResult { } fileprivate func create_upload_body(mediaData: Data, boundary: String, mediaUploader: MediaUploader, mediaToUpload: MediaUpload) -> Data { - let body = NSMutableData(); - let contentType = mediaToUpload.mime_type - body.appendString(string: "Content-Type: multipart/form-data; boundary=\(boundary)\r\n\r\n") - body.appendString(string: "--\(boundary)\r\n") - body.appendString(string: "Content-Disposition: form-data; name=\(mediaUploader.nameParam); filename=\(mediaToUpload.genericFileName)\r\n") - body.appendString(string: "Content-Type: \(contentType)\r\n\r\n") - body.append(mediaData as Data) - body.appendString(string: "\r\n") - body.appendString(string: "--\(boundary)--\r\n") - return body as Data - } + let body = NSMutableData() + let contentType = mediaToUpload.mime_type + body.appendString(string: "Content-Type: multipart/form-data; boundary=\(boundary)\r\n\r\n") + body.appendString(string: "--\(boundary)\r\n") + body.appendString(string: "Content-Disposition: form-data; name=\(mediaUploader.nameParam); filename=\(mediaToUpload.genericFileName)\r\n") + body.appendString(string: "Content-Type: \(contentType)\r\n\r\n") + body.append(mediaData as Data) + body.appendString(string: "\r\n") + body.appendString(string: "--\(boundary)--\r\n") + return body as Data +} func create_upload_request(mediaToUpload: MediaUpload, mediaUploader: MediaUploader, progress: URLSessionTaskDelegate, keypair: Keypair? = nil) async -> ImageUploadResult { var mediaData: Data? guard let url = URL(string: mediaUploader.postAPI) else { return .failed(nil) } - + var request = URLRequest(url: url) - request.httpMethod = "POST"; + request.httpMethod = "POST" let boundary = "Boundary-\(UUID().description)" request.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type") - - // If uploading to a media host that support NIP-98 authorization, add the header - if mediaUploader == .nostrBuild || mediaUploader == .nostrcheck, + + // If uploading to a media host that supports NIP-98 authorization, add the header + if mediaUploader == .nostrBuild || mediaUploader == .nostrcheck || mediaUploader == .nostrMedia, let keypair, - let method = request.httpMethod, - let signature = create_nip98_signature(keypair: keypair, method: method, url: url) { + let method = request.httpMethod, + let signature = create_nip98_signature(keypair: keypair, method: method, url: url) { - request.setValue(signature, forHTTPHeaderField: "Authorization") + request.setValue(signature, forHTTPHeaderField: "Authorization") } - + switch mediaToUpload { case .image(let url): do { @@ -68,7 +68,7 @@ func create_upload_request(mediaToUpload: MediaUpload, mediaUploader: MediaUploa } request.httpBody = create_upload_body(mediaData: mediaData, boundary: boundary, mediaUploader: mediaUploader, mediaToUpload: mediaToUpload) - + do { let (data, _) = try await URLSession.shared.data(for: request, delegate: progress) @@ -76,9 +76,9 @@ func create_upload_request(mediaToUpload: MediaUpload, mediaUploader: MediaUploa print("Upload failed getting media url") return .failed(nil) } - + return .success(url) - + } catch { return .failed(error) }