Skip to content
This repository was archived by the owner on Jan 28, 2019. It is now read-only.

Commit c1b6169

Browse files
authored
Merge pull request #8 from SlackKit/rename
Rename url to requestURL
2 parents 696fae3 + 945c6c0 commit c1b6169

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Sources/NetworkInterface.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public struct NetworkInterface {
4040
successClosure: @escaping ([String: Any]) -> Void,
4141
errorClosure: @escaping (SlackError) -> Void
4242
) {
43-
guard let url = self.url(for: endpoint, parameters: parameters) else {
43+
guard let url = requestURL(for: endpoint, parameters: parameters) else {
4444
errorClosure(SlackError.clientNetworkError)
4545
return
4646
}
@@ -57,7 +57,7 @@ public struct NetworkInterface {
5757

5858
//Adapted from https://gist.github.com/erica/baa8a187a5b4796dab27
5959
internal func synchronusRequest(_ endpoint: Endpoint, parameters: [String: Any?]) -> [String: Any]? {
60-
guard let url = self.url(for: endpoint, parameters: parameters) else {
60+
guard let url = requestURL(for: endpoint, parameters: parameters) else {
6161
return nil
6262
}
6363
let request = URLRequest(url: url)
@@ -107,7 +107,7 @@ public struct NetworkInterface {
107107
successClosure: @escaping ([String: Any]) -> Void, errorClosure: @escaping (SlackError) -> Void
108108
) {
109109
guard
110-
let url = self.url(for: Endpoint.filesUpload, parameters: parameters),
110+
let url = requestURL(for: .filesUpload, parameters: parameters),
111111
let filename = parameters["filename"] as? String,
112112
let filetype = parameters["filetype"] as? String
113113
else {
@@ -164,7 +164,7 @@ public struct NetworkInterface {
164164
}
165165
}
166166

167-
private func url(for endpoint: Endpoint, parameters: [String: Any?]) -> URL? {
167+
private func requestURL(for endpoint: Endpoint, parameters: [String: Any?]) -> URL? {
168168
var components = URLComponents(string: "\(apiUrl)\(endpoint.rawValue)")
169169
if parameters.count > 0 {
170170
components?.queryItems = filterNilParameters(parameters).map { URLQueryItem(name: $0.0, value: "\($0.1)") }

0 commit comments

Comments
 (0)