Skip to content
This repository was archived by the owner on Dec 2, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions SKCore/Sources/Extensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,3 @@ public extension Dictionary where Key == String, Value == Any {
}
}
}

public func filterNilParameters(_ parameters: [String: Any?]) -> [String: Any] {
var finalParameters = [String: Any]()
for (key, value) in parameters {
if let unwrapped = value {
finalParameters[key] = unwrapped
}
}
return finalParameters
}
2 changes: 1 addition & 1 deletion SKRTMAPI/Sources/SKRTMAPI.swift
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public final class SKRTMAPI: RTMDelegate {
"broadcastReply": broadcastReply
]
guard
let data = try? JSONSerialization.data(withJSONObject: filterNilParameters(json), options: []),
let data = try? JSONSerialization.data(withJSONObject: json.compactMapValues({$0}), options: []),
let str = String(data: data, encoding: String.Encoding.utf8)
else {
throw SlackError.clientJSONError
Expand Down
2 changes: 1 addition & 1 deletion SKWebAPI/Sources/NetworkInterface.swift
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public struct NetworkInterface {
private func requestURL(for endpoint: Endpoint, parameters: [String: Any?]) -> URL? {
var components = URLComponents(string: "\(apiUrl)\(endpoint.rawValue)")
if parameters.count > 0 {
components?.queryItems = filterNilParameters(parameters).map { URLQueryItem(name: $0.0, value: "\($0.1)") }
components?.queryItems = parameters.compactMapValues({$0}).map { URLQueryItem(name: $0.0, value: "\($0.1)") }
}

// As discussed http://www.openradar.me/24076063 and https://stackoverflow.com/a/37314144/407523, Apple considers
Expand Down
2 changes: 1 addition & 1 deletion SKWebAPI/Sources/WebAPI.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ extension WebAPI {
"types": types?.map({ $0.rawValue }).joined(separator: ","),
"user": userID
]
networkInterface.request(.usersConversations, parameters: parameters.compactMapValues({$0}), successClosure: {(response) in
networkInterface.request(.usersConversations, parameters: parameters, successClosure: {(response) in
let channels: [Channel] = (response["channels"] as? [[String: Any]])?.map{Channel(channel: $0)} ?? []
success?(channels, (response["response_metadata"] as? [String: Any])?["next_cursor"] as? String)
}) {(error) in
Expand Down