Skip to content
This repository was archived by the owner on Dec 20, 2017. It is now read-only.

Commit ae55a90

Browse files
committed
updated dependencies
1 parent 87cd93b commit ae55a90

File tree

4 files changed

+17
-35
lines changed

4 files changed

+17
-35
lines changed

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

Package.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ let package = Package(
1010
)
1111
],
1212
dependencies: [
13-
.Package(url: "https://github.com/ChameleonBot/Common.git", majorVersion: 0, minor: 1),
14-
.Package(url: "https://github.com/ChameleonBot/Config.git", majorVersion: 0, minor: 1),
15-
.Package(url: "https://github.com/ChameleonBot/Models.git", majorVersion: 0, minor: 1),
16-
.Package(url: "https://github.com/ChameleonBot/Services.git", majorVersion: 0, minor: 1),
17-
.Package(url: "https://github.com/ChameleonBot/WebAPI.git", majorVersion: 0, minor: 1),
18-
.Package(url: "https://github.com/ChameleonBot/RTMAPI.git", majorVersion: 0, minor: 1),
13+
.Package(url: "https://github.com/ChameleonBot/Common.git", majorVersion: 0, minor: 2),
14+
.Package(url: "https://github.com/ChameleonBot/Config.git", majorVersion: 0, minor: 2),
15+
.Package(url: "https://github.com/ChameleonBot/Models.git", majorVersion: 0, minor: 2),
16+
.Package(url: "https://github.com/ChameleonBot/Services.git", majorVersion: 0, minor: 2),
17+
.Package(url: "https://github.com/ChameleonBot/WebAPI.git", majorVersion: 0, minor: 2),
18+
.Package(url: "https://github.com/ChameleonBot/RTMAPI.git", majorVersion: 0, minor: 2),
1919
],
2020
exclude: [
2121
"XcodeProject"

Sources/Bot/Bot.swift

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@_exported import Common
77
import Foundation
88

9-
/// An extensible Slack bot user than can provide custom functionality
9+
/// An extensible Slack bot user that can provide custom functionality
1010
public class SlackBot {
1111
//MARK: - Private Properties
1212
fileprivate let config: Config
@@ -121,7 +121,7 @@ fileprivate extension SlackBot {
121121
self.rtmAPI.sendEvents = true
122122

123123
case .disconnected(let error):
124-
self.rtmAPI.disconnect()
124+
self.rtmAPI.disconnect(error: error)
125125
self.notifyDisconnected(error)
126126
}
127127
}
@@ -167,22 +167,20 @@ fileprivate extension SlackBot {
167167
//MARK: - RTMAPI
168168
fileprivate extension SlackBot {
169169
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))
172172
}
173-
self.rtmAPI.onError = { [weak self] error in
174-
self?.notifyError(error)
173+
self.rtmAPI.onError = { [unowned self] error in
174+
self.notifyError(error)
175175
}
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))
178178
}
179179
}
180180
func connectToRTM() {
181181
do {
182182
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
186184
do {
187185
let (botUser, team, users, channels, groups, ims) = try serializedData()
188186

@@ -235,8 +233,8 @@ fileprivate extension SlackBot {
235233
}
236234

237235
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)
240238
}
241239

242240
for endpoint in Endpoint.all {

Sources/Bot/SlackAuthenticator+OAuthAuthenticator.swift

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,3 @@ public struct OAuthSlackAuthentication: SlackAuthentication {
1212
return self.access_token
1313
}
1414
}
15-
16-
//fileprivate extension OAuthSlackAuthentication {
17-
// var elevatedScopes: [WebAPIScope] {
18-
// return [
19-
// .channels_history,
20-
// .channels_write,
21-
// .chat_write_bot,
22-
// .chat_write_user,
23-
// .emoji_read,
24-
// .groups_write,
25-
// .groups_history,
26-
// .pins_read,
27-
// ]
28-
// }
29-
//}

0 commit comments

Comments
 (0)