Linting clean up and Swift 4 fixes

pvzig · Feb 8, 2018 · aaa6d91 · aaa6d91
1 parent 11919d0
commit aaa6d91
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Sources/SKRTMAPI/Conformers/VaporEngineRTM.swift b/Sources/SKRTMAPI/Conformers/VaporEngineRTM.swift
@@ -30,9 +30,9 @@ import URI
 import WebSockets
 
 public class VaporEngineRTM: RTMWebSocket {
-    public var delegate: RTMDelegate?
+    public weak var delegate: RTMDelegate?
 
-    public required init(){}
+    public required init() {}
 
     private var websocket: WebSocket?
 
@@ -41,7 +41,7 @@ public class VaporEngineRTM: RTMWebSocket {
         let headers: [HeaderKey: String] = [:]
         let protocols: [String]? = nil
         do {
-            let uri = try! URI(url.absoluteString)
+            let uri = try URI(url.absoluteString)
             if uri.scheme.isSecure {
                 let tcp = try TCPInternetSocket(
                     scheme: "https",
@@ -75,7 +75,7 @@ public class VaporEngineRTM: RTMWebSocket {
         }
     }
 
-    func didConnect(websocket: WebSocket) throws -> Void {
+    func didConnect(websocket: WebSocket) throws {
         self.websocket = websocket
 
         self.delegate?.didConnect()
@@ -84,7 +84,7 @@ public class VaporEngineRTM: RTMWebSocket {
             self.delegate?.receivedMessage(text)
         }
 
-        websocket.onClose = { ws in
+        websocket.onClose = { ws, _, _, close in
             self.delegate?.disconnected()
         }
 

diff --git a/Sources/SKRTMAPI/SKRTMAPI.swift b/Sources/SKRTMAPI/SKRTMAPI.swift
@@ -143,7 +143,12 @@ public final class SKRTMAPI: RTMDelegate {
         self.adapter?.initialSetup(json: response, instance: self)
     }
 
-    private func format(message: String, channel: String, id: String? = nil, threadTs: String? = nil, broadcastReply: Bool = false) throws -> String {
+    private func format(message: String,
+                        channel: String,
+                        id: String? = nil,
+                        threadTs: String? = nil,
+                        broadcastReply: Bool = false
+    ) throws -> String {
         let json: [String: Any?] = [
             "id": id ?? Date().slackTimestamp,
             "type": "message",