Update podspec, project, info.plist

Add bot accessible Slack Web API endpoints

README.md

@@ -1,10 +1,10 @@
 ![SlackKit](https://cloud.githubusercontent.com/assets/8311605/10260893/5ec60f96-694e-11e5-91fd-da6845942201.png)
 ##iOS/OS X Slack Client Library
 ###Description
-This is a Slack client library for iOS and OS X written in Swift. It's intended to expose all of the functionality of Slack's [Real Time Messaging API](https://api.slack.com/rtm).
+This is a Slack client library for iOS and OS X written in Swift. It's intended to expose all of the functionality of Slack's [Real Time Messaging API](https://api.slack.com/rtm) as well as the [web APIs](https://api.slack.com/web) that are accessible by [bot users](https://api.slack.com/bot-users).
 
 ###Installation
-####Swift Package Manager (Swift 2.2 and up)
+####Swift Package Manager
 Add SlackKit to your Package.swift
 
 ```swift
@@ -37,17 +37,88 @@ import SlackKit
 ###Usage
 To use SlackKit you'll need a bearer token which identifies a single user. You can generate a [full access token or create one using OAuth 2](https://api.slack.com/web).
 
-Once you have a token, give it to the Client:
+Once you have a token, initialize a client instance using it:
 ```swift
-Client.sharedInstance.setAuthToken("YOUR_SLACK_AUTH_TOKEN")
+let client = Client(apiToken: "YOUR_SLACK_API_TOKEN")
+
 ```
-and connect:
+
+If you want to receive messages from the Slack RTM API, connect to it.
 ```swift
-Client.sharedInstance.connect()
+client.connect()
 ```
+
 Once connected, the client will begin to consume any messages sent by the Slack RTM API.
 
+####Web API Methods
+SlackKit currently supports the a subset of the Slack Web APIs that are available to bot users:
+
+- api.test
+- auth.test
+- channels.history
+- channels.info
+- channels.list
+- channels.mark
+- channels.setPurpose
+- channels.setTopic
+- chat.delete
+- chat.postMessage
+- chat.update
+- emoji.list
+- files.delete
+- 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
+- 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)
+}
+```
+
 ####Delegate methods
+
+To receive delegate callbacks for certain events, register an object as the delegate for those events:
+```swift
+client.slackEventsDelegate = self
+```
+
 There are a number of delegates that you can set to receive callbacks for certain events.
 
 #####SlackEventsDelegate
@@ -138,18 +209,6 @@ func subteamSelfAdded(subteamID: String)
 func subteamSelfRemoved(subteamID: String)
 ```
 
-###Examples
-####Sending a Message:
-```swift
-Client.sharedInstance.sendMessage(message: "Hello, world!", channelID: "CHANNEL_ID")
-```
-
-####Print a List of Users in a Channel:
-```swift
-let users = Client.sharedInstance.channels?["CHANNEL_ID"]?.members
-print(users)
-```
-
 ###Get In Touch
 [@pvzig](https://twitter.com/pvzig)
 

SlackKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "SlackKit"
-  s.version          = "0.9.5"
+  s.version          = "0.9.8"
   s.summary          = "a Slack client library for iOS and OS X written in Swift"
   s.homepage         = "https://github.com/pvzig/SlackKit"
   s.license          = 'MIT'
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.9'
   s.requires_arc = true
-  s.source_files = 'SlackKit/*.swift'  
+  s.source_files = 'SlackKit/Sources/*.swift'  
   s.frameworks = 'Foundation'
   s.dependency 'Starscream', '~> 1.0.2'
 end

SlackKit.xcodeproj/project.pbxproj

@@ -7,6 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2601D61B1C7646B80012BF22 /* SlackWebAPIErrorDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2601D61A1C7646B80012BF22 /* SlackWebAPIErrorDispatcher.swift */; };
+		260EC2331C4DC61D0093B253 /* ClientExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2301C4DC61D0093B253 /* ClientExtensions.swift */; };
+		260EC2341C4DC61D0093B253 /* NetworkInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2311C4DC61D0093B253 /* NetworkInterface.swift */; };
+		260EC2351C4DC61D0093B253 /* SlackWebAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 260EC2321C4DC61D0093B253 /* SlackWebAPI.swift */; };
 		26BBA1941C398E3C00BF7225 /* Bot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1871C398E3C00BF7225 /* Bot.swift */; };
 		26BBA1951C398E3C00BF7225 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1881C398E3C00BF7225 /* Channel.swift */; };
 		26BBA1961C398E3C00BF7225 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1891C398E3C00BF7225 /* Client.swift */; };
@@ -24,7 +28,11 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		2601D61A1C7646B80012BF22 /* SlackWebAPIErrorDispatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SlackWebAPIErrorDispatcher.swift; path = Sources/SlackWebAPIErrorDispatcher.swift; sourceTree = "<group>"; };
 		26072A341BB48B3A00CD650C /* SlackKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SlackKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		260EC2301C4DC61D0093B253 /* ClientExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ClientExtensions.swift; path = Sources/ClientExtensions.swift; sourceTree = "<group>"; };
+		260EC2311C4DC61D0093B253 /* NetworkInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NetworkInterface.swift; path = Sources/NetworkInterface.swift; sourceTree = "<group>"; };
+		260EC2321C4DC61D0093B253 /* SlackWebAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SlackWebAPI.swift; path = Sources/SlackWebAPI.swift; sourceTree = "<group>"; };
 		2661A6A41BBF62FF0026F67B /* SlackKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SlackKit.h; sourceTree = "<group>"; };
 		266E05F01BBF780C00840D76 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		26BBA1871C398E3C00BF7225 /* Bot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Bot.swift; path = Sources/Bot.swift; sourceTree = "<group>"; };
@@ -90,12 +98,16 @@
 				26BBA1871C398E3C00BF7225 /* Bot.swift */,
 				26BBA1881C398E3C00BF7225 /* Channel.swift */,
 				26BBA1891C398E3C00BF7225 /* Client.swift */,
+				260EC2301C4DC61D0093B253 /* ClientExtensions.swift */,
 				26BBA18A1C398E3C00BF7225 /* Event.swift */,
 				26BBA18B1C398E3C00BF7225 /* EventDelegate.swift */,
 				26BBA18C1C398E3C00BF7225 /* EventDispatcher.swift */,
 				26BBA18D1C398E3C00BF7225 /* EventHandler.swift */,
 				26BBA18E1C398E3C00BF7225 /* File.swift */,
 				26BBA18F1C398E3C00BF7225 /* Message.swift */,
+				260EC2311C4DC61D0093B253 /* NetworkInterface.swift */,
+				260EC2321C4DC61D0093B253 /* SlackWebAPI.swift */,
+				2601D61A1C7646B80012BF22 /* SlackWebAPIErrorDispatcher.swift */,
 				26BBA1901C398E3C00BF7225 /* Team.swift */,
 				26BBA1911C398E3C00BF7225 /* Types.swift */,
 				26BBA1921C398E3C00BF7225 /* User.swift */,
@@ -236,9 +248,13 @@
 				26BBA1971C398E3C00BF7225 /* Event.swift in Sources */,
 				26BBA1941C398E3C00BF7225 /* Bot.swift in Sources */,
 				26BBA19B1C398E3C00BF7225 /* File.swift in Sources */,
+				260EC2351C4DC61D0093B253 /* SlackWebAPI.swift in Sources */,
 				26BBA19C1C398E3C00BF7225 /* Message.swift in Sources */,
 				26BBA19D1C398E3C00BF7225 /* Team.swift in Sources */,
+				260EC2331C4DC61D0093B253 /* ClientExtensions.swift in Sources */,
 				26BBA1A01C398E3C00BF7225 /* UserGroup.swift in Sources */,
+				2601D61B1C7646B80012BF22 /* SlackWebAPIErrorDispatcher.swift in Sources */,
+				260EC2341C4DC61D0093B253 /* NetworkInterface.swift in Sources */,
 				26BBA1981C398E3C00BF7225 /* EventDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

SlackKit/Info.plist

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

SlackKit/Sources/Client.swift

@@ -50,41 +50,38 @@ public class Client: WebSocketDelegate {
     public var reactionEventsDelegate: ReactionEventsDelegate?
     public var teamEventsDelegate: TeamEventsDelegate?
     public var subteamEventsDelegate: SubteamEventsDelegate?
+    
+    internal var token = "SLACK_AUTH_TOKEN"
 
-    private var token = "SLACK_AUTH_TOKEN"
     public func setAuthToken(token: String) {
         self.token = token
     }
     
-    private var webSocket: WebSocket?
+    public var webAPI: SlackWebAPI {
+        return SlackWebAPI(client: self)
+    }
+
+    internal var webSocket: WebSocket?
+    private var dispatcher: EventDispatcher?
     
-    required public init() {
-        
+    internal let api = NetworkInterface()
+    
+    required public init(apiToken: String) {
+        self.token = apiToken
     }
     
-    public static let sharedInstance = Client()
-    
-    //MARK: - Connection
     public func connect() {
-        let request = NSURLRequest(URL: NSURL(string:"https://slack.com/api/rtm.start?token="+token)!)
-        NSURLConnection.sendAsynchronousRequest(request, queue: NSOperationQueue.currentQueue()!) {
-            (response, data, error) -> Void in
-            guard let data = data else {
-                return
+        dispatcher = EventDispatcher(client: self)
+        webAPI.rtmStart(success: {
+            (response) -> Void in
+            self.initialSetup(response)
+            if let socketURL = response["url"] as? String {
+                let url = NSURL(string: socketURL)
+                self.webSocket = WebSocket(url: url!)
+                self.webSocket?.delegate = self
+                self.webSocket?.connect()
             }
-            do {
-                let result = try NSJSONSerialization.JSONObjectWithData(data, options: []) as! [String: AnyObject]
-                if (result["ok"] as! Bool == true) {
-                    self.initialSetup(result)
-                    let socketURL = NSURL(string: result["url"] as! String)
-                    self.webSocket = WebSocket(url: socketURL!)
-                    self.webSocket?.delegate = self
-                    self.webSocket?.connect()
-                }
-            } catch _ {
-                print(error)
-            }
-        }
+            }, failure:nil)
     }
     
     //MARK: - Message send
@@ -92,7 +89,7 @@ public class Client: WebSocketDelegate {
         if (connected) {
             if let data = formatMessageToSlackJsonString(msg: message, channel: channelID) {
                 let string = NSString(data: data, encoding: NSUTF8StringEncoding)
-                self.webSocket?.writeString(string as! String)
+                webSocket?.writeString(string as! String)
             }
         }
     }
@@ -102,7 +99,7 @@ public class Client: WebSocketDelegate {
             "id": NSDate().timeIntervalSince1970,
             "type": "message",
             "channel": message.channel,
-            "text": slackFormatEscaping(message.msg)
+            "text": message.msg.slackFormatEscaping()
         ]
         addSentMessage(json)
         do {
@@ -123,15 +120,8 @@ public class Client: WebSocketDelegate {
         sentMessages[ts!.stringValue] = Message(message: message)
     }
     
-    private func slackFormatEscaping(string: String) -> String {
-        var escapedString = string.stringByReplacingOccurrencesOfString("&", withString: "&")
-        escapedString = escapedString.stringByReplacingOccurrencesOfString("<", withString: "&lt;")
-        escapedString = escapedString.stringByReplacingOccurrencesOfString(">", withString: "&gt;")
-        return escapedString
-    }
-    
     //MARK: - Client setup
-    private func initialSetup(json: [String: AnyObject]) {
+    internal 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])
@@ -144,7 +134,7 @@ public class Client: WebSocketDelegate {
         enumerateSubteams(json["subteams"] as? [String: AnyObject])
     }
     
-    private func enumerateUsers(users: [AnyObject]?) {
+    internal func enumerateUsers(users: [AnyObject]?) {
         if let users = users {
             for user in users {
                 let u = User(user: user as? [String: AnyObject])
@@ -153,7 +143,7 @@ public class Client: WebSocketDelegate {
         }
     }
     
-    private func enumerateChannels(channels: [AnyObject]?) {
+    internal func enumerateChannels(channels: [AnyObject]?) {
         if let channels = channels {
             for channel in channels {
                 let c = Channel(channel: channel as? [String: AnyObject])
@@ -162,7 +152,7 @@ public class Client: WebSocketDelegate {
         }
     }
     
-    private func enumerateGroups(groups: [AnyObject]?) {
+    internal func enumerateGroups(groups: [AnyObject]?) {
         if let groups = groups {
             for group in groups {
                 let g = Channel(channel: group as? [String: AnyObject])
@@ -171,7 +161,7 @@ public class Client: WebSocketDelegate {
         }
     }
     
-    private func enumerateIMs(ims: [AnyObject]?) {
+    internal func enumerateIMs(ims: [AnyObject]?) {
         if let ims = ims {
             for im in ims {
                 let i = Channel(channel: im as? [String: AnyObject])
@@ -180,7 +170,7 @@ public class Client: WebSocketDelegate {
         }
     }
     
-    private func enumerateMPIMs(mpims: [AnyObject]?) {
+    internal func enumerateMPIMs(mpims: [AnyObject]?) {
         if let mpims = mpims {
             for mpim in mpims {
                 let m = Channel(channel: mpim as? [String: AnyObject])
@@ -189,7 +179,7 @@ public class Client: WebSocketDelegate {
         }
     }
     
-    private func enumerateBots(bots: [AnyObject]?) {
+    internal func enumerateBots(bots: [AnyObject]?) {
         if let bots = bots {
             for bot in bots {
                 let b = Bot(bot: bot as? [String: AnyObject])
@@ -198,7 +188,7 @@ public class Client: WebSocketDelegate {
         }
     }
     
-    private func enumerateSubteams(subteams: [String: AnyObject]?) {
+    internal func enumerateSubteams(subteams: [String: AnyObject]?) {
         if let subteams = subteams {
             if let all = subteams["all"] as? [[String: AnyObject]] {
                 for item in all {
@@ -216,8 +206,7 @@ public class Client: WebSocketDelegate {
     }
     
     // MARK: - WebSocketDelegate
-    public func websocketDidConnect(socket: WebSocket) {
-    }
+    public func websocketDidConnect(socket: WebSocket) {}
     
     public func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
         connected = false
@@ -233,14 +222,13 @@ public class Client: WebSocketDelegate {
             return
         }
         do {
-            try EventDispatcher.eventDispatcher(NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions.AllowFragments) as! [String: AnyObject])
+            try dispatcher?.dispatch(NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions.AllowFragments) as! [String: AnyObject])
         }
         catch _ {
             
         }
     }
     
-    public func websocketDidReceiveData(socket: WebSocket, data: NSData) {
-    }
+    public func websocketDidReceiveData(socket: WebSocket, data: NSData) {}
     
 }

SlackKit/Sources/ClientExtensions.swift

@@ -0,0 +1,85 @@
+//
+// ClientExtensions.swift
+//
+// Copyright © 2016 Peter Zignego. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+extension Client {
+    
+    //MARK: - User & Channel
+    public func getChannelOrUserIdByName(name: String) -> String? {
+        if (name[name.startIndex] == "@") {
+            return getUserIdByName(name)
+        } else if (name[name.startIndex] == "C") {
+            return getChannelIDByName(name)
+        }
+        return nil
+    }
+    
+    public func getChannelIDByName(name: String) -> String? {
+        return channels.filter{$0.1.name == stripString(name)}.first?.0
+    }
+    
+    public func getUserIdByName(name: String) -> String? {
+        return users.filter{$0.1.name == stripString(name)}.first?.0
+    }
+    
+    public func getImIDForUserWithID(id: String, success: (imID: String?)->Void, failure: (error: SlackError)->Void) {
+        let ims = channels.filter{$0.1.isIM == true}
+        let channel = ims.filter{$0.1.user == id}.first
+        if let channel = channel {
+            success(imID: channel.0)
+        } else {
+            webAPI.openIM(id, success: success, failure: failure)
+        }
+    }
+    
+    //MARK: - Utilities
+    internal func stripString(var string: String) -> String {
+        if string[string.startIndex] == "@" {
+            string = string.substringFromIndex(string.startIndex.advancedBy(1))
+        } else if string[string.startIndex] == "#" {
+            string = string.substringFromIndex(string.startIndex.advancedBy(1))
+        }
+        return string
+    }
+    
+}
+
+internal extension String {
+    
+    func slackFormatEscaping() -> String {
+        var escapedString = stringByReplacingOccurrencesOfString("&", withString: "&")
+        escapedString = stringByReplacingOccurrencesOfString("<", withString: "&lt;")
+        escapedString = stringByReplacingOccurrencesOfString(">", withString: "&gt;")
+        return escapedString
+    }
+
+}
+
+public extension NSDate {
+    
+    func slackTimestamp() -> String {
+        return NSNumber(double: timeIntervalSince1970).stringValue
+    }
+
+}

SlackKit/Sources/Event.swift

@@ -138,7 +138,7 @@ internal struct Event {
     let domain: String?
     let emailDomain: String?
     let reaction: String?
-    let replyTo: String?
+    let replyTo: Double?
     let reactions: [[String: AnyObject]]?
     let edited: Edited?
     let bot: Bot?
@@ -178,7 +178,7 @@ internal struct Event {
         domain = event["domain"] as? String
         emailDomain = event["email_domain"] as? String
         reaction = event["reaction"] as? String
-        replyTo = event["reply_to"] 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])

SlackKit/Sources/EventDispatcher.swift

@@ -21,122 +21,129 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-internal struct EventDispatcher {
+internal class EventDispatcher {
+    let client: Client
+    let handler: EventHandler
     
-    static func eventDispatcher(event: [String: AnyObject]) {
+    required init(client: Client) {
+        self.client = client
+        handler = EventHandler(client: client)
+    }
+    
+    func dispatch(event: [String: AnyObject]) {
         let event = Event(event: event)
         if let type = event.type {
             switch type {
             case .Hello:
-                EventHandler.connected()
+                handler.connected()
             case .Ok:
-                EventHandler.messageSent(event)
+                handler.messageSent(event)
             case .Message:
                 if (event.subtype != nil) {
                     messageDispatcher(event)
                 } else {
-                    EventHandler.messageReceived(event)
+                    handler.messageReceived(event)
                 }
             case .UserTyping:
-                EventHandler.userTyping(event)
+                handler.userTyping(event)
             case .ChannelMarked, .IMMarked, .GroupMarked:
-                EventHandler.channelMarked(event)
+                handler.channelMarked(event)
             case .ChannelCreated, .IMCreated:
-                EventHandler.channelCreated(event)
+                handler.channelCreated(event)
             case .ChannelJoined, .GroupJoined:
-                EventHandler.channelJoined(event)
+                handler.channelJoined(event)
             case .ChannelLeft, .GroupLeft:
-                EventHandler.channelLeft(event)
+                handler.channelLeft(event)
             case .ChannelDeleted:
-                EventHandler.channelDeleted(event)
+                handler.channelDeleted(event)
             case .ChannelRenamed, .GroupRename:
-                EventHandler.channelRenamed(event)
+                handler.channelRenamed(event)
             case .ChannelArchive, .GroupArchive:
-                EventHandler.channelArchived(event, archived: true)
+                handler.channelArchived(event, archived: true)
             case .ChannelUnarchive, .GroupUnarchive:
-                EventHandler.channelArchived(event, archived: false)
+                handler.channelArchived(event, archived: false)
             case .ChannelHistoryChanged, .IMHistoryChanged, .GroupHistoryChanged:
-                EventHandler.channelHistoryChanged(event)
+                handler.channelHistoryChanged(event)
             case .DNDUpdated:
-                EventHandler.doNotDisturbUpdated(event)
+                handler.doNotDisturbUpdated(event)
             case .DNDUpatedUser:
-                EventHandler.doNotDisturbUserUpdated(event)
+                handler.doNotDisturbUserUpdated(event)
             case .IMOpen, .GroupOpen:
-                EventHandler.open(event, open: true)
+                handler.open(event, open: true)
             case .IMClose, .GroupClose:
-                EventHandler.open(event, open: false)
+                handler.open(event, open: false)
             case .FileCreated:
-                EventHandler.processFile(event)
+                handler.processFile(event)
             case .FileShared:
-                EventHandler.processFile(event)
+                handler.processFile(event)
             case .FileUnshared:
-                EventHandler.processFile(event)
+                handler.processFile(event)
             case .FilePublic:
-                EventHandler.processFile(event)
+                handler.processFile(event)
             case .FilePrivate:
-                EventHandler.filePrivate(event)
+                handler.filePrivate(event)
             case .FileChanged:
-                EventHandler.processFile(event)
+                handler.processFile(event)
             case .FileDeleted:
-                EventHandler.deleteFile(event)
+                handler.deleteFile(event)
             case .FileCommentAdded:
-                EventHandler.fileCommentAdded(event)
+                handler.fileCommentAdded(event)
             case .FileCommentEdited:
-                EventHandler.fileCommentEdited(event)
+                handler.fileCommentEdited(event)
             case .FileCommentDeleted:
-                EventHandler.fileCommentDeleted(event)
+                handler.fileCommentDeleted(event)
             case .PinAdded:
-                EventHandler.pinAdded(event)
+                handler.pinAdded(event)
             case .PinRemoved:
-                EventHandler.pinRemoved(event)
+                handler.pinRemoved(event)
             case .PresenceChange:
-                EventHandler.presenceChange(event)
+                handler.presenceChange(event)
             case .ManualPresenceChange:
-                EventHandler.manualPresenceChange(event)
+                handler.manualPresenceChange(event)
             case .PrefChange:
-                EventHandler.changePreference(event)
+                handler.changePreference(event)
             case .UserChange:
-                EventHandler.userChange(event)
+                handler.userChange(event)
             case .TeamJoin:
-                EventHandler.teamJoin(event)
+                handler.teamJoin(event)
             case .StarAdded:
-                EventHandler.itemStarred(event, star: true)
+                handler.itemStarred(event, star: true)
             case .StarRemoved:
-                EventHandler.itemStarred(event, star: false)
+                handler.itemStarred(event, star: false)
             case .ReactionAdded:
-                EventHandler.addedReaction(event)
+                handler.addedReaction(event)
             case .ReactionRemoved:
-                EventHandler.removedReaction(event)
+                handler.removedReaction(event)
             case .EmojiChanged:
-                EventHandler.emojiChanged(event)
+                handler.emojiChanged(event)
             case .CommandsChanged:
                 // Not implemented per Slack documentation.
                 break
             case .TeamPlanChange:
-                EventHandler.teamPlanChange(event)
+                handler.teamPlanChange(event)
             case .TeamPrefChange:
-                EventHandler.teamPreferenceChange(event)
+                handler.teamPreferenceChange(event)
             case .TeamRename:
-                EventHandler.teamNameChange(event)
+                handler.teamNameChange(event)
             case .TeamDomainChange:
-                EventHandler.teamDomainChange(event)
+                handler.teamDomainChange(event)
             case .EmailDomainChange:
-                EventHandler.emailDomainChange(event)
+                handler.emailDomainChange(event)
             case .BotAdded:
-                EventHandler.bot(event)
+                handler.bot(event)
             case .BotChanged:
-                EventHandler.bot(event)
+                handler.bot(event)
             case .AccountsChanged:
                 // Not implemented per Slack documentation.
                 break
             case .TeamMigrationStarted:
-                Client.sharedInstance.connect()
+                client.connect()
             case .SubteamCreated, .SubteamUpdated:
-                EventHandler.subteam(event)
+                handler.subteam(event)
             case .SubteamSelfAdded:
-                EventHandler.subteamAddedSelf(event)
+                handler.subteamAddedSelf(event)
             case.SubteamSelfRemoved:
-                EventHandler.subteamRemovedSelf(event)
+                handler.subteamRemovedSelf(event)
             case .Error:
                 print("Error: \(event)")
                 break
@@ -144,15 +151,15 @@ internal struct EventDispatcher {
         }
     }
     
-    static func messageDispatcher(event:Event) {
+    func messageDispatcher(event:Event) {
         let subtype = MessageSubtype(rawValue: event.subtype!)!
         switch subtype {
         case .MessageChanged:
-            EventHandler.messageChanged(event)
+            handler.messageChanged(event)
         case .MessageDeleted:
-            EventHandler.messageDeleted(event)
+            handler.messageDeleted(event)
         default:
-            EventHandler.messageReceived(event)
+            handler.messageReceived(event)
         }
     }
     

SlackKit/Sources/EventHandler.swift

@@ -23,70 +23,74 @@
 
 import Foundation
 
-internal struct EventHandler {
+internal class EventHandler {
+    let client: Client
+    required init(client: Client) {
+        self.client = client
+    }
     
     //MARK: - Initial connection
-    static func connected() {
-        Client.sharedInstance.connected = true
+    func connected() {
+        client.connected = true
         
-        if let delegate = Client.sharedInstance.slackEventsDelegate {
+        if let delegate = client.slackEventsDelegate {
             delegate.clientConnected()
         }
     }
     
     //MARK: - Messages
     
-    static func messageSent(event: Event) {
-        if let reply = event.replyTo, message = Client.sharedInstance.sentMessages[reply], channel = message.channel, ts = message.ts {
+    func messageSent(event: Event) {
+        if let reply = event.replyTo, message = client.sentMessages[NSNumber(double: reply).stringValue], channel = message.channel, ts = message.ts {
             message.ts = event.ts
             message.text = event.text
-            Client.sharedInstance.channels[channel]?.messages[ts] = message
+            client.channels[channel]?.messages[ts] = message
             
-            if let delegate = Client.sharedInstance.messageEventsDelegate {
+            if let delegate = client.messageEventsDelegate {
                 delegate.messageSent(message)
             }
         }
     }
     
-    static func messageReceived(event: Event) {
+    func messageReceived(event: Event) {
         if let channel = event.channel, message = event.message, id = channel.id, ts = message.ts {
-            Client.sharedInstance.channels[id]?.messages[ts] = message
+            client.channels[id]?.messages[ts] = message
             
-            if let delegate = Client.sharedInstance.messageEventsDelegate {
+            if let delegate = client.messageEventsDelegate {
                 delegate.messageReceived(message)
             }
         }
     }
     
-    static func messageChanged(event: Event) {
+    func messageChanged(event: Event) {
         if let id = event.channel?.id, nested = event.nestedMessage, ts = nested.ts {
-            Client.sharedInstance.channels[id]?.messages[ts] = nested
+            client.channels[id]?.messages[ts] = nested
             
-            if let delegate = Client.sharedInstance.messageEventsDelegate {
+            if let delegate = client.messageEventsDelegate {
                 delegate.messageChanged(nested)
             }
         }
     }
     
-    static func messageDeleted(event: Event) {
+    func messageDeleted(event: Event) {
         if let id = event.channel?.id, key = event.message?.deletedTs {
-            let message = Client.sharedInstance.channels[id]?.messages[key]
-            Client.sharedInstance.channels[id]?.messages.removeValueForKey(key)
+            let message = client.channels[id]?.messages[key]
+            client.channels[id]?.messages.removeValueForKey(key)
             
-            if let delegate = Client.sharedInstance.messageEventsDelegate {
+            if let delegate = client.messageEventsDelegate {
                 delegate.messageDeleted(message)
             }
         }
     }
     
     //MARK: - Channels
-    static func userTyping(event: Event) {
+    func userTyping(event: Event) {
         if let channelID = event.channel?.id, userID = event.user?.id {
-            if let _ = Client.sharedInstance.channels[channelID] {
-                if (!Client.sharedInstance.channels[channelID]!.usersTyping.contains(userID)) {
-                    Client.sharedInstance.channels[channelID]?.usersTyping.append(userID)
+            if let _ = client.channels[channelID] {
+                if (!client.channels[channelID]!.usersTyping.contains(userID)) {
+                    client.channels[channelID]?.usersTyping.append(userID)
                     
-                    if let delegate = Client.sharedInstance.channelEventsDelegate {
+                    if let delegate = client.channelEventsDelegate {
                         delegate.userTyping(event.channel, user: event.user)
                     }
                 }
@@ -94,222 +98,222 @@ internal struct EventHandler {
             
             let timeout = dispatch_time(DISPATCH_TIME_NOW, Int64(5.0 * Double(NSEC_PER_SEC)))
             dispatch_after(timeout, dispatch_get_main_queue()) {
-                if let index = Client.sharedInstance.channels[channelID]?.usersTyping.indexOf(userID) {
-                    Client.sharedInstance.channels[channelID]?.usersTyping.removeAtIndex(index)
+                if let index = self.client.channels[channelID]?.usersTyping.indexOf(userID) {
+                    self.client.channels[channelID]?.usersTyping.removeAtIndex(index)
                 }
             }
         }
     }
     
-    static func channelMarked(event: Event) {
+    func channelMarked(event: Event) {
         if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels[id]?.lastRead = event.ts
+            client.channels[id]?.lastRead = event.ts
             
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
+            if let delegate = client.channelEventsDelegate {
                 delegate.channelMarked(channel, timestamp: event.ts)
             }
         }
         //TODO: Recalculate unreads
     }
     
-    static func channelCreated(event: Event) {
+    func channelCreated(event: Event) {
         if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels[id] = channel
+            client.channels[id] = channel
             
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
+            if let delegate = client.channelEventsDelegate {
                 delegate.channelCreated(channel)
             }
         }
     }
     
-    static func channelDeleted(event: Event) {
+    func channelDeleted(event: Event) {
         if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels.removeValueForKey(id)
+            client.channels.removeValueForKey(id)
             
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
+            if let delegate = client.channelEventsDelegate {
                 delegate.channelDeleted(channel)
             }
         }
     }
     
-    static func channelJoined(event: Event) {
+    func channelJoined(event: Event) {
         if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels[id] = event.channel
+            client.channels[id] = event.channel
             
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
+            if let delegate = client.channelEventsDelegate {
                 delegate.channelJoined(channel)
             }
         }
     }
     
-    static func channelLeft(event: Event) {
-        if let channel = event.channel, id = channel.id, userID = Client.sharedInstance.authenticatedUser?.id {
-            if let index = Client.sharedInstance.channels[id]?.members.indexOf(userID) {
-                Client.sharedInstance.channels[id]?.members.removeAtIndex(index)
+    func channelLeft(event: Event) {
+        if let channel = event.channel, id = channel.id, userID = client.authenticatedUser?.id {
+            if let index = client.channels[id]?.members.indexOf(userID) {
+                client.channels[id]?.members.removeAtIndex(index)
                 
-                if let delegate = Client.sharedInstance.channelEventsDelegate {
+                if let delegate = client.channelEventsDelegate {
                     delegate.channelLeft(channel)
                 }
             }
         }
     }
     
-    static func channelRenamed(event: Event) {
+    func channelRenamed(event: Event) {
         if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels[id]?.name = channel.name
+            client.channels[id]?.name = channel.name
             
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
+            if let delegate = client.channelEventsDelegate {
                 delegate.channelRenamed(channel)
             }
         }
     }
     
-    static func channelArchived(event: Event, archived: Bool) {
+    func channelArchived(event: Event, archived: Bool) {
         if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels[id]?.isArchived = archived
+            client.channels[id]?.isArchived = archived
             
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
+            if let delegate = client.channelEventsDelegate {
                 delegate.channelArchived(channel)
             }
         }
     }
     
-    static func channelHistoryChanged(event: Event) {
+    func channelHistoryChanged(event: Event) {
         if let channel = event.channel {
             //TODO: Reload chat history if there are any cached messages before latest
             
-            if let delegate = Client.sharedInstance.channelEventsDelegate {
+            if let delegate = client.channelEventsDelegate {
                 delegate.channelHistoryChanged(channel)
             }
         }
     }
     
     //MARK: - Do Not Disturb
-    static func doNotDisturbUpdated(event: Event) {
+    func doNotDisturbUpdated(event: Event) {
         if let dndStatus = event.dndStatus {
-            Client.sharedInstance.authenticatedUser?.doNotDisturbStatus = dndStatus
+            client.authenticatedUser?.doNotDisturbStatus = dndStatus
             
-            if let delegate = Client.sharedInstance.doNotDisturbEventsDelegate {
+            if let delegate = client.doNotDisturbEventsDelegate {
                 delegate.doNotDisturbUpdated(dndStatus)
             }
         }
     }
     
-    static func doNotDisturbUserUpdated(event: Event) {
+    func doNotDisturbUserUpdated(event: Event) {
         if let dndStatus = event.dndStatus, user = event.user, id = user.id {
-            Client.sharedInstance.users[id]?.doNotDisturbStatus = dndStatus
+            client.users[id]?.doNotDisturbStatus = dndStatus
             
-            if let delegate = Client.sharedInstance.doNotDisturbEventsDelegate {
+            if let delegate = client.doNotDisturbEventsDelegate {
                 delegate.doNotDisturbUserUpdated(dndStatus, user: user)
             }
         }
     }
     
     //MARK: - IM & Group Open/Close
-    static func open(event: Event, open: Bool) {
+    func open(event: Event, open: Bool) {
         if let channel = event.channel, id = channel.id {
-            Client.sharedInstance.channels[id]?.isOpen = open
+            client.channels[id]?.isOpen = open
             
-            if let delegate = Client.sharedInstance.groupEventsDelegate {
+            if let delegate = client.groupEventsDelegate {
                 delegate.groupOpened(channel)
             }
         }
     }
     
     //MARK: - Files
-    static func processFile(event: Event) {
+    func processFile(event: Event) {
         if let file = event.file, id = file.id {
             if let comment = file.initialComment, commentID = comment.id {
-                if Client.sharedInstance.files[id]?.comments[commentID] == nil {
-                    Client.sharedInstance.files[id]?.comments[commentID] = comment
+                if client.files[id]?.comments[commentID] == nil {
+                    client.files[id]?.comments[commentID] = comment
                 }
             }
             
-            Client.sharedInstance.files[id] = file
+            client.files[id] = file
             
-            if let delegate = Client.sharedInstance.fileEventsDelegate {
+            if let delegate = client.fileEventsDelegate {
                 delegate.fileProcessed(file)
             }
         }
     }
     
-    static func filePrivate(event: Event) {
+    func filePrivate(event: Event) {
         if let file =  event.file, id = file.id {
-            Client.sharedInstance.files[id]?.isPublic = false
+            client.files[id]?.isPublic = false
             
-            if let delegate = Client.sharedInstance.fileEventsDelegate {
+            if let delegate = client.fileEventsDelegate {
                 delegate.fileMadePrivate(file)
             }
         }
     }
     
-    static func deleteFile(event: Event) {
+    func deleteFile(event: Event) {
         if let file = event.file, id = file.id {
-            if Client.sharedInstance.files[id] != nil {
-                Client.sharedInstance.files.removeValueForKey(id)
+            if client.files[id] != nil {
+                client.files.removeValueForKey(id)
             }
             
-            if let delegate = Client.sharedInstance.fileEventsDelegate {
+            if let delegate = client.fileEventsDelegate {
                 delegate.fileDeleted(file)
             }
         }
     }
     
-    static func fileCommentAdded(event: Event) {
+    func fileCommentAdded(event: Event) {
         if let file = event.file, id = file.id, comment = event.comment, commentID = comment.id {
-            Client.sharedInstance.files[id]?.comments[commentID] = comment
+            client.files[id]?.comments[commentID] = comment
             
-            if let delegate = Client.sharedInstance.fileEventsDelegate {
+            if let delegate = client.fileEventsDelegate {
                 delegate.fileCommentAdded(file, comment: comment)
             }
         }
     }
     
-    static func fileCommentEdited(event: Event) {
+    func fileCommentEdited(event: Event) {
         if let file = event.file, id = file.id, comment = event.comment, commentID = comment.id {
-            Client.sharedInstance.files[id]?.comments[commentID]?.comment = comment.comment
+            client.files[id]?.comments[commentID]?.comment = comment.comment
             
-            if let delegate = Client.sharedInstance.fileEventsDelegate {
+            if let delegate = client.fileEventsDelegate {
                 delegate.fileCommentEdited(file, comment: comment)
             }
         }
     }
     
-    static func fileCommentDeleted(event: Event) {
+    func fileCommentDeleted(event: Event) {
         if let file = event.file, id = file.id, comment = event.comment, commentID = comment.id {
-            Client.sharedInstance.files[id]?.comments.removeValueForKey(commentID)
+            client.files[id]?.comments.removeValueForKey(commentID)
             
-            if let delegate = Client.sharedInstance.fileEventsDelegate {
+            if let delegate = client.fileEventsDelegate {
                 delegate.fileCommentDeleted(file, comment: comment)
             }
         }
     }
     
     //MARK: - Pins
-    static func pinAdded(event: Event) {
+    func pinAdded(event: Event) {
         if let id = event.channelID, item = event.item {
-            Client.sharedInstance.channels[id]?.pinnedItems.append(item)
+            client.channels[id]?.pinnedItems.append(item)
             
-            if let delegate = Client.sharedInstance.pinEventsDelegate {
-                delegate.itemPinned(item, channel: Client.sharedInstance.channels[id])
+            if let delegate = client.pinEventsDelegate {
+                delegate.itemPinned(item, channel: client.channels[id])
             }
         }
     }
     
-    static func pinRemoved(event: Event) {
+    func pinRemoved(event: Event) {
         if let id = event.channelID {
-            if let pins = Client.sharedInstance.channels[id]?.pinnedItems.filter({$0 != event.item}) {
-                Client.sharedInstance.channels[id]?.pinnedItems = pins
+            if let pins = client.channels[id]?.pinnedItems.filter({$0 != event.item}) {
+                client.channels[id]?.pinnedItems = pins
             }
             
-            if let delegate = Client.sharedInstance.pinEventsDelegate {
-                delegate.itemUnpinned(event.item, channel: Client.sharedInstance.channels[id])
+            if let delegate = client.pinEventsDelegate {
+                delegate.itemUnpinned(event.item, channel: client.channels[id])
             }
         }
     }
     
     //MARK: - Stars
-    static func itemStarred(event: Event, star: Bool) {
+    func itemStarred(event: Event, star: Bool) {
         if let item = event.item, type = item.type {
             switch type {
             case "message":
@@ -322,48 +326,48 @@ internal struct EventHandler {
                 break
             }
             
-            if let delegate = Client.sharedInstance.starEventsDelegate {
+            if let delegate = client.starEventsDelegate {
                 delegate.itemStarred(item, star: star)
             }
         }
     }
     
-    static func starMessage(item: Item, star: Bool) {
+    func starMessage(item: Item, star: Bool) {
         if let message = item.message, ts = message.ts, channel = item.channel {
-            if let _ = Client.sharedInstance.channels[channel]?.messages[ts] {
-                Client.sharedInstance.channels[channel]?.messages[ts]?.isStarred = star
+            if let _ = client.channels[channel]?.messages[ts] {
+                client.channels[channel]?.messages[ts]?.isStarred = star
             }
         }
     }
     
-    static func starFile(item: Item, star: Bool) {
+    func starFile(item: Item, star: Bool) {
         if let file = item.file, id = file.id {
-            Client.sharedInstance.files[id]?.isStarred = star
-            if let stars = Client.sharedInstance.files[id]?.stars {
+            client.files[id]?.isStarred = star
+            if let stars = client.files[id]?.stars {
                 if star == true {
-                    Client.sharedInstance.files[id]?.stars = stars + 1
+                    client.files[id]?.stars = stars + 1
                 } else {
                     if stars > 0 {
-                        Client.sharedInstance.files[id]?.stars = stars - 1
+                        client.files[id]?.stars = stars - 1
                     }
                 }
             }
         }
     }
     
-    static func starComment(item: Item) {
+    func starComment(item: Item) {
         if let file = item.file, id = file.id, comment = item.comment, commentID = comment.id {
-            Client.sharedInstance.files[id]?.comments[commentID] = comment
+            client.files[id]?.comments[commentID] = comment
         }
     }
     
     //MARK: - Reactions
-    static func addedReaction(event: Event) {
+    func addedReaction(event: Event) {
         if let item = event.item, type = item.type, key = event.reaction, userID = event.user?.id {
             switch type {
             case "message":
                 if let channel = item.channel, ts = item.ts {
-                    if let message = Client.sharedInstance.channels[channel]?.messages[ts] {
+                    if let message = client.channels[channel]?.messages[ts] {
                         if (message.reactions[key]) == nil {
                             message.reactions[key] = Reaction(name: event.reaction, user: userID)
                         } else {
@@ -372,19 +376,19 @@ internal struct EventHandler {
                     }
                 }
             case "file":
-                if let id = item.file?.id, file = Client.sharedInstance.files[id] {
+                if let id = item.file?.id, file = client.files[id] {
                     if file.reactions[key] == nil {
-                        Client.sharedInstance.files[id]?.reactions[key] = Reaction(name: event.reaction, user: userID)
+                        client.files[id]?.reactions[key] = Reaction(name: event.reaction, user: userID)
                     } else {
-                        Client.sharedInstance.files[id]?.reactions[key]?.users[userID] = userID
+                        client.files[id]?.reactions[key]?.users[userID] = userID
                     }
                 }
             case "file_comment":
-                if let id = item.file?.id, file = Client.sharedInstance.files[id], commentID = item.fileCommentID {
+                if let id = item.file?.id, file = client.files[id], commentID = item.fileCommentID {
                     if file.comments[commentID]?.reactions[key] == nil {
-                        Client.sharedInstance.files[id]?.comments[commentID]?.reactions[key] = Reaction(name: event.reaction, user: userID)
+                        client.files[id]?.comments[commentID]?.reactions[key] = Reaction(name: event.reaction, user: userID)
                     } else {
-                        Client.sharedInstance.files[id]?.comments[commentID]?.reactions[key]?.users[userID] = userID
+                        client.files[id]?.comments[commentID]?.reactions[key]?.users[userID] = userID
                     }
                 }
                 break
@@ -392,18 +396,18 @@ internal struct EventHandler {
                 break
             }
             
-            if let delegate = Client.sharedInstance.reactionEventsDelegate {
+            if let delegate = client.reactionEventsDelegate {
                 delegate.reactionAdded(event.reaction, item: event.item)
             }
         }
     }
     
-    static func removedReaction(event: Event) {
+    func removedReaction(event: Event) {
         if let item = event.item, type = item.type, key = event.reaction, userID = event.user?.id {
             switch type {
             case "message":
                 if let channel = item.channel, ts = item.ts {
-                    if let message = Client.sharedInstance.channels[channel]?.messages[ts] {
+                    if let message = client.channels[channel]?.messages[ts] {
                         if (message.reactions[key]) != nil {
                             message.reactions[key]?.users.removeValueForKey(userID)
                         }
@@ -413,21 +417,21 @@ internal struct EventHandler {
                     }
                 }
             case "file":
-                if let itemFile = item.file, id = itemFile.id, file = Client.sharedInstance.files[id] {
+                if let itemFile = item.file, id = itemFile.id, file = client.files[id] {
                     if file.reactions[key] != nil {
-                        Client.sharedInstance.files[id]?.reactions[key]?.users.removeValueForKey(userID)
+                        client.files[id]?.reactions[key]?.users.removeValueForKey(userID)
                     }
-                    if Client.sharedInstance.files[id]?.reactions[key]?.users.count == 0 {
-                        Client.sharedInstance.files[id]?.reactions.removeValueForKey(key)
+                    if client.files[id]?.reactions[key]?.users.count == 0 {
+                        client.files[id]?.reactions.removeValueForKey(key)
                     }
                 }
             case "file_comment":
-                if let id = item.file?.id, file = Client.sharedInstance.files[id], commentID = item.fileCommentID {
+                if let id = item.file?.id, file = client.files[id], commentID = item.fileCommentID {
                     if file.comments[commentID]?.reactions[key] != nil {
-                        Client.sharedInstance.files[id]?.comments[commentID]?.reactions[key]?.users.removeValueForKey(userID)
+                        client.files[id]?.comments[commentID]?.reactions[key]?.users.removeValueForKey(userID)
                     }
-                    if Client.sharedInstance.files[id]?.comments[commentID]?.reactions[key]?.users.count == 0 {
-                        Client.sharedInstance.files[id]?.comments[commentID]?.reactions.removeValueForKey(key)
+                    if client.files[id]?.comments[commentID]?.reactions[key]?.users.count == 0 {
+                        client.files[id]?.comments[commentID]?.reactions.removeValueForKey(key)
                     }
                 }
                 break
@@ -435,165 +439,165 @@ internal struct EventHandler {
                 break
             }
             
-            if let delegate = Client.sharedInstance.reactionEventsDelegate {
+            if let delegate = client.reactionEventsDelegate {
                 delegate.reactionAdded(event.reaction, item: event.item)
             }
         }
     }
     
     //MARK: - Preferences
-    static func changePreference(event: Event) {
+    func changePreference(event: Event) {
         if let name = event.name {
-            Client.sharedInstance.authenticatedUser?.preferences?[name] = event.value
+            client.authenticatedUser?.preferences?[name] = event.value
             
-            if let delegate = Client.sharedInstance.slackEventsDelegate, value = event.value {
+            if let delegate = client.slackEventsDelegate, value = event.value {
                 delegate.preferenceChanged(name, value: value)
             }
         }
     }
     
     //Mark: - User Change
-    static func userChange(event: Event) {
+    func userChange(event: Event) {
         if let user = event.user, id = user.id {
-            let preferences = Client.sharedInstance.users[id]?.preferences
-            Client.sharedInstance.users[id] = user
-            Client.sharedInstance.users[id]?.preferences = preferences
+            let preferences = client.users[id]?.preferences
+            client.users[id] = user
+            client.users[id]?.preferences = preferences
             
-            if let delegate = Client.sharedInstance.slackEventsDelegate {
+            if let delegate = client.slackEventsDelegate {
                 delegate.userChanged(user)
             }
         }
     }
     
     //MARK: - User Presence
-    static func presenceChange(event: Event) {
+    func presenceChange(event: Event) {
         if let user = event.user, id = user.id {
-            Client.sharedInstance.users[id]?.presence = event.presence
+            client.users[id]?.presence = event.presence
             
-            if let delegate = Client.sharedInstance.slackEventsDelegate {
+            if let delegate = client.slackEventsDelegate {
                 delegate.presenceChanged(user, presence: event.presence)
             }
         }
     }
     
     //MARK: - Team
-    static func teamJoin(event: Event) {
+    func teamJoin(event: Event) {
         if let user = event.user, id = user.id {
-            Client.sharedInstance.users[id] = user
+            client.users[id] = user
             
-            if let delegate = Client.sharedInstance.teamEventsDelegate {
+            if let delegate = client.teamEventsDelegate {
                 delegate.teamJoined(user)
             }
         }
     }
     
-    static func teamPlanChange(event: Event) {
+    func teamPlanChange(event: Event) {
         if let plan = event.plan {
-            Client.sharedInstance.team?.plan = plan
+            client.team?.plan = plan
             
-            if let delegate = Client.sharedInstance.teamEventsDelegate {
+            if let delegate = client.teamEventsDelegate {
                 delegate.teamPlanChanged(plan)
             }
         }
     }
     
-    static func teamPreferenceChange(event: Event) {
+    func teamPreferenceChange(event: Event) {
         if let name = event.name {
-            Client.sharedInstance.team?.prefs?[name] = event.value
+            client.team?.prefs?[name] = event.value
             
-            if let delegate = Client.sharedInstance.teamEventsDelegate, value = event.value {
+            if let delegate = client.teamEventsDelegate, value = event.value {
                 delegate.teamPreferencesChanged(name, value: value)
             }
         }
     }
     
-    static func teamNameChange(event: Event) {
+    func teamNameChange(event: Event) {
         if let name = event.name {
-            Client.sharedInstance.team?.name = name
+            client.team?.name = name
             
-            if let delegate = Client.sharedInstance.teamEventsDelegate {
+            if let delegate = client.teamEventsDelegate {
                 delegate.teamNameChanged(name)
             }
         }
     }
     
-    static func teamDomainChange(event: Event) {
+    func teamDomainChange(event: Event) {
         if let domain = event.domain {
-            Client.sharedInstance.team?.domain = domain
+            client.team?.domain = domain
             
-            if let delegate = Client.sharedInstance.teamEventsDelegate {
+            if let delegate = client.teamEventsDelegate {
                 delegate.teamDomainChanged(domain)
             }
         }
     }
     
-    static func emailDomainChange(event: Event) {
+    func emailDomainChange(event: Event) {
         if let domain = event.emailDomain {
-            Client.sharedInstance.team?.emailDomain = domain
+            client.team?.emailDomain = domain
             
-            if let delegate = Client.sharedInstance.teamEventsDelegate {
+            if let delegate = client.teamEventsDelegate {
                 delegate.teamEmailDomainChanged(domain)
             }
         }
     }
     
-    static func emojiChanged(event: Event) {
+    func emojiChanged(event: Event) {
         //TODO: Call emoji.list here
         
-        if let delegate = Client.sharedInstance.teamEventsDelegate {
+        if let delegate = client.teamEventsDelegate {
             delegate.teamEmojiChanged()
         }
     }
     
     //MARK: - Bots
-    static func bot(event: Event) {
+    func bot(event: Event) {
         if let bot = event.bot, id = bot.id {
-            Client.sharedInstance.bots[id] = bot
+            client.bots[id] = bot
             
-            if let delegate = Client.sharedInstance.slackEventsDelegate {
+            if let delegate = client.slackEventsDelegate {
                 delegate.botEvent(bot)
             }
         }
     }
     
     //MARK: - Subteams
-    static func subteam(event: Event) {
+    func subteam(event: Event) {
         if let subteam = event.subteam, id = subteam.id {
-            Client.sharedInstance.userGroups[id] = subteam
+            client.userGroups[id] = subteam
             
-            if let delegate = Client.sharedInstance.subteamEventsDelegate {
+            if let delegate = client.subteamEventsDelegate {
                 delegate.subteamEvent(subteam)
             }
         }
         
     }
     
-    static func subteamAddedSelf(event: Event) {
-        if let subteamID = event.subteamID, _ = Client.sharedInstance.authenticatedUser?.userGroups {
-            Client.sharedInstance.authenticatedUser?.userGroups![subteamID] = subteamID
+    func subteamAddedSelf(event: Event) {
+        if let subteamID = event.subteamID, _ = client.authenticatedUser?.userGroups {
+            client.authenticatedUser?.userGroups![subteamID] = subteamID
             
-            if let delegate = Client.sharedInstance.subteamEventsDelegate {
+            if let delegate = client.subteamEventsDelegate {
                 delegate.subteamSelfAdded(subteamID)
             }
         }
     }
     
-    static func subteamRemovedSelf(event: Event) {
+    func subteamRemovedSelf(event: Event) {
         if let subteamID = event.subteamID {
-            Client.sharedInstance.authenticatedUser?.userGroups?.removeValueForKey(subteamID)
+            client.authenticatedUser?.userGroups?.removeValueForKey(subteamID)
             
-            if let delegate = Client.sharedInstance.subteamEventsDelegate {
+            if let delegate = client.subteamEventsDelegate {
                 delegate.subteamSelfRemoved(subteamID)
             }
         }
     }
     
     //MARK: - Authenticated User
-    static func manualPresenceChange(event: Event) {
-        Client.sharedInstance.authenticatedUser?.presence = event.presence
+    func manualPresenceChange(event: Event) {
+        client.authenticatedUser?.presence = event.presence
         
-        if let delegate = Client.sharedInstance.slackEventsDelegate {
-            delegate.manualPresenceChanged(Client.sharedInstance.authenticatedUser, presence: event.presence)
+        if let delegate = client.slackEventsDelegate {
+            delegate.manualPresenceChanged(client.authenticatedUser, presence: event.presence)
         }
     }
     

SlackKit/Sources/File.swift

@@ -22,7 +22,7 @@
 // THE SOFTWARE.
 
 public struct File {
-    
+
     public let id: String?
     public let created: Int?
     public let name: String?
@@ -36,8 +36,6 @@ public struct File {
     public let isExternal: Bool?
     public let externalType: String?
     public let size: Int?
-    public let url: String?
-    public let urlDownload: String?
     public let urlPrivate: String?
     public let urlPrivateDownload: String?
     public let thumb64: String?
@@ -78,8 +76,6 @@ public struct File {
         isExternal = file?["is_external"] as? Bool
         externalType = file?["external_type"] as? String
         size = file?["size"] as? Int
-        url = file?["url"] as? String
-        urlDownload = file?["url_download"] as? String
         urlPrivate = file?["url_private"] as? String
         urlPrivateDownload = file?["url_private_download"] as? String
         thumb64 = file?["thumb_64"] as? String
@@ -122,8 +118,6 @@ public struct File {
         isExternal = nil
         externalType = nil
         size = nil
-        url = nil
-        urlDownload = nil
         urlPrivate = nil
         urlPrivateDownload = nil
         thumb64 = nil

SlackKit/Sources/NetworkInterface.swift

@@ -0,0 +1,129 @@
+//
+// 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: SlackAPIEndpoint, token: String, parameters: [String: AnyObject]?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
+        var requestString = "\(apiUrl)\(endpoint.rawValue)?token=\(token)"
+        if let params = parameters {
+            requestString = requestString + requestStringFromParameters(params)
+        }
+        let request = NSURLRequest(URL: NSURL(string: requestString)!)
+        NSURLSession.sharedSession().dataTaskWithRequest(request) {
+            (data, response, internalError) -> Void in
+            guard let data = data else {
+                return
+            }
+            do {
+                let result = try NSJSONSerialization.JSONObjectWithData(data, options: []) as! [String: AnyObject]
+                if (result["ok"] as! Bool == true) {
+                    successClosure(result)
+                } else {
+                    if let errorString = result["error"] as? String {
+                        throw ErrorDispatcher.dispatch(errorString)
+                    } else {
+                        throw SlackError.UnknownError
+                    }
+                }
+            } catch let error {
+                if let slackError = error as? SlackError {
+                    errorClosure(slackError)
+                } else {
+                    errorClosure(SlackError.UnknownError)
+                }
+            }
+        }.resume()
+    }
+    
+    internal func uploadRequest(token: String, data: NSData, parameters: [String: AnyObject]?, successClosure: ([String: AnyObject])->Void, errorClosure: (SlackError)->Void) {
+        var requestString = "\(apiUrl)\(SlackAPIEndpoint.FilesUpload.rawValue)?token=\(token)"
+        if let params = parameters {
+            requestString = requestString + requestStringFromParameters(params)
+        }
+        
+        let request = NSMutableURLRequest(URL: NSURL(string: requestString)!)
+        request.HTTPMethod = "POST"
+        let boundaryConstant = randomBoundary()
+        let contentType = "multipart/form-data; boundary=" + boundaryConstant
+        let boundaryStart = "--\(boundaryConstant)\r\n"
+        let boundaryEnd = "--\(boundaryConstant)--\r\n"
+        let contentDispositionString = "Content-Disposition: form-data; name=\"file\"; filename=\"\(parameters!["filename"])\"\r\n"
+        let contentTypeString = "Content-Type: \(parameters!["filetype"])\r\n\r\n"
+
+        let requestBodyData : NSMutableData = NSMutableData()
+        requestBodyData.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
+            guard let data = data else {
+                return
+            }
+            do {
+                let result = try NSJSONSerialization.JSONObjectWithData(data, options: []) as! [String: AnyObject]
+                if (result["ok"] as! Bool == true) {
+                    successClosure(result)
+                } else {
+                    if let errorString = result["error"] as? String {
+                        throw ErrorDispatcher.dispatch(errorString)
+                    } else {
+                        throw SlackError.UnknownError
+                    }
+                }
+            } catch let error {
+                if let slackError = error as? SlackError {
+                    errorClosure(slackError)
+                } else {
+                    errorClosure(SlackError.UnknownError)
+                }
+            }
+            }.resume()
+    }
+    
+    private func randomBoundary() -> String {
+        return String(format: "slackkit.boundary.%08x%08x", arc4random(), arc4random())
+    }
+    
+    private func requestStringFromParameters(parameters: [String: AnyObject]) -> String {
+        var requestString = ""
+        for key in parameters.keys {
+            if let value = parameters[key] as? String, encodedValue = value.stringByAddingPercentEncodingWithAllowedCharacters(NSCharacterSet.URLHostAllowedCharacterSet()) {
+                requestString = requestString + "&"+key+"="+encodedValue
+            }
+        }
+        
+        return requestString
+    }
+    
+}

SlackKit/Sources/SlackWebAPI.swift

@@ -0,0 +1,636 @@
+//
+// SlackWebAPI.swift
+//
+// Copyright © 2016 Peter Zignego. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+internal enum SlackAPIEndpoint: String {
+    case APITest = "api.test"
+    case AuthTest = "auth.test"
+    case ChannelsHistory = "channels.history"
+    case ChannelsInfo = "channels.info"
+    case ChannelsList = "channels.list"
+    case ChannelsMark = "channels.mark"
+    case ChannelsSetPurpose = "channels.setPurpose"
+    case ChannelsSetTopic = "channels.setTopic"
+    case ChatDelete = "chat.delete"
+    case ChatPostMessage = "chat.postMessage"
+    case ChatUpdate = "chat.update"
+    case EmojiList = "emoji.list"
+    case FilesDelete = "files.delete"
+    case FilesUpload = "files.upload"
+    case GroupsClose = "groups.close"
+    case GroupsHistory = "groups.history"
+    case GroupsInfo = "groups.info"
+    case GroupsList = "groups.list"
+    case GroupsMark = "groups.mark"
+    case GroupsOpen = "groups.open"
+    case GroupsSetPurpose = "groups.setPurpose"
+    case GroupsSetTopic = "groups.setTopic"
+    case IMClose = "im.close"
+    case IMHistory = "im.history"
+    case IMList = "im.list"
+    case IMMark = "im.mark"
+    case IMOpen = "im.open"
+    case MPIMClose = "mpim.close"
+    case MPIMHistory = "mpim.history"
+    case MPIMList = "mpim.list"
+    case MPIMMark = "mpim.mark"
+    case MPIMOpen = "mpim.open"
+    case PinsAdd = "pins.add"
+    case PinsRemove = "pins.remove"
+    case ReactionsAdd = "reactions.add"
+    case ReactionsGet = "reactions.get"
+    case ReactionsList = "reactions.list"
+    case ReactionsRemove = "reactions.remove"
+    case RTMStart = "rtm.start"
+    case StarsAdd = "stars.add"
+    case StarsRemove = "stars.remove"
+    case TeamInfo = "team.info"
+    case UsersGetPresence = "users.getPresence"
+    case UsersInfo = "users.info"
+    case UsersList = "users.list"
+    case UsersSetActive = "users.setActive"
+    case UsersSetPresence = "users.setPresence"
+}
+
+public class SlackWebAPI {
+    
+    public typealias FailureClosure = (error: SlackError)->Void
+    
+    public enum InfoType: String {
+        case Purpose = "purpose"
+        case Topic = "topic"
+    }
+    
+    public enum ParseMode: String {
+        case Full = "full"
+        case None = "none"
+    }
+    
+    public enum Presence: String {
+        case Auto = "auto"
+        case Away = "away"
+    }
+    
+    private enum ChannelType: String {
+        case Channel = "channel"
+        case Group = "group"
+        case IM = "im"
+    }
+    
+    private let client: Client
+    
+    required public init(client: Client) {
+        self.client = client
+    }
+    
+    //MARK: - RTM
+    public func rtmStart(success success: ((response: [String: AnyObject])->Void)?, failure: FailureClosure?) {
+        client.api.request(.RTMStart, token: client.token, parameters: nil, successClosure: {
+                (response) -> Void in
+                success?(response: response)
+            }) {(error) -> Void in
+                failure?(error: error)
+            }
+    }
+    
+    //MARK: - Auth Test
+    public func authenticationTest(success: ((authenticated: Bool)->Void)?, failure: FailureClosure?) {
+        client.api.request(.AuthTest, token: client.token, parameters: nil, successClosure: {
+            (response) -> Void in
+                success?(authenticated: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Channels
+    public func channelHistory(id: String, latest: String = "\(NSDate().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((history: [String: AnyObject]?)->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]
+        client.api.request(.ChatDelete, token: client.token, parameters: parameters, successClosure: { (response) -> Void in
+                success?(deleted: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func sendMessage(channel: String, text: String, username: String? = nil, asUser: Bool = false, parse: ParseMode = .Full, linkNames: Bool = false, attachments: [[String: AnyObject]]? = nil, unfurlLinks: Bool = false, unfurlMedia: Bool = false, 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":attachments, "icon_url":iconURL, "icon_emoji":iconEmoji]
+        client.api.request(.ChatPostMessage, token: client.token, parameters: 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: [[String: AnyObject]]? = 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":attachments]
+        client.api.request(.ChatUpdate, token: client.token, parameters: filterNilParameters(parameters), successClosure: {
+            (response) -> Void in
+                success?(updated: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Emoji
+    public func emojiList(success: ((emojiList: [String: AnyObject]?)->Void)?, failure: FailureClosure?) {
+        client.api.request(.EmojiList, token: client.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]
+        client.api.request(.FilesDelete, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(deleted: true)
+            }) {(error) -> Void 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(",")]
+        client.api.uploadRequest(client.token, data: file, parameters: filterNilParameters(parameters), successClosure: {
+            (response) -> Void in
+                success?(file: File(file: response["file"] as? [String: AnyObject]))
+            }) {(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: [String: AnyObject]?)->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]
+        client.api.request(.GroupsOpen, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(opened: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func setGroupPurpose(channel: String, purpose: String, success: ((purposeSet: Bool)->Void)?, failure: FailureClosure?) {
+        setInfo(.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: [String: AnyObject]?)->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]
+        client.api.request(.IMOpen, token: client.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: [String: AnyObject]?)->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(",")]
+        client.api.request(.MPIMOpen, token: client.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: SlackAPIEndpoint, 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]
+        client.api.request(endpoint, token: client.token, parameters: 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: SlackAPIEndpoint, 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]
+        client.api.request(endpoint, token: client.token, parameters: 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: SlackAPIEndpoint, 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]
+        client.api.request(endpoint, token: client.token, parameters: 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?) {
+        client.api.request(.TeamInfo, token: client.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]
+        client.api.request(.UsersGetPresence, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(presence: response["presence"] as? String)
+            }){(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func userInfo(id: String, success: ((user: User?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["user":id]
+        client.api.request(.UsersInfo, token: client.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]
+        client.api.request(.UsersList, token: client.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?) {
+        client.api.request(.UsersSetActive, token: client.token, parameters: nil, successClosure: {
+            (response) -> Void in
+                success?(success: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    public func setUserPresence(presence: Presence, success: ((success: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["presence":presence.rawValue]
+        client.api.request(.UsersSetPresence, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(success:true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    //MARK: - Channel Utilities
+    private func close(endpoint: SlackAPIEndpoint, channelID: String, success: ((closed: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["channel":channelID]
+        client.api.request(endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(closed: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func history(endpoint: SlackAPIEndpoint, id: String, latest: String = "\(NSDate().timeIntervalSince1970)", oldest: String = "0", inclusive: Bool = false, count: Int = 100, unreads: Bool = false, success: ((history: [String: AnyObject]?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["channel": id, "latest": latest, "oldest": oldest, "inclusive":inclusive, "count":count, "unreads":unreads]
+        client.api.request(endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(history: response)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func info(endpoint: SlackAPIEndpoint, type: ChannelType, id: String, success: ((channel: Channel?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["channel": id]
+        client.api.request(endpoint, token: client.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: SlackAPIEndpoint, type: ChannelType, excludeArchived: Bool = false, success: ((channels: [[String: AnyObject]]?)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["exclude_archived": excludeArchived]
+        client.api.request(endpoint, token: client.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: SlackAPIEndpoint, channel: String, timestamp: String, success: ((ts: String)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["channel": channel, "ts": timestamp]
+        client.api.request(endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(ts: timestamp)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+    
+    private func setInfo(endpoint: SlackAPIEndpoint, type: InfoType, channel: String, text: String, success: ((success: Bool)->Void)?, failure: FailureClosure?) {
+        let parameters: [String: AnyObject] = ["channel": channel, type.rawValue: text]
+        client.api.request(endpoint, token: client.token, parameters: parameters, successClosure: {
+            (response) -> Void in
+                success?(success: true)
+            }) {(error) -> Void in
+                failure?(error: error)
+        }
+    }
+
+    //MARK: - Filter Nil Parameters
+    private func filterNilParameters(parameters: [String: AnyObject?]) -> [String: AnyObject] {
+        var finalParameters = [String: AnyObject]()
+        for key in parameters.keys {
+            if parameters[key] != nil {
+                finalParameters[key] = parameters[key]!
+            }
+        }
+        return finalParameters
+    }
+}

SlackKit/Sources/SlackWebAPIErrorDispatcher.swift

@@ -0,0 +1,284 @@
+//
+// SlackWebAPIErrorHandling.swift
+//
+// Copyright © 2016 Peter Zignego. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import Foundation
+
+public enum SlackError: ErrorType {
+    case AccountInactive
+    case AlreadyArchived
+    case AlreadyInChannel
+    case AlreadyPinned
+    case AlreadyReacted
+    case AlreadyStarred
+    case BadClientSecret
+    case BadRedirectURI
+    case BadTimeStamp
+    case CantArchiveGeneral
+    case CantDeleteFile
+    case CantDeleteMessage
+    case CantInvite
+    case CantInviteSelf
+    case CantKickFromGeneral
+    case CantKickFromLastChannel
+    case CantKickSelf
+    case CantLeaveGeneral
+    case CantLeaveLastChannel
+    case CantUpdateMessage
+    case ChannelNotFound
+    case ComplianceExportsPreventDeletion
+    case EditWindowClosed
+    case FileCommentNotFound
+    case FileDeleted
+    case FileNotFound
+    case FileNotShared
+    case GroupContainsOthers
+    case InvalidArrayArg
+    case InvalidAuth
+    case InvalidChannel
+    case InvalidCharSet
+    case InvalidClientID
+    case InvalidCode
+    case InvalidFormData
+    case InvalidName
+    case InvalidPostType
+    case InvalidPresence
+    case InvalidTS
+    case InvalidTSLatest
+    case InvalidTSOldest
+    case IsArchived
+    case LastMember
+    case LastRAChannel
+    case MessageNotFound
+    case MessageTooLong
+    case MigrationInProgress
+    case MissingDuration
+    case MissingPostType
+    case NameTaken
+    case NoChannel
+    case NoItemSpecified
+    case NoReaction
+    case NoText
+    case NotArchived
+    case NotAuthed
+    case NotEnoughUsers
+    case NotInChannel
+    case NotInGroup
+    case NotPinned
+    case NotStarred
+    case OverPaginationLimit
+    case PaidOnly
+    case PermissionDenied
+    case PostingToGeneralChannelDenied
+    case RateLimited
+    case RequestTimeout
+    case RestrictedAction
+    case SnoozeEndFailed
+    case SnoozeFailed
+    case SnoozeNotActive
+    case TooLong
+    case TooManyEmoji
+    case TooManyReactions
+    case TooManyUsers
+    case UnknownError
+    case UnknownType
+    case UserDisabled
+    case UserDoesNotOwnChannel
+    case UserIsBot
+    case UserIsRestricted
+    case UserIsUltraRestricted
+    case UserListNotSupplied
+    case UserNotFound
+    case UserNotVisible
+}
+
+internal struct ErrorDispatcher {
+    
+    static func dispatch(error: String) -> SlackError {
+        switch error {
+        case "account_inactive":
+            return .AccountInactive
+        case "already_in_channel":
+            return .AlreadyInChannel
+        case "already_pinned":
+            return .AlreadyPinned
+        case "already_reacted":
+            return .AlreadyReacted
+        case "already_starred":
+            return .AlreadyStarred
+        case "bad_client_secret":
+            return .BadClientSecret
+        case "bad_redirect_uri":
+            return .BadRedirectURI
+        case "bad_timestamp":
+            return .BadTimeStamp
+        case "cant_delete_file":
+            return .CantDeleteFile
+        case "cant_delete_message":
+            return .CantDeleteMessage
+        case "cant_invite":
+            return .CantInvite
+        case "cant_invite_self":
+            return .CantInviteSelf
+        case "cant_kick_from_general":
+            return .CantKickFromGeneral
+        case "cant_kick_from_last_channel":
+            return .CantKickFromLastChannel
+        case "cant_kick_self":
+            return .CantKickSelf
+        case "cant_leave_general":
+            return .CantLeaveGeneral
+        case "cant_leave_last_channel":
+            return .CantLeaveLastChannel
+        case "cant_update_message":
+            return .CantUpdateMessage
+        case "compliance_exports_prevent_deletion":
+            return .ComplianceExportsPreventDeletion
+        case "channel_not_found":
+            return .ChannelNotFound
+        case "edit_window_closed":
+            return .EditWindowClosed
+        case "file_comment_not_found":
+            return .FileCommentNotFound
+        case "file_deleted":
+            return .FileDeleted
+        case "file_not_found":
+            return .FileNotFound
+        case "file_not_shared":
+            return .FileNotShared
+        case "group_contains_others":
+            return .GroupContainsOthers
+        case "invalid_array_arg":
+            return .InvalidArrayArg
+        case "invalid_auth":
+            return .InvalidAuth
+        case "invalid_channel":
+            return .InvalidChannel
+        case "invalid_charset":
+            return .InvalidCharSet
+        case "invalid_client_id":
+            return .InvalidClientID
+        case "invalid_code":
+            return .InvalidCode
+        case "invalid_form_data":
+            return .InvalidFormData
+        case "invalid_name":
+            return .InvalidName
+        case "invalid_post_type":
+            return .InvalidPostType
+        case "invalid_presence":
+            return .InvalidPresence
+        case "invalid_timestamp":
+            return .InvalidTS
+        case "invalid_ts_latest":
+            return .InvalidTSLatest
+        case "invalid_ts_oldest":
+            return .InvalidTSOldest
+        case "is_archived":
+            return .IsArchived
+        case "last_member":
+            return .LastMember
+        case "last_ra_channel":
+            return .LastRAChannel
+        case "message_not_found":
+            return .MessageNotFound
+        case "msg_too_long":
+            return .MessageTooLong
+        case "migration_in_progress":
+            return .MigrationInProgress
+        case "missing_duration":
+            return .MissingDuration
+        case "missing_post_type":
+            return .MissingPostType
+        case "name_taken":
+            return .NameTaken
+        case "no_channel":
+            return .NoChannel
+        case "no_reaction":
+            return .NoReaction
+        case "no_item_specified":
+            return .NoItemSpecified
+        case "no_text":
+            return .NoText
+        case "not_archived":
+            return .NotArchived
+        case "not_authed":
+            return .NotAuthed
+        case "not_enough_users":
+            return .NotEnoughUsers
+        case "not_in_channel":
+            return .NotInChannel
+        case "not_in_group":
+            return .NotInGroup
+        case "not_pinned":
+            return .NotPinned
+        case "not_starred":
+            return .NotStarred
+        case "over_pagination_limit":
+            return .OverPaginationLimit
+        case "paid_only":
+            return .PaidOnly
+        case "perimssion_denied":
+            return .PermissionDenied
+        case "posting_to_general_channel_denied":
+            return .PostingToGeneralChannelDenied
+        case "rate_limited":
+            return .RateLimited
+        case "request_timeout":
+            return .RequestTimeout
+        case "snooze_end_failed":
+            return .SnoozeEndFailed
+        case "snooze_failed":
+            return .SnoozeFailed
+        case "snooze_not_active":
+            return .SnoozeNotActive
+        case "too_long":
+            return .TooLong
+        case "too_many_emoji":
+            return .TooManyEmoji
+        case "too_many_reactions":
+            return .TooManyReactions
+        case "too_many_users":
+            return .TooManyUsers
+        case "unknown_type":
+            return .UnknownType
+        case "user_disabled":
+            return .UserDisabled
+        case "user_does_not_own_channel":
+            return .UserDoesNotOwnChannel
+        case "user_is_bot":
+            return .UserIsBot
+        case "user_is_restricted":
+            return .UserIsRestricted
+        case "user_is_ultra_restricted":
+            return .UserIsUltraRestricted
+        case "user_list_not_supplied":
+            return .UserListNotSupplied
+        case "user_not_found":
+            return .UserNotFound
+        case "user_not_visible":
+            return .UserNotVisible
+        default:
+            return .UnknownError
+        }
+    }
+}

SlackKit/Sources/User.swift

@@ -71,7 +71,7 @@ public struct User {
     internal(set) public var timeZoneLabel: String?
     internal(set) public var timeZoneOffSet: Int?
     internal(set) public var preferences: [String: AnyObject]?
-    // Client use
+    // Client properties
     internal(set) public var userGroups: [String: String]?
     
     internal init?(user: [String: AnyObject]?) {
@@ -100,4 +100,4 @@ public struct User {
         self.id = id
         self.isBot = nil
     }
-}
+}