Compare commits
83 Commits
Author | SHA1 | Date | |
---|---|---|---|
kageru | e3e0c07fa2 | ||
kageru | 80111b2bbf | ||
kageru | 997284fb54 | ||
kageru | 540095f677 | ||
kageru | a49fec2fcf | ||
kageru | 7c08bab460 | ||
kageru | 2b40e0578f | ||
kageru | 3838cde65e | ||
kageru | 6b21625f19 | ||
kageru | 6b52db8324 | ||
kageru | 75588b357c | ||
kageru | d7594c29e5 | ||
kageru | 91259094ed | ||
kageru | 5679d5d8dd | ||
kageru | 83a7b2cbdf | ||
kageru | a5bc947d27 | ||
kageru | 4185ee50fa | ||
kageru | d2027a2cdc | ||
kageru | d354821881 | ||
kageru | 39083d8248 | ||
kageru | 5c7efcd10e | ||
kageru | cd9ee0e881 | ||
kageru | f742383f38 | ||
kageru | 07c45d84d0 | ||
kageru | a05f2e558b | ||
kageru | f1b727662a | ||
kageru | ccf76e7c64 | ||
kageru | 69c3ae80b8 | ||
kageru | 2c56e1959a | ||
kageru | 50b97fdec7 | ||
kageru | 3d813384e2 | ||
kageru | 7eadb2d67d | ||
kageru | 288be7e4f5 | ||
kageru | a8ed168122 | ||
kageru | 5cc34c9e29 | ||
kageru | 231b27176a | ||
kageru | 1bc26951f7 | ||
kageru | 58307c9743 | ||
kageru | 2be20880b8 | ||
kageru | af65dcc06b | ||
kageru | 5a95138861 | ||
kageru | 56475ef685 | ||
kageru | d6492bae8f | ||
kageru | bb03474bf5 | ||
kageru | 17c7120796 | ||
kageru | e31d46ceb5 | ||
kageru | 87cb943712 | ||
kageru | 897457336d | ||
kageru | 1672b4c62a | ||
kageru | 828845f230 | ||
kageru | ba913f2bed | ||
kageru | e7f47b7420 | ||
kageru | c49a122622 | ||
kageru | 684926f1c5 | ||
kageru | f314c20dd8 | ||
kageru | f871d2a381 | ||
kageru | e3219c7800 | ||
kageru | 0ae5e83641 | ||
kageru | 60797c21d0 | ||
kageru | 35bd570c93 | ||
kageru | b4c2275670 | ||
kageru | 8560c3d82e | ||
kageru | c299406d69 | ||
kageru | 7bbcaba49c | ||
kageru | 3944b07ec0 | ||
kageru | 93a6e92191 | ||
kageru | 74c2f643f9 | ||
kageru | 7efeb9bace | ||
kageru | 39ceaffa6c | ||
kageru | b9f1c6e540 | ||
kageru | d425687fb5 | ||
kageru | e6f73bb178 | ||
kageru | 31c5cd7135 | ||
kageru | d6320bb5de | ||
kageru | c400ab7369 | ||
kageru | 691bc408c0 | ||
kageru | 8be98f161f | ||
kageru | cdc053a443 | ||
kageru | c8123cca4e | ||
kageru | 6069795caa | ||
kageru | f82ed7be56 | ||
kageru | d0b3bb608b | ||
kageru | 8a1308f98d |
|
@ -0,0 +1,8 @@
|
|||
root = true
|
||||
|
||||
[*]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
end_of_line = lf
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
|
@ -0,0 +1,7 @@
|
|||
## 1.1
|
||||
- getConfig and setConfig to reload the config file at runtime via discord commands
|
||||
- fixed wrong timestamps in some embeds (ty CommanderLook)
|
||||
|
||||
# 1.0
|
||||
- feature parity with [the old bot](https://git.kageru.moe/kageru/discord-selphybot) (this does not include features that were broken in the old bot)
|
||||
- proper config validation at startup time
|
|
@ -0,0 +1,21 @@
|
|||
# kagebot
|
||||
Kinda dead.
|
||||
|
||||
This bot is a replacement for [my old one](https://git.kageru.moe/kageru/discord-selphybot) with a very simple premise:
|
||||
As much as possible should be configurable in a human-readable way.
|
||||
This will allow anyone to modify the config to host their own instance tailored to their own needs,
|
||||
and it allows server moderators to make changes without any coding experience. Even at runtime.
|
||||
I try to maintain a comprehensive default configuration as part of the repository
|
||||
because the past has taught me that I’m not good at updating readmes.
|
||||
|
||||
## A few months after
|
||||
The bot has become somewhat specialized at this point,
|
||||
but I think it should still be generally reusable if a similar use case arises.
|
||||
The implementation has kind of deteriorated into a playground for me
|
||||
(adding arrow-kt and just generally trying out FP stuff)[1],
|
||||
but it’s been running and moderating a 1000+ user server for over a year
|
||||
with relatively little maintenance.
|
||||
|
||||
[1]: While arrow is great, adding it to a project after the fact leads to a very weird combination of FP and non-FP constructs.
|
||||
Would not recommend in production. This was also built in an early version of arrow that still had `Kind` and other concepts that were scrapped later,
|
||||
but I don’t plan to update that ever. The bot can keep running as-is until it breaks.
|
|
@ -1,22 +1,25 @@
|
|||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
|
||||
apply {
|
||||
plugin("kotlin-kapt")
|
||||
}
|
||||
plugins {
|
||||
kotlin("jvm") version "1.3.40"
|
||||
id("com.github.johnrengelman.shadow") version "5.1.0" apply true
|
||||
kotlin("jvm") version "1.9.0"
|
||||
id("com.github.johnrengelman.shadow") version "8.1.1" apply true
|
||||
application
|
||||
}
|
||||
|
||||
val botMainClass = "moe.kageru.kagebot.KagebotKt"
|
||||
application {
|
||||
mainClassName = botMainClass
|
||||
mainClass.set(botMainClass)
|
||||
}
|
||||
|
||||
tasks.withType<Jar> {
|
||||
manifest {
|
||||
attributes(
|
||||
mapOf(
|
||||
"Main-Class" to botMainClass
|
||||
)
|
||||
"Main-Class" to botMainClass,
|
||||
),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
@ -27,24 +30,35 @@ version = "0.1"
|
|||
repositories {
|
||||
mavenCentral()
|
||||
jcenter()
|
||||
maven {
|
||||
url = uri("https://dl.bintray.com/arrow-kt/arrow-kt/")
|
||||
}
|
||||
}
|
||||
|
||||
val test by tasks.getting(Test::class) {
|
||||
useJUnitPlatform { }
|
||||
}
|
||||
|
||||
val arrowVersion = "0.11.0"
|
||||
dependencies {
|
||||
implementation("com.moandjiezana.toml:toml4j:0.7.2")
|
||||
implementation(kotlin("stdlib-jdk8"))
|
||||
implementation("org.javacord:javacord:3.0.4")
|
||||
implementation("com.uchuhimo:konf-core:0.23.0")
|
||||
implementation("com.uchuhimo:konf-toml:0.23.0")
|
||||
implementation("org.javacord:javacord:3.8.0")
|
||||
implementation("org.mapdb:mapdb:3.0.8")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
|
||||
implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.0")
|
||||
implementation("com.fasterxml.jackson.core:jackson-annotations:2.11.3")
|
||||
|
||||
testImplementation("io.kotlintest:kotlintest-runner-junit5:3.3.2")
|
||||
testImplementation("io.mockk:mockk:1.9.3")
|
||||
implementation("io.arrow-kt:arrow-core:$arrowVersion")
|
||||
implementation("io.arrow-kt:arrow-syntax:$arrowVersion")
|
||||
|
||||
testImplementation("io.kotlintest:kotlintest-runner-junit5:3.4.2")
|
||||
testImplementation("io.mockk:mockk:1.10.0")
|
||||
// these two are needed to access javacord internals (such as reading from sent embeds during tests)
|
||||
testImplementation("org.javacord:javacord-core:3.0.4")
|
||||
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.9.9")
|
||||
testImplementation("org.javacord:javacord-core:3.8.0")
|
||||
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.11.3")
|
||||
}
|
||||
|
||||
tasks.withType<KotlinCompile> {
|
||||
kotlinOptions.jvmTarget = "1.8"
|
||||
kotlinOptions.jvmTarget = "20"
|
||||
}
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
ktlint --disabled_rules import-ordering,no-wildcard-imports && gradle test
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/sh
|
||||
if ./check.sh; then
|
||||
ssh lain sudo systemctl restart selphybot.service
|
||||
fi
|
|
@ -1,9 +1,10 @@
|
|||
package moe.kageru.kagebot
|
||||
|
||||
import moe.kageru.kagebot.persistence.Dao
|
||||
import org.javacord.api.DiscordApi
|
||||
import java.util.concurrent.atomic.AtomicInteger
|
||||
|
||||
object Globals {
|
||||
lateinit var api: DiscordApi
|
||||
val commandCounter: AtomicInteger = AtomicInteger(0)
|
||||
val commandCounter: AtomicInteger = AtomicInteger(Dao.getCommandCounter())
|
||||
}
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
package moe.kageru.kagebot
|
||||
|
||||
import moe.kageru.kagebot.Log.log
|
||||
import arrow.core.extensions.list.foldable.find
|
||||
import moe.kageru.kagebot.Util.checked
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.config.ConfigParser
|
||||
import moe.kageru.kagebot.config.RawConfig
|
||||
import moe.kageru.kagebot.cron.CronD
|
||||
import moe.kageru.kagebot.persistence.Dao
|
||||
import org.javacord.api.DiscordApiBuilder
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
import org.javacord.api.event.server.member.ServerMemberJoinEvent
|
||||
import java.io.File
|
||||
import kotlin.system.exitProcess
|
||||
|
||||
|
@ -16,59 +16,43 @@ fun main() {
|
|||
}
|
||||
|
||||
object Kagebot {
|
||||
fun processMessage(event: MessageCreateEvent) {
|
||||
if (event.messageAuthor.isBotUser) {
|
||||
if (event.messageAuthor.isYourself) {
|
||||
log.info("<Self> ${event.readableMessageContent}")
|
||||
}
|
||||
fun MessageCreateEvent.process() {
|
||||
if (messageAuthor.isBotUser) {
|
||||
handleOwn()
|
||||
return
|
||||
}
|
||||
for (command in Config.commands) {
|
||||
if (command.matches(event.readableMessageContent)) {
|
||||
command.execute(event)
|
||||
break
|
||||
}
|
||||
}
|
||||
Config.commands
|
||||
.find { it.matches(readableMessageContent) && it.isAllowed(this) }
|
||||
.map { it.execute(this) }
|
||||
}
|
||||
|
||||
fun welcomeUser(event: ServerMemberJoinEvent) {
|
||||
Config.features.welcome!!.let { welcome ->
|
||||
val message = event.user.sendMessage(welcome.embed)
|
||||
// If the user disabled direct messages, try the fallback (if defined)
|
||||
if (!Util.wasSuccessful(message) &&
|
||||
welcome.fallbackChannel != null &&
|
||||
welcome.fallbackMessage != null
|
||||
) {
|
||||
welcome.fallbackChannel.sendMessage(
|
||||
welcome.fallbackMessage.replace(
|
||||
"@@",
|
||||
MessageUtil.mention(event.user)
|
||||
)
|
||||
)
|
||||
private fun MessageCreateEvent.handleOwn() {
|
||||
if (messageAuthor.isYourself) {
|
||||
val loggedMessage = readableMessageContent.ifBlank { "[embed]" }
|
||||
Log.info("<Self> $loggedMessage")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun getSecret() = File("secret").readText().replace("\n", "")
|
||||
|
||||
fun init() {
|
||||
Globals.api = DiscordApiBuilder().setToken(getSecret()).login().join()
|
||||
try {
|
||||
ConfigParser.initialLoad(RawConfig.read())
|
||||
} catch (e: IllegalArgumentException) {
|
||||
println("Config error:\n$e,\n${e.message},\n${e.stackTrace.joinToString("\n")}")
|
||||
val secret = File("secret").readText().trim()
|
||||
val api = DiscordApiBuilder().setToken(secret).setAllIntents().login().join()
|
||||
Globals.api = api
|
||||
ConfigParser.initialLoad(ConfigParser.DEFAULT_CONFIG_PATH).mapLeft { e ->
|
||||
println("Config parsing error:\n$e,\n${e.message},\n${e.stackTrace.joinToString("\n")}")
|
||||
println("Caused by: ${e.cause}\n${e.cause?.stackTrace?.joinToString("\n")}")
|
||||
exitProcess(1)
|
||||
}
|
||||
Runtime.getRuntime().addShutdownHook(Thread {
|
||||
log.info("Bot has been interrupted. Shutting down.")
|
||||
Globals.api.disconnect()
|
||||
})
|
||||
log.info("kagebot Mk II running")
|
||||
Globals.api.addMessageCreateListener { checked { processMessage(it) } }
|
||||
Config.features.welcome?.let {
|
||||
Globals.api.addServerMemberJoinListener {
|
||||
checked { welcomeUser(it) }
|
||||
}
|
||||
}
|
||||
Runtime.getRuntime().addShutdownHook(
|
||||
Thread {
|
||||
Log.info("Bot has been interrupted. Shutting down.")
|
||||
Dao.setCommandCounter(Globals.commandCounter.get())
|
||||
Dao.close()
|
||||
api.disconnect()
|
||||
},
|
||||
)
|
||||
Log.info("kagebot Mk II running")
|
||||
api.addMessageCreateListener { checked { it.process() } }
|
||||
Config.features.eventFeatures().forEach { it.register(api) }
|
||||
CronD.startAll()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,13 +8,22 @@ import java.util.logging.LogRecord
|
|||
import java.util.logging.Logger
|
||||
|
||||
object Log {
|
||||
val log: Logger by lazy {
|
||||
val log = Logger.getGlobal()
|
||||
val fh = FileHandler("kagebot.log", true)
|
||||
val formatter = LogFormatter()
|
||||
fh.formatter = formatter
|
||||
log.addHandler(fh)
|
||||
return@lazy log
|
||||
private val log: Logger by lazy {
|
||||
Logger.getGlobal().apply {
|
||||
addHandler(
|
||||
FileHandler("kagebot.log", true).apply {
|
||||
formatter = LogFormatter()
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fun info(message: String) {
|
||||
log.info(message)
|
||||
}
|
||||
|
||||
fun warn(message: String) {
|
||||
log.warning(message)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,37 +1,37 @@
|
|||
package moe.kageru.kagebot
|
||||
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import org.javacord.api.entity.channel.TextChannel
|
||||
import moe.kageru.kagebot.config.SystemSpec
|
||||
import org.javacord.api.entity.message.Message
|
||||
import org.javacord.api.entity.message.MessageAuthor
|
||||
import org.javacord.api.entity.message.Messageable
|
||||
import org.javacord.api.entity.message.embed.EmbedBuilder
|
||||
import org.javacord.api.entity.user.User
|
||||
import java.util.concurrent.CompletableFuture
|
||||
|
||||
object MessageUtil {
|
||||
fun mention(user: MessageAuthor): String {
|
||||
return "<@${user.id}>"
|
||||
fun MessageAuthor.mention() = "<@$id>"
|
||||
|
||||
fun withEmbed(op: EmbedBuilder.() -> Unit): EmbedBuilder {
|
||||
return EmbedBuilder().apply {
|
||||
Config.server.icon.ifPresent { setThumbnail(it) }
|
||||
setColor(SystemSpec.color)
|
||||
op()
|
||||
}
|
||||
}
|
||||
|
||||
fun mention(user: User): String {
|
||||
return "<@${user.id}>"
|
||||
fun Messageable.sendEmbed(op: EmbedBuilder.() -> Unit) {
|
||||
val embed = withEmbed {
|
||||
setTimestampToNow()
|
||||
op()
|
||||
}
|
||||
|
||||
fun getEmbedBuilder(): EmbedBuilder {
|
||||
val builder = EmbedBuilder()
|
||||
Config.server.icon.ifPresent { builder.setThumbnail(it) }
|
||||
return builder.setColor(Config.systemConfig.color)
|
||||
sendMessage(embed)
|
||||
}
|
||||
|
||||
/**
|
||||
* Send and embed and add the current time to it.
|
||||
* The time is not set in [getEmbedBuilder] because of https://git.kageru.moe/kageru/discord-kagebot/issues/13.
|
||||
* The time is not set in [withEmbed] because of https://git.kageru.moe/kageru/discord-kagebot/issues/13.
|
||||
*/
|
||||
fun sendEmbed(target: TextChannel, embed: EmbedBuilder): CompletableFuture<Message> {
|
||||
return target.sendMessage(embed.setTimestampToNow())
|
||||
}
|
||||
|
||||
fun sendEmbed(target: User, embed: EmbedBuilder): CompletableFuture<Message> {
|
||||
fun sendEmbed(target: Messageable, embed: EmbedBuilder): CompletableFuture<Message> {
|
||||
return target.sendMessage(embed.setTimestampToNow())
|
||||
}
|
||||
|
||||
|
@ -40,15 +40,22 @@ object MessageUtil {
|
|||
* I tried LinkedHashMaps, but those don’t seem to work either.
|
||||
*/
|
||||
fun listToEmbed(contents: List<String>): EmbedBuilder {
|
||||
if (contents.size % 2 == 1) {
|
||||
throw IllegalStateException("Embed must have even number of content strings (title/content pairs)")
|
||||
}
|
||||
val builder = getEmbedBuilder()
|
||||
contents.zip(1..contents.size).filter { it.second % 2 == 0 }
|
||||
for ((heading, content) in contents.withIndex().filter { it.index % 2 == 0 }
|
||||
zip contents.withIndex().filter { it.index % 2 == 1 }) {
|
||||
builder.addField(heading.value, content.value)
|
||||
}
|
||||
return builder
|
||||
check(contents.size % 2 != 1) { "Embed must have even number of content strings (title/content pairs)" }
|
||||
return withEmbed {
|
||||
contents.toPairs().forEach { (heading, content) ->
|
||||
addField(heading, content)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert a list of elements to pairs, retaining order.
|
||||
* The last element is dropped if the input size is odd.
|
||||
* [1, 2, 3, 4, 5] -> [[1, 2], [3, 4]]
|
||||
*/
|
||||
private fun <T> Collection<T>.toPairs(): List<Pair<T, T>> = this.iterator().run {
|
||||
(0 until size / 2).map {
|
||||
Pair(next(), next())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,92 +1,76 @@
|
|||
package moe.kageru.kagebot
|
||||
|
||||
import moe.kageru.kagebot.Log.log
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import arrow.core.*
|
||||
import arrow.core.extensions.either.monad.flatMap
|
||||
import arrow.core.extensions.list.foldable.find
|
||||
import moe.kageru.kagebot.config.Config.server
|
||||
import moe.kageru.kagebot.extensions.*
|
||||
import org.javacord.api.entity.channel.TextChannel
|
||||
import org.javacord.api.entity.message.MessageAuthor
|
||||
import org.javacord.api.entity.message.embed.EmbedBuilder
|
||||
import org.javacord.api.entity.permission.Role
|
||||
import org.javacord.api.entity.user.User
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
import java.awt.Color
|
||||
import java.util.*
|
||||
import java.util.concurrent.CompletableFuture
|
||||
import java.util.concurrent.CompletionException
|
||||
|
||||
object Util {
|
||||
inline fun <T> T.doIf(condition: (T) -> Boolean, op: (T) -> T): T {
|
||||
return if (condition(this)) op(this) else this
|
||||
inline fun <T> T.applyIf(condition: Boolean, op: (T) -> T): T {
|
||||
return if (condition) op(this) else this
|
||||
}
|
||||
|
||||
/**
|
||||
* Mimics the behavior of [Optional.ifPresent], but returns null if the optional is empty,
|
||||
* allowing easier fallback behavior via Kotlin’s ?: operator.
|
||||
*/
|
||||
private inline fun <T, R> Optional<T>.ifNotEmpty(op: (T) -> R): R? {
|
||||
if (this.isPresent) {
|
||||
return op(this.get())
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
fun hasOneOf(messageAuthor: MessageAuthor, roles: Set<Role>): Boolean {
|
||||
return messageAuthor.asUser().ifNotEmpty { user ->
|
||||
user.getRoles(server).toSet().intersect(roles).isNotEmpty()
|
||||
} ?: false
|
||||
fun hasOneOf(messageAuthor: MessageAuthor, roles: Set<String>): Boolean {
|
||||
return messageAuthor.asUser().asOption().flatMap { user ->
|
||||
user.roles().find { it.name in roles }
|
||||
}.nonEmpty()
|
||||
}
|
||||
|
||||
private val channelIdRegex = Regex("\\d{18}")
|
||||
private fun String.isEntityId() = channelIdRegex.matches(this)
|
||||
|
||||
@Throws(IllegalArgumentException::class)
|
||||
fun findRole(idOrName: String): Role {
|
||||
fun findRole(idOrName: String): Either<String, Role> {
|
||||
return when {
|
||||
idOrName.isEntityId() -> server.getRoleById(idOrName).ifNotEmpty { it }
|
||||
?: throw IllegalArgumentException("Role $idOrName not found.")
|
||||
else -> server.getRolesByNameIgnoreCase(idOrName).let {
|
||||
when (it.size) {
|
||||
0 -> throw IllegalArgumentException("Role $idOrName not found.")
|
||||
1 -> it[0]
|
||||
else -> throw IllegalArgumentException("More than one role found with name $idOrName. Please specify the role ID instead")
|
||||
}
|
||||
idOrName.isEntityId() -> server.getRoleById(idOrName).asOption().toEither { 0 }
|
||||
else -> server.rolesByName(idOrName).getOnly()
|
||||
}.mapLeft { "Found $it results, expected 1" }
|
||||
}
|
||||
|
||||
private fun <T> ListK<T>.getOnly(): Either<Int, T> {
|
||||
return when (size) {
|
||||
1 -> Either.right(first())
|
||||
else -> Either.left(size)
|
||||
}
|
||||
}
|
||||
|
||||
fun <T> wasSuccessful(future: CompletableFuture<T>): Boolean {
|
||||
try {
|
||||
future.join()
|
||||
fun findUser(idOrName: String): Option<User> {
|
||||
return when {
|
||||
idOrName.isEntityId() -> server.getMemberById(idOrName).asOption()
|
||||
idOrName.contains('#') -> server.getMemberByDiscriminatedNameIgnoreCase(idOrName).asOption()
|
||||
else -> server.membersByName(idOrName).firstOrNone()
|
||||
}
|
||||
}
|
||||
|
||||
fun <T> CompletableFuture<T>.asOption(): Option<T> {
|
||||
return try {
|
||||
val future = join()
|
||||
if (isCompletedExceptionally) None else Option.just(future)
|
||||
} catch (e: CompletionException) {
|
||||
// we don’t care about this error, but I don’t want to spam stdout
|
||||
Option.empty()
|
||||
}
|
||||
return !future.isCompletedExceptionally
|
||||
}
|
||||
|
||||
@Throws(IllegalArgumentException::class)
|
||||
fun findChannel(idOrName: String): TextChannel {
|
||||
fun <T> Optional<T>.asOption(): Option<T> = if (this.isPresent) Option.just(this.get()) else Option.empty()
|
||||
|
||||
fun findChannel(idOrName: String): Either<String, TextChannel> {
|
||||
return when {
|
||||
idOrName.isEntityId() -> server.getTextChannelById(idOrName).ifNotEmpty { it }
|
||||
?: throw IllegalArgumentException("Channel ID $idOrName not found.")
|
||||
else -> if (idOrName.startsWith('@')) {
|
||||
Globals.api.getCachedUserByDiscriminatedName(idOrName.removePrefix("@")).ifNotEmpty { user ->
|
||||
val channelFuture = user.openPrivateChannel()
|
||||
val channel = channelFuture.join()
|
||||
if (channelFuture.isCompletedExceptionally) {
|
||||
throw IllegalArgumentException("Could not open private channel with user $idOrName for redirection.")
|
||||
}
|
||||
channel
|
||||
}
|
||||
?: throw IllegalArgumentException("Can’t find user $idOrName for redirection.")
|
||||
} else {
|
||||
server.getTextChannelsByName(idOrName).let {
|
||||
when (it.size) {
|
||||
0 -> throw IllegalArgumentException("Channel $idOrName not found.")
|
||||
1 -> it[0]
|
||||
else -> throw IllegalArgumentException("More than one channel found with name $idOrName. Please specify the channel ID instead")
|
||||
}
|
||||
}
|
||||
idOrName.isEntityId() -> server.channelById(idOrName).toEither { "Channel $idOrName not found" }
|
||||
idOrName.startsWith('@') -> Globals.api.getUserById(idOrName.removePrefix("@")).asOption()
|
||||
.toEither { "User $idOrName not found" }
|
||||
.flatMap { user ->
|
||||
user.openPrivateChannel().asOption().toEither { "Can’t DM user $idOrName" }
|
||||
}
|
||||
else -> server.channelsByName(idOrName).getOnly().mapLeft { "Found $it channels for $idOrName, expected 1" }
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -94,24 +78,8 @@ object Util {
|
|||
try {
|
||||
op()
|
||||
} catch (e: Exception) {
|
||||
log.warning("An uncaught exception occurred.\n$e")
|
||||
MessageUtil.sendEmbed(Globals.api.owner.get(),
|
||||
EmbedBuilder()
|
||||
.setTimestampToNow()
|
||||
.setColor(Color.RED)
|
||||
.addField("Error", "kagebot has encountered an error")
|
||||
.addField(
|
||||
"$e", """```
|
||||
${e.stackTrace.joinToString("\n")}
|
||||
```""".trimIndent()
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fun userFromMessage(message: MessageCreateEvent): User? {
|
||||
return message.messageAuthor.id.let { id ->
|
||||
Config.server.getMemberById(id).orElse(null)
|
||||
Log.warn("An uncaught exception occurred.\n$e")
|
||||
Log.warn(e.stackTrace.joinToString("\n"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package moe.kageru.kagebot.command
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty
|
||||
import moe.kageru.kagebot.Globals
|
||||
import moe.kageru.kagebot.Log.log
|
||||
import moe.kageru.kagebot.Log
|
||||
import moe.kageru.kagebot.MessageUtil
|
||||
import moe.kageru.kagebot.Util.doIf
|
||||
import moe.kageru.kagebot.MessageUtil.mention
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.config.RawCommand
|
||||
import moe.kageru.kagebot.features.MessageFeature
|
||||
import org.javacord.api.entity.message.MessageAuthor
|
||||
import org.javacord.api.entity.message.embed.EmbedBuilder
|
||||
|
@ -13,41 +13,30 @@ import org.javacord.api.event.message.MessageCreateEvent
|
|||
|
||||
private const val AUTHOR_PLACEHOLDER = "@@"
|
||||
|
||||
class Command(cmd: RawCommand) {
|
||||
val trigger: String
|
||||
private val response: String?
|
||||
val matchType: MatchType
|
||||
private val permissions: Permissions?
|
||||
private val actions: MessageActions?
|
||||
val regex: Regex?
|
||||
val embed: EmbedBuilder?
|
||||
val feature: MessageFeature?
|
||||
|
||||
init {
|
||||
trigger = cmd.trigger ?: throw IllegalArgumentException("Every command must have a trigger.")
|
||||
response = cmd.response
|
||||
matchType = cmd.matchType?.let { type ->
|
||||
class Command(
|
||||
val trigger: String,
|
||||
private val response: String? = null,
|
||||
private val permissions: Permissions?,
|
||||
@JsonProperty("action")
|
||||
private val actions: MessageActions?,
|
||||
embed: List<String>?,
|
||||
feature: String?,
|
||||
matchType: String?,
|
||||
) {
|
||||
val matchType: MatchType = matchType?.let { type ->
|
||||
MatchType.values().find { it.name.equals(type, ignoreCase = true) }
|
||||
?: throw IllegalArgumentException("Invalid [command.matchType]: “${cmd.matchType}”")
|
||||
?: throw IllegalArgumentException("Invalid [command.matchType]: “$matchType”")
|
||||
} ?: MatchType.PREFIX
|
||||
permissions = cmd.permissions?.let { Permissions(it) }
|
||||
actions = cmd.actions?.let { MessageActions(it) }
|
||||
regex = if (matchType == MatchType.REGEX) Regex(trigger) else null
|
||||
embed = cmd.embed?.let(MessageUtil::listToEmbed)
|
||||
feature = cmd.feature?.let { Config.features.findByString(it) }
|
||||
}
|
||||
val regex: Regex? = if (this.matchType == MatchType.REGEX) Regex(trigger) else null
|
||||
val embed: EmbedBuilder? = embed?.let(MessageUtil::listToEmbed)
|
||||
private val feature: MessageFeature? = feature?.let { Config.features.findByString(it) }
|
||||
|
||||
fun matches(msg: String) = this.matchType.matches(msg, this)
|
||||
|
||||
fun isAllowed(message: MessageCreateEvent) = permissions?.isAllowed(message) ?: true
|
||||
|
||||
fun execute(message: MessageCreateEvent) {
|
||||
if (permissions?.isAllowed(message) == false) {
|
||||
if (Config.localization.permissionDenied.isNotBlank()) {
|
||||
message.channel.sendMessage(Config.localization.permissionDenied)
|
||||
}
|
||||
log.info("Denying command ${this.trigger} to user ${message.messageAuthor.discriminatedName} (ID: ${message.messageAuthor.id})")
|
||||
return
|
||||
}
|
||||
log.info("Executing command ${this.trigger} triggered by user ${message.messageAuthor.discriminatedName} (ID: ${message.messageAuthor.id})")
|
||||
Log.info("Executing command ${this.trigger} triggered by user ${message.messageAuthor.discriminatedName} (ID: ${message.messageAuthor.id})")
|
||||
Globals.commandCounter.incrementAndGet()
|
||||
this.actions?.run(message, this)
|
||||
this.response?.let {
|
||||
|
@ -59,23 +48,13 @@ class Command(cmd: RawCommand) {
|
|||
this.feature?.handle(message)
|
||||
}
|
||||
|
||||
fun matches(msg: String) = this.matchType.matches(msg, this)
|
||||
|
||||
private fun respond(author: MessageAuthor, response: String) = response.doIf({ it.contains(AUTHOR_PLACEHOLDER) }) {
|
||||
it.replace(AUTHOR_PLACEHOLDER, MessageUtil.mention(author))
|
||||
}
|
||||
private fun respond(author: MessageAuthor, response: String) =
|
||||
response.replace(AUTHOR_PLACEHOLDER, author.mention())
|
||||
}
|
||||
|
||||
enum class MatchType {
|
||||
PREFIX {
|
||||
override fun matches(message: String, command: Command) = message.startsWith(command.trigger)
|
||||
},
|
||||
CONTAINS {
|
||||
override fun matches(message: String, command: Command) = message.contains(command.trigger)
|
||||
},
|
||||
REGEX {
|
||||
override fun matches(message: String, command: Command) = command.regex!!.matches(message)
|
||||
};
|
||||
|
||||
abstract fun matches(message: String, command: Command): Boolean
|
||||
@Suppress("unused")
|
||||
enum class MatchType(val matches: (String, Command) -> Boolean) {
|
||||
PREFIX({ message, command -> message.startsWith(command.trigger, ignoreCase = true) }),
|
||||
CONTAINS({ message, command -> message.contains(command.trigger, ignoreCase = true) }),
|
||||
REGEX({ message, command -> command.regex!!.matches(message) }),
|
||||
}
|
||||
|
|
|
@ -1,15 +1,18 @@
|
|||
package moe.kageru.kagebot.command
|
||||
|
||||
import moe.kageru.kagebot.Log.log
|
||||
import moe.kageru.kagebot.MessageUtil
|
||||
import com.fasterxml.jackson.annotation.JsonProperty
|
||||
import moe.kageru.kagebot.Log
|
||||
import moe.kageru.kagebot.MessageUtil.sendEmbed
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.config.RawMessageActions
|
||||
import moe.kageru.kagebot.config.LocalizationSpec
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
|
||||
class MessageActions(rawActions: RawMessageActions) {
|
||||
private val delete: Boolean = rawActions.delete
|
||||
private val redirect: MessageRedirect? = rawActions.redirect?.let(::MessageRedirect)
|
||||
private val assignment: RoleAssignment? = rawActions.assign?.let(::RoleAssignment)
|
||||
class MessageActions(
|
||||
private val delete: Boolean = false,
|
||||
private val redirect: MessageRedirect?,
|
||||
@JsonProperty("assign")
|
||||
private val assignment: RoleAssignment?,
|
||||
) {
|
||||
|
||||
fun run(message: MessageCreateEvent, command: Command) {
|
||||
if (delete) {
|
||||
|
@ -23,15 +26,13 @@ class MessageActions(rawActions: RawMessageActions) {
|
|||
if (message.message.canYouDelete()) {
|
||||
message.deleteMessage()
|
||||
message.messageAuthor.asUser().ifPresent { user ->
|
||||
MessageUtil.sendEmbed(
|
||||
user,
|
||||
MessageUtil.getEmbedBuilder()
|
||||
.addField("Blacklisted", Config.localization.messageDeleted)
|
||||
.addField("Original:", "“${message.readableMessageContent}”")
|
||||
)
|
||||
user.sendEmbed {
|
||||
addField("__Blacklisted__", Config.localization[LocalizationSpec.messageDeleted])
|
||||
addField("Original:", "“${message.readableMessageContent}”")
|
||||
}
|
||||
}
|
||||
} else {
|
||||
log.info("Tried to delete a message without the necessary permissions. Channel: ${message.channel.id}")
|
||||
Log.info("Tried to delete a message without the necessary permissions. Channel: ${message.channel.id}")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,29 +1,28 @@
|
|||
package moe.kageru.kagebot.command
|
||||
|
||||
import moe.kageru.kagebot.Log.log
|
||||
import moe.kageru.kagebot.Log
|
||||
import moe.kageru.kagebot.MessageUtil
|
||||
import moe.kageru.kagebot.Util
|
||||
import moe.kageru.kagebot.Util.applyIf
|
||||
import moe.kageru.kagebot.Util.asOption
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.config.RawRedirect
|
||||
import moe.kageru.kagebot.config.LocalizationSpec
|
||||
import moe.kageru.kagebot.extensions.unwrap
|
||||
import org.javacord.api.entity.channel.TextChannel
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
|
||||
internal class MessageRedirect(rawRedirect: RawRedirect) {
|
||||
private val target: TextChannel = rawRedirect.target?.let(Util::findChannel)
|
||||
?: throw IllegalArgumentException("Every redirect needs to have a target.")
|
||||
private val anonymous: Boolean = rawRedirect.anonymous
|
||||
class MessageRedirect(target: String, private val anonymous: Boolean = false) {
|
||||
private val targetChannel: TextChannel = Util.findChannel(target).unwrap()
|
||||
|
||||
fun execute(message: MessageCreateEvent, command: Command) {
|
||||
val embed = MessageUtil.getEmbedBuilder()
|
||||
.addField(
|
||||
Config.localization.redirectedMessage,
|
||||
message.readableMessageContent.let { content ->
|
||||
when (command.matchType) {
|
||||
MatchType.PREFIX -> content.removePrefix(command.trigger).trim()
|
||||
else -> content
|
||||
val embed = MessageUtil.withEmbed {
|
||||
val redirectedText = message.readableMessageContent
|
||||
.applyIf(command.matchType == MatchType.PREFIX) { content ->
|
||||
content.removePrefix(command.trigger).trim()
|
||||
}
|
||||
addField(Config.localization[LocalizationSpec.redirectedMessage], redirectedText)
|
||||
Log.info("Redirected message: $redirectedText")
|
||||
}
|
||||
)
|
||||
// No inlined if/else because the types are different.
|
||||
// Passing the full message author will also include the avatar in the embed.
|
||||
embed.apply {
|
||||
|
@ -34,8 +33,8 @@ internal class MessageRedirect(rawRedirect: RawRedirect) {
|
|||
}
|
||||
}
|
||||
|
||||
if (!Util.wasSuccessful(MessageUtil.sendEmbed(target, embed))) {
|
||||
log.warning("Could not redirect message to channel $target")
|
||||
if (MessageUtil.sendEmbed(targetChannel, embed).asOption().isEmpty()) {
|
||||
Log.warn("Could not redirect message to channel $targetChannel")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,34 +1,23 @@
|
|||
package moe.kageru.kagebot.command
|
||||
|
||||
import arrow.core.Option
|
||||
import arrow.core.toOption
|
||||
import moe.kageru.kagebot.Util
|
||||
import moe.kageru.kagebot.config.RawPermissions
|
||||
import org.javacord.api.entity.permission.Role
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
|
||||
class Permissions(perms: RawPermissions) {
|
||||
private val hasOneOf: Set<Role>?
|
||||
private val hasNoneOf: Set<Role>?
|
||||
private val onlyDM: Boolean
|
||||
class Permissions(
|
||||
hasOneOf: List<String>?,
|
||||
hasNoneOf: List<String>?,
|
||||
private val onlyDM: Boolean = false,
|
||||
) {
|
||||
private val hasOneOf: Option<Set<String>> = hasOneOf?.toSet().toOption()
|
||||
private val hasNoneOf: Option<Set<String>> = hasNoneOf?.toSet().toOption()
|
||||
|
||||
init {
|
||||
hasOneOf = perms.hasOneOf?.mapTo(mutableSetOf(), Util::findRole)
|
||||
hasNoneOf = perms.hasNoneOf?.mapTo(mutableSetOf(), Util::findRole)
|
||||
onlyDM = perms.onlyDM
|
||||
}
|
||||
|
||||
fun isAllowed(message: MessageCreateEvent): Boolean {
|
||||
if (message.messageAuthor.isBotOwner) {
|
||||
return true
|
||||
}
|
||||
if (onlyDM && !message.isPrivateMessage) {
|
||||
return false
|
||||
}
|
||||
hasOneOf?.let { roles ->
|
||||
if (!Util.hasOneOf(message.messageAuthor, roles)) return false
|
||||
}
|
||||
hasNoneOf?.let { roles ->
|
||||
if (Util.hasOneOf(message.messageAuthor, roles)) return false
|
||||
}
|
||||
return true
|
||||
fun isAllowed(message: MessageCreateEvent): Boolean = when {
|
||||
message.messageAuthor.isBotOwner -> true
|
||||
onlyDM && !message.isPrivateMessage -> false
|
||||
// returns true if the Option is empty (case for no restrictions)
|
||||
else -> hasOneOf.forall { Util.hasOneOf(message.messageAuthor, it) } &&
|
||||
hasNoneOf.forall { !Util.hasOneOf(message.messageAuthor, it) }
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
package moe.kageru.kagebot.command
|
||||
|
||||
import moe.kageru.kagebot.Log.log
|
||||
import com.fasterxml.jackson.annotation.JsonProperty
|
||||
import moe.kageru.kagebot.Log
|
||||
import moe.kageru.kagebot.Util
|
||||
import moe.kageru.kagebot.config.RawAssignment
|
||||
import moe.kageru.kagebot.extensions.getUser
|
||||
import moe.kageru.kagebot.extensions.unwrap
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
|
||||
internal class RoleAssignment(rawAssignment: RawAssignment) {
|
||||
private val role = rawAssignment.role?.let { idOrName ->
|
||||
Util.findRole(idOrName)
|
||||
} ?: throw IllegalArgumentException("Can’t find role “${rawAssignment.role}”")
|
||||
class RoleAssignment(@JsonProperty("role") role: String) {
|
||||
private val role = Util.findRole(role).unwrap()
|
||||
|
||||
fun assign(message: MessageCreateEvent) {
|
||||
Util.userFromMessage(message)?.addRole(role, "Requested via command.")
|
||||
?: log.warning("Could not find user ${message.messageAuthor.name} for role assign")
|
||||
}
|
||||
fun assign(message: MessageCreateEvent) = message.getUser().fold(
|
||||
{ Log.warn("Could not find user ${message.messageAuthor.name} for role assign") },
|
||||
{ it.addRole(role, "Requested via command.") },
|
||||
)
|
||||
}
|
||||
|
|
|
@ -1,13 +1,26 @@
|
|||
package moe.kageru.kagebot.config
|
||||
|
||||
import arrow.core.ListK
|
||||
import arrow.core.k
|
||||
import com.uchuhimo.konf.Config
|
||||
import com.uchuhimo.konf.source.toml
|
||||
import moe.kageru.kagebot.command.Command
|
||||
import moe.kageru.kagebot.features.Features
|
||||
import org.javacord.api.entity.server.Server
|
||||
|
||||
object Config {
|
||||
val systemSpec = Config { addSpec(SystemSpec) }.from.toml
|
||||
val localeSpec = Config { addSpec(LocalizationSpec) }.from.toml
|
||||
val commandSpec = Config { addSpec(CommandSpec) }.from.toml
|
||||
val featureSpec = Config { addSpec(FeatureSpec) }.from.toml
|
||||
|
||||
lateinit var system: Config
|
||||
lateinit var localization: Config
|
||||
lateinit var commandConfig: Config
|
||||
lateinit var featureConfig: Config
|
||||
lateinit var server: Server
|
||||
lateinit var commands: List<Command>
|
||||
lateinit var systemConfig: SystemConfig
|
||||
lateinit var features: Features
|
||||
lateinit var localization: Localization
|
||||
|
||||
// for easier access
|
||||
val features: Features get() = featureConfig[FeatureSpec.features]
|
||||
val commands: ListK<Command> get() = commandConfig[CommandSpec.command].k()
|
||||
}
|
||||
|
|
|
@ -1,54 +1,34 @@
|
|||
package moe.kageru.kagebot.config
|
||||
|
||||
import arrow.core.Either
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import moe.kageru.kagebot.Globals
|
||||
import moe.kageru.kagebot.command.Command
|
||||
import moe.kageru.kagebot.features.Features
|
||||
import java.awt.Color
|
||||
import moe.kageru.kagebot.config.SystemSpec.serverId
|
||||
import java.io.File
|
||||
|
||||
object ConfigParser {
|
||||
val configFile: File = File(RawConfig.DEFAULT_CONFIG_PATH)
|
||||
internal const val DEFAULT_CONFIG_PATH = "config.toml"
|
||||
val configFile: File = File(DEFAULT_CONFIG_PATH)
|
||||
|
||||
fun initialLoad(rawConfig: RawConfig) {
|
||||
val systemConfig = rawConfig.system?.let(::SystemConfig)
|
||||
?: throw IllegalArgumentException("No [system] block in config.")
|
||||
Config.server = Globals.api.getServerById(systemConfig.serverId).orElseThrow { IllegalArgumentException("Invalid server configured.") }
|
||||
Config.systemConfig = systemConfig
|
||||
reloadLocalization(rawConfig)
|
||||
reloadFeatures(rawConfig)
|
||||
reloadCommands(rawConfig)
|
||||
}
|
||||
|
||||
fun reloadLocalization(rawConfig: RawConfig) {
|
||||
Config.localization = rawConfig.localization?.let(::Localization)
|
||||
?: throw IllegalArgumentException("No [localization] block in config.")
|
||||
}
|
||||
|
||||
fun reloadCommands(rawConfig: RawConfig) {
|
||||
Config.commands = rawConfig.commands?.map(::Command)?.toMutableList()
|
||||
?: throw IllegalArgumentException("No commands found in config.")
|
||||
}
|
||||
|
||||
fun reloadFeatures(rawConfig: RawConfig) {
|
||||
Config.features = rawConfig.features?.let(::Features)
|
||||
?: Features(RawFeatures(null))
|
||||
fun initialLoad(file: String) = runBlocking {
|
||||
Either.catch {
|
||||
val configFile = getFile(file)
|
||||
val config = Config.systemSpec.file(configFile)
|
||||
Config.system = config
|
||||
Config.server = Globals.api.getServerById(config[serverId])
|
||||
.orElseThrow { IllegalArgumentException("Invalid server configured.") }
|
||||
Config.localization = Config.localeSpec.file(configFile)
|
||||
Config.featureConfig = Config.featureSpec.file(configFile)
|
||||
Config.commandConfig = Config.commandSpec.file(configFile)
|
||||
}
|
||||
}
|
||||
|
||||
class SystemConfig(val serverId: String, val color: Color) {
|
||||
constructor(rawSystemConfig: RawSystemConfig) : this(
|
||||
rawSystemConfig.serverId ?: throw IllegalArgumentException("No [system.server] defined."),
|
||||
Color.decode(rawSystemConfig.color ?: "#1793d0")
|
||||
)
|
||||
private fun getFile(path: String): File {
|
||||
val file = File(path)
|
||||
if (file.isFile) {
|
||||
return file
|
||||
}
|
||||
println("Config not found, falling back to defaults...")
|
||||
return File(this::class.java.classLoader.getResource(path)!!.toURI())
|
||||
}
|
||||
|
||||
class Localization(val permissionDenied: String, val redirectedMessage: String, val messageDeleted: String) {
|
||||
constructor(rawLocalization: RawLocalization) : this(
|
||||
permissionDenied = rawLocalization.permissionDenied
|
||||
?: throw IllegalArgumentException("No [localization.permissionDenied] defined"),
|
||||
redirectedMessage = rawLocalization.redirectedMessage
|
||||
?: throw IllegalArgumentException("No [localization.redirectMessage] defined"),
|
||||
messageDeleted = rawLocalization.messageDeleted
|
||||
?: throw IllegalArgumentException("No [localization.messageDeleted] defined")
|
||||
)
|
||||
}
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
package moe.kageru.kagebot.config
|
||||
|
||||
import com.uchuhimo.konf.ConfigSpec
|
||||
import moe.kageru.kagebot.command.Command
|
||||
import moe.kageru.kagebot.config.Config.system
|
||||
import moe.kageru.kagebot.features.Features
|
||||
import java.awt.Color
|
||||
|
||||
object SystemSpec : ConfigSpec() {
|
||||
private val rawColor by optional("#1793d0", name = "color")
|
||||
val serverId by required<String>()
|
||||
val color by kotlin.lazy { Color.decode(system[rawColor])!! }
|
||||
}
|
||||
|
||||
object LocalizationSpec : ConfigSpec() {
|
||||
val redirectedMessage by optional("says")
|
||||
val messageDeleted by optional("Your message was deleted.")
|
||||
val timeout by optional("You have been timed out for @@ minutes.")
|
||||
}
|
||||
|
||||
object CommandSpec : ConfigSpec(prefix = "") {
|
||||
val command by optional(emptyList<Command>())
|
||||
}
|
||||
|
||||
object FeatureSpec : ConfigSpec(prefix = "") {
|
||||
val features by optional(Features(), name = "feature")
|
||||
}
|
|
@ -1,19 +0,0 @@
|
|||
package moe.kageru.kagebot.config
|
||||
|
||||
import com.google.gson.annotations.SerializedName
|
||||
|
||||
class RawCommand(
|
||||
val trigger: String?,
|
||||
val response: String?,
|
||||
val matchType: String?,
|
||||
val permissions: RawPermissions?,
|
||||
@SerializedName("action")
|
||||
val actions: RawMessageActions?,
|
||||
val embed: List<String>?,
|
||||
val feature: String?
|
||||
)
|
||||
|
||||
class RawPermissions(val hasOneOf: List<String>?, val hasNoneOf: List<String>?, val onlyDM: Boolean)
|
||||
class RawMessageActions(val delete: Boolean, val redirect: RawRedirect?, val assign: RawAssignment?)
|
||||
class RawRedirect(val target: String?, val anonymous: Boolean)
|
||||
class RawAssignment(var role: String?)
|
|
@ -1,35 +0,0 @@
|
|||
package moe.kageru.kagebot.config
|
||||
|
||||
import com.google.gson.annotations.SerializedName
|
||||
import com.moandjiezana.toml.Toml
|
||||
import java.io.File
|
||||
|
||||
class RawConfig(
|
||||
val system: RawSystemConfig?,
|
||||
val localization: RawLocalization?,
|
||||
@SerializedName("command")
|
||||
val commands: List<RawCommand>?,
|
||||
@SerializedName("feature")
|
||||
val features: RawFeatures?
|
||||
) {
|
||||
companion object {
|
||||
const val DEFAULT_CONFIG_PATH = "config.toml"
|
||||
|
||||
fun readFromString(tomlContent: String): RawConfig = Toml().read(tomlContent).to(RawConfig::class.java)
|
||||
|
||||
fun read(path: String = DEFAULT_CONFIG_PATH): RawConfig {
|
||||
val toml: Toml = Toml().read(run {
|
||||
val file = File(path)
|
||||
if (file.isFile) {
|
||||
return@run file
|
||||
}
|
||||
println("Config not found, falling back to defaults...")
|
||||
File(this::class.java.classLoader.getResource(path)!!.toURI())
|
||||
})
|
||||
return toml.to(RawConfig::class.java)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class RawSystemConfig(val serverId: String?, val color: String?)
|
||||
class RawLocalization(val permissionDenied: String?, val redirectedMessage: String?, val messageDeleted: String?)
|
|
@ -1,4 +0,0 @@
|
|||
package moe.kageru.kagebot.config
|
||||
|
||||
class RawFeatures(val welcome: RawWelcomeFeature?)
|
||||
class RawWelcomeFeature(val content: List<String>?, val fallbackChannel: String?, val fallbackMessage: String?)
|
|
@ -0,0 +1,21 @@
|
|||
package moe.kageru.kagebot.cron
|
||||
|
||||
import kotlinx.coroutines.GlobalScope
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.launch
|
||||
import moe.kageru.kagebot.config.Config
|
||||
|
||||
object CronD {
|
||||
fun startAll() {
|
||||
GlobalScope.launch {
|
||||
minutely()
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun minutely() {
|
||||
while (true) {
|
||||
Config.features.timeout?.checkAndRelease()
|
||||
delay(60_000)
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,26 @@
|
|||
package moe.kageru.kagebot.extensions
|
||||
|
||||
import arrow.Kind
|
||||
import arrow.core.Either
|
||||
import arrow.core.Tuple3
|
||||
import arrow.core.getOrElse
|
||||
import arrow.typeclasses.Functor
|
||||
import moe.kageru.kagebot.Log
|
||||
|
||||
fun <L, R> Either<L, R>.on(op: (R) -> Unit): Either<L, R> {
|
||||
this.map { op(it) }
|
||||
return this
|
||||
}
|
||||
|
||||
fun <T> Either<*, T>.unwrap(): T = getOrElse {
|
||||
Log.warn("Attempted to unwrap $this")
|
||||
error("Attempted to unwrap Either.left")
|
||||
}
|
||||
|
||||
inline fun <A, B, C, A2, F> Tuple3<A, B, C>.mapFirst(AP: Functor<F>, op: (A) -> Kind<F, A2>) = let { (a, b, c) ->
|
||||
AP.run { op(a).map { Tuple3(it, b, c) } }
|
||||
}
|
||||
|
||||
inline fun <A, B, C, B2, F> Tuple3<A, B, C>.mapSecond(AP: Functor<F>, op: (B) -> Kind<F, B2>) = let { (a, b, c) ->
|
||||
AP.run { op(b).map { Tuple3(a, it, c) } }
|
||||
}
|
|
@ -0,0 +1,24 @@
|
|||
package moe.kageru.kagebot.extensions
|
||||
|
||||
import arrow.core.ListK
|
||||
import arrow.core.Option
|
||||
import arrow.core.k
|
||||
import moe.kageru.kagebot.Util.asOption
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import org.javacord.api.entity.channel.ChannelCategory
|
||||
import org.javacord.api.entity.channel.ServerTextChannel
|
||||
import org.javacord.api.entity.permission.Role
|
||||
import org.javacord.api.entity.server.Server
|
||||
import org.javacord.api.entity.user.User
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
|
||||
fun Server.channelById(id: String): Option<ServerTextChannel> = getTextChannelById(id).asOption()
|
||||
fun Server.channelsByName(name: String): ListK<ServerTextChannel> = getTextChannelsByName(name).k()
|
||||
fun Server.rolesByName(name: String): ListK<Role> = getRolesByNameIgnoreCase(name).k()
|
||||
fun Server.membersByName(name: String): ListK<User> = getMembersByName(name).toList().k()
|
||||
fun Server.memberById(name: Long): Option<User> = getMemberById(name).asOption()
|
||||
fun Server.categoriesByName(name: String): ListK<ChannelCategory> = getChannelCategoriesByNameIgnoreCase(name).k()
|
||||
|
||||
fun MessageCreateEvent.getUser(): Option<User> = Config.server.memberById(messageAuthor.id)
|
||||
|
||||
fun User.roles(): ListK<Role> = getRoles(Config.server).k()
|
|
@ -9,9 +9,9 @@ import java.lang.management.ManagementFactory
|
|||
import java.time.Duration
|
||||
import java.time.temporal.ChronoUnit
|
||||
|
||||
class DebugFeature : MessageFeature() {
|
||||
class DebugFeature : MessageFeature {
|
||||
|
||||
override fun handleInternal(message: MessageCreateEvent) {
|
||||
override fun handle(message: MessageCreateEvent) {
|
||||
if (message.messageAuthor.isBotOwner) {
|
||||
MessageUtil.sendEmbed(message.channel, getPerformanceStats())
|
||||
}
|
||||
|
@ -29,8 +29,8 @@ class DebugFeature : MessageFeature() {
|
|||
"CPU:",
|
||||
getCpuInfo(osBean),
|
||||
"System:",
|
||||
getOsInfo()
|
||||
)
|
||||
getOsInfo(),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -44,7 +44,7 @@ class DebugFeature : MessageFeature() {
|
|||
uptime.toDaysPart(),
|
||||
uptime.toHoursPart(),
|
||||
uptime.toMinutesPart(),
|
||||
uptime.toSecondsPart()
|
||||
uptime.toSecondsPart(),
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
package moe.kageru.kagebot.features
|
||||
|
||||
import org.javacord.api.DiscordApi
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
|
||||
interface MessageFeature {
|
||||
fun handle(message: MessageCreateEvent)
|
||||
}
|
||||
|
||||
interface EventFeature {
|
||||
fun register(api: DiscordApi)
|
||||
}
|
|
@ -1,26 +1,26 @@
|
|||
package moe.kageru.kagebot.features
|
||||
|
||||
import moe.kageru.kagebot.config.RawFeatures
|
||||
|
||||
class Features(
|
||||
val welcome: WelcomeFeature?,
|
||||
debug: DebugFeature,
|
||||
help: HelpFeature,
|
||||
getConfig: GetConfigFeature
|
||||
val welcome: WelcomeFeature? = null,
|
||||
val timeout: TimeoutFeature? = null,
|
||||
vc: TempVCFeature = TempVCFeature(null),
|
||||
) {
|
||||
constructor(rawFeatures: RawFeatures) : this(
|
||||
rawFeatures.welcome?.let(::WelcomeFeature),
|
||||
DebugFeature(),
|
||||
HelpFeature(),
|
||||
GetConfigFeature()
|
||||
)
|
||||
private val debug = DebugFeature()
|
||||
private val help = HelpFeature()
|
||||
private val getConfig = GetConfigFeature()
|
||||
private val setConfig = SetConfigFeature()
|
||||
|
||||
private val all = listOf(welcome, debug, help, getConfig, setConfig, timeout, vc)
|
||||
private val featureMap = mapOf(
|
||||
"help" to help,
|
||||
"debug" to debug,
|
||||
"welcome" to welcome,
|
||||
"getConfig" to getConfig
|
||||
"getConfig" to getConfig,
|
||||
"setConfig" to setConfig,
|
||||
"timeout" to timeout,
|
||||
"vc" to vc,
|
||||
)
|
||||
|
||||
fun findByString(feature: String) = featureMap[feature]
|
||||
fun eventFeatures() = all.filterIsInstance<EventFeature>()
|
||||
}
|
||||
|
|
|
@ -6,8 +6,8 @@ import org.javacord.api.event.message.MessageCreateEvent
|
|||
/**
|
||||
* Simple message handler to send the current config file via message attachment.
|
||||
*/
|
||||
class GetConfigFeature : MessageFeature() {
|
||||
override fun handleInternal(message: MessageCreateEvent) {
|
||||
class GetConfigFeature : MessageFeature {
|
||||
override fun handle(message: MessageCreateEvent) {
|
||||
message.channel.sendMessage(ConfigParser.configFile)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,21 +1,19 @@
|
|||
package moe.kageru.kagebot.features
|
||||
|
||||
import moe.kageru.kagebot.MessageUtil
|
||||
import arrow.core.extensions.listk.functorFilter.filter
|
||||
import moe.kageru.kagebot.MessageUtil.sendEmbed
|
||||
import moe.kageru.kagebot.command.MatchType
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
|
||||
class HelpFeature : MessageFeature() {
|
||||
override fun handleInternal(message: MessageCreateEvent) {
|
||||
MessageUtil.sendEmbed(
|
||||
message.channel,
|
||||
MessageUtil.getEmbedBuilder()
|
||||
.addField("Commands:", listCommands(message))
|
||||
)
|
||||
class HelpFeature : MessageFeature {
|
||||
override fun handle(message: MessageCreateEvent) {
|
||||
message.channel.sendEmbed {
|
||||
addField("Commands:", listCommands(message))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun listCommands(message: MessageCreateEvent) = Config.commands
|
||||
.filter { it.matchType == MatchType.PREFIX && it.isAllowed(message) }
|
||||
.map { it.trigger }
|
||||
.joinToString("\n")
|
||||
.joinToString("\n") { it.trigger }
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
package moe.kageru.kagebot.features
|
||||
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
|
||||
abstract class MessageFeature {
|
||||
fun handle(message: MessageCreateEvent) {
|
||||
handleInternal(message)
|
||||
}
|
||||
|
||||
internal abstract fun handleInternal(message: MessageCreateEvent)
|
||||
}
|
|
@ -0,0 +1,28 @@
|
|||
package moe.kageru.kagebot.features
|
||||
|
||||
import moe.kageru.kagebot.MessageUtil.sendEmbed
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.config.ConfigParser
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
|
||||
class SetConfigFeature : MessageFeature {
|
||||
@ExperimentalStdlibApi
|
||||
override fun handle(message: MessageCreateEvent) {
|
||||
if (message.messageAttachments.size != 1) {
|
||||
message.channel.sendMessage("Error: please attach the new config to your message.")
|
||||
return
|
||||
}
|
||||
val newConfig = message.messageAttachments[0].url.openStream().readAllBytes().decodeToString()
|
||||
try {
|
||||
Config.localization = Config.localeSpec.string(newConfig)
|
||||
Config.featureConfig = Config.featureSpec.string(newConfig)
|
||||
Config.commandConfig = Config.commandSpec.string(newConfig)
|
||||
ConfigParser.configFile.writeText(newConfig)
|
||||
message.channel.sendMessage("Config reloaded.")
|
||||
} catch (e: Exception) {
|
||||
message.channel.sendEmbed {
|
||||
addField("Error", "```${e.message}```")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,66 @@
|
|||
package moe.kageru.kagebot.features
|
||||
|
||||
import arrow.core.Either
|
||||
import arrow.core.filterOrElse
|
||||
import arrow.core.flatMap
|
||||
import arrow.core.rightIfNotNull
|
||||
import com.fasterxml.jackson.annotation.JsonProperty
|
||||
import moe.kageru.kagebot.Log
|
||||
import moe.kageru.kagebot.Util.asOption
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.extensions.categoriesByName
|
||||
import moe.kageru.kagebot.persistence.Dao
|
||||
import org.javacord.api.DiscordApi
|
||||
import org.javacord.api.entity.channel.ChannelCategory
|
||||
import org.javacord.api.entity.channel.ServerVoiceChannel
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
|
||||
class TempVCFeature(@JsonProperty("category") category: String? = null) : EventFeature, MessageFeature {
|
||||
private val category: ChannelCategory? = category?.let { Config.server.categoriesByName(it).first() }
|
||||
|
||||
override fun handle(message: MessageCreateEvent): Unit = with(message) {
|
||||
Either.cond(
|
||||
' ' in readableMessageContent,
|
||||
{ readableMessageContent.split(' ', limit = 2).last() },
|
||||
{ "Invalid syntax, expected `<command> <userlimit>`" },
|
||||
)
|
||||
.flatMap { limit ->
|
||||
limit.toIntOrNull().rightIfNotNull { "Invalid syntax, expected a number as limit, got $limit" }
|
||||
}.filterOrElse({ it < 99 }, { "Error: can’t create a channel with that many users." })
|
||||
.fold(
|
||||
{ err -> channel.sendMessage(err) },
|
||||
{ limit ->
|
||||
createChannel(message, limit)
|
||||
channel.sendMessage("Done")
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
override fun register(api: DiscordApi) {
|
||||
api.addServerVoiceChannelMemberLeaveListener { event ->
|
||||
if (event.channel.connectedUsers.isEmpty() && Dao.isTemporaryVC(event.channel.idAsString)) {
|
||||
deleteChannel(event.channel)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun deleteChannel(channel: ServerVoiceChannel) =
|
||||
channel.delete("Empty temporary channel").asOption().fold(
|
||||
{ Log.warn("Attempted to delete temporary VC without the necessary permissions") },
|
||||
{ Dao.removeTemporaryVC(channel.idAsString) },
|
||||
)
|
||||
|
||||
private fun createChannel(message: MessageCreateEvent, limit: Int): Unit =
|
||||
Config.server.createVoiceChannelBuilder().apply {
|
||||
setUserlimit(limit)
|
||||
setName(generateChannelName(message))
|
||||
setAuditLogReason("Created temporary VC for user ${message.messageAuthor.discriminatedName}")
|
||||
setCategory(category)
|
||||
}.create().asOption().fold(
|
||||
{ Log.warn("Attempted to create temporary VC without the necessary permissions") },
|
||||
{ channel -> Dao.addTemporaryVC(channel.idAsString) },
|
||||
)
|
||||
|
||||
private fun generateChannelName(message: MessageCreateEvent): String =
|
||||
"${message.messageAuthor.name}’s volatile corner"
|
||||
}
|
|
@ -0,0 +1,80 @@
|
|||
package moe.kageru.kagebot.features
|
||||
|
||||
import arrow.core.*
|
||||
import arrow.core.extensions.either.applicative.applicative
|
||||
import arrow.core.extensions.either.monad.flatMap
|
||||
import arrow.core.extensions.list.monad.map
|
||||
import arrow.core.extensions.listk.functorFilter.filter
|
||||
import arrow.core.extensions.option.applicative.applicative
|
||||
import arrow.syntax.collections.destructured
|
||||
import com.fasterxml.jackson.annotation.JsonProperty
|
||||
import moe.kageru.kagebot.Log
|
||||
import moe.kageru.kagebot.MessageUtil.sendEmbed
|
||||
import moe.kageru.kagebot.Util.findRole
|
||||
import moe.kageru.kagebot.Util.findUser
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.config.LocalizationSpec
|
||||
import moe.kageru.kagebot.extensions.*
|
||||
import moe.kageru.kagebot.persistence.Dao
|
||||
import org.javacord.api.entity.permission.Role
|
||||
import org.javacord.api.entity.user.User
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
import java.time.Duration
|
||||
import java.time.Instant
|
||||
|
||||
class TimeoutFeature(@JsonProperty("role") role: String) : MessageFeature {
|
||||
private val timeoutRole: Role = findRole(role).unwrap()
|
||||
|
||||
override fun handle(message: MessageCreateEvent) {
|
||||
message.readableMessageContent.split(' ', limit = 4).let { args ->
|
||||
Either.cond(
|
||||
args.size >= 3,
|
||||
{ Tuple3(args[1], args[2], args.getOrNull(3)) },
|
||||
{ "Error: expected “<command> <user> <time> [<reason>]”. If the name contains spaces, please use the user ID instead." },
|
||||
).flatMap {
|
||||
it.mapFirst(Option.applicative(), ::findUser).fix()
|
||||
.toEither { "Error: User ${it.a} not found, consider using the user ID" }
|
||||
}.flatMap {
|
||||
it.mapSecond(Either.applicative()) { time ->
|
||||
time.toLongOrNull().rightIfNotNull { "Error: malformed time “${it.b}”" }
|
||||
}.fix()
|
||||
}.on { (user, time, _) ->
|
||||
applyTimeout(user, time)
|
||||
}.fold(
|
||||
{ error -> message.channel.sendMessage(error) },
|
||||
{ (user, time, reason) ->
|
||||
user.sendEmbed {
|
||||
addField("Timeout", Config.localization[LocalizationSpec.timeout].replace("@@", "$time"))
|
||||
reason?.let { addField("Reason", it) }
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private fun applyTimeout(user: User, time: Long) {
|
||||
val oldRoles = user.roles()
|
||||
.filter { !it.isManaged }
|
||||
.onEach { user.removeRole(it) }
|
||||
.map { it.id }
|
||||
user.addRole(timeoutRole)
|
||||
val releaseTime = Instant.now().plus(Duration.ofMinutes(time)).epochSecond
|
||||
Dao.saveTimeout(releaseTime, user.id, oldRoles)
|
||||
Log.info("Removed roles ${oldRoles.joinToString()} from user ${user.discriminatedName}")
|
||||
}
|
||||
|
||||
fun checkAndRelease(): Unit = Dao.getAllTimeouts()
|
||||
.filter { releaseTime -> Instant.now().epochSecond > releaseTime }
|
||||
.map { Dao.deleteTimeout(it) }
|
||||
.map { it.destructured() }
|
||||
.forEach { (userId, roleIds) ->
|
||||
Config.server.memberById(userId).fold(
|
||||
{ Log.warn("Tried to free user $userId, but couldn’t find them on the server anymore") },
|
||||
{ user ->
|
||||
roleIds.forEach { findRole("$it").map(user::addRole) }
|
||||
user.removeRole(timeoutRole)
|
||||
Log.info("Lifted timeout from user ${user.discriminatedName}. Stored roles ${roleIds.joinToString()}")
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
|
@ -1,27 +1,53 @@
|
|||
package moe.kageru.kagebot.features
|
||||
|
||||
import moe.kageru.kagebot.Log
|
||||
import moe.kageru.kagebot.MessageUtil
|
||||
import moe.kageru.kagebot.Util
|
||||
import moe.kageru.kagebot.config.RawWelcomeFeature
|
||||
import moe.kageru.kagebot.Util.asOption
|
||||
import moe.kageru.kagebot.Util.checked
|
||||
import moe.kageru.kagebot.extensions.unwrap
|
||||
import org.javacord.api.DiscordApi
|
||||
import org.javacord.api.entity.channel.TextChannel
|
||||
import org.javacord.api.entity.message.embed.EmbedBuilder
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
import org.javacord.api.event.server.member.ServerMemberJoinEvent
|
||||
|
||||
class WelcomeFeature(rawWelcome: RawWelcomeFeature) : MessageFeature() {
|
||||
override fun handleInternal(message: MessageCreateEvent) {
|
||||
class WelcomeFeature(
|
||||
content: List<String>?,
|
||||
fallbackChannel: String?,
|
||||
private val fallbackMessage: String?,
|
||||
) : MessageFeature, EventFeature {
|
||||
val embed: EmbedBuilder? by lazy { content?.let(MessageUtil::listToEmbed) }
|
||||
|
||||
override fun register(api: DiscordApi) {
|
||||
api.addServerMemberJoinListener { event ->
|
||||
checked { welcomeUser(event) }
|
||||
}
|
||||
}
|
||||
|
||||
fun welcomeUser(event: ServerMemberJoinEvent) {
|
||||
Log.info("User ${event.user.discriminatedName} joined")
|
||||
val message = event.user.sendMessage(embed)
|
||||
// If the user disabled direct messages, try the fallback (if defined)
|
||||
if (message.asOption().isEmpty() && hasFallback()) {
|
||||
fallbackChannel!!.sendMessage(
|
||||
fallbackMessage!!.replace("@@", event.user.mentionTag),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
override fun handle(message: MessageCreateEvent) {
|
||||
embed?.let {
|
||||
MessageUtil.sendEmbed(message.channel, embed!!)
|
||||
}
|
||||
MessageUtil.sendEmbed(message.channel, it)
|
||||
} ?: Log.info("Welcome command was triggered, but no welcome embed defined.")
|
||||
}
|
||||
|
||||
val embed: EmbedBuilder? by lazy {
|
||||
rawWelcome.content?.let(MessageUtil::listToEmbed)
|
||||
private fun hasFallback(): Boolean = fallbackChannel != null && fallbackMessage != null
|
||||
|
||||
private val fallbackChannel: TextChannel? = fallbackChannel?.let { channel ->
|
||||
requireNotNull(fallbackMessage) {
|
||||
"[feature.welcome.fallbackMessage] must not be null if fallbackChannel is defined"
|
||||
}
|
||||
val fallbackChannel: TextChannel? = rawWelcome.fallbackChannel?.let {
|
||||
if (rawWelcome.fallbackMessage == null) {
|
||||
throw IllegalArgumentException("[feature.welcome.fallbackMessage] must not be null if fallbackChannel is defined")
|
||||
Util.findChannel(channel).unwrap()
|
||||
}
|
||||
Util.findChannel(it)
|
||||
}
|
||||
val fallbackMessage: String? = rawWelcome.fallbackMessage
|
||||
}
|
||||
|
|
|
@ -0,0 +1,44 @@
|
|||
package moe.kageru.kagebot.persistence
|
||||
|
||||
import arrow.core.k
|
||||
import org.mapdb.DBMaker
|
||||
import org.mapdb.Serializer
|
||||
|
||||
object Dao {
|
||||
private val db = DBMaker.fileDB("kagebot.db").fileMmapEnable().transactionEnable().make()
|
||||
private val prisoners = db.hashMap("timeout", Serializer.LONG, Serializer.LONG_ARRAY).createOrOpen()
|
||||
private val commands = db.hashMap("commands", Serializer.STRING, Serializer.INTEGER).createOrOpen()
|
||||
private val tempVcs = db.hashSet("vcs", Serializer.STRING).createOrOpen()
|
||||
|
||||
fun saveTimeout(releaseTime: Long, user: Long, roles: List<Long>) {
|
||||
prisoners[releaseTime] = (listOf(user) + roles).toLongArray()
|
||||
}
|
||||
|
||||
fun setCommandCounter(count: Int) {
|
||||
commands["total"] = count
|
||||
}
|
||||
|
||||
fun getCommandCounter() = commands["total"] ?: 0
|
||||
|
||||
fun close() = db.close()
|
||||
|
||||
fun getAllTimeouts() = prisoners.keys.k()
|
||||
|
||||
fun deleteTimeout(releaseTime: Long): List<Long> {
|
||||
val timeout = prisoners[releaseTime]!!
|
||||
prisoners.remove(releaseTime)
|
||||
return timeout.toList()
|
||||
}
|
||||
|
||||
fun isTemporaryVC(channel: String): Boolean {
|
||||
return channel in tempVcs
|
||||
}
|
||||
|
||||
fun addTemporaryVC(channel: String) {
|
||||
tempVcs.add(channel)
|
||||
}
|
||||
|
||||
fun removeTemporaryVC(channel: String) {
|
||||
tempVcs.remove(channel)
|
||||
}
|
||||
}
|
|
@ -8,6 +8,8 @@ permissionDenied = "You do not have permission to use this command."
|
|||
# results in <name> says <message>
|
||||
redirectedMessage = "says"
|
||||
messageDeleted = "Your message was deleted because it contained a banned word or phrase."
|
||||
# @@ will be replaced with the time
|
||||
timeout = "You have been timed out for @@ minutes"
|
||||
|
||||
# If this is enable, every new user will receive a welcome message.
|
||||
# If the user has disabled their DMs, the fallbackMessage will be sent in the fallbackChannel instead.
|
||||
|
@ -25,6 +27,9 @@ content = [
|
|||
"5th", "asdasd"
|
||||
]
|
||||
|
||||
[feature.timeout]
|
||||
role = "timeout"
|
||||
|
||||
[[command]]
|
||||
trigger = "!ping"
|
||||
response = "pong"
|
||||
|
@ -59,15 +64,15 @@ trigger = "!restricted"
|
|||
response = "access granted"
|
||||
[command.permissions]
|
||||
hasOneOf = [
|
||||
"452034011393425409",
|
||||
"446668543816106004"
|
||||
"new role",
|
||||
"another new role"
|
||||
]
|
||||
|
||||
[[command]]
|
||||
trigger = "!almostUnrestricted"
|
||||
response = "access granted"
|
||||
[command.permissions]
|
||||
hasNoneOf = ["452034011393425409"]
|
||||
hasNoneOf = ["new role"]
|
||||
|
||||
[[command]]
|
||||
trigger = "!private"
|
||||
|
@ -75,7 +80,7 @@ response = "some long response that you don’t want in public channels"
|
|||
[command.permissions]
|
||||
onlyDM = true
|
||||
|
||||
# redirect every message that starts with !redirect to channel 555097559023222825
|
||||
# redirect every message that starts with !redirect to a channel called “testchannel”
|
||||
[[command]]
|
||||
trigger = "!redirect"
|
||||
response = "redirected"
|
||||
|
@ -87,7 +92,7 @@ target = "testchannel"
|
|||
trigger = "!anonRedirect"
|
||||
response = "redirected"
|
||||
[command.action.redirect]
|
||||
target = "555097559023222825"
|
||||
target = "testchannel"
|
||||
anonymous = true
|
||||
|
||||
[[command]]
|
||||
|
@ -110,3 +115,15 @@ feature = "help"
|
|||
[[command]]
|
||||
trigger = "!getConfig"
|
||||
feature = "getConfig"
|
||||
|
||||
[[command]]
|
||||
trigger = "!setConfig"
|
||||
feature = "setConfig"
|
||||
|
||||
[[command]]
|
||||
trigger = "!prison"
|
||||
feature = "timeout"
|
||||
|
||||
[[command]]
|
||||
trigger = "!vc"
|
||||
feature = "vc"
|
||||
|
|
|
@ -2,15 +2,42 @@ package moe.kageru.kagebot
|
|||
|
||||
import io.kotlintest.shouldBe
|
||||
import io.kotlintest.shouldNotBe
|
||||
import io.kotlintest.specs.ShouldSpec
|
||||
import io.kotlintest.specs.StringSpec
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.config.LocalizationSpec
|
||||
import moe.kageru.kagebot.config.SystemSpec
|
||||
import moe.kageru.kagebot.features.SetConfigFeature
|
||||
import java.awt.Color
|
||||
|
||||
class ConfigTest : ShouldSpec({
|
||||
TestUtil.prepareTestEnvironment()
|
||||
@ExperimentalStdlibApi
|
||||
class ConfigTest : StringSpec() {
|
||||
init {
|
||||
"should properly parse test config" {
|
||||
Config.systemConfig shouldNotBe null
|
||||
Config.localization shouldNotBe null
|
||||
Config.features shouldNotBe null
|
||||
Config.commands.size shouldBe 2
|
||||
TestUtil.prepareTestEnvironment()
|
||||
Config.system[SystemSpec.serverId] shouldNotBe null
|
||||
SystemSpec.color shouldBe Color.decode("#1793d0")
|
||||
Config.features.welcome!!.embed shouldNotBe null
|
||||
Config.commands.size shouldBe 3
|
||||
}
|
||||
|
||||
"should parse test config via command" {
|
||||
val redir = "says"
|
||||
val testConfig = """
|
||||
[localization]
|
||||
redirectedMessage = "$redir"
|
||||
messageDeleted = "dongered"
|
||||
timeout = "timeout"
|
||||
""".trimIndent()
|
||||
val message = TestUtil.mockMessage("anything")
|
||||
every { message.messageAttachments } returns listOf(
|
||||
mockk {
|
||||
every { url.openStream().readAllBytes() } returns testConfig.toByteArray()
|
||||
},
|
||||
)
|
||||
SetConfigFeature().handle(message)
|
||||
Config.localization[LocalizationSpec.redirectedMessage] shouldBe redir
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
package moe.kageru.kagebot
|
||||
|
||||
import arrow.core.ListK
|
||||
import arrow.core.Option
|
||||
import io.kotlintest.matchers.string.shouldContain
|
||||
import io.kotlintest.matchers.string.shouldNotContain
|
||||
import io.kotlintest.shouldBe
|
||||
|
@ -7,12 +9,13 @@ import io.mockk.Runs
|
|||
import io.mockk.every
|
||||
import io.mockk.just
|
||||
import io.mockk.mockk
|
||||
import moe.kageru.kagebot.Kagebot.process
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.config.ConfigParser
|
||||
import moe.kageru.kagebot.config.RawConfig
|
||||
import org.javacord.api.DiscordApi
|
||||
import moe.kageru.kagebot.extensions.*
|
||||
import org.javacord.api.entity.channel.ServerTextChannel
|
||||
import org.javacord.api.entity.message.embed.EmbedBuilder
|
||||
import org.javacord.api.entity.permission.Role
|
||||
import org.javacord.api.entity.user.User
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
import org.javacord.core.entity.message.embed.EmbedBuilderDelegateImpl
|
||||
|
@ -20,19 +23,34 @@ import java.io.File
|
|||
import java.util.*
|
||||
|
||||
object TestUtil {
|
||||
private val TIMEOUT_ROLE = mockk<Role> {
|
||||
every { id } returns 123
|
||||
}
|
||||
val TEST_ROLE: Role = mockk {
|
||||
every { id } returns 1
|
||||
every { isManaged } returns false
|
||||
every { name } returns "testrole"
|
||||
}
|
||||
|
||||
fun mockMessage(
|
||||
content: String,
|
||||
replies: MutableList<String> = mutableListOf(),
|
||||
replyEmbeds: MutableList<EmbedBuilder> = mutableListOf(),
|
||||
files: MutableList<File> = mutableListOf(),
|
||||
isBot: Boolean = false
|
||||
isBot: Boolean = false,
|
||||
): MessageCreateEvent {
|
||||
return mockk {
|
||||
every { messageContent } returns content
|
||||
every { readableMessageContent } returns content
|
||||
every { channel.sendMessage(capture(replies)) } returns mockk()
|
||||
every { channel.sendMessage(capture(replyEmbeds)) } returns mockk()
|
||||
every { channel.sendMessage(capture(files)) } returns mockk()
|
||||
every { channel.sendMessage(capture(replies)) } returns mockk(relaxed = true) {
|
||||
every { isCompletedExceptionally } returns false
|
||||
}
|
||||
every { channel.sendMessage(capture(replyEmbeds)) } returns mockk(relaxed = true) {
|
||||
every { isCompletedExceptionally } returns false
|
||||
}
|
||||
every { channel.sendMessage(capture(files)) } returns mockk(relaxed = true) {
|
||||
every { isCompletedExceptionally } returns false
|
||||
}
|
||||
every { message.canYouDelete() } returns true
|
||||
every { isPrivateMessage } returns false
|
||||
// We can’t use a nested mock here because other fields of messageAuthor might
|
||||
|
@ -42,48 +60,65 @@ object TestUtil {
|
|||
every { messageAuthor.isBotUser } returns isBot
|
||||
every { messageAuthor.isYourself } returns isBot
|
||||
every { messageAuthor.isBotOwner } returns false
|
||||
every { messageAuthor.asUser() } returns Optional.of(messageableAuthor())
|
||||
every { messageAuthor.asUser() } returns Optional.of(messageableAuthor(replyEmbeds))
|
||||
every { messageAuthor.name } returns "kageru"
|
||||
}
|
||||
}
|
||||
|
||||
fun messageableAuthor(messages: MutableList<EmbedBuilder> = mutableListOf()): User {
|
||||
return mockk {
|
||||
every { getRoles(any()) } returns emptyList()
|
||||
every { sendMessage(capture(messages)) } returns mockk()
|
||||
every { roles() } returns ListK.empty()
|
||||
every { sendMessage(capture(messages)) } returns mockk(relaxed = true)
|
||||
}
|
||||
}
|
||||
|
||||
fun prepareTestEnvironment(
|
||||
sentEmbeds: MutableList<EmbedBuilder> = mutableListOf(),
|
||||
sentMessages: MutableList<String> = mutableListOf()
|
||||
sentMessages: MutableList<String> = mutableListOf(),
|
||||
dmEmbeds: MutableList<EmbedBuilder> = mutableListOf(),
|
||||
) {
|
||||
val channel = mockk<Optional<ServerTextChannel>> {
|
||||
every { isPresent } returns true
|
||||
every { get() } returns mockk {
|
||||
every { sendMessage(capture(sentEmbeds)) } returns mockk {
|
||||
every { join() } returns mockk()
|
||||
val channel = mockk<ServerTextChannel>(relaxed = true) {
|
||||
every { sendMessage(capture(sentEmbeds)) } returns mockk(relaxed = true) {
|
||||
every { join() } returns mockk {
|
||||
every { isCompletedExceptionally } returns false
|
||||
}
|
||||
every { sendMessage(capture(sentMessages)) } returns mockk()
|
||||
every { isCompletedExceptionally } returns false
|
||||
}
|
||||
every { sendMessage(capture(sentMessages)) } returns mockk(relaxed = true)
|
||||
}
|
||||
val api = mockk<DiscordApi> {
|
||||
every { getServerById(any<String>()) } returns Optional.of(mockk {
|
||||
// mockk tries to access Config.server in the mocking block below, so we need to provide some kind of value
|
||||
Config.server = mockk()
|
||||
Config.server = mockk(relaxed = true) {
|
||||
every { icon.ifPresent(any()) } just Runs
|
||||
every { getTextChannelById(any<String>()) } returns channel
|
||||
every { getTextChannelsByName(any()) } returns listOf(channel.get())
|
||||
every { getRolesByNameIgnoreCase("testrole") } returns listOf(mockk {
|
||||
every { id } returns 1
|
||||
})
|
||||
})
|
||||
every { channelById(any()) } returns Option.just(channel)
|
||||
every { channelsByName(any()) } returns ListK.just(channel)
|
||||
every { rolesByName("testrole") } returns ListK.just(TEST_ROLE)
|
||||
every { rolesByName("timeout") } returns ListK.just(TIMEOUT_ROLE)
|
||||
every { categoriesByName(any()) } returns ListK.just(mockk())
|
||||
every { createVoiceChannelBuilder().create() } returns mockk {
|
||||
every { isCompletedExceptionally } returns false
|
||||
every { join().idAsString } returns "12345"
|
||||
}
|
||||
Globals.api = api
|
||||
ConfigParser.initialLoad(RawConfig.read("testconfig.toml"))
|
||||
every { getMembersByName(any()) } returns setOf(
|
||||
mockk(relaxed = true) {
|
||||
every { id } returns 123
|
||||
every { roles() } returns ListK.just(TEST_ROLE)
|
||||
every { getRoles(any()) } returns ListK.just(TEST_ROLE)
|
||||
every { sendMessage(capture(dmEmbeds)) } returns mockk(relaxed = true) {
|
||||
every { isCompletedExceptionally } returns false
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
Globals.api = mockk(relaxed = true) {
|
||||
every { getServerById(any<String>()) } returns Optional.of(Config.server)
|
||||
}
|
||||
ConfigParser.initialLoad("testconfig.toml")
|
||||
}
|
||||
|
||||
fun testMessageSuccess(content: String, result: String) {
|
||||
val calls = mutableListOf<String>()
|
||||
Kagebot.processMessage(mockMessage(content, replies = calls))
|
||||
mockMessage(content, replies = calls).process()
|
||||
calls shouldBe mutableListOf(result)
|
||||
}
|
||||
|
||||
|
@ -91,26 +126,17 @@ object TestUtil {
|
|||
return (embed.delegate as EmbedBuilderDelegateImpl).toJsonNode().toString()
|
||||
}
|
||||
|
||||
fun <R> withCommands(config: String, test: (() -> R)) {
|
||||
val oldCmds = Config.commands
|
||||
val rawConfig = RawConfig.readFromString(config)
|
||||
ConfigParser.reloadCommands(rawConfig)
|
||||
fun withCommands(config: String, test: (() -> Unit)) {
|
||||
val oldCmds = Config.commandConfig
|
||||
Config.commandConfig = Config.commandSpec.string(config)
|
||||
test()
|
||||
Config.commands = oldCmds
|
||||
}
|
||||
|
||||
fun <R> withLocalization(config: String, test: (() -> R)) {
|
||||
val oldLoc = Config.localization
|
||||
val rawConfig = RawConfig.readFromString(config)
|
||||
ConfigParser.reloadLocalization(rawConfig)
|
||||
test()
|
||||
Config.localization = oldLoc
|
||||
Config.commandConfig = oldCmds
|
||||
}
|
||||
|
||||
fun withReplyContents(
|
||||
expected: List<String> = emptyList(),
|
||||
unexpected: List<String> = emptyList(),
|
||||
op: (MutableList<EmbedBuilder>) -> Unit
|
||||
op: (MutableList<EmbedBuilder>) -> Unit,
|
||||
) {
|
||||
val replies = mutableListOf<EmbedBuilder>()
|
||||
op(replies)
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
package moe.kageru.kagebot.command
|
||||
|
||||
import arrow.core.ListK
|
||||
import io.kotlintest.matchers.string.shouldContain
|
||||
import io.kotlintest.shouldBe
|
||||
import io.kotlintest.specs.StringSpec
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.Kagebot
|
||||
import moe.kageru.kagebot.Globals
|
||||
import moe.kageru.kagebot.Kagebot.process
|
||||
import moe.kageru.kagebot.TestUtil
|
||||
import moe.kageru.kagebot.TestUtil.embedToString
|
||||
import moe.kageru.kagebot.TestUtil.messageableAuthor
|
||||
|
@ -14,8 +15,12 @@ import moe.kageru.kagebot.TestUtil.mockMessage
|
|||
import moe.kageru.kagebot.TestUtil.prepareTestEnvironment
|
||||
import moe.kageru.kagebot.TestUtil.testMessageSuccess
|
||||
import moe.kageru.kagebot.TestUtil.withCommands
|
||||
import moe.kageru.kagebot.TestUtil.withLocalization
|
||||
import moe.kageru.kagebot.Util
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.extensions.roles
|
||||
import moe.kageru.kagebot.extensions.rolesByName
|
||||
import moe.kageru.kagebot.extensions.unwrap
|
||||
import moe.kageru.kagebot.persistence.Dao
|
||||
import org.javacord.api.entity.message.embed.EmbedBuilder
|
||||
import org.javacord.api.entity.permission.Role
|
||||
import org.javacord.api.entity.user.User
|
||||
|
@ -23,13 +28,26 @@ import java.util.*
|
|||
|
||||
class CommandTest : StringSpec({
|
||||
prepareTestEnvironment()
|
||||
"should increment command counter" {
|
||||
withCommands(
|
||||
"""
|
||||
[[command]]
|
||||
trigger = "!ping"
|
||||
response = "pong"
|
||||
""".trimIndent(),
|
||||
) {
|
||||
val before = Globals.commandCounter.get()
|
||||
testMessageSuccess("!ping", "pong")
|
||||
Globals.commandCounter.get() shouldBe (before + 1)
|
||||
}
|
||||
}
|
||||
"should match prefix command" {
|
||||
withCommands(
|
||||
"""
|
||||
[[command]]
|
||||
trigger = "!ping"
|
||||
response = "pong"
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
testMessageSuccess("!ping", "pong")
|
||||
}
|
||||
|
@ -44,10 +62,10 @@ class CommandTest : StringSpec({
|
|||
[[command]]
|
||||
trigger = "!embed"
|
||||
embed = [ "$heading", "$content" ]
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
TestUtil.withReplyContents(expected = listOf(heading, content)) {
|
||||
Kagebot.processMessage(mockMessage("!embed", replyEmbeds = it))
|
||||
mockMessage("!embed", replyEmbeds = it).process()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -58,7 +76,7 @@ class CommandTest : StringSpec({
|
|||
trigger = "somewhere"
|
||||
response = "found it"
|
||||
matchType = "CONTAINS"
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
testMessageSuccess("the trigger is somewhere in this message", "found it")
|
||||
}
|
||||
|
@ -70,7 +88,7 @@ class CommandTest : StringSpec({
|
|||
trigger = "A.+B"
|
||||
response = "regex matched"
|
||||
matchType = "REGEX"
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
testMessageSuccess("AcsdB", "regex matched")
|
||||
}
|
||||
|
@ -81,7 +99,7 @@ class CommandTest : StringSpec({
|
|||
[[command]]
|
||||
trigger = "answer me"
|
||||
response = "@@ there you go"
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
testMessageSuccess("answer me", "<@1> there you go")
|
||||
}
|
||||
|
@ -92,10 +110,10 @@ class CommandTest : StringSpec({
|
|||
[[command]]
|
||||
trigger = "!ping"
|
||||
response = "pong"
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
val calls = mutableListOf<String>()
|
||||
Kagebot.processMessage(mockMessage("!ping", replies = calls, isBot = true))
|
||||
mockMessage("!ping", replies = calls, isBot = true).process()
|
||||
calls shouldBe mutableListOf()
|
||||
}
|
||||
}
|
||||
|
@ -106,14 +124,14 @@ class CommandTest : StringSpec({
|
|||
trigger = "delet this"
|
||||
[command.action]
|
||||
delete = true
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
val messageContent = "delet this"
|
||||
TestUtil.withReplyContents(expected = listOf(messageContent)) {
|
||||
val mockMessage = mockMessage(messageContent)
|
||||
every { mockMessage.deleteMessage() } returns mockk()
|
||||
every { mockMessage.messageAuthor.asUser() } returns Optional.of(messageableAuthor(it))
|
||||
Kagebot.processMessage(mockMessage)
|
||||
mockMessage.process()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -127,24 +145,12 @@ class CommandTest : StringSpec({
|
|||
hasOneOf = [
|
||||
"testrole",
|
||||
]
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
val replies = mutableListOf<String>()
|
||||
val mockMessage = mockMessage("!restricted", replies = replies)
|
||||
Kagebot.processMessage(mockMessage)
|
||||
replies shouldBe mutableListOf(Config.localization.permissionDenied)
|
||||
withLocalization(
|
||||
"""
|
||||
[localization]
|
||||
permissionDenied = ""
|
||||
messageDeleted = "whatever"
|
||||
redirectedMessage = "asdja"
|
||||
""".trimIndent()
|
||||
) {
|
||||
Kagebot.processMessage(mockMessage)
|
||||
// still one string in there from earlier, nothing new was added
|
||||
replies.size shouldBe 1
|
||||
}
|
||||
mockMessage.process()
|
||||
replies shouldBe mutableListOf()
|
||||
}
|
||||
}
|
||||
"should accept restricted command for owner" {
|
||||
|
@ -157,12 +163,12 @@ class CommandTest : StringSpec({
|
|||
hasOneOf = [
|
||||
"testrole"
|
||||
]
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
val calls = mutableListOf<String>()
|
||||
val mockMessage = mockMessage("!restricted", replies = calls)
|
||||
every { mockMessage.messageAuthor.isBotOwner } returns true
|
||||
Kagebot.processMessage(mockMessage)
|
||||
mockMessage.process()
|
||||
calls shouldBe mutableListOf("access granted")
|
||||
}
|
||||
}
|
||||
|
@ -176,16 +182,18 @@ class CommandTest : StringSpec({
|
|||
hasOneOf = [
|
||||
"testrole"
|
||||
]
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
val calls = mutableListOf<String>()
|
||||
val mockMessage = mockMessage("!restricted", replies = calls)
|
||||
every { mockMessage.messageAuthor.asUser() } returns Optional.of(mockk {
|
||||
every { getRoles(any()) } returns listOf(
|
||||
Config.server.getRolesByNameIgnoreCase("testrole")[0]
|
||||
every { mockMessage.messageAuthor.asUser() } returns Optional.of(
|
||||
mockk {
|
||||
every { roles() } returns ListK.just(
|
||||
Config.server.rolesByName("testrole").first(),
|
||||
)
|
||||
})
|
||||
Kagebot.processMessage(mockMessage)
|
||||
},
|
||||
)
|
||||
mockMessage.process()
|
||||
calls shouldBe mutableListOf("access granted")
|
||||
}
|
||||
}
|
||||
|
@ -197,7 +205,7 @@ class CommandTest : StringSpec({
|
|||
response = "access granted"
|
||||
[command.permissions]
|
||||
hasNoneOf = ["testrole"]
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
val calls = mutableListOf<String>()
|
||||
val mockMessage = mockMessage("!almostUnrestricted", replies = calls)
|
||||
|
@ -205,18 +213,19 @@ class CommandTest : StringSpec({
|
|||
every { mockMessage.messageAuthor.asUser() } returns mockk {
|
||||
every { isPresent } returns true
|
||||
every { get().getRoles(any()) } returns listOf(
|
||||
Config.server.getRolesByNameIgnoreCase("testrole")[0]
|
||||
Config.server.rolesByName("testrole").first(),
|
||||
)
|
||||
}
|
||||
Kagebot.processMessage(mockMessage)
|
||||
mockMessage.process()
|
||||
|
||||
// without the role
|
||||
every { mockMessage.messageAuthor.asUser() } returns mockk {
|
||||
every { isPresent } returns true
|
||||
every { get().getRoles(any()) } returns emptyList()
|
||||
}
|
||||
Kagebot.processMessage(mockMessage)
|
||||
calls shouldBe mutableListOf(Config.localization.permissionDenied, "access granted")
|
||||
mockMessage.process()
|
||||
// first message didn’t answer anything
|
||||
calls shouldBe mutableListOf("access granted")
|
||||
}
|
||||
}
|
||||
"should refuse DM only message in server channel" {
|
||||
|
@ -227,11 +236,11 @@ class CommandTest : StringSpec({
|
|||
response = "access granted"
|
||||
[command.permissions]
|
||||
onlyDM = true
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
val calls = mutableListOf<String>()
|
||||
Kagebot.processMessage(mockMessage("!dm", replies = calls))
|
||||
calls shouldBe listOf(Config.localization.permissionDenied)
|
||||
mockMessage("!dm", replies = calls).process()
|
||||
calls shouldBe mutableListOf()
|
||||
}
|
||||
}
|
||||
/*
|
||||
|
@ -249,10 +258,10 @@ class CommandTest : StringSpec({
|
|||
[command.action.redirect]
|
||||
target = "testchannel"
|
||||
anonymous = true
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
val message = "this is a message"
|
||||
Kagebot.processMessage(mockMessage("!redirect $message"))
|
||||
mockMessage("!redirect $message").process()
|
||||
calls.size shouldBe 1
|
||||
embedToString(calls[0]) shouldContain "\"$message\""
|
||||
}
|
||||
|
@ -264,15 +273,40 @@ class CommandTest : StringSpec({
|
|||
trigger = "!assign"
|
||||
[command.action.assign]
|
||||
role = "testrole"
|
||||
""".trimIndent()
|
||||
""".trimIndent(),
|
||||
) {
|
||||
val roles = mutableListOf<Role>()
|
||||
val user = mockk<User> {
|
||||
every { addRole(capture(roles), "Requested via command.") } returns mockk()
|
||||
}
|
||||
every { Config.server.getMemberById(1) } returns Optional.of(user)
|
||||
Kagebot.processMessage(mockMessage("!assign"))
|
||||
roles shouldBe mutableListOf(Util.findRole("testrole"))
|
||||
mockMessage("!assign").process()
|
||||
roles shouldBe mutableListOf(Util.findRole("testrole").unwrap())
|
||||
}
|
||||
}
|
||||
"should create VC" {
|
||||
withCommands(
|
||||
"""
|
||||
[[command]]
|
||||
trigger = "!vc"
|
||||
feature = "vc"
|
||||
""".trimIndent(),
|
||||
) {
|
||||
testMessageSuccess("!vc 2", "Done")
|
||||
Dao.isTemporaryVC("12345") shouldBe true
|
||||
Dao.removeTemporaryVC("12345")
|
||||
}
|
||||
}
|
||||
"should reject invalid vc command" {
|
||||
withCommands(
|
||||
"""
|
||||
[[command]]
|
||||
trigger = "!vc"
|
||||
feature = "vc"
|
||||
""".trimIndent(),
|
||||
) {
|
||||
testMessageSuccess("!vc asd", "Invalid syntax, expected a number as limit, got asd")
|
||||
Dao.isTemporaryVC("12345") shouldBe false
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
@ -2,7 +2,7 @@ package moe.kageru.kagebot.features
|
|||
|
||||
import io.kotlintest.shouldBe
|
||||
import io.kotlintest.specs.ShouldSpec
|
||||
import moe.kageru.kagebot.Kagebot
|
||||
import moe.kageru.kagebot.Kagebot.process
|
||||
import moe.kageru.kagebot.TestUtil
|
||||
import moe.kageru.kagebot.TestUtil.mockMessage
|
||||
import moe.kageru.kagebot.TestUtil.withCommands
|
||||
|
@ -11,13 +11,15 @@ import java.io.File
|
|||
class ConfigFeatureTest : ShouldSpec({
|
||||
TestUtil.prepareTestEnvironment()
|
||||
"getConfig should sent message with attachment" {
|
||||
withCommands("""
|
||||
withCommands(
|
||||
"""
|
||||
[[command]]
|
||||
trigger = "!getConfig"
|
||||
feature = "getConfig"
|
||||
""".trimIndent()) {
|
||||
""".trimIndent(),
|
||||
) {
|
||||
val calls = mutableListOf<File>()
|
||||
Kagebot.processMessage(mockMessage("!getConfig", files = calls))
|
||||
mockMessage("!getConfig", files = calls).process()
|
||||
calls.size shouldBe 1
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@ import io.kotlintest.specs.StringSpec
|
|||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import io.mockk.verify
|
||||
import moe.kageru.kagebot.Kagebot
|
||||
import moe.kageru.kagebot.Kagebot.process
|
||||
import moe.kageru.kagebot.TestUtil
|
||||
import org.javacord.api.entity.message.embed.EmbedBuilder
|
||||
import org.javacord.api.event.message.MessageCreateEvent
|
||||
|
@ -16,7 +16,7 @@ class DebugFeatureTest : StringSpec({
|
|||
"should ignore regular users" {
|
||||
val message = TestUtil.mockMessage("!debug")
|
||||
every { message.messageAuthor.isBotOwner } returns false
|
||||
Kagebot.processMessage(message)
|
||||
message.process()
|
||||
DebugFeature().handle(message)
|
||||
verify(exactly = 0) { message.channel.sendMessage(any<EmbedBuilder>()) }
|
||||
}
|
||||
|
|
|
@ -3,12 +3,13 @@ package moe.kageru.kagebot.features
|
|||
import io.kotlintest.specs.StringSpec
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.Kagebot
|
||||
import moe.kageru.kagebot.Kagebot.process
|
||||
import moe.kageru.kagebot.TestUtil
|
||||
import moe.kageru.kagebot.TestUtil.mockMessage
|
||||
import moe.kageru.kagebot.TestUtil.withCommands
|
||||
import moe.kageru.kagebot.TestUtil.withReplyContents
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.extensions.rolesByName
|
||||
import org.javacord.api.entity.message.embed.EmbedBuilder
|
||||
import java.util.*
|
||||
|
||||
|
@ -36,7 +37,7 @@ class HelpFeatureTest : StringSpec({
|
|||
val expected = listOf("!ping", "!something")
|
||||
val unexpected = listOf("not a prefix", "!prison")
|
||||
withReplyContents(expected = expected, unexpected = unexpected) { replies ->
|
||||
Kagebot.processMessage(mockMessage("!help", replyEmbeds = replies))
|
||||
mockMessage("!help", replyEmbeds = replies).process()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -46,12 +47,14 @@ class HelpFeatureTest : StringSpec({
|
|||
val unexpected = listOf("not a prefix")
|
||||
withReplyContents(expected = expected, unexpected = unexpected) { replies ->
|
||||
val message = mockMessage("!help", replyEmbeds = replies)
|
||||
every { message.messageAuthor.asUser() } returns Optional.of(mockk {
|
||||
every { message.messageAuthor.asUser() } returns Optional.of(
|
||||
mockk {
|
||||
every { getRoles(any()) } returns listOf(
|
||||
Config.server.getRolesByNameIgnoreCase("testrole")[0]
|
||||
Config.server.rolesByName("testrole").first(),
|
||||
)
|
||||
})
|
||||
Kagebot.processMessage(message)
|
||||
},
|
||||
)
|
||||
message.process()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,62 @@
|
|||
package moe.kageru.kagebot.features
|
||||
|
||||
import io.kotlintest.matchers.string.shouldContain
|
||||
import io.kotlintest.shouldBe
|
||||
import io.kotlintest.specs.StringSpec
|
||||
import moe.kageru.kagebot.Kagebot.process
|
||||
import moe.kageru.kagebot.TestUtil
|
||||
import moe.kageru.kagebot.TestUtil.TEST_ROLE
|
||||
import moe.kageru.kagebot.persistence.Dao
|
||||
import org.javacord.api.entity.message.embed.EmbedBuilder
|
||||
|
||||
class TimeoutFeatureTest : StringSpec({
|
||||
TestUtil.prepareTestEnvironment()
|
||||
"should remove and store roles" {
|
||||
clearTimeouts()
|
||||
TestUtil.mockMessage("!timeout kageru 99999999").process()
|
||||
Dao.getAllTimeouts().let {
|
||||
it.size shouldBe 1
|
||||
val user = Dao.deleteTimeout(it.first())
|
||||
user shouldBe arrayOf(123, TEST_ROLE.id)
|
||||
}
|
||||
clearTimeouts()
|
||||
}
|
||||
"should announce timeout via DM" {
|
||||
val dms = mutableListOf<EmbedBuilder>()
|
||||
TestUtil.prepareTestEnvironment(dmEmbeds = dms)
|
||||
val time = "1235436"
|
||||
TestUtil.mockMessage("!timeout kageru $time").process()
|
||||
dms.size shouldBe 1
|
||||
TestUtil.embedToString(dms[0]) shouldContain time
|
||||
clearTimeouts()
|
||||
}
|
||||
"should return error for invalid input" {
|
||||
val replies = mutableListOf<String>()
|
||||
TestUtil.mockMessage("!timeout kageruWithoutATime", replies = replies).process()
|
||||
replies.size shouldBe 1
|
||||
replies[0] shouldContain "Error"
|
||||
}
|
||||
"should catch malformed time" {
|
||||
val replies = mutableListOf<String>()
|
||||
TestUtil.mockMessage("!timeout kageru this is not a time", replies = replies).process()
|
||||
replies.size shouldBe 1
|
||||
replies[0] shouldContain "Error"
|
||||
}
|
||||
"should print optional reason" {
|
||||
val dms = mutableListOf<EmbedBuilder>()
|
||||
TestUtil.prepareTestEnvironment(dmEmbeds = dms)
|
||||
val reason = "because I don’t like you"
|
||||
TestUtil.mockMessage("!timeout kageru 1 $reason").process()
|
||||
dms.size shouldBe 1
|
||||
TestUtil.embedToString(dms[0]) shouldContain reason
|
||||
clearTimeouts()
|
||||
}
|
||||
}) {
|
||||
companion object {
|
||||
private fun clearTimeouts() {
|
||||
Dao.getAllTimeouts().forEach { to ->
|
||||
Dao.deleteTimeout(to)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -4,41 +4,45 @@ import io.kotlintest.shouldBe
|
|||
import io.kotlintest.specs.StringSpec
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.Kagebot
|
||||
import io.mockk.verify
|
||||
import moe.kageru.kagebot.TestUtil
|
||||
import moe.kageru.kagebot.config.Config
|
||||
import moe.kageru.kagebot.extensions.channelsByName
|
||||
import org.javacord.api.entity.message.embed.EmbedBuilder
|
||||
|
||||
@ExperimentalStdlibApi
|
||||
class WelcomeFeatureTest : StringSpec({
|
||||
TestUtil.prepareTestEnvironment()
|
||||
"should send welcome" {
|
||||
val sentMessages = mutableListOf<EmbedBuilder>()
|
||||
Kagebot.welcomeUser(
|
||||
Config.features.welcome!!.welcomeUser(
|
||||
mockk {
|
||||
every { user } returns mockk {
|
||||
every { discriminatedName } returns "testuser#1234"
|
||||
every { sendMessage(capture(sentMessages)) } returns mockk {
|
||||
every { join() } returns mockk()
|
||||
every { isCompletedExceptionally } returns false
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
)
|
||||
sentMessages shouldBe mutableListOf(Config.features.welcome!!.embed)
|
||||
}
|
||||
"should send welcome fallback if DMs are disabled" {
|
||||
val message = mutableListOf<String>()
|
||||
TestUtil.prepareTestEnvironment(sentMessages = message)
|
||||
Kagebot.welcomeUser(
|
||||
Config.features.welcome!!.welcomeUser(
|
||||
mockk {
|
||||
every { user } returns mockk {
|
||||
every { discriminatedName } returns "testuser#1234"
|
||||
every { id } returns 123
|
||||
every { sendMessage(any<EmbedBuilder>()) } returns mockk {
|
||||
every { join() } returns mockk()
|
||||
every { isCompletedExceptionally } returns true
|
||||
}
|
||||
every { mentionTag } returns "<@123>"
|
||||
}
|
||||
}
|
||||
},
|
||||
)
|
||||
message shouldBe mutableListOf("<@123> welcome")
|
||||
val channel = Config.server.channelsByName("").first()
|
||||
verify(exactly = 1) { channel.sendMessage("<@123> welcome") }
|
||||
}
|
||||
})
|
||||
|
|
|
@ -3,9 +3,9 @@ serverId = "356414885292277771"
|
|||
color = "#1793d0"
|
||||
|
||||
[localization]
|
||||
permissionDenied = "no permissions"
|
||||
redirectedMessage = "says"
|
||||
messageDeleted = "message dongered"
|
||||
timeout = "timeout @@ minutes"
|
||||
|
||||
[feature.welcome]
|
||||
fallbackChannel = "123"
|
||||
|
@ -17,6 +17,12 @@ content = [
|
|||
"Second paragraph heading", "Second paragraph content"
|
||||
]
|
||||
|
||||
[feature.timeout]
|
||||
role = "timeout"
|
||||
|
||||
[feature.vc]
|
||||
category = "testcategory"
|
||||
|
||||
[[command]]
|
||||
trigger = "!debug"
|
||||
feature = "debug"
|
||||
|
@ -24,3 +30,7 @@ feature = "debug"
|
|||
[[command]]
|
||||
trigger = "!welcome"
|
||||
feature = "welcome"
|
||||
|
||||
[[command]]
|
||||
trigger = "!timeout"
|
||||
feature = "timeout"
|
||||
|
|
Loading…
Reference in New Issue
Block a user