Merge pull request #64 from pvzig/swift3

Update to Swift 3

.gitignore

@@ -16,10 +16,10 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-
-# SwiftPM
-Packages/
 .build
+Packages/
+*.xcodeproj/
+*.DS_Store
 
 # CocoaPods
 #
@@ -28,10 +28,10 @@ Packages/
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
 #
 Pods/
-SlackKit.xcworkspace
 
 # Carthage
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
-Carthage/Checkouts
+# Carthage/Checkouts
+
 Carthage/Build

.swift-version

@@ -1 +1 @@
-2.2
+3.0.2

Cartfile

@@ -1,2 +0,0 @@
-github "daltoniam/Starscream" ~> 1.0
-github "glock45/swifter" "d7c820bfc9260e469094b5f8d3d101b30c4a8fac"

Cartfile.resolved

@@ -1,2 +0,0 @@
-github "daltoniam/Starscream" "1.1.3"
-github "glock45/swifter" "d7c820bfc9260e469094b5f8d3d101b30c4a8fac"

Examples/echobot/Package.swift

@@ -0,0 +1,9 @@
+import PackageDescription
+
+let package = Package(
+    name: "echobot",
+    targets: [],
+    dependencies: [
+        .Package(url: "https://github.com/pvzig/SlackKit.git", majorVersion: 0, minor: 0),
+    ]
+)

Examples/echobot/Sources/main.swift

@@ -0,0 +1,35 @@
+import Foundation
+import SlackKit
+
+class Echobot: MessageEventsDelegate {
+    
+    let client: SlackClient
+    
+    init(token: String) {
+        client = SlackClient(apiToken: token)
+        client.messageEventsDelegate = self
+    }
+    
+    // MARK: MessageEventsDelegate
+    func sent(_ message: Message, client: SlackClient) {}
+    func changed(_ message: Message, client: SlackClient) {}
+    func deleted(_ message: Message?, client: SlackClient) {}
+    func received(_ message: Message, client: SlackClient) {
+        listen(message: message)
+    }
+    
+    // MARK: Echobot Internal Logic
+    private func listen(message: Message) {
+        if let channel = message.channel, let text = message.text, let id = client.authenticatedUser?.id {
+            if id != message.user && message.user != nil {
+                client.webAPI.sendMessage(channel:channel, text: text, linkNames: true, success: {(response) in
+                }, failure: { (error) in
+                    print("Echobot failed to reply due to error:\(error)")
+                })
+            }
+        }
+    }
+}
+
+let echobot = Echobot(token: "xoxb-SLACK_API_TOKEN")
+echobot.client.connect()

Examples/leaderboard/Package.swift

@@ -0,0 +1,8 @@
+import PackageDescription
+
+let package = Package(
+    name: "leaderboard",
+    dependencies: [
+        .Package(url: "https://github.com/pvzig/SlackKit.git", majorVersion: 0, minor: 0),
+    ]
+)

Examples/leaderboard/Sources/main.swift

@@ -0,0 +1,141 @@
+import Foundation
+import SlackKit
+
+class Leaderboard: MessageEventsDelegate {
+    
+    var leaderboard: [String: Int] = [String: Int]()
+    let atSet = CharacterSet(charactersIn: "@")
+    
+    let client: SlackClient
+    
+    init(token: String) {
+        client = SlackClient(apiToken: token)
+        client.messageEventsDelegate = self
+    }
+    
+    enum Command: String {
+        case leaderboard = "leaderboard"
+    }
+    
+    enum Trigger: String {
+        case plusPlus = "++"
+        case minusMinus = "--"
+    }
+    
+    // MARK: MessageEventsDelegate
+    func sent(_ message: Message, client: SlackClient) {}
+    func changed(_ message: Message, client: SlackClient) {}
+    func deleted(_ message: Message?, client: SlackClient) {}
+    func received(_ message: Message, client: SlackClient) {
+        listen(message: message)
+    }
+    
+    // MARK: Leaderboard Internal Logic
+    private func listen(message: Message) {
+        if let id = client.authenticatedUser?.id, let text = message.text {
+            if text.lowercased().contains(Command.leaderboard.rawValue) && text.contains(id) {
+                handleCommand(command: .leaderboard, channel: message.channel)
+            }
+        }
+        if message.text?.contains(Trigger.plusPlus.rawValue) == true {
+            handleMessageWithTrigger(message: message, trigger: .plusPlus)
+        }
+        if message.text?.contains(Trigger.minusMinus.rawValue) == true {
+            handleMessageWithTrigger(message: message, trigger: .minusMinus)
+        }
+    }
+    
+    private func handleMessageWithTrigger(message: Message, trigger: Trigger) {
+        if let text = message.text, let start = text.range(of: "@")?.lowerBound, let end = text.range(of: trigger.rawValue)?.lowerBound {
+            let string = String(text.characters[start...end].dropLast().dropFirst())
+            let users = client.users.values.filter{$0.id == self.userID(string: string)}
+            if users.count > 0 {
+                let idString = userID(string: string)
+                initalizationForValue(dictionary: &leaderboard, value: idString)
+                scoringForValue(dictionary: &leaderboard, value: idString, trigger: trigger)
+            } else {
+                initalizationForValue(dictionary: &leaderboard, value: string)
+                scoringForValue(dictionary: &leaderboard, value: string, trigger: trigger)
+            }
+        }
+    }
+    
+    private func handleCommand(command: Command, channel:String?) {
+        switch command {
+        case .leaderboard:
+            if let id = channel {
+                client.webAPI.sendMessage(channel:id, text: "Leaderboard", linkNames: true, attachments: [constructLeaderboardAttachment()], success: {(response) in
+                    print(response)
+                }, failure: { (error) in
+                    print("Leaderboard failed to post due to error:\(error)")
+                })
+            }
+        }
+    }
+    
+    private func initalizationForValue( dictionary: inout [String: Int], value: String) {
+        if dictionary[value] == nil {
+            dictionary[value] = 0
+        }
+    }
+    
+    private func scoringForValue( dictionary: inout [String: Int], value: String, trigger: Trigger) {
+        switch trigger {
+        case .plusPlus:
+            dictionary[value]?+=1
+        case .minusMinus:
+            dictionary[value]?-=1
+        }
+    }
+    
+    // MARK: Leaderboard Interface
+    private func constructLeaderboardAttachment() -> Attachment? {
+        let 💯 = AttachmentField(title: "💯", value: swapIDsForNames(string: topItems(dictionary: &leaderboard)), short: true)
+        let 💩 = AttachmentField(title: "💩", value: swapIDsForNames(string: bottomItems(dictionary: &leaderboard)), short: true)
+        return Attachment(fallback: "Leaderboard", title: "Leaderboard", colorHex: AttachmentColor.good.rawValue, text: "", fields: [💯, 💩])
+    }
+    
+    private func topItems(dictionary: inout [String: Int]) -> String {
+        let sortedKeys = dictionary.keys.sorted(by: { (k1: String, k2: String) -> Bool in
+            return dictionary[k1]! > dictionary[k2]!
+        }).filter({ dictionary[$0]! > 0})
+        let sortedValues = dictionary.values.sorted(by: {$0 > $1}).filter({$0 > 0})
+        return leaderboardString(keys: sortedKeys, values: sortedValues)
+    }
+    
+    private func bottomItems( dictionary: inout [String: Int]) -> String {
+        let sortedKeys = dictionary.keys.sorted(by: { (k1: String, k2: String) -> Bool in
+            return dictionary[k1]! < dictionary[k2]!
+        }).filter({ dictionary[$0]! < 0})
+        let sortedValues = dictionary.values.sorted(by: {$0 < $1}).filter({$0 < 0})
+        return leaderboardString(keys: sortedKeys, values: sortedValues)
+    }
+    
+    private func leaderboardString(keys: [String], values: [Int]) -> String {
+        var returnValue = ""
+        for i in 0..<values.count {
+            returnValue += keys[i] + " (" + "\(values[i])" + ")\n"
+        }
+        return returnValue
+    }
+    
+    // MARK: - Utilities
+    private func swapIDsForNames(string: String) -> String {
+        var returnString = string
+        for key in client.users.keys {
+            if let name = client.users[key]?.name {
+                if returnString.contains(key) {
+                    returnString = returnString.replacingOccurrences(of: key, with: "@"+name)
+                }
+            }
+        }
+        return returnString
+    }
+    
+    private func userID(string: String) -> String {
+        return string.trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
+    }
+}
+
+let leaderboard = Leaderboard(token: "xoxb-SLACK_API_TOKEN")
+leaderboard.client.connect()

Examples/robot-or-not-bot/Package.swift

@@ -0,0 +1,9 @@
+import PackageDescription
+
+let package = Package(
+    name: "robot-or-not-bot",
+    targets: [],
+    dependencies: [
+        .Package(url: "https://github.com/pvzig/SlackKit.git", majorVersion: 0, minor: 0),
+    ]
+)

Examples/robot-or-not-bot/Sources/main.swift

@@ -0,0 +1,117 @@
+import Foundation
+import SlackKit
+
+class RobotOrNotBot: MessageEventsDelegate {
+    
+    let verdicts: [String:Bool] = [
+        "Mr. Roboto" : false,
+        "Service Kiosks": false,
+        "Darth Vader": false,
+        "K-9": true,
+        "Emotions": false,
+        "Self-Driving Cars": false,
+        "Telepresence Robots": false,
+        "Roomba": true,
+        "Assembly-Line Robot": false,
+        "ASIMO": false,
+        "KITT": false,
+        "USS Enterprise": false,
+        "Transformers": true,
+        "Jaegers": false,
+        "The Major": false,
+        "Siri": false,
+        "The Terminator": true,
+        "Commander Data": false,
+        "Marvin the Paranoid Android": true,
+        "Pinocchio": false,
+        "Droids": true,
+        "Hitchbot": false,
+        "Mars Rovers": false,
+        "Space Probes": false,
+        "Sasquatch": false,
+        "Toaster": false,
+        "Toaster Oven": false,
+        "Cylons": false,
+        "V'ger": true,
+        "Ilia Robot": false,
+        "The TARDIS": false,
+        "Johnny 5": true,
+        "Twiki": true,
+        "Dr. Theopolis": false,
+        "robots.txt": false,
+        "Lobot": false,
+        "Vicki": true,
+        "GlaDOS": false,
+        "Turrets": true,
+        "Wheatley": true,
+        "Herbie the Love Bug": false,
+        "Iron Man": false,
+        "Ultron": false,
+        "The Vision": false,
+        "Clockwork Droids": false,
+        "Podcasts": false,
+        "Cars": false,
+        "Swimming Pool Cleaners": false,
+        "Burritos": false,
+        "Prince Robot IV": false,
+        "Daleks": false,
+        "Cybermen": false,
+        "The Internet of Things": false,
+        "Nanobots": true,
+        "Two Intermeshed Gears": false,
+        "Crow T. Robot": true,
+        "Tom Servo": true,
+        "Thomas and Friends": false,
+        "Replicants": false,
+        "Chatbots": false,
+        "Agents": false,
+        "Lego Simulated Worm Toy": true,
+        "Ghosts": false,
+        "Exos": true,
+        "Rasputin": false,
+        "Tamagotchi": false,
+        "T-1000": true,
+        "The Tin Woodman": false,
+        "Mic N. The Robot": true,
+        "Robot Or Not Bot": false
+    ]
+    
+    let client: SlackClient
+    
+    init(token: String) {
+        client = SlackClient(apiToken: token)
+        client.messageEventsDelegate = self
+    }
+    
+    // MARK: MessageEventsDelegate
+    func received(_ message: Message, client: SlackClient) {
+        if let id = client.authenticatedUser?.id {
+            if message.text?.contains(id) == true {
+                handleMessage(message: message)
+            }
+        }
+    }
+    func changed(_ message: Message, client: SlackClient) {}
+    func deleted(_ message: Message?, client: SlackClient) {}
+    func sent(_ message: Message, client: SlackClient) {}
+    
+    private func handleMessage(message: Message) {
+        if let text = message.text?.lowercased(), let channel = message.channel {
+            for (robot, verdict) in verdicts {
+                let lowerbot = robot.lowercased()
+                if text.contains(lowerbot) {
+                    if verdict == true {
+                        client.webAPI.addReaction(name: "robot_face", channel: channel, timestamp: message.ts, success: nil, failure: nil)
+                    } else {
+                        client.webAPI.addReaction(name: "no_entry_sign", channel: channel, timestamp: message.ts, success: nil, failure: nil)
+                    }
+                    return
+                }
+            }
+            client.webAPI.addReaction(name: "question", channel: channel, timestamp: message.ts, success: nil, failure: nil)
+        }
+    }
+}
+
+let slackbot = RobotOrNotBot(token: "xoxb-SLACK_API_TOKEN")
+slackbot.client.connect()

Package.swift

@@ -27,9 +27,8 @@ let package = Package(
     name: "SlackKit",
     targets: [],
     dependencies: [
-        .Package(url: "https://github.com/daltoniam/Starscream",
-            majorVersion: 1),
-        .Package(url: "https://github.com/httpswift/swifter", majorVersion: 1)
+        .Package(url: "https://github.com/Zewo/WebSocketClient", majorVersion: 0, minor: 14),
+        .Package(url: "https://github.com/Zewo/HTTPClient.git", majorVersion: 0, minor: 14)
     ],
-    exclude: ["Examples", "Carthage", "Pods"]
+    exclude: ["Examples"]
 )

Podfile

@@ -1,18 +0,0 @@
-source 'https://github.com/CocoaPods/Specs.git'
-
-use_frameworks!
-
-target 'SlackKit OS X' do
-	pod 'Starscream'
-	pod 'Swifter'
-end
-
-target 'SlackKit iOS' do
-	pod 'Starscream'
-	pod 'Swifter'
-end
-
-target 'SlackKit tvOS' do
-	pod 'Starscream'
-	pod 'Swifter'
-end

Podfile.lock

@@ -1,15 +0,0 @@
-PODS:
-  - Starscream (1.1.3)
-  - Swifter (1.2.6)
-
-DEPENDENCIES:
-  - Starscream
-  - Swifter
-
-SPEC CHECKSUMS:
-  Starscream: d662732354b40dd19ed1ece3e3c44c80b536b83c
-  Swifter: c6f13d053398f1e2f209c7a394dfd5e863ae0157
-
-PODFILE CHECKSUM: 372d57254c34897042ce228cf421d7c9cc5caf9f
-
-COCOAPODS: 1.0.1

README.md

@@ -1,139 +1,72 @@
 ![SlackKit](https://cloud.githubusercontent.com/assets/8311605/10260893/5ec60f96-694e-11e5-91fd-da6845942201.png)
-## SlackKit: A Swift Slack Client Library
-### Description
-This is a Slack client library for OS X, iOS, and tvOS written in Swift. It's intended to expose all of the functionality of Slack's [Real Time Messaging API](https://api.slack.com/rtm) as well as the [web APIs](https://api.slack.com/web) that are accessible to [bot users](https://api.slack.com/bot-users). SlackKit also supports Slack’s [OAuth 2.0](https://api.slack.com/docs/oauth) flow including the [Add to Slack](https://api.slack.com/docs/slack-button) and [Sign in with Slack](https://api.slack.com/docs/sign-in-with-slack) buttons, [incoming webhooks](https://api.slack.com/incoming-webhooks), [slash commands](https://api.slack.com/slash-commands), and [message buttons](https://api.slack.com/docs/message-buttons).
 
-SlackKit also has alpha support for: [Swift 3](https://github.com/pvzig/SlackKit/tree/swift3), [Linux](https://github.com/pvzig/SlackKit/tree/linux)
+![Swift Version](https://img.shields.io/badge/Swift-DEVELOPMENT--SNAPSHOT--2016--05--09--a-orange.svg) ![Plaforms](https://img.shields.io/badge/Platforms-macOS,linux-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)
+##Alpha Linux Slack Client Library
+###Description
+This is a Slack client library for Linux written in Swift. It's intended to expose all of the functionality of Slack's [Real Time Messaging API](https://api.slack.com/rtm) as well as the [web APIs](https://api.slack.com/web) that are accessible by [bot users](https://api.slack.com/bot-users).
 
-#### Building the SlackKit Framework
-To build the SlackKit project directly, first build the dependencies using Carthage or CocoaPods. To use the framework in your application, install it in one of the following ways:
+###Disclaimer: The linux version of SlackKit is a pre-release alpha. Feel free to report issues you come across.
 
-### Installation
-#### CocoaPods
-Add the pod to your podfile:
-```
-pod 'SlackKit'
-```
-and run
-```
-pod install
-```
+###Installation
 
-#### Carthage
-
-Add SlackKit to your Cartfile:
-```
-github "pvzig/SlackKit" ~> 2.0
-```
-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"
-```
-Drag the built `SlackKit.framework` into your Xcode project.
-
-#### Swift Package Manager
+####Swift Package Manager
 Add SlackKit to your Package.swift
+
 ```swift
 import PackageDescription
 
 let package = Package(
     dependencies: [
-        .Package(url: "https://github.com/pvzig/SlackKit.git", majorVersion: 2)
+        .Package(url: "https://github.com/pvzig/SlackKit.git", majorVersion: 0, minor: 0)
     ]
 )
 ```
-Run `swift build` on your application’s main directory.
+
+####Development
+1. Install Homebrew: `/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`
+2. Install `swiftenv`: `brew install kylef/formulae/swiftenv`
+3. Configure your shell: `echo 'if which swiftenv > /dev/null; then eval "$(swiftenv init -)"; fi' >> ~/.bash_profile`
+4. Download and install the latest Zewo compatible snapshot:
+```
+swiftenv install DEVELOPMENT-SNAPSHOT-2016-05-09-a
+swiftenv local DEVELOPMENT-SNAPSHOT-2016-05-09-a
+```
+5. Install and Link OpenSSL: `brew install openssl`, `brew link openssl --force`
+
+To build an application that uses SlackKit in Xcode, simply use SwiftPM. (For the 05-03 snapshot you must run `swift build` before generating an Xcode project:
+```
+swift build
+swift build -Xlinker -L$(pwd)/.build/debug/ -Xswiftc -I/usr/local/include -Xlinker -L/usr/local/lib -X
+```
+
 
 To use the library in your project import it:
 ```
 import SlackKit
 ```
 
-### Usage
+####Deployment
+Deploy your application to Heroku using [this buildpack](https://github.com/pvzig/heroku-buildpack-swift). For more detailed instructions please see [this post](https://medium.com/@pvzig/building-slack-bots-in-swift-b99e243e444c).
 
-#### OAuth
-Slack has [many different oauth scopes](https://api.slack.com/docs/oauth-scopes) that can be combined in different ways. If your application does not request the proper OAuth scopes, your API calls will fail. 
+###Usage
+To use SlackKit you'll need a bearer token which identifies a single user. You can generate a [full access token or create one using OAuth 2](https://api.slack.com/web).
 
-If you authenticate using OAuth and the Add to Slack or Sign in with Slack buttons this is handled for you.
-
-If you wish to make OAuth requests yourself, you can generate them using the `authorizeRequest` function on `SlackKit`’s `oauth` property:
+Once you have a token, initialize a client instance using it:
 ```swift
-func authorizeRequest(scope:[Scope], redirectURI: String, state: String = "slackkit", team: String? = nil)
+let client = Client(apiToken: "YOUR_SLACK_API_TOKEN")
 ```
 
-For local development of things like OAuth, slash commands, and message buttons that require connecting over `https`, you may want to use a tool like [ngrok](https://ngrok.com) or [localtunnel](http://localtunnel.me).
-
-#### Incoming Webhooks
-After [configuring your incoming webhook in Slack](https://my.slack.com/services/new/incoming-webhook/), initialize IncomingWebhook with the provided URL and use `postMessage` to send messages.
+If you want to receive messages from the Slack RTM API, connect to it.
 ```swift
-let incoming = IncomingWebhook(url: "https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX")
-let message = Response(text: "Hello, World!")
-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 webhook = WebhookServer(token: "SLASH-COMMAND-TOKEN", route: "hello_world", response: response)
-webhook.start()
-```
-When a user enters that slash command, it will hit your configured route and return the response you specified.
-
-To add additional routes and responses, you can use WebhookServer’s addRoute function:
-```swift 
-func addRoute(route: String, response: Response)
-```
-
-#### Message Buttons
-If you are developing a Slack App and are authorizing using OAuth, you can use [message buttons](https://api.slack.com/docs/message-buttons).
-
-To send messages with actions, add them to an attachment:
-```swift
-let helloAction = Action(name: "hello_world", text: "Hello, World!")
-let attachment = Attachment(fallback: "Hello World Attachment", title: "Attachment with an Action Button", callbackID: "helloworld", actions: [helloAction])
-```
-
-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 responder = MessageActionResponder(responses: [(action, response)])
-let server = MessageActionServer(token: "SLACK-APP-VERIFICATION-TOKEN", route: "actions", responder: responder)
-server.start()
-```
-
-#### Bot Users
-To deploy a bot user using SlackKit you'll need a bearer token which identifies a single user. You can generate a [full access token or create one using OAuth 2](https://api.slack.com/web).
-
-Initialize a SlackKit instance using your [application’s Client ID and Client Secret](https://api.slack.com/apps) to set up SlackKit for OAuth authorization:
-```swift
-let bot = SlackKit(clientID: "CLIENT_ID", clientSecret: "CLIENT_SECRET")
-```
-
-or use a manually acquired token:
-```swift
-let bot = SlackKit(withAPIToken: "xoxp-YOUR-SLACK-API-TOKEN")
-```
-
-#### Client Connection Options
-You can also set options for a ping/pong interval, timeout interval, and automatic reconnection:
-```swift
-let options = ClientOptions(pingInterval: 2, timeout: 10, reconnect: false)
-let bot = SlackKit(clientID: "CLIENT_ID", clientSecret: "CLIENT_SECRET", clientOptions: options)
+client.connect()
 ```
 
 Once connected, the client will begin to consume any messages sent by the Slack RTM API.
 
-#### Web API Methods
+####Web API Methods
 SlackKit currently supports the a subset of the Slack Web APIs that are available to bot users:
 
 - api.test
-- auth.revoke
 - auth.test
 - channels.history
 - channels.info
@@ -149,7 +82,6 @@ SlackKit currently supports the a subset of the Slack Web APIs that are availabl
 - files.comments.edit
 - files.comments.delete
 - files.delete
-- files.info
 - files.upload
 - groups.close
 - groups.history
@@ -169,7 +101,6 @@ SlackKit currently supports the a subset of the Slack Web APIs that are availabl
 - mpim.list
 - mpim.mark
 - mpim.open
-- oauth.access
 - pins.add
 - pins.list
 - pins.remove
@@ -189,122 +120,112 @@ SlackKit currently supports the a subset of the Slack Web APIs that are availabl
 
 They can be accessed through a Client object’s `webAPI` property:
 ```swift
-client.webAPI.authenticationTest({ (authenticated) -> Void in
-	print(authenticated)
-}){(error) -> Void in
-	print(error)
+client.webAPI.authenticationTest({
+(authenticated) -> Void in
+		print(authenticated)
+	}){(error) -> Void in
+	    print(error)
 }
 ```
 
-#### Delegate methods
+####Delegate methods
 
-To receive delegate callbacks for events, register an object as the delegate for those events using the `onClientInitalization` block:
+To receive delegate callbacks for certain events, register an object as the delegate for those events:
 ```swift
-let bot = SlackKit(clientID: "CLIENT_ID", clientSecret: "CLIENT_SECRET")
-bot.onClientInitalization = { (client: Client) in
-    dispatch_async(dispatch_get_main_queue(), {
-		client.connectionEventsDelegate = self
-	    client.messageEventsDelegate = self
-	})
-}
+client.slackEventsDelegate = self
 ```
 
-Delegate callbacks contain a reference to the Client where the event occurred.
-
 There are a number of delegates that you can set to receive callbacks for certain events.
 
-##### ConnectionEventsDelegate
+#####SlackEventsDelegate
 ```swift
-clientConnected(client: Client)
-clientDisconnected(client: Client)
-clientConnectionFailed(client: Client, error: SlackError)
-```
-##### MessageEventsDelegate
-```swift
-messageSent(client: Client, message: Message)
-messageReceived(client: Client, message: Message)
-messageChanged(client: Client, message: Message)
-messageDeleted(client: Client, message: Message?)
-```
-##### ChannelEventsDelegate
-```swift
-userTyping(client: Client, channel: Channel, user: User)
-channelMarked(client: Client, channel: Channel, timestamp: String)
-channelCreated(client: Client, channel: Channel)
-channelDeleted(client: Client, channel: Channel)
-channelRenamed(client: Client, channel: Channel)
-channelArchived(client: Client, channel: Channel)
-channelHistoryChanged(client: Client, channel: Channel)
-channelJoined(client: Client, channel: Channel)
-channelLeft(client: Client, channel: Channel)
-```
-##### DoNotDisturbEventsDelegate
-```swift
-doNotDisturbUpdated(client: Client, dndStatus: DoNotDisturbStatus)
-doNotDisturbUserUpdated(client: Client, dndStatus: DoNotDisturbStatus, user: User)
-```
-##### GroupEventsDelegate
-```swift
-groupOpened(client: Client, group: Channel)
-```
-##### FileEventsDelegate
-```swift
-fileProcessed(client: Client, file: File)
-fileMadePrivate(client: Client, file: File)
-fileDeleted(client: Client, file: File)
-fileCommentAdded(client: Client, file: File, comment: Comment)
-fileCommentEdited(client: Client, file: File, comment: Comment)
-fileCommentDeleted(client: Client, file: File, comment: Comment)
-```
-##### PinEventsDelegate
-```swift
-itemPinned(client: Client, item: Item, channel: Channel?)
-itemUnpinned(client: Client, item: Item, channel: Channel?)
-```
-##### StarEventsDelegate
-```swift
-itemStarred(client: Client, item: Item, star: Bool)
-```
-##### ReactionEventsDelegate
-```swift
-reactionAdded(client: Client, reaction: String, item: Item, itemUser: String)
-reactionRemoved(client: Client, reaction: String, item: Item, itemUser: String)
-```
-##### SlackEventsDelegate
-```swift
-preferenceChanged(client: Client, preference: String, value: AnyObject?)
-userChanged(client: Client, user: User)
-presenceChanged(client: Client, user: User, presence: String)
-manualPresenceChanged(client: Client, user: User, presence: String)
-botEvent(client: Client, bot: Bot)
-```
-##### TeamEventsDelegate
-```swift
-teamJoined(client: Client, user: User)
-teamPlanChanged(client: Client, plan: String)
-teamPreferencesChanged(client: Client, preference: String, value: AnyObject?)
-teamNameChanged(client: Client, name: String)
-teamDomainChanged(client: Client, domain: String)
-teamEmailDomainChanged(client: Client, domain: String)
-teamEmojiChanged(client: Client)
-```
-##### SubteamEventsDelegate
-```swift
-subteamEvent(client: Client, userGroup: UserGroup)
-subteamSelfAdded(client: Client, subteamID: String)
-subteamSelfRemoved(client: Client, subteamID: String)
-```
-##### TeamProfileEventsDelegate
-```swift
-teamProfileChanged(client: Client, profile: CustomProfile)
-teamProfileDeleted(client: Client, profile: CustomProfile)
-teamProfileReordered(client: Client, profile: CustomProfile)
+func clientConnected()
+func clientDisconnected()
+func preferenceChanged(preference: String, value: AnyObject)
+func userChanged(user: User)
+func presenceChanged(user: User?, presence: String?)
+func manualPresenceChanged(user: User?, presence: String?)
+func botEvent(bot: Bot)
 ```
 
-### Examples
-[Check out example applications here.](https://github.com/pvzig/SlackKit-examples)
+#####MessageEventsDelegate
+```swift
+func messageSent(message: Message)
+func messageReceived(message: Message)
+func messageChanged(message: Message)
+func messageDeleted(message: Message?)
+```
 
-### Get In Touch
+#####ChannelEventsDelegate
+```swift
+func userTyping(channel: Channel?, user: User?)
+func channelMarked(channel: Channel, timestamp: String?)
+func channelCreated(channel: Channel)
+func channelDeleted(channel: Channel)
+func channelRenamed(channel: Channel)
+func channelArchived(channel: Channel)
+func channelHistoryChanged(channel: Channel)
+func channelJoined(channel: Channel)
+func channelLeft(channel: Channel)
+```
+
+#####DoNotDisturbEventsDelegate
+```swift
+doNotDisturbUpdated(dndStatus: DoNotDisturbStatus)
+doNotDisturbUserUpdated(dndStatus: DoNotDisturbStatus, user: User?)
+```
+
+#####GroupEventsDelegate
+```swift
+func groupOpened(group: Channel)
+```
+
+#####FileEventsDelegate
+```swift
+func fileProcessed(file: File)
+func fileMadePrivate(file: File)
+func fileDeleted(file: File)
+func fileCommentAdded(file: File, comment: Comment)
+func fileCommentEdited(file: File, comment: Comment)
+func fileCommentDeleted(file: File, comment: Comment)
+```
+
+#####PinEventsDelegate
+```swift
+func itemPinned(item: Item?, channel: Channel?)
+func itemUnpinned(item: Item?, channel: Channel?)
+```
+
+#####StarEventsDelegate
+```swift
+func itemStarred(item: Item, star: Bool)
+```
+
+#####ReactionEventsDelegate
+```swift
+func reactionAdded(reaction: String?, item: Item?, itemUser: String?)
+func reactionRemoved(reaction: String?, item: Item?, itemUser: String?)
+```
+
+#####TeamEventsDelegate
+```swift
+func teamJoined(user: User)
+func teamPlanChanged(plan: String)
+func teamPreferencesChanged(preference: String, value: AnyObject)
+func teamNameChanged(name: String)
+func teamDomainChanged(domain: String)
+func teamEmailDomainChanged(domain: String)
+func teamEmojiChanged()
+```
+
+#####SubteamEventsDelegate
+```swift
+func subteamEvent(userGroup: UserGroup)
+func subteamSelfAdded(subteamID: String)
+func subteamSelfRemoved(subteamID: String)
+```
+
+###Get In Touch
 [@pvzig](https://twitter.com/pvzig)
 
 <peter@launchsoft.co>

SlackKit.podspec

@@ -1,19 +0,0 @@
-Pod::Spec.new do |s|
-  s.name             = "SlackKit"
-  s.version          = "2.0.0"
-  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'
-  s.author           = { "Peter Zignego" => "peter@launchsoft.co" }
-  s.source           = { :git => "https://github.com/pvzig/SlackKit.git", :tag => s.version.to_s }
-  s.social_media_url = 'https://twitter.com/pvzig'
-  s.ios.deployment_target = '8.0'
-  s.osx.deployment_target = '10.10'
-  s.tvos.deployment_target = '9.0'
-  s.requires_arc = true
-  s.source_files = 'SlackKit/Sources/*.swift'  
-  s.frameworks = 'Foundation'
-  s.dependency 'Starscream', '~> 1.1.3'
-  s.dependency 'Swifter'
-end
-

SlackKit.xcodeproj/project.pbxproj

@@ -1,960 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		2601D61B1C7646B80012BF22 /* SlackError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2601D61A1C7646B80012BF22 /* SlackError.swift */; };
-		260EC2331C4DC61D0093B253 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2301C4DC61D0093B253 /* Extensions.swift */; };
-		260EC2341C4DC61D0093B253 /* NetworkInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2311C4DC61D0093B253 /* NetworkInterface.swift */; };
-		260EC2351C4DC61D0093B253 /* WebAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2321C4DC61D0093B253 /* WebAPI.swift */; };
-		263993901CE90C87004A6E93 /* SlackKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2661A6A41BBF62FF0026F67B /* SlackKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		263993971CE90EE0004A6E93 /* Client+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = C16C98791CE7D3DD00692776 /* Client+Utilities.swift */; };
-		263993981CE90EE0004A6E93 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1881C398E3C00BF7225 /* Channel.swift */; };
-		263993991CE90EE0004A6E93 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1921C398E3C00BF7225 /* User.swift */; };
-		2639939B1CE90EE0004A6E93 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1891C398E3C00BF7225 /* Client.swift */; };
-		2639939C1CE90EE0004A6E93 /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18A1C398E3C00BF7225 /* Event.swift */; };
-		2639939D1CE90EE0004A6E93 /* Bot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1871C398E3C00BF7225 /* Bot.swift */; };
-		2639939E1CE90EE0004A6E93 /* Client+EventDispatching.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A85FF71CE3BCEF00756C40 /* Client+EventDispatching.swift */; };
-		2639939F1CE90EE0004A6E93 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18E1C398E3C00BF7225 /* File.swift */; };
-		263993A01CE90EE0004A6E93 /* WebAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2321C4DC61D0093B253 /* WebAPI.swift */; };
-		263993A11CE90EE0004A6E93 /* Attachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26DF40341C7A0FA300E19241 /* Attachment.swift */; };
-		263993A21CE90EE0004A6E93 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18F1C398E3C00BF7225 /* Message.swift */; };
-		263993A31CE90EE0004A6E93 /* Team.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1901C398E3C00BF7225 /* Team.swift */; };
-		263993A41CE90EE0004A6E93 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2301C4DC61D0093B253 /* Extensions.swift */; };
-		263993A51CE90EE0004A6E93 /* UserGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1931C398E3C00BF7225 /* UserGroup.swift */; };
-		263993A61CE90EE0004A6E93 /* SlackError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2601D61A1C7646B80012BF22 /* SlackError.swift */; };
-		263993A71CE90EE0004A6E93 /* Client+EventHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A85FF81CE3BCEF00756C40 /* Client+EventHandling.swift */; };
-		263993A81CE90EE0004A6E93 /* NetworkInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2311C4DC61D0093B253 /* NetworkInterface.swift */; };
-		263993A91CE90EE0004A6E93 /* EventDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18B1C398E3C00BF7225 /* EventDelegate.swift */; };
-		263993AB1CE90EE0004A6E93 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4307A07F1CC6D0910011D5DE /* Starscream.framework */; };
-		263993AD1CE90EE0004A6E93 /* SlackKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2661A6A41BBF62FF0026F67B /* SlackKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		263993B61CE90EED004A6E93 /* Client+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = C16C98791CE7D3DD00692776 /* Client+Utilities.swift */; };
-		263993B71CE90EED004A6E93 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1881C398E3C00BF7225 /* Channel.swift */; };
-		263993B81CE90EED004A6E93 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1921C398E3C00BF7225 /* User.swift */; };
-		263993BA1CE90EED004A6E93 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1891C398E3C00BF7225 /* Client.swift */; };
-		263993BB1CE90EED004A6E93 /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18A1C398E3C00BF7225 /* Event.swift */; };
-		263993BC1CE90EED004A6E93 /* Bot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1871C398E3C00BF7225 /* Bot.swift */; };
-		263993BD1CE90EED004A6E93 /* Client+EventDispatching.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A85FF71CE3BCEF00756C40 /* Client+EventDispatching.swift */; };
-		263993BE1CE90EED004A6E93 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18E1C398E3C00BF7225 /* File.swift */; };
-		263993BF1CE90EED004A6E93 /* WebAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2321C4DC61D0093B253 /* WebAPI.swift */; };
-		263993C01CE90EED004A6E93 /* Attachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26DF40341C7A0FA300E19241 /* Attachment.swift */; };
-		263993C11CE90EED004A6E93 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18F1C398E3C00BF7225 /* Message.swift */; };
-		263993C21CE90EED004A6E93 /* Team.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1901C398E3C00BF7225 /* Team.swift */; };
-		263993C31CE90EED004A6E93 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2301C4DC61D0093B253 /* Extensions.swift */; };
-		263993C41CE90EED004A6E93 /* UserGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1931C398E3C00BF7225 /* UserGroup.swift */; };
-		263993C51CE90EED004A6E93 /* SlackError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2601D61A1C7646B80012BF22 /* SlackError.swift */; };
-		263993C61CE90EED004A6E93 /* Client+EventHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A85FF81CE3BCEF00756C40 /* Client+EventHandling.swift */; };
-		263993C71CE90EED004A6E93 /* NetworkInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2311C4DC61D0093B253 /* NetworkInterface.swift */; };
-		263993C81CE90EED004A6E93 /* EventDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18B1C398E3C00BF7225 /* EventDelegate.swift */; };
-		263993CA1CE90EED004A6E93 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4307A07F1CC6D0910011D5DE /* Starscream.framework */; };
-		263993CC1CE90EED004A6E93 /* SlackKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2661A6A41BBF62FF0026F67B /* SlackKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		2678B5941D3151B900CE521A /* AuthorizeResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2678B5931D3151B900CE521A /* AuthorizeResponse.swift */; };
-		2678B5951D3151B900CE521A /* AuthorizeResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2678B5931D3151B900CE521A /* AuthorizeResponse.swift */; };
-		2678B5961D3151B900CE521A /* AuthorizeResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2678B5931D3151B900CE521A /* AuthorizeResponse.swift */; };
-		2678B5971D3151C600CE521A /* MessageActionRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B871D297A98004D4AB5 /* MessageActionRequest.swift */; };
-		2678B5981D3151C900CE521A /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B931D298E78004D4AB5 /* Response.swift */; };
-		2678B5991D3151CD00CE521A /* WebhookRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B981D298F25004D4AB5 /* WebhookRequest.swift */; };
-		269B475A1D3493DE0042D137 /* OAuthResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B47591D3493DE0042D137 /* OAuthResponse.swift */; };
-		269B475B1D3493DE0042D137 /* OAuthResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B47591D3493DE0042D137 /* OAuthResponse.swift */; };
-		269B475C1D3493DE0042D137 /* OAuthResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B47591D3493DE0042D137 /* OAuthResponse.swift */; };
-		269B475E1D3538E90042D137 /* SlackKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B475D1D3538E90042D137 /* SlackKit.swift */; };
-		269B475F1D3538E90042D137 /* SlackKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B475D1D3538E90042D137 /* SlackKit.swift */; };
-		269B47601D3538E90042D137 /* SlackKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B475D1D3538E90042D137 /* SlackKit.swift */; };
-		269B47621D3544240042D137 /* IncomingWebhook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B47611D3544240042D137 /* IncomingWebhook.swift */; };
-		269B47631D3544240042D137 /* IncomingWebhook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B47611D3544240042D137 /* IncomingWebhook.swift */; };
-		269B47641D3544240042D137 /* IncomingWebhook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B47611D3544240042D137 /* IncomingWebhook.swift */; };
-		269B47661D39AAA80042D137 /* MessageActionResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B47651D39AAA80042D137 /* MessageActionResponder.swift */; };
-		269B47671D39AAA80042D137 /* MessageActionResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B47651D39AAA80042D137 /* MessageActionResponder.swift */; };
-		269B47681D39AAA80042D137 /* MessageActionResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B47651D39AAA80042D137 /* MessageActionResponder.swift */; };
-		269B47C71D3AE25B0042D137 /* MessageActionServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B8F1D298E08004D4AB5 /* MessageActionServer.swift */; };
-		269B47C81D3AE25B0042D137 /* MessageActionServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B8F1D298E08004D4AB5 /* MessageActionServer.swift */; };
-		269B47C91D3AE2620042D137 /* Server.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B911D298E12004D4AB5 /* Server.swift */; };
-		269B47CA1D3AE2670042D137 /* WebhookServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC15001D260B1000FD3A53 /* WebhookServer.swift */; };
-		269B47CC1D3AE5670042D137 /* Swifter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 269B47CB1D3AE5670042D137 /* Swifter.framework */; };
-		269B47CE1D3C22FC0042D137 /* ClientOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B47CD1D3C22FC0042D137 /* ClientOptions.swift */; };
-		269B47CF1D3C22FC0042D137 /* ClientOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B47CD1D3C22FC0042D137 /* ClientOptions.swift */; };
-		269B47D01D3C22FC0042D137 /* ClientOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269B47CD1D3C22FC0042D137 /* ClientOptions.swift */; };
-		26B30B6C1D289FA0004D4AB5 /* Swifter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26B30B6B1D289FA0004D4AB5 /* Swifter.framework */; };
-		26B30B6F1D289FB2004D4AB5 /* Swifter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26B30B6E1D289FB2004D4AB5 /* Swifter.framework */; };
-		26B30B881D297A98004D4AB5 /* MessageActionRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B871D297A98004D4AB5 /* MessageActionRequest.swift */; };
-		26B30B901D298E08004D4AB5 /* MessageActionServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B8F1D298E08004D4AB5 /* MessageActionServer.swift */; };
-		26B30B921D298E12004D4AB5 /* Server.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B911D298E12004D4AB5 /* Server.swift */; };
-		26B30B941D298E78004D4AB5 /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B931D298E78004D4AB5 /* Response.swift */; };
-		26B30B951D298E78004D4AB5 /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B931D298E78004D4AB5 /* Response.swift */; };
-		26B30B961D298EE1004D4AB5 /* MessageActionRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B871D297A98004D4AB5 /* MessageActionRequest.swift */; };
-		26B30B971D298EED004D4AB5 /* Server.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B911D298E12004D4AB5 /* Server.swift */; };
-		26B30B991D298F25004D4AB5 /* WebhookRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B981D298F25004D4AB5 /* WebhookRequest.swift */; };
-		26B30B9A1D298F25004D4AB5 /* WebhookRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30B981D298F25004D4AB5 /* WebhookRequest.swift */; };
-		26B30BB61D2BC2E4004D4AB5 /* Scope.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30BB51D2BC2E4004D4AB5 /* Scope.swift */; };
-		26B30BB71D2BC2E4004D4AB5 /* Scope.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30BB51D2BC2E4004D4AB5 /* Scope.swift */; };
-		26B30BB81D2BC2E4004D4AB5 /* Scope.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30BB51D2BC2E4004D4AB5 /* Scope.swift */; };
-		26B30BC31D2DFF0D004D4AB5 /* OAuthServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30BC21D2DFF0D004D4AB5 /* OAuthServer.swift */; };
-		26B30BC41D2DFF0D004D4AB5 /* OAuthServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30BC21D2DFF0D004D4AB5 /* OAuthServer.swift */; };
-		26B30BC51D2DFF0D004D4AB5 /* OAuthServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30BC21D2DFF0D004D4AB5 /* OAuthServer.swift */; };
-		26B30BC71D2DFF7D004D4AB5 /* AuthorizeRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30BC61D2DFF7D004D4AB5 /* AuthorizeRequest.swift */; };
-		26B30BC81D2DFF7D004D4AB5 /* AuthorizeRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30BC61D2DFF7D004D4AB5 /* AuthorizeRequest.swift */; };
-		26B30BC91D2DFF7D004D4AB5 /* AuthorizeRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B30BC61D2DFF7D004D4AB5 /* AuthorizeRequest.swift */; };
-		26BBA1941C398E3C00BF7225 /* Bot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1871C398E3C00BF7225 /* Bot.swift */; };
-		26BBA1951C398E3C00BF7225 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1881C398E3C00BF7225 /* Channel.swift */; };
-		26BBA1961C398E3C00BF7225 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1891C398E3C00BF7225 /* Client.swift */; };
-		26BBA1971C398E3C00BF7225 /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18A1C398E3C00BF7225 /* Event.swift */; };
-		26BBA1981C398E3C00BF7225 /* EventDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18B1C398E3C00BF7225 /* EventDelegate.swift */; };
-		26BBA19B1C398E3C00BF7225 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18E1C398E3C00BF7225 /* File.swift */; };
-		26BBA19C1C398E3C00BF7225 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18F1C398E3C00BF7225 /* Message.swift */; };
-		26BBA19D1C398E3C00BF7225 /* Team.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1901C398E3C00BF7225 /* Team.swift */; };
-		26BBA19F1C398E3C00BF7225 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1921C398E3C00BF7225 /* User.swift */; };
-		26BBA1A01C398E3C00BF7225 /* UserGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1931C398E3C00BF7225 /* UserGroup.swift */; };
-		26DF40351C7A0FA300E19241 /* Attachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26DF40341C7A0FA300E19241 /* Attachment.swift */; };
-		26EC14C11D1EF16500FD3A53 /* AttachmentField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C01D1EF16500FD3A53 /* AttachmentField.swift */; };
-		26EC14C21D1EF16500FD3A53 /* AttachmentField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C01D1EF16500FD3A53 /* AttachmentField.swift */; };
-		26EC14C31D1EF16500FD3A53 /* AttachmentField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C01D1EF16500FD3A53 /* AttachmentField.swift */; };
-		26EC14C91D1EF17400FD3A53 /* Comment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C41D1EF17400FD3A53 /* Comment.swift */; };
-		26EC14CA1D1EF17400FD3A53 /* Comment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C41D1EF17400FD3A53 /* Comment.swift */; };
-		26EC14CB1D1EF17400FD3A53 /* Comment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C41D1EF17400FD3A53 /* Comment.swift */; };
-		26EC14CC1D1EF17400FD3A53 /* CustomProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C51D1EF17400FD3A53 /* CustomProfile.swift */; };
-		26EC14CD1D1EF17400FD3A53 /* CustomProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C51D1EF17400FD3A53 /* CustomProfile.swift */; };
-		26EC14CE1D1EF17400FD3A53 /* CustomProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C51D1EF17400FD3A53 /* CustomProfile.swift */; };
-		26EC14CF1D1EF17400FD3A53 /* CustomProfileField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C61D1EF17400FD3A53 /* CustomProfileField.swift */; };
-		26EC14D01D1EF17400FD3A53 /* CustomProfileField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C61D1EF17400FD3A53 /* CustomProfileField.swift */; };
-		26EC14D11D1EF17400FD3A53 /* CustomProfileField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C61D1EF17400FD3A53 /* CustomProfileField.swift */; };
-		26EC14D21D1EF17400FD3A53 /* DoNotDisturbStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C71D1EF17400FD3A53 /* DoNotDisturbStatus.swift */; };
-		26EC14D31D1EF17400FD3A53 /* DoNotDisturbStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C71D1EF17400FD3A53 /* DoNotDisturbStatus.swift */; };
-		26EC14D41D1EF17400FD3A53 /* DoNotDisturbStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C71D1EF17400FD3A53 /* DoNotDisturbStatus.swift */; };
-		26EC14D51D1EF17400FD3A53 /* Edited.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C81D1EF17400FD3A53 /* Edited.swift */; };
-		26EC14D61D1EF17400FD3A53 /* Edited.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C81D1EF17400FD3A53 /* Edited.swift */; };
-		26EC14D71D1EF17400FD3A53 /* Edited.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14C81D1EF17400FD3A53 /* Edited.swift */; };
-		26EC14DA1D1EF17E00FD3A53 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14D81D1EF17E00FD3A53 /* History.swift */; };
-		26EC14DB1D1EF17E00FD3A53 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14D81D1EF17E00FD3A53 /* History.swift */; };
-		26EC14DC1D1EF17E00FD3A53 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14D81D1EF17E00FD3A53 /* History.swift */; };
-		26EC14DD1D1EF17E00FD3A53 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14D91D1EF17E00FD3A53 /* Item.swift */; };
-		26EC14DE1D1EF17E00FD3A53 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14D91D1EF17E00FD3A53 /* Item.swift */; };
-		26EC14DF1D1EF17E00FD3A53 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14D91D1EF17E00FD3A53 /* Item.swift */; };
-		26EC14E11D1EF18700FD3A53 /* Reaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14E01D1EF18700FD3A53 /* Reaction.swift */; };
-		26EC14E21D1EF18700FD3A53 /* Reaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14E01D1EF18700FD3A53 /* Reaction.swift */; };
-		26EC14E31D1EF18700FD3A53 /* Reaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14E01D1EF18700FD3A53 /* Reaction.swift */; };
-		26EC14E61D1EF18F00FD3A53 /* TeamIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14E41D1EF18F00FD3A53 /* TeamIcon.swift */; };
-		26EC14E71D1EF18F00FD3A53 /* TeamIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14E41D1EF18F00FD3A53 /* TeamIcon.swift */; };
-		26EC14E81D1EF18F00FD3A53 /* TeamIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14E41D1EF18F00FD3A53 /* TeamIcon.swift */; };
-		26EC14E91D1EF18F00FD3A53 /* Topic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14E51D1EF18F00FD3A53 /* Topic.swift */; };
-		26EC14EA1D1EF18F00FD3A53 /* Topic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14E51D1EF18F00FD3A53 /* Topic.swift */; };
-		26EC14EB1D1EF18F00FD3A53 /* Topic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14E51D1EF18F00FD3A53 /* Topic.swift */; };
-		26EC14F91D1F355A00FD3A53 /* Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14F81D1F355A00FD3A53 /* Action.swift */; };
-		26EC14FA1D1F355A00FD3A53 /* Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14F81D1F355A00FD3A53 /* Action.swift */; };
-		26EC14FB1D1F355A00FD3A53 /* Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC14F81D1F355A00FD3A53 /* Action.swift */; };
-		26EC15011D260B1000FD3A53 /* WebhookServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC15001D260B1000FD3A53 /* WebhookServer.swift */; };
-		26EC15021D260B1000FD3A53 /* WebhookServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EC15001D260B1000FD3A53 /* WebhookServer.swift */; };
-		4307A0801CC6D0910011D5DE /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4307A07F1CC6D0910011D5DE /* Starscream.framework */; };
-		C16C987A1CE7D3DD00692776 /* Client+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = C16C98791CE7D3DD00692776 /* Client+Utilities.swift */; };
-		C1A85FF91CE3BCEF00756C40 /* Client+EventDispatching.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A85FF71CE3BCEF00756C40 /* Client+EventDispatching.swift */; };
-		C1A85FFA1CE3BCEF00756C40 /* Client+EventHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A85FF81CE3BCEF00756C40 /* Client+EventHandling.swift */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		2601D61A1C7646B80012BF22 /* SlackError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SlackError.swift; path = Sources/SlackError.swift; sourceTree = "<group>"; };
-		26072A341BB48B3A00CD650C /* SlackKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SlackKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		260EC2301C4DC61D0093B253 /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = Sources/Extensions.swift; sourceTree = "<group>"; };
-		260EC2311C4DC61D0093B253 /* NetworkInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NetworkInterface.swift; path = Sources/NetworkInterface.swift; sourceTree = "<group>"; };
-		260EC2321C4DC61D0093B253 /* WebAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WebAPI.swift; path = Sources/WebAPI.swift; sourceTree = "<group>"; };
-		263993B21CE90EE0004A6E93 /* SlackKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SlackKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		263993D11CE90EED004A6E93 /* SlackKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SlackKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		2661A6A41BBF62FF0026F67B /* SlackKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SlackKit.h; sourceTree = "<group>"; };
-		2678B5931D3151B900CE521A /* AuthorizeResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AuthorizeResponse.swift; path = Sources/AuthorizeResponse.swift; sourceTree = "<group>"; };
-		268E46131CE8F79D009F19CC /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-iOS.plist"; path = "Supporting Files/Info-iOS.plist"; sourceTree = "<group>"; };
-		268E46141CE8F79D009F19CC /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-tvOS.plist"; path = "Supporting Files/Info-tvOS.plist"; sourceTree = "<group>"; };
-		268E46151CE8F79D009F19CC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Supporting Files/Info.plist"; sourceTree = "<group>"; };
-		269B47591D3493DE0042D137 /* OAuthResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OAuthResponse.swift; path = Sources/OAuthResponse.swift; sourceTree = "<group>"; };
-		269B475D1D3538E90042D137 /* SlackKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SlackKit.swift; path = Sources/SlackKit.swift; sourceTree = "<group>"; };
-		269B47611D3544240042D137 /* IncomingWebhook.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = IncomingWebhook.swift; path = Sources/IncomingWebhook.swift; sourceTree = "<group>"; };
-		269B47651D39AAA80042D137 /* MessageActionResponder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MessageActionResponder.swift; path = Sources/MessageActionResponder.swift; sourceTree = "<group>"; };
-		269B47CB1D3AE5670042D137 /* Swifter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Swifter.framework; path = Carthage/Build/tvOS/Swifter.framework; sourceTree = "<group>"; };
-		269B47CD1D3C22FC0042D137 /* ClientOptions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ClientOptions.swift; path = Sources/ClientOptions.swift; sourceTree = "<group>"; };
-		26B30B6B1D289FA0004D4AB5 /* Swifter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Swifter.framework; path = Carthage/Build/Mac/Swifter.framework; sourceTree = "<group>"; };
-		26B30B6E1D289FB2004D4AB5 /* Swifter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Swifter.framework; path = Carthage/Build/iOS/Swifter.framework; sourceTree = "<group>"; };
-		26B30B871D297A98004D4AB5 /* MessageActionRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MessageActionRequest.swift; path = Sources/MessageActionRequest.swift; sourceTree = "<group>"; };
-		26B30B8F1D298E08004D4AB5 /* MessageActionServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MessageActionServer.swift; path = Sources/MessageActionServer.swift; sourceTree = "<group>"; };
-		26B30B911D298E12004D4AB5 /* Server.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Server.swift; path = Sources/Server.swift; sourceTree = "<group>"; };
-		26B30B931D298E78004D4AB5 /* Response.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Response.swift; path = Sources/Response.swift; sourceTree = "<group>"; };
-		26B30B981D298F25004D4AB5 /* WebhookRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WebhookRequest.swift; path = Sources/WebhookRequest.swift; sourceTree = "<group>"; };
-		26B30BB51D2BC2E4004D4AB5 /* Scope.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Scope.swift; path = Sources/Scope.swift; sourceTree = "<group>"; };
-		26B30BC21D2DFF0D004D4AB5 /* OAuthServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OAuthServer.swift; path = Sources/OAuthServer.swift; sourceTree = "<group>"; };
-		26B30BC61D2DFF7D004D4AB5 /* AuthorizeRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AuthorizeRequest.swift; path = Sources/AuthorizeRequest.swift; sourceTree = "<group>"; };
-		26BBA1871C398E3C00BF7225 /* Bot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Bot.swift; path = Sources/Bot.swift; sourceTree = "<group>"; };
-		26BBA1881C398E3C00BF7225 /* Channel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Channel.swift; path = Sources/Channel.swift; sourceTree = "<group>"; };
-		26BBA1891C398E3C00BF7225 /* Client.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Client.swift; path = Sources/Client.swift; sourceTree = "<group>"; };
-		26BBA18A1C398E3C00BF7225 /* Event.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Event.swift; path = Sources/Event.swift; sourceTree = "<group>"; };
-		26BBA18B1C398E3C00BF7225 /* EventDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EventDelegate.swift; path = Sources/EventDelegate.swift; sourceTree = "<group>"; };
-		26BBA18E1C398E3C00BF7225 /* File.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = File.swift; path = Sources/File.swift; sourceTree = "<group>"; };
-		26BBA18F1C398E3C00BF7225 /* Message.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Message.swift; path = Sources/Message.swift; sourceTree = "<group>"; };
-		26BBA1901C398E3C00BF7225 /* Team.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Team.swift; path = Sources/Team.swift; sourceTree = "<group>"; };
-		26BBA1921C398E3C00BF7225 /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = User.swift; path = Sources/User.swift; sourceTree = "<group>"; };
-		26BBA1931C398E3C00BF7225 /* UserGroup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UserGroup.swift; path = Sources/UserGroup.swift; sourceTree = "<group>"; };
-		26DF40341C7A0FA300E19241 /* Attachment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Attachment.swift; path = Sources/Attachment.swift; sourceTree = "<group>"; };
-		26EC14C01D1EF16500FD3A53 /* AttachmentField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AttachmentField.swift; path = Sources/AttachmentField.swift; sourceTree = "<group>"; };
-		26EC14C41D1EF17400FD3A53 /* Comment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Comment.swift; path = Sources/Comment.swift; sourceTree = "<group>"; };
-		26EC14C51D1EF17400FD3A53 /* CustomProfile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CustomProfile.swift; path = Sources/CustomProfile.swift; sourceTree = "<group>"; };
-		26EC14C61D1EF17400FD3A53 /* CustomProfileField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CustomProfileField.swift; path = Sources/CustomProfileField.swift; sourceTree = "<group>"; };
-		26EC14C71D1EF17400FD3A53 /* DoNotDisturbStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DoNotDisturbStatus.swift; path = Sources/DoNotDisturbStatus.swift; sourceTree = "<group>"; };
-		26EC14C81D1EF17400FD3A53 /* Edited.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Edited.swift; path = Sources/Edited.swift; sourceTree = "<group>"; };
-		26EC14D81D1EF17E00FD3A53 /* History.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = History.swift; path = Sources/History.swift; sourceTree = "<group>"; };
-		26EC14D91D1EF17E00FD3A53 /* Item.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Item.swift; path = Sources/Item.swift; sourceTree = "<group>"; };
-		26EC14E01D1EF18700FD3A53 /* Reaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Reaction.swift; path = Sources/Reaction.swift; sourceTree = "<group>"; };
-		26EC14E41D1EF18F00FD3A53 /* TeamIcon.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TeamIcon.swift; path = Sources/TeamIcon.swift; sourceTree = "<group>"; };
-		26EC14E51D1EF18F00FD3A53 /* Topic.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Topic.swift; path = Sources/Topic.swift; sourceTree = "<group>"; };
-		26EC14F81D1F355A00FD3A53 /* Action.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Action.swift; path = Sources/Action.swift; sourceTree = "<group>"; };
-		26EC15001D260B1000FD3A53 /* WebhookServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WebhookServer.swift; path = Sources/WebhookServer.swift; sourceTree = "<group>"; };
-		4307A07F1CC6D0910011D5DE /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = Carthage/Build/Mac/Starscream.framework; sourceTree = "<group>"; };
-		C16C98791CE7D3DD00692776 /* Client+Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Client+Utilities.swift"; path = "Sources/Client+Utilities.swift"; sourceTree = "<group>"; };
-		C1A85FF71CE3BCEF00756C40 /* Client+EventDispatching.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Client+EventDispatching.swift"; path = "Sources/Client+EventDispatching.swift"; sourceTree = "<group>"; };
-		C1A85FF81CE3BCEF00756C40 /* Client+EventHandling.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Client+EventHandling.swift"; path = "Sources/Client+EventHandling.swift"; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		26072A301BB48B3A00CD650C /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4307A0801CC6D0910011D5DE /* Starscream.framework in Frameworks */,
-				26B30B6C1D289FA0004D4AB5 /* Swifter.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		263993AA1CE90EE0004A6E93 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				263993AB1CE90EE0004A6E93 /* Starscream.framework in Frameworks */,
-				26B30B6F1D289FB2004D4AB5 /* Swifter.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		263993C91CE90EED004A6E93 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				263993CA1CE90EED004A6E93 /* Starscream.framework in Frameworks */,
-				269B47CC1D3AE5670042D137 /* Swifter.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		26072A2A1BB48B3A00CD650C = {
-			isa = PBXGroup;
-			children = (
-				2661A6811BBF60E60026F67B /* SlackKit */,
-				26072A351BB48B3A00CD650C /* Products */,
-				CA70A3A1A9A1A259960DFBCF /* Frameworks */,
-			);
-			sourceTree = "<group>";
-		};
-		26072A351BB48B3A00CD650C /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				26072A341BB48B3A00CD650C /* SlackKit.framework */,
-				263993B21CE90EE0004A6E93 /* SlackKit.framework */,
-				263993D11CE90EED004A6E93 /* SlackKit.framework */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		2661A6811BBF60E60026F67B /* SlackKit */ = {
-			isa = PBXGroup;
-			children = (
-				26BBA1891C398E3C00BF7225 /* Client.swift */,
-				C1A85FF71CE3BCEF00756C40 /* Client+EventDispatching.swift */,
-				C1A85FF81CE3BCEF00756C40 /* Client+EventHandling.swift */,
-				C16C98791CE7D3DD00692776 /* Client+Utilities.swift */,
-				26BBA18B1C398E3C00BF7225 /* EventDelegate.swift */,
-				260EC2301C4DC61D0093B253 /* Extensions.swift */,
-				269B47611D3544240042D137 /* IncomingWebhook.swift */,
-				260EC2311C4DC61D0093B253 /* NetworkInterface.swift */,
-				26B30B8F1D298E08004D4AB5 /* MessageActionServer.swift */,
-				269B47651D39AAA80042D137 /* MessageActionResponder.swift */,
-				26B30BC21D2DFF0D004D4AB5 /* OAuthServer.swift */,
-				26B30B911D298E12004D4AB5 /* Server.swift */,
-				269B475D1D3538E90042D137 /* SlackKit.swift */,
-				260EC2321C4DC61D0093B253 /* WebAPI.swift */,
-				26EC15001D260B1000FD3A53 /* WebhookServer.swift */,
-				26EC14B31D1B974500FD3A53 /* Models */,
-				268E46161CE8F7A2009F19CC /* Supporting Files */,
-			);
-			path = SlackKit;
-			sourceTree = "<group>";
-		};
-		268E46161CE8F7A2009F19CC /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				2661A6A41BBF62FF0026F67B /* SlackKit.h */,
-				268E46151CE8F79D009F19CC /* Info.plist */,
-				268E46131CE8F79D009F19CC /* Info-iOS.plist */,
-				268E46141CE8F79D009F19CC /* Info-tvOS.plist */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		26B30B9B1D29AB1E004D4AB5 /* Server */ = {
-			isa = PBXGroup;
-			children = (
-				26B30B871D297A98004D4AB5 /* MessageActionRequest.swift */,
-				26B30B931D298E78004D4AB5 /* Response.swift */,
-				26B30B981D298F25004D4AB5 /* WebhookRequest.swift */,
-			);
-			name = Server;
-			sourceTree = "<group>";
-		};
-		26B30BB91D2BC2EA004D4AB5 /* Auth */ = {
-			isa = PBXGroup;
-			children = (
-				26B30BC61D2DFF7D004D4AB5 /* AuthorizeRequest.swift */,
-				2678B5931D3151B900CE521A /* AuthorizeResponse.swift */,
-				26B30BB51D2BC2E4004D4AB5 /* Scope.swift */,
-				269B47591D3493DE0042D137 /* OAuthResponse.swift */,
-			);
-			name = Auth;
-			sourceTree = "<group>";
-		};
-		26EC14B31D1B974500FD3A53 /* Models */ = {
-			isa = PBXGroup;
-			children = (
-				26EC14F81D1F355A00FD3A53 /* Action.swift */,
-				26DF40341C7A0FA300E19241 /* Attachment.swift */,
-				26EC14C01D1EF16500FD3A53 /* AttachmentField.swift */,
-				26BBA1871C398E3C00BF7225 /* Bot.swift */,
-				26BBA1881C398E3C00BF7225 /* Channel.swift */,
-				269B47CD1D3C22FC0042D137 /* ClientOptions.swift */,
-				26EC14C41D1EF17400FD3A53 /* Comment.swift */,
-				26EC14C51D1EF17400FD3A53 /* CustomProfile.swift */,
-				26EC14C61D1EF17400FD3A53 /* CustomProfileField.swift */,
-				26EC14C71D1EF17400FD3A53 /* DoNotDisturbStatus.swift */,
-				26EC14C81D1EF17400FD3A53 /* Edited.swift */,
-				26BBA18A1C398E3C00BF7225 /* Event.swift */,
-				26BBA18E1C398E3C00BF7225 /* File.swift */,
-				26EC14D81D1EF17E00FD3A53 /* History.swift */,
-				26EC14D91D1EF17E00FD3A53 /* Item.swift */,
-				26BBA18F1C398E3C00BF7225 /* Message.swift */,
-				26EC14E01D1EF18700FD3A53 /* Reaction.swift */,
-				2601D61A1C7646B80012BF22 /* SlackError.swift */,
-				26BBA1901C398E3C00BF7225 /* Team.swift */,
-				26EC14E41D1EF18F00FD3A53 /* TeamIcon.swift */,
-				26EC14E51D1EF18F00FD3A53 /* Topic.swift */,
-				26BBA1921C398E3C00BF7225 /* User.swift */,
-				26BBA1931C398E3C00BF7225 /* UserGroup.swift */,
-				26B30BB91D2BC2EA004D4AB5 /* Auth */,
-				26B30B9B1D29AB1E004D4AB5 /* Server */,
-			);
-			name = Models;
-			sourceTree = "<group>";
-		};
-		CA70A3A1A9A1A259960DFBCF /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				269B47CB1D3AE5670042D137 /* Swifter.framework */,
-				26B30B6E1D289FB2004D4AB5 /* Swifter.framework */,
-				26B30B6B1D289FA0004D4AB5 /* Swifter.framework */,
-				4307A07F1CC6D0910011D5DE /* Starscream.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		26072A311BB48B3A00CD650C /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				263993901CE90C87004A6E93 /* SlackKit.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		263993AC1CE90EE0004A6E93 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				263993AD1CE90EE0004A6E93 /* SlackKit.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		263993CB1CE90EED004A6E93 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				263993CC1CE90EED004A6E93 /* SlackKit.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		26072A331BB48B3A00CD650C /* SlackKit OS X */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 26072A3C1BB48B3B00CD650C /* Build configuration list for PBXNativeTarget "SlackKit OS X" */;
-			buildPhases = (
-				26072A2F1BB48B3A00CD650C /* Sources */,
-				26072A301BB48B3A00CD650C /* Frameworks */,
-				26072A311BB48B3A00CD650C /* Headers */,
-				26072A321BB48B3A00CD650C /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "SlackKit OS X";
-			productName = SlackRTMKit;
-			productReference = 26072A341BB48B3A00CD650C /* SlackKit.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-		263993951CE90EE0004A6E93 /* SlackKit iOS */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 263993AF1CE90EE0004A6E93 /* Build configuration list for PBXNativeTarget "SlackKit iOS" */;
-			buildPhases = (
-				263993961CE90EE0004A6E93 /* Sources */,
-				263993AA1CE90EE0004A6E93 /* Frameworks */,
-				263993AC1CE90EE0004A6E93 /* Headers */,
-				263993AE1CE90EE0004A6E93 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "SlackKit iOS";
-			productName = SlackRTMKit;
-			productReference = 263993B21CE90EE0004A6E93 /* SlackKit.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-		263993B41CE90EED004A6E93 /* SlackKit tvOS */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 263993CE1CE90EED004A6E93 /* Build configuration list for PBXNativeTarget "SlackKit tvOS" */;
-			buildPhases = (
-				263993B51CE90EED004A6E93 /* Sources */,
-				263993C91CE90EED004A6E93 /* Frameworks */,
-				263993CB1CE90EED004A6E93 /* Headers */,
-				263993CD1CE90EED004A6E93 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "SlackKit tvOS";
-			productName = SlackRTMKit;
-			productReference = 263993D11CE90EED004A6E93 /* SlackKit.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		26072A2B1BB48B3A00CD650C /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0730;
-				ORGANIZATIONNAME = "Launch Software LLC";
-				TargetAttributes = {
-					26072A331BB48B3A00CD650C = {
-						CreatedOnToolsVersion = 7.0;
-					};
-				};
-			};
-			buildConfigurationList = 26072A2E1BB48B3A00CD650C /* Build configuration list for PBXProject "SlackKit" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 26072A2A1BB48B3A00CD650C;
-			productRefGroup = 26072A351BB48B3A00CD650C /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				26072A331BB48B3A00CD650C /* SlackKit OS X */,
-				263993951CE90EE0004A6E93 /* SlackKit iOS */,
-				263993B41CE90EED004A6E93 /* SlackKit tvOS */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		26072A321BB48B3A00CD650C /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		263993AE1CE90EE0004A6E93 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		263993CD1CE90EED004A6E93 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		26072A2F1BB48B3A00CD650C /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2678B5941D3151B900CE521A /* AuthorizeResponse.swift in Sources */,
-				26B30B921D298E12004D4AB5 /* Server.swift in Sources */,
-				269B47CE1D3C22FC0042D137 /* ClientOptions.swift in Sources */,
-				269B47621D3544240042D137 /* IncomingWebhook.swift in Sources */,
-				C16C987A1CE7D3DD00692776 /* Client+Utilities.swift in Sources */,
-				26BBA1951C398E3C00BF7225 /* Channel.swift in Sources */,
-				26B30B901D298E08004D4AB5 /* MessageActionServer.swift in Sources */,
-				26B30B941D298E78004D4AB5 /* Response.swift in Sources */,
-				26EC14CF1D1EF17400FD3A53 /* CustomProfileField.swift in Sources */,
-				269B47661D39AAA80042D137 /* MessageActionResponder.swift in Sources */,
-				26BBA19F1C398E3C00BF7225 /* User.swift in Sources */,
-				26EC14DD1D1EF17E00FD3A53 /* Item.swift in Sources */,
-				26EC15011D260B1000FD3A53 /* WebhookServer.swift in Sources */,
-				26EC14CC1D1EF17400FD3A53 /* CustomProfile.swift in Sources */,
-				26BBA1961C398E3C00BF7225 /* Client.swift in Sources */,
-				26B30B881D297A98004D4AB5 /* MessageActionRequest.swift in Sources */,
-				269B475E1D3538E90042D137 /* SlackKit.swift in Sources */,
-				26B30BC71D2DFF7D004D4AB5 /* AuthorizeRequest.swift in Sources */,
-				26BBA1971C398E3C00BF7225 /* Event.swift in Sources */,
-				26EC14D21D1EF17400FD3A53 /* DoNotDisturbStatus.swift in Sources */,
-				26BBA1941C398E3C00BF7225 /* Bot.swift in Sources */,
-				26EC14E61D1EF18F00FD3A53 /* TeamIcon.swift in Sources */,
-				C1A85FF91CE3BCEF00756C40 /* Client+EventDispatching.swift in Sources */,
-				26BBA19B1C398E3C00BF7225 /* File.swift in Sources */,
-				26EC14F91D1F355A00FD3A53 /* Action.swift in Sources */,
-				26B30BC31D2DFF0D004D4AB5 /* OAuthServer.swift in Sources */,
-				26EC14D51D1EF17400FD3A53 /* Edited.swift in Sources */,
-				260EC2351C4DC61D0093B253 /* WebAPI.swift in Sources */,
-				26EC14E11D1EF18700FD3A53 /* Reaction.swift in Sources */,
-				26B30BB61D2BC2E4004D4AB5 /* Scope.swift in Sources */,
-				26EC14E91D1EF18F00FD3A53 /* Topic.swift in Sources */,
-				26DF40351C7A0FA300E19241 /* Attachment.swift in Sources */,
-				26BBA19C1C398E3C00BF7225 /* Message.swift in Sources */,
-				26BBA19D1C398E3C00BF7225 /* Team.swift in Sources */,
-				260EC2331C4DC61D0093B253 /* Extensions.swift in Sources */,
-				26BBA1A01C398E3C00BF7225 /* UserGroup.swift in Sources */,
-				2601D61B1C7646B80012BF22 /* SlackError.swift in Sources */,
-				26EC14DA1D1EF17E00FD3A53 /* History.swift in Sources */,
-				269B475A1D3493DE0042D137 /* OAuthResponse.swift in Sources */,
-				C1A85FFA1CE3BCEF00756C40 /* Client+EventHandling.swift in Sources */,
-				26B30B991D298F25004D4AB5 /* WebhookRequest.swift in Sources */,
-				26EC14C91D1EF17400FD3A53 /* Comment.swift in Sources */,
-				26EC14C11D1EF16500FD3A53 /* AttachmentField.swift in Sources */,
-				260EC2341C4DC61D0093B253 /* NetworkInterface.swift in Sources */,
-				26BBA1981C398E3C00BF7225 /* EventDelegate.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		263993961CE90EE0004A6E93 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				26B30B961D298EE1004D4AB5 /* MessageActionRequest.swift in Sources */,
-				263993971CE90EE0004A6E93 /* Client+Utilities.swift in Sources */,
-				269B47CF1D3C22FC0042D137 /* ClientOptions.swift in Sources */,
-				269B47C71D3AE25B0042D137 /* MessageActionServer.swift in Sources */,
-				263993981CE90EE0004A6E93 /* Channel.swift in Sources */,
-				26EC14D01D1EF17400FD3A53 /* CustomProfileField.swift in Sources */,
-				263993991CE90EE0004A6E93 /* User.swift in Sources */,
-				26EC14DE1D1EF17E00FD3A53 /* Item.swift in Sources */,
-				269B475B1D3493DE0042D137 /* OAuthResponse.swift in Sources */,
-				26EC15021D260B1000FD3A53 /* WebhookServer.swift in Sources */,
-				26B30BC41D2DFF0D004D4AB5 /* OAuthServer.swift in Sources */,
-				26EC14CD1D1EF17400FD3A53 /* CustomProfile.swift in Sources */,
-				2639939B1CE90EE0004A6E93 /* Client.swift in Sources */,
-				2639939C1CE90EE0004A6E93 /* Event.swift in Sources */,
-				26B30BC81D2DFF7D004D4AB5 /* AuthorizeRequest.swift in Sources */,
-				2678B5951D3151B900CE521A /* AuthorizeResponse.swift in Sources */,
-				26EC14D31D1EF17400FD3A53 /* DoNotDisturbStatus.swift in Sources */,
-				2639939D1CE90EE0004A6E93 /* Bot.swift in Sources */,
-				26EC14E71D1EF18F00FD3A53 /* TeamIcon.swift in Sources */,
-				2639939E1CE90EE0004A6E93 /* Client+EventDispatching.swift in Sources */,
-				26B30B971D298EED004D4AB5 /* Server.swift in Sources */,
-				2639939F1CE90EE0004A6E93 /* File.swift in Sources */,
-				26B30B951D298E78004D4AB5 /* Response.swift in Sources */,
-				26EC14FA1D1F355A00FD3A53 /* Action.swift in Sources */,
-				26EC14D61D1EF17400FD3A53 /* Edited.swift in Sources */,
-				263993A01CE90EE0004A6E93 /* WebAPI.swift in Sources */,
-				26B30B9A1D298F25004D4AB5 /* WebhookRequest.swift in Sources */,
-				26EC14E21D1EF18700FD3A53 /* Reaction.swift in Sources */,
-				26EC14EA1D1EF18F00FD3A53 /* Topic.swift in Sources */,
-				263993A11CE90EE0004A6E93 /* Attachment.swift in Sources */,
-				26B30BB71D2BC2E4004D4AB5 /* Scope.swift in Sources */,
-				263993A21CE90EE0004A6E93 /* Message.swift in Sources */,
-				263993A31CE90EE0004A6E93 /* Team.swift in Sources */,
-				263993A41CE90EE0004A6E93 /* Extensions.swift in Sources */,
-				263993A51CE90EE0004A6E93 /* UserGroup.swift in Sources */,
-				263993A61CE90EE0004A6E93 /* SlackError.swift in Sources */,
-				269B475F1D3538E90042D137 /* SlackKit.swift in Sources */,
-				26EC14DB1D1EF17E00FD3A53 /* History.swift in Sources */,
-				263993A71CE90EE0004A6E93 /* Client+EventHandling.swift in Sources */,
-				269B47631D3544240042D137 /* IncomingWebhook.swift in Sources */,
-				269B47671D39AAA80042D137 /* MessageActionResponder.swift in Sources */,
-				26EC14CA1D1EF17400FD3A53 /* Comment.swift in Sources */,
-				26EC14C21D1EF16500FD3A53 /* AttachmentField.swift in Sources */,
-				263993A81CE90EE0004A6E93 /* NetworkInterface.swift in Sources */,
-				263993A91CE90EE0004A6E93 /* EventDelegate.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		263993B51CE90EED004A6E93 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				263993B61CE90EED004A6E93 /* Client+Utilities.swift in Sources */,
-				263993B71CE90EED004A6E93 /* Channel.swift in Sources */,
-				269B47D01D3C22FC0042D137 /* ClientOptions.swift in Sources */,
-				26EC14D11D1EF17400FD3A53 /* CustomProfileField.swift in Sources */,
-				263993B81CE90EED004A6E93 /* User.swift in Sources */,
-				26EC14DF1D1EF17E00FD3A53 /* Item.swift in Sources */,
-				2678B5981D3151C900CE521A /* Response.swift in Sources */,
-				269B475C1D3493DE0042D137 /* OAuthResponse.swift in Sources */,
-				26EC14CE1D1EF17400FD3A53 /* CustomProfile.swift in Sources */,
-				269B47C91D3AE2620042D137 /* Server.swift in Sources */,
-				263993BA1CE90EED004A6E93 /* Client.swift in Sources */,
-				263993BB1CE90EED004A6E93 /* Event.swift in Sources */,
-				269B47CA1D3AE2670042D137 /* WebhookServer.swift in Sources */,
-				26EC14D41D1EF17400FD3A53 /* DoNotDisturbStatus.swift in Sources */,
-				263993BC1CE90EED004A6E93 /* Bot.swift in Sources */,
-				26EC14E81D1EF18F00FD3A53 /* TeamIcon.swift in Sources */,
-				263993BD1CE90EED004A6E93 /* Client+EventDispatching.swift in Sources */,
-				263993BE1CE90EED004A6E93 /* File.swift in Sources */,
-				26B30BB81D2BC2E4004D4AB5 /* Scope.swift in Sources */,
-				269B47601D3538E90042D137 /* SlackKit.swift in Sources */,
-				2678B5991D3151CD00CE521A /* WebhookRequest.swift in Sources */,
-				26EC14FB1D1F355A00FD3A53 /* Action.swift in Sources */,
-				26EC14D71D1EF17400FD3A53 /* Edited.swift in Sources */,
-				263993BF1CE90EED004A6E93 /* WebAPI.swift in Sources */,
-				2678B5961D3151B900CE521A /* AuthorizeResponse.swift in Sources */,
-				26EC14E31D1EF18700FD3A53 /* Reaction.swift in Sources */,
-				26EC14EB1D1EF18F00FD3A53 /* Topic.swift in Sources */,
-				26B30BC51D2DFF0D004D4AB5 /* OAuthServer.swift in Sources */,
-				263993C01CE90EED004A6E93 /* Attachment.swift in Sources */,
-				263993C11CE90EED004A6E93 /* Message.swift in Sources */,
-				263993C21CE90EED004A6E93 /* Team.swift in Sources */,
-				269B47681D39AAA80042D137 /* MessageActionResponder.swift in Sources */,
-				263993C31CE90EED004A6E93 /* Extensions.swift in Sources */,
-				2678B5971D3151C600CE521A /* MessageActionRequest.swift in Sources */,
-				263993C41CE90EED004A6E93 /* UserGroup.swift in Sources */,
-				269B47C81D3AE25B0042D137 /* MessageActionServer.swift in Sources */,
-				263993C51CE90EED004A6E93 /* SlackError.swift in Sources */,
-				26EC14DC1D1EF17E00FD3A53 /* History.swift in Sources */,
-				263993C61CE90EED004A6E93 /* Client+EventHandling.swift in Sources */,
-				26B30BC91D2DFF7D004D4AB5 /* AuthorizeRequest.swift in Sources */,
-				269B47641D3544240042D137 /* IncomingWebhook.swift in Sources */,
-				26EC14CB1D1EF17400FD3A53 /* Comment.swift in Sources */,
-				26EC14C31D1EF16500FD3A53 /* AttachmentField.swift in Sources */,
-				263993C71CE90EED004A6E93 /* NetworkInterface.swift in Sources */,
-				263993C81CE90EED004A6E93 /* EventDelegate.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		26072A3A1BB48B3B00CD650C /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		26072A3B1BB48B3B00CD650C /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = macosx;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		26072A3D1BB48B3B00CD650C /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "-";
-				COMBINE_HIDPI_IMAGES = YES;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/Mac",
-				);
-				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/SlackKit/Supporting Files/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = com.launchsoft.SlackKit;
-				PRODUCT_NAME = SlackKit;
-				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-			};
-			name = Debug;
-		};
-		26072A3E1BB48B3B00CD650C /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "-";
-				COMBINE_HIDPI_IMAGES = YES;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/Mac",
-				);
-				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/SlackKit/Supporting Files/Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = com.launchsoft.SlackKit;
-				PRODUCT_NAME = SlackKit;
-				SKIP_INSTALL = YES;
-			};
-			name = Release;
-		};
-		263993B01CE90EE0004A6E93 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/iOS",
-					"$(PROJECT_DIR)/Carthage/Build/Mac",
-				);
-				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/SlackKit/Supporting Files/Info-iOS.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = com.launchsoft.SlackKit;
-				PRODUCT_NAME = SlackKit;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-			};
-			name = Debug;
-		};
-		263993B11CE90EE0004A6E93 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COMBINE_HIDPI_IMAGES = YES;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/iOS",
-					"$(PROJECT_DIR)/Carthage/Build/Mac",
-				);
-				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/SlackKit/Supporting Files/Info-iOS.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = com.launchsoft.SlackKit;
-				PRODUCT_NAME = SlackKit;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
-			};
-			name = Release;
-		};
-		263993CF1CE90EED004A6E93 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/tvOS",
-				);
-				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/SlackKit/Supporting Files/Info-tvOS.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = com.launchsoft.SlackKit;
-				PRODUCT_NAME = SlackKit;
-				SDKROOT = appletvos;
-				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
-			};
-			name = Debug;
-		};
-		263993D01CE90EED004A6E93 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/tvOS",
-				);
-				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = "$(SRCROOT)/SlackKit/Supporting Files/Info-tvOS.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = com.launchsoft.SlackKit;
-				PRODUCT_NAME = SlackKit;
-				SDKROOT = appletvos;
-				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		26072A2E1BB48B3A00CD650C /* Build configuration list for PBXProject "SlackKit" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				26072A3A1BB48B3B00CD650C /* Debug */,
-				26072A3B1BB48B3B00CD650C /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		26072A3C1BB48B3B00CD650C /* Build configuration list for PBXNativeTarget "SlackKit OS X" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				26072A3D1BB48B3B00CD650C /* Debug */,
-				26072A3E1BB48B3B00CD650C /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		263993AF1CE90EE0004A6E93 /* Build configuration list for PBXNativeTarget "SlackKit iOS" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				263993B01CE90EE0004A6E93 /* Debug */,
-				263993B11CE90EE0004A6E93 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		263993CE1CE90EED004A6E93 /* Build configuration list for PBXNativeTarget "SlackKit tvOS" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				263993CF1CE90EED004A6E93 /* Debug */,
-				263993D01CE90EED004A6E93 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 26072A2B1BB48B3A00CD650C /* Project object */;
-}

SlackKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:SlackRTMKit.xcodeproj">
-   </FileRef>
-</Workspace>

SlackKit.xcodeproj/xcshareddata/xcschemes/SlackKit OS X.xcscheme

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0730"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "26072A331BB48B3A00CD650C"
-               BuildableName = "SlackKit.framework"
-               BlueprintName = "SlackKit OS X"
-               ReferencedContainer = "container:SlackKit.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "26072A331BB48B3A00CD650C"
-            BuildableName = "SlackKit.framework"
-            BlueprintName = "SlackKit OS X"
-            ReferencedContainer = "container:SlackKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "26072A331BB48B3A00CD650C"
-            BuildableName = "SlackKit.framework"
-            BlueprintName = "SlackKit OS X"
-            ReferencedContainer = "container:SlackKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

SlackKit.xcodeproj/xcshareddata/xcschemes/SlackKit iOS.xcscheme

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0730"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "263993951CE90EE0004A6E93"
-               BuildableName = "SlackKit.framework"
-               BlueprintName = "SlackKit iOS"
-               ReferencedContainer = "container:SlackKit.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "263993951CE90EE0004A6E93"
-            BuildableName = "SlackKit.framework"
-            BlueprintName = "SlackKit iOS"
-            ReferencedContainer = "container:SlackKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "263993951CE90EE0004A6E93"
-            BuildableName = "SlackKit.framework"
-            BlueprintName = "SlackKit iOS"
-            ReferencedContainer = "container:SlackKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

SlackKit.xcodeproj/xcshareddata/xcschemes/SlackKit tvOS.xcscheme

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0730"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "263993B41CE90EED004A6E93"
-               BuildableName = "SlackKit.framework"
-               BlueprintName = "SlackKit tvOS"
-               ReferencedContainer = "container:SlackKit.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "263993B41CE90EED004A6E93"
-            BuildableName = "SlackKit.framework"
-            BlueprintName = "SlackKit tvOS"
-            ReferencedContainer = "container:SlackKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "263993B41CE90EED004A6E93"
-            BuildableName = "SlackKit.framework"
-            BlueprintName = "SlackKit tvOS"
-            ReferencedContainer = "container:SlackKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

SlackKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

SlackKit/SlackKit.h

@@ -1,30 +0,0 @@
-//
-// SlackKit.h
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import <Foundation/Foundation.h>
-
-//! Project version number for SlackKit.
-FOUNDATION_EXPORT double SlackKitVersionNumber;
-
-//! Project version string for SlackKit.
-FOUNDATION_EXPORT const unsigned char SlackKitVersionString[];

SlackKit/Sources/Action.swift

@@ -30,16 +30,16 @@ public struct Action {
     public let style: ActionStyle?
     public let confirm: Confirm?
     
-    internal init(action:[String: AnyObject]?) {
+    internal init(action:[String: Any]?) {
         name = action?["name"] as? String
         text = action?["text"] as? String
         type = action?["type"] as? String
         value = action?["value"] as? String
         style = ActionStyle(rawValue: action?["style"] as? String ?? "")
-        confirm = Confirm(confirm:action?["confirm"] as? [String: AnyObject])
+        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
@@ -48,13 +48,14 @@ public struct Action {
         self.confirm = confirm
     }
     
-    internal func dictionary() -> [String: AnyObject] {
-        var dict = [String: AnyObject]()
+    internal var dictionary: [String: Any] {
+        var dict = [String: Any]()
         dict["name"] = name
         dict["text"] = text
         dict["type"] = type
         dict["value"] = value
-        dict["confirm"] = confirm?.dictionary()
+        dict["style"] = style?.rawValue
+        dict["confirm"] = confirm?.dictionary
         return dict
     }
     
@@ -65,7 +66,7 @@ public struct Action {
         public let okText: String?
         public let dismissText: String?
         
-        internal init(confirm:[String: AnyObject]?) {
+        internal init(confirm:[String: Any]?) {
             title = confirm?["title"] as? String
             text = confirm?["text"] as? String
             okText = confirm?["ok_text"] as? String
@@ -79,26 +80,24 @@ public struct Action {
             self.dismissText = dismissText
         }
         
-        internal func dictionary() -> [String: AnyObject] {
-            var dict = [String: AnyObject]()
+        internal var dictionary: [String: Any] {
+            var dict = [String: Any]()
             dict["title"] = title
             dict["text"] = text
             dict["ok_text"] = okText
             dict["dismiss_text"] = dismissText
             return dict
         }
-        
     }
-    
 }
 
 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

@@ -41,8 +41,8 @@ public struct Attachment {
     public let footer: String?
     public let footerIcon: String?
     public let ts: Int?
-
-    internal init(attachment: [String: AnyObject]?) {
+    
+    internal init(attachment: [String: Any]?) {
         fallback = attachment?["fallback"] as? String
         callbackID = attachment?["callback_id"] as? String
         type = attachment?["attachment_type"] as? String
@@ -59,8 +59,8 @@ public struct Attachment {
         footer = attachment?["footer"] as? String
         footerIcon = attachment?["footer_icon"] as? String
         ts = attachment?["ts"] as? Int
-        fields = (attachment?["fields"] as? [[String: AnyObject]])?.map { AttachmentField(field: $0) }
-        actions = (attachment?["actions"] as? [[String: AnyObject]])?.map { Action(action: $0) }
+        fields = (attachment?["fields"] as? [[String: Any]])?.map { AttachmentField(field: $0) }
+        actions = (attachment?["actions"] as? [[String: Any]])?.map { Action(action: $0) }
     }
     
     public init(fallback: String, title:String, callbackID: String? = nil, type: String? = nil, colorHex: String? = nil, pretext: String? = nil, authorName: String? = nil, authorLink: String? = nil, authorIcon: String? = nil, titleLink: String? = nil, text: String? = nil, fields: [AttachmentField]? = nil, actions: [Action]? = nil, imageURL: String? = nil, thumbURL: String? = nil, footer: String? = nil, footerIcon:String? = nil, ts:Int? = nil) {
@@ -84,8 +84,8 @@ public struct Attachment {
         self.ts = ts
     }
     
-    internal func dictionary() -> [String: AnyObject] {
-        var attachment = [String: AnyObject]()
+    internal var dictionary: [String: Any] {
+        var attachment = [String: Any]()
         attachment["fallback"] = fallback
         attachment["callback_id"] = callbackID
         attachment["attachment_type"] = type
@@ -97,8 +97,8 @@ public struct Attachment {
         attachment["title"] = title
         attachment["title_link"] = titleLink
         attachment["text"] = text
-        attachment["fields"] = fields?.map{$0.dictionary()}
-        attachment["actions"] = actions?.map{$0.dictionary()}
+        attachment["fields"] = fields?.map{$0.dictionary}
+        attachment["actions"] = actions?.map{$0.dictionary}
         attachment["image_url"] = imageURL
         attachment["thumb_url"] = thumbURL
         attachment["footer"] = footer
@@ -106,11 +106,10 @@ public struct Attachment {
         attachment["ts"] = ts
         return 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/AttachmentField.swift

@@ -27,7 +27,7 @@ public struct AttachmentField {
     public let value: String?
     public let short: Bool?
     
-    internal init(field: [String: AnyObject]?) {
+    internal init(field: [String: Any]?) {
         title = field?["title"] as? String
         value = field?["value"] as? String
         short = field?["short"] as? Bool
@@ -35,16 +35,15 @@ public struct AttachmentField {
     
     public init(title:String, value:String, short: Bool? = nil) {
         self.title = title
-        self.value = value.slackFormatEscaping()
+        self.value = value.slackFormatEscaping
         self.short = short
     }
     
-    internal func dictionary() -> [String: AnyObject] {
-        var field = [String: AnyObject]()
+    internal var dictionary: [String: Any] {
+        var field = [String: Any]()
         field["title"] = title
         field["value"] = value
         field["short"] = short
         return field
     }
-    
 }

SlackKit/Sources/AuthorizeRequest.swift

@@ -1,48 +0,0 @@
-//
-// AuthorizeRequest.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-internal struct AuthorizeRequest {
-    
-    let clientID: String
-    let scope: [Scope]
-    let redirectURI: String
-    let state: String
-    let team: String?
-    
-    var parameters: [String: AnyObject] {
-        var json = [String : AnyObject]()
-        json["scope"] = scope.map({$0.rawValue}).joinWithSeparator(",")
-        json["state"] = state
-        json["team"] = team
-        return json
-    }
-    
-    init(clientID: String, scope:[Scope], redirectURI: String, state: String = "slackkit", team: String? = nil) {
-        self.clientID = clientID
-        self.scope = scope
-        self.redirectURI = redirectURI
-        self.state = state
-        self.team = team
-    }
-
-}

SlackKit/Sources/AuthorizeResponse.swift

@@ -1,36 +0,0 @@
-//
-// AuthorizeResponse.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-internal struct AuthorizeResponse {
-    
-    let code: String
-    let state: String
-    
-    init?(queryParameters: [(String, String)]) {
-        guard let code = queryParameters.first?.1, state = queryParameters.last?.1 else {
-            return nil
-        }
-        self.code = code
-        self.state = state
-    }
-}

SlackKit/Sources/Bot.swift

@@ -26,17 +26,16 @@ public struct Bot {
     public let id: String?
     internal(set) public var botToken: String?
     internal(set) public var name: String?
-    internal(set) public var icons: [String: AnyObject]?
+    internal(set) public var icons: [String: Any]?
     
-    internal init(bot: [String: AnyObject]?) {
+    internal init(bot: [String: Any]?) {
         id = bot?["id"] as? String
         name = bot?["name"] as? String
-        icons = bot?["icons"] as? [String: AnyObject]
+        icons = bot?["icons"] as? [String: Any]
     }
     
-    internal init(botUser: [String: AnyObject]?) {
+    internal init(botUser: [String: Any]?) {
         id = botUser?["bot_user_id"] as? String
         botToken = botUser?["bot_access_token"] as? String
     }
-    
 }

SlackKit/Sources/Channel.swift

@@ -49,7 +49,7 @@ public struct Channel {
     internal(set) public var usersTyping = [String]()
     internal(set) public var messages = [String: Message]()
     
-    internal init(channel: [String: AnyObject]?) {
+    internal init(channel: [String: Any]?) {
         id = channel?["id"] as? String
         name = channel?["name"] as? String
         created = channel?["created"] as? Int
@@ -62,17 +62,17 @@ public struct Channel {
         isUserDeleted = channel?["is_user_deleted"] as? Bool
         user = channel?["user"] as? String
         isOpen = channel?["is_open"] as? Bool
-        topic = Topic(topic: channel?["topic"] as? [String: AnyObject])
-        purpose = Topic(topic: channel?["purpose"] as? [String: AnyObject])
+        topic = Topic(topic: channel?["topic"] as? [String: Any])
+        purpose = Topic(topic: channel?["purpose"] as? [String: Any])
         isMember = channel?["is_member"] as? Bool
         lastRead = channel?["last_read"] as? String
         unread = channel?["unread_count"] as? Int
         unreadCountDisplay = channel?["unread_count_display"] as? Int
         hasPins = channel?["has_pins"] as? Bool
         members = channel?["members"] as? [String]
-
-        if let latestMsgDictionary = channel?["latest"] as? [String: AnyObject] {
-            latest = Message(message: latestMsgDictionary)
+        
+        if let latestMesssageDictionary = channel?["latest"] as? [String: Any] {
+            latest = Message(dictionary: latestMesssageDictionary)
         } else {
             latest = Message(ts: channel?["latest"] as? String)
         }

SlackKit/Sources/Client+EventDispatching.swift

@@ -21,157 +21,154 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-internal extension Client {
-
-    func dispatch(event: [String: AnyObject]) {
-        let event = Event(event: event)
-        guard let type = event.type else {
-            return
-        }
+internal extension SlackClient {
+    
+    func dispatch(_ anEvent: [String: Any]) {
+        let event = Event(anEvent)
+        let type = event.type ?? .unknown
         switch type {
-        case .Hello:
+        case .hello:
             connected = true
-            connectionEventsDelegate?.clientConnected(self)
-        case .Ok:
+            pingRTMServer()
+            connectionEventsDelegate?.connected(self)
+        case .ok:
             messageSent(event)
-        case .Message:
+        case .message:
             if (event.subtype != nil) {
                 messageDispatcher(event)
             } else {
                 messageReceived(event)
             }
-        case .UserTyping:
+        case .userTyping:
             userTyping(event)
-        case .ChannelMarked, .IMMarked, .GroupMarked:
+        case .channelMarked, .imMarked, .groupMarked:
             channelMarked(event)
-        case .ChannelCreated, .IMCreated:
+        case .channelCreated, .imCreated:
             channelCreated(event)
-        case .ChannelJoined, .GroupJoined:
+        case .channelJoined, .groupJoined:
             channelJoined(event)
-        case .ChannelLeft, .GroupLeft:
+        case .channelLeft, .groupLeft:
             channelLeft(event)
-        case .ChannelDeleted:
+        case .channelDeleted:
             channelDeleted(event)
-        case .ChannelRenamed, .GroupRename:
+        case .channelRenamed, .groupRename:
             channelRenamed(event)
-        case .ChannelArchive, .GroupArchive:
+        case .channelArchive, .groupArchive:
             channelArchived(event, archived: true)
-        case .ChannelUnarchive, .GroupUnarchive:
+        case .channelUnarchive, .groupUnarchive:
             channelArchived(event, archived: false)
-        case .ChannelHistoryChanged, .IMHistoryChanged, .GroupHistoryChanged:
+        case .channelHistoryChanged, .imHistoryChanged, .groupHistoryChanged:
             channelHistoryChanged(event)
-        case .DNDUpdated:
+        case .dndUpdated:
             doNotDisturbUpdated(event)
-        case .DNDUpatedUser:
+        case .dndUpatedUser:
             doNotDisturbUserUpdated(event)
-        case .IMOpen, .GroupOpen:
+        case .imOpen, .groupOpen:
             open(event, open: true)
-        case .IMClose, .GroupClose:
+        case .imClose, .groupClose:
             open(event, open: false)
-        case .FileCreated:
+        case .fileCreated:
             processFile(event)
-        case .FileShared:
+        case .fileShared:
             processFile(event)
-        case .FileUnshared:
+        case .fileUnshared:
             processFile(event)
-        case .FilePublic:
+        case .filePublic:
             processFile(event)
-        case .FilePrivate:
+        case .filePrivate:
             filePrivate(event)
-        case .FileChanged:
+        case .fileChanged:
             processFile(event)
-        case .FileDeleted:
+        case .fileDeleted:
             deleteFile(event)
-        case .FileCommentAdded:
+        case .fileCommentAdded:
             fileCommentAdded(event)
-        case .FileCommentEdited:
+        case .fileCommentEdited:
             fileCommentEdited(event)
-        case .FileCommentDeleted:
+        case .fileCommentDeleted:
             fileCommentDeleted(event)
-        case .PinAdded:
+        case .pinAdded:
             pinAdded(event)
-        case .PinRemoved:
+        case .pinRemoved:
             pinRemoved(event)
-        case .Pong:
+        case .pong:
             pong(event)
-        case .PresenceChange:
+        case .presenceChange:
             presenceChange(event)
-        case .ManualPresenceChange:
+        case .manualPresenceChange:
             manualPresenceChange(event)
-        case .PrefChange:
+        case .prefChange:
             changePreference(event)
-        case .UserChange:
+        case .userChange:
             userChange(event)
-        case .TeamJoin:
+        case .teamJoin:
             teamJoin(event)
-        case .StarAdded:
+        case .starAdded:
             itemStarred(event, star: true)
-        case .StarRemoved:
+        case .starRemoved:
             itemStarred(event, star: false)
-        case .ReactionAdded:
+        case .reactionAdded:
             addedReaction(event)
-        case .ReactionRemoved:
+        case .reactionRemoved:
             removedReaction(event)
-        case .EmojiChanged:
+        case .emojiChanged:
             emojiChanged(event)
-        case .CommandsChanged:
-            // This functionality is only used by our web client. 
-            // The other APIs required to support slash command metadata are currently unstable. 
+        case .commandsChanged:
+            // This functionality is only used by our web client.
+            // The other APIs required to support slash command metadata are currently unstable.
             // Until they are released other clients should ignore this event.
             break
-        case .TeamPlanChange:
+        case .teamPlanChange:
             teamPlanChange(event)
-        case .TeamPrefChange:
+        case .teamPrefChange:
             teamPreferenceChange(event)
-        case .TeamRename:
+        case .teamRename:
             teamNameChange(event)
-        case .TeamDomainChange:
+        case .teamDomainChange:
             teamDomainChange(event)
-        case .EmailDomainChange:
+        case .emailDomainChange:
             emailDomainChange(event)
-        case .TeamProfileChange:
+        case .teamProfileChange:
             teamProfileChange(event)
-        case .TeamProfileDelete:
+        case .teamProfileDelete:
             teamProfileDeleted(event)
-        case .TeamProfileReorder:
+        case .teamProfileReorder:
             teamProfileReordered(event)
-        case .BotAdded:
+        case .botAdded:
             bot(event)
-        case .BotChanged:
+        case .botChanged:
             bot(event)
-        case .AccountsChanged:
+        case .accountsChanged:
             // The accounts_changed event is used by our web client to maintain a list of logged-in accounts.
             // Other clients should ignore this event.
             break
-        case .TeamMigrationStarted:
-            connect(options: options ?? ClientOptions())
-        case .ReconnectURL:
+        case .teamMigrationStarted:
+            connect(pingInterval: pingInterval, timeout: timeout, reconnect: reconnect)
+        case .reconnectURL:
             // The reconnect_url event is currently unsupported and experimental.
             break
-        case .SubteamCreated, .SubteamUpdated:
+        case .subteamCreated, .subteamUpdated:
             subteam(event)
-        case .SubteamSelfAdded:
+        case .subteamSelfAdded:
             subteamAddedSelf(event)
-        case.SubteamSelfRemoved:
+        case .subteamSelfRemoved:
             subteamRemovedSelf(event)
-        case .Error:
-            print("Error: \(event)")
-            break
+        case .unknown:
+            print("Unknown event of type: \(anEvent["type"] ?? "No Type Information")")
         }
     }
     
-    func messageDispatcher(event:Event) {
-        guard let value = event.subtype, subtype = MessageSubtype(rawValue:value) else {
+    func messageDispatcher(_ event:Event) {
+        guard let value = event.subtype, let subtype = MessageSubtype(rawValue:value) else {
             return
         }
         switch subtype {
-        case .MessageChanged:
+        case .messageChanged:
             messageChanged(event)
-        case .MessageDeleted:
+        case .messageDeleted:
             messageDeleted(event)
         default:
             messageReceived(event)
         }
     }
-    
 }

SlackKit/Sources/Client+EventHandling.swift

@@ -22,258 +22,259 @@
 // THE SOFTWARE.
 
 import Foundation
+import Dispatch
 
-internal extension Client {
-
+internal extension SlackClient {
+    
     //MARK: - Pong
-    func pong(event: Event) {
+    func pong(_ event: Event) {
         pong = event.replyTo
     }
     
     //MARK: - Messages
-    func messageSent(event: Event) {
-        guard let reply = event.replyTo, message = sentMessages[NSNumber(double: reply).stringValue], channel = message.channel, ts = message.ts else {
+    func messageSent(_ event: Event) {
+        guard let reply = event.replyTo, let message = sentMessages[NSNumber(value: reply).stringValue], let channel = message.channel, let ts = message.ts else {
             return
         }
         
         message.ts = event.ts
         message.text = event.text
         channels[channel]?.messages[ts] = message
-        messageEventsDelegate?.messageSent(self, message: message)
+        messageEventsDelegate?.sent(message, client: self)
     }
     
-    func messageReceived(event: Event) {
-        guard let channel = event.channel, message = event.message, id = channel.id, ts = message.ts else {
+    func messageReceived(_ event: Event) {
+        guard let channel = event.channel, let message = event.message, let id = channel.id, let ts = message.ts else {
             return
         }
         
         channels[id]?.messages[ts] = message
-        messageEventsDelegate?.messageReceived(self, message: message)
+        messageEventsDelegate?.received(message, client:self)
     }
     
-    func messageChanged(event: Event) {
-        guard let id = event.channel?.id, nested = event.nestedMessage, ts = nested.ts else {
+    func messageChanged(_ event: Event) {
+        guard let id = event.channel?.id, let nested = event.nestedMessage, let ts = nested.ts else {
             return
         }
         
         channels[id]?.messages[ts] = nested
-        messageEventsDelegate?.messageChanged(self, message: nested)
+        messageEventsDelegate?.changed(nested, client:self)
     }
     
-    func messageDeleted(event: Event) {
-        guard let id = event.channel?.id, key = event.message?.deletedTs, message = channels[id]?.messages[key] else {
+    func messageDeleted(_ event: Event) {
+        guard let id = event.channel?.id, let key = event.message?.deletedTs, let message = channels[id]?.messages[key] else {
             return
         }
         
-        channels[id]?.messages.removeValueForKey(key)
-        messageEventsDelegate?.messageDeleted(self, message: message)
+        _ = channels[id]?.messages.removeValue(forKey: key)
+        messageEventsDelegate?.deleted(message, client:self)
     }
     
     //MARK: - Channels
-    func userTyping(event: Event) {
-        guard let channel = event.channel, channelID = channel.id, user = event.user, userID = user.id where
-            channels.indexForKey(channelID) != nil && !channels[channelID]!.usersTyping.contains(userID) else {
-            return
+    func userTyping(_ event: Event) {
+        guard let channel = event.channel, let channelID = channel.id, let user = event.user, let userID = user.id ,
+            channels.index(forKey: channelID) != nil && !channels[channelID]!.usersTyping.contains(userID) else {
+                return
         }
-
+        
         channels[channelID]?.usersTyping.append(userID)
-        channelEventsDelegate?.userTyping(self, channel: channel, user: user)
-
-        let timeout = dispatch_time(DISPATCH_TIME_NOW, Int64(5.0 * Double(NSEC_PER_SEC)))
-        dispatch_after(timeout, dispatch_get_main_queue()) {
-            if let index = self.channels[channelID]?.usersTyping.indexOf(userID) {
-                self.channels[channelID]?.usersTyping.removeAtIndex(index)
+        channelEventsDelegate?.userTypingIn(channel, user: user, client: self)
+        
+        let timeout = DispatchTime.now() + Double(Int64(5.0 * Double(CLOCKS_PER_SEC))) / Double(CLOCKS_PER_SEC)
+        DispatchQueue.main.asyncAfter(deadline: timeout, execute: {
+            if let index = self.channels[channelID]?.usersTyping.index(of: userID) {
+                self.channels[channelID]?.usersTyping.remove(at: index)
             }
-        }
+        })
     }
-
-    func channelMarked(event: Event) {
-        guard let channel = event.channel, id = channel.id, timestamp = event.ts else {
+    
+    func channelMarked(_ event: Event) {
+        guard let channel = event.channel, let id = channel.id, let timestamp = event.ts else {
             return
         }
         
         channels[id]?.lastRead = event.ts
-        channelEventsDelegate?.channelMarked(self, channel: channel, timestamp: timestamp)
+        channelEventsDelegate?.marked(channel, timestamp: timestamp, client: self)
     }
     
-    func channelCreated(event: Event) {
-        guard let channel = event.channel, id = channel.id else {
+    func channelCreated(_ event: Event) {
+        guard let channel = event.channel, let id = channel.id else {
             return
         }
         
         channels[id] = channel
-        channelEventsDelegate?.channelCreated(self, channel: channel)
+        channelEventsDelegate?.created(channel, client: self)
     }
     
-    func channelDeleted(event: Event) {
-        guard let channel = event.channel, id = channel.id else {
+    func channelDeleted(_ event: Event) {
+        guard let channel = event.channel, let id = channel.id else {
             return
         }
         
-        channels.removeValueForKey(id)
-        channelEventsDelegate?.channelDeleted(self, channel: channel)
+        channels.removeValue(forKey: id)
+        channelEventsDelegate?.deleted(channel, client: self)
     }
     
-    func channelJoined(event: Event) {
-        guard let channel = event.channel, id = channel.id else {
+    func channelJoined(_ event: Event) {
+        guard let channel = event.channel, let id = channel.id else {
             return
         }
         
         channels[id] = event.channel
-        channelEventsDelegate?.channelJoined(self, channel: channel)
+        channelEventsDelegate?.joined(channel, client: self)
     }
     
-    func channelLeft(event: Event) {
-        guard let channel = event.channel, id = channel.id else {
+    func channelLeft(_ event: Event) {
+        guard let channel = event.channel, let id = channel.id else {
             return
         }
         
-        if let userID = authenticatedUser?.id, index = channels[id]?.members?.indexOf(userID) {
-            channels[id]?.members?.removeAtIndex(index)
+        if let userID = authenticatedUser?.id, let index = channels[id]?.members?.index(of: userID) {
+            channels[id]?.members?.remove(at: index)
         }
-        channelEventsDelegate?.channelLeft(self, channel: channel)
+        channelEventsDelegate?.left(channel, client: self)
     }
     
-    func channelRenamed(event: Event) {
-        guard let channel = event.channel, id = channel.id else {
+    func channelRenamed(_ event: Event) {
+        guard let channel = event.channel, let id = channel.id else {
             return
         }
         
         channels[id]?.name = channel.name
-        channelEventsDelegate?.channelRenamed(self, channel: channel)
+        channelEventsDelegate?.renamed(channel, client: self)
     }
     
-    func channelArchived(event: Event, archived: Bool) {
-        guard let channel = event.channel, id = channel.id else {
+    func channelArchived(_ event: Event, archived: Bool) {
+        guard let channel = event.channel, let id = channel.id else {
             return
         }
         
         channels[id]?.isArchived = archived
-        channelEventsDelegate?.channelArchived(self, channel: channel)
+        channelEventsDelegate?.archived(channel, client: self)
     }
     
-    func channelHistoryChanged(event: Event) {
+    func channelHistoryChanged(_ event: Event) {
         guard let channel = event.channel else {
             return
         }
-        channelEventsDelegate?.channelHistoryChanged(self, channel: channel)
+        channelEventsDelegate?.historyChanged(channel, client: self)
     }
     
     //MARK: - Do Not Disturb
-    func doNotDisturbUpdated(event: Event) {
+    func doNotDisturbUpdated(_ event: Event) {
         guard let dndStatus = event.dndStatus else {
             return
         }
         
         authenticatedUser?.doNotDisturbStatus = dndStatus
-        doNotDisturbEventsDelegate?.doNotDisturbUpdated(self, dndStatus: dndStatus)
+        doNotDisturbEventsDelegate?.updated(dndStatus, client: self)
     }
     
-    func doNotDisturbUserUpdated(event: Event) {
-        guard let dndStatus = event.dndStatus, user = event.user, id = user.id else {
+    func doNotDisturbUserUpdated(_ event: Event) {
+        guard let dndStatus = event.dndStatus, let user = event.user, let id = user.id else {
             return
         }
         
         users[id]?.doNotDisturbStatus = dndStatus
-        doNotDisturbEventsDelegate?.doNotDisturbUserUpdated(self, dndStatus: dndStatus, user: user)
+        doNotDisturbEventsDelegate?.userUpdated(dndStatus, user: user, client: self)
     }
     
     //MARK: - IM & Group Open/Close
-    func open(event: Event, open: Bool) {
-        guard let channel = event.channel, id = channel.id else {
+    func open(_ event: Event, open: Bool) {
+        guard let channel = event.channel, let id = channel.id else {
             return
         }
         
         channels[id]?.isOpen = open
-        groupEventsDelegate?.groupOpened(self, group: channel)
+        groupEventsDelegate?.opened(channel, client: self)
     }
     
     //MARK: - Files
-    func processFile(event: Event) {
-        guard let file = event.file, id = file.id else {
+    func processFile(_ event: Event) {
+        guard let file = event.file, let id = file.id else {
             return
         }
-        if let comment = file.initialComment, commentID = comment.id {
+        if let comment = file.initialComment, let commentID = comment.id {
             if files[id]?.comments[commentID] == nil {
                 files[id]?.comments[commentID] = comment
             }
         }
-            
+        
         files[id] = file
-        fileEventsDelegate?.fileProcessed(self, file: file)
+        fileEventsDelegate?.processed(file, client: self)
     }
     
-    func filePrivate(event: Event) {
-        guard let file =  event.file, id = file.id else {
+    func filePrivate(_ event: Event) {
+        guard let file =  event.file, let id = file.id else {
             return
         }
         
         files[id]?.isPublic = false
-        fileEventsDelegate?.fileMadePrivate(self, file: file)
+        fileEventsDelegate?.madePrivate(file, client: self)
     }
     
-    func deleteFile(event: Event) {
-        guard let file = event.file, id = file.id else {
+    func deleteFile(_ event: Event) {
+        guard let file = event.file, let id = file.id else {
             return
         }
         
         if files[id] != nil {
-            files.removeValueForKey(id)
+            files.removeValue(forKey: id)
         }
-        fileEventsDelegate?.fileDeleted(self, file: file)
+        fileEventsDelegate?.deleted(file, client: self)
     }
     
-    func fileCommentAdded(event: Event) {
-        guard let file = event.file, id = file.id, comment = event.comment, commentID = comment.id else {
+    func fileCommentAdded(_ event: Event) {
+        guard let file = event.file, let id = file.id, let comment = event.comment, let commentID = comment.id else {
             return
         }
         
         files[id]?.comments[commentID] = comment
-        fileEventsDelegate?.fileCommentAdded(self, file: file, comment: comment)
+        fileEventsDelegate?.commentAdded(file, comment: comment, client: self)
     }
     
-    func fileCommentEdited(event: Event) {
-        guard let file = event.file, id = file.id, comment = event.comment, commentID = comment.id else {
+    func fileCommentEdited(_ event: Event) {
+        guard let file = event.file, let id = file.id, let comment = event.comment, let commentID = comment.id else {
             return
         }
         
         files[id]?.comments[commentID]?.comment = comment.comment
-        fileEventsDelegate?.fileCommentEdited(self, file: file, comment: comment)
+        fileEventsDelegate?.commentAdded(file, comment: comment, client: self)
     }
     
-    func fileCommentDeleted(event: Event) {
-        guard let file = event.file, id = file.id, comment = event.comment, commentID = comment.id else {
+    func fileCommentDeleted(_ event: Event) {
+        guard let file = event.file, let id = file.id, let comment = event.comment, let commentID = comment.id else {
             return
         }
         
-        files[id]?.comments.removeValueForKey(commentID)
-        fileEventsDelegate?.fileCommentDeleted(self, file: file, comment: comment)
+        _ = files[id]?.comments.removeValue(forKey: commentID)
+        fileEventsDelegate?.commentDeleted(file, comment: comment, client: self)
     }
     
     //MARK: - Pins
-    func pinAdded(event: Event) {
-        guard let id = event.channelID, item = event.item else {
+    func pinAdded(_ event: Event) {
+        guard let id = event.channelID, let item = event.item else {
             return
         }
         
         channels[id]?.pinnedItems.append(item)
-        pinEventsDelegate?.itemPinned(self, item: item, channel: channels[id])
+        pinEventsDelegate?.pinned(item, channel: channels[id], client: self)
     }
     
-    func pinRemoved(event: Event) {
-        guard let id = event.channelID, item = event.item else {
+    func pinRemoved(_ event: Event) {
+        guard let id = event.channelID, let item = event.item else {
             return
         }
-
+        
         if let pins = channels[id]?.pinnedItems.filter({$0 != item}) {
             channels[id]?.pinnedItems = pins
         }
-        pinEventsDelegate?.itemUnpinned(self, item: item, channel: channels[id])
+        pinEventsDelegate?.unpinned(item, channel: channels[id], client: self)
     }
-
+    
     //MARK: - Stars
-    func itemStarred(event: Event, star: Bool) {
-        guard let item = event.item, type = item.type else {
+    func itemStarred(_ event: Event, star: Bool) {
+        guard let item = event.item, let type = item.type else {
             return
         }
         switch type {
@@ -286,19 +287,19 @@ internal extension Client {
         default:
             break
         }
-            
-        starEventsDelegate?.itemStarred(self, item: item, star: star)
+        
+        starEventsDelegate?.starred(item, starred: star, self)
     }
     
-    func starMessage(item: Item, star: Bool) {
-        guard let message = item.message, ts = message.ts, channel = item.channel where channels[channel]?.messages[ts] != nil else {
+    func starMessage(_ item: Item, star: Bool) {
+        guard let message = item.message, let ts = message.ts, let channel = item.channel , channels[channel]?.messages[ts] != nil else {
             return
         }
         channels[channel]?.messages[ts]?.isStarred = star
     }
     
-    func starFile(item: Item, star: Bool) {
-        guard let file = item.file, id = file.id else {
+    func starFile(_ item: Item, star: Bool) {
+        guard let file = item.file, let id = file.id else {
             return
         }
         
@@ -314,22 +315,22 @@ internal extension Client {
         }
     }
     
-    func starComment(item: Item) {
-        guard let file = item.file, id = file.id, comment = item.comment, commentID = comment.id else {
+    func starComment(_ item: Item) {
+        guard let file = item.file, let id = file.id, let comment = item.comment, let commentID = comment.id else {
             return
         }
         files[id]?.comments[commentID] = comment
     }
     
     //MARK: - Reactions
-    func addedReaction(event: Event) {
-        guard let item = event.item, type = item.type, reaction = event.reaction, userID = event.user?.id, itemUser = event.itemUser else {
+    func addedReaction(_ event: Event) {
+        guard let item = event.item, let type = item.type, let reaction = event.reaction, let userID = event.user?.id, let itemUser = event.itemUser else {
             return
         }
         
         switch type {
         case "message":
-            guard let channel = item.channel, ts = item.ts, message = channels[channel]?.messages[ts] else {
+            guard let channel = item.channel, let ts = item.ts, let message = channels[channel]?.messages[ts] else {
                 return
             }
             message.reactions.append(Reaction(name: reaction, user: userID))
@@ -339,225 +340,224 @@ internal extension Client {
             }
             files[id]?.reactions.append(Reaction(name: reaction, user: userID))
         case "file_comment":
-            guard let id = item.file?.id, commentID = item.fileCommentID else {
+            guard let id = item.file?.id, let commentID = item.fileCommentID else {
                 return
             }
             files[id]?.comments[commentID]?.reactions.append(Reaction(name: reaction, user: userID))
         default:
             break
         }
-
-        reactionEventsDelegate?.reactionAdded(self, reaction: reaction, item: item, itemUser: itemUser)
+        
+        reactionEventsDelegate?.added(reaction, item: item, itemUser: itemUser, client: self)
     }
-
-    func removedReaction(event: Event) {
-        guard let item = event.item, type = item.type, key = event.reaction, userID = event.user?.id, itemUser = event.itemUser else {
+    
+    func removedReaction(_ event: Event) {
+        guard let item = event.item, let type = item.type, let key = event.reaction, let userID = event.user?.id, let itemUser = event.itemUser else {
             return
         }
-
+        
         switch type {
         case "message":
-            guard let channel = item.channel, ts = item.ts, message = channels[channel]?.messages[ts] else {
+            guard let channel = item.channel, let ts = item.ts, let message = channels[channel]?.messages[ts] else {
                 return
             }
             message.reactions = message.reactions.filter({$0.name != key && $0.user != userID})
         case "file":
-            guard let itemFile = item.file, id = itemFile.id else {
+            guard let itemFile = item.file, let id = itemFile.id else {
                 return
             }
             files[id]?.reactions = files[id]!.reactions.filter({$0.name != key && $0.user != userID})
         case "file_comment":
-            guard let id = item.file?.id, commentID = item.fileCommentID else {
+            guard let id = item.file?.id, let commentID = item.fileCommentID else {
                 return
             }
             files[id]?.comments[commentID]?.reactions = files[id]!.comments[commentID]!.reactions.filter({$0.name != key && $0.user != userID})
         default:
             break
         }
-
-        reactionEventsDelegate?.reactionRemoved(self, reaction: key, item: item, itemUser: itemUser)
+        
+        reactionEventsDelegate?.removed(key, item: item, itemUser: itemUser, client: self)
     }
-
+    
     //MARK: - Preferences
-    func changePreference(event: Event) {
+    func changePreference(_ event: Event) {
         guard let name = event.name else {
             return
         }
         
         authenticatedUser?.preferences?[name] = event.value
-        slackEventsDelegate?.preferenceChanged(self, preference: name, value: event.value)
+        slackEventsDelegate?.preferenceChanged(name, value: event.value, client: self)
     }
     
     //Mark: - User Change
-    func userChange(event: Event) {
-        guard let user = event.user, id = user.id else {
+    func userChange(_ event: Event) {
+        guard let user = event.user, let id = user.id else {
             return
         }
         
         let preferences = users[id]?.preferences
         users[id] = user
         users[id]?.preferences = preferences
-        slackEventsDelegate?.userChanged(self, user: user)
+        slackEventsDelegate?.userChanged(user, client: self)
     }
     
     //MARK: - User Presence
-    func presenceChange(event: Event) {
-        guard let user = event.user, id = user.id, presence = event.presence else {
+    func presenceChange(_ event: Event) {
+        guard let user = event.user, let id = user.id, let presence = event.presence else {
             return
         }
         
         users[id]?.presence = event.presence
-        slackEventsDelegate?.presenceChanged(self, user: user, presence: presence)
+        slackEventsDelegate?.presenceChanged(user, presence: presence, client: self)
     }
     
     //MARK: - Team
-    func teamJoin(event: Event) {
-        guard let user = event.user, id = user.id else {
+    func teamJoin(_ event: Event) {
+        guard let user = event.user, let id = user.id else {
             return
         }
         
         users[id] = user
-        teamEventsDelegate?.teamJoined(self, user: user)
+        teamEventsDelegate?.userJoined(user, client: self)
     }
     
-    func teamPlanChange(event: Event) {
+    func teamPlanChange(_ event: Event) {
         guard let plan = event.plan else {
             return
         }
         
         team?.plan = plan
-        teamEventsDelegate?.teamPlanChanged(self, plan: plan)
+        teamEventsDelegate?.planChanged(plan, client: self)
     }
     
-    func teamPreferenceChange(event: Event) {
+    func teamPreferenceChange(_ event: Event) {
         guard let name = event.name else {
             return
         }
         
         team?.prefs?[name] = event.value
-        teamEventsDelegate?.teamPreferencesChanged(self, preference: name, value: event.value)
+        teamEventsDelegate?.preferencesChanged(name, value: event.value, client: self)
     }
     
-    func teamNameChange(event: Event) {
+    func teamNameChange(_ event: Event) {
         guard let name = event.name else {
             return
         }
         
         team?.name = name
-        teamEventsDelegate?.teamNameChanged(self, name: name)
+        teamEventsDelegate?.nameChanged(name, client: self)
     }
     
-    func teamDomainChange(event: Event) {
+    func teamDomainChange(_ event: Event) {
         guard let domain = event.domain else {
             return
         }
         
         team?.domain = domain
-        teamEventsDelegate?.teamDomainChanged(self, domain: domain)
+        teamEventsDelegate?.domainChanged(domain, client: self)
     }
     
-    func emailDomainChange(event: Event) {
+    func emailDomainChange(_ event: Event) {
         guard let domain = event.emailDomain else {
             return
         }
         
         team?.emailDomain = domain
-        teamEventsDelegate?.teamEmailDomainChanged(self, domain: domain)
+        teamEventsDelegate?.emailDomainChanged(domain, client: self)
     }
     
-    func emojiChanged(event: Event) {
-        teamEventsDelegate?.teamEmojiChanged(self)
+    func emojiChanged(_ event: Event) {
+        teamEventsDelegate?.emojiChanged(self)
     }
     
     //MARK: - Bots
-    func bot(event: Event) {
-        guard let bot = event.bot, id = bot.id else {
+    func bot(_ event: Event) {
+        guard let bot = event.bot, let id = bot.id else {
             return
         }
         
         bots[id] = bot
-        slackEventsDelegate?.botEvent(self, bot: bot)
+        slackEventsDelegate?.botEvent(bot, client: self)
     }
     
     //MARK: - Subteams
-    func subteam(event: Event) {
-        guard let subteam = event.subteam, id = subteam.id else {
+    func subteam(_ event: Event) {
+        guard let subteam = event.subteam, let id = subteam.id else {
             return
         }
         
         userGroups[id] = subteam
-        subteamEventsDelegate?.subteamEvent(self, userGroup: subteam)
+        subteamEventsDelegate?.event(subteam, client: self)
     }
     
-    func subteamAddedSelf(event: Event) {
-        guard let subteamID = event.subteamID, _ = authenticatedUser?.userGroups else {
+    func subteamAddedSelf(_ event: Event) {
+        guard let subteamID = event.subteamID, let _ = authenticatedUser?.userGroups else {
             return
         }
         
         authenticatedUser?.userGroups![subteamID] = subteamID
-        subteamEventsDelegate?.subteamSelfAdded(self, subteamID: subteamID)
+        subteamEventsDelegate?.selfAdded(subteamID, client: self)
     }
     
-    func subteamRemovedSelf(event: Event) {
+    func subteamRemovedSelf(_ event: Event) {
         guard let subteamID = event.subteamID else {
             return
         }
         
-        authenticatedUser?.userGroups?.removeValueForKey(subteamID)
-        subteamEventsDelegate?.subteamSelfRemoved(self, subteamID: subteamID)
+        _ = authenticatedUser?.userGroups?.removeValue(forKey: subteamID)
+        subteamEventsDelegate?.selfRemoved(subteamID, client: self)
     }
     
     //MARK: - Team Profiles
-    func teamProfileChange(event: Event) {
+    func teamProfileChange(_ event: Event) {
         guard let profile = event.profile else {
             return
         }
-
+        
         for user in users {
             for key in profile.fields.keys {
                 users[user.0]?.profile?.customProfile?.fields[key]?.updateProfileField(profile.fields[key])
             }
         }
         
-        teamProfileEventsDelegate?.teamProfileChanged(self, profile: profile)
+        teamProfileEventsDelegate?.changed(profile, client: self)
     }
     
-    func teamProfileDeleted(event: Event) {
+    func teamProfileDeleted(_ event: Event) {
         guard let profile = event.profile else {
             return
         }
-
+        
         for user in users {
             if let id = profile.fields.first?.0 {
                 users[user.0]?.profile?.customProfile?.fields[id] = nil
             }
         }
         
-        teamProfileEventsDelegate?.teamProfileDeleted(self, profile: profile)
+        teamProfileEventsDelegate?.deleted(profile, client: self)
     }
     
-    func teamProfileReordered(event: Event) {
+    func teamProfileReordered(_ event: Event) {
         guard let profile = event.profile else {
             return
         }
-
+        
         for user in users {
             for key in profile.fields.keys {
                 users[user.0]?.profile?.customProfile?.fields[key]?.ordering = profile.fields[key]?.ordering
             }
         }
-
-        teamProfileEventsDelegate?.teamProfileReordered(self, profile: profile)
+        
+        teamProfileEventsDelegate?.reordered(profile, client: self)
     }
     
     //MARK: - Authenticated User
-    func manualPresenceChange(event: Event) {
-        guard let presence = event.presence, user = authenticatedUser else {
+    func manualPresenceChange(_ event: Event) {
+        guard let presence = event.presence, let user = authenticatedUser else {
             return
         }
         
         authenticatedUser?.presence = presence
-        slackEventsDelegate?.manualPresenceChanged(self, user: user, presence: presence)
+        slackEventsDelegate?.manualPresenceChanged(user, presence: presence, client: self)
     }
-    
 }

SlackKit/Sources/Client+Utilities.swift

@@ -21,43 +21,43 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-public enum ClientError: ErrorType {
-    case ChannelDoesNotExist
-    case UserDoesNotExist
+public enum ClientError: Error {
+    case channelDoesNotExist
+    case userDoesNotExist
 }
 
-public extension Client {
+public extension SlackClient {
     
     //MARK: - User & Channel
-    public func getChannelIDByName(name: String) throws -> String {
-        guard let id = channels.filter({$0.1.name == stripString(name)}).first?.0 else {
-            throw ClientError.ChannelDoesNotExist
+    public func getChannelIDWith(name: String) throws -> String {
+        guard let id = channels.filter({$0.1.name == strip(string:name)}).first?.0 else {
+            throw ClientError.channelDoesNotExist
         }
         return id
     }
-
-    public func getUserIDByName(name: String) throws -> String {
-        guard let id = users.filter({$0.1.name == stripString(name)}).first?.0 else {
-            throw ClientError.UserDoesNotExist
+    
+    public func getUserIDWith(name: String) throws -> String {
+        guard let id = users.filter({$0.1.name == strip(string:name)}).first?.0 else {
+            throw ClientError.userDoesNotExist
         }
         return id
     }
-
-    public func getImIDForUserWithID(id: String, success: (imID: String?)->Void, failure: (error: SlackError)->Void) {
+    
+    public func getImIDForUserWith(id: String, success: @escaping (_ imID: String?)->Void, failure: @escaping (SlackError)->Void) {
         let ims = channels.filter{$0.1.isIM == true}
         let channel = ims.filter{$0.1.user == id}.first
         if let channel = channel {
-            success(imID: channel.0)
+            success(channel.0)
         } else {
-            webAPI.openIM(id, success: success, failure: failure)
+            webAPI.openIM(userID: id, success: success, failure: failure)
         }
     }
-
+    
     //MARK: - Utilities
-    internal func stripString(string: String) -> String {
+    internal func strip(string: String) -> String {
         var strippedString = string
         if string[string.startIndex] == "@" || string[string.startIndex] == "#" {
-            strippedString = string.substringFromIndex(string.startIndex.advancedBy(1))
+            strippedString = string.substring(from: string.characters.index(string.startIndex, offsetBy: 1))
         }
         return strippedString
     }

SlackKit/Sources/Client.swift

@@ -22,11 +22,13 @@
 // THE SOFTWARE.
 
 import Foundation
-import Starscream
+import Venice
+import WebSocketClient
 
-public final class Client: WebSocketDelegate {
+public class SlackClient {
     
     internal(set) public var connected = false
+    internal(set) public var authenticated = false
     internal(set) public var authenticatedUser: User?
     internal(set) public var team: Team?
     
@@ -37,18 +39,6 @@ public final class Client: WebSocketDelegate {
     internal(set) public var files = [String: File]()
     internal(set) public var sentMessages = [String: Message]()
     
-    public var token = "xoxp-SLACK_AUTH_TOKEN"
-    
-    public var webAPI: WebAPI {
-        return WebAPI(token: token)
-    }
-
-    internal var webSocket: WebSocket?
-    private let pingPongQueue = dispatch_queue_create("com.launchsoft.SlackKit", DISPATCH_QUEUE_SERIAL)
-    internal var ping: Double?
-    internal var pong: Double?
-    internal var options: ClientOptions?
-        
     //MARK: - Delegates
     public weak var connectionEventsDelegate: ConnectionEventsDelegate?
     public weak var slackEventsDelegate: SlackEventsDelegate?
@@ -63,203 +53,244 @@ public final class Client: WebSocketDelegate {
     public weak var teamEventsDelegate: TeamEventsDelegate?
     public weak var subteamEventsDelegate: SubteamEventsDelegate?
     public weak var teamProfileEventsDelegate: TeamProfileEventsDelegate?
-
-    // If you already have an API token
-    internal init(apiToken: String) {
-        self.token = apiToken
-    }
+    
+    internal var token = "SLACK_AUTH_TOKEN"
     
     public func setAuthToken(token: String) {
         self.token = token
     }
     
-    public func connect(options options: ClientOptions = ClientOptions()) {
-        self.options = options
-        webAPI.rtmStart(options.simpleLatest, noUnreads: options.noUnreads, mpimAware: options.mpimAware, success: {
-            (response) -> Void in
-            guard let socketURL = response["url"] as? String, url = NSURL(string: socketURL) else {
-                return
+    public var webAPI: SlackWebAPI {
+        return SlackWebAPI(token: token)
+    }
+
+    internal var client: WebSocketClient?
+    internal var socket: WebSocket?
+    
+    internal var ping: Double?
+    internal var pong: Double?
+    internal var pingInterval: Double = 30
+    internal var timeout: Double = 300
+    internal var reconnect: Bool = false
+    
+    required public init(apiToken: String) {
+        self.token = apiToken
+    }
+    
+    public func connect(simpleLatest: Bool? = nil, noUnreads: Bool? = nil, mpimAware: Bool? = nil, pingInterval: Double = 30, timeout: Double = 300, reconnect: Bool = false) {
+        self.pingInterval = pingInterval
+        self.timeout = timeout
+        self.reconnect = reconnect
+        webAPI.rtmStart(simpleLatest: simpleLatest, noUnreads: noUnreads, mpimAware: mpimAware, success: { (response) in
+            self.initialSetup(JSON: response)
+            if let socketURL = response["url"] as? String, let url = URL(string: socketURL) {
+                do {
+                    self.client = try WebSocketClient(url: url, didConnect: { (socket) in
+                        self.setupSocket(socket)
+                    })
+                    try self.client?.connect()
+                } catch let error {
+                    print("WebSocket client could not connect: \(error)")
+                }
             }
-            self.initialSetup(response)
-            self.webSocket = WebSocket(url: url)
-            self.webSocket?.delegate = self
-            self.webSocket?.connect()
-            }, failure: {(error) -> Void in
-                self.connectionEventsDelegate?.clientConnectionFailed(self, error: error)
-            })
+        }, failure: {(error) in
+            print("rtm.start failed with error: \(error)")
+        })
     }
     
     public func disconnect() {
-        webSocket?.disconnect()
+        _ = try? socket?.close()
     }
     
-    //MARK: - RTM Message send
+    //MARK: - RTM message send
     public func sendMessage(message: String, channelID: String) {
-        guard connected else { return }
-
-        if let data = try? formatMessageToSlackJsonString(msg: message, channel: channelID),
-            string = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
-            webSocket?.writeString(string)
+        if connected {
+            if let data = formatMessageToSlackJsonString(message: message, channel: channelID) {
+                do {
+                    try socket?.send(data.base64EncodedString())
+                } catch let error {
+                    print("Message failed to send: \(error)")
+                }
+            }
         }
     }
     
-    private func formatMessageToSlackJsonString(message: (msg: String, channel: String)) throws -> NSData {
-        let json: [String: AnyObject] = [
-            "id": NSDate().slackTimestamp(),
+    private func formatMessageToSlackJsonString(message: String, channel: String) -> Data? {
+        let json: [String: Any] = [
+            "id": Date().slackTimestamp,
             "type": "message",
-            "channel": message.channel,
-            "text": message.msg.slackFormatEscaping()
+            "channel": channel,
+            "text": message.slackFormatEscaping
         ]
-        addSentMessage(json)
-        return try NSJSONSerialization.dataWithJSONObject(json, options: [])
+        
+        do {
+            return try JSONSerialization.data(withJSONObject: json, options: [])
+        } catch {
+            return nil
+        }
     }
     
-    private func addSentMessage(dictionary: [String: AnyObject]) {
+    private func addSentMessage(_ dictionary: [String: Any]) {
         var message = dictionary
         guard let id = message["id"] as? NSNumber else {
             return
         }
-        let ts = String(id)
-        message.removeValueForKey("id")
+        let ts = String(describing: id)
+        message.removeValue(forKey: "id")
         message["ts"] = ts
         message["user"] = self.authenticatedUser?.id
-        sentMessages[ts] = Message(message: message)
-    }
-    
-    //MARK: - RTM Ping
-    private func pingRTMServerAtInterval(interval: NSTimeInterval) {
-        let delay = dispatch_time(DISPATCH_TIME_NOW, Int64(interval * Double(NSEC_PER_SEC)))
-        dispatch_after(delay, pingPongQueue, {
-            guard self.connected && self.timeoutCheck() else {
-                self.disconnect()
-                return
-            }
-            self.sendRTMPing()
-            self.pingRTMServerAtInterval(interval)
-        })
-    }
-    
-    private func sendRTMPing() {
-        guard connected else {
-            return
-        }
-        let json: [String: AnyObject] = [
-            "id": NSDate().slackTimestamp(),
-            "type": "ping",
-        ]
-        guard let data = try? NSJSONSerialization.dataWithJSONObject(json, options: []) else {
-            return
-        }
-        let string = NSString(data: data, encoding: NSUTF8StringEncoding)
-        if let writePing = string as? String {
-            ping = json["id"] as? Double
-            webSocket?.writeString(writePing)
-        }
-    }
-    
-    private func timeoutCheck() -> Bool {
-        if let pong = pong, ping = ping, timeout = options?.timeout {
-            if pong - ping < timeout {
-                return true
-            } else {
-                return false
-            }
-        // Ping-pong or timeout not configured
-        } else {
-            return true
-        }
+        sentMessages[ts] = Message(dictionary: message)
     }
     
     //MARK: - Client setup
-    private func initialSetup(json: [String: AnyObject]) {
-        team = Team(team: json["team"] as? [String: AnyObject])
-        authenticatedUser = User(user: json["self"] as? [String: AnyObject])
-        authenticatedUser?.doNotDisturbStatus = DoNotDisturbStatus(status: json["dnd"] as? [String: AnyObject])
-        enumerateObjects(json["users"] as? Array) { (user) in self.addUser(user) }
-        enumerateObjects(json["channels"] as? Array) { (channel) in self.addChannel(channel) }
-        enumerateObjects(json["groups"] as? Array) { (group) in self.addChannel(group) }
-        enumerateObjects(json["mpims"] as? Array) { (mpim) in self.addChannel(mpim) }
-        enumerateObjects(json["ims"] as? Array) { (ims) in self.addChannel(ims) }
-        enumerateObjects(json["bots"] as? Array) { (bots) in self.addBot(bots) }
-        enumerateSubteams(json["subteams"] as? [String: AnyObject])
+    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])
+        enumerateObjects(JSON["users"] as? Array) { (user) in self.addUser(user) }
+        enumerateObjects(JSON["channels"] as? Array) { (channel) in self.addChannel(channel) }
+        enumerateObjects(JSON["groups"] as? Array) { (group) in self.addChannel(group) }
+        enumerateObjects(JSON["mpims"] as? Array) { (mpim) in self.addChannel(mpim) }
+        enumerateObjects(JSON["ims"] as? Array) { (ims) in self.addChannel(ims) }
+        enumerateObjects(JSON["bots"] as? Array) { (bots) in self.addBot(bots) }
+        enumerateSubteams(JSON["subteams"] as? [String: Any])
     }
     
-    private func addUser(aUser: [String: AnyObject]) {
+    private func addUser(_ aUser: [String: Any]) {
         let user = User(user: aUser)
         if let id = user.id {
             users[id] = user
         }
     }
     
-    private func addChannel(aChannel: [String: AnyObject]) {
+    private func addChannel(_ aChannel: [String: Any]) {
         let channel = Channel(channel: aChannel)
         if let id = channel.id {
             channels[id] = channel
         }
     }
     
-    private func addBot(aBot: [String: AnyObject]) {
+    private func addBot(_ aBot: [String: Any]) {
         let bot = Bot(bot: aBot)
         if let id = bot.id {
             bots[id] = bot
         }
     }
     
-    private func enumerateSubteams(subteams: [String: AnyObject]?) {
+    private func enumerateSubteams(_ subteams: [String: Any]?) {
         if let subteams = subteams {
-            if let all = subteams["all"] as? [[String: AnyObject]] {
+            if let all = subteams["all"] as? [[String: Any]] {
                 for item in all {
                     let u = UserGroup(userGroup: item)
-                    self.userGroups[u.id!] = u
+                    if let id = u.id {
+                        self.userGroups[id] = u
+                    }
                 }
             }
             if let auth = subteams["self"] as? [String] {
                 for item in auth {
                     authenticatedUser?.userGroups = [String: String]()
-                    authenticatedUser?.userGroups![item] = item
+                    authenticatedUser?.userGroups?[item] = item
                 }
             }
         }
     }
     
     // MARK: - Utilities
-    private func enumerateObjects(array: [AnyObject]?, initalizer: ([String: AnyObject])-> Void) {
+    private func enumerateObjects(_ array: [Any]?, initalizer: ([String: Any])-> Void) {
         if let array = array {
             for object in array {
-                if let dictionary = object as? [String: AnyObject] {
+                if let dictionary = object as? [String: Any] {
                     initalizer(dictionary)
                 }
             }
         }
     }
     
-    // MARK: - WebSocketDelegate
-    public func websocketDidConnect(socket: WebSocket) {
-        if let pingInterval = options?.pingInterval {
-            pingRTMServerAtInterval(pingInterval)
+    //MARK: - RTM Ping
+    internal func pingRTMServer() {
+        co {
+            self.sendRTMPing()
+            nap(for: self.pingInterval.seconds)
+            guard self.connected && self.isConnectionTimedOut else {
+                self.disconnect()
+                return
+            }
+            self.pingRTMServer()
         }
     }
     
-    public func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
-        connected = false
-        webSocket = nil
-        authenticatedUser = nil
-        connectionEventsDelegate?.clientDisconnected(self)
-        if let options = options where options.reconnect == true {
-            connect(options: options)
-        }
-    }
-    
-    public func websocketDidReceiveMessage(socket: WebSocket, text: String) {
-        guard let data = text.dataUsingEncoding(NSUTF8StringEncoding) else {
+    private func sendRTMPing() {
+        guard connected else {
             return
         }
-
-        if let json = (try? NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions.AllowFragments)) as? [String: AnyObject] {
-            dispatch(json)
+        let json: [String: Any] = [
+            "id": Date().slackTimestamp,
+            "type": "ping"
+        ]
+        guard let data = try? JSONSerialization.data(withJSONObject: json, options: []) else {
+            return
+        }
+        if let string = String(data: data, encoding: String.Encoding.utf8) {
+            ping = json["id"] as? Double
+            do {
+                try socket?.send(string)
+            } catch let error {
+                print("Failed to send ping with error: \(error)")
+            }
         }
     }
-
-    public func websocketDidReceiveData(socket: WebSocket, data: NSData) {}
     
+    var isConnectionTimedOut: Bool {
+        if let pong = pong, let ping = ping {
+            if pong - ping < timeout {
+                return true
+            } else {
+                return false
+            }
+        } else {
+            return true
+        }
+    }
+    
+    // MARK: - WebSocket
+    private func setupSocket(_ socket: WebSocket) {
+        socket.onText {(message) in
+            self.websocketDidReceive(message: message)
+        }
+        socket.onClose{ (code: CloseCode?, reason: String?) in
+            self.websocketDidDisconnect(closeCode: code, error: reason)
+        }
+        socket.onPing { (data) in try socket.pong() }
+        socket.onPong { (data) in try socket.ping() }
+        self.socket = socket
+    }
+    
+    private func websocketDidReceive(message: String) {
+        do {
+            guard let message = message.data(using: .utf8) else {
+                print("Failed to decode message")
+                return
+            }
+            let json = try JSONSerialization.jsonObject(with: message, options: [])
+            if let event = json as? [String: Any] {
+                dispatch(event)
+            }
+        }
+        catch let error {
+            print("Failed to dispatch message: \(error)")
+        }
+    }
+    
+    private func websocketDidDisconnect(closeCode: CloseCode?, error: String?) {
+        connected = false
+        authenticated = false
+        client = nil
+        socket = nil
+        authenticatedUser = nil
+        connectionEventsDelegate?.disconnected(self)
+        if reconnect == true {
+            connect(pingInterval: pingInterval, timeout: timeout, reconnect: reconnect)
+        }
+    }
 }

SlackKit/Sources/ClientOptions.swift

@@ -1,44 +0,0 @@
-//
-// ClientOptions.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-import Foundation
-
-public struct ClientOptions {
-    
-    let simpleLatest: Bool?
-    let noUnreads: Bool?
-    let mpimAware: Bool?
-    let pingInterval: NSTimeInterval?
-    let timeout: NSTimeInterval?
-    let reconnect: Bool?
-    
-    public init(simpleLatest: Bool? = nil, noUnreads: Bool? = nil, mpimAware: Bool? = nil, pingInterval: NSTimeInterval? = nil, timeout: NSTimeInterval? = nil, reconnect: Bool? = nil) {
-        self.simpleLatest = simpleLatest
-        self.noUnreads = noUnreads
-        self.mpimAware = mpimAware
-        self.pingInterval = pingInterval
-        self.timeout = timeout
-        self.reconnect = reconnect
-    }
-    
-}

SlackKit/Sources/Comment.swift

@@ -21,7 +21,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-public struct Comment {
+public struct Comment: Equatable {
+    
     public let id: String?
     public let user: String?
     internal(set) public var created: Int?
@@ -30,7 +31,7 @@ public struct Comment {
     internal(set) public var stars: Int?
     internal(set) public var reactions = [Reaction]()
     
-    internal init(comment:[String: AnyObject]?) {
+    internal init(comment:[String: Any]?) {
         id = comment?["id"] as? String
         created = comment?["created"] as? Int
         user = comment?["user"] as? String
@@ -43,10 +44,8 @@ public struct Comment {
         self.id = id
         self.user = nil
     }
-}
-
-extension Comment: Equatable {}
-
-public func ==(lhs: Comment, rhs: Comment) -> Bool {
-    return lhs.id == rhs.id
+    
+    public static func ==(lhs: Comment, rhs: Comment) -> Bool {
+        return lhs.id == rhs.id
+    }
 }

SlackKit/Sources/CustomProfile.swift

@@ -22,13 +22,14 @@
 // THE SOFTWARE.
 
 public struct CustomProfile {
+    
     internal(set) public var fields = [String: CustomProfileField]()
     
-    internal init(profile: [String: AnyObject]?) {
-        if let eventFields = profile?["fields"] as? [AnyObject] {
+    internal init(profile: [String: Any]?) {
+        if let eventFields = profile?["fields"] as? [Any] {
             for field in eventFields {
                 var cpf: CustomProfileField?
-                if let fieldDictionary = field as? [String: AnyObject] {
+                if let fieldDictionary = field as? [String: Any] {
                     cpf = CustomProfileField(field: fieldDictionary)
                 } else {
                     cpf = CustomProfileField(id: field as? String)
@@ -38,13 +39,12 @@ public struct CustomProfile {
         }
     }
     
-    internal init(customFields: [String: AnyObject]?) {
+    internal init(customFields: [String: Any]?) {
         if let customFields = customFields {
             for key in customFields.keys {
-                let cpf = CustomProfileField(field: customFields[key] as? [String: AnyObject])
+                let cpf = CustomProfileField(field: customFields[key] as? [String: Any])
                 self.fields[key] = cpf
             }
         }
     }
-    
 }

SlackKit/Sources/CustomProfileField.swift

@@ -22,6 +22,7 @@
 // THE SOFTWARE.
 
 public struct CustomProfileField {
+    
     internal(set) public var id: String?
     internal(set) public var alt: String?
     internal(set) public var value: String?
@@ -33,7 +34,7 @@ public struct CustomProfileField {
     internal(set) public var possibleValues: [String]?
     internal(set) public var type: String?
     
-    internal init(field: [String: AnyObject]?) {
+    internal init(field: [String: Any]?) {
         id = field?["id"] as? String
         alt = field?["alt"] as? String
         value = field?["value"] as? String
@@ -50,7 +51,7 @@ public struct CustomProfileField {
         self.id = id
     }
     
-    internal mutating func updateProfileField(profile: CustomProfileField?) {
+    internal mutating func updateProfileField(_ profile: CustomProfileField?) {
         id = profile?.id != nil ? profile?.id : id
         alt = profile?.alt != nil ? profile?.alt : alt
         value = profile?.value != nil ? profile?.value : value

SlackKit/Sources/DoNotDisturbStatus.swift

@@ -22,18 +22,18 @@
 // THE SOFTWARE.
 
 public struct DoNotDisturbStatus {
+    
     internal(set) public var enabled: Bool?
     internal(set) public var nextDoNotDisturbStart: Int?
     internal(set) public var nextDoNotDisturbEnd: Int?
     internal(set) public var snoozeEnabled: Bool?
     internal(set) public var snoozeEndtime: Int?
     
-    internal init(status: [String: AnyObject]?) {
+    internal init(status: [String: Any]?) {
         enabled = status?["dnd_enabled"] as? Bool
         nextDoNotDisturbStart = status?["next_dnd_start_ts"] as? Int
         nextDoNotDisturbEnd = status?["next_dnd_end_ts"] as? Int
         snoozeEnabled = status?["snooze_enabled"] as? Bool
         snoozeEndtime = status?["snooze_endtime"] as? Int
     }
-    
 }

SlackKit/Sources/Edited.swift

@@ -22,10 +22,11 @@
 // THE SOFTWARE.
 
 public struct Edited {
+    
     public let user: String?
     public let ts: String?
     
-    internal init(edited:[String: AnyObject]?) {
+    internal init(edited:[String: Any]?) {
         user = edited?["user"] as? String
         ts = edited?["ts"] as? String
     }

SlackKit/Sources/Event.swift

@@ -22,107 +22,108 @@
 // THE SOFTWARE.
 
 internal enum EventType: String {
-    case Hello = "hello"
-    case Message = "message"
-    case UserTyping = "user_typing"
-    case ChannelMarked = "channel_marked"
-    case ChannelCreated = "channel_created"
-    case ChannelJoined = "channel_joined"
-    case ChannelLeft = "channel_left"
-    case ChannelDeleted = "channel_deleted"
-    case ChannelRenamed = "channel_rename"
-    case ChannelArchive = "channel_archive"
-    case ChannelUnarchive = "channel_unarchive"
-    case ChannelHistoryChanged = "channel_history_changed"
-    case DNDUpdated = "dnd_updated"
-    case DNDUpatedUser = "dnd_updated_user"
-    case IMCreated = "im_created"
-    case IMOpen = "im_open"
-    case IMClose = "im_close"
-    case IMMarked = "im_marked"
-    case IMHistoryChanged = "im_history_changed"
-    case GroupJoined = "group_joined"
-    case GroupLeft = "group_left"
-    case GroupOpen = "group_open"
-    case GroupClose = "group_close"
-    case GroupArchive = "group_archive"
-    case GroupUnarchive = "group_unarchive"
-    case GroupRename = "group_rename"
-    case GroupMarked = "group_marked"
-    case GroupHistoryChanged = "group_history_changed"
-    case FileCreated = "file_created"
-    case FileShared = "file_shared"
-    case FileUnshared = "file_unshared"
-    case FilePublic = "file_public"
-    case FilePrivate = "file_private"
-    case FileChanged = "file_change"
-    case FileDeleted = "file_deleted"
-    case FileCommentAdded = "file_comment_added"
-    case FileCommentEdited = "file_comment_edited"
-    case FileCommentDeleted = "file_comment_deleted"
-    case PinAdded = "pin_added"
-    case PinRemoved = "pin_removed"
-    case Pong = "pong"
-    case PresenceChange = "presence_change"
-    case ManualPresenceChange = "manual_presence_change"
-    case PrefChange = "pref_change"
-    case UserChange = "user_change"
-    case TeamJoin = "team_join"
-    case StarAdded = "star_added"
-    case StarRemoved = "star_removed"
-    case ReactionAdded = "reaction_added"
-    case ReactionRemoved = "reaction_removed"
-    case EmojiChanged = "emoji_changed"
-    case CommandsChanged = "commands_changed"
-    case TeamPlanChange = "team_plan_change"
-    case TeamPrefChange = "team_pref_change"
-    case TeamRename = "team_rename"
-    case TeamDomainChange = "team_domain_change"
-    case EmailDomainChange = "email_domain_change"
-    case TeamProfileChange = "team_profile_change"
-    case TeamProfileDelete = "team_profile_delete"
-    case TeamProfileReorder = "team_profile_reorder"
-    case BotAdded = "bot_added"
-    case BotChanged = "bot_changed"
-    case AccountsChanged = "accounts_changed"
-    case TeamMigrationStarted = "team_migration_started"
-    case ReconnectURL = "reconnect_url"
-    case SubteamCreated = "subteam_created"
-    case SubteamUpdated = "subteam_updated"
-    case SubteamSelfAdded = "subteam_self_added"
-    case SubteamSelfRemoved = "subteam_self_removed"
-    case Ok = "ok"
-    case Error = "error"
+    
+    case hello = "hello"
+    case message = "message"
+    case userTyping = "user_typing"
+    case channelMarked = "channel_marked"
+    case channelCreated = "channel_created"
+    case channelJoined = "channel_joined"
+    case channelLeft = "channel_left"
+    case channelDeleted = "channel_deleted"
+    case channelRenamed = "channel_rename"
+    case channelArchive = "channel_archive"
+    case channelUnarchive = "channel_unarchive"
+    case channelHistoryChanged = "channel_history_changed"
+    case dndUpdated = "dnd_updated"
+    case dndUpatedUser = "dnd_updated_user"
+    case imCreated = "im_created"
+    case imOpen = "im_open"
+    case imClose = "im_close"
+    case imMarked = "im_marked"
+    case imHistoryChanged = "im_history_changed"
+    case groupJoined = "group_joined"
+    case groupLeft = "group_left"
+    case groupOpen = "group_open"
+    case groupClose = "group_close"
+    case groupArchive = "group_archive"
+    case groupUnarchive = "group_unarchive"
+    case groupRename = "group_rename"
+    case groupMarked = "group_marked"
+    case groupHistoryChanged = "group_history_changed"
+    case fileCreated = "file_created"
+    case fileShared = "file_shared"
+    case fileUnshared = "file_unshared"
+    case filePublic = "file_public"
+    case filePrivate = "file_private"
+    case fileChanged = "file_change"
+    case fileDeleted = "file_deleted"
+    case fileCommentAdded = "file_comment_added"
+    case fileCommentEdited = "file_comment_edited"
+    case fileCommentDeleted = "file_comment_deleted"
+    case pinAdded = "pin_added"
+    case pinRemoved = "pin_removed"
+    case pong = "pong"
+    case presenceChange = "presence_change"
+    case manualPresenceChange = "manual_presence_change"
+    case prefChange = "pref_change"
+    case userChange = "user_change"
+    case teamJoin = "team_join"
+    case starAdded = "star_added"
+    case starRemoved = "star_removed"
+    case reactionAdded = "reaction_added"
+    case reactionRemoved = "reaction_removed"
+    case emojiChanged = "emoji_changed"
+    case commandsChanged = "commands_changed"
+    case teamPlanChange = "team_plan_change"
+    case teamPrefChange = "team_pref_change"
+    case teamRename = "team_rename"
+    case teamDomainChange = "team_domain_change"
+    case emailDomainChange = "email_domain_change"
+    case teamProfileChange = "team_profile_change"
+    case teamProfileDelete = "team_profile_delete"
+    case teamProfileReorder = "team_profile_reorder"
+    case botAdded = "bot_added"
+    case botChanged = "bot_changed"
+    case accountsChanged = "accounts_changed"
+    case teamMigrationStarted = "team_migration_started"
+    case reconnectURL = "reconnect_url"
+    case subteamCreated = "subteam_created"
+    case subteamUpdated = "subteam_updated"
+    case subteamSelfAdded = "subteam_self_added"
+    case subteamSelfRemoved = "subteam_self_removed"
+    case ok = "ok"
+    case unknown = "unknown"
 }
 
 internal enum MessageSubtype: String {
-    case BotMessage = "bot_message"
-    case MeMessage = "me_message"
-    case MessageChanged = "message_changed"
-    case MessageDeleted = "message_deleted"
-    case ChannelJoin = "channel_join"
-    case ChannelLeave = "channel_leave"
-    case ChannelTopic = "channel_topic"
-    case ChannelPurpose = "channel_purpose"
-    case ChannelName = "channel_name"
-    case ChannelArchive = "channel_archive"
-    case ChannelUnarchive = "channel_unarchive"
-    case GroupJoin = "group_join"
-    case GroupLeave = "group_leave"
-    case GroupTopic = "group_topic"
-    case GroupPurpose = "group_purpose"
-    case GroupName = "group_name"
-    case GroupArchive = "group_archive"
-    case GroupUnarchive = "group_unarchive"
-    case FileShare = "file_share"
-    case FileComment = "file_comment"
-    case FileMention = "file_mention"
-    case PinnedItem = "pinned_item"
-    case UnpinnedItem = "unpinned_item"
+    
+    case botMessage = "bot_message"
+    case meMessage = "me_message"
+    case messageChanged = "message_changed"
+    case messageDeleted = "message_deleted"
+    case channelJoin = "channel_join"
+    case channelLeave = "channel_leave"
+    case channelTopic = "channel_topic"
+    case channelPurpose = "channel_purpose"
+    case channelName = "channel_name"
+    case channelArchive = "channel_archive"
+    case channelUnarchive = "channel_unarchive"
+    case groupJoin = "group_join"
+    case groupLeave = "group_leave"
+    case groupTopic = "group_topic"
+    case groupPurpose = "group_purpose"
+    case groupName = "group_name"
+    case groupArchive = "group_archive"
+    case groupUnarchive = "group_unarchive"
+    case fileShare = "file_share"
+    case fileComment = "file_comment"
+    case fileMention = "file_mention"
+    case pinnedItem = "pinned_item"
+    case unpinnedItem = "unpinned_item"
 }
 
-internal struct Event {
-    
+internal class Event {
     let type: EventType?
     let ts: String?
     let subtype: String?
@@ -137,14 +138,14 @@ internal struct Event {
     let fileID: String?
     let presence: String?
     let name: String?
-    let value: AnyObject?
+    let value: Any?
     let plan: String?
     let url: String?
     let domain: String?
     let emailDomain: String?
     let reaction: String?
     let replyTo: Double?
-    let reactions: [[String: AnyObject]]?
+    let reactions: [[String: Any]]?
     let edited: Edited?
     let bot: Bot?
     let channel: Channel?
@@ -160,7 +161,7 @@ internal struct Event {
     let subteamID: String?
     var profile: CustomProfile?
     
-    init(event:[String: AnyObject]) {
+    init(_ event:[String: Any]) {
         type = EventType(rawValue: event["type"] as? String ?? "ok")
         ts = event["ts"] as? String
         subtype = event["subtype"] as? String
@@ -182,38 +183,36 @@ internal struct Event {
         emailDomain = event["email_domain"] as? String
         reaction = event["reaction"] as? String
         replyTo = event["reply_to"] as? Double
-        reactions = event["reactions"] as? [[String: AnyObject]]
-        bot = Bot(bot: event["bot"] as? [String: AnyObject])
-        edited = Edited(edited:event["edited"] as? [String: AnyObject])
-        dndStatus = DoNotDisturbStatus(status: event["dnd_status"] as? [String: AnyObject])
+        reactions = event["reactions"] as? [[String: Any]]
+        bot = Bot(bot: event["bot"] as? [String: Any])
+        edited = Edited(edited:event["edited"] as? [String: Any])
+        dndStatus = DoNotDisturbStatus(status: event["dnd_status"] as? [String: Any])
         itemUser = event["item_user"] as? String
-        item = Item(item: event["item"] as? [String: AnyObject])
-        subteam = UserGroup(userGroup: event["subteam"] as? [String: AnyObject])
+        item = Item(item: event["item"] as? [String: Any])
+        subteam = UserGroup(userGroup: event["subteam"] as? [String: Any])
         subteamID = event["subteam_id"] as? String
-        message = Message(message: event)
-        nestedMessage = Message(message: event["message"] as? [String: AnyObject])
-        profile = CustomProfile(profile: event["profile"] as? [String: AnyObject])
+        message = Message(dictionary: event)
+        nestedMessage = Message(dictionary: event["message"] as? [String: Any])
+        profile = CustomProfile(profile: event["profile"] as? [String: Any])
         file = File(id: event["file"] as? String)
-
+        
         // Comment, Channel, and User can come across as Strings or Dictionaries
-        if let commentDictionary = event["comment"] as? [String: AnyObject] {
+        if let commentDictionary = event["comment"] as? [String: Any] {
             comment = Comment(comment: commentDictionary)
         } else {
             comment = Comment(id: event["comment"] as? String)
         }
-
-        if let userDictionary = event["user"] as? [String: AnyObject] {
+        
+        if let userDictionary = event["user"] as? [String: Any] {
             user = User(user: userDictionary)
         } else {
             user = User(id: event["user"] as? String)
         }
-
-        if let channelDictionary =  event["channel"] as? [String: AnyObject] {
+        
+        if let channelDictionary =  event["channel"] as? [String: Any] {
             channel = Channel(channel: channelDictionary)
         } else {
             channel = Channel(id: event["channel"] as? String)
         }
-
     }
-    
 }

SlackKit/Sources/EventDelegate.swift

@@ -22,88 +22,88 @@
 // THE SOFTWARE.
 
 public protocol ConnectionEventsDelegate: class {
-    func clientConnected(client: Client)
-    func clientDisconnected(client: Client)
-    func clientConnectionFailed(client: Client, error: SlackError)
+    func connected(_ client: SlackClient)
+    func disconnected(_ client: SlackClient)
+    func connectionFailed(_ client: SlackClient, error: SlackError)
 }
 
 public protocol MessageEventsDelegate: class {
-    func messageSent(client: Client, message: Message)
-    func messageReceived(client: Client, message: Message)
-    func messageChanged(client: Client, message: Message)
-    func messageDeleted(client: Client, message: Message?)
+    func sent(_ message: Message, client: SlackClient)
+    func received(_ message: Message, client: SlackClient)
+    func changed(_ message: Message, client: SlackClient)
+    func deleted(_ message: Message?, client: SlackClient)
 }
 
 public protocol ChannelEventsDelegate: class {
-    func userTyping(client: Client, channel: Channel, user: User)
-    func channelMarked(client: Client, channel: Channel, timestamp: String)
-    func channelCreated(client: Client, channel: Channel)
-    func channelDeleted(client: Client, channel: Channel)
-    func channelRenamed(client: Client, channel: Channel)
-    func channelArchived(client: Client, channel: Channel)
-    func channelHistoryChanged(client: Client, channel: Channel)
-    func channelJoined(client: Client, channel: Channel)
-    func channelLeft(client: Client, channel: Channel)
+    func userTypingIn(_ channel: Channel, user: User, client: SlackClient)
+    func marked(_ channel: Channel, timestamp: String, client: SlackClient)
+    func created(_ channel: Channel, client: SlackClient)
+    func deleted(_ channel: Channel, client: SlackClient)
+    func renamed(_ channel: Channel, client: SlackClient)
+    func archived(_ channel: Channel, client: SlackClient)
+    func historyChanged(_ channel: Channel, client: SlackClient)
+    func joined(_ channel: Channel, client: SlackClient)
+    func left(_ channel: Channel, client: SlackClient)
 }
 
 public protocol DoNotDisturbEventsDelegate: class {
-    func doNotDisturbUpdated(client: Client, dndStatus: DoNotDisturbStatus)
-    func doNotDisturbUserUpdated(client: Client, dndStatus: DoNotDisturbStatus, user: User)
+    func updated(_ status: DoNotDisturbStatus, client: SlackClient)
+    func userUpdated(_ status: DoNotDisturbStatus, user: User, client: SlackClient)
 }
 
 public protocol GroupEventsDelegate: class {
-    func groupOpened(client: Client, group: Channel)
+    func opened(_ group: Channel, client: SlackClient)
 }
 
 public protocol FileEventsDelegate: class {
-    func fileProcessed(client: Client, file: File)
-    func fileMadePrivate(client: Client, file: File)
-    func fileDeleted(client: Client, file: File)
-    func fileCommentAdded(client: Client, file: File, comment: Comment)
-    func fileCommentEdited(client: Client, file: File, comment: Comment)
-    func fileCommentDeleted(client: Client, file: File, comment: Comment)
+    func processed(_ file: File, client: SlackClient)
+    func madePrivate(_ file: File, client: SlackClient)
+    func deleted(_ file: File, client: SlackClient)
+    func commentAdded(_ file: File, comment: Comment, client: SlackClient)
+    func commentEdited(_ file: File, comment: Comment, client: SlackClient)
+    func commentDeleted(_ file: File, comment: Comment, client: SlackClient)
 }
 
 public protocol PinEventsDelegate: class {
-    func itemPinned(client: Client, item: Item, channel: Channel?)
-    func itemUnpinned(client: Client, item: Item, channel: Channel?)
+    func pinned(_ item: Item, channel: Channel?, client: SlackClient)
+    func unpinned(_ item: Item, channel: Channel?, client: SlackClient)
 }
 
 public protocol StarEventsDelegate: class {
-    func itemStarred(client: Client, item: Item, star: Bool)
+    func starred(_ item: Item, starred: Bool, _ client: SlackClient)
 }
 
 public protocol ReactionEventsDelegate: class {
-    func reactionAdded(client: Client, reaction: String, item: Item, itemUser: String)
-    func reactionRemoved(client: Client, reaction: String, item: Item, itemUser: String)
+    func added(_ reaction: String, item: Item, itemUser: String, client: SlackClient)
+    func removed(_ reaction: String, item: Item, itemUser: String, client: SlackClient)
 }
 
 public protocol SlackEventsDelegate: class {
-    func preferenceChanged(client: Client, preference: String, value: AnyObject?)
-    func userChanged(client: Client, user: User)
-    func presenceChanged(client: Client, user: User, presence: String)
-    func manualPresenceChanged(client: Client, user: User, presence: String)
-    func botEvent(client: Client, bot: Bot)
+    func preferenceChanged(_ preference: String, value: Any?, client: SlackClient)
+    func userChanged(_ user: User, client: SlackClient)
+    func presenceChanged(_ user: User, presence: String, client: SlackClient)
+    func manualPresenceChanged(_ user: User, presence: String, client: SlackClient)
+    func botEvent(_ bot: Bot, client: SlackClient)
 }
 
 public protocol TeamEventsDelegate: class {
-    func teamJoined(client: Client, user: User)
-    func teamPlanChanged(client: Client, plan: String)
-    func teamPreferencesChanged(client: Client, preference: String, value: AnyObject?)
-    func teamNameChanged(client: Client, name: String)
-    func teamDomainChanged(client: Client, domain: String)
-    func teamEmailDomainChanged(client: Client, domain: String)
-    func teamEmojiChanged(client: Client)
+    func userJoined(_ user: User, client: SlackClient)
+    func planChanged(_ plan: String, client: SlackClient)
+    func preferencesChanged(_ preference: String, value: Any?, client: SlackClient)
+    func nameChanged(_ name: String, client: SlackClient)
+    func domainChanged(_ domain: String, client: SlackClient)
+    func emailDomainChanged(_ domain: String, client: SlackClient)
+    func emojiChanged(_ client: SlackClient)
 }
 
 public protocol SubteamEventsDelegate: class {
-    func subteamEvent(client: Client, userGroup: UserGroup)
-    func subteamSelfAdded(client: Client, subteamID: String)
-    func subteamSelfRemoved(client: Client, subteamID: String)
+    func event(_ userGroup: UserGroup, client: SlackClient)
+    func selfAdded(_ subteamID: String, client: SlackClient)
+    func selfRemoved(_ subteamID: String, client: SlackClient)
 }
 
 public protocol TeamProfileEventsDelegate: class {
-    func teamProfileChanged(client: Client, profile: CustomProfile)
-    func teamProfileDeleted(client: Client, profile: CustomProfile)
-    func teamProfileReordered(client: Client, profile: CustomProfile)
+    func changed(_ profile: CustomProfile, client: SlackClient)
+    func deleted(_ profile: CustomProfile, client: SlackClient)
+    func reordered(_ profile: CustomProfile, client: SlackClient)
 }

SlackKit/Sources/Extensions.swift

@@ -23,39 +23,34 @@
 
 import Foundation
 
-public extension NSDate {
-
-    func slackTimestamp() -> Double {
-        return NSNumber(double: timeIntervalSince1970).doubleValue
-    }
+public extension Date {
     
+    var slackTimestamp: Double {
+        return NSNumber(value: timeIntervalSince1970).doubleValue
+    }
 }
 
 internal extension String {
     
-    func slackFormatEscaping() -> String {
-        var escapedString = stringByReplacingOccurrencesOfString("&", withString: "&")
-        escapedString = stringByReplacingOccurrencesOfString("<", withString: "&lt;")
-        escapedString = stringByReplacingOccurrencesOfString(">", withString: "&gt;")
+    var slackFormatEscaping: String {
+        var escapedString = replacingOccurrences(of: "&", with: "&amp;")
+        escapedString = replacingOccurrences(of: "<", with: "&lt;")
+        escapedString = replacingOccurrences(of: ">", with: "&gt;")
         return escapedString
     }
-
 }
 
-internal extension Dictionary where Key: StringLiteralConvertible, Value: AnyObject {
-
+internal extension Dictionary where Key: ExpressibleByStringLiteral, Value: Any {
+    
     var requestStringFromParameters: String {
         var requestString = ""
         for key in self.keys {
-            if let value = self[key] as? String, encodedValue = value.stringByAddingPercentEncodingWithAllowedCharacters(NSCharacterSet.URLHostAllowedCharacterSet()) {
+            if let value = self[key] as? String, let encodedValue = value.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed) {
                 requestString += "&\(key)=\(encodedValue)"
-            } else if let value = self[key] as? Int {
+            } else if let value = self[key] {
                 requestString += "&\(key)=\(value)"
             }
         }
-        
         return requestString
     }
-
 }
-

SlackKit/Sources/File.swift

@@ -21,8 +21,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-public struct File {
-
+public struct File: Equatable {
+    
     public let id: String?
     public let created: Int?
     public let name: String?
@@ -78,7 +78,7 @@ public struct File {
     internal(set) public var comments = [String: Comment]()
     internal(set) public var reactions = [Reaction]()
     
-    public init(file:[String: AnyObject]?) {
+    public init(file:[String: Any]?) {
         id = file?["id"] as? String
         created = file?["created"] as? Int
         name = file?["name"] as? String
@@ -127,11 +127,11 @@ public struct File {
         channels = file?["channels"] as? [String]
         groups = file?["groups"] as? [String]
         ims = file?["ims"] as? [String]
-        initialComment = Comment(comment: file?["initial_comment"] as? [String: AnyObject])
+        initialComment = Comment(comment: file?["initial_comment"] as? [String: Any])
         stars = file?["num_stars"] as? Int
         isStarred = file?["is_starred"] as? Bool
         pinnedTo = file?["pinned_to"] as? [String]
-        reactions = Reaction.reactionsFromArray(file?["reactions"] as? [[String: AnyObject]])        
+        reactions = Reaction.reactionsFromArray(file?["reactions"] as? [[String: Any]])
     }
     
     internal init(id:String?) {
@@ -179,11 +179,8 @@ public struct File {
         linesMore = nil
         initialComment = nil
     }
+    
+    public static func ==(lhs: File, rhs: File) -> Bool {
+        return lhs.id == rhs.id
+    }
 }
-
-extension File: Equatable {}
-
-public func ==(lhs: File, rhs: File) -> Bool {
-    return lhs.id == rhs.id
-}
-    

SlackKit/Sources/History.swift

@@ -25,17 +25,17 @@ import Foundation
 
 public struct History {
     
-    internal(set) public var latest: NSDate?
+    internal(set) public var latest: Date?
     internal(set) public var messages = [Message]()
     public let hasMore: Bool?
     
-    internal init(history: [String: AnyObject]?) {
-        if let latestStr = history?["latest"] as? String, latestDouble = Double(latestStr) {
-            latest = NSDate(timeIntervalSince1970: NSTimeInterval(latestDouble))
+    internal init(history: [String: Any]?) {
+        if let latestStr = history?["latest"] as? String, let latestDouble = Double(latestStr) {
+            latest = Date(timeIntervalSince1970: TimeInterval(latestDouble))
         }
-        if let msgs = history?["messages"] as? [[String: AnyObject]] {
+        if let msgs = history?["messages"] as? [[String: Any]] {
             for message in msgs {
-                messages.append(Message(message: message))
+                messages.append(Message(dictionary: message))
             }
         }
         hasMore = history?["has_more"] as? Bool

SlackKit/Sources/IncomingWebhook.swift

@@ -1,72 +0,0 @@
-//
-// IncomingWebhook.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-import Foundation
-
-public struct IncomingWebhook {
-    
-    public let url: String?
-    public let channel: String?
-    public let configurationURL: String?
-    public let username: String?
-    public let iconEmoji: String?
-    public let iconURL: String?
-    
-    internal init(webhook: [String: AnyObject]?) {
-        url = webhook?["url"] as? String
-        channel = webhook?["channel"] as? String
-        configurationURL = webhook?["configuration_url"] as? String
-        username = webhook?["username"] as? String
-        iconEmoji = webhook?["icon_emoji"] as? String
-        iconURL = webhook?["icon_url"] as? String
-    }
-    
-    public init(url: String, channel: String? = nil, username: String? = nil, iconEmoji: String? = nil, iconURL: String? = nil) {
-        self.url = url
-        self.channel = channel
-        self.username = username
-        self.iconEmoji = iconEmoji
-        self.iconURL = iconURL
-        self.configurationURL = nil
-    }
-    
-    public func postMessage(response: Response, success: ((Bool)->Void)? = nil, failure: ((SlackError)->Void)? = nil) {
-        if let url = self.url, data = try? NSJSONSerialization.dataWithJSONObject(jsonBody(response.json()), options: []) {
-            NetworkInterface().customRequest(url, data: data, success: { _ in
-                success?(true)
-            }, errorClosure: {(error) in
-                failure?(error)
-            })
-        }
-    }
-    
-    private func jsonBody(response: [String: AnyObject]) -> [String: AnyObject] {
-        var json = response
-        json["channel"] = channel
-        json["username"] = username
-        json["icon_emoji"] = iconEmoji
-        json["icon_url"] = iconURL
-        return json
-    }
-    
-}

SlackKit/Sources/Item.swift

@@ -21,7 +21,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-public struct Item {
+public struct Item: Equatable {
+    
     public let type: String?
     public let ts: String?
     public let channel: String?
@@ -30,21 +31,20 @@ public struct Item {
     public let comment: Comment?
     public let fileCommentID: String?
     
-    internal init(item:[String: AnyObject]?) {
+    internal init(item:[String: Any]?) {
         type = item?["type"] as? String
         ts = item?["ts"] as? String
         channel = item?["channel"] as? String
-        
-        message = Message(message: item?["message"] as? [String: AnyObject])
+        message = Message(dictionary: item?["message"] as? [String: Any])
         
         // Comment and File can come across as Strings or Dictionaries
-        if let commentDictionary = item?["comment"] as? [String: AnyObject] {
+        if let commentDictionary = item?["comment"] as? [String: Any] {
             comment = Comment(comment: commentDictionary)
         } else {
             comment = Comment(id: item?["comment"] as? String)
         }
         
-        if let fileDictionary = item?["file"] as? [String: AnyObject] {
+        if let fileDictionary = item?["file"] as? [String: Any] {
             file = File(file: fileDictionary)
         } else {
             file = File(id: item?["file"] as? String)
@@ -52,10 +52,8 @@ public struct Item {
         
         fileCommentID = item?["file_comment"] as? String
     }
-}
-
-extension Item: Equatable {}
-
-public func ==(lhs: Item, rhs: Item) -> Bool {
-    return lhs.type == rhs.type && lhs.channel == rhs.channel && lhs.file == rhs.file && lhs.comment == rhs.comment && lhs.message == rhs.message
+    
+    public static func ==(lhs: Item, rhs: Item) -> Bool {
+        return lhs.type == rhs.type && lhs.channel == rhs.channel && lhs.file == rhs.file && lhs.comment == rhs.comment && lhs.message == rhs.message
+    }
 }

SlackKit/Sources/Message.swift

@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-public final class Message {
+public final class Message: Equatable {
     
     public let type = "message"
     public let subtype: String?
@@ -32,7 +32,7 @@ public final class Message {
     internal(set) public var text: String?
     public let botID: String?
     public let username: String?
-    public let icons: [String: AnyObject]?
+    public let icons: [String: Any]?
     public let deletedTs: String?
     internal(set) var purpose: String?
     internal(set) var topic: String?
@@ -51,33 +51,33 @@ public final class Message {
     internal(set) public var replaceOriginal: Bool?
     internal(set) public var deleteOriginal: Bool?
     
-    public init(message: [String: AnyObject]?) {
-        subtype = message?["subtype"] as? String
-        ts = message?["ts"] as? String
-        user = message?["user"] as? String
-        channel = message?["channel"] as? String
-        hidden = message?["hidden"] as? Bool
-        text = message?["text"] as? String
-        botID = message?["bot_id"] as? String
-        username = message?["username"] as? String
-        icons = message?["icons"] as? [String: AnyObject]
-        deletedTs = message?["deleted_ts"] as? String
-        purpose = message?["purpose"] as? String
-        topic = message?["topic"] as? String
-        name = message?["name"] as? String
-        members = message?["members"] as? [String]
-        oldName = message?["old_name"] as? String
-        upload = message?["upload"] as? Bool
-        itemType = message?["item_type"] as? String
-        isStarred = message?["is_starred"] as? Bool
-        pinnedTo = message?["pinned_to"] as? [String]
-        comment = Comment(comment: message?["comment"] as? [String: AnyObject])
-        file = File(file: message?["file"] as? [String: AnyObject])
-        reactions = Reaction.reactionsFromArray(message?["reactions"] as? [[String: AnyObject]])
-        attachments = (message?["attachments"] as? [[String: AnyObject]])?.map{Attachment(attachment: $0)}
-        responseType = ResponseType(rawValue: message?["response_type"] as? String ?? "")
-        replaceOriginal = message?["replace_original"] as? Bool
-        deleteOriginal = message?["delete_original"] as? Bool
+    public init(dictionary: [String: Any]?) {
+        subtype = dictionary?["subtype"] as? String
+        ts = dictionary?["ts"] as? String
+        user = dictionary?["user"] as? String
+        channel = dictionary?["channel"] as? String
+        hidden = dictionary?["hidden"] as? Bool
+        text = dictionary?["text"] as? String
+        botID = dictionary?["bot_id"] as? String
+        username = dictionary?["username"] as? String
+        icons = dictionary?["icons"] as? [String: Any]
+        deletedTs = dictionary?["deleted_ts"] as? String
+        purpose = dictionary?["purpose"] as? String
+        topic = dictionary?["topic"] as? String
+        name = dictionary?["name"] as? String
+        members = dictionary?["members"] as? [String]
+        oldName = dictionary?["old_name"] as? String
+        upload = dictionary?["upload"] as? Bool
+        itemType = dictionary?["item_type"] as? String
+        isStarred = dictionary?["is_starred"] as? Bool
+        pinnedTo = dictionary?["pinned_to"] as? [String]
+        comment = Comment(comment: dictionary?["comment"] as? [String: Any])
+        file = File(file: dictionary?["file"] as? [String: Any])
+        reactions = Reaction.reactionsFromArray(dictionary?["reactions"] as? [[String: Any]])
+        attachments = (dictionary?["attachments"] as? [[String: Any]])?.map{Attachment(attachment: $0)}
+        responseType = ResponseType(rawValue: dictionary?["response_type"] as? String ?? "")
+        replaceOriginal = dictionary?["replace_original"] as? Bool
+        deleteOriginal = dictionary?["delete_original"] as? Bool
     }
     
     internal init(ts:String?) {
@@ -94,11 +94,8 @@ public final class Message {
         comment = nil
         file = nil
     }
-
-}
-
-extension Message: Equatable {}
-
-public func ==(lhs: Message, rhs: Message) -> Bool {
-    return lhs.ts == rhs.ts && lhs.user == rhs.user && lhs.text == rhs.text
+    
+    public static func ==(lhs: Message, rhs: Message) -> Bool {
+        return lhs.ts == rhs.ts && lhs.user == rhs.user && lhs.text == rhs.text
+    }
 }

SlackKit/Sources/MessageActionRequest.swift

@@ -1,52 +0,0 @@
-//
-// MessageActionRequest.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-internal struct MessageActionRequest: Request {
-    
-    let action: Action?
-    let callbackID: String?
-    let team: Team?
-    let channel: Channel?
-    let user: User?
-    let actionTS: String?
-    let messageTS: String?
-    let attachmentID: String?
-    let token: String?
-    let originalMessage: Message?
-    let responseURL: String
-    
-    init(response: [String: AnyObject]?) {
-        action = (response?["actions"] as? [[String:AnyObject]])?.map({Action(action: $0)}).first
-        callbackID = response?["callback_id"] as? String
-        team = Team(team: response?["team"] as? [String: AnyObject])
-        channel = Channel(channel: response?["channel"] as? [String: AnyObject])
-        user = User(user: response?["channel"] as? [String: AnyObject])
-        actionTS = response?["action_ts"] as? String
-        messageTS = response?["message_ts"] as? String
-        attachmentID = response?["attachment_id"] as? String
-        token = response?["token"] as? String
-        originalMessage = Message(message: response?["original_message"] as? [String: AnyObject])
-        responseURL = response?["response_url"] as? String ?? ""
-    }
-    
-}

SlackKit/Sources/MessageActionResponder.swift

@@ -1,40 +0,0 @@
-//
-// MessageActionResponder.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-public struct MessageActionResponder {
-    
-    public var responses:[(Action, Response)]
-    
-    public init(responses:[(Action, Response)]) {
-        self.responses = responses
-    }
-    
-    internal func responseForRequest(request:MessageActionRequest) -> Reply? {
-        if let response = responses.filter({$0.0.name == request.action?.name}).first?.1 {
-            return Reply.JSON(response: response)
-        } else {
-            return nil
-        }
-    }
-    
-}

SlackKit/Sources/MessageActionServer.swift

@@ -1,46 +0,0 @@
-//
-// MessageActionServer.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-public class MessageActionServer: Server {
-    
-    internal let responder: MessageActionResponder
-    
-    required public init(token: String, route: String, responder: MessageActionResponder) {
-        self.responder = responder
-        super.init(token: token)
-        addRoute(route)
-    }
-    
-    internal func addRoute(route: String) {
-        http.POST["/\(route)"] = { request in
-            let payload = request.parseUrlencodedForm()
-            let actionRequest = MessageActionRequest(response: self.jsonFromRequest(payload[0].1))
-            if let reply = self.responder.responseForRequest(actionRequest) where actionRequest.token == self.token {
-                return self.request(actionRequest, reply: reply)
-            } else {
-                return .BadRequest(.Text("Bad request."))
-            }
-        }
-    }
-    
-}

SlackKit/Sources/NetworkInterface.swift

@@ -22,132 +22,113 @@
 // THE SOFTWARE.
 
 import Foundation
+import HTTPClient
+import WebSocketClient
 
 internal struct NetworkInterface {
     
     private let apiUrl = "https://slack.com/api/"
+    private let client: HTTPClient.Client?
     
-    internal func request(endpoint: Endpoint, token: String? = nil, parameters: [String: AnyObject]?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
-        var requestString = "\(apiUrl)\(endpoint.rawValue)?"
-        if let token = token {
-            requestString += "token=\(token)"
+    init() {
+        do {
+            self.client = try Client(url: URL(string: "https://slack.com")!)
+        } catch {
+            self.client = nil
         }
+    }
+    
+    internal func request(_ endpoint: Endpoint, token: String, parameters: [String: Any]?, successClosure: ([String: Any])->Void, errorClosure: (SlackError)->Void) {
+        var requestString = "\(apiUrl)\(endpoint.rawValue)?token=\(token)"
         if let params = parameters {
             requestString += params.requestStringFromParameters
         }
-        guard let url =  NSURL(string: requestString) else {
-            errorClosure(SlackError.ClientNetworkError)
-            return
-        }
-        let request = NSURLRequest(URL:url)
-        NSURLSession.sharedSession().dataTaskWithRequest(request) {
-            (data, response, internalError) -> Void in
-            self.handleResponse(data, response: response, internalError: internalError, successClosure: {(json) in
-                successClosure(json)
-            }, errorClosure: {(error) in
-                errorClosure(error)
-            })
-        }.resume()
-    }
-    
-    internal func customRequest(url: String, data: NSData, success: (Bool)->Void, errorClosure: (SlackError)->Void) {
-        guard let requestString = url.stringByRemovingPercentEncoding, url =  NSURL(string: requestString) else {
-            errorClosure(SlackError.ClientNetworkError)
-            return
-        }
-        let request = NSMutableURLRequest(URL:url)
-        request.HTTPMethod = "POST"
-        let contentType = "application/json"
-        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
-        request.HTTPBody = data
         
-        NSURLSession.sharedSession().dataTaskWithRequest(request) {
-            (data, response, internalError) -> Void in
-            if internalError == nil {
-                success(true)
-            } else {
-                errorClosure(SlackError.ClientNetworkError)
-            }
-            }.resume()
-    }
-    
-    internal func uploadRequest(token: String, data: NSData, parameters: [String: AnyObject]?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
-        var requestString = "\(apiUrl)\(Endpoint.FilesUpload.rawValue)?token=\(token)"
-        if let params = parameters {
-            requestString = requestString + params.requestStringFromParameters
-        }
-        guard let url =  NSURL(string: requestString) else {
-            errorClosure(SlackError.ClientNetworkError)
-            return
-        }
-        let request = NSMutableURLRequest(URL:url)
-        request.HTTPMethod = "POST"
-        let boundaryConstant = randomBoundary()
-        let contentType = "multipart/form-data; boundary=" + boundaryConstant
-        let boundaryStart = "--\(boundaryConstant)\r\n"
-        let boundaryEnd = "--\(boundaryConstant)--\r\n"
-        let contentDispositionString = "Content-Disposition: form-data; name=\"file\"; filename=\"\(parameters!["filename"])\"\r\n"
-        let contentTypeString = "Content-Type: \(parameters!["filetype"])\r\n\r\n"
-
-        let requestBodyData : NSMutableData = NSMutableData()
-        requestBodyData.appendData(boundaryStart.dataUsingEncoding(NSUTF8StringEncoding)!)
-        requestBodyData.appendData(contentDispositionString.dataUsingEncoding(NSUTF8StringEncoding)!)
-        requestBodyData.appendData(contentTypeString.dataUsingEncoding(NSUTF8StringEncoding)!)
-        requestBodyData.appendData(data)
-        requestBodyData.appendData("\r\n".dataUsingEncoding(NSUTF8StringEncoding)!)
-        requestBodyData.appendData(boundaryEnd.dataUsingEncoding(NSUTF8StringEncoding)!)
-        
-        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
-        request.HTTPBody = requestBodyData
-
-        NSURLSession.sharedSession().dataTaskWithRequest(request) {
-            (data, response, internalError) -> Void in
-            self.handleResponse(data, response: response, internalError: internalError, successClosure: {(json) in
-                successClosure(json)
-            }, errorClosure: {(error) in
-                errorClosure(error)
-            })
-        }.resume()
-    }
-    
-    private func handleResponse(data: NSData?, response:NSURLResponse?, internalError:NSError?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
-        guard let data = data, response = response as? NSHTTPURLResponse else {
-            errorClosure(SlackError.ClientNetworkError)
-            return
-        }
         do {
-            guard let json = try NSJSONSerialization.JSONObjectWithData(data, options: []) as? [String: AnyObject] else {
-                errorClosure(SlackError.ClientJSONError)
-                return
-            }
-            
-            switch response.statusCode {
-            case 200:
-                if (json["ok"] as! Bool == true) {
-                    successClosure(json)
-                } else {
-                    if let errorString = json["error"] as? String {
-                        throw SlackError(rawValue: errorString) ?? .UnknownError
+            let contentNegotiation = ContentNegotiationMiddleware(mediaTypes: [.json, .urlEncodedForm], mode: .client)
+            var response = try client?.get(requestString, middleware: [contentNegotiation])
+            if let buffer = try response?.body.becomeBuffer(deadline: 3.seconds.fromNow()) {
+                let data = Data(bytes: buffer.bytes)
+                let json = try JSONSerialization.jsonObject(with: data, options: .allowFragments)
+                if let result = json as? [String: Any] {
+                    if (result["ok"] as? Bool == true) {
+                        successClosure(result)
                     } else {
-                        throw SlackError.UnknownError
+                        if let errorString = result["error"] as? String {
+                            throw SlackError(rawValue: errorString) ?? SlackError.unknownError
+                        } else {
+                            throw SlackError.unknownError
+                        }
                     }
                 }
-            case 429:
-                throw SlackError.TooManyRequests
-            default:
-                throw SlackError.ClientNetworkError
             }
         } catch let error {
             if let slackError = error as? SlackError {
                 errorClosure(slackError)
             } else {
-                errorClosure(SlackError.UnknownError)
+                errorClosure(SlackError.unknownError)
+            }
+        }
+    }
+    
+    internal func uploadRequest(token: String, data: Data, parameters: [String: Any]?, successClosure: ([String: Any])->Void, errorClosure: (SlackError)->Void) {
+        var requestString = "\(apiUrl)\(Endpoint.filesUpload.rawValue)?token=\(token)"
+        if let params = parameters {
+            requestString = requestString + params.requestStringFromParameters
+        }
+    
+        let boundaryConstant = randomBoundary()
+        let boundaryStart = "--\(boundaryConstant)\r\n"
+        let boundaryEnd = "\r\n--\(boundaryConstant)--\r\n"
+        let contentDispositionString = "Content-Disposition: form-data; name=\"file\"; filename=\"\(parameters!["filename"])\"\r\n"
+        let contentTypeString = "Content-Type: \(parameters!["filetype"])\r\n\r\n"
+        
+        guard let boundaryStartData = boundaryStart.data(using: .utf8), let dispositionData = contentDispositionString.data(using: .utf8), let contentTypeData = contentTypeString.data(using: .utf8), let boundaryEndData = boundaryEnd.data(using: .utf8) else {
+            errorClosure(SlackError.clientNetworkError)
+            return
+        }
+        var requestBodyData = Data()
+        requestBodyData.append(contentsOf: boundaryStartData)
+        requestBodyData.append(contentsOf: dispositionData)
+        requestBodyData.append(contentsOf: contentTypeData)
+        requestBodyData.append(contentsOf: data)
+        requestBodyData.append(contentsOf: boundaryEndData)
+        
+        let header: Headers = ["Content-Type":"multipart/form-data; boundary=\(boundaryConstant)"]
+        
+        do {
+            let body = Buffer([UInt8](requestBodyData))
+            var response = try client?.post(requestString, headers: header, body: body)
+            if let buffer = try response?.body.becomeBuffer(deadline: 3.seconds.fromNow()) {
+                let data = Data(bytes: buffer.bytes)
+                let json = try JSONSerialization.jsonObject(with: data, options: .allowFragments)
+                if let result = json as? [String: Any] {
+                    if (result["ok"] as? Bool == true) {
+                        successClosure(result)
+                    } else {
+                        if let errorString = result["error"] as? String {
+                            throw SlackError(rawValue: errorString) ?? SlackError.unknownError
+                        } else {
+                            throw SlackError.unknownError
+                        }
+                    }
+                }
+            }
+
+        } catch let error {
+            if let slackError = error as? SlackError {
+                errorClosure(slackError)
+            } else {
+                errorClosure(SlackError.unknownError)
             }
         }
     }
     
     private func randomBoundary() -> String {
-        return String(format: "slackkit.boundary.%08x%08x", arc4random(), arc4random())
+        #if os(Linux)
+            return "slackkit.boundary.\(Int(random()))\(Int(random()))"
+        #else
+            return "slackkit.boundary.\(arc4random())\(arc4random())"
+        #endif
     }
-    
 }

SlackKit/Sources/OAuthResponse.swift

@@ -1,44 +0,0 @@
-//
-// OAuthResponse.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-internal struct OAuthResponse {
-
-    let accessToken: String?
-    let scope: [Scope]?
-    let userID: String?
-    let teamName: String?
-    let teamID: String?
-    let incomingWebhook: IncomingWebhook?
-    let bot: Bot?
-    
-    init(response: [String: AnyObject]?) {
-        accessToken = response?["access_token"] as? String
-        scope = (response?["scope"] as? String)?.componentsSeparatedByString(",").flatMap{Scope(rawValue:$0)}
-        userID = response?["user_id"] as? String
-        teamName = response?["team_name"] as? String
-        teamID = response?["team_id"] as? String
-        incomingWebhook = IncomingWebhook(webhook: response?["incoming_webhook"] as? [String: AnyObject])
-        bot = Bot(botUser: response?["bot"] as? [String: AnyObject])
-    }
-    
-}

SlackKit/Sources/OAuthServer.swift

@@ -1,99 +0,0 @@
-//
-// OAuthServer.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-import Foundation
-import Swifter
-
-internal protocol OAuthDelegate {
-    mutating func userAuthed(response: OAuthResponse)
-}
-
-public struct OAuthServer {
-    
-    private let oauthURL = "https://slack.com/oauth/authorize"
-
-    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
-        self.clientSecret = clientSecret
-        self.state = state ?? "state"
-        self.redirectURI = redirectURI
-        self.delegate = delegate
-        oauthRoute()
-        start(port, forceIPV4: forceIPV4)
-    }
-    
-    public func start(port: in_port_t = 8080, forceIPV4: Bool = false) {
-        do {
-            try http.start(port, forceIPv4: forceIPV4)
-        } catch let error as NSError {
-            print("Server failed to start with error: \(error)")
-        }
-    }
-    
-    public func stop() {
-        http.stop()
-    }
-    
-    private mutating func oauthRoute() {
-        http["/oauth"] = { request in
-            guard let response = AuthorizeResponse(queryParameters: request.queryParams) where response.state == self.state else {
-                return .BadRequest(.Text("Bad request."))
-            }
-            self.oauthRequest(response)
-            if let redirect = self.redirectURI {
-                return .MovedPermanently(redirect)
-            }
-            return .OK(.Text("Authentication successful."))
-        }
-    }
-    
-    private mutating func oauthRequest(auth: AuthorizeResponse) {
-        WebAPI.oauthAccess(self.clientID, clientSecret: self.clientSecret, code: auth.code, redirectURI: self.redirectURI, success: {(response) in
-            self.delegate?.userAuthed(OAuthResponse(response: response))
-        }, failure: {(error) in
-            
-        })
-    }
-    
-    private func oauthURLRequest(authorize: AuthorizeRequest) -> NSURLRequest? {
-        var requestString = "\(oauthURL)?client_id=\(authorize.clientID)"
-        requestString += authorize.parameters.requestStringFromParameters
-        guard let url = NSURL(string: requestString) else {
-            return nil
-        }
-        return NSURLRequest(URL:url)
-    }
-    
-    public func authorizeRequest(scope:[Scope], redirectURI: String, state: String = "slackkit", team: String? = nil) -> NSURLRequest? {
-        let request = AuthorizeRequest(clientID: clientID, scope: scope, redirectURI: redirectURI, state: state, team: team)
-        return oauthURLRequest(request)
-    }
-    
-}

SlackKit/Sources/Reaction.swift

@@ -21,11 +21,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-public struct Reaction {
+public struct Reaction: Equatable {
+    
     public let name: String?
     internal(set) public var user: String?
     
-    internal init(reaction:[String: AnyObject]?) {
+    internal init(reaction:[String: Any]?) {
         name = reaction?["name"] as? String
     }
     
@@ -34,11 +35,11 @@ public struct Reaction {
         self.user = user
     }
     
-    static func reactionsFromArray(array: [[String: AnyObject]]?) -> [Reaction] {
+    static func reactionsFromArray(_ array: [[String: Any]]?) -> [Reaction] {
         var reactions = [Reaction]()
         if let array = array {
             for reaction in array {
-                if let users = reaction["users"] as? [String], name = reaction["name"] as? String {
+                if let users = reaction["users"] as? [String], let name = reaction["name"] as? String {
                     for user in users {
                         reactions.append(Reaction(name: name, user: user))
                     }
@@ -48,10 +49,7 @@ public struct Reaction {
         return reactions
     }
     
-}
-
-extension Reaction: Equatable {}
-
-public func ==(lhs: Reaction, rhs: Reaction) -> Bool {
-    return lhs.name == rhs.name
+    public static func ==(lhs: Reaction, rhs: Reaction) -> Bool {
+        return lhs.name == rhs.name
+    }
 }

SlackKit/Sources/Response.swift

@@ -1,44 +0,0 @@
-//
-// Response.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-public struct Response {
-    
-    let text: String
-    let responseType: ResponseType?
-    let attachments: [Attachment]?
-    
-    public init(text: String, responseType: ResponseType? = nil, attachments: [Attachment]? = nil) {
-        self.responseType = responseType
-        self.text = text
-        self.attachments = attachments
-    }
-    
-    internal func json() -> [String: AnyObject] {
-        var json = [String : AnyObject]()
-        json["text"] = text
-        json["response_type"] = responseType?.rawValue
-        json["attachments"] = attachments?.map({$0.dictionary()})
-        return json
-    }
-    
-}

SlackKit/Sources/Scope.swift

@@ -1,71 +0,0 @@
-//
-// Scope.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-public enum Scope: String {
-    
-    case ChannelsHistory = "channels:history"
-    case ChannelsRead = "channels:read"
-    case ChannelsWrite = "channels:write"
-    case ChatWriteBot = "chat:write:bot"
-    case ChatWriteUser = "chat:write:user"
-    case DNDRead = "dnd:read"
-    case DNDWrite = "dnd:write"
-    case EmojiRead = "emoji:read"
-    case FilesRead = "files:read"
-    case FilesWriteUser = "files:write:user"
-    case GroupsHistory = "groups:history"
-    case GroupsRead = "groups:read"
-    case GroupsWrite = "groups:write"
-    case IdentityBasic = "identity.basic"
-    case IMHistory = "im:history"
-    case IMRead = "im:read"
-    case IMWrite = "im:write"
-    case MPIMHistory = "mpim:history"
-    case MPIMRead = "mpim:read"
-    case MPIMWrite = "mpim:write"
-    case PinsRead = "pins:read"
-    case PinsWrite = "pins:write"
-    case ReactionsRead = "reactions:read"
-    case ReactionsWrite = "reactions:write"
-    case RemindersRead = "reminders:read"
-    case RemindersWrite = "reminders:write"
-    case SearchRead = "search:read"
-    case StarsRead = "stars:read"
-    case StarsWrite = "stars:write"
-    case TeamRead = "team:read"
-    case UserGroupsRead = "usergroups:read"
-    case UserGroupsWrite = "usergroups:write"
-    case UserProfilesRead = "user.profiles:read"
-    case UserProfilesWrite = "user.profiles:write"
-    case UsersRead = "users:read"
-    case UsersWrite = "users:write"
-    case IncomingWebhook = "incoming-webhook"
-    case Commands = "commands"
-    case Bot = "bot"
-    case Identify = "identify"
-    case Client = "client"
-    case Admin = "admin"
-    //Deprecated
-    case Read = "read"
-    case Post = "post"
-}

SlackKit/Sources/Server.swift

@@ -1,91 +0,0 @@
-//
-// Server.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-import Foundation
-import Swifter
-
-internal enum Reply {
-    case JSON(response: Response)
-    case Text(body: String)
-    case BadRequest
-}
-
-internal protocol Request {
-    var responseURL: String { get }
-}
-
-public class Server {
-    
-    internal let http = HttpServer()
-    internal let token: String
-    
-    internal init(token: String) {
-        self.token = token
-    }
-    
-    public func start(port: in_port_t = 8080, forceIPV4: Bool = false) {
-        do {
-            try http.start(port, forceIPv4: forceIPV4)
-        } catch let error as NSError {
-            print("Server failed to start with error: \(error)")
-        }
-    }
-    
-    public func stop() {
-        http.stop()
-    }
-    
-    internal func request(request:Request, reply: Reply) -> HttpResponse {
-        switch reply {
-        case .Text(let body):
-            return .OK(.Text(body))
-        case .JSON(let response):
-            return .OK(.Json(response.json()))
-        case .BadRequest:
-            return .BadRequest(.Text("Bad request."))
-        }
-    }
-    
-    internal func dictionaryFromRequest(body: [UInt8]) -> [String: AnyObject]? {
-        let string = NSString(data: NSData(bytes: body, length: body.count), encoding: NSUTF8StringEncoding)
-        if let body = string?.componentsSeparatedByString("&") {
-            var dict: [String: AnyObject] = [:]
-            for argument in body {
-                let kv = argument.componentsSeparatedByString("=")
-                if let key = kv.first, value = kv.last {
-                    dict[key] = value
-                }
-            }
-            return dict
-        }
-        return nil
-    }
-    
-    internal func jsonFromRequest(string: String) -> [String: AnyObject]? {
-        guard let data = string.dataUsingEncoding(NSUTF8StringEncoding) else {
-            return nil
-        }
-        return (try? NSJSONSerialization.JSONObjectWithData(data, options: [])) as? [String: AnyObject] ?? nil
-    }
-    
-}

SlackKit/Sources/SlackError.swift

@@ -21,100 +21,101 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-public enum SlackError: String, ErrorType {
-    case AccountInactive = "account_inactive"
-    case AlreadyArchived = "already_archived"
-    case AlreadyInChannel = "already_in_channel"
-    case AlreadyPinned = "already_pinned"
-    case AlreadyReacted = "already_reacted"
-    case AlreadyStarred = "already_starred"
-    case BadClientSecret = "bad_client_secret"
-    case BadRedirectURI = "bad_redirect_uri"
-    case BadTimeStamp = "bad_timestamp"
-    case CantArchiveGeneral = "cant_archive_general"
-    case CantDelete = "cant_delete"
-    case CantDeleteFile = "cant_delete_file"
-    case CantDeleteMessage = "cant_delete_message"
-    case CantInvite = "cant_invite"
-    case CantInviteSelf = "cant_invite_self"
-    case CantKickFromGeneral = "cant_kick_from_general"
-    case CantKickFromLastChannel = "cant_kick_from_last_channel"
-    case CantKickSelf = "cant_kick_self"
-    case CantLeaveGeneral = "cant_leave_general"
-    case CantLeaveLastChannel = "cant_leave_last_channel"
-    case CantUpdateMessage = "cant_update_message"
-    case ChannelNotFound = "channel_not_found"
-    case ComplianceExportsPreventDeletion = "compliance_exports_prevent_deletion"
-    case EditWindowClosed = "edit_window_closed"
-    case FileCommentNotFound = "file_comment_not_found"
-    case FileDeleted = "file_deleted"
-    case FileNotFound = "file_not_found"
-    case FileNotShared = "file_not_shared"
-    case GroupContainsOthers = "group_contains_others"
-    case InvalidArgName = "invalid_arg_name"
-    case InvalidArrayArg = "invalid_array_arg"
-    case InvalidAuth = "invalid_auth"
-    case InvalidChannel = "invalid_channel"
-    case InvalidCharSet = "invalid_charset"
-    case InvalidClientID = "invalid_client_id"
-    case InvalidCode = "invalid_code"
-    case InvalidFormData = "invalid_form_data"
-    case InvalidName = "invalid_name"
-    case InvalidPostType = "invalid_post_type"
-    case InvalidPresence = "invalid_presence"
-    case InvalidTS = "invalid_timestamp"
-    case InvalidTSLatest = "invalid_ts_latest"
-    case InvalidTSOldest = "invalid_ts_oldest"
-    case IsArchived = "is_archived"
-    case LastMember = "last_member"
-    case LastRAChannel = "last_ra_channel"
-    case MessageNotFound = "message_not_found"
-    case MessageTooLong = "msg_too_long"
-    case MigrationInProgress = "migration_in_progress"
-    case MissingDuration = "missing_duration"
-    case MissingPostType = "missing_post_type"
-    case NameTaken = "name_taken"
-    case NoChannel = "no_channel"
-    case NoComment = "no_comment"
-    case NoItemSpecified = "no_item_specified"
-    case NoReaction = "no_reaction"
-    case NoText = "no_text"
-    case NotArchived = "not_archived"
-    case NotAuthed = "not_authed"
-    case NotEnoughUsers = "not_enough_users"
-    case NotInChannel = "not_in_channel"
-    case NotInGroup = "not_in_group"
-    case NotPinned = "not_pinned"
-    case NotStarred = "not_starred"
-    case OverPaginationLimit = "over_pagination_limit"
-    case PaidOnly = "paid_only"
-    case PermissionDenied = "perimssion_denied"
-    case PostingToGeneralChannelDenied = "posting_to_general_channel_denied"
-    case RateLimited = "rate_limited"
-    case RequestTimeout = "request_timeout"
-    case RestrictedAction = "restricted_action"
-    case SnoozeEndFailed = "snooze_end_failed"
-    case SnoozeFailed = "snooze_failed"
-    case SnoozeNotActive = "snooze_not_active"
-    case TooLong = "too_long"
-    case TooManyEmoji = "too_many_emoji"
-    case TooManyReactions = "too_many_reactions"
-    case TooManyUsers = "too_many_users"
-    case UnknownError
-    case UnknownType = "unknown_type"
-    case UserDisabled = "user_disabled"
-    case UserDoesNotOwnChannel = "user_does_not_own_channel"
-    case UserIsBot = "user_is_bot"
-    case UserIsRestricted = "user_is_restricted"
-    case UserIsUltraRestricted = "user_is_ultra_restricted"
-    case UserListNotSupplied = "user_list_not_supplied"
-    case UserNotFound = "user_not_found"
-    case UserNotVisible = "user_not_visible"
+public enum SlackError: String, Error {
+    case accountInactive = "account_inactive"
+    case alreadyArchived = "already_archived"
+    case alreadyInChannel = "already_in_channel"
+    case alreadyPinned = "already_pinned"
+    case alreadyReacted = "already_reacted"
+    case alreadyStarred = "already_starred"
+    case badClientSecret = "bad_client_secret"
+    case badRedirectURI = "bad_redirect_uri"
+    case badTimeStamp = "bad_timestamp"
+    case cantArchiveGeneral = "cant_archive_general"
+    case cantDelete = "cant_delete"
+    case cantDeleteFile = "cant_delete_file"
+    case cantDeleteMessage = "cant_delete_message"
+    case cantInvite = "cant_invite"
+    case cantInviteSelf = "cant_invite_self"
+    case cantKickFromGeneral = "cant_kick_from_general"
+    case cantKickFromLastChannel = "cant_kick_from_last_channel"
+    case cantKickSelf = "cant_kick_self"
+    case cantLeaveGeneral = "cant_leave_general"
+    case cantLeaveLastChannel = "cant_leave_last_channel"
+    case cantUpdateMessage = "cant_update_message"
+    case channelNotFound = "channel_not_found"
+    case complianceExportsPreventDeletion = "compliance_exports_prevent_deletion"
+    case editWindowClosed = "edit_window_closed"
+    case fileCommentNotFound = "file_comment_not_found"
+    case fileDeleted = "file_deleted"
+    case fileNotFound = "file_not_found"
+    case fileNotShared = "file_not_shared"
+    case groupContainsOthers = "group_contains_others"
+    case invalidArgName = "invalid_arg_name"
+    case invalidArrayArg = "invalid_array_arg"
+    case invalidAuth = "invalid_auth"
+    case invalidChannel = "invalid_channel"
+    case invalidCharSet = "invalid_charset"
+    case invalidClientID = "invalid_client_id"
+    case invalidCode = "invalid_code"
+    case invalidFormData = "invalid_form_data"
+    case invalidName = "invalid_name"
+    case invalidPostType = "invalid_post_type"
+    case invalidPresence = "invalid_presence"
+    case invalidTS = "invalid_timestamp"
+    case invalidTSLatest = "invalid_ts_latest"
+    case invalidTSOldest = "invalid_ts_oldest"
+    case isArchived = "is_archived"
+    case lastMember = "last_member"
+    case lastRAChannel = "last_ra_channel"
+    case messageNotFound = "message_not_found"
+    case messageTooLong = "msg_too_long"
+    case migrationInProgress = "migration_in_progress"
+    case missingDuration = "missing_duration"
+    case missingPostType = "missing_post_type"
+    case missingScope = "missing_scope"
+    case nameTaken = "name_taken"
+    case noChannel = "no_channel"
+    case noComment = "no_comment"
+    case noItemSpecified = "no_item_specified"
+    case noReaction = "no_reaction"
+    case noText = "no_text"
+    case notArchived = "not_archived"
+    case notAuthed = "not_authed"
+    case notEnoughUsers = "not_enough_users"
+    case notInChannel = "not_in_channel"
+    case notInGroup = "not_in_group"
+    case notPinned = "not_pinned"
+    case notStarred = "not_starred"
+    case overPaginationLimit = "over_pagination_limit"
+    case paidOnly = "paid_only"
+    case permissionDenied = "perimssion_denied"
+    case postingToGeneralChannelDenied = "posting_to_general_channel_denied"
+    case rateLimited = "rate_limited"
+    case requestTimeout = "request_timeout"
+    case restrictedAction = "restricted_action"
+    case snoozeEndFailed = "snooze_end_failed"
+    case snoozeFailed = "snooze_failed"
+    case snoozeNotActive = "snooze_not_active"
+    case tooLong = "too_long"
+    case tooManyEmoji = "too_many_emoji"
+    case tooManyReactions = "too_many_reactions"
+    case tooManyUsers = "too_many_users"
+    case unknownError
+    case unknownType = "unknown_type"
+    case userDisabled = "user_disabled"
+    case userDoesNotOwnChannel = "user_does_not_own_channel"
+    case userIsBot = "user_is_bot"
+    case userIsRestricted = "user_is_restricted"
+    case userIsUltraRestricted = "user_is_ultra_restricted"
+    case userListNotSupplied = "user_list_not_supplied"
+    case userNotFound = "user_not_found"
+    case userNotVisible = "user_not_visible"
     // Client
-    case ClientNetworkError
-    case ClientJSONError
-    case ClientOAuthError
+    case clientNetworkError
+    case clientJSONError
+    case clientOAuthError
     // HTTP
-    case TooManyRequests
-    case UnknownHTTPError
+    case tooManyRequests
+    case unknownHTTPError
 }

SlackKit/Sources/SlackKit.swift

@@ -1,67 +0,0 @@
-//
-// SlackKit.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-import Foundation
-
-public final class SlackKit: OAuthDelegate {
-    
-    internal(set) public var oauth: OAuthServer?
-    internal(set) public var clients: [String: Client] = [:]
-    private let clientOptions: ClientOptions
-    // Initalization block
-    public var onClientInitalization: ((Client) -> Void)?
-    
-    // If you already have an API token
-    public init(withAPIToken token: String, clientOptions: ClientOptions = ClientOptions()) {
-        self.clientOptions = clientOptions
-        let client = Client(apiToken: token)
-        dispatch_async(dispatch_get_main_queue(), {
-            self.onClientInitalization?(client)
-        })
-        clients[token] = client
-        client.connect(options: self.clientOptions)
-    }
-    
-    // If you're going to be receiving and/or initiating OAuth requests, provide a client ID and secret
-    public init(clientID: String, clientSecret: String, state: String? = nil, redirectURI: String? = nil, port:in_port_t = 8080, forceIPV4: Bool = false, clientOptions: ClientOptions = ClientOptions()) {
-        self.clientOptions = clientOptions
-        oauth = try? OAuthServer(clientID: clientID, clientSecret: clientSecret, state: state, redirectURI: redirectURI, port: port, forceIPV4: forceIPV4, delegate: self)
-    }
-    
-    internal func userAuthed(response: OAuthResponse) {
-        // User auth
-        if let token = response.accessToken {
-            let client = Client(apiToken: token)
-            self.onClientInitalization?(client)
-            clients[token] = client
-        }
-        // Bot User
-        if let token = response.bot?.botToken {
-            let client = Client(apiToken: token)
-            self.onClientInitalization?(client)
-            clients[token] = client
-            client.connect(options: self.clientOptions)
-        }
-    }
-    
-}

SlackKit/Sources/SlackWebAPI.swift

@@ -0,0 +1,698 @@
+//
+// SlackWebAPI.swift
+//
+// Copyright © 2016 Peter Zignego. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+internal enum Endpoint: String {
+    case apiTest = "api.test"
+    case authTest = "auth.test"
+    case channelsHistory = "channels.history"
+    case channelsInfo = "channels.info"
+    case channelsList = "channels.list"
+    case channelsMark = "channels.mark"
+    case channelsSetPurpose = "channels.setPurpose"
+    case channelsSetTopic = "channels.setTopic"
+    case chatDelete = "chat.delete"
+    case chatMeMessage = "chat.meMessage"
+    case chatPostMessage = "chat.postMessage"
+    case chatUpdate = "chat.update"
+    case dndInfo = "dnd.info"
+    case dndTeamInfo = "dnd.teamInfo"
+    case emojiList = "emoji.list"
+    case filesCommentsAdd = "files.comments.add"
+    case filesCommentsEdit = "files.comments.edit"
+    case filesCommentsDelete = "files.comments.delete"
+    case filesDelete = "files.delete"
+    case filesInfo = "files.info"
+    case filesUpload = "files.upload"
+    case groupsClose = "groups.close"
+    case groupsHistory = "groups.history"
+    case groupsInfo = "groups.info"
+    case groupsList = "groups.list"
+    case groupsMark = "groups.mark"
+    case groupsOpen = "groups.open"
+    case groupsSetPurpose = "groups.setPurpose"
+    case groupsSetTopic = "groups.setTopic"
+    case imClose = "im.close"
+    case imHistory = "im.history"
+    case imList = "im.list"
+    case imMark = "im.mark"
+    case imOpen = "im.open"
+    case mpimClose = "mpim.close"
+    case mpimHistory = "mpim.history"
+    case mpimList = "mpim.list"
+    case mpimMark = "mpim.mark"
+    case mpimOpen = "mpim.open"
+    case pinsAdd = "pins.add"
+    case pinsRemove = "pins.remove"
+    case reactionsAdd = "reactions.add"
+    case reactionsGet = "reactions.get"
+    case reactionsList = "reactions.list"
+    case reactionsRemove = "reactions.remove"
+    case rtmStart = "rtm.start"
+    case starsAdd = "stars.add"
+    case starsRemove = "stars.remove"
+    case teamInfo = "team.info"
+    case usersGetPresence = "users.getPresence"
+    case usersInfo = "users.info"
+    case usersList = "users.list"
+    case usersSetActive = "users.setActive"
+    case usersSetPresence = "users.setPresence"
+}
+
+public class SlackWebAPI {
+    
+    public typealias FailureClosure = (_ error: SlackError)->Void
+    
+    public enum InfoType: String {
+        case purpose = "purpose"
+        case topic = "topic"
+    }
+    
+    public enum ParseMode: String {
+        case full = "full"
+        case none = "none"
+    }
+    
+    public enum Presence: String {
+        case auto = "auto"
+        case away = "away"
+    }
+    
+    private enum ChannelType: String {
+        case channel = "channel"
+        case group = "group"
+        case im = "im"
+    }
+    
+    private let networkInterface: NetworkInterface
+    private let token: String
+    
+    public init(token: String) {
+        self.networkInterface = NetworkInterface()
+        self.token = token
+    }
+    
+    //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: filterNilParameters(parameters), successClosure: {(response) in
+                success?(response)
+            }) {(error) in
+                failure?(error)
+            }
+    }
+    
+    //MARK: - Auth Test
+    public func authenticationTest(success: ((_ authenticated: Bool)->Void)?, failure: FailureClosure?) {
+        networkInterface.request(.authTest, token: token, parameters: nil, successClosure: {(response) in
+                success?(true)
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    //MARK: - Channels
+    public func channelHistory(id: String, latest: String = "\(Date().slackTimestamp)", 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) 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) 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) 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) 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) 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) 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) 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, "attachments":encodeAttachments(attachments), "icon_url":iconURL, "icon_emoji":iconEmoji]
+        networkInterface.request(.chatPostMessage, token: token, parameters: 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: filterNilParameters(parameters), successClosure: {(response) in
+            success?((ts: response["ts"] as? String, response["channel"] as? String))
+        }) {(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: 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: 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: 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) 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, 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
+                }
+            }
+            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: token, data: file, parameters: 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) 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) in
+            success?(Comment(comment: response["comment"] as? [String: Any]))
+            }) {(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) 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) in
+                success?(closed)
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    public func groupHistory(id: String, latest: String = "\(Date().slackTimestamp)", 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) 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) 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) 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) 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, 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) 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) 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) in
+                success?(closed)
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    public func imHistory(id: String, latest: String = "\(Date().slackTimestamp)", 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) 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) 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) 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, 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) in
+                success?(closed)
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    public func mpimHistory(id: String, latest: String = "\(Date().slackTimestamp)", 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) 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) 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) 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, 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) 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) in
+                success?(ok)
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    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: 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) 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) in
+                success?(ok)
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    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: 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) 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) in
+                success?(ok)
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    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: 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) 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) 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) 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) 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) 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) in
+                success?(true)
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    //MARK: - Channel Utilities
+    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) in
+                success?(true)
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    private func history(_ endpoint: Endpoint, id: String, latest: String = "\(Date().slackTimestamp)", 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) in
+                success?(History(history: response))
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    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) in
+                success?(Channel(channel: response[type.rawValue] as? [String: Any]))
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    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) in
+                success?(response[type.rawValue+"s"] as? [[String: Any]])
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    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) in
+                success?(timestamp)
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    private 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) in
+                success?(true)
+            }) {(error) in
+                failure?(error)
+        }
+    }
+    
+    //MARK: - Encode Attachments
+    private func encodeAttachments(_ attachments: [Attachment?]?) -> String? {
+        if let attachments = attachments {
+            var attachmentArray: [[String: Any]] = []
+            for attachment in attachments {
+                if let attachment = attachment {
+                    attachmentArray.append(attachment.dictionary)
+                }
+            }
+            do {
+                let data = try JSONSerialization.data(withJSONObject: attachmentArray, options: [])
+                return String(data: data, encoding: String.Encoding.utf8)
+            } catch _ {
+                print("Error encoding attachments")
+            }
+        }
+        return nil
+    }
+    
+    //MARK: - Filter Nil Parameters
+    internal 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
+    }
+    
+    //MARK: - Enumerate Do Not Disturb Status
+    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])
+        }
+        return retVal
+    }
+}

SlackKit/Sources/Team.swift

@@ -29,19 +29,19 @@ public struct Team {
     internal(set) public var emailDomain: String?
     internal(set) public var messageEditWindowMinutes: Int?
     internal(set) public var overStorageLimit: Bool?
-    internal(set) public var prefs: [String: AnyObject]?
+    internal(set) public var prefs: [String: Any]?
     internal(set) public var plan: String?
     internal(set) public var icon: TeamIcon?
     
-    internal init(team: [String: AnyObject]?) {
+    internal init(team: [String: Any]?) {
         id = team?["id"] as? String
         name = team?["name"] as? String
         domain = team?["domain"] as? String
         emailDomain = team?["email_domain"] as? String
         messageEditWindowMinutes = team?["msg_edit_window_mins"] as? Int
         overStorageLimit = team?["over_storage_limit"] as? Bool
-        prefs = team?["prefs"] as? [String: AnyObject]
+        prefs = team?["prefs"] as? [String: Any]
         plan = team?["plan"] as? String
-        icon = TeamIcon(icon: team?["icon"] as? [String: AnyObject])
+        icon = TeamIcon(icon: team?["icon"] as? [String: Any])
     }
 }

SlackKit/Sources/TeamIcon.swift

@@ -22,6 +22,7 @@
 // THE SOFTWARE.
 
 public struct TeamIcon {
+    
     internal(set) public var image34: String?
     internal(set) public var image44: String?
     internal(set) public var image68: String?
@@ -31,7 +32,7 @@ public struct TeamIcon {
     internal(set) public var imageOriginal: String?
     internal(set) public var imageDefault: Bool?
     
-    internal init(icon: [String: AnyObject]?) {
+    internal init(icon: [String: Any]?) {
         image34 = icon?["image_34"] as? String
         image44 = icon?["image_44"] as? String
         image68 = icon?["image_68"] as? String

SlackKit/Sources/Topic.swift

@@ -22,11 +22,12 @@
 // THE SOFTWARE.
 
 public struct Topic {
+    
     public let value: String?
     public let creator: String?
     public let lastSet: Int?
     
-    internal init(topic: [String: AnyObject]?) {
+    internal init(topic: [String: Any]?) {
         value = topic?["value"] as? String
         creator = topic?["creator"] as? String
         lastSet = topic?["last_set"] as? Int

SlackKit/Sources/User.swift

@@ -24,6 +24,7 @@
 public struct User {
     
     public struct Profile {
+        
         internal(set) public var firstName: String?
         internal(set) public var lastName: String?
         internal(set) public var realName: String?
@@ -37,7 +38,7 @@ public struct User {
         internal(set) public var image192: String?
         internal(set) public var customProfile: CustomProfile?
         
-        internal init(profile: [String: AnyObject]?) {
+        internal init(profile: [String: Any]?) {
             firstName = profile?["first_name"] as? String
             lastName = profile?["last_name"] as? String
             realName = profile?["real_name"] as? String
@@ -49,11 +50,10 @@ public struct User {
             image48 = profile?["image_48"] as? String
             image72 = profile?["image_72"] as? String
             image192 = profile?["image_192"] as? String
-            customProfile = CustomProfile(customFields: profile?["fields"] as? [String: AnyObject])
+            customProfile = CustomProfile(customFields: profile?["fields"] as? [String: Any])
         }
     }
     
-    
     public let id: String?
     internal(set) public var name: String?
     internal(set) public var deleted: Bool?
@@ -73,15 +73,15 @@ public struct User {
     internal(set) public var timeZone: String?
     internal(set) public var timeZoneLabel: String?
     internal(set) public var timeZoneOffSet: Int?
-    internal(set) public var preferences: [String: AnyObject]?
+    internal(set) public var preferences: [String: Any]?
     // Client properties
     internal(set) public var userGroups: [String: String]?
     
-    internal init(user: [String: AnyObject]?) {
+    internal init(user: [String: Any]?) {
         id = user?["id"] as? String
         name = user?["name"] as? String
         deleted = user?["deleted"] as? Bool
-        profile = Profile(profile: user?["profile"] as? [String: AnyObject])
+        profile = Profile(profile: user?["profile"] as? [String: Any])
         color = user?["color"] as? String
         isAdmin = user?["is_admin"] as? Bool
         isOwner = user?["is_owner"] as? Bool
@@ -96,11 +96,11 @@ public struct User {
         timeZone = user?["tz"] as? String
         timeZoneLabel = user?["tz_label"] as? String
         timeZoneOffSet = user?["tz_offset"] as? Int
-        preferences = user?["prefs"] as? [String: AnyObject]
+        preferences = user?["prefs"] as? [String: Any]
     }
     
     internal init(id: String?) {
         self.id = id
         self.isBot = nil
     }
-}
+}

SlackKit/Sources/UserGroup.swift

@@ -37,11 +37,11 @@ public struct UserGroup {
     public let createdBy: String?
     internal(set) public var updatedBy: String?
     internal(set) public var deletedBy: String?
-    internal(set) public var preferences: [String: AnyObject]?
+    internal(set) public var preferences: [String: Any]?
     internal(set) public var users: [String]?
     internal(set) public var userCount: Int?
     
-    internal init(userGroup: [String: AnyObject]?) {
+    internal init(userGroup: [String: Any]?) {
         id = userGroup?["id"] as? String
         teamID = userGroup?["team_id"] as? String
         isUserGroup = userGroup?["is_usergroup"] as? Bool
@@ -56,11 +56,10 @@ public struct UserGroup {
         createdBy = userGroup?["created_by"] as? String
         updatedBy = userGroup?["updated_by"] as? String
         deletedBy = userGroup?["deleted_by"] as? String
-        preferences = userGroup?["prefs"] as? [String: AnyObject]
+        preferences = userGroup?["prefs"] as? [String: Any]
         users = userGroup?["users"] as? [String]
         if let count = userGroup?["user_count"] as? String {
             userCount = Int(count)
         }
     }
-    
 }

SlackKit/Sources/WebAPI.swift

@@ -1,770 +0,0 @@
-//
-// WebAPI.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-import Foundation
-
-internal enum Endpoint: String {
-    case APITest = "api.test"
-    case AuthRevoke = "auth.revoke"
-    case AuthTest = "auth.test"
-    case ChannelsHistory = "channels.history"
-    case ChannelsInfo = "channels.info"
-    case ChannelsList = "channels.list"
-    case ChannelsMark = "channels.mark"
-    case ChannelsSetPurpose = "channels.setPurpose"
-    case ChannelsSetTopic = "channels.setTopic"
-    case ChatDelete = "chat.delete"
-    case ChatPostMessage = "chat.postMessage"
-    case ChatUpdate = "chat.update"
-    case DNDInfo = "dnd.info"
-    case DNDTeamInfo = "dnd.teamInfo"
-    case EmojiList = "emoji.list"
-    case FilesCommentsAdd = "files.comments.add"
-    case FilesCommentsEdit = "files.comments.edit"
-    case FilesCommentsDelete = "files.comments.delete"
-    case FilesDelete = "files.delete"
-    case FilesInfo = "files.info"
-    case FilesUpload = "files.upload"
-    case GroupsClose = "groups.close"
-    case GroupsHistory = "groups.history"
-    case GroupsInfo = "groups.info"
-    case GroupsList = "groups.list"
-    case GroupsMark = "groups.mark"
-    case GroupsOpen = "groups.open"
-    case GroupsSetPurpose = "groups.setPurpose"
-    case GroupsSetTopic = "groups.setTopic"
-    case IMClose = "im.close"
-    case IMHistory = "im.history"
-    case IMList = "im.list"
-    case IMMark = "im.mark"
-    case IMOpen = "im.open"
-    case MPIMClose = "mpim.close"
-    case MPIMHistory = "mpim.history"
-    case MPIMList = "mpim.list"
-    case MPIMMark = "mpim.mark"
-    case MPIMOpen = "mpim.open"
-    case OAuthAccess = "oauth.access"
-    case PinsAdd = "pins.add"
-    case PinsRemove = "pins.remove"
-    case ReactionsAdd = "reactions.add"
-    case ReactionsGet = "reactions.get"
-    case ReactionsList = "reactions.list"
-    case ReactionsRemove = "reactions.remove"
-    case RTMStart = "rtm.start"
-    case StarsAdd = "stars.add"
-    case StarsRemove = "stars.remove"
-    case TeamInfo = "team.info"
-    case UsersGetPresence = "users.getPresence"
-    case UsersInfo = "users.info"
-    case UsersList = "users.list"
-    case UsersSetActive = "users.setActive"
-    case UsersSetPresence = "users.setPresence"
-}
-
-public final class WebAPI {
-    
-    public typealias FailureClosure = (error: SlackError)->Void
-    
-    public enum InfoType: String {
-        case Purpose = "purpose"
-        case Topic = "topic"
-    }
-    
-    public enum ParseMode: String {
-        case Full = "full"
-        case None = "none"
-    }
-    
-    public enum Presence: String {
-        case Auto = "auto"
-        case Away = "away"
-    }
-    
-    private enum ChannelType: String {
-        case Channel = "channel"
-        case Group = "group"
-        case IM = "im"
-    }
-    
-    private let networkInterface: NetworkInterface
-    private let token: String
-
-    public init(token: String) {
-        self.networkInterface = NetworkInterface()
-        self.token = token
-    }
-    
-    //MARK: - RTM
-    public func rtmStart(simpleLatest: Bool? = nil, noUnreads: Bool? = nil, mpimAware: Bool? = nil, success: ((response: [String: AnyObject])->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject?] = ["simple_latest": simpleLatest, "no_unreads": noUnreads, "mpim_aware": mpimAware]
-        networkInterface.request(.RTMStart, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-                (response) -> Void in
-                success?(response: response)
-            }) {(error) -> Void in
-                failure?(error: error)
-            }
-    }
-    
-    //MARK: - Auth
-    public func authenticationTest(success: ((authenticated: Bool)->Void)?, failure: FailureClosure?) {
-        networkInterface.request(.AuthTest, token: token, parameters: nil, successClosure: {
-            (response) -> Void in
-                success?(authenticated: true)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public static func oauthAccess(clientID: String, clientSecret: String, code: String, redirectURI: String? = nil, success: ((response: [String: AnyObject])->Void)?, failure: ((SlackError)->Void)?) {
-        let parameters: [String: AnyObject?] = ["client_id": clientID, "client_secret": clientSecret, "code": code, "redirect_uri": redirectURI]
-        NetworkInterface().request(.OAuthAccess, parameters: filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-            success?(response:response)
-        }) {(error) -> Void in
-            failure?(error)
-        }
-    }
-    
-    public static func oauthRevoke(token: String, test: Bool? = nil, success: ((revoked:Bool)->Void)?, failure: ((SlackError)->Void)?) {
-        let parameters: [String: AnyObject?] = ["token": token, "test": test]
-        NetworkInterface().request(.AuthRevoke, parameters: filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-            success?(revoked:true)
-        }) {(error) -> Void in
-            failure?(error)
-        }
-    }
-    
-    //MARK: - Channels
-    public func channelHistory(id: String, latest: String = "\(NSDate().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: history)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func channelInfo(id: String, success: ((channel: Channel)->Void)?, failure: FailureClosure?) {
-        info(.ChannelsInfo, type:ChannelType.Channel, id: id, success: {
-            (channel) -> Void in
-                success?(channel: channel)
-            }) { (error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func channelsList(excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
-        list(.ChannelsList, type:ChannelType.Channel, excludeArchived: excludeArchived, success: {
-            (channels) -> Void in
-                success?(channels: channels)
-            }) {(error) -> Void in
-                failure?(error: 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?(ts:timestamp)
-            }) {(error) -> Void in
-                failure?(error: 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: purposeSet)
-            }) { (error) -> Void in
-                failure?(error: 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: topicSet)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    //MARK: - Messaging
-    public func deleteMessage(channel: String, ts: String, success: ((deleted: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["channel": channel, "ts": ts]
-        networkInterface.request(.ChatDelete, token: token, parameters: parameters, successClosure: { (response) -> Void in
-                success?(deleted: true)
-            }) {(error) -> Void in
-                failure?(error: 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: AnyObject?] = ["channel":channel, "text":text.slackFormatEscaping(), "as_user":asUser, "parse":parse?.rawValue, "link_names":linkNames, "unfurl_links":unfurlLinks, "unfurlMedia":unfurlMedia, "username":username, "attachments":encodeAttachments(attachments), "icon_url":iconURL, "icon_emoji":iconEmoji]
-        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: 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: AnyObject?] = ["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?(updated: true)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    //MARK: - Do Not Disturb
-    public func dndInfo(user: String? = nil, success: ((status: DoNotDisturbStatus)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject?] = ["user": user]
-        networkInterface.request(.DNDInfo, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(status: DoNotDisturbStatus(status: response))
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func dndTeamInfo(users: [String]? = nil, success: ((statuses: [String: DoNotDisturbStatus])->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject?] = ["users":users?.joinWithSeparator(",")]
-        networkInterface.request(.DNDTeamInfo, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                guard let usersDictionary = response["users"] as? [String: AnyObject] else {
-                    success?(statuses: [:])
-                    return
-                }
-                success?(statuses: self.enumerateDNDStatuses(usersDictionary))
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    //MARK: - Emoji
-    public func emojiList(success: ((emojiList: [String: AnyObject]?)->Void)?, failure: FailureClosure?) {
-        networkInterface.request(.EmojiList, token: token, parameters: nil, successClosure: {
-            (response) -> Void in
-                success?(emojiList: response["emoji"] as? [String: AnyObject])
-            }) { (error) -> Void in
-                failure?(error: 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, successClosure: {
-            (response) -> Void in
-                success?(deleted: true)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func fileInfo(fileID: String, commentCount: Int = 100, totalPages: Int = 1, success: ((file: File)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["file":fileID, "count": commentCount, "totalPages":totalPages]
-        networkInterface.request(.FilesInfo, token: token, parameters: parameters, successClosure: {
-            (response) in
-                var file = File(file: response["file"] as? [String: AnyObject])
-                (response["comments"] as? [[String: AnyObject]])?.forEach { comment in
-                    let comment = Comment(comment: comment)
-                    if let id = comment.id {
-                        file.comments[id] = comment
-                    }
-                }
-                success?(file: file)
-            }) {(error) in
-                failure?(error: error)
-        }
-    }
-    
-    public func uploadFile(file: NSData, filename: String, filetype: String = "auto", title: String? = nil, initialComment: String? = nil, channels: [String]? = nil, success: ((file: File)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject?] = ["file":file, "filename": filename, "filetype":filetype, "title":title, "initial_comment":initialComment, "channels":channels?.joinWithSeparator(",")]
-        networkInterface.uploadRequest(token, data: file, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(file: File(file: response["file"] as? [String: AnyObject]))
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    //MARK: - File Comments
-    public func addFileComment(fileID: String, comment: String, success: ((comment: Comment)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["file":fileID, "comment":comment.slackFormatEscaping()]
-        networkInterface.request(.FilesCommentsAdd, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(comment: Comment(comment: response["comment"] as? [String: AnyObject]))
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func editFileComment(fileID: String, commentID: String, comment: String, success: ((comment: Comment)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["file":fileID, "id":commentID, "comment":comment.slackFormatEscaping()]
-        networkInterface.request(.FilesCommentsEdit, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-            success?(comment: Comment(comment: response["comment"] as? [String: AnyObject]))
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func deleteFileComment(fileID: String, commentID: String, success: ((deleted: Bool?)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["file":fileID, "id": commentID]
-        networkInterface.request(.FilesCommentsDelete, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(deleted: true)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    //MARK: - Groups
-    public func closeGroup(groupID: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
-        close(.GroupsClose, channelID: groupID, success: {
-            (closed) -> Void in
-                success?(closed:closed)
-            }) {(error) -> Void in
-                failure?(error:error)
-        }
-    }
-    
-    public func groupHistory(id: String, latest: String = "\(NSDate().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: history)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func groupInfo(id: String, success: ((channel: Channel)->Void)?, failure: FailureClosure?) {
-        info(.GroupsInfo, type:ChannelType.Group, id: id, success: {
-            (channel) -> Void in
-                success?(channel: channel)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func groupsList(excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
-        list(.GroupsList, type:ChannelType.Group, excludeArchived: excludeArchived, success: {
-            (channels) -> Void in
-                success?(channels: channels)
-            }) {(error) -> Void in
-                failure?(error: 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?(ts: timestamp)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func openGroup(channel: String, success: ((opened: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters = ["channel":channel]
-        networkInterface.request(.GroupsOpen, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(opened: true)
-            }) {(error) -> Void in
-                failure?(error: 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: purposeSet)
-            }) {(error) -> Void in
-                failure?(error: 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: topicSet)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    //MARK: - IM
-    public func closeIM(channel: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
-        close(.IMClose, channelID: channel, success: {
-            (closed) -> Void in
-                success?(closed: closed)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func imHistory(id: String, latest: String = "\(NSDate().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: history)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func imsList(excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
-        list(.IMList, type:ChannelType.IM, excludeArchived: excludeArchived, success: {
-            (channels) -> Void in
-                success?(channels: channels)
-            }) {(error) -> Void in
-                failure?(error: 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?(ts: timestamp)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func openIM(userID: String, success: ((imID: String?)->Void)?, failure: FailureClosure?) {
-        let parameters = ["user":userID]
-        networkInterface.request(.IMOpen, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                let group = response["channel"] as? [String: AnyObject]
-                success?(imID: group?["id"] as? String)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    //MARK: - MPIM
-    public func closeMPIM(channel: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
-        close(.MPIMClose, channelID: channel, success: {
-            (closed) -> Void in
-                success?(closed: closed)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func mpimHistory(id: String, latest: String = "\(NSDate().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: history)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func mpimsList(excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
-        list(.MPIMList, type:ChannelType.Group, excludeArchived: excludeArchived, success: {
-            (channels) -> Void in
-                success?(channels: channels)
-            }) {(error) -> Void in
-                failure?(error: 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?(ts: timestamp)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func openMPIM(userIDs: [String], success: ((mpimID: String?)->Void)?, failure: FailureClosure?) {
-        let parameters = ["users":userIDs.joinWithSeparator(",")]
-        networkInterface.request(.MPIMOpen, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                let group = response["group"] as? [String: AnyObject]
-                success?(mpimID: group?["id"] as? String)
-            }) {(error) -> Void in
-                failure?(error: 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?(pinned: ok)
-            }) {(error) -> Void in
-                failure?(error: 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?(unpinned: ok)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    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: AnyObject?] = ["channel":channel, "file":file, "file_comment":fileComment, "timestamp":timestamp]
-        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(ok: true)
-            }){(error) -> Void in
-                failure?(error: 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?(reacted: ok)
-            }) {(error) -> Void in
-                failure?(error: 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?(unreacted: ok)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    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: AnyObject?] = ["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?(ok: true)
-            }) {(error) -> Void in
-                failure?(error: 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?(starred: ok)
-            }) {(error) -> Void in
-                failure?(error: 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?(unstarred: ok)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    private func star(endpoint: Endpoint, file: String?, fileComment: String?, channel: String?, timestamp: String?, success: ((ok: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject?] = ["file":file, "file_comment":fileComment, "channel":channel, "timestamp":timestamp]
-        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(ok: true)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-
-    
-    //MARK: - Team
-    public func teamInfo(success: ((info: [String: AnyObject]?)->Void)?, failure: FailureClosure?) {
-        networkInterface.request(.TeamInfo, token: token, parameters: nil, successClosure: {
-            (response) -> Void in
-                success?(info: response["team"] as? [String: AnyObject])
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    //MARK: - Users
-    public func userPresence(user: String, success: ((presence: String?)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["user":user]
-        networkInterface.request(.UsersGetPresence, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(presence: response["presence"] as? String)
-            }){(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func userInfo(id: String, success: ((user: User)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["user":id]
-        networkInterface.request(.UsersInfo, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(user: User(user: response["user"] as? [String: AnyObject]))
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func usersList(includePresence: Bool = false, success: ((userList: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["presence":includePresence]
-        networkInterface.request(.UsersList, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(userList: response["members"] as? [[String: AnyObject]])
-            }){(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func setUserActive(success: ((success: Bool)->Void)?, failure: FailureClosure?) {
-        networkInterface.request(.UsersSetActive, token: token, parameters: nil, successClosure: {
-            (response) -> Void in
-                success?(success: true)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    public func setUserPresence(presence: Presence, success: ((success: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["presence":presence.rawValue]
-        networkInterface.request(.UsersSetPresence, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(success:true)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    //MARK: - Channel Utilities
-    private func close(endpoint: Endpoint, channelID: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["channel":channelID]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(closed: true)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    private func history(endpoint: Endpoint, id: String, latest: String = "\(NSDate().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((history: History)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["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(history: response))
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    private func info(endpoint: Endpoint, type: ChannelType, id: String, success: ((channel: Channel)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["channel": id]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(channel: Channel(channel: response[type.rawValue] as? [String: AnyObject]))
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    private func list(endpoint: Endpoint, type: ChannelType, excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["exclude_archived": excludeArchived]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(channels: response[type.rawValue+"s"] as? [[String: AnyObject]])
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    private func mark(endpoint: Endpoint, channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["channel": channel, "ts": timestamp]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(ts: timestamp)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    private func setInfo(endpoint: Endpoint, type: InfoType, channel: String, text: String, success: ((success: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: AnyObject] = ["channel": channel, type.rawValue: text]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(success: true)
-            }) {(error) -> Void in
-                failure?(error: error)
-        }
-    }
-    
-    //MARK: - Encode Attachments
-    private func encodeAttachments(attachments: [Attachment?]?) -> NSString? {
-        if let attachments = attachments {
-            var attachmentArray: [[String: AnyObject]] = []
-            for attachment in attachments {
-                if let attachment = attachment {
-                    attachmentArray.append(attachment.dictionary())
-                }
-            }
-            do {
-                let data = try NSJSONSerialization.dataWithJSONObject(attachmentArray, options: [])
-                let string = NSString(data: data, encoding: NSUTF8StringEncoding)
-                return string
-            } catch _ {
-                
-            }
-        }
-        return nil
-    }
-    
-    //MARK: - Filter Nil Parameters
-    internal static func filterNilParameters(parameters: [String: AnyObject?]) -> [String: AnyObject] {
-        var finalParameters = [String: AnyObject]()
-        for (key, value) in parameters {
-            if let unwrapped = value {
-                finalParameters[key] = unwrapped
-            }
-        }
-        return finalParameters
-    }
-    
-    //MARK: - Enumerate Do Not Disturb Status
-    private func enumerateDNDStatuses(statuses: [String: AnyObject]) -> [String: DoNotDisturbStatus] {
-        var retVal = [String: DoNotDisturbStatus]()
-        for key in statuses.keys {
-            retVal[key] = DoNotDisturbStatus(status: statuses[key] as? [String: AnyObject])
-        }
-        return retVal
-    }
-    
-}

SlackKit/Sources/WebhookRequest.swift

@@ -1,50 +0,0 @@
-//
-// WebhookRequest.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-internal struct WebhookRequest: Request {
-    
-    let token: String?
-    let teamID: String
-    let teamDomain: String
-    let channelID: String
-    let channelName: String
-    let userID: String
-    let userName: String
-    let command: String
-    let text: String
-    let responseURL: String
-    
-    init(request: [String: AnyObject]?) {
-        token = request?["token"] as? String
-        teamID = request?["team_id"] as? String ?? ""
-        teamDomain = request?["team_domain"] as? String ?? ""
-        channelID = request?["channel_id"] as? String ?? ""
-        channelName = request?["channel_name"] as? String ?? ""
-        userID = request?["user_id"] as? String ?? ""
-        userName = request?["user_name"] as? String ?? ""
-        command = request?["command"] as? String ?? ""
-        text = request?["text"] as? String ?? ""
-        responseURL = request?["response_url"] as? String ?? ""
-    }
-    
-}

SlackKit/Sources/WebhookServer.swift

@@ -1,50 +0,0 @@
-//
-// WebhookServer.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-public class WebhookServer: Server {
-    
-    public init(token: String, route: String, response: Response) {
-        super.init(token: token)
-        addRoute(route, response: response)
-    }
-    
-    public func addRoute(route: String, response: Response) {
-        http["/\(route)"] = { request in
-            let webhookRequest = WebhookRequest(request: self.dictionaryFromRequest(request.body))
-            if webhookRequest.token == self.token {
-                return self.request(webhookRequest, reply: self.replyForResponse(response))
-            } else {
-                return .BadRequest(.Text("Bad request."))
-            }
-        }
-    }
-    
-    private func replyForResponse(response: Response) -> Reply {
-        if response.attachments == nil && response.responseType == nil {
-            return Reply.Text(body: response.text)
-        } else {
-            return Reply.JSON(response: response)
-        }
-    }
-
-}

SlackKit/Supporting Files/Info-iOS.plist

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Peter Zignego. All rights reserved.</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>

SlackKit/Supporting Files/Info-tvOS.plist

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Peter Zignego. All rights reserved.</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>