Update SlackKit.swift

Updated podspec

.gitignore

@@ -16,6 +16,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+*.DS_Store
 
 # SwiftPM
 Packages/

.swift-version

@@ -1 +1 @@
-2.2
+3.1.1

Cartfile

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

Cartfile.resolved

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

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Peter Zignego
+Copyright (c) 2017 Peter Zignego
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Package.swift

@@ -1,35 +1,14 @@
-//
-// 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/daltoniam/Starscream",
-            majorVersion: 1),
-        .Package(url: "https://github.com/httpswift/swifter", majorVersion: 1)
+    targets: [
+        Target(name: "SlackKit")
     ],
-    exclude: ["Examples", "Carthage", "Pods"]
+    dependencies: [
+        .Package(url: "https://github.com/SlackKit/SKCore", "4.0.0"),
+        .Package(url: "https://github.com/SlackKit/SKClient", "4.0.0"),
+        .Package(url: "https://github.com/SlackKit/SKRTMAPI", "4.0.0"),
+        .Package(url: "https://github.com/SlackKit/SKServer", "4.0.0")
+    ]
 )

Podfile

@@ -1,18 +1,28 @@
-source 'https://github.com/CocoaPods/Specs.git'
-
 use_frameworks!
 
-target 'SlackKit OS X' do
-	pod 'Starscream'
-	pod 'Swifter'
+target 'SlackKit macOS' do
+	platform :osx, '10.11'
+	pod 'SKCore'
+	pod 'SKClient'
+	pod 'SKWebAPI'
+	pod 'SKRTMAPI'
+	pod 'SKServer'
 end
 
 target 'SlackKit iOS' do
-	pod 'Starscream'
-	pod 'Swifter'
+	platform :ios, '9.0'
+	pod 'SKCore'
+	pod 'SKClient'
+	pod 'SKWebAPI'
+	pod 'SKRTMAPI'
+	pod 'SKServer'
 end
 
 target 'SlackKit tvOS' do
-	pod 'Starscream'
-	pod 'Swifter'
+	platform :tvos, '9.0'
+	pod 'SKCore'
+	pod 'SKClient'
+	pod 'SKWebAPI'
+	pod 'SKRTMAPI'
+	pod 'SKServer'
 end

Podfile.lock

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

README.md

@@ -1,310 +1,205 @@
-![SlackKit](https://cloud.githubusercontent.com/assets/8311605/10260893/5ec60f96-694e-11e5-91fd-da6845942201.png)
-## SlackKit: A Swift Slack Client Library
+<p align="center"><img src="https://cloud.githubusercontent.com/assets/8311605/24083714/e921a0d4-0cb2-11e7-8384-d42113ef5056.png" alt="SlackKit" width="500"/></p>
+
+![Swift Version](https://img.shields.io/badge/Swift-3.1.1-orange.svg)
+![Plaforms](https://img.shields.io/badge/Platforms-macOS,iOS,tvOS,Linux-lightgrey.svg)
+![License MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg)
+[![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg)](https://github.com/Carthage/Carthage)
+[![CocoaPods compatible](https://img.shields.io/badge/CocoaPods-compatible-brightgreen.svg)](https://cocoapods.org)
+
+## SlackKit: Slack Apps in Swift
 ### Description
-This is a Slack client library for OS X, iOS, and tvOS written in Swift. It's intended to expose all of the functionality of Slack's [Real Time Messaging API](https://api.slack.com/rtm) as well as the [web APIs](https://api.slack.com/web) that are accessible to [bot users](https://api.slack.com/bot-users). SlackKit also supports Slack’s [OAuth 2.0](https://api.slack.com/docs/oauth) flow including the [Add to Slack](https://api.slack.com/docs/slack-button) and [Sign in with Slack](https://api.slack.com/docs/sign-in-with-slack) buttons, [incoming webhooks](https://api.slack.com/incoming-webhooks), [slash commands](https://api.slack.com/slash-commands), and [message buttons](https://api.slack.com/docs/message-buttons).
 
-SlackKit also has alpha support for: [Swift 3](https://github.com/pvzig/SlackKit/tree/swift3), [Linux](https://github.com/pvzig/SlackKit/tree/linux)
+SlackKit makes it easy to build Slack apps in Swift.
 
-#### 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:
+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).
 
 ### Installation
+
+#### Swift Package Manager
+
+Add `SlackKit` to your `Package.swift`
+
+```swift
+import PackageDescription
+  
+let package = Package(
+	dependencies: [
+		.Package(url: "https://github.com/SlackKit/SlackKit.git", "4.0.0")
+	]
+)
+```
+#### Carthage
+
+Add `SlackKit` to your `Cartfile`:
+
+```
+github "SlackKit/SlackKit"
+```
+
 #### CocoaPods
-Add the pod to your podfile:
+Add `SlackKit` to your `Podfile`:
+
 ```
 pod 'SlackKit'
 ```
-and run
-```
-pod install
-```
-
-#### Carthage
-
-Add SlackKit to your Cartfile:
-```
-github "pvzig/SlackKit" ~> 2.0
-```
-and run
-```
-carthage bootstrap
-```
-**Note:** SlackKit currently takes a _long_ time for the compiler to compile with optimizations turned on. I'm currently exploring a potential fix for this issue. In the meantime, you may want to skip the waiting and build it in the debug configuration instead:
-```
-carthage bootstrap --configuration "Debug"
-```
-Drag the built `SlackKit.framework` into your Xcode project.
-
-#### Swift Package Manager
-Add SlackKit to your Package.swift
-```swift
-import PackageDescription
-
-let package = Package(
-    dependencies: [
-        .Package(url: "https://github.com/pvzig/SlackKit.git", majorVersion: 2)
-    ]
-)
-```
-Run `swift build` on your application’s main directory.
-
-To use the library in your project import it:
-```
-import SlackKit
-```
 
 ### Usage
+#### The Basics
+Create a bot user with an API token:
+
+```swift
+import SlackKit
+
+let bot = SlackKit()
+bot.addRTMBotWithAPIToken("xoxb-SLACK-BOT-TOKEN")
+// Register for event notifications
+bot.notificationForEvent(.message) { (event, _) in
+	// Your bot logic here
+	print(event.message)
+}
+```
+
+or create a ready-to-launch Slack app with your [application’s `Client ID` and `Client Secret`](https://api.slack.com/apps):
+
+```swift
+import SlackKit
+
+let bot = SlackKit()
+let oauthConfig = OAuthConfig(clientID: "CLIENT_ID", clientSecret: "CLIENT_SECRET")
+bot.addServer(oauth: oauthConfig)
+```
+
+or just make calls to the Slack Web API:
+
+```swift
+import SlackKit
+
+let bot = SlackKit()
+bot.addWebAPIAccessWithToken("xoxb-SLACK-BOT-TOKEN")
+bot.webAPI?.authenticationTest(success: { (success) in
+	print(success)
+}, failure: nil)
+
+```
+
+#### 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)), create a route, response middleware for that route, and add it to a responder:
+
+```swift
+let slackkit = SlackKit()
+let middleware = ResponseMiddleware(token: "SLASH_COMMAND_TOKEN", response: SKResponse(text: "👋"))
+let route = RequestRoute(path: "/hello", middleware: middleware)
+let responder = SlackKitResponder(routes: [route])
+slackkit.addServer(responder: responder)
+```
+When a user enters that slash command, it will hit your configured route and return the response you specified.
+
+#### Message Buttons
+Add [message buttons](https://api.slack.com/docs/message-buttons) to your responses for additional interactivity.
+
+To send messages with actions, add them to an attachment and send them using the Web API:
+
+```swift
+let helloAction = Action(name: "hello", text: "🌎")
+let attachment = Attachment(fallback: "Hello World", title: "Welcome to SlackKit", callbackID: "hello_world", actions: [helloAction])
+slackkit.webAPI?.sendMessage(channel: "CXXXXXX", text: "", attachments: [attachment], success: nil, failure: nil)
+```
+
+To respond to message actions, add a `RequestRoute` with `MessageActionMiddleware` using your app’s verification token to your `SlackKitResponder`:
+
+```swift
+let response = ResponseMiddleware(token: "SLACK_APP_VERIFICATION_TOKEN", response: SKResponse(text: "Hello, world!"))
+let actionRoute = MessageActionRoute(action: helloAction, middleware: response)
+let actionMiddleware = MessageActionMiddleware(token: "SLACK_APP_VERIFICATION_TOKEN", routes:[actionRoute])
+let actions = RequestRoute(path: "/actions", middleware: actionMiddleware)
+let responder = SlackKitResponder(routes: [actions])
+slackkit.addServer(responder: responder)
+```
 
 #### 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:
-```swift
-func authorizeRequest(scope:[Scope], redirectURI: String, state: String = "slackkit", team: String? = nil)
-```
-
-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.
-```swift
-let incoming = IncomingWebhook(url: "https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX")
-let message = Response(text: "Hello, World!")
-incoming.postMessage(message)
-```
-
-#### Slash Commands
-After [configuring your slash command in Slack](https://my.slack.com/services/new/slash-commands) (you can also provide slash commands as part of a [Slack App](https://api.slack.com/slack-apps)), initialize a webhook server with the token for the slash command, a configured route, and a response.
-```swift
-let response = Response(text: "Hello, World!", responseType: .InChannel)
-let webhook = WebhookServer(token: "SLASH-COMMAND-TOKEN", route: "hello_world", response: response)
-webhook.start()
-```
-When a user enters that slash command, it will hit your configured route and return the response you specified.
-
-To add additional routes and responses, you can use WebhookServer’s addRoute function:
-```swift 
-func addRoute(route: String, response: Response)
-```
-
-#### Message Buttons
-If you are developing a Slack App and are authorizing using OAuth, you can use [message buttons](https://api.slack.com/docs/message-buttons).
-
-To send messages with actions, add them to an attachment:
-```swift
-let helloAction = Action(name: "hello_world", text: "Hello, World!")
-let attachment = Attachment(fallback: "Hello World Attachment", title: "Attachment with an Action Button", callbackID: "helloworld", actions: [helloAction])
-```
-
-To act on message actions, initialize an instance of the `MessageActionServer` using your app’s verification token, your specified interactive messages request URL route, and a `MessageActionResponder`:
-```swift
-let action = Action(name: "hello_world", text: "Hello, World!")
-let response = Response(text: "Hello, 🌎!", responseType: .InChannel)
-let responder = MessageActionResponder(responses: [(action, response)])
-let server = MessageActionServer(token: "SLACK-APP-VERIFICATION-TOKEN", route: "actions", responder: responder)
-server.start()
-```
-
-#### Bot Users
-To deploy a bot user using SlackKit you'll need a bearer token which identifies a single user. You can generate a [full access token or create one using OAuth 2](https://api.slack.com/web).
-
-Initialize a SlackKit instance using your [application’s Client ID and Client Secret](https://api.slack.com/apps) to set up SlackKit for OAuth authorization:
-```swift
-let bot = SlackKit(clientID: "CLIENT_ID", clientSecret: "CLIENT_SECRET")
-```
-
-or use a manually acquired token:
-```swift
-let bot = SlackKit(withAPIToken: "xoxp-YOUR-SLACK-API-TOKEN")
-```
-
-#### Client Connection Options
-You can also set options for a ping/pong interval, timeout interval, and automatic reconnection:
-```swift
-let options = ClientOptions(pingInterval: 2, timeout: 10, reconnect: false)
-let bot = SlackKit(clientID: "CLIENT_ID", clientSecret: "CLIENT_SECRET", clientOptions: options)
-```
-
-Once connected, the client will begin to consume any messages sent by the Slack RTM API.
+For local development of things like OAuth, slash commands, and message buttons, you may want to use a tool like [ngrok](https://ngrok.com).
 
 #### 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
-- channels.list
-- channels.mark
-- channels.setPurpose
-- channels.setTopic
-- chat.delete
-- chat.postMessage
-- chat.update
-- emoji.list
-- files.comments.add
-- files.comments.edit
-- files.comments.delete
-- files.delete
-- files.info
-- files.upload
-- groups.close
-- groups.history
-- groups.info
-- groups.list
-- groups.mark
-- groups.open
-- groups.setPurpose
-- groups.setTopic
-- im.close
-- im.history
-- im.list
-- im.mark
-- im.open
-- mpim.close
-- mpim.history
-- mpim.list
-- mpim.mark
-- mpim.open
-- oauth.access
-- pins.add
-- pins.list
-- pins.remove
-- reactions.add
-- reactions.get
-- reactions.list
-- reactions.remove
-- rtm.start
-- stars.add
-- stars.remove
-- team.info
-- users.getPresence
-- users.info
-- users.list
-- users.setActive
-- users.setPresence
+| Web APIs      |
+| ------------- |
+| `api.test`|
+| `api.revoke`|
+| `auth.test`|
+| `channels.history`|
+| `channels.info`|
+| `channels.list`|
+| `channels.mark`|
+| `channels.setPurpose`|
+| `channels.setTopic`|
+| `chat.delete`|
+| `chat.meMessage`|
+| `chat.postMessage`|
+| `chat.update`|
+| `emoji.list`|
+| `files.comments.add`|
+| `files.comments.edit`|
+| `files.comments.delete`|
+| `files.delete`|
+| `files.info`|
+| `files.upload`|
+| `groups.close`|
+| `groups.history`|
+| `groups.info`|
+| `groups.list`|
+| `groups.mark`|
+| `groups.open`|
+| `groups.setPurpose`|
+| `groups.setTopic`|
+| `im.close`|
+| `im.history`|
+| `im.list`|
+| `im.mark`|
+| `im.open`|
+| `mpim.close`|
+| `mpim.history`|
+| `mpim.list`|
+| `mpim.mark`|
+| `mpim.open`|
+| `oauth.access`|
+| `pins.add`|
+| `pins.list`|
+| `pins.remove`|
+| `reactions.add`|
+| `reactions.get`|
+| `reactions.list`|
+| `reactions.remove`|
+| `rtm.start`|
+| `stars.add`|
+| `stars.remove`|
+| `team.info`|
+| `users.getPresence`|
+| `users.info`|
+| `users.list`|
+| `users.setActive`|
+| `users.setPresence`|
 
-They can be accessed through a Client object’s `webAPI` property:
-```swift
-client.webAPI.authenticationTest({ (authenticated) -> Void in
-	print(authenticated)
-}){(error) -> Void in
-	print(error)
-}
-```
+Don’t need the whole banana? Want more control over the low-level implementation details? Use the extensible modules SlackKit is built on:
 
-#### 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: "CLIENT_ID", clientSecret: "CLIENT_SECRET")
-bot.onClientInitalization = { (client: Client) in
-    dispatch_async(dispatch_get_main_queue(), {
-		client.connectionEventsDelegate = self
-	    client.messageEventsDelegate = self
-	})
-}
-```
-
-Delegate callbacks contain a reference to the Client where the event occurred.
-
-There are a number of delegates that you can set to receive callbacks for certain events.
-
-##### ConnectionEventsDelegate
-```swift
-clientConnected(client: Client)
-clientDisconnected(client: Client)
-clientConnectionFailed(client: Client, error: SlackError)
-```
-##### MessageEventsDelegate
-```swift
-messageSent(client: Client, message: Message)
-messageReceived(client: Client, message: Message)
-messageChanged(client: Client, message: Message)
-messageDeleted(client: Client, message: Message?)
-```
-##### ChannelEventsDelegate
-```swift
-userTyping(client: Client, channel: Channel, user: User)
-channelMarked(client: Client, channel: Channel, timestamp: String)
-channelCreated(client: Client, channel: Channel)
-channelDeleted(client: Client, channel: Channel)
-channelRenamed(client: Client, channel: Channel)
-channelArchived(client: Client, channel: Channel)
-channelHistoryChanged(client: Client, channel: Channel)
-channelJoined(client: Client, channel: Channel)
-channelLeft(client: Client, channel: Channel)
-```
-##### DoNotDisturbEventsDelegate
-```swift
-doNotDisturbUpdated(client: Client, dndStatus: DoNotDisturbStatus)
-doNotDisturbUserUpdated(client: Client, dndStatus: DoNotDisturbStatus, user: User)
-```
-##### GroupEventsDelegate
-```swift
-groupOpened(client: Client, group: Channel)
-```
-##### FileEventsDelegate
-```swift
-fileProcessed(client: Client, file: File)
-fileMadePrivate(client: Client, file: File)
-fileDeleted(client: Client, file: File)
-fileCommentAdded(client: Client, file: File, comment: Comment)
-fileCommentEdited(client: Client, file: File, comment: Comment)
-fileCommentDeleted(client: Client, file: File, comment: Comment)
-```
-##### PinEventsDelegate
-```swift
-itemPinned(client: Client, item: Item, channel: Channel?)
-itemUnpinned(client: Client, item: Item, channel: Channel?)
-```
-##### StarEventsDelegate
-```swift
-itemStarred(client: Client, item: Item, star: Bool)
-```
-##### ReactionEventsDelegate
-```swift
-reactionAdded(client: Client, reaction: String, item: Item, itemUser: String)
-reactionRemoved(client: Client, reaction: String, item: Item, itemUser: String)
-```
-##### SlackEventsDelegate
-```swift
-preferenceChanged(client: Client, preference: String, value: AnyObject?)
-userChanged(client: Client, user: User)
-presenceChanged(client: Client, user: User, presence: String)
-manualPresenceChanged(client: Client, user: User, presence: String)
-botEvent(client: Client, bot: Bot)
-```
-##### TeamEventsDelegate
-```swift
-teamJoined(client: Client, user: User)
-teamPlanChanged(client: Client, plan: String)
-teamPreferencesChanged(client: Client, preference: String, value: AnyObject?)
-teamNameChanged(client: Client, name: String)
-teamDomainChanged(client: Client, domain: String)
-teamEmailDomainChanged(client: Client, domain: String)
-teamEmojiChanged(client: Client)
-```
-##### SubteamEventsDelegate
-```swift
-subteamEvent(client: Client, userGroup: UserGroup)
-subteamSelfAdded(client: Client, subteamID: String)
-subteamSelfRemoved(client: Client, subteamID: String)
-```
-##### TeamProfileEventsDelegate
-```swift
-teamProfileChanged(client: Client, profile: CustomProfile)
-teamProfileDeleted(client: Client, profile: CustomProfile)
-teamProfileReordered(client: Client, profile: CustomProfile)
-```
+| Module        | Slack Service |
+| ------------- |-------------  |
+| **[SKClient](https://github.com/SlackKit/SKClient)** | Write your own client implementation|
+| **[SKRTMAPI](https://github.com/SlackKit/SKRTMAPI)**     | Connect to the Slack RTM API|
+| **[SKServer](https://github.com/SlackKit/SKServer)**      | Spin up a server|
+| **[SKWebAPI](https://github.com/SlackKit/SKWebAPI)** | Access the Slack Web API|
 
 ### Examples
-[Check out example applications here.](https://github.com/pvzig/SlackKit-examples)
+You can find the source code for several example applications [here](https://github.com/SlackKit/Examples).
+### Tutorials
+Coming soon!
 
 ### Get In Touch
-[@pvzig](https://twitter.com/pvzig)
+Twitter: [@pvzig](https://twitter.com/pvzig)
 
-<peter@launchsoft.co>
+Email: <peter@launchsoft.co>

SlackKit.podspec

@@ -1,19 +1,20 @@
 Pod::Spec.new do |s|
   s.name             = "SlackKit"
-  s.version          = "2.0.0"
-  s.summary          = "a Slack client library for OS X, iOS, and tvOS written in Swift"
+  s.version          = "4.0.0"
+  s.summary          = "Write Slack apps in Swift"
   s.homepage         = "https://github.com/pvzig/SlackKit"
   s.license          = 'MIT'
   s.author           = { "Peter Zignego" => "peter@launchsoft.co" }
-  s.source           = { :git => "https://github.com/pvzig/SlackKit.git", :tag => s.version.to_s }
+  s.source           = { :git => "https://github.com/SlackKit/SlackKit.git", :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/pvzig'
-  s.ios.deployment_target = '8.0'
-  s.osx.deployment_target = '10.10'
+  s.ios.deployment_target = '9.0'
+  s.osx.deployment_target = '10.11'
   s.tvos.deployment_target = '9.0'
   s.requires_arc = true
-  s.source_files = 'SlackKit/Sources/*.swift'  
+  s.source_files = 'Sources/*.swift'  
   s.frameworks = 'Foundation'
-  s.dependency 'Starscream', '~> 1.1.3'
-  s.dependency 'Swifter'
-end
-
+  s.dependency 'SKCore'
+  s.dependency 'SKClient'
+  s.dependency 'SKRTMAPI'
+  s.dependency 'SKServer'
+end

SlackKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:SlackRTMKit.xcodeproj">
+      location = "self:SKCore.xcodeproj">
    </FileRef>
 </Workspace>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "263993951CE90EE0004A6E93"
+               BlueprintIdentifier = "2684F1C21E95ABD400536DCC"
                BuildableName = "SlackKit.framework"
                BlueprintName = "SlackKit iOS"
                ReferencedContainer = "container:SlackKit.xcodeproj">
@@ -45,7 +45,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "263993951CE90EE0004A6E93"
+            BlueprintIdentifier = "2684F1C21E95ABD400536DCC"
             BuildableName = "SlackKit.framework"
             BlueprintName = "SlackKit iOS"
             ReferencedContainer = "container:SlackKit.xcodeproj">
@@ -63,7 +63,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "263993951CE90EE0004A6E93"
+            BlueprintIdentifier = "2684F1C21E95ABD400536DCC"
             BuildableName = "SlackKit.framework"
             BlueprintName = "SlackKit iOS"
             ReferencedContainer = "container:SlackKit.xcodeproj">

SlackKit.xcodeproj/xcshareddata/xcschemes/SlackKit macOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,9 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "26072A331BB48B3A00CD650C"
+               BlueprintIdentifier = "2684F17C1E95AA6900536DCC"
                BuildableName = "SlackKit.framework"
-               BlueprintName = "SlackKit OS X"
+               BlueprintName = "SlackKit macOS"
                ReferencedContainer = "container:SlackKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -45,9 +45,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "26072A331BB48B3A00CD650C"
+            BlueprintIdentifier = "2684F17C1E95AA6900536DCC"
             BuildableName = "SlackKit.framework"
-            BlueprintName = "SlackKit OS X"
+            BlueprintName = "SlackKit macOS"
             ReferencedContainer = "container:SlackKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -63,9 +63,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "26072A331BB48B3A00CD650C"
+            BlueprintIdentifier = "2684F17C1E95AA6900536DCC"
             BuildableName = "SlackKit.framework"
-            BlueprintName = "SlackKit OS X"
+            BlueprintName = "SlackKit macOS"
             ReferencedContainer = "container:SlackKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "263993B41CE90EED004A6E93"
+               BlueprintIdentifier = "2684F1E61E95ABD600536DCC"
                BuildableName = "SlackKit.framework"
                BlueprintName = "SlackKit tvOS"
                ReferencedContainer = "container:SlackKit.xcodeproj">
@@ -45,7 +45,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "263993B41CE90EED004A6E93"
+            BlueprintIdentifier = "2684F1E61E95ABD600536DCC"
             BuildableName = "SlackKit.framework"
             BlueprintName = "SlackKit tvOS"
             ReferencedContainer = "container:SlackKit.xcodeproj">
@@ -63,7 +63,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "263993B41CE90EED004A6E93"
+            BlueprintIdentifier = "2684F1E61E95ABD600536DCC"
             BuildableName = "SlackKit.framework"
             BlueprintName = "SlackKit tvOS"
             ReferencedContainer = "container:SlackKit.xcodeproj">

SlackKit/SlackKit.h

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

SlackKit/Sources/Action.swift

@@ -1,104 +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: AnyObject]?) {
-        name = action?["name"] as? String
-        text = action?["text"] as? String
-        type = action?["type"] as? String
-        value = action?["value"] as? String
-        style = ActionStyle(rawValue: action?["style"] as? String ?? "")
-        confirm = Confirm(confirm:action?["confirm"] as? [String: AnyObject])
-    }
-    
-    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 func dictionary() -> [String: AnyObject] {
-        var dict = [String: AnyObject]()
-        dict["name"] = name
-        dict["text"] = text
-        dict["type"] = type
-        dict["value"] = value
-        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: AnyObject]?) {
-            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 func dictionary() -> [String: AnyObject] {
-            var dict = [String: AnyObject]()
-            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

@@ -1,116 +0,0 @@
-//
-// Attachment.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 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?
-    public let authorLink: String?
-    public let authorIcon: String?
-    public let title: String?
-    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: AnyObject]?) {
-        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
-        authorLink = attachment?["author_link"] as? String
-        authorIcon = attachment?["author_icon"] as? String
-        title = attachment?["title"] as? String
-        titleLink = attachment?["title_link"] as? String
-        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: AnyObject]])?.map { AttachmentField(field: $0) }
-        actions = (attachment?["actions"] as? [[String: AnyObject]])?.map { Action(action: $0) }
-    }
-    
-    public init(fallback: String, title:String, callbackID: String? = nil, type: String? = nil, colorHex: String? = nil, pretext: String? = nil, authorName: String? = nil, authorLink: String? = nil, authorIcon: String? = nil, titleLink: String? = nil, text: String? = nil, fields: [AttachmentField]? = nil, actions: [Action]? = nil, imageURL: String? = nil, thumbURL: String? = nil, footer: String? = nil, footerIcon:String? = nil, ts:Int? = nil) {
-        self.fallback = fallback
-        self.callbackID = callbackID
-        self.type = type
-        self.color = colorHex
-        self.pretext = pretext
-        self.authorName = authorName
-        self.authorLink = authorLink
-        self.authorIcon = authorIcon
-        self.title = title
-        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 func dictionary() -> [String: AnyObject] {
-        var attachment = [String: AnyObject]()
-        attachment["fallback"] = fallback
-        attachment["callback_id"] = callbackID
-        attachment["attachment_type"] = type
-        attachment["color"] = color
-        attachment["pretext"] = pretext
-        attachment["authorName"] = authorName
-        attachment["author_link"] = authorLink
-        attachment["author_icon"] = authorIcon
-        attachment["title"] = title
-        attachment["title_link"] = titleLink
-        attachment["text"] = text
-        attachment["fields"] = fields?.map{$0.dictionary()}
-        attachment["actions"] = actions?.map{$0.dictionary()}
-        attachment["image_url"] = imageURL
-        attachment["thumb_url"] = thumbURL
-        attachment["footer"] = footer
-        attachment["footer_icon"] = footerIcon
-        attachment["ts"] = ts
-        return attachment
-    }
-    
-}
-
-public enum AttachmentColor: String {
-    case Good = "good"
-    case Warning = "warning"
-    case Danger = "danger"
-}

SlackKit/Sources/AttachmentField.swift

@@ -1,50 +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: AnyObject]?) {
-        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: AnyObject] {
-        var field = [String: AnyObject]()
-        field["title"] = title
-        field["value"] = value
-        field["short"] = short
-        return field
-    }
-    
-}

SlackKit/Sources/AuthorizeRequest.swift

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

SlackKit/Sources/AuthorizeResponse.swift

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

SlackKit/Sources/Bot.swift

@@ -1,42 +0,0 @@
-//
-// Bot.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 Bot {
-    
-    public let id: String?
-    internal(set) public var botToken: String?
-    internal(set) public var name: String?
-    internal(set) public var icons: [String: AnyObject]?
-    
-    internal init(bot: [String: AnyObject]?) {
-        id = bot?["id"] as? String
-        name = bot?["name"] as? String
-        icons = bot?["icons"] as? [String: AnyObject]
-    }
-    
-    internal init(botUser: [String: AnyObject]?) {
-        id = botUser?["bot_user_id"] as? String
-        botToken = botUser?["bot_access_token"] as? String
-    }
-    
-}

SlackKit/Sources/Channel.swift

@@ -1,89 +0,0 @@
-//
-// Channel.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 Channel {
-    
-    public let id: String?
-    public let created: Int?
-    public let creator: String?
-    internal(set) public var name: String?
-    internal(set) public var isArchived: Bool?
-    internal(set) public var isGeneral: Bool?
-    public let isGroup: Bool?
-    public let isIM: Bool?
-    public let isMPIM: Bool?
-    internal(set) public var user: String?
-    internal(set) public var isUserDeleted: Bool?
-    internal(set) public var isOpen: Bool?
-    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 latest: Message?
-    public var unread: Int?
-    public var unreadCountDisplay: Int?
-    internal(set) public var hasPins: Bool?
-    internal(set) public var members: [String]?
-    // Client use
-    internal(set) public var pinnedItems = [Item]()
-    internal(set) public var usersTyping = [String]()
-    internal(set) public var messages = [String: Message]()
-    
-    internal init(channel: [String: AnyObject]?) {
-        id = channel?["id"] as? String
-        name = channel?["name"] as? String
-        created = channel?["created"] as? Int
-        creator = channel?["creator"] as? String
-        isArchived = channel?["is_archived"] as? Bool
-        isGeneral = channel?["is_general"] as? Bool
-        isGroup = channel?["is_group"] as? Bool
-        isIM = channel?["is_im"] as? Bool
-        isMPIM = channel?["is_mpim"] as? Bool
-        isUserDeleted = channel?["is_user_deleted"] as? Bool
-        user = channel?["user"] as? String
-        isOpen = channel?["is_open"] as? Bool
-        topic = Topic(topic: channel?["topic"] as? [String: AnyObject])
-        purpose = Topic(topic: channel?["purpose"] as? [String: AnyObject])
-        isMember = channel?["is_member"] as? Bool
-        lastRead = channel?["last_read"] as? String
-        unread = channel?["unread_count"] as? Int
-        unreadCountDisplay = channel?["unread_count_display"] as? Int
-        hasPins = channel?["has_pins"] as? Bool
-        members = channel?["members"] as? [String]
-
-        if let latestMsgDictionary = channel?["latest"] as? [String: AnyObject] {
-            latest = Message(message: latestMsgDictionary)
-        } else {
-            latest = Message(ts: channel?["latest"] as? String)
-        }
-    }
-    
-    internal init(id:String?) {
-        self.id = id
-        created = nil
-        creator = nil
-        isGroup = false
-        isIM = false
-        isMPIM = false
-    }
-}

SlackKit/Sources/Client+EventDispatching.swift

@@ -1,177 +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: AnyObject]) {
-        let event = Event(event: event)
-        guard let type = event.type else {
-            return
-        }
-        switch type {
-        case .Hello:
-            connected = true
-            connectionEventsDelegate?.clientConnected(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)")
-            break
-        }
-    }
-    
-    func messageDispatcher(event:Event) {
-        guard let value = event.subtype, 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,563 +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, message = sentMessages[NSNumber(double: reply).stringValue], channel = message.channel, ts = message.ts else {
-            return
-        }
-        
-        message.ts = event.ts
-        message.text = event.text
-        channels[channel]?.messages[ts] = message
-        messageEventsDelegate?.messageSent(self, message: message)
-    }
-    
-    func messageReceived(event: Event) {
-        guard let channel = event.channel, message = event.message, id = channel.id, ts = message.ts else {
-            return
-        }
-        
-        channels[id]?.messages[ts] = message
-        messageEventsDelegate?.messageReceived(self, message: message)
-    }
-    
-    func messageChanged(event: Event) {
-        guard let id = event.channel?.id, nested = event.nestedMessage, ts = nested.ts else {
-            return
-        }
-        
-        channels[id]?.messages[ts] = nested
-        messageEventsDelegate?.messageChanged(self, message: nested)
-    }
-    
-    func messageDeleted(event: Event) {
-        guard let id = event.channel?.id, key = event.message?.deletedTs, message = channels[id]?.messages[key] else {
-            return
-        }
-        
-        channels[id]?.messages.removeValueForKey(key)
-        messageEventsDelegate?.messageDeleted(self, message: message)
-    }
-    
-    //MARK: - Channels
-    func userTyping(event: Event) {
-        guard let channel = event.channel, channelID = channel.id, user = event.user, userID = user.id where
-            channels.indexForKey(channelID) != nil && !channels[channelID]!.usersTyping.contains(userID) else {
-            return
-        }
-
-        channels[channelID]?.usersTyping.append(userID)
-        channelEventsDelegate?.userTyping(self, channel: channel, user: user)
-
-        let timeout = dispatch_time(DISPATCH_TIME_NOW, Int64(5.0 * Double(NSEC_PER_SEC)))
-        dispatch_after(timeout, dispatch_get_main_queue()) {
-            if let index = self.channels[channelID]?.usersTyping.indexOf(userID) {
-                self.channels[channelID]?.usersTyping.removeAtIndex(index)
-            }
-        }
-    }
-
-    func channelMarked(event: Event) {
-        guard let channel = event.channel, id = channel.id, timestamp = event.ts else {
-            return
-        }
-        
-        channels[id]?.lastRead = event.ts
-        channelEventsDelegate?.channelMarked(self, channel: channel, timestamp: timestamp)
-    }
-    
-    func channelCreated(event: Event) {
-        guard let channel = event.channel, id = channel.id else {
-            return
-        }
-        
-        channels[id] = channel
-        channelEventsDelegate?.channelCreated(self, channel: channel)
-    }
-    
-    func channelDeleted(event: Event) {
-        guard let channel = event.channel, id = channel.id else {
-            return
-        }
-        
-        channels.removeValueForKey(id)
-        channelEventsDelegate?.channelDeleted(self, channel: channel)
-    }
-    
-    func channelJoined(event: Event) {
-        guard let channel = event.channel, id = channel.id else {
-            return
-        }
-        
-        channels[id] = event.channel
-        channelEventsDelegate?.channelJoined(self, channel: channel)
-    }
-    
-    func channelLeft(event: Event) {
-        guard let channel = event.channel, id = channel.id else {
-            return
-        }
-        
-        if let userID = authenticatedUser?.id, index = channels[id]?.members?.indexOf(userID) {
-            channels[id]?.members?.removeAtIndex(index)
-        }
-        channelEventsDelegate?.channelLeft(self, channel: channel)
-    }
-    
-    func channelRenamed(event: Event) {
-        guard let channel = event.channel, id = channel.id else {
-            return
-        }
-        
-        channels[id]?.name = channel.name
-        channelEventsDelegate?.channelRenamed(self, channel: channel)
-    }
-    
-    func channelArchived(event: Event, archived: Bool) {
-        guard let channel = event.channel, id = channel.id else {
-            return
-        }
-        
-        channels[id]?.isArchived = archived
-        channelEventsDelegate?.channelArchived(self, channel: channel)
-    }
-    
-    func channelHistoryChanged(event: Event) {
-        guard let channel = event.channel else {
-            return
-        }
-        channelEventsDelegate?.channelHistoryChanged(self, channel: channel)
-    }
-    
-    //MARK: - Do Not Disturb
-    func doNotDisturbUpdated(event: Event) {
-        guard let dndStatus = event.dndStatus else {
-            return
-        }
-        
-        authenticatedUser?.doNotDisturbStatus = dndStatus
-        doNotDisturbEventsDelegate?.doNotDisturbUpdated(self, dndStatus: dndStatus)
-    }
-    
-    func doNotDisturbUserUpdated(event: Event) {
-        guard let dndStatus = event.dndStatus, user = event.user, id = user.id else {
-            return
-        }
-        
-        users[id]?.doNotDisturbStatus = dndStatus
-        doNotDisturbEventsDelegate?.doNotDisturbUserUpdated(self, dndStatus: dndStatus, user: user)
-    }
-    
-    //MARK: - IM & Group Open/Close
-    func open(event: Event, open: Bool) {
-        guard let channel = event.channel, id = channel.id else {
-            return
-        }
-        
-        channels[id]?.isOpen = open
-        groupEventsDelegate?.groupOpened(self, group: channel)
-    }
-    
-    //MARK: - Files
-    func processFile(event: Event) {
-        guard let file = event.file, id = file.id else {
-            return
-        }
-        if let comment = file.initialComment, commentID = comment.id {
-            if files[id]?.comments[commentID] == nil {
-                files[id]?.comments[commentID] = comment
-            }
-        }
-            
-        files[id] = file
-        fileEventsDelegate?.fileProcessed(self, file: file)
-    }
-    
-    func filePrivate(event: Event) {
-        guard let file =  event.file, id = file.id else {
-            return
-        }
-        
-        files[id]?.isPublic = false
-        fileEventsDelegate?.fileMadePrivate(self, file: file)
-    }
-    
-    func deleteFile(event: Event) {
-        guard let file = event.file, id = file.id else {
-            return
-        }
-        
-        if files[id] != nil {
-            files.removeValueForKey(id)
-        }
-        fileEventsDelegate?.fileDeleted(self, file: file)
-    }
-    
-    func fileCommentAdded(event: Event) {
-        guard let file = event.file, id = file.id, comment = event.comment, commentID = comment.id else {
-            return
-        }
-        
-        files[id]?.comments[commentID] = comment
-        fileEventsDelegate?.fileCommentAdded(self, file: file, comment: comment)
-    }
-    
-    func fileCommentEdited(event: Event) {
-        guard let file = event.file, id = file.id, comment = event.comment, commentID = comment.id else {
-            return
-        }
-        
-        files[id]?.comments[commentID]?.comment = comment.comment
-        fileEventsDelegate?.fileCommentEdited(self, file: file, comment: comment)
-    }
-    
-    func fileCommentDeleted(event: Event) {
-        guard let file = event.file, id = file.id, comment = event.comment, commentID = comment.id else {
-            return
-        }
-        
-        files[id]?.comments.removeValueForKey(commentID)
-        fileEventsDelegate?.fileCommentDeleted(self, file: file, comment: comment)
-    }
-    
-    //MARK: - Pins
-    func pinAdded(event: Event) {
-        guard let id = event.channelID, item = event.item else {
-            return
-        }
-        
-        channels[id]?.pinnedItems.append(item)
-        pinEventsDelegate?.itemPinned(self, item: item, channel: channels[id])
-    }
-    
-    func pinRemoved(event: Event) {
-        guard let id = event.channelID, item = event.item else {
-            return
-        }
-
-        if let pins = channels[id]?.pinnedItems.filter({$0 != item}) {
-            channels[id]?.pinnedItems = pins
-        }
-        pinEventsDelegate?.itemUnpinned(self, item: item, channel: channels[id])
-    }
-
-    //MARK: - Stars
-    func itemStarred(event: Event, star: Bool) {
-        guard let item = event.item, 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?.itemStarred(self, item: item, star: star)
-    }
-    
-    func starMessage(item: Item, star: Bool) {
-        guard let message = item.message, ts = message.ts, channel = item.channel where channels[channel]?.messages[ts] != nil else {
-            return
-        }
-        channels[channel]?.messages[ts]?.isStarred = star
-    }
-    
-    func starFile(item: Item, star: Bool) {
-        guard let file = item.file, id = file.id else {
-            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, id = file.id, comment = item.comment, commentID = comment.id else {
-            return
-        }
-        files[id]?.comments[commentID] = comment
-    }
-    
-    //MARK: - Reactions
-    func addedReaction(event: Event) {
-        guard let item = event.item, type = item.type, reaction = event.reaction, userID = event.user?.id, itemUser = event.itemUser else {
-            return
-        }
-        
-        switch type {
-        case "message":
-            guard let channel = item.channel, ts = item.ts, 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, commentID = item.fileCommentID else {
-                return
-            }
-            files[id]?.comments[commentID]?.reactions.append(Reaction(name: reaction, user: userID))
-        default:
-            break
-        }
-
-        reactionEventsDelegate?.reactionAdded(self, reaction: reaction, item: item, itemUser: itemUser)
-    }
-
-    func removedReaction(event: Event) {
-        guard let item = event.item, type = item.type, key = event.reaction, userID = event.user?.id, itemUser = event.itemUser else {
-            return
-        }
-
-        switch type {
-        case "message":
-            guard let channel = item.channel, ts = item.ts, message = channels[channel]?.messages[ts] else {
-                return
-            }
-            message.reactions = message.reactions.filter({$0.name != key && $0.user != userID})
-        case "file":
-            guard let itemFile = item.file, id = itemFile.id else {
-                return
-            }
-            files[id]?.reactions = files[id]!.reactions.filter({$0.name != key && $0.user != userID})
-        case "file_comment":
-            guard let id = item.file?.id, commentID = item.fileCommentID else {
-                return
-            }
-            files[id]?.comments[commentID]?.reactions = files[id]!.comments[commentID]!.reactions.filter({$0.name != key && $0.user != userID})
-        default:
-            break
-        }
-
-        reactionEventsDelegate?.reactionRemoved(self, reaction: key, item: item, itemUser: itemUser)
-    }
-
-    //MARK: - Preferences
-    func changePreference(event: Event) {
-        guard let name = event.name else {
-            return
-        }
-        
-        authenticatedUser?.preferences?[name] = event.value
-        slackEventsDelegate?.preferenceChanged(self, preference: name, value: event.value)
-    }
-    
-    //Mark: - User Change
-    func userChange(event: Event) {
-        guard let user = event.user, id = user.id else {
-            return
-        }
-        
-        let preferences = users[id]?.preferences
-        users[id] = user
-        users[id]?.preferences = preferences
-        slackEventsDelegate?.userChanged(self, user: user)
-    }
-    
-    //MARK: - User Presence
-    func presenceChange(event: Event) {
-        guard let user = event.user, id = user.id, presence = event.presence else {
-            return
-        }
-        
-        users[id]?.presence = event.presence
-        slackEventsDelegate?.presenceChanged(self, user: user, presence: presence)
-    }
-    
-    //MARK: - Team
-    func teamJoin(event: Event) {
-        guard let user = event.user, id = user.id else {
-            return
-        }
-        
-        users[id] = user
-        teamEventsDelegate?.teamJoined(self, user: user)
-    }
-    
-    func teamPlanChange(event: Event) {
-        guard let plan = event.plan else {
-            return
-        }
-        
-        team?.plan = plan
-        teamEventsDelegate?.teamPlanChanged(self, plan: plan)
-    }
-    
-    func teamPreferenceChange(event: Event) {
-        guard let name = event.name else {
-            return
-        }
-        
-        team?.prefs?[name] = event.value
-        teamEventsDelegate?.teamPreferencesChanged(self, preference: name, value: event.value)
-    }
-    
-    func teamNameChange(event: Event) {
-        guard let name = event.name else {
-            return
-        }
-        
-        team?.name = name
-        teamEventsDelegate?.teamNameChanged(self, name: name)
-    }
-    
-    func teamDomainChange(event: Event) {
-        guard let domain = event.domain else {
-            return
-        }
-        
-        team?.domain = domain
-        teamEventsDelegate?.teamDomainChanged(self, domain: domain)
-    }
-    
-    func emailDomainChange(event: Event) {
-        guard let domain = event.emailDomain else {
-            return
-        }
-        
-        team?.emailDomain = domain
-        teamEventsDelegate?.teamEmailDomainChanged(self, domain: domain)
-    }
-    
-    func emojiChanged(event: Event) {
-        teamEventsDelegate?.teamEmojiChanged(self)
-    }
-    
-    //MARK: - Bots
-    func bot(event: Event) {
-        guard let bot = event.bot, id = bot.id else {
-            return
-        }
-        
-        bots[id] = bot
-        slackEventsDelegate?.botEvent(self, bot: bot)
-    }
-    
-    //MARK: - Subteams
-    func subteam(event: Event) {
-        guard let subteam = event.subteam, id = subteam.id else {
-            return
-        }
-        
-        userGroups[id] = subteam
-        subteamEventsDelegate?.subteamEvent(self, userGroup: subteam)
-    }
-    
-    func subteamAddedSelf(event: Event) {
-        guard let subteamID = event.subteamID, _ = authenticatedUser?.userGroups else {
-            return
-        }
-        
-        authenticatedUser?.userGroups![subteamID] = subteamID
-        subteamEventsDelegate?.subteamSelfAdded(self, subteamID: subteamID)
-    }
-    
-    func subteamRemovedSelf(event: Event) {
-        guard let subteamID = event.subteamID else {
-            return
-        }
-        
-        authenticatedUser?.userGroups?.removeValueForKey(subteamID)
-        subteamEventsDelegate?.subteamSelfRemoved(self, subteamID: subteamID)
-    }
-    
-    //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?.teamProfileChanged(self, profile: profile)
-    }
-    
-    func teamProfileDeleted(event: Event) {
-        guard let profile = event.profile else {
-            return
-        }
-
-        for user in users {
-            if let id = profile.fields.first?.0 {
-                users[user.0]?.profile?.customProfile?.fields[id] = nil
-            }
-        }
-        
-        teamProfileEventsDelegate?.teamProfileDeleted(self, profile: profile)
-    }
-    
-    func teamProfileReordered(event: Event) {
-        guard let profile = event.profile else {
-            return
-        }
-
-        for user in users {
-            for key in profile.fields.keys {
-                users[user.0]?.profile?.customProfile?.fields[key]?.ordering = profile.fields[key]?.ordering
-            }
-        }
-
-        teamProfileEventsDelegate?.teamProfileReordered(self, profile: profile)
-    }
-    
-    //MARK: - Authenticated User
-    func manualPresenceChange(event: Event) {
-        guard let presence = event.presence, user = authenticatedUser else {
-            return
-        }
-        
-        authenticatedUser?.presence = presence
-        slackEventsDelegate?.manualPresenceChanged(self, user: user, presence: presence)
-    }
-    
-}

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: ErrorType {
-    case ChannelDoesNotExist
-    case UserDoesNotExist
-}
-
-public extension Client {
-    
-    //MARK: - User & Channel
-    public func getChannelIDByName(name: String) throws -> String {
-        guard let id = channels.filter({$0.1.name == stripString(name)}).first?.0 else {
-            throw ClientError.ChannelDoesNotExist
-        }
-        return id
-    }
-
-    public func getUserIDByName(name: String) throws -> String {
-        guard let id = users.filter({$0.1.name == stripString(name)}).first?.0 else {
-            throw ClientError.UserDoesNotExist
-        }
-        return id
-    }
-
-    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(id, success: success, failure: failure)
-        }
-    }
-
-    //MARK: - Utilities
-    internal func stripString(string: String) -> String {
-        var strippedString = string
-        if string[string.startIndex] == "@" || string[string.startIndex] == "#" {
-            strippedString = string.substringFromIndex(string.startIndex.advancedBy(1))
-        }
-        return strippedString
-    }
-}

SlackKit/Sources/Client.swift

@@ -1,265 +0,0 @@
-//
-// Client.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 Starscream
-
-public final class Client: WebSocketDelegate {
-    
-    internal(set) public var connected = false
-    internal(set) public var authenticatedUser: User?
-    internal(set) public var team: Team?
-    
-    internal(set) public var channels = [String: Channel]()
-    internal(set) public var users = [String: User]()
-    internal(set) public var userGroups = [String: UserGroup]()
-    internal(set) public var bots = [String: Bot]()
-    internal(set) public var files = [String: File]()
-    internal(set) public var sentMessages = [String: Message]()
-    
-    public var token = "xoxp-SLACK_AUTH_TOKEN"
-    
-    public var webAPI: WebAPI {
-        return WebAPI(token: token)
-    }
-
-    internal var webSocket: WebSocket?
-    private let pingPongQueue = dispatch_queue_create("com.launchsoft.SlackKit", DISPATCH_QUEUE_SERIAL)
-    internal var ping: Double?
-    internal var pong: Double?
-    internal var options: ClientOptions?
-        
-    //MARK: - Delegates
-    public weak var connectionEventsDelegate: ConnectionEventsDelegate?
-    public weak var slackEventsDelegate: SlackEventsDelegate?
-    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 func setAuthToken(token: String) {
-        self.token = token
-    }
-    
-    public func connect(options options: ClientOptions = ClientOptions()) {
-        self.options = options
-        webAPI.rtmStart(options.simpleLatest, noUnreads: options.noUnreads, mpimAware: options.mpimAware, success: {
-            (response) -> Void in
-            guard let socketURL = response["url"] as? String, url = NSURL(string: socketURL) else {
-                return
-            }
-            self.initialSetup(response)
-            self.webSocket = WebSocket(url: url)
-            self.webSocket?.delegate = self
-            self.webSocket?.connect()
-            }, failure: {(error) -> Void in
-                self.connectionEventsDelegate?.clientConnectionFailed(self, error: error)
-            })
-    }
-    
-    public func disconnect() {
-        webSocket?.disconnect()
-    }
-    
-    //MARK: - RTM Message send
-    public func sendMessage(message: String, channelID: String) {
-        guard connected else { return }
-
-        if let data = try? formatMessageToSlackJsonString(msg: message, channel: channelID),
-            string = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
-            webSocket?.writeString(string)
-        }
-    }
-    
-    private func formatMessageToSlackJsonString(message: (msg: String, channel: String)) throws -> NSData {
-        let json: [String: AnyObject] = [
-            "id": NSDate().slackTimestamp(),
-            "type": "message",
-            "channel": message.channel,
-            "text": message.msg.slackFormatEscaping()
-        ]
-        addSentMessage(json)
-        return try NSJSONSerialization.dataWithJSONObject(json, options: [])
-    }
-    
-    private func addSentMessage(dictionary: [String: AnyObject]) {
-        var message = dictionary
-        guard let id = message["id"] as? NSNumber else {
-            return
-        }
-        let ts = String(id)
-        message.removeValueForKey("id")
-        message["ts"] = ts
-        message["user"] = self.authenticatedUser?.id
-        sentMessages[ts] = Message(message: message)
-    }
-    
-    //MARK: - RTM Ping
-    private func pingRTMServerAtInterval(interval: NSTimeInterval) {
-        let delay = dispatch_time(DISPATCH_TIME_NOW, Int64(interval * Double(NSEC_PER_SEC)))
-        dispatch_after(delay, pingPongQueue, {
-            guard self.connected && self.timeoutCheck() else {
-                self.disconnect()
-                return
-            }
-            self.sendRTMPing()
-            self.pingRTMServerAtInterval(interval)
-        })
-    }
-    
-    private func sendRTMPing() {
-        guard connected else {
-            return
-        }
-        let json: [String: AnyObject] = [
-            "id": NSDate().slackTimestamp(),
-            "type": "ping",
-        ]
-        guard let data = try? NSJSONSerialization.dataWithJSONObject(json, options: []) else {
-            return
-        }
-        let string = NSString(data: data, encoding: NSUTF8StringEncoding)
-        if let writePing = string as? String {
-            ping = json["id"] as? Double
-            webSocket?.writeString(writePing)
-        }
-    }
-    
-    private func timeoutCheck() -> Bool {
-        if let pong = pong, ping = ping, timeout = options?.timeout {
-            if pong - ping < timeout {
-                return true
-            } else {
-                return false
-            }
-        // Ping-pong or timeout not configured
-        } else {
-            return true
-        }
-    }
-    
-    //MARK: - Client setup
-    private func initialSetup(json: [String: AnyObject]) {
-        team = Team(team: json["team"] as? [String: AnyObject])
-        authenticatedUser = User(user: json["self"] as? [String: AnyObject])
-        authenticatedUser?.doNotDisturbStatus = DoNotDisturbStatus(status: json["dnd"] as? [String: AnyObject])
-        enumerateObjects(json["users"] as? Array) { (user) in self.addUser(user) }
-        enumerateObjects(json["channels"] as? Array) { (channel) in self.addChannel(channel) }
-        enumerateObjects(json["groups"] as? Array) { (group) in self.addChannel(group) }
-        enumerateObjects(json["mpims"] as? Array) { (mpim) in self.addChannel(mpim) }
-        enumerateObjects(json["ims"] as? Array) { (ims) in self.addChannel(ims) }
-        enumerateObjects(json["bots"] as? Array) { (bots) in self.addBot(bots) }
-        enumerateSubteams(json["subteams"] as? [String: AnyObject])
-    }
-    
-    private func addUser(aUser: [String: AnyObject]) {
-        let user = User(user: aUser)
-        if let id = user.id {
-            users[id] = user
-        }
-    }
-    
-    private func addChannel(aChannel: [String: AnyObject]) {
-        let channel = Channel(channel: aChannel)
-        if let id = channel.id {
-            channels[id] = channel
-        }
-    }
-    
-    private func addBot(aBot: [String: AnyObject]) {
-        let bot = Bot(bot: aBot)
-        if let id = bot.id {
-            bots[id] = bot
-        }
-    }
-    
-    private func enumerateSubteams(subteams: [String: AnyObject]?) {
-        if let subteams = subteams {
-            if let all = subteams["all"] as? [[String: AnyObject]] {
-                for item in all {
-                    let u = UserGroup(userGroup: item)
-                    self.userGroups[u.id!] = u
-                }
-            }
-            if let auth = subteams["self"] as? [String] {
-                for item in auth {
-                    authenticatedUser?.userGroups = [String: String]()
-                    authenticatedUser?.userGroups![item] = item
-                }
-            }
-        }
-    }
-    
-    // MARK: - Utilities
-    private func enumerateObjects(array: [AnyObject]?, initalizer: ([String: AnyObject])-> Void) {
-        if let array = array {
-            for object in array {
-                if let dictionary = object as? [String: AnyObject] {
-                    initalizer(dictionary)
-                }
-            }
-        }
-    }
-    
-    // MARK: - WebSocketDelegate
-    public func websocketDidConnect(socket: WebSocket) {
-        if let pingInterval = options?.pingInterval {
-            pingRTMServerAtInterval(pingInterval)
-        }
-    }
-    
-    public func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
-        connected = false
-        webSocket = nil
-        authenticatedUser = nil
-        connectionEventsDelegate?.clientDisconnected(self)
-        if let options = options where options.reconnect == true {
-            connect(options: options)
-        }
-    }
-    
-    public func websocketDidReceiveMessage(socket: WebSocket, text: String) {
-        guard let data = text.dataUsingEncoding(NSUTF8StringEncoding) else {
-            return
-        }
-
-        if let json = (try? NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions.AllowFragments)) as? [String: AnyObject] {
-            dispatch(json)
-        }
-    }
-
-    public func websocketDidReceiveData(socket: WebSocket, data: NSData) {}
-    
-}

SlackKit/Sources/ClientOptions.swift

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

SlackKit/Sources/Comment.swift

@@ -1,52 +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 {
-    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: AnyObject]?) {
-        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
-}

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: AnyObject]?) {
-        if let eventFields = profile?["fields"] as? [AnyObject] {
-            for field in eventFields {
-                var cpf: CustomProfileField?
-                if let fieldDictionary = field as? [String: AnyObject] {
-                    cpf = CustomProfileField(field: fieldDictionary)
-                } else {
-                    cpf = CustomProfileField(id: field as? String)
-                }
-                if let id = cpf?.id { fields[id] = cpf }
-            }
-        }
-    }
-    
-    internal init(customFields: [String: AnyObject]?) {
-        if let customFields = customFields {
-            for key in customFields.keys {
-                let cpf = CustomProfileField(field: customFields[key] as? [String: AnyObject])
-                self.fields[key] = cpf
-            }
-        }
-    }
-    
-}

SlackKit/Sources/CustomProfileField.swift

@@ -1,65 +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: AnyObject]?) {
-        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: AnyObject]?) {
-        enabled = status?["dnd_enabled"] as? Bool
-        nextDoNotDisturbStart = status?["next_dnd_start_ts"] as? Int
-        nextDoNotDisturbEnd = status?["next_dnd_end_ts"] as? Int
-        snoozeEnabled = status?["snooze_enabled"] as? Bool
-        snoozeEndtime = status?["snooze_endtime"] as? Int
-    }
-    
-}

SlackKit/Sources/Edited.swift

@@ -1,32 +0,0 @@
-//
-// Edited.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 Edited {
-    public let user: String?
-    public let ts: String?
-    
-    internal init(edited:[String: AnyObject]?) {
-        user = edited?["user"] as? String
-        ts = edited?["ts"] as? String
-    }
-}

SlackKit/Sources/Event.swift

@@ -1,219 +0,0 @@
-//
-// Event.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 enum EventType: String {
-    case Hello = "hello"
-    case Message = "message"
-    case UserTyping = "user_typing"
-    case ChannelMarked = "channel_marked"
-    case ChannelCreated = "channel_created"
-    case ChannelJoined = "channel_joined"
-    case ChannelLeft = "channel_left"
-    case ChannelDeleted = "channel_deleted"
-    case ChannelRenamed = "channel_rename"
-    case ChannelArchive = "channel_archive"
-    case ChannelUnarchive = "channel_unarchive"
-    case ChannelHistoryChanged = "channel_history_changed"
-    case DNDUpdated = "dnd_updated"
-    case DNDUpatedUser = "dnd_updated_user"
-    case IMCreated = "im_created"
-    case IMOpen = "im_open"
-    case IMClose = "im_close"
-    case IMMarked = "im_marked"
-    case IMHistoryChanged = "im_history_changed"
-    case GroupJoined = "group_joined"
-    case GroupLeft = "group_left"
-    case GroupOpen = "group_open"
-    case GroupClose = "group_close"
-    case GroupArchive = "group_archive"
-    case GroupUnarchive = "group_unarchive"
-    case GroupRename = "group_rename"
-    case GroupMarked = "group_marked"
-    case GroupHistoryChanged = "group_history_changed"
-    case FileCreated = "file_created"
-    case FileShared = "file_shared"
-    case FileUnshared = "file_unshared"
-    case FilePublic = "file_public"
-    case FilePrivate = "file_private"
-    case FileChanged = "file_change"
-    case FileDeleted = "file_deleted"
-    case FileCommentAdded = "file_comment_added"
-    case FileCommentEdited = "file_comment_edited"
-    case FileCommentDeleted = "file_comment_deleted"
-    case PinAdded = "pin_added"
-    case PinRemoved = "pin_removed"
-    case Pong = "pong"
-    case PresenceChange = "presence_change"
-    case ManualPresenceChange = "manual_presence_change"
-    case PrefChange = "pref_change"
-    case UserChange = "user_change"
-    case TeamJoin = "team_join"
-    case StarAdded = "star_added"
-    case StarRemoved = "star_removed"
-    case ReactionAdded = "reaction_added"
-    case ReactionRemoved = "reaction_removed"
-    case EmojiChanged = "emoji_changed"
-    case CommandsChanged = "commands_changed"
-    case TeamPlanChange = "team_plan_change"
-    case TeamPrefChange = "team_pref_change"
-    case TeamRename = "team_rename"
-    case TeamDomainChange = "team_domain_change"
-    case EmailDomainChange = "email_domain_change"
-    case TeamProfileChange = "team_profile_change"
-    case TeamProfileDelete = "team_profile_delete"
-    case TeamProfileReorder = "team_profile_reorder"
-    case BotAdded = "bot_added"
-    case BotChanged = "bot_changed"
-    case AccountsChanged = "accounts_changed"
-    case TeamMigrationStarted = "team_migration_started"
-    case ReconnectURL = "reconnect_url"
-    case SubteamCreated = "subteam_created"
-    case SubteamUpdated = "subteam_updated"
-    case SubteamSelfAdded = "subteam_self_added"
-    case SubteamSelfRemoved = "subteam_self_removed"
-    case Ok = "ok"
-    case Error = "error"
-}
-
-internal enum MessageSubtype: String {
-    case BotMessage = "bot_message"
-    case MeMessage = "me_message"
-    case MessageChanged = "message_changed"
-    case MessageDeleted = "message_deleted"
-    case ChannelJoin = "channel_join"
-    case ChannelLeave = "channel_leave"
-    case ChannelTopic = "channel_topic"
-    case ChannelPurpose = "channel_purpose"
-    case ChannelName = "channel_name"
-    case ChannelArchive = "channel_archive"
-    case ChannelUnarchive = "channel_unarchive"
-    case GroupJoin = "group_join"
-    case GroupLeave = "group_leave"
-    case GroupTopic = "group_topic"
-    case GroupPurpose = "group_purpose"
-    case GroupName = "group_name"
-    case GroupArchive = "group_archive"
-    case GroupUnarchive = "group_unarchive"
-    case FileShare = "file_share"
-    case FileComment = "file_comment"
-    case FileMention = "file_mention"
-    case PinnedItem = "pinned_item"
-    case UnpinnedItem = "unpinned_item"
-}
-
-internal struct Event {
-    
-    let type: EventType?
-    let ts: String?
-    let subtype: String?
-    let channelID: String?
-    let text: String?
-    let eventTs: String?
-    let latest: String?
-    let hidden: Bool?
-    let isStarred: Bool?
-    let hasPins: Bool?
-    let pinnedTo: [String]?
-    let fileID: String?
-    let presence: String?
-    let name: String?
-    let value: AnyObject?
-    let plan: String?
-    let url: String?
-    let domain: String?
-    let emailDomain: String?
-    let reaction: String?
-    let replyTo: Double?
-    let reactions: [[String: AnyObject]]?
-    let edited: Edited?
-    let bot: Bot?
-    let channel: Channel?
-    let comment: Comment?
-    let user: User?
-    let file: File?
-    let message: Message?
-    let nestedMessage: Message?
-    let itemUser: String?
-    let item: Item?
-    let dndStatus: DoNotDisturbStatus?
-    let subteam: UserGroup?
-    let subteamID: String?
-    var profile: CustomProfile?
-    
-    init(event:[String: AnyObject]) {
-        type = EventType(rawValue: event["type"] as? String ?? "ok")
-        ts = event["ts"] as? String
-        subtype = event["subtype"] as? String
-        channelID = event["channel_id"] as? String
-        text = event["text"] as? String
-        eventTs = event["event_ts"] as? String
-        latest = event["latest"] as? String
-        hidden = event["hidden"] as? Bool
-        isStarred = event["is_starred"] as? Bool
-        hasPins = event["has_pins"] as? Bool
-        pinnedTo = event["pinned_top"] as? [String]
-        fileID = event["file_id"] as? String
-        presence = event["presence"] as? String
-        name = event["name"] as? String
-        value = event["value"]
-        plan = event["plan"] as? String
-        url = event["url"] as? String
-        domain = event["domain"] as? String
-        emailDomain = event["email_domain"] as? String
-        reaction = event["reaction"] as? String
-        replyTo = event["reply_to"] as? Double
-        reactions = event["reactions"] as? [[String: AnyObject]]
-        bot = Bot(bot: event["bot"] as? [String: AnyObject])
-        edited = Edited(edited:event["edited"] as? [String: AnyObject])
-        dndStatus = DoNotDisturbStatus(status: event["dnd_status"] as? [String: AnyObject])
-        itemUser = event["item_user"] as? String
-        item = Item(item: event["item"] as? [String: AnyObject])
-        subteam = UserGroup(userGroup: event["subteam"] as? [String: AnyObject])
-        subteamID = event["subteam_id"] as? String
-        message = Message(message: event)
-        nestedMessage = Message(message: event["message"] as? [String: AnyObject])
-        profile = CustomProfile(profile: event["profile"] as? [String: AnyObject])
-        file = File(id: event["file"] as? String)
-
-        // Comment, Channel, and User can come across as Strings or Dictionaries
-        if let commentDictionary = event["comment"] as? [String: AnyObject] {
-            comment = Comment(comment: commentDictionary)
-        } else {
-            comment = Comment(id: event["comment"] as? String)
-        }
-
-        if let userDictionary = event["user"] as? [String: AnyObject] {
-            user = User(user: userDictionary)
-        } else {
-            user = User(id: event["user"] as? String)
-        }
-
-        if let channelDictionary =  event["channel"] as? [String: AnyObject] {
-            channel = Channel(channel: channelDictionary)
-        } else {
-            channel = Channel(id: event["channel"] as? String)
-        }
-
-    }
-    
-}

SlackKit/Sources/EventDelegate.swift

@@ -1,109 +0,0 @@
-//
-// EventDelegate.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 protocol ConnectionEventsDelegate: class {
-    func clientConnected(client: Client)
-    func clientDisconnected(client: Client)
-    func clientConnectionFailed(client: Client, error: SlackError)
-}
-
-public protocol MessageEventsDelegate: class {
-    func messageSent(client: Client, message: Message)
-    func messageReceived(client: Client, message: Message)
-    func messageChanged(client: Client, message: Message)
-    func messageDeleted(client: Client, message: Message?)
-}
-
-public protocol ChannelEventsDelegate: class {
-    func userTyping(client: Client, channel: Channel, user: User)
-    func channelMarked(client: Client, channel: Channel, timestamp: String)
-    func channelCreated(client: Client, channel: Channel)
-    func channelDeleted(client: Client, channel: Channel)
-    func channelRenamed(client: Client, channel: Channel)
-    func channelArchived(client: Client, channel: Channel)
-    func channelHistoryChanged(client: Client, channel: Channel)
-    func channelJoined(client: Client, channel: Channel)
-    func channelLeft(client: Client, channel: Channel)
-}
-
-public protocol DoNotDisturbEventsDelegate: class {
-    func doNotDisturbUpdated(client: Client, dndStatus: DoNotDisturbStatus)
-    func doNotDisturbUserUpdated(client: Client, dndStatus: DoNotDisturbStatus, user: User)
-}
-
-public protocol GroupEventsDelegate: class {
-    func groupOpened(client: Client, group: Channel)
-}
-
-public protocol FileEventsDelegate: class {
-    func fileProcessed(client: Client, file: File)
-    func fileMadePrivate(client: Client, file: File)
-    func fileDeleted(client: Client, file: File)
-    func fileCommentAdded(client: Client, file: File, comment: Comment)
-    func fileCommentEdited(client: Client, file: File, comment: Comment)
-    func fileCommentDeleted(client: Client, file: File, comment: Comment)
-}
-
-public protocol PinEventsDelegate: class {
-    func itemPinned(client: Client, item: Item, channel: Channel?)
-    func itemUnpinned(client: Client, item: Item, channel: Channel?)
-}
-
-public protocol StarEventsDelegate: class {
-    func itemStarred(client: Client, item: Item, star: Bool)
-}
-
-public protocol ReactionEventsDelegate: class {
-    func reactionAdded(client: Client, reaction: String, item: Item, itemUser: String)
-    func reactionRemoved(client: Client, reaction: String, item: Item, itemUser: String)
-}
-
-public protocol SlackEventsDelegate: class {
-    func preferenceChanged(client: Client, preference: String, value: AnyObject?)
-    func userChanged(client: Client, user: User)
-    func presenceChanged(client: Client, user: User, presence: String)
-    func manualPresenceChanged(client: Client, user: User, presence: String)
-    func botEvent(client: Client, bot: Bot)
-}
-
-public protocol TeamEventsDelegate: class {
-    func teamJoined(client: Client, user: User)
-    func teamPlanChanged(client: Client, plan: String)
-    func teamPreferencesChanged(client: Client, preference: String, value: AnyObject?)
-    func teamNameChanged(client: Client, name: String)
-    func teamDomainChanged(client: Client, domain: String)
-    func teamEmailDomainChanged(client: Client, domain: String)
-    func teamEmojiChanged(client: Client)
-}
-
-public protocol SubteamEventsDelegate: class {
-    func subteamEvent(client: Client, userGroup: UserGroup)
-    func subteamSelfAdded(client: Client, subteamID: String)
-    func subteamSelfRemoved(client: Client, subteamID: String)
-}
-
-public protocol TeamProfileEventsDelegate: class {
-    func teamProfileChanged(client: Client, profile: CustomProfile)
-    func teamProfileDeleted(client: Client, profile: CustomProfile)
-    func teamProfileReordered(client: Client, profile: CustomProfile)
-}

SlackKit/Sources/Extensions.swift

@@ -1,61 +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 NSDate {
-
-    func slackTimestamp() -> Double {
-        return NSNumber(double: timeIntervalSince1970).doubleValue
-    }
-    
-}
-
-internal extension String {
-    
-    func slackFormatEscaping() -> String {
-        var escapedString = stringByReplacingOccurrencesOfString("&", withString: "&")
-        escapedString = stringByReplacingOccurrencesOfString("<", withString: "&lt;")
-        escapedString = stringByReplacingOccurrencesOfString(">", withString: "&gt;")
-        return escapedString
-    }
-
-}
-
-internal extension Dictionary where Key: StringLiteralConvertible, Value: AnyObject {
-
-    var requestStringFromParameters: String {
-        var requestString = ""
-        for key in self.keys {
-            if let value = self[key] as? String, encodedValue = value.stringByAddingPercentEncodingWithAllowedCharacters(NSCharacterSet.URLHostAllowedCharacterSet()) {
-                requestString += "&\(key)=\(encodedValue)"
-            } else if let value = self[key] as? Int {
-                requestString += "&\(key)=\(value)"
-            }
-        }
-        
-        return requestString
-    }
-
-}
-

SlackKit/Sources/File.swift

@@ -1,189 +0,0 @@
-//
-// File.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 File {
-
-    public let id: String?
-    public let created: Int?
-    public let name: String?
-    public let title: String?
-    public let mimeType: String?
-    public let fileType: String?
-    public let prettyType: String?
-    public let user: String?
-    public let mode: String?
-    internal(set) public var editable: Bool?
-    public let isExternal: Bool?
-    public let externalType: String?
-    public let size: Int?
-    public let urlPrivate: String?
-    public let urlPrivateDownload: String?
-    public let thumb64: String?
-    public let thumb80: String?
-    public let thumb360: String?
-    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?
-    public let previewHighlight: String?
-    public let lines: Int?
-    public let linesMore: Int?
-    internal(set) public var isPublic: Bool?
-    internal(set) public var publicSharedURL: Bool?
-    internal(set) public var channels: [String]?
-    internal(set) public var groups: [String]?
-    internal(set) public var ims: [String]?
-    public let initialComment: Comment?
-    internal(set) public var stars: Int?
-    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]()
-    
-    public init(file:[String: AnyObject]?) {
-        id = file?["id"] as? String
-        created = file?["created"] as? Int
-        name = file?["name"] as? String
-        title = file?["title"] as? String
-        mimeType = file?["mimetype"] as? String
-        fileType = file?["filetype"] as? String
-        prettyType = file?["pretty_type"] as? String
-        user = file?["user"] as? String
-        mode = file?["mode"] as? String
-        editable = file?["editable"] as? Bool
-        isExternal = file?["is_external"] as? Bool
-        externalType = file?["external_type"] as? String
-        size = file?["size"] as? Int
-        urlPrivate = file?["url_private"] as? String
-        urlPrivateDownload = file?["url_private_download"] as? String
-        thumb64 = file?["thumb_64"] as? String
-        thumb80 = file?["thumb_80"] as? String
-        thumb360 = file?["thumb_360"] as? String
-        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
-        previewHighlight = file?["preview_highlight"] as? String
-        lines = file?["lines"] as? Int
-        linesMore = file?["lines_more"] as? Int
-        isPublic = file?["is_public"] as? Bool
-        publicSharedURL = file?["public_url_shared"] as? Bool
-        channels = file?["channels"] as? [String]
-        groups = file?["groups"] as? [String]
-        ims = file?["ims"] as? [String]
-        initialComment = Comment(comment: file?["initial_comment"] as? [String: AnyObject])
-        stars = file?["num_stars"] as? Int
-        isStarred = file?["is_starred"] as? Bool
-        pinnedTo = file?["pinned_to"] as? [String]
-        reactions = Reaction.reactionsFromArray(file?["reactions"] as? [[String: AnyObject]])        
-    }
-    
-    internal init(id:String?) {
-        self.id = id
-        created = nil
-        name = nil
-        title = nil
-        mimeType = nil
-        fileType = nil
-        prettyType = nil
-        user = nil
-        mode = nil
-        isExternal = nil
-        externalType = nil
-        size = nil
-        urlPrivate = nil
-        urlPrivateDownload = nil
-        thumb64 = nil
-        thumb80 = nil
-        thumb360 = nil
-        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
-        previewHighlight = nil
-        lines = nil
-        linesMore = nil
-        initialComment = nil
-    }
-}
-
-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: NSDate?
-    internal(set) public var messages = [Message]()
-    public let hasMore: Bool?
-    
-    internal init(history: [String: AnyObject]?) {
-        if let latestStr = history?["latest"] as? String, latestDouble = Double(latestStr) {
-            latest = NSDate(timeIntervalSince1970: NSTimeInterval(latestDouble))
-        }
-        if let msgs = history?["messages"] as? [[String: AnyObject]] {
-            for message in msgs {
-                messages.append(Message(message: message))
-            }
-        }
-        hasMore = history?["has_more"] as? Bool
-    }
-}

SlackKit/Sources/IncomingWebhook.swift

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

SlackKit/Sources/Item.swift

@@ -1,61 +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 {
-    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: AnyObject]?) {
-        type = item?["type"] as? String
-        ts = item?["ts"] as? String
-        channel = item?["channel"] as? String
-        
-        message = Message(message: item?["message"] as? [String: AnyObject])
-        
-        // Comment and File can come across as Strings or Dictionaries
-        if let commentDictionary = item?["comment"] as? [String: AnyObject] {
-            comment = Comment(comment: commentDictionary)
-        } else {
-            comment = Comment(id: item?["comment"] as? String)
-        }
-        
-        if let fileDictionary = item?["file"] as? [String: AnyObject] {
-            file = File(file: fileDictionary)
-        } else {
-            file = File(id: item?["file"] as? String)
-        }
-        
-        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
-}

SlackKit/Sources/Message.swift

@@ -1,104 +0,0 @@
-//
-// Message.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 final class Message {
-    
-    public let type = "message"
-    public let subtype: String?
-    internal(set) public var ts: String?
-    public let user: String?
-    public let channel: String?
-    internal(set) public var hidden: Bool?
-    internal(set) public var text: String?
-    public let botID: String?
-    public let username: String?
-    public let icons: [String: AnyObject]?
-    public let deletedTs: String?
-    internal(set) var purpose: String?
-    internal(set) var topic: String?
-    internal(set) var name: String?
-    internal(set) var members: [String]?
-    internal(set) var oldName: String?
-    public let upload: Bool?
-    public let itemType: String?
-    internal(set) public var isStarred: Bool?
-    internal(set) var pinnedTo: [String]?
-    public let comment: Comment?
-    public let file: File?
-    internal(set) public var reactions = [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(message: [String: AnyObject]?) {
-        subtype = message?["subtype"] as? String
-        ts = message?["ts"] as? String
-        user = message?["user"] as? String
-        channel = message?["channel"] as? String
-        hidden = message?["hidden"] as? Bool
-        text = message?["text"] as? String
-        botID = message?["bot_id"] as? String
-        username = message?["username"] as? String
-        icons = message?["icons"] as? [String: AnyObject]
-        deletedTs = message?["deleted_ts"] as? String
-        purpose = message?["purpose"] as? String
-        topic = message?["topic"] as? String
-        name = message?["name"] as? String
-        members = message?["members"] as? [String]
-        oldName = message?["old_name"] as? String
-        upload = message?["upload"] as? Bool
-        itemType = message?["item_type"] as? String
-        isStarred = message?["is_starred"] as? Bool
-        pinnedTo = message?["pinned_to"] as? [String]
-        comment = Comment(comment: message?["comment"] as? [String: AnyObject])
-        file = File(file: message?["file"] as? [String: AnyObject])
-        reactions = Reaction.reactionsFromArray(message?["reactions"] as? [[String: AnyObject]])
-        attachments = (message?["attachments"] as? [[String: AnyObject]])?.map{Attachment(attachment: $0)}
-        responseType = ResponseType(rawValue: message?["response_type"] as? String ?? "")
-        replaceOriginal = message?["replace_original"] as? Bool
-        deleteOriginal = message?["delete_original"] as? Bool
-    }
-    
-    internal init(ts:String?) {
-        self.ts = ts
-        subtype = nil
-        user = nil
-        channel = nil
-        botID = nil
-        username = nil
-        icons = nil
-        deletedTs = nil
-        upload = nil
-        itemType = nil
-        comment = nil
-        file = nil
-    }
-
-}
-
-extension Message: Equatable {}
-
-public func ==(lhs: Message, rhs: Message) -> Bool {
-    return lhs.ts == rhs.ts && lhs.user == rhs.user && lhs.text == rhs.text
-}

SlackKit/Sources/MessageActionRequest.swift

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

SlackKit/Sources/MessageActionResponder.swift

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

SlackKit/Sources/MessageActionServer.swift

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

SlackKit/Sources/NetworkInterface.swift

@@ -1,153 +0,0 @@
-//
-// NetworkInterface.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 struct NetworkInterface {
-    
-    private let apiUrl = "https://slack.com/api/"
-    
-    internal func request(endpoint: Endpoint, token: String? = nil, parameters: [String: AnyObject]?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
-        var requestString = "\(apiUrl)\(endpoint.rawValue)?"
-        if let token = token {
-            requestString += "token=\(token)"
-        }
-        if let params = parameters {
-            requestString += params.requestStringFromParameters
-        }
-        guard let url =  NSURL(string: requestString) else {
-            errorClosure(SlackError.ClientNetworkError)
-            return
-        }
-        let request = NSURLRequest(URL:url)
-        NSURLSession.sharedSession().dataTaskWithRequest(request) {
-            (data, response, internalError) -> Void in
-            self.handleResponse(data, response: response, internalError: internalError, successClosure: {(json) in
-                successClosure(json)
-            }, errorClosure: {(error) in
-                errorClosure(error)
-            })
-        }.resume()
-    }
-    
-    internal func customRequest(url: String, data: NSData, success: (Bool)->Void, errorClosure: (SlackError)->Void) {
-        guard let requestString = url.stringByRemovingPercentEncoding, url =  NSURL(string: requestString) else {
-            errorClosure(SlackError.ClientNetworkError)
-            return
-        }
-        let request = NSMutableURLRequest(URL:url)
-        request.HTTPMethod = "POST"
-        let contentType = "application/json"
-        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
-        request.HTTPBody = data
-        
-        NSURLSession.sharedSession().dataTaskWithRequest(request) {
-            (data, response, internalError) -> Void in
-            if internalError == nil {
-                success(true)
-            } else {
-                errorClosure(SlackError.ClientNetworkError)
-            }
-            }.resume()
-    }
-    
-    internal func uploadRequest(token: String, data: NSData, parameters: [String: AnyObject]?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
-        var requestString = "\(apiUrl)\(Endpoint.FilesUpload.rawValue)?token=\(token)"
-        if let params = parameters {
-            requestString = requestString + params.requestStringFromParameters
-        }
-        guard let url =  NSURL(string: requestString) else {
-            errorClosure(SlackError.ClientNetworkError)
-            return
-        }
-        let request = NSMutableURLRequest(URL:url)
-        request.HTTPMethod = "POST"
-        let boundaryConstant = randomBoundary()
-        let contentType = "multipart/form-data; boundary=" + boundaryConstant
-        let boundaryStart = "--\(boundaryConstant)\r\n"
-        let boundaryEnd = "--\(boundaryConstant)--\r\n"
-        let contentDispositionString = "Content-Disposition: form-data; name=\"file\"; filename=\"\(parameters!["filename"])\"\r\n"
-        let contentTypeString = "Content-Type: \(parameters!["filetype"])\r\n\r\n"
-
-        let requestBodyData : NSMutableData = NSMutableData()
-        requestBodyData.appendData(boundaryStart.dataUsingEncoding(NSUTF8StringEncoding)!)
-        requestBodyData.appendData(contentDispositionString.dataUsingEncoding(NSUTF8StringEncoding)!)
-        requestBodyData.appendData(contentTypeString.dataUsingEncoding(NSUTF8StringEncoding)!)
-        requestBodyData.appendData(data)
-        requestBodyData.appendData("\r\n".dataUsingEncoding(NSUTF8StringEncoding)!)
-        requestBodyData.appendData(boundaryEnd.dataUsingEncoding(NSUTF8StringEncoding)!)
-        
-        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
-        request.HTTPBody = requestBodyData
-
-        NSURLSession.sharedSession().dataTaskWithRequest(request) {
-            (data, response, internalError) -> Void in
-            self.handleResponse(data, response: response, internalError: internalError, successClosure: {(json) in
-                successClosure(json)
-            }, errorClosure: {(error) in
-                errorClosure(error)
-            })
-        }.resume()
-    }
-    
-    private func handleResponse(data: NSData?, response:NSURLResponse?, internalError:NSError?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
-        guard let data = data, response = response as? NSHTTPURLResponse else {
-            errorClosure(SlackError.ClientNetworkError)
-            return
-        }
-        do {
-            guard let json = try NSJSONSerialization.JSONObjectWithData(data, options: []) as? [String: AnyObject] else {
-                errorClosure(SlackError.ClientJSONError)
-                return
-            }
-            
-            switch response.statusCode {
-            case 200:
-                if (json["ok"] as! Bool == true) {
-                    successClosure(json)
-                } else {
-                    if let errorString = json["error"] as? String {
-                        throw SlackError(rawValue: errorString) ?? .UnknownError
-                    } else {
-                        throw SlackError.UnknownError
-                    }
-                }
-            case 429:
-                throw SlackError.TooManyRequests
-            default:
-                throw SlackError.ClientNetworkError
-            }
-        } catch let error {
-            if let slackError = error as? SlackError {
-                errorClosure(slackError)
-            } else {
-                errorClosure(SlackError.UnknownError)
-            }
-        }
-    }
-    
-    private func randomBoundary() -> String {
-        return String(format: "slackkit.boundary.%08x%08x", arc4random(), arc4random())
-    }
-    
-}

SlackKit/Sources/OAuthResponse.swift

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

SlackKit/Sources/OAuthServer.swift

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

SlackKit/Sources/Reaction.swift

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

SlackKit/Sources/Response.swift

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

SlackKit/Sources/Scope.swift

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

SlackKit/Sources/Server.swift

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

SlackKit/Sources/SlackError.swift

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

SlackKit/Sources/SlackKit.swift

@@ -1,65 +0,0 @@
-//
-// SlackKit.swift
-//
-// Copyright © 2016 Peter Zignego. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-import Foundation
-
-public final class SlackKit: OAuthDelegate {
-    
-    internal(set) public var oauth: OAuthServer?
-    internal(set) public var clients: [String: Client] = [:]
-    private let clientOptions: ClientOptions
-    // Initalization block
-    public var onClientInitalization: ((Client) -> Void)?
-    
-    // If you already have an API token
-    public init(withAPIToken token: String, clientOptions: ClientOptions = ClientOptions()) {
-        self.clientOptions = clientOptions
-        let client = Client(apiToken: token)
-        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/Team.swift

@@ -1,47 +0,0 @@
-//
-// Team.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 Team {
-    
-    public let id: String?
-    internal(set) public var name: String?
-    internal(set) public var domain: String?
-    internal(set) public var emailDomain: String?
-    internal(set) public var messageEditWindowMinutes: Int?
-    internal(set) public var overStorageLimit: Bool?
-    internal(set) public var prefs: [String: AnyObject]?
-    internal(set) public var plan: String?
-    internal(set) public var icon: TeamIcon?
-    
-    internal init(team: [String: AnyObject]?) {
-        id = team?["id"] as? String
-        name = team?["name"] as? String
-        domain = team?["domain"] as? String
-        emailDomain = team?["email_domain"] as? String
-        messageEditWindowMinutes = team?["msg_edit_window_mins"] as? Int
-        overStorageLimit = team?["over_storage_limit"] as? Bool
-        prefs = team?["prefs"] as? [String: AnyObject]
-        plan = team?["plan"] as? String
-        icon = TeamIcon(icon: team?["icon"] as? [String: AnyObject])
-    }
-}

SlackKit/Sources/TeamIcon.swift

@@ -1,44 +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: AnyObject]?) {
-        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,34 +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: AnyObject]?) {
-        value = topic?["value"] as? String
-        creator = topic?["creator"] as? String
-        lastSet = topic?["last_set"] as? Int
-    }
-}

SlackKit/Sources/User.swift

@@ -1,106 +0,0 @@
-//
-// User.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 User {
-    
-    public struct Profile {
-        internal(set) public var firstName: String?
-        internal(set) public var lastName: String?
-        internal(set) public var realName: String?
-        internal(set) public var email: String?
-        internal(set) public var skype: String?
-        internal(set) public var phone: String?
-        internal(set) public var image24: String?
-        internal(set) public var image32: String?
-        internal(set) public var image48: String?
-        internal(set) public var image72: String?
-        internal(set) public var image192: String?
-        internal(set) public var customProfile: CustomProfile?
-        
-        internal init(profile: [String: AnyObject]?) {
-            firstName = profile?["first_name"] as? String
-            lastName = profile?["last_name"] as? String
-            realName = profile?["real_name"] as? String
-            email = profile?["email"] as? String
-            skype = profile?["skype"] as? String
-            phone = profile?["phone"] as? String
-            image24 = profile?["image_24"] as? String
-            image32 = profile?["image_32"] as? String
-            image48 = profile?["image_48"] as? String
-            image72 = profile?["image_72"] as? String
-            image192 = profile?["image_192"] as? String
-            customProfile = CustomProfile(customFields: profile?["fields"] as? [String: AnyObject])
-        }
-    }
-    
-    
-    public let id: String?
-    internal(set) public var name: String?
-    internal(set) public var deleted: Bool?
-    internal(set) public var profile: Profile?
-    internal(set) public var doNotDisturbStatus: DoNotDisturbStatus?
-    internal(set) public var presence: String?
-    internal(set) public var color: String?
-    public let isBot: Bool?
-    internal(set) public var isAdmin: Bool?
-    internal(set) public var isOwner: Bool?
-    internal(set) public var isPrimaryOwner: Bool?
-    internal(set) public var isRestricted: Bool?
-    internal(set) public var isUltraRestricted: Bool?
-    internal(set) public var has2fa: Bool?
-    internal(set) public var hasFiles: Bool?
-    internal(set) public var status: String?
-    internal(set) public var timeZone: String?
-    internal(set) public var timeZoneLabel: String?
-    internal(set) public var timeZoneOffSet: Int?
-    internal(set) public var preferences: [String: AnyObject]?
-    // Client properties
-    internal(set) public var userGroups: [String: String]?
-    
-    internal init(user: [String: AnyObject]?) {
-        id = user?["id"] as? String
-        name = user?["name"] as? String
-        deleted = user?["deleted"] as? Bool
-        profile = Profile(profile: user?["profile"] as? [String: AnyObject])
-        color = user?["color"] as? String
-        isAdmin = user?["is_admin"] as? Bool
-        isOwner = user?["is_owner"] as? Bool
-        isPrimaryOwner = user?["is_primary_owner"] as? Bool
-        isRestricted = user?["is_restricted"] as? Bool
-        isUltraRestricted = user?["is_ultra_restricted"] as? Bool
-        has2fa = user?["has_2fa"] as? Bool
-        hasFiles = user?["has_files"] as? Bool
-        isBot = user?["is_bot"] as? Bool
-        presence = user?["presence"] as? String
-        status = user?["status"] as? String
-        timeZone = user?["tz"] as? String
-        timeZoneLabel = user?["tz_label"] as? String
-        timeZoneOffSet = user?["tz_offset"] as? Int
-        preferences = user?["prefs"] as? [String: AnyObject]
-    }
-    
-    internal init(id: String?) {
-        self.id = id
-        self.isBot = nil
-    }
-}

SlackKit/Sources/UserGroup.swift

@@ -1,66 +0,0 @@
-//
-// UserGroup.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 UserGroup {
-    
-    public let id: String?
-    internal(set) public var teamID: String?
-    public let isUserGroup: Bool?
-    internal(set) public var name: String?
-    internal(set) public var description: String?
-    internal(set) public var handle: String?
-    internal(set) public var isExternal: Bool?
-    public let dateCreated: Int?
-    internal(set) public var dateUpdated: Int?
-    internal(set) public var dateDeleted: Int?
-    internal(set) public var autoType: String?
-    public let createdBy: String?
-    internal(set) public var updatedBy: String?
-    internal(set) public var deletedBy: String?
-    internal(set) public var preferences: [String: AnyObject]?
-    internal(set) public var users: [String]?
-    internal(set) public var userCount: Int?
-    
-    internal init(userGroup: [String: AnyObject]?) {
-        id = userGroup?["id"] as? String
-        teamID = userGroup?["team_id"] as? String
-        isUserGroup = userGroup?["is_usergroup"] as? Bool
-        name = userGroup?["name"] as? String
-        description = userGroup?["description"] as? String
-        handle = userGroup?["handle"] as? String
-        isExternal = userGroup?["is_external"] as? Bool
-        dateCreated = userGroup?["date_create"] as? Int
-        dateUpdated = userGroup?["date_update"] as? Int
-        dateDeleted = userGroup?["date_delete"] as? Int
-        autoType = userGroup?["auto_type"] as? String
-        createdBy = userGroup?["created_by"] as? String
-        updatedBy = userGroup?["updated_by"] as? String
-        deletedBy = userGroup?["deleted_by"] as? String
-        preferences = userGroup?["prefs"] as? [String: AnyObject]
-        users = userGroup?["users"] as? [String]
-        if let count = userGroup?["user_count"] as? String {
-            userCount = Int(count)
-        }
-    }
-    
-}

SlackKit/Sources/WebAPI.swift

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

SlackKit/Sources/WebhookRequest.swift

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

SlackKit/Sources/WebhookServer.swift

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

SlackKit/Supporting Files/Info-iOS.plist

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

SlackKit/Supporting Files/Info-tvOS.plist

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

Sources/SlackKit.swift

@@ -0,0 +1,104 @@
+//
+// SlackKit.swift
+//
+// Copyright © 2017 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
+@_exported import SKClient
+@_exported import SKCore
+@_exported import SKRTMAPI
+@_exported import SKServer
+@_exported import SKWebAPI
+
+public final class SlackKit: RTMAdapter {
+    
+    public typealias EventClosure = (Event, Client?) -> Void
+    internal typealias TypedEvent = (EventType, EventClosure)
+    internal var callbacks = [TypedEvent]()
+    
+    internal(set) public var rtm: SKRTMAPI?
+    internal(set) public var server: SKServer?
+    internal(set) public var webAPI: WebAPI?
+    internal(set) public var clients: [String: Client] = [:]
+    
+    public init() {}
+
+    public func addWebAPIAccessWithToken(_ token: String) {
+        self.webAPI = WebAPI(token: token)
+    }
+    
+    public func addRTMBotWithAPIToken(_ token: String, client: Client? = Client(), options: RTMOptions = RTMOptions(), rtm: RTMWebSocket? = nil) {
+        self.rtm = SKRTMAPI(withAPIToken: token, options: options, rtm: rtm)
+        self.rtm?.adapter = self
+        clients[token] = client
+        self.rtm?.connect()
+    }
+    
+    public func addServer(_ server: SlackKitServer? = nil, responder: SlackKitResponder? = nil, oauth: OAuthConfig? = nil) {
+        var responder: SlackKitResponder = responder ?? SlackKitResponder(routes: [])
+        if let oauth = oauth {
+            responder.routes.append(oauthRequestRoute(config: oauth))
+        }
+        self.server = SKServer(server: server, responder: responder)
+        self.server?.start()
+    }
+    
+    private func oauthRequestRoute(config: OAuthConfig) -> RequestRoute {
+        let oauth = OAuthMiddleware(config: config) { authorization in
+            // User
+            if let token = authorization.accessToken {
+                self.webAPI = WebAPI(token: token)
+            }
+            // Bot User
+            if let token = authorization.bot?.botToken {
+                self.webAPI = WebAPI(token: token)
+                self.rtm = SKRTMAPI(withAPIToken: token, options: RTMOptions(), rtm: nil)
+                self.rtm?.adapter = self
+                self.clients[token] = Client()
+                self.rtm?.connect()
+            }
+        }
+        return RequestRoute(path: "/oauth", middleware: oauth)
+    }
+    
+    //MARK: - RTM Adapter
+    public func initialSetup(json: [String: Any], instance: SKRTMAPI) {
+        clients[instance.token]?.initialSetup(JSON: json)
+    }
+    
+    public func notificationForEvent(_ event: Event, type: EventType, instance: SKRTMAPI) {
+        let client = clients[instance.token]
+        client?.notificationForEvent(event, type: type)
+        executeCallbackForEvent(event, type: type, client: client)
+    }
+    
+    //MARK: - Callbacks
+    public func notificationForEvent(_ type: EventType, event: @escaping EventClosure) {
+        callbacks.append((type, event))
+    }
+    
+    private func executeCallbackForEvent(_ event: Event, type: EventType, client: Client?) {
+        let cbs = callbacks.filter {$0.0 == type}
+        for callback in cbs {
+            callback.1(event, client)
+        }
+    }
+}

Supporting Files/Info.plist

@@ -15,13 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
+	<string>4.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Peter Zignego. All rights reserved.</string>
+	<string>Copyright © 2017 Peter Zignego. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>