Code cleanup

Author: pvzig

SlackKit/Sources/Client.swift

@@ -103,8 +103,9 @@ public class Client: WebSocketDelegate {
     public func sendMessage(message: String, channelID: String) {
         if (connected) {
             if let data = formatMessageToSlackJsonString(msg: message, channel: channelID) {
-                let string = NSString(data: data, encoding: NSUTF8StringEncoding)
-                webSocket?.writeString(string as! String)
+                if let string = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
+                    webSocket?.writeString(string)
+                }
             }
         }
     }

SlackKit/Sources/ClientExtensions.swift

@@ -26,20 +26,11 @@ 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? {
+    public func getUserIDByName(name: String) -> String? {
         return users.filter{$0.1.name == stripString(name)}.first?.0
     }
 
@@ -54,13 +45,14 @@ extension Client {
     }
 
     //MARK: - Utilities
-    internal func stripString(var string: String) -> String {
+    internal func stripString(string: String) -> String? {
+        var strippedString: String?
         if string[string.startIndex] == "@" {
-            string = string.substringFromIndex(string.startIndex.advancedBy(1))
+            strippedString = string.substringFromIndex(string.startIndex.advancedBy(1))
         } else if string[string.startIndex] == "#" {
-            string = string.substringFromIndex(string.startIndex.advancedBy(1))
+            strippedString = string.substringFromIndex(string.startIndex.advancedBy(1))
         }
-        return string
+        return strippedString
     }
 
 }

SlackKit/Sources/EventDispatcher.swift

@@ -148,7 +148,7 @@ internal class EventDispatcher {
                 // Other clients should ignore this event.
                 break
             case .TeamMigrationStarted:
-                client.connect(client.pingInterval, timeout: client.timeout, reconnect: client.reconnect)
+                client.connect(pingInterval: client.pingInterval, timeout: client.timeout, reconnect: client.reconnect)
             case .ReconnectURL:
                 // The reconnect_url event is currently unsupported and experimental.
                 break

SlackKit/Sources/File.swift

@@ -62,7 +62,7 @@ public struct File {
     internal(set) public var comments = [String: Comment]()
     internal(set) public var reactions = [String: Reaction]()
 
-    init?(file:[String: AnyObject]?) {
+    public init?(file:[String: AnyObject]?) {
         id = file?["id"] as? String
         created = file?["created"] as? Int
         name = file?["name"] as? String
@@ -105,7 +105,7 @@ public struct File {
 
     }
 
-    init?(id:String?) {
+    internal init?(id:String?) {
         self.id = id
         created = nil
         name = nil