Merge pull request #65 from pvzig/minor-updates

Code styling

README.md

@@ -1,6 +1,6 @@
 ![SlackKit](https://cloud.githubusercontent.com/assets/8311605/10260893/5ec60f96-694e-11e5-91fd-da6845942201.png)
 
-![Swift Version](https://img.shields.io/badge/Swift-3.0-orange.svg) ![Plaforms](https://img.shields.io/badge/Platforms-macOS,iOS,tvOS-lightgrey.svg) ![License MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg) [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg)](https://github.com/Carthage/Carthage) 
+![Swift Version](https://img.shields.io/badge/Swift-3.0-orange.svg) ![Plaforms](https://img.shields.io/badge/Platforms-macOS,iOS,tvOS-lightgrey.svg) ![License MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg) [![CocoaPods compatible](https://img.shields.io/badge/CocoaPods-compatible-brightgreen.svg)](https://cocoapods.org) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg)](https://github.com/Carthage/Carthage) [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
 ## SlackKit: A Swift Slack Client Library
 ### Description
 
@@ -18,11 +18,11 @@ To build the SlackKit project directly, first build the dependencies using Carth
 Add SlackKit to your pod file:
 ```
 use_frameworks!
-pod 'SlackKit', '~> 3.1.2'
+pod 'SlackKit', '~> 3.1.5'
 ```
 and run
 ```
-# Use CocoaPods version >= 1.1.0.rc.2 (gem install cocoapods --pre)
+# Use CocoaPods version >= 1.1.0
 pod install
 ```
 
@@ -36,10 +36,7 @@ and run
 ```
 carthage bootstrap
 ```
-**Note:** SlackKit currently takes a _long_ time for the compiler to compile with optimizations turned on. I'm currently exploring a potential fix for this issue. In the meantime, you may want to skip the waiting and build it in the debug configuration instead:
-```
-carthage bootstrap --configuration "Debug"
-```
+**Note:** If you’re seeing long compile times with optimizations turned on, try updating to the latest version of Xcode, 8.2.1.
 
 Drag the built `SlackKit.framework` into your Xcode project.
 
@@ -88,7 +85,7 @@ incoming.postMessage(message)
 #### Slash Commands
 After [configuring your slash command in Slack](https://my.slack.com/services/new/slash-commands) (you can also provide slash commands as part of a [Slack App](https://api.slack.com/slack-apps)), initialize a webhook server with the token for the slash command, a configured route, and a response.
 ```swift
-let response = Response(text: "Hello, World!", responseType: .InChannel)
+let response = Response(text: "Hello, World!", responseType: .inChannel)
 let webhook = WebhookServer(token: "SLASH-COMMAND-TOKEN", route: "hello_world", response: response)
 webhook.start()
 ```
@@ -111,7 +108,7 @@ let attachment = Attachment(fallback: "Hello World Attachment", title: "Attachme
 To act on message actions, initialize an instance of the `MessageActionServer` using your app’s verification token, your specified interactive messages request URL route, and a `MessageActionResponder`:
 ```swift
 let action = Action(name: "hello_world", text: "Hello, World!")
-let response = Response(text: "Hello, 🌎!", responseType: .InChannel)
+let response = Response(text: "Hello, 🌎!", responseType: .inChannel)
 let responder = MessageActionResponder(responses: [(action, response)])
 let server = MessageActionServer(token: "SLACK-APP-VERIFICATION-TOKEN", route: "actions", responder: responder)
 server.start()

SlackKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "SlackKit"
-  s.version          = "3.1.2"
+  s.version          = "3.1.5"
   s.summary          = "a Slack client library for OS X, iOS, and tvOS written in Swift"
   s.homepage         = "https://github.com/pvzig/SlackKit"
   s.license          = 'MIT'

SlackKit/Sources/Action.swift

@@ -39,7 +39,7 @@ public struct Action {
         confirm = Confirm(confirm:action?["confirm"] as? [String: Any])
     }
     
-    public init(name: String, text: String, style: ActionStyle = .Default, value: String? = nil, confirm: Confirm? = nil) {
+    public init(name: String, text: String, style: ActionStyle = .defaultStyle, value: String? = nil, confirm: Confirm? = nil) {
         self.type = "button"
         self.name = name
         self.text = text
@@ -92,12 +92,12 @@ public struct Action {
 }
 
 public enum ActionStyle: String {
-    case Default = "default"
-    case Primary = "primary"
-    case Danger = "danger"
+    case defaultStyle = "default"
+    case primary = "primary"
+    case danger = "danger"
 }
 
 public enum ResponseType: String {
-    case InChannel = "in_channel"
-    case Ephemeral = "ephemeral"
+    case inChannel = "in_channel"
+    case ephemeral = "ephemeral"
 }

SlackKit/Sources/Attachment.swift

@@ -109,7 +109,7 @@ public struct Attachment {
 }
 
 public enum AttachmentColor: String {
-    case Good = "good"
-    case Warning = "warning"
-    case Danger = "danger"
+    case good = "good"
+    case warning = "warning"
+    case danger = "danger"
 }

SlackKit/Sources/Client.swift

@@ -44,7 +44,7 @@ public final class Client: WebSocketDelegate {
     }
 
     internal var webSocket: WebSocket?
-    fileprivate let pingPongQueue = DispatchQueue(label: "com.launchsoft.SlackKit")
+    private let pingPongQueue = DispatchQueue(label: "com.launchsoft.SlackKit")
     internal var ping: Double?
     internal var pong: Double?
     internal var options: ClientOptions?
@@ -101,7 +101,7 @@ public final class Client: WebSocketDelegate {
         }
     }
     
-    fileprivate func format(message: String, channel: String) throws -> Data {
+    private func format(message: String, channel: String) throws -> Data {
         let json: [String: Any] = [
             "id": Date().slackTimestamp,
             "type": "message",
@@ -112,7 +112,7 @@ public final class Client: WebSocketDelegate {
         return try JSONSerialization.data(withJSONObject: json, options: [])
     }
     
-    fileprivate func addSentMessage(_ dictionary: [String: Any]) {
+    private func addSentMessage(_ dictionary: [String: Any]) {
         var message = dictionary
         guard let id = message["id"] as? NSNumber else {
             return
@@ -125,7 +125,7 @@ public final class Client: WebSocketDelegate {
     }
     
     //MARK: - RTM Ping
-    fileprivate func pingRTMServerAt(interval: TimeInterval) {
+    private func pingRTMServerAt(interval: TimeInterval) {
         let delay = DispatchTime.now() + Double(Int64(interval * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)
         pingPongQueue.asyncAfter(deadline: delay, execute: {
             guard self.connected && self.timeoutCheck() else {
@@ -137,7 +137,7 @@ public final class Client: WebSocketDelegate {
         })
     }
     
-    fileprivate func sendRTMPing() {
+    private func sendRTMPing() {
         guard connected else {
             return
         }
@@ -154,7 +154,7 @@ public final class Client: WebSocketDelegate {
         }
     }
     
-    fileprivate func timeoutCheck() -> Bool {
+    private func timeoutCheck() -> Bool {
         if let pong = pong, let ping = ping, let timeout = options?.timeout {
             if pong - ping < timeout {
                 return true
@@ -168,7 +168,7 @@ public final class Client: WebSocketDelegate {
     }
     
     //MARK: - Client setup
-    fileprivate func initialSetup(JSON: [String: Any]) {
+    private func initialSetup(JSON: [String: Any]) {
         team = Team(team: JSON["team"] as? [String: Any])
         authenticatedUser = User(user: JSON["self"] as? [String: Any])
         authenticatedUser?.doNotDisturbStatus = DoNotDisturbStatus(status: JSON["dnd"] as? [String: Any])
@@ -181,28 +181,28 @@ public final class Client: WebSocketDelegate {
         enumerateSubteams(JSON["subteams"] as? [String: Any])
     }
     
-    fileprivate func addUser(_ aUser: [String: Any]) {
+    private func addUser(_ aUser: [String: Any]) {
         let user = User(user: aUser)
         if let id = user.id {
             users[id] = user
         }
     }
     
-    fileprivate func addChannel(_ aChannel: [String: Any]) {
+    private func addChannel(_ aChannel: [String: Any]) {
         let channel = Channel(channel: aChannel)
         if let id = channel.id {
             channels[id] = channel
         }
     }
     
-    fileprivate func addBot(_ aBot: [String: Any]) {
+    private func addBot(_ aBot: [String: Any]) {
         let bot = Bot(bot: aBot)
         if let id = bot.id {
             bots[id] = bot
         }
     }
     
-    fileprivate func enumerateSubteams(_ subteams: [String: Any]?) {
+    private func enumerateSubteams(_ subteams: [String: Any]?) {
         if let subteams = subteams {
             if let all = subteams["all"] as? [[String: Any]] {
                 for item in all {
@@ -222,7 +222,7 @@ public final class Client: WebSocketDelegate {
     }
     
     // MARK: - Utilities
-    fileprivate func enumerateObjects(_ array: [Any]?, initalizer: ([String: Any])-> Void) {
+    private func enumerateObjects(_ array: [Any]?, initalizer: ([String: Any])-> Void) {
         if let array = array {
             for object in array {
                 if let dictionary = object as? [String: Any] {

SlackKit/Sources/IncomingWebhook.swift

@@ -60,7 +60,7 @@ public struct IncomingWebhook {
         }
     }
     
-    fileprivate func jsonBody(_ response: [String: Any]) -> [String: Any] {
+    private func jsonBody(_ response: [String: Any]) -> [String: Any] {
         var json = response
         json["channel"] = channel
         json["username"] = username

SlackKit/Sources/NetworkInterface.swift

@@ -41,8 +41,7 @@ internal struct NetworkInterface {
         }
         let request = URLRequest(url:url)
     
-        URLSession.shared.dataTask(with: request) {
-            (data, response, internalError) -> Void in
+        URLSession.shared.dataTask(with: request) {(data, response, internalError) in
             do {
                 successClosure(try self.handleResponse(data, response: response, internalError: internalError))
             } catch let error {
@@ -62,8 +61,7 @@ internal struct NetworkInterface {
         request.setValue(contentType, forHTTPHeaderField: "Content-Type")
         request.httpBody = data
         
-        URLSession.shared.dataTask(with: request) {
-            (data, response, internalError) -> Void in
+        URLSession.shared.dataTask(with: request) {(data, response, internalError) in
             if internalError == nil {
                 success(true)
             } else {
@@ -101,8 +99,7 @@ internal struct NetworkInterface {
         request.setValue(contentType, forHTTPHeaderField: "Content-Type")
         request.httpBody = requestBodyData as Data
 
-        URLSession.shared.dataTask(with: request) {
-            (data, response, internalError) -> Void in
+        URLSession.shared.dataTask(with: request) {(data, response, internalError) in
             do {
                 successClosure(try self.handleResponse(data, response: response, internalError: internalError))
             } catch let error {

SlackKit/Sources/OAuthServer.swift

@@ -30,14 +30,14 @@ internal protocol OAuthDelegate {
 
 public struct OAuthServer {
     
-    fileprivate let oauthURL = "https://slack.com/oauth/authorize"
+    private let oauthURL = "https://slack.com/oauth/authorize"
 
-    fileprivate let http = HttpServer()
-    fileprivate let clientID: String
-    fileprivate let clientSecret: String
-    fileprivate let state: String?
-    fileprivate let redirectURI: String?
-    fileprivate var delegate: OAuthDelegate?
+    private let http = HttpServer()
+    private let clientID: String
+    private let clientSecret: String
+    private let state: String?
+    private let redirectURI: String?
+    private var delegate: OAuthDelegate?
     
     internal init(clientID: String, clientSecret: String, state: String? = nil, redirectURI: String? = nil, port:in_port_t = 8080, forceIPV4: Bool = false, delegate: OAuthDelegate? = nil) throws {
         self.clientID = clientID
@@ -61,7 +61,7 @@ public struct OAuthServer {
         http.stop()
     }
     
-    fileprivate func oauthRoute() {
+    private func oauthRoute() {
         http["/oauth"] = { request in
             guard let response = AuthorizeResponse(queryParameters: request.queryParams), response.state == self.state else {
                 return .badRequest(.text("Bad request."))
@@ -78,7 +78,7 @@ public struct OAuthServer {
         }
     }
     
-    fileprivate func oauthURLRequest(_ authorize: AuthorizeRequest) -> URLRequest? {
+    private func oauthURLRequest(_ authorize: AuthorizeRequest) -> URLRequest? {
         var requestString = "\(oauthURL)?client_id=\(authorize.clientID)"
         requestString += authorize.parameters.requestStringFromParameters
         guard let url = URL(string: requestString) else {

SlackKit/Sources/SlackKit.swift

@@ -27,7 +27,7 @@ public final class SlackKit: OAuthDelegate {
     
     internal(set) public var oauth: OAuthServer?
     internal(set) public var clients: [String: Client] = [:]
-    fileprivate let clientOptions: ClientOptions
+    private let clientOptions: ClientOptions
     // Initalization block
     public var onClientInitalization: ((Client) -> Void)?
     

SlackKit/Sources/WebAPI.swift

@@ -102,14 +102,14 @@ public final class WebAPI {
         case away = "away"
     }
     
-    fileprivate enum ChannelType: String {
+    private enum ChannelType: String {
         case channel = "channel"
         case group = "group"
         case im = "im"
     }
     
-    fileprivate let networkInterface: NetworkInterface
-    fileprivate let token: String
+    private let networkInterface: NetworkInterface
+    private let token: String
 
     public init(token: String) {
         self.networkInterface = NetworkInterface()
@@ -119,628 +119,567 @@ public final class WebAPI {
     //MARK: - RTM
     public func rtmStart(_ simpleLatest: Bool? = nil, noUnreads: Bool? = nil, mpimAware: Bool? = nil, success: ((_ response: [String: Any])->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any?] = ["simple_latest": simpleLatest, "no_unreads": noUnreads, "mpim_aware": mpimAware]
-        networkInterface.request(.rtmStart, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-                (response) -> Void in
-                success?(response)
-            }) {(error) -> Void in
-                failure?(error)
-            }
+        networkInterface.request(.rtmStart, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {(response) in
+            success?(response)
+        }) {(error) in
+            failure?(error)
+        }
     }
     
     //MARK: - Auth
     public func authenticationTest(_ success: ((_ authenticated: Bool)->Void)?, failure: FailureClosure?) {
-        networkInterface.request(.authTest, token: token, parameters: nil, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.authTest, token: token, parameters: nil, successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public static func oauthAccess(_ clientID: String, clientSecret: String, code: String, redirectURI: String? = nil, success: ((_ response: [String: Any])->Void)?, failure: ((SlackError)->Void)?) {
         let parameters: [String: Any?] = ["client_id": clientID, "client_secret": clientSecret, "code": code, "redirect_uri": redirectURI]
-        NetworkInterface().request(.oauthAccess, parameters: filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
+        NetworkInterface().request(.oauthAccess, parameters: filterNilParameters(parameters), successClosure: {(response) in
             success?(response)
-        }) {(error) -> Void in
+        }) {(error) in
             failure?(error)
         }
     }
     
     public static func oauthRevoke(_ token: String, test: Bool? = nil, success: ((_ revoked:Bool)->Void)?, failure: ((SlackError)->Void)?) {
         let parameters: [String: Any?] = ["token": token, "test": test]
-        NetworkInterface().request(.authRevoke, parameters: filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
+        NetworkInterface().request(.authRevoke, parameters: filterNilParameters(parameters), successClosure: {(response) in
             success?(true)
-        }) {(error) -> Void in
+        }) {(error) in
             failure?(error)
         }
     }
     
     //MARK: - Channels
     public func channelHistory(_ id: String, latest: String = "\(Date().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((_ history: History)->Void)?, failure: FailureClosure?) {
-        history(.channelsHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {
-            (history) -> Void in
-                success?(history)
-            }) {(error) -> Void in
-                failure?(error)
+        history(.channelsHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {(history) in
+            success?(history)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func channelInfo(_ id: String, success: ((_ channel: Channel)->Void)?, failure: FailureClosure?) {
-        info(.channelsInfo, type:.channel, id: id, success: {
-            (channel) -> Void in
-                success?(channel)
-            }) { (error) -> Void in
-                failure?(error)
+        info(.channelsInfo, type:.channel, id: id, success: {(channel) in
+            success?(channel)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func channelsList(_ excludeArchived: Bool = false, success: ((_ channels: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
-        list(.channelsList, type:.channel, excludeArchived: excludeArchived, success: {
-            (channels) -> Void in
-                success?(channels)
-            }) {(error) -> Void in
-                failure?(error)
+        list(.channelsList, type:.channel, excludeArchived: excludeArchived, success: {(channels) in
+            success?(channels)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func markChannel(_ channel: String, timestamp: String, success: ((_ ts: String)->Void)?, failure: FailureClosure?) {
-        mark(.channelsMark, channel: channel, timestamp: timestamp, success: {
-            (ts) -> Void in
-                success?(timestamp)
-            }) {(error) -> Void in
-                failure?(error)
+        mark(.channelsMark, channel: channel, timestamp: timestamp, success: {(ts) in
+            success?(timestamp)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func setChannelPurpose(_ channel: String, purpose: String, success: ((_ purposeSet: Bool)->Void)?, failure: FailureClosure?) {
-        setInfo(.channelsSetPurpose, type: .purpose, channel: channel, text: purpose, success: {
-            (purposeSet) -> Void in
-                success?(purposeSet)
-            }) { (error) -> Void in
-                failure?(error)
+        setInfo(.channelsSetPurpose, type: .purpose, channel: channel, text: purpose, success: {(purposeSet) in
+            success?(purposeSet)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func setChannelTopic(_ channel: String, topic: String, success: ((_ topicSet: Bool)->Void)?, failure: FailureClosure?) {
-        setInfo(.channelsSetTopic, type: .topic, channel: channel, text: topic, success: {
-            (topicSet) -> Void in
-                success?(topicSet)
-            }) {(error) -> Void in
-                failure?(error)
+        setInfo(.channelsSetTopic, type: .topic, channel: channel, text: topic, success: {(topicSet) in
+            success?(topicSet)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - Messaging
     public func deleteMessage(_ channel: String, ts: String, success: ((_ deleted: Bool)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["channel": channel, "ts": ts]
-        networkInterface.request(.chatDelete, token: token, parameters: parameters, successClosure: { (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.chatDelete, token: token, parameters: parameters, successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func sendMessage(_ channel: String, text: String, username: String? = nil, asUser: Bool? = nil, parse: ParseMode? = nil, linkNames: Bool? = nil, attachments: [Attachment?]? = nil, unfurlLinks: Bool? = nil, unfurlMedia: Bool? = nil, iconURL: String? = nil, iconEmoji: String? = nil, success: (((ts: String?, channel: String?))->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any?] = ["channel": channel, "text": text.slackFormatEscaping, "as_user": asUser, "parse": parse?.rawValue, "link_names": linkNames, "unfurl_links": unfurlLinks, "unfurlMedia": unfurlMedia, "username": username, "icon_url": iconURL, "icon_emoji": iconEmoji, "attachments": encodeAttachments(attachments)]
-        networkInterface.request(.chatPostMessage, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?((ts: response["ts"] as? String, response["channel"] as? String))
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.chatPostMessage, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {(response) in
+            success?((ts: response["ts"] as? String, response["channel"] as? String))
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func sendMeMessage(_ channel: String, text: String, success: (((ts: String?, channel: String?))->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any?] = ["channel": channel, "text": text.slackFormatEscaping]
-        networkInterface.request(.chatMeMessage, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
+        networkInterface.request(.chatMeMessage, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {(response) in
             success?((ts: response["ts"] as? String, response["channel"] as? String))
-        }) {(error) -> Void in
+        }) {(error) in
             failure?(error)
         }
     }
     
     public func updateMessage(_ channel: String, ts: String, message: String, attachments: [Attachment?]? = nil, parse:ParseMode = .none, linkNames: Bool = false, success: ((_ updated: Bool)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any?] = ["channel": channel, "ts": ts, "text": message.slackFormatEscaping, "parse": parse.rawValue, "link_names": linkNames, "attachments": encodeAttachments(attachments)]
-        networkInterface.request(.chatUpdate, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.chatUpdate, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - Do Not Disturb
     public func dndInfo(_ user: String? = nil, success: ((_ status: DoNotDisturbStatus)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any?] = ["user": user]
-        networkInterface.request(.dndInfo, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(DoNotDisturbStatus(status: response))
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.dndInfo, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {(response) in
+            success?(DoNotDisturbStatus(status: response))
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func dndTeamInfo(_ users: [String]? = nil, success: ((_ statuses: [String: DoNotDisturbStatus])->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any?] = ["users": users?.joined(separator: ",")]
-        networkInterface.request(.dndTeamInfo, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                guard let usersDictionary = response["users"] as? [String: Any] else {
-                    success?([:])
-                    return
-                }
-                success?(self.enumerateDNDStatuses(usersDictionary))
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.dndTeamInfo, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {(response) in
+            guard let usersDictionary = response["users"] as? [String: Any] else {
+                success?([:])
+                return
+            }
+            success?(self.enumerateDNDStatuses(usersDictionary))
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - Emoji
     public func emojiList(_ success: ((_ emojiList: [String: Any]?)->Void)?, failure: FailureClosure?) {
-        networkInterface.request(.emojiList, token: token, parameters: nil, successClosure: {
-            (response) -> Void in
-                success?(response["emoji"] as? [String: Any])
-            }) { (error) -> Void in
-                failure?(error)
+        networkInterface.request(.emojiList, token: token, parameters: nil, successClosure: {(response) in
+            success?(response["emoji"] as? [String: Any])
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - Files
     public func deleteFile(_ fileID: String, success: ((_ deleted: Bool)->Void)?, failure: FailureClosure?) {
         let parameters = ["file": fileID]
-        networkInterface.request(.filesDelete, token: token, parameters: parameters as [String : Any]?, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.filesDelete, token: token, parameters: parameters as [String : Any]?, successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func fileInfo(_ fileID: String, commentCount: Int = 100, totalPages: Int = 1, success: ((_ file: File)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["file": fileID, "count": commentCount, "totalPages": totalPages]
-        networkInterface.request(.filesInfo, token: token, parameters: parameters, successClosure: {
-            (response) in
-                var file = File(file: response["file"] as? [String: Any])
-                (response["comments"] as? [[String: Any]])?.forEach { comment in
-                    let comment = Comment(comment: comment)
-                    if let id = comment.id {
-                        file.comments[id] = comment
-                    }
+        networkInterface.request(.filesInfo, token: token, parameters: parameters, successClosure: {(response) in
+            var file = File(file: response["file"] as? [String: Any])
+            (response["comments"] as? [[String: Any]])?.forEach { comment in
+                let comment = Comment(comment: comment)
+                if let id = comment.id {
+                    file.comments[id] = comment
                 }
-                success?(file)
-            }) {(error) in
-                failure?(error)
+            }
+            success?(file)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func uploadFile(_ file: Data, filename: String, filetype: String = "auto", title: String? = nil, initialComment: String? = nil, channels: [String]? = nil, success: ((_ file: File)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any?] = ["filename": filename, "filetype": filetype, "title": title, "initial_comment": initialComment, "channels": channels?.joined(separator: ",")]
-        networkInterface.uploadRequest(token, data: file, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(File(file: response["file"] as? [String: Any]))
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.uploadRequest(token, data: file, parameters: WebAPI.filterNilParameters(parameters), successClosure: {(response) in
+            success?(File(file: response["file"] as? [String: Any]))
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - File Comments
     public func addFileComment(_ fileID: String, comment: String, success: ((_ comment: Comment)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["file": fileID, "comment": comment.slackFormatEscaping]
-        networkInterface.request(.filesCommentsAdd, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(Comment(comment: response["comment"] as? [String: Any]))
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.filesCommentsAdd, token: token, parameters: parameters, successClosure: {(response) in
+            success?(Comment(comment: response["comment"] as? [String: Any]))
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func editFileComment(_ fileID: String, commentID: String, comment: String, success: ((_ comment: Comment)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["file": fileID, "id": commentID, "comment": comment.slackFormatEscaping]
-        networkInterface.request(.filesCommentsEdit, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
+        networkInterface.request(.filesCommentsEdit, token: token, parameters: parameters, successClosure: {(response) in
             success?(Comment(comment: response["comment"] as? [String: Any]))
-            }) {(error) -> Void in
-                failure?(error)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func deleteFileComment(_ fileID: String, commentID: String, success: ((_ deleted: Bool?)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["file": fileID, "id": commentID]
-        networkInterface.request(.filesCommentsDelete, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.filesCommentsDelete, token: token, parameters: parameters, successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - Groups
     public func closeGroup(_ groupID: String, success: ((_ closed: Bool)->Void)?, failure: FailureClosure?) {
-        close(.groupsClose, channelID: groupID, success: {
-            (closed) -> Void in
-                success?(closed)
-            }) {(error) -> Void in
-                failure?(error)
+        close(.groupsClose, channelID: groupID, success: {(closed) in
+            success?(closed)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func groupHistory(_ id: String, latest: String = "\(Date().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((_ history: History)->Void)?, failure: FailureClosure?) {
-        history(.groupsHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {
-            (history) -> Void in
-                success?(history)
-            }) {(error) -> Void in
-                failure?(error)
+        history(.groupsHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {(history) in
+            success?(history)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func groupInfo(_ id: String, success: ((_ channel: Channel)->Void)?, failure: FailureClosure?) {
-        info(.groupsInfo, type:.group, id: id, success: {
-            (channel) -> Void in
-                success?(channel)
-            }) {(error) -> Void in
-                failure?(error)
+        info(.groupsInfo, type:.group, id: id, success: {(channel) in
+            success?(channel)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func groupsList(_ excludeArchived: Bool = false, success: ((_ channels: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
-        list(.groupsList, type:.group, excludeArchived: excludeArchived, success: {
-            (channels) -> Void in
-                success?(channels)
-            }) {(error) -> Void in
-                failure?(error)
+        list(.groupsList, type:.group, excludeArchived: excludeArchived, success: {(channels) in
+            success?(channels)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func markGroup(_ channel: String, timestamp: String, success: ((_ ts: String)->Void)?, failure: FailureClosure?) {
-        mark(.groupsMark, channel: channel, timestamp: timestamp, success: {
-            (ts) -> Void in
-                success?(timestamp)
-            }) {(error) -> Void in
-                failure?(error)
+        mark(.groupsMark, channel: channel, timestamp: timestamp, success: {(ts) in
+            success?(timestamp)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func openGroup(_ channel: String, success: ((_ opened: Bool)->Void)?, failure: FailureClosure?) {
         let parameters = ["channel":channel]
-        networkInterface.request(.groupsOpen, token: token, parameters: parameters as [String: Any]?, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.groupsOpen, token: token, parameters: parameters as [String: Any]?, successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func setGroupPurpose(_ channel: String, purpose: String, success: ((_ purposeSet: Bool)->Void)?, failure: FailureClosure?) {
-        setInfo(.groupsSetPurpose, type: .purpose, channel: channel, text: purpose, success: {
-            (purposeSet) -> Void in
-                success?(purposeSet)
-            }) {(error) -> Void in
-                failure?(error)
+        setInfo(.groupsSetPurpose, type: .purpose, channel: channel, text: purpose, success: {(purposeSet) in
+            success?(purposeSet)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func setGroupTopic(_ channel: String, topic: String, success: ((_ topicSet: Bool)->Void)?, failure: FailureClosure?) {
-        setInfo(.groupsSetTopic, type: .topic, channel: channel, text: topic, success: {
-            (topicSet) -> Void in
-                success?(topicSet)
-            }) {(error) -> Void in
-                failure?(error)
+        setInfo(.groupsSetTopic, type: .topic, channel: channel, text: topic, success: {(topicSet) in
+            success?(topicSet)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - IM
     public func closeIM(_ channel: String, success: ((_ closed: Bool)->Void)?, failure: FailureClosure?) {
-        close(.imClose, channelID: channel, success: {
-            (closed) -> Void in
-                success?(closed)
-            }) {(error) -> Void in
-                failure?(error)
+        close(.imClose, channelID: channel, success: {(closed) in
+            success?(closed)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func imHistory(_ id: String, latest: String = "\(Date().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((_ history: History)->Void)?, failure: FailureClosure?) {
-        history(.imHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {
-            (history) -> Void in
-                success?(history)
-            }) {(error) -> Void in
-                failure?(error)
+        history(.imHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {(history) in
+            success?(history)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func imsList(_ excludeArchived: Bool = false, success: ((_ channels: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
-        list(.imList, type:.im, excludeArchived: excludeArchived, success: {
-            (channels) -> Void in
-                success?(channels)
-            }) {(error) -> Void in
-                failure?(error)
+        list(.imList, type:.im, excludeArchived: excludeArchived, success: {(channels) in
+            success?(channels)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func markIM(_ channel: String, timestamp: String, success: ((_ ts: String)->Void)?, failure: FailureClosure?) {
-        mark(.imMark, channel: channel, timestamp: timestamp, success: {
-            (ts) -> Void in
-                success?(timestamp)
-            }) {(error) -> Void in
-                failure?(error)
+        mark(.imMark, channel: channel, timestamp: timestamp, success: {(ts) in
+            success?(timestamp)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func openIM(_ userID: String, success: ((_ imID: String?)->Void)?, failure: FailureClosure?) {
         let parameters = ["user": userID]
-        networkInterface.request(.imOpen, token: token, parameters: parameters as [String: Any]?, successClosure: {
-            (response) -> Void in
-                let group = response["channel"] as? [String: Any]
-                success?(group?["id"] as? String)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.imOpen, token: token, parameters: parameters as [String: Any]?, successClosure: {(response) in
+            let group = response["channel"] as? [String: Any]
+            success?(group?["id"] as? String)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - MPIM
     public func closeMPIM(_ channel: String, success: ((_ closed: Bool)->Void)?, failure: FailureClosure?) {
-        close(.mpimClose, channelID: channel, success: {
-            (closed) -> Void in
-                success?(closed)
-            }) {(error) -> Void in
-                failure?(error)
+        close(.mpimClose, channelID: channel, success: {(closed) in
+            success?(closed)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func mpimHistory(_ id: String, latest: String = "\(Date().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((_ history: History)->Void)?, failure: FailureClosure?) {
-        history(.mpimHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {
-            (history) -> Void in
-                success?(history)
-            }) {(error) -> Void in
-                failure?(error)
+        history(.mpimHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {(history) in
+            success?(history)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func mpimsList(_ excludeArchived: Bool = false, success: ((_ channels: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
-        list(.mpimList, type:.group, excludeArchived: excludeArchived, success: {
-            (channels) -> Void in
-                success?(channels)
-            }) {(error) -> Void in
-                failure?(error)
+        list(.mpimList, type:.group, excludeArchived: excludeArchived, success: {(channels) in
+            success?(channels)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func markMPIM(_ channel: String, timestamp: String, success: ((_ ts: String)->Void)?, failure: FailureClosure?) {
-        mark(.mpimMark, channel: channel, timestamp: timestamp, success: {
-            (ts) -> Void in
-                success?(timestamp)
-            }) {(error) -> Void in
-                failure?(error)
+        mark(.mpimMark, channel: channel, timestamp: timestamp, success: {(ts) in
+            success?(timestamp)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func openMPIM(_ userIDs: [String], success: ((_ mpimID: String?)->Void)?, failure: FailureClosure?) {
         let parameters = ["users": userIDs.joined(separator: ",")]
-        networkInterface.request(.mpimOpen, token: token, parameters: parameters as [String: Any]?, successClosure: {
-            (response) -> Void in
-                let group = response["group"] as? [String: Any]
-                success?(group?["id"] as? String)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.mpimOpen, token: token, parameters: parameters as [String: Any]?, successClosure: {(response) in
+            let group = response["group"] as? [String: Any]
+            success?(group?["id"] as? String)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - Pins
     public func pinItem(_ channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((_ pinned: Bool)->Void)?, failure: FailureClosure?) {
-        pin(.pinsAdd, channel: channel, file: file, fileComment: fileComment, timestamp: timestamp, success: {
-            (ok) -> Void in
-                success?(ok)
-            }) {(error) -> Void in
-                failure?(error)
+        pin(.pinsAdd, channel: channel, file: file, fileComment: fileComment, timestamp: timestamp, success: {(ok) in
+            success?(ok)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func unpinItem(_ channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((_ unpinned: Bool)->Void)?, failure: FailureClosure?) {
-        pin(.pinsRemove, channel: channel, file: file, fileComment: fileComment, timestamp: timestamp, success: {
-            (ok) -> Void in
-                success?(ok)
-            }) {(error) -> Void in
-                failure?(error)
+        pin(.pinsRemove, channel: channel, file: file, fileComment: fileComment, timestamp: timestamp, success: {(ok) in
+            success?(ok)
+        }) {(error) in
+            failure?(error)
         }
     }
     
-    fileprivate func pin(_ endpoint: Endpoint, channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((_ ok: Bool)->Void)?, failure: FailureClosure?) {
+    private func pin(_ endpoint: Endpoint, channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((_ ok: Bool)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any?] = ["channel": channel, "file": file, "file_comment": fileComment, "timestamp": timestamp]
-        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(true)
-            }){(error) -> Void in
-                failure?(error)
+        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - Reactions
     // One of file, file_comment, or the combination of channel and timestamp must be specified.
     public func addReaction(_ name: String, file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((_ reacted: Bool)->Void)?, failure: FailureClosure?) {
-        react(.reactionsAdd, name: name, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {
-            (ok) -> Void in
-                success?(ok)
-            }) {(error) -> Void in
-                failure?(error)
+        react(.reactionsAdd, name: name, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {(ok) in
+            success?(ok)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     // One of file, file_comment, or the combination of channel and timestamp must be specified.
     public func removeReaction(_ name: String, file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((_ unreacted: Bool)->Void)?, failure: FailureClosure?) {
-        react(.reactionsRemove, name: name, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {
-            (ok) -> Void in
-                success?(ok)
-            }) {(error) -> Void in
-                failure?(error)
+        react(.reactionsRemove, name: name, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {(ok) in
+            success?(ok)
+        }) {(error) in
+            failure?(error)
         }
     }
     
-    fileprivate func react(_ endpoint: Endpoint, name: String, file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((_ ok: Bool)->Void)?, failure: FailureClosure?) {
+    private func react(_ endpoint: Endpoint, name: String, file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((_ ok: Bool)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any?] = ["name": name, "file": file, "file_comment": fileComment, "channel": channel, "timestamp": timestamp]
-        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - Stars
     // One of file, file_comment, channel, or the combination of channel and timestamp must be specified.
     public func addStar(_ file: String? = nil, fileComment: String? = nil, channel: String?  = nil, timestamp: String? = nil, success: ((_ starred: Bool)->Void)?, failure: FailureClosure?) {
-        star(.starsAdd, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {
-            (ok) -> Void in
-                success?(ok)
-            }) {(error) -> Void in
-                failure?(error)
+        star(.starsAdd, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {(ok) in
+            success?(ok)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     // One of file, file_comment, channel, or the combination of channel and timestamp must be specified.
     public func removeStar(_ file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((_ unstarred: Bool)->Void)?, failure: FailureClosure?) {
-        star(.starsRemove, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {
-            (ok) -> Void in
-                success?(ok)
-            }) {(error) -> Void in
-                failure?(error)
+        star(.starsRemove, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {(ok) in
+            success?(ok)
+        }) {(error) in
+            failure?(error)
         }
     }
     
-    fileprivate func star(_ endpoint: Endpoint, file: String?, fileComment: String?, channel: String?, timestamp: String?, success: ((_ ok: Bool)->Void)?, failure: FailureClosure?) {
+    private func star(_ endpoint: Endpoint, file: String?, fileComment: String?, channel: String?, timestamp: String?, success: ((_ ok: Bool)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any?] = ["file": file, "file_comment": fileComment, "channel": channel, "timestamp": timestamp]
-        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
 
     
     //MARK: - Team
     public func teamInfo(_ success: ((_ info: [String: Any]?)->Void)?, failure: FailureClosure?) {
-        networkInterface.request(.teamInfo, token: token, parameters: nil, successClosure: {
-            (response) -> Void in
-                success?(response["team"] as? [String: Any])
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.teamInfo, token: token, parameters: nil, successClosure: {(response) in
+            success?(response["team"] as? [String: Any])
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - Users
     public func userPresence(_ user: String, success: ((_ presence: String?)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["user": user]
-        networkInterface.request(.usersGetPresence, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(response["presence"] as? String)
-            }){(error) -> Void in
-                failure?(error)
+        networkInterface.request(.usersGetPresence, token: token, parameters: parameters, successClosure: {(response) in
+            success?(response["presence"] as? String)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func userInfo(_ id: String, success: ((_ user: User)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["user": id]
-        networkInterface.request(.usersInfo, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(User(user: response["user"] as? [String: Any]))
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.usersInfo, token: token, parameters: parameters, successClosure: {(response) in
+            success?(User(user: response["user"] as? [String: Any]))
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func usersList(_ includePresence: Bool = false, success: ((_ userList: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["presence": includePresence]
-        networkInterface.request(.usersList, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(response["members"] as? [[String: Any]])
-            }){(error) -> Void in
-                failure?(error)
+        networkInterface.request(.usersList, token: token, parameters: parameters, successClosure: {(response) in
+            success?(response["members"] as? [[String: Any]])
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func setUserActive(_ success: ((_ success: Bool)->Void)?, failure: FailureClosure?) {
-        networkInterface.request(.usersSetActive, token: token, parameters: nil, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.usersSetActive, token: token, parameters: nil, successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     public func setUserPresence(_ presence: Presence, success: ((_ success: Bool)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["presence": presence.rawValue]
-        networkInterface.request(.usersSetPresence, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(.usersSetPresence, token: token, parameters: parameters, successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - Channel Utilities
-    fileprivate func close(_ endpoint: Endpoint, channelID: String, success: ((_ closed: Bool)->Void)?, failure: FailureClosure?) {
+    private func close(_ endpoint: Endpoint, channelID: String, success: ((_ closed: Bool)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["channel": channelID]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
     
-    fileprivate func history(_ endpoint: Endpoint, id: String, latest: String = "\(Date().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((_ history: History)->Void)?, failure: FailureClosure?) {
+    private func history(_ endpoint: Endpoint, id: String, latest: String = "\(Date().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((_ history: History)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["channel": id, "latest": latest, "oldest": oldest, "inclusive": inclusive, "count": count, "unreads": unreads]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(History(history: response))
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {(response) in
+            success?(History(history: response))
+        }) {(error) in
+            failure?(error)
         }
     }
     
-    fileprivate func info(_ endpoint: Endpoint, type: ChannelType, id: String, success: ((_ channel: Channel)->Void)?, failure: FailureClosure?) {
+    private func info(_ endpoint: Endpoint, type: ChannelType, id: String, success: ((_ channel: Channel)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["channel": id]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(Channel(channel: response[type.rawValue] as? [String: Any]))
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {(response) in
+            success?(Channel(channel: response[type.rawValue] as? [String: Any]))
+        }) {(error) in
+            failure?(error)
         }
     }
     
-    fileprivate func list(_ endpoint: Endpoint, type: ChannelType, excludeArchived: Bool = false, success: ((_ channels: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
+    private func list(_ endpoint: Endpoint, type: ChannelType, excludeArchived: Bool = false, success: ((_ channels: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["exclude_archived": excludeArchived]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(response[type.rawValue+"s"] as? [[String: Any]])
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {(response) in
+            success?(response[type.rawValue+"s"] as? [[String: Any]])
+        }) {(error) in
+            failure?(error)
         }
     }
     
-    fileprivate func mark(_ endpoint: Endpoint, channel: String, timestamp: String, success: ((_ ts: String)->Void)?, failure: FailureClosure?) {
+    private func mark(_ endpoint: Endpoint, channel: String, timestamp: String, success: ((_ ts: String)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["channel": channel, "ts": timestamp]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(timestamp)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {(response) in
+            success?(timestamp)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     fileprivate func setInfo(_ endpoint: Endpoint, type: InfoType, channel: String, text: String, success: ((_ success: Bool)->Void)?, failure: FailureClosure?) {
         let parameters: [String: Any] = ["channel": channel, type.rawValue: text]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
+        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {(response) in
+            success?(true)
+        }) {(error) in
+            failure?(error)
         }
     }
     
     //MARK: - Encode Attachments
-    fileprivate func encodeAttachments(_ attachments: [Attachment?]?) -> String? {
+    private func encodeAttachments(_ attachments: [Attachment?]?) -> String? {
         if let attachments = attachments {
             var attachmentArray: [[String: Any]] = []
             for attachment in attachments {
@@ -770,7 +709,7 @@ public final class WebAPI {
     }
     
     //MARK: - Enumerate Do Not Disturb Status
-    fileprivate func enumerateDNDStatuses(_ statuses: [String: Any]) -> [String: DoNotDisturbStatus] {
+    private func enumerateDNDStatuses(_ statuses: [String: Any]) -> [String: DoNotDisturbStatus] {
         var retVal = [String: DoNotDisturbStatus]()
         for key in statuses.keys {
             retVal[key] = DoNotDisturbStatus(status: statuses[key] as? [String: Any])

SlackKit/Sources/WebhookServer.swift

@@ -39,7 +39,7 @@ open class WebhookServer: Server {
         }
     }
     
-    fileprivate func replyForResponse(_ response: Response) -> Reply {
+    private func replyForResponse(_ response: Response) -> Reply {
         if response.attachments == nil && response.responseType == nil {
             return Reply.text(body: response.text)
         } else {