Skip to content
This repository was archived by the owner on Jan 28, 2019. It is now read-only.

Commit aaa6d91

Browse files
committed
Linting clean up and Swift 4 fixes
1 parent 11919d0 commit aaa6d91

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

Sources/SKRTMAPI/Conformers/VaporEngineRTM.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import URI
3030
import WebSockets
3131

3232
public class VaporEngineRTM: RTMWebSocket {
33-
public var delegate: RTMDelegate?
33+
public weak var delegate: RTMDelegate?
3434

35-
public required init(){}
35+
public required init() {}
3636

3737
private var websocket: WebSocket?
3838

@@ -41,7 +41,7 @@ public class VaporEngineRTM: RTMWebSocket {
4141
let headers: [HeaderKey: String] = [:]
4242
let protocols: [String]? = nil
4343
do {
44-
let uri = try! URI(url.absoluteString)
44+
let uri = try URI(url.absoluteString)
4545
if uri.scheme.isSecure {
4646
let tcp = try TCPInternetSocket(
4747
scheme: "https",
@@ -75,7 +75,7 @@ public class VaporEngineRTM: RTMWebSocket {
7575
}
7676
}
7777

78-
func didConnect(websocket: WebSocket) throws -> Void {
78+
func didConnect(websocket: WebSocket) throws {
7979
self.websocket = websocket
8080

8181
self.delegate?.didConnect()
@@ -84,7 +84,7 @@ public class VaporEngineRTM: RTMWebSocket {
8484
self.delegate?.receivedMessage(text)
8585
}
8686

87-
websocket.onClose = { ws in
87+
websocket.onClose = { ws, _, _, close in
8888
self.delegate?.disconnected()
8989
}
9090

Sources/SKRTMAPI/SKRTMAPI.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,12 @@ public final class SKRTMAPI: RTMDelegate {
143143
self.adapter?.initialSetup(json: response, instance: self)
144144
}
145145

146-
private func format(message: String, channel: String, id: String? = nil, threadTs: String? = nil, broadcastReply: Bool = false) throws -> String {
146+
private func format(message: String,
147+
channel: String,
148+
id: String? = nil,
149+
threadTs: String? = nil,
150+
broadcastReply: Bool = false
151+
) throws -> String {
147152
let json: [String: Any?] = [
148153
"id": id ?? Date().slackTimestamp,
149154
"type": "message",

0 commit comments

Comments
 (0)