Add public contains extension

.gitignore

@@ -16,11 +16,8 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-*.DS_Store
-
-# SwiftPM
-Packages/
 .build
+Packages/
 
 # CocoaPods
 #
@@ -29,10 +26,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 +0,0 @@
-3.0

Cartfile

@@ -1,2 +0,0 @@
-git "https://github.com/daltoniam/Starscream"
-git "https://github.com/pvzig/swifter.git"

Cartfile.resolved

@@ -1,2 +0,0 @@
-git "https://github.com/daltoniam/Starscream" "2.0.0"
-git "https://github.com/pvzig/swifter.git" "3.0.2"

Package.swift

@@ -1,11 +1,34 @@
+//
+// Package.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 PackageDescription
 
 let package = Package(
     name: "SlackKit",
     targets: [],
     dependencies: [
-        .Package(url: "https://github.com/pvzig/swifter.git",
-                 majorVersion: 3, minor: 0),
-        .Package(url: "https://github.com/daltoniam/Starscream", majorVersion: 2, minor: 0)
-    ]
+        .Package(url: "https://github.com/open-swift/C7.git", majorVersion: 0, minor: 5),
+        .Package(url: "https://github.com/czechboy0/Jay.git", majorVersion: 0, minor: 5),
+        .Package(url: "https://github.com/Zewo/WebSocket", majorVersion: 0, minor: 5),
+        ]
 )

README.md

@@ -1,139 +1,63 @@
 ![SlackKit](https://cloud.githubusercontent.com/assets/8311605/10260893/5ec60f96-694e-11e5-91fd-da6845942201.png)
+##iOS/OS X Slack Client Library
+###Description
+This is a Slack client library for iOS and OS X 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).
 
-![Swift Version](https://img.shields.io/badge/Swift-3.0-orange.svg) ![Plaforms](https://img.shields.io/badge/Platforms-macOS,iOS,tvOS-lightgrey.svg) ![License MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg) [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg)](https://github.com/Carthage/Carthage) 
-## 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).
-
-This is the **Swift 3** branch of SlackKit. SlackKit also has support for [Swift 2.3](https://github.com/pvzig/SlackKit/tree/swift2.3) and [Linux](https://github.com/pvzig/SlackKit/tree/linux).
-
-#### 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:
-
-### Installation
-
-#### Carthage
-
-Add SlackKit to your Cartfile:
-```
-github "https://github.com/pvzig/slackkit.git"
-```
-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
-
+###Installation
+####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: 3)
-	]
+    dependencies: [
+        .Package(url: "https://github.com/pvzig/SlackKit.git", majorVersion: 1)
+    ]
 )
 ```
 
-Run `swift build` on your application’s main directory.
- 
-#### ~~CocoaPods~~
-SlackKit doesn’t currently build correctly using CocoaPods with Swift 3. I’m hoping to restore support soon.
+Run `swift-build` on your application’s main directory.
+
+####CocoaPods
+Add the pod to your podfile:
+```
+pod 'SlackKit'
+```
+and run
+```
+pod install
+```
 
 To use the library in your project import it:
 ```
 import SlackKit
 ```
 
-### Usage
+###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).
 
-#### 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. 
-
-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)
+client.connect()
 ```
 
-#### 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(pingInterval: 2, timeout: 10, reconnect: false)
 ```
 
 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 +73,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 +92,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,121 +111,124 @@ 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({(auth) in
-	print(auth)
-}, failure: {(error) in
-	print(error)
-})
-```
-
-#### Delegate methods
-
-To receive delegate callbacks for events, register an object as the delegate for those events using the `onClientInitalization` block:
-```swift
-let bot = SlackKit(clientID: clientID, clientSecret: clientSecret)
-bot.onClientInitalization = { (client: Client) in
-    DispatchQueue.main.async(execute: {
-	    client.messageEventsDelegate = self
-    })
+client.webAPI.authenticationTest({
+(authenticated) -> Void in
+		print(authenticated)
+	}){(error) -> Void in
+	    print(error)
 }
 ```
 
-Delegate callbacks contain a reference to the Client where the event occurred.
+####Delegate methods
+
+To receive delegate callbacks for certain events, register an object as the delegate for those events:
+```swift
+client.slackEventsDelegate = self
+```
 
 There are a number of delegates that you can set to receive callbacks for certain events.
 
-##### ConnectionEventsDelegate
+#####SlackEventsDelegate
 ```swift
-connected(_ client: Client)
-disconnected(_ client: Client)
-connectionFailed(_ client: Client, error: SlackError)
-```
-##### MessageEventsDelegate
-```swift
-sent(_ message: Message, client: Client)
-received(_ message: Message, client: Client)
-changed(_ message: Message, client: Client)
-deleted(_ message: Message?, client: Client)
-```
-##### ChannelEventsDelegate
-```swift
-userTypingIn(_ channel: Channel, user: User, client: Client)
-marked(_ channel: Channel, timestamp: String, client: Client)
-created(_ channel: Channel, client: Client)
-deleted(_ channel: Channel, client: Client)
-renamed(_ channel: Channel, client: Client)
-archived(_ channel: Channel, client: Client)
-historyChanged(_ channel: Channel, client: Client)
-joined(_ channel: Channel, client: Client)
-left(_ channel: Channel, client: Client)
-```
-##### DoNotDisturbEventsDelegate
-```swift
-updated(_ status: DoNotDisturbStatus, client: Client)
-userUpdated(_ status: DoNotDisturbStatus, user: User, client: Client)
-```
-##### GroupEventsDelegate
-```swift
-opened(_ group: Channel, client: Client)
-```
-##### FileEventsDelegate
-```swift
-processed(_ file: File, client: Client)
-madePrivate(_ file: File, client: Client)
-deleted(_ file: File, client: Client)
-commentAdded(_ file: File, comment: Comment, client: Client)
-commentEdited(_ file: File, comment: Comment, client: Client)
-commentDeleted(_ file: File, comment: Comment, client: Client)
-```
-##### PinEventsDelegate
-```swift
-pinned(_ item: Item, channel: Channel?, client: Client)
-unpinned(_ item: Item, channel: Channel?, client: Client)
-```
-##### StarEventsDelegate
-```swift
-starred(_ item: Item, starred: Bool, _ client: Client)
-```
-##### ReactionEventsDelegate
-```swift
-added(_ reaction: String, item: Item, itemUser: String, client: Client)
-removed(_ reaction: String, item: Item, itemUser: String, client: Client)
-```
-##### SlackEventsDelegate
-```swift
-preferenceChanged(_ preference: String, value: Any?, client: Client)
-userChanged(_ user: User, client: Client)
-presenceChanged(_ user: User, presence: String, client: Client)
-manualPresenceChanged(_ user: User, presence: String, client: Client)
-botEvent(_ bot: Bot, client: Client)
-```
-##### TeamEventsDelegate
-```swift
-userJoined(_ user: User, client: Client)
-planChanged(_ plan: String, client: Client)
-preferencesChanged(_ preference: String, value: Any?, client: Client)
-nameChanged(_ name: String, client: Client)
-domainChanged(_ domain: String, client: Client)
-emailDomainChanged(_ domain: String, client: Client)
-emojiChanged(_ client: Client)
-```
-##### SubteamEventsDelegate
-```swift
-event(_ userGroup: UserGroup, client: Client)
-selfAdded(_ subteamID: String, client: Client)
-selfRemoved(_ subteamID: String, client: Client)
-```
-##### TeamProfileEventsDelegate
-```swift
-changed(_ profile: CustomProfile, client: Client)
-deleted(_ profile: CustomProfile, client: Client)
-reordered(_ profile: CustomProfile, client: Client)
+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)
+```
+
+###Examples
+####Leaderboard
+Included in the OSX-Sample is an example application of a bot you might make using SlackKit. It’s a basic leaderboard scoring bot, in the spirit of [PlusPlus](https://plusplus.chat).
+
+To configure it, enter your bot’s API token in `AppDelegate.swift` for the Leaderboard bot:
+
+```swift
+let learderboard = Leaderboard(token: "SLACK_AUTH_TOKEN")
+```
+
+It adds a point for every `@thing++`, subtracts a point for every `@thing--`, and shows a leaderboard when asked `@botname leaderboard`.
+
+###Get In Touch
 [@pvzig](https://twitter.com/pvzig)
 
 <peter@launchsoft.co>

SlackKit.h

@@ -1,5 +1,5 @@
 //
-// Edited.swift
+// SlackKit.h
 //
 // Copyright © 2016 Peter Zignego. All rights reserved.
 //
@@ -21,13 +21,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-public struct Edited {
-    
-    public let user: String?
-    public let ts: String?
-    
-    internal init(edited:[String: Any]?) {
-        user = edited?["user"] as? String
-        ts = edited?["ts"] as? String
-    }
-}
+#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.xcodeproj/project.xcworkspace/xcshareddata/SlackKit.xcscmblueprint

@@ -0,0 +1,72 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "7C8CB4917A87F5E5383E6800524CC50437576509",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "7C8CB4917A87F5E5383E6800524CC50437576509" : 0,
+    "15033DFF73D1DAA84A806DC9B6994613D8A2EB4F" : 0,
+    "4B8317071C2E8191C0071D14B19E229FF434BD5B" : 0,
+    "8951CEB15DDB2D711276960E67900B8AA34FF427" : 0,
+    "10A2CB6C4392F0E306FF8D509BE5E88232276EA4" : 0,
+    "269ADF55FAAC04D68303BE30B6BD693E717155DE" : 0,
+    "997F6D72B6636BD16A82A9AFFBB55CCAE1A5596D" : 0,
+    "704B817219E4CBC31AA92368EF54A4E2835A8C3D" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "06B58BC9-590E-416B-85DA-67AE0673C049",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "7C8CB4917A87F5E5383E6800524CC50437576509" : "SlackKit\/",
+    "15033DFF73D1DAA84A806DC9B6994613D8A2EB4F" : "SlackKit\/Packages\/IP-0.5.0\/",
+    "4B8317071C2E8191C0071D14B19E229FF434BD5B" : "SlackKit\/Packages\/WebSocket-0.5.1\/",
+    "8951CEB15DDB2D711276960E67900B8AA34FF427" : "SlackKit\/Packages\/MediaType-0.5.0\/",
+    "10A2CB6C4392F0E306FF8D509BE5E88232276EA4" : "SlackKit\/Packages\/String-0.5.1\/",
+    "269ADF55FAAC04D68303BE30B6BD693E717155DE" : "SlackKit\/Packages\/CHTTPParser-0.5.0\/",
+    "997F6D72B6636BD16A82A9AFFBB55CCAE1A5596D" : "SlackKit\/Packages\/TCPSSL-0.5.1\/",
+    "704B817219E4CBC31AA92368EF54A4E2835A8C3D" : "SlackKit\/Packages\/POSIX-0.5.0\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "SlackKit",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "SlackKit.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Zewo\/String.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "10A2CB6C4392F0E306FF8D509BE5E88232276EA4"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/VeniceX\/IP.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "15033DFF73D1DAA84A806DC9B6994613D8A2EB4F"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Zewo\/CHTTPParser.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "269ADF55FAAC04D68303BE30B6BD693E717155DE"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Zewo\/WebSocket",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4B8317071C2E8191C0071D14B19E229FF434BD5B"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Zewo\/POSIX.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "704B817219E4CBC31AA92368EF54A4E2835A8C3D"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/pvzig\/SlackRTMKit.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "7C8CB4917A87F5E5383E6800524CC50437576509"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Zewo\/MediaType.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8951CEB15DDB2D711276960E67900B8AA34FF427"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/VeniceX\/TCPSSL.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "997F6D72B6636BD16A82A9AFFBB55CCAE1A5596D"
+    }
+  ]
+}

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

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0800"
-   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 = "0800"
-   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 = "0800"
-   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.xcodeproj/xcshareddata/xcschemes/SlackKit.xcscheme

@@ -0,0 +1,467 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "9999"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_C7"
+               BuildableName = "libC7.dylib"
+               BlueprintName = "C7"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_Jay"
+               BuildableName = "libJay.dylib"
+               BlueprintName = "Jay"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "NO"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_JayExample"
+               BuildableName = "JayExample"
+               BlueprintName = "JayExample"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_String"
+               BuildableName = "libString.dylib"
+               BlueprintName = "String"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_StructuredData"
+               BuildableName = "libStructuredData.dylib"
+               BlueprintName = "StructuredData"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_MediaType"
+               BuildableName = "libMediaType.dylib"
+               BlueprintName = "MediaType"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_CURIParser"
+               BuildableName = "libCURIParser.dylib"
+               BlueprintName = "CURIParser"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_URI"
+               BuildableName = "libURI.dylib"
+               BlueprintName = "URI"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_S4"
+               BuildableName = "libS4.dylib"
+               BlueprintName = "S4"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_HTTP"
+               BuildableName = "libHTTP.dylib"
+               BlueprintName = "HTTP"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_CLibvenice"
+               BuildableName = "libCLibvenice.dylib"
+               BlueprintName = "CLibvenice"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_Venice"
+               BuildableName = "libVenice.dylib"
+               BlueprintName = "Venice"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_POSIX"
+               BuildableName = "libPOSIX.dylib"
+               BlueprintName = "POSIX"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_IP"
+               BuildableName = "libIP.dylib"
+               BlueprintName = "IP"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_TCP"
+               BuildableName = "libTCP.dylib"
+               BlueprintName = "TCP"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_CHTTPParser"
+               BuildableName = "libCHTTPParser.dylib"
+               BlueprintName = "CHTTPParser"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_HTTPParser"
+               BuildableName = "libHTTPParser.dylib"
+               BlueprintName = "HTTPParser"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_HTTPSerializer"
+               BuildableName = "libHTTPSerializer.dylib"
+               BlueprintName = "HTTPSerializer"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_HTTPClient"
+               BuildableName = "libHTTPClient.dylib"
+               BlueprintName = "HTTPClient"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_File"
+               BuildableName = "libFile.dylib"
+               BlueprintName = "File"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_OpenSSL"
+               BuildableName = "libOpenSSL.dylib"
+               BlueprintName = "OpenSSL"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_TCPSSL"
+               BuildableName = "libTCPSSL.dylib"
+               BlueprintName = "TCPSSL"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_HTTPSClient"
+               BuildableName = "libHTTPSClient.dylib"
+               BlueprintName = "HTTPSClient"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_Event"
+               BuildableName = "libEvent.dylib"
+               BlueprintName = "Event"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_Base64"
+               BuildableName = "libBase64.dylib"
+               BlueprintName = "Base64"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_WebSocket"
+               BuildableName = "libWebSocket.dylib"
+               BlueprintName = "WebSocket"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "NO"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_Botly"
+               BuildableName = "Botly"
+               BlueprintName = "Botly"
+               ReferencedContainer = "container:SlackKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "______Target_SlackKit"
+               BuildableName = "libSlackKit.dylib"
+               BlueprintName = "SlackKit"
+               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>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "______Target_C7"
+            BuildableName = "libC7.dylib"
+            BlueprintName = "C7"
+            ReferencedContainer = "container:SlackKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <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 = "______Target_C7"
+            BuildableName = "libC7.dylib"
+            BlueprintName = "C7"
+            ReferencedContainer = "container:SlackKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "______Target_C7"
+            BuildableName = "libC7.dylib"
+            BlueprintName = "C7"
+            ReferencedContainer = "container:SlackKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

SlackKit.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>SchemeUserState</key>
+  <dict>
+    <key>SlackKit.xcscheme</key>
+    <dict></dict>
+  </dict>
+  <key>SuppressBuildableAutocreation</key>
+  <dict></dict>
+</dict>
+</plist>

SlackKit/Info.plist

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

SlackKit/Sources/Action.swift

@@ -1,103 +0,0 @@
-//
-// Action.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 Action {
-    
-    public let name: String?
-    public let text: String?
-    public let type: String?
-    public let value: String?
-    public let style: ActionStyle?
-    public let confirm: Confirm?
-    
-    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: Any])
-    }
-    
-    public init(name: String, text: String, style: ActionStyle = .Default, value: String? = nil, confirm: Confirm? = nil) {
-        self.type = "button"
-        self.name = name
-        self.text = text
-        self.value = value
-        self.style = style
-        self.confirm = confirm
-    }
-    
-    internal var dictionary: [String: Any] {
-        var dict = [String: Any]()
-        dict["name"] = name
-        dict["text"] = text
-        dict["type"] = type
-        dict["value"] = value
-        dict["style"] = style?.rawValue
-        dict["confirm"] = confirm?.dictionary
-        return dict
-    }
-    
-    public struct Confirm {
-        
-        public let title: String?
-        public let text: String?
-        public let okText: String?
-        public let dismissText: String?
-        
-        internal init(confirm:[String: Any]?) {
-            title = confirm?["title"] as? String
-            text = confirm?["text"] as? String
-            okText = confirm?["ok_text"] as? String
-            dismissText = confirm?["dismiss_text"] as? String
-        }
-        
-        public init(text: String, title: String? = nil, okText: String? = nil, dismissText: String? = nil) {
-            self.text = text
-            self.title = title
-            self.okText = okText
-            self.dismissText = dismissText
-        }
-        
-        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"
-}
-
-public enum ResponseType: String {
-    case InChannel = "in_channel"
-    case Ephemeral = "ephemeral"
-}

SlackKit/Sources/Attachment.swift

@@ -24,8 +24,6 @@
 public struct Attachment {
     
     public let fallback: String?
-    public let callbackID: String?
-    public let type: String?
     public let color: String?
     public let pretext: String?
     public let authorName: String?
@@ -35,17 +33,11 @@ public struct Attachment {
     public let titleLink: String?
     public let text: String?
     public let fields: [AttachmentField]?
-    public let actions: [Action]?
     public let imageURL: String?
     public let thumbURL: String?
-    public let footer: String?
-    public let footerIcon: String?
-    public let ts: Int?
 
-    internal init(attachment: [String: Any]?) {
+    internal init?(attachment: [String: Any]?) {
         fallback = attachment?["fallback"] as? String
-        callbackID = attachment?["callback_id"] as? String
-        type = attachment?["attachment_type"] as? String
         color = attachment?["color"] as? String
         pretext = attachment?["pretext"] as? String
         authorName = attachment?["author_name"] as? String
@@ -56,17 +48,13 @@ public struct Attachment {
         text = attachment?["text"] as? String
         imageURL = attachment?["image_url"] as? String
         thumbURL = attachment?["thumb_url"] as? String
-        footer = attachment?["footer"] as? String
-        footerIcon = attachment?["footer_icon"] as? String
-        ts = attachment?["ts"] as? Int
-        fields = (attachment?["fields"] as? [[String: Any]])?.map { AttachmentField(field: $0) }
-        actions = (attachment?["actions"] as? [[String: Any]])?.map { Action(action: $0) }
+        fields = (attachment?["fields"] as? [[String: Any]])?.objectArrayFromDictionaryArray(intializer: {(field) -> AttachmentField? in
+            return AttachmentField(field: field)
+        })
     }
     
-    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) {
+    public init?(fallback: String, title:String, colorHex: String? = nil, pretext: String? = nil, authorName: String? = nil, authorLink: String? = nil, authorIcon: String? = nil, titleLink: String? = nil, text: String? = nil, fields: [AttachmentField]? = nil, imageURL: String? = nil, thumbURL: String? = nil) {
         self.fallback = fallback
-        self.callbackID = callbackID
-        self.type = type
         self.color = colorHex
         self.pretext = pretext
         self.authorName = authorName
@@ -76,19 +64,13 @@ public struct Attachment {
         self.titleLink = titleLink
         self.text = text
         self.fields = fields
-        self.actions = actions
         self.imageURL = imageURL
         self.thumbURL = thumbURL
-        self.footer = footer
-        self.footerIcon = footerIcon
-        self.ts = ts
     }
     
-    internal var dictionary: [String: Any] {
+    internal func dictionary() -> [String: Any] {
         var attachment = [String: Any]()
         attachment["fallback"] = fallback
-        attachment["callback_id"] = callbackID
-        attachment["attachment_type"] = type
         attachment["color"] = color
         attachment["pretext"] = pretext
         attachment["authorName"] = authorName
@@ -97,19 +79,48 @@ 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"] = fieldJSONArray(fields: fields)
         attachment["image_url"] = imageURL
         attachment["thumb_url"] = thumbURL
-        attachment["footer"] = footer
-        attachment["footer_icon"] = footerIcon
-        attachment["ts"] = ts
         return attachment
     }
+    
+    private func fieldJSONArray(fields: [AttachmentField]?) -> [[String: Any]] {
+        var returnValue = [[String: Any]]()
+        if let f = fields {
+            for field in f {
+                returnValue.append(field.dictionary())
+            }
+        }
+        return returnValue
+    }
+    
 }
 
-public enum AttachmentColor: String {
-    case Good = "good"
-    case Warning = "warning"
-    case Danger = "danger"
+public struct AttachmentField {
+    
+    public let title: String?
+    public let value: String?
+    public let short: Bool?
+    
+    internal init?(field: [String: Any]?) {
+        title = field?["title"] as? String
+        value = field?["value"] as? String
+        short = field?["short"] as? Bool
+    }
+    
+    public init(title:String, value:String, short: Bool? = nil) {
+        self.title = title
+        self.value = value.slackFormatEscaping()
+        self.short = short
+    }
+    
+    internal func dictionary() -> [String: Any] {
+        var field = [String: Any]()
+        field["title"] = title
+        field["value"] = value
+        field["short"] = short
+        return field
+    }
+    
 }

SlackKit/Sources/AttachmentField.swift

@@ -1,49 +0,0 @@
-//
-// AttachmentField.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 AttachmentField {
-    
-    public let title: String?
-    public let value: String?
-    public let short: Bool?
-    
-    internal init(field: [String: Any]?) {
-        title = field?["title"] as? String
-        value = field?["value"] as? String
-        short = field?["short"] as? Bool
-    }
-    
-    public init(title:String, value:String, short: Bool? = nil) {
-        self.title = title
-        self.value = value.slackFormatEscaping
-        self.short = short
-    }
-    
-    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,47 +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: Any] {
-        var json = [String : Any]()
-        json["scope"] = scope.map({$0.rawValue}).joined(separator: ",")
-        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, let state = queryParameters.last?.1 else {
-            return nil
-        }
-        self.code = code
-        self.state = state
-    }
-}

SlackKit/Sources/Bot.swift

@@ -24,18 +24,13 @@
 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: Any]?
     
-    internal init(bot: [String: Any]?) {
+    internal init?(bot: [String: Any]?) {
         id = bot?["id"] as? String
         name = bot?["name"] as? String
         icons = bot?["icons"] as? [String: Any]
     }
     
-    internal init(botUser: [String: Any]?) {
-        id = botUser?["bot_user_id"] as? String
-        botToken = botUser?["bot_access_token"] as? String
-    }
 }

SlackKit/Sources/Channel.swift

@@ -38,10 +38,10 @@ public struct Channel {
     internal(set) public var topic: Topic?
     internal(set) public var purpose: Topic?
     internal(set) public var isMember: Bool?
-    public var lastRead: String?
+    internal(set) public var lastRead: String?
     internal(set) public var latest: Message?
-    public var unread: Int?
-    public var unreadCountDisplay: Int?
+    internal(set) public var unread: Int?
+    internal(set) public var unreadCountDisplay: Int?
     internal(set) public var hasPins: Bool?
     internal(set) public var members: [String]?
     // Client use
@@ -49,7 +49,7 @@ public struct Channel {
     internal(set) public var usersTyping = [String]()
     internal(set) public var messages = [String: Message]()
     
-    internal init(channel: [String: Any]?) {
+    internal init?(channel: [String: Any]?) {
         id = channel?["id"] as? String
         name = channel?["name"] as? String
         created = channel?["created"] as? Int
@@ -70,15 +70,15 @@ public struct Channel {
         unreadCountDisplay = channel?["unread_count_display"] as? Int
         hasPins = channel?["has_pins"] as? Bool
         members = channel?["members"] as? [String]
-
-        if let latestMesssageDictionary = channel?["latest"] as? [String: Any] {
-            latest = Message(dictionary: latestMesssageDictionary)
-        } else {
+        
+        if (Message(message: channel?["latest"] as? [String: Any])?.ts == nil) {
             latest = Message(ts: channel?["latest"] as? String)
+        } else {
+            latest = Message(message: channel?["latest"] as? [String: Any])
         }
     }
     
-    internal init(id:String?) {
+    internal init?(id:String?) {
         self.id = id
         created = nil
         creator = nil

SlackKit/Sources/Client+EventDispatching.swift

@@ -1,175 +0,0 @@
-//
-// Client+EventDispatching.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 extension Client {
-
-    func dispatch(_ event: [String: Any]) {
-        let event = Event(event: event)
-        guard let type = event.type else {
-            return
-        }
-        switch type {
-        case .Hello:
-            connected = true
-            connectionEventsDelegate?.connected(self)
-        case .Ok:
-            messageSent(event)
-        case .Message:
-            if (event.subtype != nil) {
-                messageDispatcher(event)
-            } else {
-                messageReceived(event)
-            }
-        case .UserTyping:
-            userTyping(event)
-        case .ChannelMarked, .IMMarked, .GroupMarked:
-            channelMarked(event)
-        case .ChannelCreated, .IMCreated:
-            channelCreated(event)
-        case .ChannelJoined, .GroupJoined:
-            channelJoined(event)
-        case .ChannelLeft, .GroupLeft:
-            channelLeft(event)
-        case .ChannelDeleted:
-            channelDeleted(event)
-        case .ChannelRenamed, .GroupRename:
-            channelRenamed(event)
-        case .ChannelArchive, .GroupArchive:
-            channelArchived(event, archived: true)
-        case .ChannelUnarchive, .GroupUnarchive:
-            channelArchived(event, archived: false)
-        case .ChannelHistoryChanged, .IMHistoryChanged, .GroupHistoryChanged:
-            channelHistoryChanged(event)
-        case .DNDUpdated:
-            doNotDisturbUpdated(event)
-        case .DNDUpatedUser:
-            doNotDisturbUserUpdated(event)
-        case .IMOpen, .GroupOpen:
-            open(event, open: true)
-        case .IMClose, .GroupClose:
-            open(event, open: false)
-        case .FileCreated:
-            processFile(event)
-        case .FileShared:
-            processFile(event)
-        case .FileUnshared:
-            processFile(event)
-        case .FilePublic:
-            processFile(event)
-        case .FilePrivate:
-            filePrivate(event)
-        case .FileChanged:
-            processFile(event)
-        case .FileDeleted:
-            deleteFile(event)
-        case .FileCommentAdded:
-            fileCommentAdded(event)
-        case .FileCommentEdited:
-            fileCommentEdited(event)
-        case .FileCommentDeleted:
-            fileCommentDeleted(event)
-        case .PinAdded:
-            pinAdded(event)
-        case .PinRemoved:
-            pinRemoved(event)
-        case .Pong:
-            pong(event)
-        case .PresenceChange:
-            presenceChange(event)
-        case .ManualPresenceChange:
-            manualPresenceChange(event)
-        case .PrefChange:
-            changePreference(event)
-        case .UserChange:
-            userChange(event)
-        case .TeamJoin:
-            teamJoin(event)
-        case .StarAdded:
-            itemStarred(event, star: true)
-        case .StarRemoved:
-            itemStarred(event, star: false)
-        case .ReactionAdded:
-            addedReaction(event)
-        case .ReactionRemoved:
-            removedReaction(event)
-        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. 
-            // Until they are released other clients should ignore this event.
-            break
-        case .TeamPlanChange:
-            teamPlanChange(event)
-        case .TeamPrefChange:
-            teamPreferenceChange(event)
-        case .TeamRename:
-            teamNameChange(event)
-        case .TeamDomainChange:
-            teamDomainChange(event)
-        case .EmailDomainChange:
-            emailDomainChange(event)
-        case .TeamProfileChange:
-            teamProfileChange(event)
-        case .TeamProfileDelete:
-            teamProfileDeleted(event)
-        case .TeamProfileReorder:
-            teamProfileReordered(event)
-        case .BotAdded:
-            bot(event)
-        case .BotChanged:
-            bot(event)
-        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:
-            // The reconnect_url event is currently unsupported and experimental.
-            break
-        case .SubteamCreated, .SubteamUpdated:
-            subteam(event)
-        case .SubteamSelfAdded:
-            subteamAddedSelf(event)
-        case.SubteamSelfRemoved:
-            subteamRemovedSelf(event)
-        case .Error:
-            print("Error: \(event)")
-        }
-    }
-    
-    func messageDispatcher(_ event:Event) {
-        guard let value = event.subtype, let subtype = MessageSubtype(rawValue:value) else {
-            return
-        }
-        switch subtype {
-        case .MessageChanged:
-            messageChanged(event)
-        case .MessageDeleted:
-            messageDeleted(event)
-        default:
-            messageReceived(event)
-        }
-    }
-}

SlackKit/Sources/Client+EventHandling.swift

@@ -1,562 +0,0 @@
-//
-// Client+EventHandling.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 extension Client {
-
-    //MARK: - Pong
-    func pong(_ event: Event) {
-        pong = event.replyTo
-    }
-    
-    //MARK: - Messages
-    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?.sent(message, client: self)
-    }
-    
-    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?.received(message, client:self)
-    }
-    
-    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?.changed(nested, client:self)
-    }
-    
-    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.removeValue(forKey: key)
-        messageEventsDelegate?.deleted(message, client:self)
-    }
-    
-    //MARK: - Channels
-    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?.userTypingIn(channel, user: user, client: self)
-
-        let timeout = DispatchTime.now() + Double(Int64(5.0 * Double(NSEC_PER_SEC))) / Double(NSEC_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, let id = channel.id, let timestamp = event.ts else {
-            return
-        }
-        
-        channels[id]?.lastRead = event.ts
-        channelEventsDelegate?.marked(channel, timestamp: timestamp, client: self)
-    }
-    
-    func channelCreated(_ event: Event) {
-        guard let channel = event.channel, let id = channel.id else {
-            return
-        }
-        
-        channels[id] = channel
-        channelEventsDelegate?.created(channel, client: self)
-    }
-    
-    func channelDeleted(_ event: Event) {
-        guard let channel = event.channel, let id = channel.id else {
-            return
-        }
-        
-        channels.removeValue(forKey: id)
-        channelEventsDelegate?.deleted(channel, client: self)
-    }
-    
-    func channelJoined(_ event: Event) {
-        guard let channel = event.channel, let id = channel.id else {
-            return
-        }
-        
-        channels[id] = event.channel
-        channelEventsDelegate?.joined(channel, client: self)
-    }
-    
-    func channelLeft(_ event: Event) {
-        guard let channel = event.channel, let id = channel.id else {
-            return
-        }
-        
-        if let userID = authenticatedUser?.id, let index = channels[id]?.members?.index(of: userID) {
-            channels[id]?.members?.remove(at: index)
-        }
-        channelEventsDelegate?.left(channel, client: self)
-    }
-    
-    func channelRenamed(_ event: Event) {
-        guard let channel = event.channel, let id = channel.id else {
-            return
-        }
-        
-        channels[id]?.name = channel.name
-        channelEventsDelegate?.renamed(channel, client: self)
-    }
-    
-    func channelArchived(_ event: Event, archived: Bool) {
-        guard let channel = event.channel, let id = channel.id else {
-            return
-        }
-        
-        channels[id]?.isArchived = archived
-        channelEventsDelegate?.archived(channel, client: self)
-    }
-    
-    func channelHistoryChanged(_ event: Event) {
-        guard let channel = event.channel else {
-            return
-        }
-        channelEventsDelegate?.historyChanged(channel, client: self)
-    }
-    
-    //MARK: - Do Not Disturb
-    func doNotDisturbUpdated(_ event: Event) {
-        guard let dndStatus = event.dndStatus else {
-            return
-        }
-        
-        authenticatedUser?.doNotDisturbStatus = dndStatus
-        doNotDisturbEventsDelegate?.updated(dndStatus, client: self)
-    }
-    
-    func doNotDisturbUserUpdated(_ event: Event) {
-        guard let dndStatus = event.dndStatus, let user = event.user, let id = user.id else {
-            return
-        }
-        
-        users[id]?.doNotDisturbStatus = dndStatus
-        doNotDisturbEventsDelegate?.userUpdated(dndStatus, user: user, client: self)
-    }
-    
-    //MARK: - IM & Group Open/Close
-    func open(_ event: Event, open: Bool) {
-        guard let channel = event.channel, let id = channel.id else {
-            return
-        }
-        
-        channels[id]?.isOpen = open
-        groupEventsDelegate?.opened(channel, client: self)
-    }
-    
-    //MARK: - Files
-    func processFile(_ event: Event) {
-        guard let file = event.file, let id = file.id else {
-            return
-        }
-        if let comment = file.initialComment, let commentID = comment.id {
-            if files[id]?.comments[commentID] == nil {
-                files[id]?.comments[commentID] = comment
-            }
-        }
-            
-        files[id] = file
-        fileEventsDelegate?.processed(file, client: self)
-    }
-    
-    func filePrivate(_ event: Event) {
-        guard let file =  event.file, let id = file.id else {
-            return
-        }
-        
-        files[id]?.isPublic = false
-        fileEventsDelegate?.madePrivate(file, client: self)
-    }
-    
-    func deleteFile(_ event: Event) {
-        guard let file = event.file, let id = file.id else {
-            return
-        }
-        
-        if files[id] != nil {
-            files.removeValue(forKey: id)
-        }
-        fileEventsDelegate?.deleted(file, client: self)
-    }
-    
-    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?.commentAdded(file, comment: comment, client: self)
-    }
-    
-    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?.commentAdded(file, comment: comment, client: self)
-    }
-    
-    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.removeValue(forKey: commentID)
-        fileEventsDelegate?.commentDeleted(file, comment: comment, client: self)
-    }
-    
-    //MARK: - Pins
-    func pinAdded(_ event: Event) {
-        guard let id = event.channelID, let item = event.item else {
-            return
-        }
-        
-        channels[id]?.pinnedItems.append(item)
-        pinEventsDelegate?.pinned(item, channel: channels[id], client: self)
-    }
-    
-    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?.unpinned(item, channel: channels[id], client: self)
-    }
-
-    //MARK: - Stars
-    func itemStarred(_ event: Event, star: Bool) {
-        guard let item = event.item, let type = item.type else {
-            return
-        }
-        switch type {
-        case "message":
-            starMessage(item, star: star)
-        case "file":
-            starFile(item, star: star)
-        case "file_comment":
-            starComment(item)
-        default:
-            break
-        }
-            
-        starEventsDelegate?.starred(item, starred: star, self)
-    }
-    
-    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, let id = file.id else {
-            return
-        }
-        
-        files[id]?.isStarred = star
-        if let stars = files[id]?.stars {
-            if star == true {
-                files[id]?.stars = stars + 1
-            } else {
-                if stars > 0 {
-                    files[id]?.stars = stars - 1
-                }
-            }
-        }
-    }
-    
-    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, 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, let ts = item.ts, let message = channels[channel]?.messages[ts] else {
-                return
-            }
-            message.reactions.append(Reaction(name: reaction, user: userID))
-        case "file":
-            guard let id = item.file?.id else {
-                return
-            }
-            files[id]?.reactions.append(Reaction(name: reaction, user: userID))
-        case "file_comment":
-            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?.added(reaction, item: item, itemUser: itemUser, client: self)
-    }
-
-    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, 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, 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, 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?.removed(key, item: item, itemUser: itemUser, client: self)
-    }
-
-    //MARK: - Preferences
-    func changePreference(_ event: Event) {
-        guard let name = event.name else {
-            return
-        }
-        
-        authenticatedUser?.preferences?[name] = event.value
-        slackEventsDelegate?.preferenceChanged(name, value: event.value, client: self)
-    }
-    
-    //Mark: - User Change
-    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(user, client: self)
-    }
-    
-    //MARK: - User Presence
-    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(user, presence: presence, client: self)
-    }
-    
-    //MARK: - Team
-    func teamJoin(_ event: Event) {
-        guard let user = event.user, let id = user.id else {
-            return
-        }
-        
-        users[id] = user
-        teamEventsDelegate?.userJoined(user, client: self)
-    }
-    
-    func teamPlanChange(_ event: Event) {
-        guard let plan = event.plan else {
-            return
-        }
-        
-        team?.plan = plan
-        teamEventsDelegate?.planChanged(plan, client: self)
-    }
-    
-    func teamPreferenceChange(_ event: Event) {
-        guard let name = event.name else {
-            return
-        }
-        
-        team?.prefs?[name] = event.value
-        teamEventsDelegate?.preferencesChanged(name, value: event.value, client: self)
-    }
-    
-    func teamNameChange(_ event: Event) {
-        guard let name = event.name else {
-            return
-        }
-        
-        team?.name = name
-        teamEventsDelegate?.nameChanged(name, client: self)
-    }
-    
-    func teamDomainChange(_ event: Event) {
-        guard let domain = event.domain else {
-            return
-        }
-        
-        team?.domain = domain
-        teamEventsDelegate?.domainChanged(domain, client: self)
-    }
-    
-    func emailDomainChange(_ event: Event) {
-        guard let domain = event.emailDomain else {
-            return
-        }
-        
-        team?.emailDomain = domain
-        teamEventsDelegate?.emailDomainChanged(domain, client: self)
-    }
-    
-    func emojiChanged(_ event: Event) {
-        teamEventsDelegate?.emojiChanged(self)
-    }
-    
-    //MARK: - Bots
-    func bot(_ event: Event) {
-        guard let bot = event.bot, let id = bot.id else {
-            return
-        }
-        
-        bots[id] = bot
-        slackEventsDelegate?.botEvent(bot, client: self)
-    }
-    
-    //MARK: - Subteams
-    func subteam(_ event: Event) {
-        guard let subteam = event.subteam, let id = subteam.id else {
-            return
-        }
-        
-        userGroups[id] = subteam
-        subteamEventsDelegate?.event(subteam, client: self)
-    }
-    
-    func subteamAddedSelf(_ event: Event) {
-        guard let subteamID = event.subteamID, let _ = authenticatedUser?.userGroups else {
-            return
-        }
-        
-        authenticatedUser?.userGroups![subteamID] = subteamID
-        subteamEventsDelegate?.selfAdded(subteamID, client: self)
-    }
-    
-    func subteamRemovedSelf(_ event: Event) {
-        guard let subteamID = event.subteamID else {
-            return
-        }
-        
-        _ = authenticatedUser?.userGroups?.removeValue(forKey: subteamID)
-        subteamEventsDelegate?.selfRemoved(subteamID, client: self)
-    }
-    
-    //MARK: - Team Profiles
-    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?.changed(profile, client: self)
-    }
-    
-    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?.deleted(profile, client: self)
-    }
-    
-    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?.reordered(profile, client: self)
-    }
-    
-    //MARK: - Authenticated User
-    func manualPresenceChange(_ event: Event) {
-        guard let presence = event.presence, let user = authenticatedUser else {
-            return
-        }
-        
-        authenticatedUser?.presence = presence
-        slackEventsDelegate?.manualPresenceChanged(user, presence: presence, client: self)
-    }
-}

SlackKit/Sources/Client+Utilities.swift

@@ -1,64 +0,0 @@
-//
-// Client+Utilities.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 ClientError: Error {
-    case channelDoesNotExist
-    case userDoesNotExist
-}
-
-public extension Client {
-    
-    //MARK: - User & Channel
-    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 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 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(channel.0)
-        } else {
-            webAPI.openIM(id, success: success, failure: failure)
-        }
-    }
-
-    //MARK: - Utilities
-    internal func strip(string: String) -> String {
-        var strippedString = string
-        if string[string.startIndex] == "@" || string[string.startIndex] == "#" {
-            strippedString = string.substring(from: string.characters.index(string.startIndex, offsetBy: 1))
-        }
-        return strippedString
-    }
-}

SlackKit/Sources/Client.swift

@@ -21,12 +21,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import Foundation
-import Starscream
+import C7
+import Jay
+import WebSocket
 
-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,125 +39,147 @@ 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?
-    fileprivate let pingPongQueue = DispatchQueue(label: "com.launchsoft.SlackKit")
-    internal var ping: Double?
-    internal var pong: Double?
-    internal var options: ClientOptions?
-        
     //MARK: - Delegates
-    public weak var connectionEventsDelegate: ConnectionEventsDelegate?
-    public weak var slackEventsDelegate: SlackEventsDelegate?
-    public weak var messageEventsDelegate: MessageEventsDelegate?
-    public weak var doNotDisturbEventsDelegate: DoNotDisturbEventsDelegate?
-    public weak var channelEventsDelegate: ChannelEventsDelegate?
-    public weak var groupEventsDelegate: GroupEventsDelegate?
-    public weak var fileEventsDelegate: FileEventsDelegate?
-    public weak var pinEventsDelegate: PinEventsDelegate?
-    public weak var starEventsDelegate: StarEventsDelegate?
-    public weak var reactionEventsDelegate: ReactionEventsDelegate?
-    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
-    }
+    public var slackEventsDelegate: SlackEventsDelegate?
+    public var messageEventsDelegate: MessageEventsDelegate?
+    public var doNotDisturbEventsDelegate: DoNotDisturbEventsDelegate?
+    public var channelEventsDelegate: ChannelEventsDelegate?
+    public var groupEventsDelegate: GroupEventsDelegate?
+    public var fileEventsDelegate: FileEventsDelegate?
+    public var pinEventsDelegate: PinEventsDelegate?
+    public var starEventsDelegate: StarEventsDelegate?
+    public var reactionEventsDelegate: ReactionEventsDelegate?
+    public var teamEventsDelegate: TeamEventsDelegate?
+    public var subteamEventsDelegate: SubteamEventsDelegate?
+    public var teamProfileEventsDelegate: TeamProfileEventsDelegate?
     
-    public func setAuthToken(_ token: String) {
+    internal var token = "SLACK_AUTH_TOKEN"
+    
+    public func setAuthToken(token: String) {
         self.token = token
     }
     
-    public func connect(options: ClientOptions = ClientOptions()) {
-        self.options = options
-        webAPI.rtmStart(options.simpleLatest, noUnreads: options.noUnreads, mpimAware: options.mpimAware, success: {(response) in
-            guard let socketURL = response["url"] as? String, let url = URL(string: socketURL) else {
-                return
-            }
-            self.initialSetup(JSON: response)
-            self.webSocket = WebSocket(url: url)
-            self.webSocket?.delegate = self
-            self.webSocket?.connect()
-        }, failure: {(error) in
-            self.connectionEventsDelegate?.connectionFailed(self, error: error)
-        })
+    public var webAPI: SlackWebAPI {
+        return SlackWebAPI(slackClient: self)
+    }
+
+    internal var webSocket: WebSocket.Client?
+    internal let api = NetworkInterface()
+    private var dispatcher: EventDispatcher?
+    
+    //private let pingPongQueue = dispatch_queue_create("com.launchsoft.SlackKit", DISPATCH_QUEUE_SERIAL)
+    internal var ping: Double?
+    internal var pong: Double?
+    
+    internal var pingInterval: Double?
+    internal var timeout: Double?
+    internal var reconnect: Bool?
+    
+    required public init(apiToken: String) {
+        self.token = apiToken
     }
     
-    public func disconnect() {
-        webSocket?.disconnect()
+    public func connect(simpleLatest: Bool? = nil, noUnreads: Bool? = nil, mpimAware: Bool? = nil, pingInterval: Double? = nil, timeout: Double? = nil, reconnect: Bool? = nil) {
+        self.pingInterval = pingInterval
+        self.timeout = timeout
+        self.reconnect = reconnect
+        dispatcher = EventDispatcher(client: self)
+        webAPI.rtmStart(simpleLatest: simpleLatest, noUnreads: noUnreads, mpimAware: mpimAware, success: {
+            (response) -> Void in
+            self.initialSetup(json: response)
+            if let socketURL = response["url"] as? String {
+                do {
+                    let uri = try URI(socketURL)
+                    self.webSocket = try WebSocket.Client(uri: uri, onConnect: {(socket) in
+                        self.setupSocket(socket: socket)
+                        /*if let pingInterval = self.pingInterval {
+                            self.pingRTMServerAtInterval(interval: pingInterval)
+                        }*/
+                    })
+                    try self.webSocket?.connect(uri.description)
+                } catch _ {
+                    
+                }
+            }
+            }, failure:nil)
+    }
+    
+    //TODO: Currently Unsupported
+    /*public func disconnect() {
+        //webSocket?.disconnect()
     }
     
     //MARK: - RTM Message send
-    public func send(message: String, channelID: String) {
-        guard connected else { return }
-
-        if let data = try? format(message: message, channel: channelID), let string = String(data: data, encoding: String.Encoding.utf8) {
-            webSocket?.write(string: string)
+    public func sendMessage(message: String, channelID: String) {
+        if (connected) {
+            if let data = formatMessageToSlackJsonString(message: message, channel: channelID) {
+                if let string = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
+                    //webSocket?.writeString(string)
+                }
+            }
         }
-    }
+    }*/
     
-    fileprivate func format(message: String, channel: String) throws -> Data {
+    private func formatMessageToSlackJsonString(message: String, channel: String) -> Data? {
         let json: [String: Any] = [
-            "id": Date().slackTimestamp,
+            "id": Time.slackTimestamp,
             "type": "message",
             "channel": channel,
-            "text": message.slackFormatEscaping
+            "text": message.slackFormatEscaping()
         ]
-        addSentMessage(json)
-        return try JSONSerialization.data(withJSONObject: json, options: [])
+        
+        do {
+            let bytes = try Jay().dataFromJson(json)
+            return Data(bytes)
+        } catch {
+            return nil
+        }
     }
     
-    fileprivate func addSentMessage(_ dictionary: [String: Any]) {
+    private func addSentMessage(dictionary: [String: Any]) {
         var message = dictionary
-        guard let id = message["id"] as? NSNumber else {
-            return
-        }
-        let ts = String(describing: id)
-        message.removeValue(forKey: "id")
-        message["ts"] = ts
+        let ts = message["id"] as? Int
+        message.removeValue(forKey:"id")
+        message["ts"] = "\(ts)"
         message["user"] = self.authenticatedUser?.id
-        sentMessages[ts] = Message(dictionary: message)
+        sentMessages["\(ts)"] = Message(message: message)
     }
     
     //MARK: - RTM Ping
-    fileprivate func pingRTMServerAt(interval: TimeInterval) {
-        let delay = DispatchTime.now() + Double(Int64(interval * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)
-        pingPongQueue.asyncAfter(deadline: delay, execute: {
-            guard self.connected && self.timeoutCheck() else {
-                self.disconnect()
-                return
+    /*private func pingRTMServerAtInterval(interval: NSTimeInterval) {
+        let delay = dispatch_time(DISPATCH_TIME_NOW, Int64(interval * Double(NSEC_PER_SEC)))
+        dispatch_after(delay, pingPongQueue, {
+            if self.connected && self.timeoutCheck() {
+                self.sendRTMPing()
+                self.pingRTMServerAtInterval(interval: interval)
+            } else {
+                //self.disconnect()
             }
-            self.sendRTMPing()
-            self.pingRTMServerAt(interval: interval)
         })
     }
     
-    fileprivate func sendRTMPing() {
-        guard connected else {
-            return
-        }
-        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
-            webSocket?.write(string: string)
+    private func sendRTMPing() {
+        if connected {
+            let json: [String: Any] = [
+                "id": NSDate().slackTimestamp(),
+                "type": "ping",
+            ]
+            do {
+                let data = try NSJSONSerialization.data(withJSONObject: json, options: .prettyPrinted)
+                let string = NSString(data: data, encoding: NSUTF8StringEncoding)
+                if let writePing = string as? String {
+                    ping = json["id"] as? Double
+                    //webSocket?.writeString(writePing)
+                }
+            }
+            catch _ {
+                
+            }
         }
     }
     
-    fileprivate func timeoutCheck() -> Bool {
-        if let pong = pong, let ping = ping, let timeout = options?.timeout {
+    private func timeoutCheck() -> Bool {
+        if let pong = pong, ping = ping, timeout = timeout {
             if pong - ping < timeout {
                 return true
             } else {
@@ -165,64 +189,59 @@ public final class Client: WebSocketDelegate {
         } else {
             return true
         }
-    }
+    }*/
     
     //MARK: - Client setup
-    fileprivate 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 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(array: json["users"] as? Array) { (user) in self.addUser(aUser: user) }
+        enumerateObjects(array: json["channels"] as? Array) { (channel) in self.addChannel(aChannel: channel) }
+        enumerateObjects(array: json["groups"] as? Array) { (group) in self.addChannel(aChannel: group) }
+        enumerateObjects(array: json["mpims"] as? Array) { (mpim) in self.addChannel(aChannel: mpim) }
+        enumerateObjects(array: json["ims"] as? Array) { (ims) in self.addChannel(aChannel: ims) }
+        enumerateObjects(array: json["bots"] as? Array) { (bots) in self.addBot(aBot: bots) }
+        enumerateSubteams(subteams: json["subteams"] as? [String: Any])
     }
     
-    fileprivate func addUser(_ aUser: [String: Any]) {
-        let user = User(user: aUser)
-        if let id = user.id {
+    private func addUser(aUser: [String: Any]) {
+        if let user = User(user: aUser), id = user.id {
             users[id] = user
         }
     }
     
-    fileprivate func addChannel(_ aChannel: [String: Any]) {
-        let channel = Channel(channel: aChannel)
-        if let id = channel.id {
+    private func addChannel(aChannel: [String: Any]) {
+        if let channel = Channel(channel: aChannel), id = channel.id {
             channels[id] = channel
         }
     }
     
-    fileprivate func addBot(_ aBot: [String: Any]) {
-        let bot = Bot(bot: aBot)
-        if let id = bot.id {
+    private func addBot(aBot: [String: Any]) {
+        if let bot = Bot(bot: aBot), id = bot.id {
             bots[id] = bot
         }
     }
     
-    fileprivate func enumerateSubteams(_ subteams: [String: Any]?) {
+    private func enumerateSubteams(subteams: [String: Any]?) {
         if let subteams = subteams {
             if let all = subteams["all"] as? [[String: Any]] {
                 for item in all {
                     let u = UserGroup(userGroup: item)
-                    if let id = u.id {
-                        self.userGroups[id] = u
-                    }
+                    self.userGroups[u!.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
-    fileprivate func enumerateObjects(_ array: [Any]?, initalizer: ([String: Any])-> Void) {
+    private func enumerateObjects(array: [Any]?, initalizer: ([String: Any])-> Void) {
         if let array = array {
             for object in array {
                 if let dictionary = object as? [String: Any] {
@@ -232,32 +251,42 @@ public final class Client: WebSocketDelegate {
         }
     }
     
-    // MARK: - WebSocketDelegate
-    public func websocketDidConnect(socket: WebSocket) {
-        if let pingInterval = options?.pingInterval {
-            pingRTMServerAt(interval: pingInterval)
+    
+    // MARK: - WebSocket
+    private func setupSocket(socket: Socket) {
+        socket.onText {(message) in
+            self.websocketDidReceive(message: message)
+        }
+        socket.onPing { (data) in try socket.pong() }
+        socket.onPong { (data) in try socket.ping() }
+        socket.onClose{ (code: CloseCode?, reason: String?) in
+            self.websocketDidDisconnect(closeCode: code, error: reason)
         }
     }
     
-    public func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
+    private func websocketDidReceive(message: String) {
+        do {
+            let json = try Jay().jsonFromData(message.data.bytes)
+            if let event = json as? [String: Any] {
+                dispatcher?.dispatch(event:event)
+            }
+        }
+        catch _ {
+            
+        }
+
+    }
+    
+    private func websocketDidDisconnect(closeCode: CloseCode?, error: String?) {
         connected = false
+        authenticated = false
         webSocket = nil
+        dispatcher = nil
         authenticatedUser = nil
-        connectionEventsDelegate?.disconnected(self)
-        if let options = options, options.reconnect == true {
-            connect(options: options)
+        slackEventsDelegate?.clientDisconnected()
+        if reconnect == true {
+            connect(pingInterval: pingInterval, timeout: timeout, reconnect: reconnect)
         }
     }
     
-    public func websocketDidReceiveMessage(socket: WebSocket, text: String) {
-        guard let data = text.data(using: String.Encoding.utf8) else {
-            return
-        }
-
-        if let json = (try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions.allowFragments)) as? [String: Any] {
-            dispatch(json)
-        }
-    }
-
-    public func websocketDidReceiveData(socket: WebSocket, data: Data) {}
 }

SlackKit/Sources/ClientExtensions.swift

@@ -0,0 +1,136 @@
+//
+// ClientExtensions.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 C7
+#if os(Linux)
+    import Glibc
+#else
+    import Darwin.C
+#endif
+
+extension SlackClient {
+    
+    //MARK: - User & Channel
+    public func getChannelIDByName(name: String) -> String? {
+        return channels.filter{$0.1.name == stripString(string: name)}.first?.0
+    }
+    
+    public func getUserIDByName(name: String) -> String? {
+        return users.filter{$0.1.name == stripString(string: name)}.first?.0
+    }
+    
+    public func getImIDForUserWithID(id: String, success: (imID: String?)->Void, failure: (error: 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)
+        } else {
+            webAPI.openIM(userID: id, success: success, failure: failure)
+        }
+    }
+    
+    //MARK: - Utilities
+    internal func stripString(string: String) -> String? {
+        var strippedString = string
+        if string[string.startIndex] == "@" || string[string.startIndex] == "#" {
+            strippedString.characters.remove(at: string.startIndex.advanced(by:1))
+        }
+        return strippedString
+    }
+}
+
+public enum AttachmentColor: String {
+    case Good = "good"
+    case Warning = "warning"
+    case Danger = "danger"
+}
+
+public typealias Time=Double
+
+public extension Double {
+    
+    static func slackTimestamp() -> Double {
+        #if os(Linux)
+            return Double(time(nil))
+        #else
+            var clock: clock_serv_t = clock_serv_t()
+            var timeSpecBuffer: mach_timespec_t = mach_timespec_t(tv_sec: 0, tv_nsec: 0)
+            
+            host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &clock)
+            clock_get_time(clock, &timeSpecBuffer)
+            mach_port_deallocate(mach_task_self_, clock)
+            
+            return Double(timeSpecBuffer.tv_sec) + Double(timeSpecBuffer.tv_nsec) * 0.000000001
+        #endif
+    }
+    
+}
+
+internal extension String {
+    
+    func slackFormatEscaping() -> String {
+        var escapedString = self
+        escapedString.replace(string: "&", with: "&")
+        escapedString.replace(string: "<", with: "&lt;")
+        escapedString.replace(string: ">", with: "&gt;")
+        return escapedString
+    }
+    
+}
+
+public extension String {
+    
+    func contains(query: String, caseSensitive: Bool = false) -> Bool {
+        if query.isEmpty { return true }
+        let (s, q) = caseSensitive ? (self, query) : (self.lowercased(), query.lowercased())
+        var chars = s.characters; let qchars = q.characters
+        
+        while !chars.isEmpty {
+            if chars.starts(with: qchars) { return true }
+            chars.removeFirst()
+        }
+        
+        return false
+    }
+    
+    func prefixedBy(query: String, caseSensitive: Bool = false) -> Bool {
+        let (s, q) = caseSensitive ? (self, query) : (self.lowercased(), query.lowercased())
+        return s.characters.starts(with: q.characters)
+    }
+}
+
+internal extension Array {
+
+    func objectArrayFromDictionaryArray<T>(intializer:([String: Any])->T?) -> [T] {
+        var returnValue = [T]()
+        for object in self {
+            if let dictionary = object as? [String: Any] {
+                if let value = intializer(dictionary) {
+                    returnValue.append(value)
+                }
+            }
+        }
+        return returnValue
+    }
+    
+}

SlackKit/Sources/ClientOptions.swift

@@ -1,43 +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: TimeInterval?
-    let timeout: TimeInterval?
-    let reconnect: Bool?
-    
-    public init(simpleLatest: Bool? = nil, noUnreads: Bool? = nil, mpimAware: Bool? = nil, pingInterval: TimeInterval? = nil, timeout: TimeInterval? = 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

@@ -1,51 +0,0 @@
-//
-// Comment.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 Comment: Equatable {
-    
-    public let id: String?
-    public let user: String?
-    internal(set) public var created: Int?
-    internal(set) public var comment: String?
-    internal(set) public var starred: Bool?
-    internal(set) public var stars: Int?
-    internal(set) public var reactions = [Reaction]()
-    
-    internal init(comment:[String: Any]?) {
-        id = comment?["id"] as? String
-        created = comment?["created"] as? Int
-        user = comment?["user"] as? String
-        starred = comment?["is_starred"] as? Bool
-        stars = comment?["num_stars"] as? Int
-        self.comment = comment?["comment"] as? String
-    }
-    
-    internal init(id: String?) {
-        self.id = id
-        self.user = nil
-    }
-    
-    public static func ==(lhs: Comment, rhs: Comment) -> Bool {
-        return lhs.id == rhs.id
-    }
-}

SlackKit/Sources/CustomProfile.swift

@@ -1,50 +0,0 @@
-//
-// CustomProfile.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 CustomProfile {
-    
-    internal(set) public var fields = [String: CustomProfileField]()
-    
-    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: Any] {
-                    cpf = CustomProfileField(field: fieldDictionary)
-                } else {
-                    cpf = CustomProfileField(id: field as? String)
-                }
-                if let id = cpf?.id { fields[id] = cpf }
-            }
-        }
-    }
-    
-    internal init(customFields: [String: Any]?) {
-        if let customFields = customFields {
-            for key in customFields.keys {
-                let cpf = CustomProfileField(field: customFields[key] as? [String: Any])
-                self.fields[key] = cpf
-            }
-        }
-    }
-}

SlackKit/Sources/CustomProfileField.swift

@@ -1,66 +0,0 @@
-//
-// CustomProfileField.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 CustomProfileField {
-    
-    internal(set) public var id: String?
-    internal(set) public var alt: String?
-    internal(set) public var value: String?
-    internal(set) public var hidden: Bool?
-    internal(set) public var hint: String?
-    internal(set) public var label: String?
-    internal(set) public var options: String?
-    internal(set) public var ordering: Int?
-    internal(set) public var possibleValues: [String]?
-    internal(set) public var type: String?
-    
-    internal init(field: [String: Any]?) {
-        id = field?["id"] as? String
-        alt = field?["alt"] as? String
-        value = field?["value"] as? String
-        hidden = field?["is_hidden"] as? Bool
-        hint = field?["hint"] as? String
-        label = field?["label"] as? String
-        options = field?["options"] as? String
-        ordering = field?["ordering"] as? Int
-        possibleValues = field?["possible_values"] as? [String]
-        type = field?["type"] as? String
-    }
-    
-    internal init(id: String?) {
-        self.id = id
-    }
-    
-    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
-        hidden = profile?.hidden != nil ? profile?.hidden : hidden
-        hint = profile?.hint != nil ? profile?.hint : hint
-        label = profile?.label != nil ? profile?.label : label
-        options = profile?.options != nil ? profile?.options : options
-        ordering = profile?.ordering != nil ? profile?.ordering : ordering
-        possibleValues = profile?.possibleValues != nil ? profile?.possibleValues : possibleValues
-        type = profile?.type != nil ? profile?.type : type
-    }
-}

SlackKit/Sources/DoNotDisturbStatus.swift

@@ -1,39 +0,0 @@
-//
-// DoNotDisturbStatus.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 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: 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/Event.swift

@@ -1,5 +1,5 @@
 //
-// Event.swift
+// Message.swift
 //
 // Copyright © 2016 Peter Zignego. All rights reserved.
 //
@@ -22,7 +22,6 @@
 // THE SOFTWARE.
 
 internal enum EventType: String {
-    
     case Hello = "hello"
     case Message = "message"
     case UserTyping = "user_typing"
@@ -97,7 +96,6 @@ internal enum EventType: String {
 }
 
 internal enum MessageSubtype: String {
-    
     case BotMessage = "bot_message"
     case MeMessage = "me_message"
     case MessageChanged = "message_changed"
@@ -163,7 +161,11 @@ internal struct Event {
     var profile: CustomProfile?
     
     init(event:[String: Any]) {
-        type = EventType(rawValue: event["type"] as? String ?? "ok")
+        if let eventType = event["type"] as? String {
+            type = EventType(rawValue:eventType)
+        } else {
+            type = EventType(rawValue: "ok")
+        }
         ts = event["ts"] as? String
         subtype = event["subtype"] as? String
         channelID = event["channel_id"] as? String
@@ -192,28 +194,34 @@ internal struct Event {
         item = Item(item: event["item"] as? [String: Any])
         subteam = UserGroup(userGroup: event["subteam"] as? [String: Any])
         subteamID = event["subteam_id"] as? String
-        message = Message(dictionary: event)
-        nestedMessage = Message(dictionary: event["message"] as? [String: Any])
+        message = Message(message: event)
+        nestedMessage = Message(message: 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: Any] {
-            comment = Comment(comment: commentDictionary)
-        } else {
+        
+        // Comment, Channel, User, and File can come across as Strings or Dictionaries
+        if (Comment(comment: event["comment"] as? [String: Any])?.id == nil) {
             comment = Comment(id: event["comment"] as? String)
-        }
-
-        if let userDictionary = event["user"] as? [String: Any] {
-            user = User(user: userDictionary)
         } else {
+            comment = Comment(comment: event["comment"] as? [String: Any])
+        }
+        
+        if (User(user: event["user"] as? [String: Any])?.id == nil) {
             user = User(id: event["user"] as? String)
-        }
-
-        if let channelDictionary =  event["channel"] as? [String: Any] {
-            channel = Channel(channel: channelDictionary)
         } else {
+            user = User(user: event["user"] as? [String: Any])
+        }
+        
+        if (File(file: event["file"] as? [String: Any])?.id == nil) {
+            file = File(id: event["file"] as? String)
+        } else {
+            file = File(file: event["file"] as? [String: Any])
+        }
+        
+        if (Channel(channel: event["channel"] as? [String: Any])?.id == nil) {
             channel = Channel(id: event["channel"] as? String)
+        } else {
+            channel = Channel(channel: event["channel"] as? [String: Any])
         }
     }
+    
 }

SlackKit/Sources/EventDelegate.swift

@@ -21,89 +21,85 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-public protocol ConnectionEventsDelegate: class {
-    func connected(_ client: Client)
-    func disconnected(_ client: Client)
-    func connectionFailed(_ client: Client, error: SlackError)
+public protocol SlackEventsDelegate {
+    func clientConnected()
+    func clientDisconnected()
+    func preferenceChanged(preference: String, value: Any)
+    func userChanged(user: User)
+    func presenceChanged(user: User?, presence: String?)
+    func manualPresenceChanged(user: User?, presence: String?)
+    func botEvent(bot: Bot)
 }
 
-public protocol MessageEventsDelegate: class {
-    func sent(_ message: Message, client: Client)
-    func received(_ message: Message, client: Client)
-    func changed(_ message: Message, client: Client)
-    func deleted(_ message: Message?, client: Client)
+public protocol MessageEventsDelegate {
+    func messageSent(message: Message)
+    func messageReceived(message: Message)
+    func messageChanged(message: Message)
+    func messageDeleted(message: Message?)
 }
 
-public protocol ChannelEventsDelegate: class {
-    func userTypingIn(_ channel: Channel, user: User, client: Client)
-    func marked(_ channel: Channel, timestamp: String, client: Client)
-    func created(_ channel: Channel, client: Client)
-    func deleted(_ channel: Channel, client: Client)
-    func renamed(_ channel: Channel, client: Client)
-    func archived(_ channel: Channel, client: Client)
-    func historyChanged(_ channel: Channel, client: Client)
-    func joined(_ channel: Channel, client: Client)
-    func left(_ channel: Channel, client: Client)
+public protocol ChannelEventsDelegate {
+    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)
 }
 
-public protocol DoNotDisturbEventsDelegate: class {
-    func updated(_ status: DoNotDisturbStatus, client: Client)
-    func userUpdated(_ status: DoNotDisturbStatus, user: User, client: Client)
+public protocol DoNotDisturbEventsDelegate {
+    func doNotDisturbUpdated(dndStatus: DoNotDisturbStatus)
+    func doNotDisturbUserUpdated(dndStatus: DoNotDisturbStatus, user: User?)
 }
 
-public protocol GroupEventsDelegate: class {
-    func opened(_ group: Channel, client: Client)
+public protocol GroupEventsDelegate {
+    func groupOpened(group: Channel)
 }
 
-public protocol FileEventsDelegate: class {
-    func processed(_ file: File, client: Client)
-    func madePrivate(_ file: File, client: Client)
-    func deleted(_ file: File, client: Client)
-    func commentAdded(_ file: File, comment: Comment, client: Client)
-    func commentEdited(_ file: File, comment: Comment, client: Client)
-    func commentDeleted(_ file: File, comment: Comment, client: Client)
+public protocol FileEventsDelegate {
+    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)
 }
 
-public protocol PinEventsDelegate: class {
-    func pinned(_ item: Item, channel: Channel?, client: Client)
-    func unpinned(_ item: Item, channel: Channel?, client: Client)
+public protocol PinEventsDelegate {
+    func itemPinned(item: Item?, channel: Channel?)
+    func itemUnpinned(item: Item?, channel: Channel?)
 }
 
-public protocol StarEventsDelegate: class {
-    func starred(_ item: Item, starred: Bool, _ client: Client)
+public protocol StarEventsDelegate {
+    func itemStarred(item: Item, star: Bool)
 }
 
-public protocol ReactionEventsDelegate: class {
-    func added(_ reaction: String, item: Item, itemUser: String, client: Client)
-    func removed(_ reaction: String, item: Item, itemUser: String, client: Client)
+public protocol ReactionEventsDelegate {
+    func reactionAdded(reaction: String?, item: Item?, itemUser: String?)
+    func reactionRemoved(reaction: String?, item: Item?, itemUser: String?)
 }
 
-public protocol SlackEventsDelegate: class {
-    func preferenceChanged(_ preference: String, value: Any?, client: Client)
-    func userChanged(_ user: User, client: Client)
-    func presenceChanged(_ user: User, presence: String, client: Client)
-    func manualPresenceChanged(_ user: User, presence: String, client: Client)
-    func botEvent(_ bot: Bot, client: Client)
+public protocol TeamEventsDelegate {
+    func teamJoined(user: User)
+    func teamPlanChanged(plan: String)
+    func teamPreferencesChanged(preference: String, value: Any)
+    func teamNameChanged(name: String)
+    func teamDomainChanged(domain: String)
+    func teamEmailDomainChanged(domain: String)
+    func teamEmojiChanged()
 }
 
-public protocol TeamEventsDelegate: class {
-    func userJoined(_ user: User, client: Client)
-    func planChanged(_ plan: String, client: Client)
-    func preferencesChanged(_ preference: String, value: Any?, client: Client)
-    func nameChanged(_ name: String, client: Client)
-    func domainChanged(_ domain: String, client: Client)
-    func emailDomainChanged(_ domain: String, client: Client)
-    func emojiChanged(_ client: Client)
+public protocol SubteamEventsDelegate {
+    func subteamEvent(userGroup: UserGroup)
+    func subteamSelfAdded(subteamID: String)
+    func subteamSelfRemoved(subteamID: String)
 }
 
-public protocol SubteamEventsDelegate: class {
-    func event(_ userGroup: UserGroup, client: Client)
-    func selfAdded(_ subteamID: String, client: Client)
-    func selfRemoved(_ subteamID: String, client: Client)
-}
-
-public protocol TeamProfileEventsDelegate: class {
-    func changed(_ profile: CustomProfile, client: Client)
-    func deleted(_ profile: CustomProfile, client: Client)
-    func reordered(_ profile: CustomProfile, client: Client)
+public protocol TeamProfileEventsDelegate {
+    func teamProfileChanged(profile: CustomProfile?)
+    func teamProfileDeleted(profile: CustomProfile?)
+    func teamProfileReordered(profile: CustomProfile?)
 }

SlackKit/Sources/EventDispatcher.swift

@@ -0,0 +1,180 @@
+//
+// EventDispatcher.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 class EventDispatcher {
+    let client: SlackClient
+    let handler: EventHandler
+    
+    required init(client: SlackClient) {
+        self.client = client
+        handler = EventHandler(client: client)
+    }
+    
+    func dispatch(event: [String: Any]) {
+        let event = Event(event: event)
+        if let type = event.type {
+            switch type {
+            case .Hello:
+                handler.connected()
+            case .Ok:
+                handler.messageSent(event: event)
+            case .Message:
+                if (event.subtype != nil) {
+                    messageDispatcher(event: event)
+                } else {
+                    handler.messageReceived(event: event)
+                }
+            case .UserTyping:
+                handler.userTyping(event: event)
+            case .ChannelMarked, .IMMarked, .GroupMarked:
+                handler.channelMarked(event: event)
+            case .ChannelCreated, .IMCreated:
+                handler.channelCreated(event: event)
+            case .ChannelJoined, .GroupJoined:
+                handler.channelJoined(event: event)
+            case .ChannelLeft, .GroupLeft:
+                handler.channelLeft(event: event)
+            case .ChannelDeleted:
+                handler.channelDeleted(event: event)
+            case .ChannelRenamed, .GroupRename:
+                handler.channelRenamed(event: event)
+            case .ChannelArchive, .GroupArchive:
+                handler.channelArchived(event: event, archived: true)
+            case .ChannelUnarchive, .GroupUnarchive:
+                handler.channelArchived(event: event, archived: false)
+            case .ChannelHistoryChanged, .IMHistoryChanged, .GroupHistoryChanged:
+                handler.channelHistoryChanged(event: event)
+            case .DNDUpdated:
+                handler.doNotDisturbUpdated(event: event)
+            case .DNDUpatedUser:
+                handler.doNotDisturbUserUpdated(event: event)
+            case .IMOpen, .GroupOpen:
+                handler.open(event: event, open: true)
+            case .IMClose, .GroupClose:
+                handler.open(event: event, open: false)
+            case .FileCreated:
+                handler.processFile(event: event)
+            case .FileShared:
+                handler.processFile(event: event)
+            case .FileUnshared:
+                handler.processFile(event: event)
+            case .FilePublic:
+                handler.processFile(event: event)
+            case .FilePrivate:
+                handler.filePrivate(event: event)
+            case .FileChanged:
+                handler.processFile(event: event)
+            case .FileDeleted:
+                handler.deleteFile(event: event)
+            case .FileCommentAdded:
+                handler.fileCommentAdded(event: event)
+            case .FileCommentEdited:
+                handler.fileCommentEdited(event: event)
+            case .FileCommentDeleted:
+                handler.fileCommentDeleted(event: event)
+            case .PinAdded:
+                handler.pinAdded(event: event)
+            case .PinRemoved:
+                handler.pinRemoved(event: event)
+            case .Pong:
+                handler.pong(event: event)
+            case .PresenceChange:
+                handler.presenceChange(event: event)
+            case .ManualPresenceChange:
+                handler.manualPresenceChange(event: event)
+            case .PrefChange:
+                handler.changePreference(event: event)
+            case .UserChange:
+                handler.userChange(event: event)
+            case .TeamJoin:
+                handler.teamJoin(event: event)
+            case .StarAdded:
+                handler.itemStarred(event: event, star: true)
+            case .StarRemoved:
+                handler.itemStarred(event: event, star: false)
+            case .ReactionAdded:
+                handler.addedReaction(event: event)
+            case .ReactionRemoved:
+                handler.removedReaction(event: event)
+            case .EmojiChanged:
+                handler.emojiChanged(event: event)
+            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:
+                handler.teamPlanChange(event: event)
+            case .TeamPrefChange:
+                handler.teamPreferenceChange(event: event)
+            case .TeamRename:
+                handler.teamNameChange(event: event)
+            case .TeamDomainChange:
+                handler.teamDomainChange(event: event)
+            case .EmailDomainChange:
+                handler.emailDomainChange(event: event)
+            case .TeamProfileChange:
+                handler.teamProfileChange(event: event)
+            case .TeamProfileDelete:
+                handler.teamProfileDeleted(event: event)
+            case .TeamProfileReorder:
+                handler.teamProfileReordered(event: event)
+            case .BotAdded:
+                handler.bot(event: event)
+            case .BotChanged:
+                handler.bot(event: event)
+            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:
+                client.connect(pingInterval: client.pingInterval, timeout: client.timeout, reconnect: client.reconnect)
+            case .ReconnectURL:
+                // The reconnect_url event is currently unsupported and experimental.
+                break
+            case .SubteamCreated, .SubteamUpdated:
+                handler.subteam(event: event)
+            case .SubteamSelfAdded:
+                handler.subteamAddedSelf(event: event)
+            case.SubteamSelfRemoved:
+                handler.subteamRemovedSelf(event: event)
+            case .Error:
+                print("Error: \(event)")
+                break
+            }
+        }
+    }
+    
+    func messageDispatcher(event:Event) {
+        let subtype = MessageSubtype(rawValue: event.subtype!)!
+        switch subtype {
+        case .MessageChanged:
+            handler.messageChanged(event: event)
+        case .MessageDeleted:
+            handler.messageDeleted(event: event)
+        default:
+            handler.messageReceived(event: event)
+        }
+    }
+    
+}

SlackKit/Sources/EventHandler.swift

@@ -0,0 +1,647 @@
+//
+// EventHandler.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 class EventHandler {
+    let client: SlackClient
+    required init(client: SlackClient) {
+        self.client = client
+    }
+    
+    //MARK: - Initial connection
+    func connected() {
+        client.connected = true
+        
+        if let delegate = client.slackEventsDelegate {
+            delegate.clientConnected()
+        }
+    }
+    
+    //MARK: - Pong
+    func pong(event: Event) {
+        client.pong = event.replyTo
+    }
+    
+    //MARK: - Messages
+    func messageSent(event: Event) {
+        if let reply = event.replyTo, message = client.sentMessages["\(reply)"], channel = message.channel, ts = message.ts {
+            message.ts = event.ts
+            message.text = event.text
+            client.channels[channel]?.messages[ts] = message
+            
+            if let delegate = client.messageEventsDelegate {
+                delegate.messageSent(message: message)
+            }
+        }
+    }
+    
+    func messageReceived(event: Event) {
+        if let channel = event.channel, message = event.message, id = channel.id, ts = message.ts {
+            client.channels[id]?.messages[ts] = message
+            
+            if let delegate = client.messageEventsDelegate {
+                delegate.messageReceived(message: message)
+            }
+        }
+    }
+    
+    func messageChanged(event: Event) {
+        if let id = event.channel?.id, nested = event.nestedMessage, ts = nested.ts {
+            client.channels[id]?.messages[ts] = nested
+            
+            if let delegate = client.messageEventsDelegate {
+                delegate.messageChanged(message: nested)
+            }
+        }
+    }
+    
+    func messageDeleted(event: Event) {
+        if let id = event.channel?.id, key = event.message?.deletedTs {
+            let message = client.channels[id]?.messages[key]
+            client.channels[id]?.messages.removeValue(forKey:key)
+            
+            if let delegate = client.messageEventsDelegate {
+                delegate.messageDeleted(message: message)
+            }
+        }
+    }
+    
+    //MARK: - Channels
+    func userTyping(event: Event) {
+        if let channelID = event.channel?.id, userID = event.user?.id {
+            if let _ = client.channels[channelID] {
+                if (!client.channels[channelID]!.usersTyping.contains(userID)) {
+                    client.channels[channelID]?.usersTyping.append(userID)
+                    
+                    if let delegate = client.channelEventsDelegate {
+                        delegate.userTyping(channel: event.channel, user: event.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.client.channels[channelID]?.usersTyping.index(of:userID) {
+                    self.client.channels[channelID]?.usersTyping.remove(at: index)
+                }
+            }*/
+        }
+    }
+    
+    func channelMarked(event: Event) {
+        if let channel = event.channel, id = channel.id {
+            client.channels[id]?.lastRead = event.ts
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelMarked(channel: channel, timestamp: event.ts)
+            }
+        }
+        //TODO: Recalculate unreads
+    }
+    
+    func channelCreated(event: Event) {
+        if let channel = event.channel, id = channel.id {
+            client.channels[id] = channel
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelCreated(channel: channel)
+            }
+        }
+    }
+    
+    func channelDeleted(event: Event) {
+        if let channel = event.channel, id = channel.id {
+            client.channels.removeValue(forKey:id)
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelDeleted(channel: channel)
+            }
+        }
+    }
+    
+    func channelJoined(event: Event) {
+        if let channel = event.channel, id = channel.id {
+            client.channels[id] = event.channel
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelJoined(channel: channel)
+            }
+        }
+    }
+    
+    func channelLeft(event: Event) {
+        if let channel = event.channel, id = channel.id, userID = client.authenticatedUser?.id {
+            if let index = client.channels[id]?.members?.index(of:userID) {
+                client.channels[id]?.members?.remove(at: index)
+                
+                if let delegate = client.channelEventsDelegate {
+                    delegate.channelLeft(channel: channel)
+                }
+            }
+        }
+    }
+    
+    func channelRenamed(event: Event) {
+        if let channel = event.channel, id = channel.id {
+            client.channels[id]?.name = channel.name
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelRenamed(channel: channel)
+            }
+        }
+    }
+    
+    func channelArchived(event: Event, archived: Bool) {
+        if let channel = event.channel, id = channel.id {
+            client.channels[id]?.isArchived = archived
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelArchived(channel: channel)
+            }
+        }
+    }
+    
+    func channelHistoryChanged(event: Event) {
+        if let channel = event.channel {
+            //TODO: Reload chat history if there are any cached messages before latest
+            
+            if let delegate = client.channelEventsDelegate {
+                delegate.channelHistoryChanged(channel: channel)
+            }
+        }
+    }
+    
+    //MARK: - Do Not Disturb
+    func doNotDisturbUpdated(event: Event) {
+        if let dndStatus = event.dndStatus {
+            client.authenticatedUser?.doNotDisturbStatus = dndStatus
+            
+            if let delegate = client.doNotDisturbEventsDelegate {
+                delegate.doNotDisturbUpdated(dndStatus: dndStatus)
+            }
+        }
+    }
+    
+    func doNotDisturbUserUpdated(event: Event) {
+        if let dndStatus = event.dndStatus, user = event.user, id = user.id {
+            client.users[id]?.doNotDisturbStatus = dndStatus
+            
+            if let delegate = client.doNotDisturbEventsDelegate {
+                delegate.doNotDisturbUserUpdated(dndStatus: dndStatus, user: user)
+            }
+        }
+    }
+    
+    //MARK: - IM & Group Open/Close
+    func open(event: Event, open: Bool) {
+        if let channel = event.channel, id = channel.id {
+            client.channels[id]?.isOpen = open
+            
+            if let delegate = client.groupEventsDelegate {
+                delegate.groupOpened(group: channel)
+            }
+        }
+    }
+    
+    //MARK: - Files
+    func processFile(event: Event) {
+        if let file = event.file, id = file.id {
+            if let comment = file.initialComment, commentID = comment.id {
+                if client.files[id]?.comments[commentID] == nil {
+                    client.files[id]?.comments[commentID] = comment
+                }
+            }
+            
+            client.files[id] = file
+            
+            if let delegate = client.fileEventsDelegate {
+                delegate.fileProcessed(file: file)
+            }
+        }
+    }
+    
+    func filePrivate(event: Event) {
+        if let file =  event.file, id = file.id {
+            client.files[id]?.isPublic = false
+            
+            if let delegate = client.fileEventsDelegate {
+                delegate.fileMadePrivate(file: file)
+            }
+        }
+    }
+    
+    func deleteFile(event: Event) {
+        if let file = event.file, id = file.id {
+            if client.files[id] != nil {
+                client.files.removeValue(forKey:id)
+            }
+            
+            if let delegate = client.fileEventsDelegate {
+                delegate.fileDeleted(file: file)
+            }
+        }
+    }
+    
+    func fileCommentAdded(event: Event) {
+        if let file = event.file, id = file.id, comment = event.comment, commentID = comment.id {
+            client.files[id]?.comments[commentID] = comment
+            
+            if let delegate = client.fileEventsDelegate {
+                delegate.fileCommentAdded(file: file, comment: comment)
+            }
+        }
+    }
+    
+    func fileCommentEdited(event: Event) {
+        if let file = event.file, id = file.id, comment = event.comment, commentID = comment.id {
+            client.files[id]?.comments[commentID]?.comment = comment.comment
+            
+            if let delegate = client.fileEventsDelegate {
+                delegate.fileCommentEdited(file: file, comment: comment)
+            }
+        }
+    }
+    
+    func fileCommentDeleted(event: Event) {
+        if let file = event.file, id = file.id, comment = event.comment, commentID = comment.id {
+            client.files[id]?.comments.removeValue(forKey:commentID)
+            
+            if let delegate = client.fileEventsDelegate {
+                delegate.fileCommentDeleted(file: file, comment: comment)
+            }
+        }
+    }
+    
+    //MARK: - Pins
+    func pinAdded(event: Event) {
+        if let id = event.channelID, item = event.item {
+            client.channels[id]?.pinnedItems.append(item)
+            
+            if let delegate = client.pinEventsDelegate {
+                delegate.itemPinned(item: item, channel: client.channels[id])
+            }
+        }
+    }
+    
+    func pinRemoved(event: Event) {
+        if let id = event.channelID {
+            if let pins = client.channels[id]?.pinnedItems.filter({$0 != event.item}) {
+                client.channels[id]?.pinnedItems = pins
+            }
+            
+            if let delegate = client.pinEventsDelegate {
+                delegate.itemUnpinned(item: event.item, channel: client.channels[id])
+            }
+        }
+    }
+    
+    //MARK: - Stars
+    func itemStarred(event: Event, star: Bool) {
+        if let item = event.item, type = item.type {
+            switch type {
+            case "message":
+                starMessage(item: item, star: star)
+            case "file":
+                starFile(item: item, star: star)
+            case "file_comment":
+                starComment(item: item)
+            default:
+                break
+            }
+            
+            if let delegate = client.starEventsDelegate {
+                delegate.itemStarred(item: item, star: star)
+            }
+        }
+    }
+    
+    func starMessage(item: Item, star: Bool) {
+        if let message = item.message, ts = message.ts, channel = item.channel {
+            if let _ = client.channels[channel]?.messages[ts] {
+                client.channels[channel]?.messages[ts]?.isStarred = star
+            }
+        }
+    }
+    
+    func starFile(item: Item, star: Bool) {
+        if let file = item.file, id = file.id {
+            client.files[id]?.isStarred = star
+            if let stars = client.files[id]?.stars {
+                if star == true {
+                    client.files[id]?.stars = stars + 1
+                } else {
+                    if stars > 0 {
+                        client.files[id]?.stars = stars - 1
+                    }
+                }
+            }
+        }
+    }
+    
+    func starComment(item: Item) {
+        if let file = item.file, id = file.id, comment = item.comment, commentID = comment.id {
+            client.files[id]?.comments[commentID] = comment
+        }
+    }
+    
+    //MARK: - Reactions
+    func addedReaction(event: Event) {
+        if let item = event.item, type = item.type, key = event.reaction, userID = event.user?.id {
+            switch type {
+            case "message":
+                if let channel = item.channel, ts = item.ts {
+                    if let message = client.channels[channel]?.messages[ts] {
+                        if (message.reactions[key]) == nil {
+                            message.reactions[key] = Reaction(name: event.reaction, user: userID)
+                        } else {
+                            message.reactions[key]?.users[userID] = userID
+                        }
+                    }
+                }
+            case "file":
+                if let id = item.file?.id, file = client.files[id] {
+                    if file.reactions[key] == nil {
+                        client.files[id]?.reactions[key] = Reaction(name: event.reaction, user: userID)
+                    } else {
+                        client.files[id]?.reactions[key]?.users[userID] = userID
+                    }
+                }
+            case "file_comment":
+                if let id = item.file?.id, file = client.files[id], commentID = item.fileCommentID {
+                    if file.comments[commentID]?.reactions[key] == nil {
+                        client.files[id]?.comments[commentID]?.reactions[key] = Reaction(name: event.reaction, user: userID)
+                    } else {
+                        client.files[id]?.comments[commentID]?.reactions[key]?.users[userID] = userID
+                    }
+                }
+                break
+            default:
+                break
+            }
+            
+            if let delegate = client.reactionEventsDelegate {
+                delegate.reactionAdded(reaction: event.reaction, item: event.item, itemUser: event.itemUser)
+            }
+        }
+    }
+    
+    func removedReaction(event: Event) {
+        if let item = event.item, type = item.type, key = event.reaction, userID = event.user?.id {
+            switch type {
+            case "message":
+                if let channel = item.channel, ts = item.ts {
+                    if let message = client.channels[channel]?.messages[ts] {
+                        if (message.reactions[key]) != nil {
+                            message.reactions[key]?.users.removeValue(forKey:userID)
+                        }
+                        if (message.reactions[key]?.users.count == 0) {
+                            message.reactions.removeValue(forKey:key)
+                        }
+                    }
+                }
+            case "file":
+                if let itemFile = item.file, id = itemFile.id, file = client.files[id] {
+                    if file.reactions[key] != nil {
+                        client.files[id]?.reactions[key]?.users.removeValue(forKey:userID)
+                    }
+                    if client.files[id]?.reactions[key]?.users.count == 0 {
+                        client.files[id]?.reactions.removeValue(forKey:key)
+                    }
+                }
+            case "file_comment":
+                if let id = item.file?.id, file = client.files[id], commentID = item.fileCommentID {
+                    if file.comments[commentID]?.reactions[key] != nil {
+                        client.files[id]?.comments[commentID]?.reactions[key]?.users.removeValue(forKey:userID)
+                    }
+                    if client.files[id]?.comments[commentID]?.reactions[key]?.users.count == 0 {
+                        client.files[id]?.comments[commentID]?.reactions.removeValue(forKey:key)
+                    }
+                }
+                break
+            default:
+                break
+            }
+            
+            if let delegate = client.reactionEventsDelegate {
+                delegate.reactionAdded(reaction: event.reaction, item: event.item, itemUser: event.itemUser)
+            }
+        }
+    }
+    
+    //MARK: - Preferences
+    func changePreference(event: Event) {
+        if let name = event.name {
+            client.authenticatedUser?.preferences?[name] = event.value
+            
+            if let delegate = client.slackEventsDelegate, value = event.value {
+                delegate.preferenceChanged(preference: name, value: value)
+            }
+        }
+    }
+    
+    //Mark: - User Change
+    func userChange(event: Event) {
+        if let user = event.user, id = user.id {
+            let preferences = client.users[id]?.preferences
+            client.users[id] = user
+            client.users[id]?.preferences = preferences
+            
+            if let delegate = client.slackEventsDelegate {
+                delegate.userChanged(user: user)
+            }
+        }
+    }
+    
+    //MARK: - User Presence
+    func presenceChange(event: Event) {
+        if let user = event.user, id = user.id {
+            client.users[id]?.presence = event.presence
+            
+            if let delegate = client.slackEventsDelegate {
+                delegate.presenceChanged(user: user, presence: event.presence)
+            }
+        }
+    }
+    
+    //MARK: - Team
+    func teamJoin(event: Event) {
+        if let user = event.user, id = user.id {
+            client.users[id] = user
+            
+            if let delegate = client.teamEventsDelegate {
+                delegate.teamJoined(user: user)
+            }
+        }
+    }
+    
+    func teamPlanChange(event: Event) {
+        if let plan = event.plan {
+            client.team?.plan = plan
+            
+            if let delegate = client.teamEventsDelegate {
+                delegate.teamPlanChanged(plan: plan)
+            }
+        }
+    }
+    
+    func teamPreferenceChange(event: Event) {
+        if let name = event.name {
+            client.team?.prefs?[name] = event.value
+            
+            if let delegate = client.teamEventsDelegate, value = event.value {
+                delegate.teamPreferencesChanged(preference: name, value: value)
+            }
+        }
+    }
+    
+    func teamNameChange(event: Event) {
+        if let name = event.name {
+            client.team?.name = name
+            
+            if let delegate = client.teamEventsDelegate {
+                delegate.teamNameChanged(name: name)
+            }
+        }
+    }
+    
+    func teamDomainChange(event: Event) {
+        if let domain = event.domain {
+            client.team?.domain = domain
+            
+            if let delegate = client.teamEventsDelegate {
+                delegate.teamDomainChanged(domain: domain)
+            }
+        }
+    }
+    
+    func emailDomainChange(event: Event) {
+        if let domain = event.emailDomain {
+            client.team?.emailDomain = domain
+            
+            if let delegate = client.teamEventsDelegate {
+                delegate.teamEmailDomainChanged(domain: domain)
+            }
+        }
+    }
+    
+    func emojiChanged(event: Event) {
+        //TODO: Call emoji.list here
+        
+        if let delegate = client.teamEventsDelegate {
+            delegate.teamEmojiChanged()
+        }
+    }
+    
+    //MARK: - Bots
+    func bot(event: Event) {
+        if let bot = event.bot, id = bot.id {
+            client.bots[id] = bot
+            
+            if let delegate = client.slackEventsDelegate {
+                delegate.botEvent(bot: bot)
+            }
+        }
+    }
+    
+    //MARK: - Subteams
+    func subteam(event: Event) {
+        if let subteam = event.subteam, id = subteam.id {
+            client.userGroups[id] = subteam
+            
+            if let delegate = client.subteamEventsDelegate {
+                delegate.subteamEvent(userGroup: subteam)
+            }
+        }
+        
+    }
+    
+    func subteamAddedSelf(event: Event) {
+        if let subteamID = event.subteamID, _ = client.authenticatedUser?.userGroups {
+            client.authenticatedUser?.userGroups![subteamID] = subteamID
+            
+            if let delegate = client.subteamEventsDelegate {
+                delegate.subteamSelfAdded(subteamID: subteamID)
+            }
+        }
+    }
+    
+    func subteamRemovedSelf(event: Event) {
+        if let subteamID = event.subteamID {
+            client.authenticatedUser?.userGroups?.removeValue(forKey:subteamID)
+            
+            if let delegate = client.subteamEventsDelegate {
+                delegate.subteamSelfRemoved(subteamID: subteamID)
+            }
+        }
+    }
+    
+    //MARK: - Team Profiles
+    func teamProfileChange(event: Event) {
+        for user in client.users {
+            if let fields = event.profile?.fields {
+                for key in fields.keys {
+                    client.users[user.0]?.profile?.customProfile?.fields[key]?.updateProfileField(profile: fields[key])
+                }
+            }
+        }
+        
+        if let delegate = client.teamProfileEventsDelegate {
+            delegate.teamProfileChanged(profile: event.profile)
+        }
+    }
+    
+    func teamProfileDeleted(event: Event) {
+        for user in client.users {
+            if let id = event.profile?.fields.first?.0 {
+                client.users[user.0]?.profile?.customProfile?.fields[id] = nil
+            }
+        }
+        
+        if let delegate = client.teamProfileEventsDelegate {
+            delegate.teamProfileDeleted(profile: event.profile)
+        }
+    }
+    
+    func teamProfileReordered(event: Event) {
+        for user in client.users {
+            if let keys = event.profile?.fields.keys {
+                for key in keys {
+                    client.users[user.0]?.profile?.customProfile?.fields[key]?.ordering = event.profile?.fields[key]?.ordering
+                }
+            }
+        }
+        
+        if let delegate = client.teamProfileEventsDelegate {
+            delegate.teamProfileReordered(profile: event.profile)
+        }
+    }
+    
+    //MARK: - Authenticated User
+    func manualPresenceChange(event: Event) {
+        client.authenticatedUser?.presence = event.presence
+        
+        if let delegate = client.slackEventsDelegate {
+            delegate.manualPresenceChanged(user: client.authenticatedUser, presence: event.presence)
+        }
+    }
+    
+}

SlackKit/Sources/Extensions.swift

@@ -1,58 +0,0 @@
-//
-// Extensions.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 extension Date {
-
-    var slackTimestamp: Double {
-        return NSNumber(value: timeIntervalSince1970).doubleValue
-    }
-}
-
-internal extension String {
-    
-    var slackFormatEscaping: String {
-        var escapedString = replacingOccurrences(of: "&", with: "&")
-        escapedString = replacingOccurrences(of: "<", with: "&lt;")
-        escapedString = replacingOccurrences(of: ">", with: "&gt;")
-        return escapedString
-    }
-}
-
-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, let encodedValue = value.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlHostAllowed) {
-                requestString += "&\(key)=\(encodedValue)"
-            } else if let value = self[key] as? Int {
-                requestString += "&\(key)=\(value)"
-            }
-        }
-        
-        return requestString
-    }
-}
-

SlackKit/Sources/File.swift

@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-public struct File: Equatable {
+public struct File {
 
     public let id: String?
     public let created: Int?
@@ -44,22 +44,6 @@ public struct File: Equatable {
     public let thumb360gif: String?
     public let thumb360w: String?
     public let thumb360h: String?
-    public let thumb480: String?
-    public let thumb480gif: String?
-    public let thumb480w: String?
-    public let thumb480h: String?
-    public let thumb720: String?
-    public let thumb720gif: String?
-    public let thumb720w: String?
-    public let thumb720h: String?
-    public let thumb960: String?
-    public let thumb960gif: String?
-    public let thumb960w: String?
-    public let thumb960h: String?
-    public let thumb1024: String?
-    public let thumb1024gif: String?
-    public let thumb1024w: String?
-    public let thumb1024h: String?
     public let permalink: String?
     public let editLink: String?
     public let preview: String?
@@ -76,9 +60,9 @@ public struct File: Equatable {
     internal(set) public var isStarred: Bool?
     internal(set) public var pinnedTo: [String]?
     internal(set) public var comments = [String: Comment]()
-    internal(set) public var reactions = [Reaction]()
+    internal(set) public var reactions = [String: Reaction]()
     
-    public init(file:[String: Any]?) {
+    public init?(file:[String: Any]?) {
         id = file?["id"] as? String
         created = file?["created"] as? Int
         name = file?["name"] as? String
@@ -100,22 +84,6 @@ public struct File: Equatable {
         thumb360gif = file?["thumb_360_gif"] as? String
         thumb360w = file?["thumb_360_w"] as? String
         thumb360h = file?["thumb_360_h"] as? String
-        thumb480 = file?["thumb_480"] as? String
-        thumb480gif = file?["thumb_480_gif"] as? String
-        thumb480w = file?["thumb_480_w"] as? String
-        thumb480h = file?["thumb_480_h"] as? String
-        thumb720 = file?["thumb_720"] as? String
-        thumb720gif = file?["thumb_720_gif"] as? String
-        thumb720w = file?["thumb_720_w"] as? String
-        thumb720h = file?["thumb_720_h"] as? String
-        thumb960 = file?["thumb_960"] as? String
-        thumb960gif = file?["thumb_960_gif"] as? String
-        thumb960w = file?["thumb_960_w"] as? String
-        thumb960h = file?["thumb_960_h"] as? String
-        thumb1024 = file?["thumb_1024"] as? String
-        thumb1024gif = file?["thumb_1024_gif"] as? String
-        thumb1024w = file?["thumb_1024_w"] as? String
-        thumb1024h = file?["thumb_1024_h"] as? String
         permalink = file?["permalink"] as? String
         editLink = file?["edit_link"] as? String
         preview = file?["preview"] as? String
@@ -131,10 +99,13 @@ public struct File: Equatable {
         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: Any]])        
+        if let reactions = file?["reactions"] as? [[String: Any]] {
+            self.reactions = Reaction.reactionsFromArray(array: reactions)
+        }
+        
     }
     
-    internal init(id:String?) {
+    internal init?(id:String?) {
         self.id = id
         created = nil
         name = nil
@@ -155,22 +126,6 @@ public struct File: Equatable {
         thumb360gif = nil
         thumb360w = nil
         thumb360h = nil
-        thumb480 = nil
-        thumb480gif = nil
-        thumb480w = nil
-        thumb480h = nil
-        thumb720 = nil
-        thumb720gif = nil
-        thumb720w = nil
-        thumb720h = nil
-        thumb960 = nil
-        thumb960gif = nil
-        thumb960w = nil
-        thumb960h = nil
-        thumb1024 = nil
-        thumb1024gif = nil
-        thumb1024w = nil
-        thumb1024h = nil
         permalink = nil
         editLink = nil
         preview = nil
@@ -179,8 +134,11 @@ public struct File: Equatable {
         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

@@ -1,43 +0,0 @@
-//
-// History.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 History {
-    
-    internal(set) public var latest: Date?
-    internal(set) public var messages = [Message]()
-    public let hasMore: Bool?
-    
-    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: Any]] {
-            for message in msgs {
-                messages.append(Message(dictionary: message))
-            }
-        }
-        hasMore = history?["has_more"] as? Bool
-    }
-}

SlackKit/Sources/IncomingWebhook.swift

@@ -1,71 +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: Any]?) {
-        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, let data = try? JSONSerialization.data(withJSONObject: jsonBody(response.json), options: []) {
-            NetworkInterface().customRequest(url, data: data, success: { _ in
-                success?(true)
-            }, errorClosure: {(error) in
-                failure?(error)
-            })
-        }
-    }
-    
-    fileprivate func jsonBody(_ response: [String: Any]) -> [String: Any] {
-        var json = response
-        json["channel"] = channel
-        json["username"] = username
-        json["icon_emoji"] = iconEmoji
-        json["icon_url"] = iconURL
-        return json
-    }
-}

SlackKit/Sources/Item.swift

@@ -1,59 +0,0 @@
-//
-// Item.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 Item: Equatable {
-    
-    public let type: String?
-    public let ts: String?
-    public let channel: String?
-    public let message: Message?
-    public let file: File?
-    public let comment: Comment?
-    public let fileCommentID: String?
-    
-    internal init(item:[String: Any]?) {
-        type = item?["type"] as? String
-        ts = item?["ts"] as? String
-        channel = item?["channel"] as? String
-        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: Any] {
-            comment = Comment(comment: commentDictionary)
-        } else {
-            comment = Comment(id: item?["comment"] as? String)
-        }
-        
-        if let fileDictionary = item?["file"] as? [String: Any] {
-            file = File(file: fileDictionary)
-        } else {
-            file = File(id: item?["file"] as? String)
-        }
-        
-        fileCommentID = item?["file_comment"] as? String
-    }
-    
-    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: Equatable {
+public class Message {
     
     public let type = "message"
     public let subtype: String?
@@ -45,42 +45,38 @@ public final class Message: Equatable {
     internal(set) var pinnedTo: [String]?
     public let comment: Comment?
     public let file: File?
-    internal(set) public var reactions = [Reaction]()
+    internal(set) public var reactions = [String: Reaction]()
     internal(set) public var attachments: [Attachment]?
-    internal(set) public var responseType: ResponseType?
-    internal(set) public var replaceOriginal: Bool?
-    internal(set) public var deleteOriginal: 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
+    public init?(message: [String: Any]?) {
+        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: Any]
+        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: Any])
+        file = File(file: message?["file"] as? [String: Any])
+        reactions = messageReactions(reactions: message?["reactions"] as? [[String: Any]])
+        attachments = (message?["attachments"] as? [[String: Any]])?.objectArrayFromDictionaryArray(intializer: {(attachment) -> Attachment? in
+            return Attachment(attachment: attachment)
+        })
     }
     
-    internal init(ts:String?) {
+    internal init?(ts:String?) {
         self.ts = ts
         subtype = nil
         user = nil
@@ -95,7 +91,21 @@ public final class Message: Equatable {
         file = nil
     }
     
-    public static func ==(lhs: Message, rhs: Message) -> Bool {
-        return lhs.ts == rhs.ts && lhs.user == rhs.user && lhs.text == rhs.text
+    private func messageReactions(reactions: [[String: Any]]?) -> [String: Reaction] {
+        var returnValue = [String: Reaction]()
+        if let r = reactions {
+            for react in r {
+                if let reaction = Reaction(reaction: react), reactionName = reaction.name {
+                    returnValue[reactionName] = reaction
+                }
+            }
+        }
+        return returnValue
     }
 }
+
+extension Message: Equatable {}
+
+public func ==(lhs: Message, rhs: Message) -> Bool {
+    return lhs.ts == rhs.ts && lhs.user == rhs.user && lhs.text == rhs.text
+}

SlackKit/Sources/MessageActionRequest.swift

@@ -1,51 +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: Any]?) {
-        action = (response?["actions"] as? [[String:Any]])?.map({Action(action: $0)}).first
-        callbackID = response?["callback_id"] as? String
-        team = Team(team: response?["team"] as? [String: Any])
-        channel = Channel(channel: response?["channel"] as? [String: Any])
-        user = User(user: response?["channel"] as? [String: Any])
-        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(dictionary: response?["original_message"] as? [String: Any])
-        responseURL = response?["response_url"] as? String ?? ""
-    }
-}

SlackKit/Sources/MessageActionResponder.swift

@@ -1,39 +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,45 +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.
-
-open 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), actionRequest.token == self.token {
-                return self.request(actionRequest, reply: reply)
-            } else {
-                return .badRequest(.text("Bad request."))
-            }
-        }
-    }
-}

SlackKit/Sources/NetworkInterface.swift

@@ -22,121 +22,46 @@
 // THE SOFTWARE.
 
 import Foundation
+import HTTPSClient
+import Jay
 
 internal struct NetworkInterface {
     
     private let apiUrl = "https://slack.com/api/"
+    private let client: HTTPSClient.Client?
     
-    internal func request(_ endpoint: Endpoint, token: String? = nil, parameters: [String: Any]?, successClosure: @escaping ([String: Any])->Void, errorClosure: @escaping (SlackError)->Void) {
-        var requestString = "\(apiUrl)\(endpoint.rawValue)?"
-        if let token = token {
-            requestString += "token=\(token)"
-        }
-        if let params = parameters {
-            requestString += params.requestStringFromParameters
-        }
-        guard let url =  URL(string: requestString) else {
-            errorClosure(SlackError.ClientNetworkError)
-            return
-        }
-        let request = URLRequest(url:url)
-        
-        URLSession.shared.dataTask(with: 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: Data, success: @escaping (Bool)->Void, errorClosure: @escaping (SlackError)->Void) {
-        guard let url =  URL(string: url.removePercentEncoding()) else {
-            errorClosure(SlackError.ClientNetworkError)
-            return
-        }
-        var request = URLRequest(url:url)
-        request.httpMethod = "POST"
-        let contentType = "application/json"
-        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
-        request.httpBody = data
-        
-        URLSession.shared.dataTask(with: request) {
-            (data, response, internalError) -> Void in
-            if internalError == nil {
-                success(true)
-            } else {
-                errorClosure(SlackError.ClientNetworkError)
-            }
-        }.resume()
-    }
-    
-    internal func uploadRequest(_ token: String, data: Data, parameters: [String: Any]?, successClosure: @escaping ([String: Any])->Void, errorClosure: @escaping (SlackError)->Void) {
-        var requestString = "\(apiUrl)\(Endpoint.FilesUpload.rawValue)?token=\(token)"
-        if let params = parameters {
-            requestString = requestString + params.requestStringFromParameters
-        }
-        guard let url =  URL(string: requestString) else {
-            errorClosure(SlackError.ClientNetworkError)
-            return
-        }
-        var request = URLRequest(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"
-
-        var requestBodyData: Data = Data()
-        requestBodyData.append(boundaryStart.data(using: String.Encoding.utf8)!)
-        requestBodyData.append(contentDispositionString.data(using: String.Encoding.utf8)!)
-        requestBodyData.append(contentTypeString.data(using: String.Encoding.utf8)!)
-        requestBodyData.append(data)
-        requestBodyData.append("\r\n".data(using: String.Encoding.utf8)!)
-        requestBodyData.append(boundaryEnd.data(using: String.Encoding.utf8)!)
-        
-        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
-        request.httpBody = requestBodyData as Data
-
-        URLSession.shared.dataTask(with: 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: Data?, response:URLResponse?, internalError:Error?, successClosure: ([String: Any])->Void, errorClosure: (SlackError)->Void) {
-        guard let data = data, let response = response as? HTTPURLResponse else {
-            errorClosure(SlackError.ClientNetworkError)
-            return
-        }
+    init() {
         do {
-            guard let json = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] else {
-                errorClosure(SlackError.ClientJSONError)
-                return
-            }
+            self.client = try Client(uri: URI("https://slack.com"))
+        } catch {
+            self.client = nil
+        }
+    }
+    
+    internal func request(endpoint: SlackAPIEndpoint, token: String, parameters: [String: Any]?, successClosure: ([String: Any])->Void, errorClosure: (SlackError)->Void) {
+        var requestString = "\(apiUrl)\(endpoint.rawValue)?token=\(token)"
+        if let params = parameters {
+            requestString += requestStringFromParameters(parameters: params)
+        }
+        
+        do {
+            var response: Response?
+            response = try client?.get(requestString)
             
-            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 data = try response?.body.becomeBuffer()
+            if let data = data {
+                let json = try Jay().jsonFromData(data.bytes)
+                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 ErrorDispatcher.dispatch(error: errorString)
+                        } else {
+                            throw SlackError.UnknownError
+                        }
                     }
                 }
-            case 429:
-                throw SlackError.TooManyRequests
-            default:
-                throw SlackError.ClientNetworkError
             }
         } catch let error {
             if let slackError = error as? SlackError {
@@ -147,7 +72,120 @@ internal struct NetworkInterface {
         }
     }
     
+    internal func postRequest(endpoint: SlackAPIEndpoint, token: String, parameters: [String: Any]?, successClosure: ([String: Any])->Void, errorClosure: (SlackError)->Void) {
+        let requestString = "\(apiUrl)\(endpoint.rawValue)?token=\(token)"
+        do {
+            var response: Response?
+            let headers: Headers = ["Content-Type": "application/x-www-form-urlencoded"]
+            var body = ""
+            if let params = parameters {
+                body = requestStringFromParameters(parameters: params)
+            } else {
+                body = ""
+            }
+        
+            response = try client?.post(requestString, headers: headers, body: body)
+
+            let data = try response?.body.becomeBuffer()
+            if let data = data {
+                let json = try Jay().jsonFromData(data.bytes)
+                if let result = json as? [String: Any] {
+                    if (result["ok"] as? Bool == true) {
+                        successClosure(result)
+                    } else {
+                        if let errorString = result["error"] as? String {
+                            throw ErrorDispatcher.dispatch(error: errorString)
+                        } else {
+                            throw SlackError.UnknownError
+                        }
+                    }
+                }
+            }
+        } catch let error {
+            if let slackError = error as? SlackError {
+                errorClosure(slackError)
+            } else {
+                errorClosure(SlackError.UnknownError)
+            }
+        }
+    }
+    
+    //TODO: Currently Unsupported
+    /*internal func uploadRequest(token: String, data: NSData, parameters: [String: Any]?, successClosure: ([String: Any])->Void, errorClosure: (SlackError)->Void) {
+        var requestString = "\(apiUrl)\(SlackAPIEndpoint.FilesUpload.rawValue)?token=\(token)"
+        if let params = parameters {
+            requestString = requestString + requestStringFromParameters(parameters: params)
+        }
+        
+        let request = NSMutableURLRequest(url: NSURL(string: requestString)!)
+        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.append(boundaryStart.data(using: NSUTF8StringEncoding)!)
+        requestBodyData.append(contentDispositionString.data(using: NSUTF8StringEncoding)!)
+        requestBodyData.append(contentTypeString.data(using: NSUTF8StringEncoding)!)
+        requestBodyData.append(data)
+        requestBodyData.append("\r\n".data(using: NSUTF8StringEncoding)!)
+        requestBodyData.append(boundaryEnd.data(using: NSUTF8StringEncoding)!)
+        
+        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
+        request.httpBody = requestBodyData
+
+        NSURLSession.shared().dataTask(with: request) {
+            (data, response, internalError) -> Void in
+            guard let data = data else {
+                return
+            }
+            do {
+                let result = try NSJSONSerialization.jsonObject(with: data, options: []) as! [String: Any]
+                if (result["ok"] as! Bool == true) {
+                    successClosure(result)
+                } else {
+                    if let errorString = result["error"] as? String {
+                        throw ErrorDispatcher.dispatch(error: errorString)
+                    } else {
+                        throw SlackError.UnknownError
+                    }
+                }
+            } catch let error {
+                if let slackError = error as? SlackError {
+                    errorClosure(slackError)
+                } else {
+                    errorClosure(SlackError.UnknownError)
+                }
+            }
+            }.resume()
+    }
+    
     private func randomBoundary() -> String {
         return String(format: "slackkit.boundary.%08x%08x", arc4random(), arc4random())
+    }*/
+    
+    private func requestStringFromParameters(parameters: [String: Any]) -> String {
+        var requestString = ""
+        for key in parameters.keys {
+            if let value = parameters[key] as? String {
+                #if os(Linux)
+                    if let encodedValue = value.stringByAddingPercentEncodingWithAllowedCharacters(NSCharacterSet.URLQueryAllowedCharacterSet()) {
+                        requestString += "&\(key)=\(encodedValue)"
+                    }
+                #else
+                    if let encodedValue = value.addingPercentEncoding(withAllowedCharacters: NSCharacterSet.urlQueryAllowed()) {
+                        requestString += "&\(key)=\(encodedValue)"
+                    }
+                #endif
+            } else if let value = parameters[key] as? Int {
+                requestString += "&\(key)=\(value)"
+            }
+        }
+        
+        return requestString
     }
+    
 }

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: Any]?) {
-        accessToken = response?["access_token"] as? String
-        scope = (response?["scope"] as? String)?.components(separatedBy: ",").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: Any])
-        bot = Bot(botUser: response?["bot"] as? [String: Any])
-    }
-    
-}

SlackKit/Sources/OAuthServer.swift

@@ -1,94 +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 {
-    func userAuthed(_ response: OAuthResponse)
-}
-
-public struct OAuthServer {
-    
-    fileprivate let oauthURL = "https://slack.com/oauth/authorize"
-
-    fileprivate let http = HttpServer()
-    fileprivate let clientID: String
-    fileprivate let clientSecret: String
-    fileprivate let state: String?
-    fileprivate let redirectURI: String?
-    fileprivate var delegate: OAuthDelegate?
-    
-    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()
-    }
-    
-    fileprivate func oauthRoute() {
-        http["/oauth"] = { request in
-            guard let response = AuthorizeResponse(queryParameters: request.queryParams), response.state == self.state else {
-                return .badRequest(.text("Bad request."))
-            }
-            WebAPI.oauthAccess(self.clientID, clientSecret: self.clientSecret, code: response.code, redirectURI: self.redirectURI, success: {(response) in
-                self.delegate?.userAuthed(OAuthResponse(response: response))
-            }, failure: {(error) in
-                print("Authorization failed")
-            })
-            if let redirect = self.redirectURI {
-                return .movedPermanently(redirect)
-            }
-            return .ok(.text("Authentication successful."))
-        }
-    }
-    
-    fileprivate func oauthURLRequest(_ authorize: AuthorizeRequest) -> URLRequest? {
-        var requestString = "\(oauthURL)?client_id=\(authorize.clientID)"
-        requestString += authorize.parameters.requestStringFromParameters
-        guard let url = URL(string: requestString) else {
-            return nil
-        }
-        return URLRequest(url:url)
-    }
-    
-    public func authorizeRequest(_ scope:[Scope], redirectURI: String, state: String = "slackkit", team: String? = nil) -> URLRequest? {
-        let request = AuthorizeRequest(clientID: clientID, scope: scope, redirectURI: redirectURI, state: state, team: team)
-        return oauthURLRequest(request)
-    }
-}

SlackKit/Sources/Reaction.swift

@@ -1,55 +0,0 @@
-//
-// Reaction.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 Reaction: Equatable {
-    
-    public let name: String?
-    internal(set) public var user: String?
-    
-    internal init(reaction:[String: Any]?) {
-        name = reaction?["name"] as? String
-    }
-    
-    internal init(name: String, user: String) {
-        self.name = name
-        self.user = user
-    }
-    
-    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], let name = reaction["name"] as? String {
-                    for user in users {
-                        reactions.append(Reaction(name: name, user: user))
-                    }
-                }
-            }
-        }
-        return reactions
-    }
-    
-    public static func ==(lhs: Reaction, rhs: Reaction) -> Bool {
-        return lhs.name == rhs.name
-    }
-}

SlackKit/Sources/Response.swift

@@ -1,43 +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 var json: [String: Any] {
-        var json = [String : Any]()
-        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,90 +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 }
-}
-
-open class Server {
-    
-    internal let http = HttpServer()
-    internal let token: String
-    
-    internal init(token: String) {
-        self.token = token
-    }
-    
-    open 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)")
-        }
-    }
-    
-    open 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: Any]? {
-        let string = String(data: Data(bytes: UnsafePointer<UInt8>(body), count: body.count), encoding: String.Encoding.utf8)
-        if let body = string?.components(separatedBy: "&") {
-            var dict: [String: Any] = [:]
-            for argument in body {
-                let kv = argument.components(separatedBy: "=")
-                if let key = kv.first, let value = kv.last {
-                    dict[key] = value as Any?
-                }
-            }
-            return dict
-        }
-        return nil
-    }
-    
-    internal func jsonFromRequest(_ string: String) -> [String: Any]? {
-        guard let data = string.data(using: String.Encoding.utf8) else {
-            return nil
-        }
-        return (try? JSONSerialization.jsonObject(with: data, options: [])) as? [String: Any] ?? nil
-    }
-}

SlackKit/Sources/SlackError.swift

@@ -1,122 +0,0 @@
-//
-// SlackError.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 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
-    // HTTP
-    case TooManyRequests
-    case UnknownHTTPError
-}

SlackKit/Sources/SlackKit.swift

@@ -1,66 +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] = [:]
-    fileprivate 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)
-        DispatchQueue.main.async(execute: {
-            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,726 @@
+//
+// 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 Jay
+
+internal enum SlackAPIEndpoint: 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 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 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 client: SlackClient
+    
+    required public init(slackClient: SlackClient) {
+        self.client = slackClient
+    }
+    
+    //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]
+        client.api.request(endpoint: .RTMStart, token: client.token, parameters: filterNilParameters(parameters: parameters), successClosure: {
+                (response) -> Void in
+                success?(response: response)
+            }) {(error) -> Void in
+                failure?(error: error)
+            }
+    }
+    
+    //MARK: - Auth Test
+    public func authenticationTest(success: ((authenticated: Bool)->Void)?, failure: FailureClosure?) {
+        client.api.request(endpoint: .AuthTest, token: client.token, parameters: nil, successClosure: {
+            (response) -> Void in
+                success?(authenticated: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Channels
+    public func channelHistory(id: String, latest: String = "\(Time.slackTimestamp())", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((history: History?)->Void)?, failure: FailureClosure?) {
+        history(endpoint: .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(endpoint: .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: [Any]?)->Void)?, failure: FailureClosure?) {
+        list(endpoint: .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(endpoint: .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(endpoint: .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(endpoint: .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: Any] = ["channel": channel, "ts": ts]
+        client.api.request(endpoint: .ChatDelete, token: client.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: 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: attachments), "icon_url":iconURL, "icon_emoji":iconEmoji]
+        client.api.postRequest(endpoint: .ChatPostMessage, token: client.token, parameters: filterNilParameters(parameters: 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: Any?] = ["channel": channel, "ts": ts, "text": message.slackFormatEscaping(), "parse": parse.rawValue, "link_names": linkNames, "attachments":encodeAttachments(attachments: attachments)]
+        client.api.postRequest(endpoint: .ChatUpdate, token: client.token, parameters: filterNilParameters(parameters: 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: Any?] = ["user": user]
+        client.api.request(endpoint: .DNDInfo, token: client.token, parameters: filterNilParameters(parameters: 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: Any?] = ["users":users?.joined(separator: ",")]
+        client.api.request(endpoint: .DNDTeamInfo, token: client.token, parameters: filterNilParameters(parameters: parameters), successClosure: {
+            (response) -> Void in
+                success?(statuses: self.enumerateDNDStauses(statuses: response["users"] as? [String: Any]))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Emoji
+    public func emojiList(success: ((emojiList: [String: Any]?)->Void)?, failure: FailureClosure?) {
+        client.api.request(endpoint: .EmojiList, token: client.token, parameters: nil, successClosure: {
+            (response) -> Void in
+                success?(emojiList: response["emoji"] as? [String: Any])
+            }) { (error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Files
+    public func deleteFile(fileID: String, success: ((deleted: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: Any] = ["file":fileID]
+        client.api.request(endpoint: .FilesDelete, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(deleted: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //TODO: Currently Unsupported
+    /*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: Any?] = ["file":file, "filename": filename, "filetype":filetype, "title":title, "initial_comment":initialComment, "channels":channels?.joined(separator: ",")]
+        client.api.uploadRequest(token: client.token, data: file, parameters: filterNilParameters(parameters: parameters), successClosure: {
+            (response) -> Void in
+                success?(file: File(file: response["file"] as? [String: Any]))
+            }) {(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: Any] = ["file":fileID, "comment":comment.slackFormatEscaping()]
+        client.api.request(endpoint: .FilesCommentsAdd, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(comment: Comment(comment: response["comment"] as? [String: Any]))
+            }) {(error) -> Void in
+                failure?(error: 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()]
+        client.api.request(endpoint: .FilesCommentsEdit, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+            success?(comment: Comment(comment: response["comment"] as? [String: Any]))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func deleteFileComment(fileID: String, commentID: String, success: ((deleted: Bool?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: Any] = ["file":fileID, "id": commentID]
+        client.api.request(endpoint: .FilesCommentsDelete, token: client.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(endpoint: .GroupsClose, channelID: groupID, success: {
+            (closed) -> Void in
+                success?(closed:closed)
+            }) {(error) -> Void in
+                failure?(error:error)
+        }
+    }
+    
+    public func groupHistory(id: String, latest: String = "\(Time.slackTimestamp())", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((history: History?)->Void)?, failure: FailureClosure?) {
+        history(endpoint: .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(endpoint: .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: [Any]?)->Void)?, failure: FailureClosure?) {
+        list(endpoint: .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(endpoint: .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: [String: Any] = ["channel":channel]
+        client.api.request(endpoint: .GroupsOpen, token: client.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(endpoint: .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(endpoint: .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(endpoint: .IMClose, channelID: channel, success: {
+            (closed) -> Void in
+                success?(closed: closed)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func imHistory(id: String, latest: String = "\(Time.slackTimestamp())", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((history: History?)->Void)?, failure: FailureClosure?) {
+        history(endpoint: .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: [Any]?)->Void)?, failure: FailureClosure?) {
+        list(endpoint: .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(endpoint: .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: [String: Any] = ["user":userID]
+        client.api.request(endpoint: .IMOpen, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                let group = response["channel"] as? [String: Any]
+                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(endpoint: .MPIMClose, channelID: channel, success: {
+            (closed) -> Void in
+                success?(closed: closed)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func mpimHistory(id: String, latest: String = "\(Time.slackTimestamp())", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((history: History?)->Void)?, failure: FailureClosure?) {
+        history(endpoint: .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: [Any]?)->Void)?, failure: FailureClosure?) {
+        list(endpoint: .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(endpoint: .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: [String: Any] = ["users":userIDs.joined(separator: ",")]
+        client.api.request(endpoint: .MPIMOpen, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                let group = response["group"] as? [String: Any]
+                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(endpoint: .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(endpoint: .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: SlackAPIEndpoint, 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]
+        client.api.request(endpoint: endpoint, token: client.token, parameters: filterNilParameters(parameters: 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(endpoint: .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(endpoint: .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: SlackAPIEndpoint, 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]
+        client.api.request(endpoint: endpoint, token: client.token, parameters: filterNilParameters(parameters: 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(endpoint: .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(endpoint: .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: SlackAPIEndpoint, 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]
+        client.api.request(endpoint: endpoint, token: client.token, parameters: filterNilParameters(parameters: parameters), successClosure: {
+            (response) -> Void in
+                success?(ok: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+
+    
+    //MARK: - Team
+    public func teamInfo(success: ((info: [String: Any]?)->Void)?, failure: FailureClosure?) {
+        client.api.request(endpoint: .TeamInfo, token: client.token, parameters: nil, successClosure: {
+            (response) -> Void in
+                success?(info: response["team"] as? [String: Any])
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Users
+    public func userPresence(user: String, success: ((presence: String?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: Any] = ["user":user]
+        client.api.request(endpoint: .UsersGetPresence, token: client.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: Any] = ["user":id]
+        client.api.request(endpoint: .UsersInfo, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(user: User(user: response["user"] as? [String: Any]))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func usersList(includePresence: Bool = false, success: ((userList: [String: Any]?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: Any] = ["presence":includePresence]
+        client.api.request(endpoint: .UsersList, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(userList: response["members"] as? [String: Any])
+            }){(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func setUserActive(success: ((success: Bool)->Void)?, failure: FailureClosure?) {
+        client.api.request(endpoint: .UsersSetActive, token: client.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: Any] = ["presence":presence.rawValue]
+        client.api.request(endpoint: .UsersSetPresence, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(success:true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Channel Utilities
+    private func close(endpoint: SlackAPIEndpoint, channelID: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: Any] = ["channel":channelID]
+        client.api.request(endpoint: endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(closed: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func history(endpoint: SlackAPIEndpoint, id: String, latest: String = "\(Time.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]
+        client.api.request(endpoint: endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(history: History(history: response))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func info(endpoint: SlackAPIEndpoint, type: ChannelType, id: String, success: ((channel: Channel?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: Any] = ["channel": id]
+        client.api.request(endpoint: endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(channel: Channel(channel: response[type.rawValue] as? [String: Any]))
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func list(endpoint: SlackAPIEndpoint, type: ChannelType, excludeArchived: Bool = false, success: ((channels: [Any]?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: Any] = ["exclude_archived": excludeArchived]
+        client.api.request(endpoint: endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(channels: response[type.rawValue+"s"] as? [Any])
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func mark(endpoint: SlackAPIEndpoint, channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: Any] = ["channel": channel, "ts": timestamp]
+        client.api.request(endpoint: endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(ts: timestamp)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func setInfo(endpoint: SlackAPIEndpoint, type: InfoType, channel: String, text: String, success: ((success: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: Any] = ["channel": channel, type.rawValue: text]
+        client.api.request(endpoint: endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(success: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+
+    //MARK: - Filter Nil Parameters
+    private func filterNilParameters(parameters: [String: Any?]) -> [String: Any] {
+        var finalParameters = [String: Any]()
+        for key in parameters.keys {
+            if parameters[key] != nil {
+                finalParameters[key] = parameters[key]!
+            }
+        }
+        return finalParameters
+    }
+    
+    //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 string = try Jay().dataFromJson(attachmentArray).string()
+                return string
+            } catch _ {
+                
+            }
+        }
+        return nil
+    }
+    
+    //MARK: - Enumerate Do Not Distrub Status
+    private func enumerateDNDStauses(statuses: [String: Any]?) -> [String: DoNotDisturbStatus] {
+        var retVal = [String: DoNotDisturbStatus]()
+        if let keys = statuses?.keys {
+            for key in keys {
+                retVal[key] = DoNotDisturbStatus(status: statuses?[key] as? [String: Any])
+            }
+        }
+        return retVal
+    }
+    
+}

SlackKit/Sources/SlackWebAPIErrorDispatcher.swift

@@ -0,0 +1,288 @@
+//
+// SlackWebAPIErrorHandling.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 SlackError: ErrorProtocol {
+    case AccountInactive
+    case AlreadyArchived
+    case AlreadyInChannel
+    case AlreadyPinned
+    case AlreadyReacted
+    case AlreadyStarred
+    case BadClientSecret
+    case BadRedirectURI
+    case BadTimeStamp
+    case CantArchiveGeneral
+    case CantDelete
+    case CantDeleteFile
+    case CantDeleteMessage
+    case CantInvite
+    case CantInviteSelf
+    case CantKickFromGeneral
+    case CantKickFromLastChannel
+    case CantKickSelf
+    case CantLeaveGeneral
+    case CantLeaveLastChannel
+    case CantUpdateMessage
+    case ChannelNotFound
+    case ComplianceExportsPreventDeletion
+    case EditWindowClosed
+    case FileCommentNotFound
+    case FileDeleted
+    case FileNotFound
+    case FileNotShared
+    case GroupContainsOthers
+    case InvalidArrayArg
+    case InvalidAuth
+    case InvalidChannel
+    case InvalidCharSet
+    case InvalidClientID
+    case InvalidCode
+    case InvalidFormData
+    case InvalidName
+    case InvalidPostType
+    case InvalidPresence
+    case InvalidTS
+    case InvalidTSLatest
+    case InvalidTSOldest
+    case IsArchived
+    case LastMember
+    case LastRAChannel
+    case MessageNotFound
+    case MessageTooLong
+    case MigrationInProgress
+    case MissingDuration
+    case MissingPostType
+    case NameTaken
+    case NoChannel
+    case NoComment
+    case NoItemSpecified
+    case NoReaction
+    case NoText
+    case NotArchived
+    case NotAuthed
+    case NotEnoughUsers
+    case NotInChannel
+    case NotInGroup
+    case NotPinned
+    case NotStarred
+    case OverPaginationLimit
+    case PaidOnly
+    case PermissionDenied
+    case PostingToGeneralChannelDenied
+    case RateLimited
+    case RequestTimeout
+    case RestrictedAction
+    case SnoozeEndFailed
+    case SnoozeFailed
+    case SnoozeNotActive
+    case TooLong
+    case TooManyEmoji
+    case TooManyReactions
+    case TooManyUsers
+    case UnknownError
+    case UnknownType
+    case UserDisabled
+    case UserDoesNotOwnChannel
+    case UserIsBot
+    case UserIsRestricted
+    case UserIsUltraRestricted
+    case UserListNotSupplied
+    case UserNotFound
+    case UserNotVisible
+}
+
+internal struct ErrorDispatcher {
+    
+    static func dispatch(error: String) -> SlackError {
+        switch error {
+        case "account_inactive":
+            return .AccountInactive
+        case "already_in_channel":
+            return .AlreadyInChannel
+        case "already_pinned":
+            return .AlreadyPinned
+        case "already_reacted":
+            return .AlreadyReacted
+        case "already_starred":
+            return .AlreadyStarred
+        case "bad_client_secret":
+            return .BadClientSecret
+        case "bad_redirect_uri":
+            return .BadRedirectURI
+        case "bad_timestamp":
+            return .BadTimeStamp
+        case "cant_delete":
+            return .CantDelete
+        case "cant_delete_file":
+            return .CantDeleteFile
+        case "cant_delete_message":
+            return .CantDeleteMessage
+        case "cant_invite":
+            return .CantInvite
+        case "cant_invite_self":
+            return .CantInviteSelf
+        case "cant_kick_from_general":
+            return .CantKickFromGeneral
+        case "cant_kick_from_last_channel":
+            return .CantKickFromLastChannel
+        case "cant_kick_self":
+            return .CantKickSelf
+        case "cant_leave_general":
+            return .CantLeaveGeneral
+        case "cant_leave_last_channel":
+            return .CantLeaveLastChannel
+        case "cant_update_message":
+            return .CantUpdateMessage
+        case "compliance_exports_prevent_deletion":
+            return .ComplianceExportsPreventDeletion
+        case "channel_not_found":
+            return .ChannelNotFound
+        case "edit_window_closed":
+            return .EditWindowClosed
+        case "file_comment_not_found":
+            return .FileCommentNotFound
+        case "file_deleted":
+            return .FileDeleted
+        case "file_not_found":
+            return .FileNotFound
+        case "file_not_shared":
+            return .FileNotShared
+        case "group_contains_others":
+            return .GroupContainsOthers
+        case "invalid_array_arg":
+            return .InvalidArrayArg
+        case "invalid_auth":
+            return .InvalidAuth
+        case "invalid_channel":
+            return .InvalidChannel
+        case "invalid_charset":
+            return .InvalidCharSet
+        case "invalid_client_id":
+            return .InvalidClientID
+        case "invalid_code":
+            return .InvalidCode
+        case "invalid_form_data":
+            return .InvalidFormData
+        case "invalid_name":
+            return .InvalidName
+        case "invalid_post_type":
+            return .InvalidPostType
+        case "invalid_presence":
+            return .InvalidPresence
+        case "invalid_timestamp":
+            return .InvalidTS
+        case "invalid_ts_latest":
+            return .InvalidTSLatest
+        case "invalid_ts_oldest":
+            return .InvalidTSOldest
+        case "is_archived":
+            return .IsArchived
+        case "last_member":
+            return .LastMember
+        case "last_ra_channel":
+            return .LastRAChannel
+        case "message_not_found":
+            return .MessageNotFound
+        case "msg_too_long":
+            return .MessageTooLong
+        case "migration_in_progress":
+            return .MigrationInProgress
+        case "missing_duration":
+            return .MissingDuration
+        case "missing_post_type":
+            return .MissingPostType
+        case "name_taken":
+            return .NameTaken
+        case "no_channel":
+            return .NoChannel
+        case "no_comment":
+            return .NoComment
+        case "no_reaction":
+            return .NoReaction
+        case "no_item_specified":
+            return .NoItemSpecified
+        case "no_text":
+            return .NoText
+        case "not_archived":
+            return .NotArchived
+        case "not_authed":
+            return .NotAuthed
+        case "not_enough_users":
+            return .NotEnoughUsers
+        case "not_in_channel":
+            return .NotInChannel
+        case "not_in_group":
+            return .NotInGroup
+        case "not_pinned":
+            return .NotPinned
+        case "not_starred":
+            return .NotStarred
+        case "over_pagination_limit":
+            return .OverPaginationLimit
+        case "paid_only":
+            return .PaidOnly
+        case "perimssion_denied":
+            return .PermissionDenied
+        case "posting_to_general_channel_denied":
+            return .PostingToGeneralChannelDenied
+        case "rate_limited":
+            return .RateLimited
+        case "request_timeout":
+            return .RequestTimeout
+        case "snooze_end_failed":
+            return .SnoozeEndFailed
+        case "snooze_failed":
+            return .SnoozeFailed
+        case "snooze_not_active":
+            return .SnoozeNotActive
+        case "too_long":
+            return .TooLong
+        case "too_many_emoji":
+            return .TooManyEmoji
+        case "too_many_reactions":
+            return .TooManyReactions
+        case "too_many_users":
+            return .TooManyUsers
+        case "unknown_type":
+            return .UnknownType
+        case "user_disabled":
+            return .UserDisabled
+        case "user_does_not_own_channel":
+            return .UserDoesNotOwnChannel
+        case "user_is_bot":
+            return .UserIsBot
+        case "user_is_restricted":
+            return .UserIsRestricted
+        case "user_is_ultra_restricted":
+            return .UserIsUltraRestricted
+        case "user_list_not_supplied":
+            return .UserListNotSupplied
+        case "user_not_found":
+            return .UserNotFound
+        case "user_not_visible":
+            return .UserNotVisible
+        default:
+            return .UnknownError
+        }
+    }
+}

SlackKit/Sources/Team.swift

@@ -23,7 +23,7 @@
 
 public struct Team {
     
-    public let id: String?
+    public let id: String
     internal(set) public var name: String?
     internal(set) public var domain: String?
     internal(set) public var emailDomain: String?
@@ -33,8 +33,8 @@ public struct Team {
     internal(set) public var plan: String?
     internal(set) public var icon: TeamIcon?
     
-    internal init(team: [String: Any]?) {
-        id = team?["id"] as? String
+    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
@@ -45,3 +45,26 @@ public struct Team {
         icon = TeamIcon(icon: team?["icon"] as? [String: Any])
     }
 }
+
+public struct TeamIcon {
+    internal(set) public var image34: String?
+    internal(set) public var image44: String?
+    internal(set) public var image68: String?
+    internal(set) public var image88: String?
+    internal(set) public var image102: String?
+    internal(set) public var image132: String?
+    internal(set) public var imageOriginal: String?
+    internal(set) public var imageDefault: Bool?
+    
+    internal init?(icon: [String: Any]?) {
+        image34 = icon?["image_34"] as? String
+        image44 = icon?["image_44"] as? String
+        image68 = icon?["image_68"] as? String
+        image88 = icon?["image_88"] as? String
+        image102 = icon?["image_102"] as? String
+        image132 = icon?["image_132"] as? String
+        imageOriginal = icon?["image_original"] as? String
+        imageDefault = icon?["image_default"] as? Bool
+    }
+}
+

SlackKit/Sources/TeamIcon.swift

@@ -1,45 +0,0 @@
-//
-// TeamIcon.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 TeamIcon {
-    
-    internal(set) public var image34: String?
-    internal(set) public var image44: String?
-    internal(set) public var image68: String?
-    internal(set) public var image88: String?
-    internal(set) public var image102: String?
-    internal(set) public var image132: String?
-    internal(set) public var imageOriginal: String?
-    internal(set) public var imageDefault: Bool?
-    
-    internal init(icon: [String: Any]?) {
-        image34 = icon?["image_34"] as? String
-        image44 = icon?["image_44"] as? String
-        image68 = icon?["image_68"] as? String
-        image88 = icon?["image_88"] as? String
-        image102 = icon?["image_102"] as? String
-        image132 = icon?["image_132"] as? String
-        imageOriginal = icon?["image_original"] as? String
-        imageDefault = icon?["image_default"] as? Bool
-    }
-}

SlackKit/Sources/Topic.swift

@@ -1,35 +0,0 @@
-//
-// Topic.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 Topic {
-    
-    public let value: String?
-    public let creator: String?
-    public let lastSet: Int?
-    
-    internal init(topic: [String: Any]?) {
-        value = topic?["value"] as? String
-        creator = topic?["creator"] as? String
-        lastSet = topic?["last_set"] as? Int
-    }
-}

SlackKit/Sources/Types.swift

@@ -0,0 +1,272 @@
+//
+// Types.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.
+
+
+// MARK: - Edited
+public struct Edited {
+    public let user: String?
+    public let ts: String?
+    
+    internal init?(edited:[String: Any]?) {
+        user = edited?["user"] as? String
+        ts = edited?["ts"] as? String
+    }
+}
+
+// MARK: - History
+public struct History {
+    internal(set) public var latest: Double?
+    internal(set) public var messages = [Message]()
+    public let hasMore: Bool?
+    
+    internal init?(history: [String: Any]?) {
+        if let latestStr = history?["latest"] as? String, latestDouble = Double(latestStr) {
+            latest = latestDouble
+        }
+        if let msgs = history?["messages"] as? [Any] {
+            for message in msgs {
+                if let message = Message(message: message as? [String: Any]) {
+                    messages.append(message)
+                }
+            }
+        }
+        hasMore = history?["has_more"] as? Bool
+    }
+}
+
+// MARK: - Reaction
+public struct Reaction {
+    public let name: String?
+    internal(set) public var users = [String: String]()
+    
+    internal init?(reaction:[String: Any]?) {
+        name = reaction?["name"] as? String
+    }
+    
+    internal init?(name: String?, user: String) {
+        self.name = name
+        users[user] = user
+    }
+    
+    internal init?(name: String?, users: [String: String]) {
+        self.name = name
+        self.users = users
+    }
+    
+    static func reactionsFromArray(array: [[String: Any]]) -> [String: Reaction] {
+        var reactions = [String: Reaction]()
+        var userDictionary = [String: String]()
+        for reaction in array {
+            if let users = reaction["users"] as? [String] {
+                for user in users {
+                    userDictionary[user] = user
+                }
+            }
+            if let name = reaction["name"] as? String {
+                reactions[name] = Reaction(name: name, users: userDictionary)
+            }
+        }
+        return reactions
+    }
+    
+}
+
+extension Reaction: Equatable {}
+
+public func ==(lhs: Reaction, rhs: Reaction) -> Bool {
+    return lhs.name == rhs.name
+}
+
+// MARK: - Comment
+public struct Comment {
+    public let id: String?
+    public let user: String?
+    internal(set) public var created: Int?
+    internal(set) public var comment: String?
+    internal(set) public var starred: Bool?
+    internal(set) public var stars: Int?
+    internal(set) public var reactions = [String: Reaction]()
+    
+    internal init?(comment:[String: Any]?) {
+        id = comment?["id"] as? String
+        created = comment?["created"] as? Int
+        user = comment?["user"] as? String
+        starred = comment?["is_starred"] as? Bool
+        stars = comment?["num_stars"] as? Int
+        self.comment = comment?["comment"] as? String
+    }
+    
+    internal init?(id: String?) {
+        self.id = id
+        self.user = nil
+    }
+}
+
+extension Comment: Equatable {}
+
+public func ==(lhs: Comment, rhs: Comment) -> Bool {
+    return lhs.id == rhs.id
+}
+
+// MARK: - Item
+public struct Item {
+    public let type: String?
+    public let ts: String?
+    public let channel: String?
+    public let message: Message?
+    public let file: File?
+    public let comment: Comment?
+    public let fileCommentID: String?
+    
+    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: Any])
+        
+        // Comment and File can come across as Strings or Dictionaries
+        if (Comment(comment: item?["comment"] as? [String: Any])?.id == nil) {
+            comment = Comment(id: item?["comment"] as? String)
+        } else {
+            comment = Comment(comment: item?["comment"] as? [String: Any])
+        }
+        if (File(file: item?["file"] as? [String: Any])?.id == nil) {
+            file = File(id: item?["file"] as? String)
+        } else {
+            file = File(file: item?["file"] as? [String: Any])
+        }
+        
+        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
+}
+
+// MARK: - Topic
+public struct Topic {
+    public let value: String?
+    public let creator: String?
+    public let lastSet: Int?
+    
+    internal init?(topic: [String: Any]?) {
+        value = topic?["value"] as? String
+        creator = topic?["creator"] as? String
+        lastSet = topic?["last_set"] as? Int
+    }
+}
+
+// MARK: - Do Not Disturb Status
+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: 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
+    }
+    
+}
+
+// MARK - Custom Team Profile
+public struct CustomProfile {
+    internal(set) public var fields = [String: CustomProfileField]()
+    
+    internal init?(profile: [String: Any]?) {
+        if let eventFields = profile?["fields"] as? [Any] {
+            for field in eventFields {
+                if let cpf = CustomProfileField(field: field as? [String: Any]), id = cpf.id {
+                    fields[id] = cpf
+                } else {
+                    if let cpf = CustomProfileField(id: field as? String), id = cpf.id {
+                        fields[id] = cpf
+                    }
+                }
+            }
+        }
+    }
+    
+    internal init?(customFields: [String: Any]?) {
+        if let customFields = customFields {
+            for key in customFields.keys {
+                if let cpf = CustomProfileField(field: customFields[key] as? [String: Any]) {
+                    self.fields[key] = cpf
+                }
+            }
+        }
+    }
+    
+}
+
+public struct CustomProfileField {
+    internal(set) public var id: String?
+    internal(set) public var alt: String?
+    internal(set) public var value: String?
+    internal(set) public var hidden: Bool?
+    internal(set) public var hint: String?
+    internal(set) public var label: String?
+    internal(set) public var options: String?
+    internal(set) public var ordering: Int?
+    internal(set) public var possibleValues: [String]?
+    internal(set) public var type: String?
+    
+    internal init?(field: [String: Any]?) {
+        id = field?["id"] as? String
+        alt = field?["alt"] as? String
+        value = field?["value"] as? String
+        hidden = field?["is_hidden"] as? Bool
+        hint = field?["hint"] as? String
+        label = field?["label"] as? String
+        options = field?["options"] as? String
+        ordering = field?["ordering"] as? Int
+        possibleValues = field?["possible_values"] as? [String]
+        type = field?["type"] as? String
+    }
+    
+    internal init?(id: String?) {
+        self.id = id
+    }
+    
+    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
+        hidden = profile?.hidden != nil ? profile?.hidden : hidden
+        hint = profile?.hint != nil ? profile?.hint : hint
+        label = profile?.label != nil ? profile?.label : label
+        options = profile?.options != nil ? profile?.options : options
+        ordering = profile?.ordering != nil ? profile?.ordering : ordering
+        possibleValues = profile?.possibleValues != nil ? profile?.possibleValues : possibleValues
+        type = profile?.type != nil ? profile?.type : type
+    }
+}

SlackKit/Sources/User.swift

@@ -24,7 +24,6 @@
 public struct User {
     
     public struct Profile {
-        
         internal(set) public var firstName: String?
         internal(set) public var lastName: String?
         internal(set) public var realName: String?
@@ -38,7 +37,7 @@ public struct User {
         internal(set) public var image192: String?
         internal(set) public var customProfile: CustomProfile?
         
-        internal init(profile: [String: Any]?) {
+        internal init?(profile: [String: Any]?) {
             firstName = profile?["first_name"] as? String
             lastName = profile?["last_name"] as? String
             realName = profile?["real_name"] as? String
@@ -54,6 +53,7 @@ public struct User {
         }
     }
     
+    
     public let id: String?
     internal(set) public var name: String?
     internal(set) public var deleted: Bool?
@@ -77,7 +77,7 @@ public struct User {
     // Client properties
     internal(set) public var userGroups: [String: String]?
     
-    internal init(user: [String: Any]?) {
+    internal init?(user: [String: Any]?) {
         id = user?["id"] as? String
         name = user?["name"] as? String
         deleted = user?["deleted"] as? Bool
@@ -99,8 +99,8 @@ public struct User {
         preferences = user?["prefs"] as? [String: Any]
     }
     
-    internal init(id: String?) {
+    internal init?(id: String?) {
         self.id = id
         self.isBot = nil
     }
-}
+}

SlackKit/Sources/UserGroup.swift

@@ -21,9 +21,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+
 public struct UserGroup {
     
     public let id: String?
+    
     internal(set) public var teamID: String?
     public let isUserGroup: Bool?
     internal(set) public var name: String?
@@ -41,7 +43,7 @@ public struct UserGroup {
     internal(set) public var users: [String]?
     internal(set) public var userCount: Int?
     
-    internal init(userGroup: [String: Any]?) {
+    internal init?(userGroup: [String: Any]?) {
         id = userGroup?["id"] as? String
         teamID = userGroup?["team_id"] as? String
         isUserGroup = userGroup?["is_usergroup"] as? Bool
@@ -62,4 +64,5 @@ public struct UserGroup {
             userCount = Int(count)
         }
     }
+    
 }

SlackKit/Sources/WebAPI.swift

@@ -1,769 +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"
-    }
-    
-    fileprivate enum ChannelType: String {
-        case Channel = "channel"
-        case Group = "group"
-        case IM = "im"
-    }
-    
-    fileprivate let networkInterface: NetworkInterface
-    fileprivate 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: WebAPI.filterNilParameters(parameters), successClosure: {
-                (response) -> Void in
-                success?(response)
-            }) {(error) -> Void in
-                failure?(error)
-            }
-    }
-    
-    //MARK: - Auth
-    public func authenticationTest(_ success: ((_ authenticated: Bool)->Void)?, failure: FailureClosure?) {
-        networkInterface.request(.AuthTest, token: token, parameters: nil, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public static func oauthAccess(_ clientID: String, clientSecret: String, code: String, redirectURI: String? = nil, success: ((_ response: [String: Any])->Void)?, failure: ((SlackError)->Void)?) {
-        let parameters: [String: Any?] = ["client_id": clientID, "client_secret": clientSecret, "code": code, "redirect_uri": redirectURI]
-        NetworkInterface().request(.OAuthAccess, parameters: filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-            success?(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: Any?] = ["token": token, "test": test]
-        NetworkInterface().request(.AuthRevoke, parameters: filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-            success?(true)
-        }) {(error) -> Void in
-            failure?(error)
-        }
-    }
-    
-    //MARK: - Channels
-    public func channelHistory(_ id: String, latest: String = "\(Date().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((_ history: History)->Void)?, failure: FailureClosure?) {
-        history(.ChannelsHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {
-            (history) -> Void in
-                success?(history)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func channelInfo(_ id: String, success: ((_ channel: Channel)->Void)?, failure: FailureClosure?) {
-        info(.ChannelsInfo, type:ChannelType.Channel, id: id, success: {
-            (channel) -> Void in
-                success?(channel)
-            }) { (error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func channelsList(_ excludeArchived: Bool = false, success: ((_ channels: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
-        list(.ChannelsList, type:ChannelType.Channel, excludeArchived: excludeArchived, success: {
-            (channels) -> Void in
-                success?(channels)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func markChannel(_ channel: String, timestamp: String, success: ((_ ts: String)->Void)?, failure: FailureClosure?) {
-        mark(.ChannelsMark, channel: channel, timestamp: timestamp, success: {
-            (ts) -> Void in
-                success?(timestamp)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func setChannelPurpose(_ channel: String, purpose: String, success: ((_ purposeSet: Bool)->Void)?, failure: FailureClosure?) {
-        setInfo(.ChannelsSetPurpose, type: .Purpose, channel: channel, text: purpose, success: {
-            (purposeSet) -> Void in
-                success?(purposeSet)
-            }) { (error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func setChannelTopic(_ channel: String, topic: String, success: ((_ topicSet: Bool)->Void)?, failure: FailureClosure?) {
-        setInfo(.ChannelsSetTopic, type: .Topic, channel: channel, text: topic, success: {
-            (topicSet) -> Void in
-                success?(topicSet)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - Messaging
-    public func deleteMessage(_ channel: String, ts: String, success: ((_ deleted: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["channel": channel, "ts": ts]
-        networkInterface.request(.ChatDelete, token: token, parameters: parameters, successClosure: { (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func sendMessage(_ channel: String, text: String, username: String? = nil, asUser: Bool? = nil, parse: ParseMode? = nil, linkNames: Bool? = nil, attachments: [Attachment?]? = nil, unfurlLinks: Bool? = nil, unfurlMedia: Bool? = nil, iconURL: String? = nil, iconEmoji: String? = nil, success: (((ts: String?, channel: String?))->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any?] = ["channel": channel, "text": text.slackFormatEscaping, "as_user": asUser, "parse": parse?.rawValue, "link_names": linkNames, "unfurl_links": unfurlLinks, "unfurlMedia": unfurlMedia, "username": username, "icon_url": iconURL, "icon_emoji": iconEmoji, "attachments": encodeAttachments(attachments)]
-        networkInterface.request(.ChatPostMessage, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?((ts: response["ts"] as? String, response["channel"] as? String))
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func updateMessage(_ channel: String, ts: String, message: String, attachments: [Attachment?]? = nil, parse:ParseMode = .None, linkNames: Bool = false, success: ((_ updated: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any?] = ["channel": channel, "ts": ts, "text": message.slackFormatEscaping, "parse": parse.rawValue, "link_names": linkNames, "attachments": encodeAttachments(attachments)]
-        networkInterface.request(.ChatUpdate, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - Do Not Disturb
-    public func dndInfo(_ user: String? = nil, success: ((_ status: DoNotDisturbStatus)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any?] = ["user": user]
-        networkInterface.request(.DNDInfo, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(DoNotDisturbStatus(status: response))
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func dndTeamInfo(_ users: [String]? = nil, success: ((_ statuses: [String: DoNotDisturbStatus])->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any?] = ["users": users?.joined(separator: ",")]
-        networkInterface.request(.DNDTeamInfo, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                guard let usersDictionary = response["users"] as? [String: Any] else {
-                    success?([:])
-                    return
-                }
-                success?(self.enumerateDNDStatuses(usersDictionary))
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - Emoji
-    public func emojiList(_ success: ((_ emojiList: [String: Any]?)->Void)?, failure: FailureClosure?) {
-        networkInterface.request(.EmojiList, token: token, parameters: nil, successClosure: {
-            (response) -> Void in
-                success?(response["emoji"] as? [String: Any])
-            }) { (error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - Files
-    public func deleteFile(_ fileID: String, success: ((_ deleted: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters = ["file": fileID]
-        networkInterface.request(.FilesDelete, token: token, parameters: parameters as [String : Any]?, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    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?] = ["file": file, "filename": filename, "filetype": filetype, "title": title, "initial_comment": initialComment, "channels": channels?.joined(separator: ",")]
-        networkInterface.uploadRequest(token, data: file, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(File(file: response["file"] as? [String: Any]))
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - File Comments
-    public func addFileComment(_ fileID: String, comment: String, success: ((_ comment: Comment)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["file": fileID, "comment": comment.slackFormatEscaping]
-        networkInterface.request(.FilesCommentsAdd, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(Comment(comment: response["comment"] as? [String: Any]))
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func editFileComment(_ fileID: String, commentID: String, comment: String, success: ((_ comment: Comment)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["file": fileID, "id": commentID, "comment": comment.slackFormatEscaping]
-        networkInterface.request(.FilesCommentsEdit, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-            success?(Comment(comment: response["comment"] as? [String: Any]))
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func deleteFileComment(_ fileID: String, commentID: String, success: ((_ deleted: Bool?)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["file": fileID, "id": commentID]
-        networkInterface.request(.FilesCommentsDelete, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - Groups
-    public func closeGroup(_ groupID: String, success: ((_ closed: Bool)->Void)?, failure: FailureClosure?) {
-        close(.GroupsClose, channelID: groupID, success: {
-            (closed) -> Void in
-                success?(closed)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func groupHistory(_ id: String, latest: String = "\(Date().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((_ history: History)->Void)?, failure: FailureClosure?) {
-        history(.GroupsHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {
-            (history) -> Void in
-                success?(history)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func groupInfo(_ id: String, success: ((_ channel: Channel)->Void)?, failure: FailureClosure?) {
-        info(.GroupsInfo, type:ChannelType.Group, id: id, success: {
-            (channel) -> Void in
-                success?(channel)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func groupsList(_ excludeArchived: Bool = false, success: ((_ channels: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
-        list(.GroupsList, type:ChannelType.Group, excludeArchived: excludeArchived, success: {
-            (channels) -> Void in
-                success?(channels)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func markGroup(_ channel: String, timestamp: String, success: ((_ ts: String)->Void)?, failure: FailureClosure?) {
-        mark(.GroupsMark, channel: channel, timestamp: timestamp, success: {
-            (ts) -> Void in
-                success?(timestamp)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func openGroup(_ channel: String, success: ((_ opened: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters = ["channel":channel]
-        networkInterface.request(.GroupsOpen, token: token, parameters: parameters as [String: Any]?, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func setGroupPurpose(_ channel: String, purpose: String, success: ((_ purposeSet: Bool)->Void)?, failure: FailureClosure?) {
-        setInfo(.GroupsSetPurpose, type: .Purpose, channel: channel, text: purpose, success: {
-            (purposeSet) -> Void in
-                success?(purposeSet)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func setGroupTopic(_ channel: String, topic: String, success: ((_ topicSet: Bool)->Void)?, failure: FailureClosure?) {
-        setInfo(.GroupsSetTopic, type: .Topic, channel: channel, text: topic, success: {
-            (topicSet) -> Void in
-                success?(topicSet)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - IM
-    public func closeIM(_ channel: String, success: ((_ closed: Bool)->Void)?, failure: FailureClosure?) {
-        close(.IMClose, channelID: channel, success: {
-            (closed) -> Void in
-                success?(closed)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func imHistory(_ id: String, latest: String = "\(Date().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((_ history: History)->Void)?, failure: FailureClosure?) {
-        history(.IMHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {
-            (history) -> Void in
-                success?(history)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func imsList(_ excludeArchived: Bool = false, success: ((_ channels: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
-        list(.IMList, type:ChannelType.IM, excludeArchived: excludeArchived, success: {
-            (channels) -> Void in
-                success?(channels)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func markIM(_ channel: String, timestamp: String, success: ((_ ts: String)->Void)?, failure: FailureClosure?) {
-        mark(.IMMark, channel: channel, timestamp: timestamp, success: {
-            (ts) -> Void in
-                success?(timestamp)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func openIM(_ userID: String, success: ((_ imID: String?)->Void)?, failure: FailureClosure?) {
-        let parameters = ["user": userID]
-        networkInterface.request(.IMOpen, token: token, parameters: parameters as [String: Any]?, successClosure: {
-            (response) -> Void in
-                let group = response["channel"] as? [String: Any]
-                success?(group?["id"] as? String)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - MPIM
-    public func closeMPIM(_ channel: String, success: ((_ closed: Bool)->Void)?, failure: FailureClosure?) {
-        close(.MPIMClose, channelID: channel, success: {
-            (closed) -> Void in
-                success?(closed)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func mpimHistory(_ id: String, latest: String = "\(Date().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((_ history: History)->Void)?, failure: FailureClosure?) {
-        history(.MPIMHistory, id: id, latest: latest, oldest: oldest, inclusive: inclusive, count: count, unreads: unreads, success: {
-            (history) -> Void in
-                success?(history)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func mpimsList(_ excludeArchived: Bool = false, success: ((_ channels: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
-        list(.MPIMList, type:ChannelType.Group, excludeArchived: excludeArchived, success: {
-            (channels) -> Void in
-                success?(channels)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func markMPIM(_ channel: String, timestamp: String, success: ((_ ts: String)->Void)?, failure: FailureClosure?) {
-        mark(.MPIMMark, channel: channel, timestamp: timestamp, success: {
-            (ts) -> Void in
-                success?(timestamp)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func openMPIM(_ userIDs: [String], success: ((_ mpimID: String?)->Void)?, failure: FailureClosure?) {
-        let parameters = ["users": userIDs.joined(separator: ",")]
-        networkInterface.request(.MPIMOpen, token: token, parameters: parameters as [String: Any]?, successClosure: {
-            (response) -> Void in
-                let group = response["group"] as? [String: Any]
-                success?(group?["id"] as? String)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - Pins
-    public func pinItem(_ channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((_ pinned: Bool)->Void)?, failure: FailureClosure?) {
-        pin(.PinsAdd, channel: channel, file: file, fileComment: fileComment, timestamp: timestamp, success: {
-            (ok) -> Void in
-                success?(ok)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func unpinItem(_ channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((_ unpinned: Bool)->Void)?, failure: FailureClosure?) {
-        pin(.PinsRemove, channel: channel, file: file, fileComment: fileComment, timestamp: timestamp, success: {
-            (ok) -> Void in
-                success?(ok)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    fileprivate func pin(_ endpoint: Endpoint, channel: String, file: String? = nil, fileComment: String? = nil, timestamp: String? = nil, success: ((_ ok: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any?] = ["channel": channel, "file": file, "file_comment": fileComment, "timestamp": timestamp]
-        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(true)
-            }){(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - Reactions
-    // One of file, file_comment, or the combination of channel and timestamp must be specified.
-    public func addReaction(_ name: String, file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((_ reacted: Bool)->Void)?, failure: FailureClosure?) {
-        react(.ReactionsAdd, name: name, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {
-            (ok) -> Void in
-                success?(ok)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    // One of file, file_comment, or the combination of channel and timestamp must be specified.
-    public func removeReaction(_ name: String, file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((_ unreacted: Bool)->Void)?, failure: FailureClosure?) {
-        react(.ReactionsRemove, name: name, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {
-            (ok) -> Void in
-                success?(ok)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    fileprivate func react(_ endpoint: Endpoint, name: String, file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((_ ok: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any?] = ["name": name, "file": file, "file_comment": fileComment, "channel": channel, "timestamp": timestamp]
-        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - Stars
-    // One of file, file_comment, channel, or the combination of channel and timestamp must be specified.
-    public func addStar(_ file: String? = nil, fileComment: String? = nil, channel: String?  = nil, timestamp: String? = nil, success: ((_ starred: Bool)->Void)?, failure: FailureClosure?) {
-        star(.StarsAdd, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {
-            (ok) -> Void in
-                success?(ok)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    // One of file, file_comment, channel, or the combination of channel and timestamp must be specified.
-    public func removeStar(_ file: String? = nil, fileComment: String? = nil, channel: String? = nil, timestamp: String? = nil, success: ((_ unstarred: Bool)->Void)?, failure: FailureClosure?) {
-        star(.StarsRemove, file: file, fileComment: fileComment, channel: channel, timestamp: timestamp, success: {
-            (ok) -> Void in
-                success?(ok)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    fileprivate func star(_ endpoint: Endpoint, file: String?, fileComment: String?, channel: String?, timestamp: String?, success: ((_ ok: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any?] = ["file": file, "file_comment": fileComment, "channel": channel, "timestamp": timestamp]
-        networkInterface.request(endpoint, token: token, parameters: WebAPI.filterNilParameters(parameters), successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-
-    
-    //MARK: - Team
-    public func teamInfo(_ success: ((_ info: [String: Any]?)->Void)?, failure: FailureClosure?) {
-        networkInterface.request(.TeamInfo, token: token, parameters: nil, successClosure: {
-            (response) -> Void in
-                success?(response["team"] as? [String: Any])
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - Users
-    public func userPresence(_ user: String, success: ((_ presence: String?)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["user": user]
-        networkInterface.request(.UsersGetPresence, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(response["presence"] as? String)
-            }){(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func userInfo(_ id: String, success: ((_ user: User)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["user": id]
-        networkInterface.request(.UsersInfo, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(User(user: response["user"] as? [String: Any]))
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func usersList(_ includePresence: Bool = false, success: ((_ userList: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["presence": includePresence]
-        networkInterface.request(.UsersList, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(response["members"] as? [[String: Any]])
-            }){(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func setUserActive(_ success: ((_ success: Bool)->Void)?, failure: FailureClosure?) {
-        networkInterface.request(.UsersSetActive, token: token, parameters: nil, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    public func setUserPresence(_ presence: Presence, success: ((_ success: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["presence": presence.rawValue]
-        networkInterface.request(.UsersSetPresence, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - Channel Utilities
-    fileprivate func close(_ endpoint: Endpoint, channelID: String, success: ((_ closed: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["channel": channelID]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    fileprivate func history(_ endpoint: Endpoint, id: String, latest: String = "\(Date().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((_ history: History)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["channel": id, "latest": latest, "oldest": oldest, "inclusive": inclusive, "count": count, "unreads": unreads]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(History(history: response))
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    fileprivate func info(_ endpoint: Endpoint, type: ChannelType, id: String, success: ((_ channel: Channel)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["channel": id]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(Channel(channel: response[type.rawValue] as? [String: Any]))
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    fileprivate func list(_ endpoint: Endpoint, type: ChannelType, excludeArchived: Bool = false, success: ((_ channels: [[String: Any]]?)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["exclude_archived": excludeArchived]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(response[type.rawValue+"s"] as? [[String: Any]])
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    fileprivate func mark(_ endpoint: Endpoint, channel: String, timestamp: String, success: ((_ ts: String)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["channel": channel, "ts": timestamp]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(timestamp)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    fileprivate func setInfo(_ endpoint: Endpoint, type: InfoType, channel: String, text: String, success: ((_ success: Bool)->Void)?, failure: FailureClosure?) {
-        let parameters: [String: Any] = ["channel": channel, type.rawValue: text]
-        networkInterface.request(endpoint, token: token, parameters: parameters, successClosure: {
-            (response) -> Void in
-                success?(true)
-            }) {(error) -> Void in
-                failure?(error)
-        }
-    }
-    
-    //MARK: - Encode Attachments
-    fileprivate 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 _ {
-                
-            }
-        }
-        return nil
-    }
-    
-    //MARK: - Filter Nil Parameters
-    internal static 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
-    fileprivate 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/WebhookRequest.swift

@@ -1,49 +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: Any]?) {
-        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,49 +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.
-
-open class WebhookServer: Server {
-    
-    public init(token: String, route: String, response: Response) {
-        super.init(token: token)
-        addRoute(route, response: response)
-    }
-    
-    open 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."))
-            }
-        }
-    }
-    
-    fileprivate 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>3.1.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>3.1.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>