Skip to content
Snippets Groups Projects
Verified Commit 9831316d authored by Spotlight Deveaux's avatar Spotlight Deveaux :fox:
Browse files

Better nil handling

parent aedfcf10
No related branches found
No related tags found
No related merge requests found
...@@ -19,7 +19,7 @@ class PomfManager { ...@@ -19,7 +19,7 @@ class PomfManager {
let userInfo: [AnyHashable : Any] = [ let userInfo: [AnyHashable : Any] = [
NSLocalizedDescriptionKey : NSLocalizedString("Unsuccessful", value: "Go to Settings and enter a Pomf upload url.", comment: "") , NSLocalizedDescriptionKey : NSLocalizedString("Unsuccessful", value: "Go to Settings and enter a Pomf upload url.", comment: "") ,
] ]
completionHandler(NSError(domain: "PomfErrorDomain", code: 1, userInfo: userInfo as? [String : Any]), "https://google.com") completionHandler(NSError(domain: "PomfErrorDomain", code: 1, userInfo: userInfo as? [String : Any]), "https://whats-th.is")
return return
} }
...@@ -49,27 +49,37 @@ class PomfManager { ...@@ -49,27 +49,37 @@ class PomfManager {
let description : String = parsedData["description"] as! String let description : String = parsedData["description"] as! String
let userInfo: [AnyHashable : Any] = [ let userInfo: [AnyHashable : Any] = [
NSLocalizedDescriptionKey : NSLocalizedString("Unsuccessful", value: description, comment: "") , NSLocalizedDescriptionKey : NSLocalizedString("Unsuccessful", value: description, comment: "") ,
NSLocalizedFailureReasonErrorKey : NSLocalizedString("Unsuccessful", value: description, comment: "") ]
]
let errorCode : Int = parsedData["errorcode"] as! Int let errorCode : Int = parsedData["errorcode"] as! Int
completionHandler(NSError(domain: "PomfErrorDomain", code: errorCode, userInfo: userInfo as? [String : Any]), "https://google.com") completionHandler(NSError(domain: "PomfErrorDomain", code: errorCode, userInfo: userInfo as? [String : Any]), "https://whats-th.is")
return return
} }
// Attempt to get information returned over the uploaded file. // Attempt to get information returned over the uploaded file.
let test : [NSDictionary] = parsedData["files"] as! [NSDictionary] let test = parsedData["files"] as! [NSDictionary]
let furtherTest : NSDictionary = test[0] if let fileName : String = test[0]["url"] as? String {
// https://discord.coffee/c58cec.png if let pomfBaseDomain = defaults.string(forKey: "pomfBaseDomain") {
let fileName = furtherTest.object(forKey: "url") as! String? ?? "c58cec.png" completionHandler(nil, "\(pomfBaseDomain)!)/\(fileName)")
completionHandler(nil, "\(defaults.string(forKey: "pomfBaseDomain")!)/\(fileName)" ) } else {
let userInfo: [AnyHashable : Any] = [
NSLocalizedDescriptionKey : NSLocalizedString("Unsuccessful", value: "Go to Settings and enter a Pomf base domain.", comment: "") ,
]
completionHandler(NSError(domain: "PomfErrorDomain", code: 2, userInfo: userInfo as? [String : Any]), "https://whats-th.is")
}
} else {
let userInfo: [AnyHashable : Any] = [
NSLocalizedDescriptionKey : NSLocalizedString("Unsuccessful", value: "Could not parse returned filename.", comment: "") ,
]
completionHandler(NSError(domain: "PomfErrorDomain", code: 3, userInfo: userInfo as? [String : Any]), "https://whats-th.is")
}
} }
} }
case .failure(let encodingError): case .failure(let encodingError):
print(encodingError) print(encodingError)
completionHandler(encodingError, "https://google.com/") completionHandler(encodingError, "https://whats-th.is")
} }
} }
) )
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment