Skip to content

Commit 944d4c4

Browse files
IanKeenIanKeen
authored
Merge pull request #29 from iosdevelopershq/upgrade
Upgrade to new Chameleon
2 parents 7982625 + 6a6fc76 commit 944d4c4

25 files changed

+731
-676
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ sudo: required
66
dist: trusty
77
osx_image: xcode8
88
script:
9-
- eval "$(curl -sL https://raw.githubusercontent.com/ChameleonBot/Scripts/master/ci_3.0.1)"
9+
- eval "$(curl -sL https://raw.githubusercontent.com/ChameleonBot/Scripts/master/ci)"

‎Package.swift‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1+
// swift-tools-version:3.1
2+
13
import PackageDescription
24

35
let package = Package(
46
name: "Camille",
5-
targets: [
6-
Target(
7-
name: "Camille",
8-
dependencies: []
9-
)
10-
],
117
dependencies: [
12-
.Package(url: "https://github.com/ChameleonBot/Bot.git", majorVersion: 0, minor: 2),
13-
.Package(url: "https://github.com/ChameleonBot/Sugar.git", majorVersion: 0, minor: 2)
8+
.Package(url: "https://github.com/ChameleonBot/Chameleon.git", majorVersion: 1),
149
],
1510
exclude: [
1611
"XcodeProject"

‎Sources/Camille/Configs/Configs+CrossPostService.swift‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
import Sugar
2-
3-
extension Configs {
4-
static let CrossPost = CrossPostServiceConfig(
5-
timeSpan: 60 * 2,
6-
includeMessage: { message in
7-
return message.text.components(separatedBy: " ").count > 5
8-
},
9-
reportingTarget: "admins",
10-
publicWarning: { channel, user in
11-
return try SlackMessage()
12-
.line(user, " cross posting is discouraged.")
13-
.makeChatPostMessage(target: channel)
14-
},
15-
privateWarning: { im in
16-
return try SlackMessage()
17-
.line("Please refrain from cross posting, it is discouraged here.")
18-
.makeChatPostMessage(target: im)
19-
}
20-
)
21-
}
1+
//import Sugar
2+
//
3+
//extension Configs {
4+
// static let CrossPost = CrossPostServiceConfig(
5+
// timeSpan: 60 * 2,
6+
// includeMessage: { message in
7+
// return message.text.components(separatedBy: " ").count > 5
8+
// },
9+
// reportingTarget: "admins",
10+
// publicWarning: { channel, user in
11+
// return try SlackMessage()
12+
// .line(user, " cross posting is discouraged.")
13+
// .makeChatPostMessage(target: channel)
14+
// },
15+
// privateWarning: { im in
16+
// return try SlackMessage()
17+
// .line("Please refrain from cross posting, it is discouraged here.")
18+
// .makeChatPostMessage(target: im)
19+
// }
20+
// )
21+
//}

‎Sources/Camille/Configs/Configs+KarmaService.swift‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import Sugar
2-
3-
extension Configs {
4-
static let Karma = KarmaService.Config(
5-
topUsersLimit: 20,
6-
karmaAdjusters: [("++", 1), ("--", -1)],
7-
textDistanceThreshold: 4,
8-
allowedBufferCharacters: [" ", ":"],
9-
positiveMessage: { user, total in
10-
return ["\(user.name) you rock!: \(total)"]
11-
},
12-
negativeMessage: { user, total in
13-
return ["Boooo \(user.name)!: \(total)"]
14-
}
15-
)
16-
}
1+
//import Sugar
2+
//
3+
//extension Configs {
4+
// static let Karma = KarmaService.Config(
5+
// topUsersLimit: 20,
6+
// karmaAdjusters: [("++", 1), ("--", -1)],
7+
// textDistanceThreshold: 4,
8+
// allowedBufferCharacters: [" ", ":"],
9+
// positiveMessage: { user, total in
10+
// return ["\(user.name) you rock!: \(total)"]
11+
// },
12+
// negativeMessage: { user, total in
13+
// return ["Boooo \(user.name)!: \(total)"]
14+
// }
15+
// )
16+
//}

‎Sources/Camille/Configs/Configs+TopicService.swift‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import Sugar
2-
3-
extension Configs {
4-
static let Topic = TopicServiceConfig(
5-
userAllowed: { user in
6-
return user.is_admin
7-
},
8-
warning: { channel, user in
9-
return try SlackMessage()
10-
.line("I can't let you do that, ", user, ". Only admins are allowed to change the topic.")
11-
.makeChatPostMessage(target: channel)
12-
}
13-
)
14-
}
1+
//import Sugar
2+
//
3+
//extension Configs {
4+
// static let Topic = TopicServiceConfig(
5+
// userAllowed: { user in
6+
// return user.is_admin
7+
// },
8+
// warning: { channel, user in
9+
// return try SlackMessage()
10+
// .line("I can't let you do that, ", user, ". Only admins are allowed to change the topic.")
11+
// .makeChatPostMessage(target: channel)
12+
// }
13+
// )
14+
//}

‎Sources/Camille/Configs/Configs+UserJoinService.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import Sugar
2-
3-
extension Configs {
4-
static let UserJoin = UserJoinConfig(newUserAnnouncement: { im in
5-
return try SlackMessage()
6-
.line("Hi, ", im.user, ", welcome to the ios-developer slack team!")
7-
.makeChatPostMessage(target: im)
8-
})
9-
}
1+
//import Sugar
2+
//
3+
//extension Configs {
4+
// static let UserJoin = UserJoinConfig(newUserAnnouncement: { im in
5+
// return try SlackMessage()
6+
// .line("Hi, ", im.user, ", welcome to the ios-developer slack team!")
7+
// .makeChatPostMessage(target: im)
8+
// })
9+
//}

‎Sources/Camille/Configs/Configs.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
2-
enum Configs { }
1+
//
2+
//enum Configs { }

‎Sources/Camille/CrossPost/CrossPostButton.swift‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
2-
enum CrossPostButton: String {
3-
case privateWarning
4-
case publicWarning
5-
case removeAll
6-
7-
var text: String {
8-
switch self {
9-
case .privateWarning: return "Private Warning"
10-
case .publicWarning: return "Public Warning"
11-
case .removeAll: return "Remove all posts"
12-
}
13-
}
14-
15-
var afterExecuted: [CrossPostButton] {
16-
switch self {
17-
case .privateWarning: return [.removeAll]
18-
case .publicWarning: return [.removeAll]
19-
case .removeAll: return [.privateWarning, .publicWarning]
20-
}
21-
}
22-
23-
static var all: [CrossPostButton] { return [.privateWarning, .publicWarning, .removeAll] }
24-
}
1+
//
2+
//enum CrossPostButton: String {
3+
// case privateWarning
4+
// case publicWarning
5+
// case removeAll
6+
//
7+
// var text: String {
8+
// switch self {
9+
// case .privateWarning: return "Private Warning"
10+
// case .publicWarning: return "Public Warning"
11+
// case .removeAll: return "Remove all posts"
12+
// }
13+
// }
14+
//
15+
// var afterExecuted: [CrossPostButton] {
16+
// switch self {
17+
// case .privateWarning: return [.removeAll]
18+
// case .publicWarning: return [.removeAll]
19+
// case .removeAll: return [.privateWarning, .publicWarning]
20+
// }
21+
// }
22+
//
23+
// static var all: [CrossPostButton] { return [.privateWarning, .publicWarning, .removeAll] }
24+
//}

0 commit comments

Comments
 (0)