|
6 | 6 | @_exported import Common |
7 | 7 | import Foundation |
8 | 8 |
|
9 | | -/// An extensible Slack bot user than can provide custom functionality |
| 9 | +/// An extensible Slack bot user that can provide custom functionality |
10 | 10 | public class SlackBot { |
11 | 11 | //MARK: - Private Properties |
12 | 12 | fileprivate let config: Config |
@@ -121,7 +121,7 @@ fileprivate extension SlackBot { |
121 | 121 | self.rtmAPI.sendEvents = true |
122 | 122 |
|
123 | 123 | case .disconnected(let error): |
124 | | - self.rtmAPI.disconnect() |
| 124 | + self.rtmAPI.disconnect(error: error) |
125 | 125 | self.notifyDisconnected(error) |
126 | 126 | } |
127 | 127 | } |
@@ -167,22 +167,20 @@ fileprivate extension SlackBot { |
167 | 167 | //MARK: - RTMAPI |
168 | 168 | fileprivate extension SlackBot { |
169 | 169 | func bindToRTM() { |
170 | | - self.rtmAPI.onDisconnected = { [weak self] error in |
171 | | - self?.state.transition(withEvent: .disconnect(reconnect: true, error: error)) |
| 170 | + self.rtmAPI.onDisconnected = { [unowned self] error in |
| 171 | + self.state.transition(withEvent: .disconnect(reconnect: true, error: error)) |
172 | 172 | } |
173 | | - self.rtmAPI.onError = { [weak self] error in |
174 | | - self?.notifyError(error) |
| 173 | + self.rtmAPI.onError = { [unowned self] error in |
| 174 | + self.notifyError(error) |
175 | 175 | } |
176 | | - self.rtmAPI.onEvent(hello.self) { [weak self] in |
177 | | - self?.state.transition(withEvent: .connectionState(state: .Hello)) |
| 176 | + self.rtmAPI.onEvent(hello.self) { [unowned self] in |
| 177 | + self.state.transition(withEvent: .connectionState(state: .Hello)) |
178 | 178 | } |
179 | 179 | } |
180 | 180 | func connectToRTM() { |
181 | 181 | do { |
182 | 182 | let options: [RTMStartOption] = try self.config.value(for: RTMStartOptions.self) |
183 | | - let rtmStart = RTMStart(options: options) { [weak self] serializedData in |
184 | | - guard let `self` = self else { return } |
185 | | - |
| 183 | + let rtmStart = RTMStart(options: options) { [unowned self] serializedData in |
186 | 184 | do { |
187 | 185 | let (botUser, team, users, channels, groups, ims) = try serializedData() |
188 | 186 |
|
@@ -235,8 +233,8 @@ fileprivate extension SlackBot { |
235 | 233 | } |
236 | 234 |
|
237 | 235 | func configureServer() { |
238 | | - self.server.onError = { [weak self] error in |
239 | | - self?.notifyError(error) |
| 236 | + self.server.onError = { [unowned self] error in |
| 237 | + self.notifyError(error) |
240 | 238 | } |
241 | 239 |
|
242 | 240 | for endpoint in Endpoint.all { |
|
0 commit comments