This commit is contained in:
kageru 2019-06-15 11:49:32 +02:00
parent f03f9bdb9f
commit c8847824ee
Signed by: kageru
GPG Key ID: 8282A2BEA4ADA3D2
7 changed files with 4 additions and 13 deletions

View File

@ -26,9 +26,9 @@ class Kagebot {
Globals.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
if (!Util.wasSuccessful(message) &&
welcome.fallbackChannel != null &&
welcome.fallbackMessage != null
) {
welcome.fallbackChannel.sendMessage(
welcome.fallbackMessage.replace(

View File

@ -13,7 +13,6 @@ object MessageUtil {
return "<@${user.id}>"
}
fun getEmbedBuilder(): EmbedBuilder {
val builder = EmbedBuilder()
Globals.server.icon.ifPresent { builder.setThumbnail(it) }

View File

@ -61,4 +61,3 @@ enum class MatchType {
abstract fun matches(message: String, command: Command): Boolean
}

View File

@ -4,9 +4,7 @@ import moe.kageru.kagebot.Globals
import moe.kageru.kagebot.Globals.api
import moe.kageru.kagebot.command.Command
import moe.kageru.kagebot.features.Features
import moe.kageru.kagebot.features.WelcomeFeature
import java.awt.Color
import kotlin.IllegalArgumentException
class Config(rawConfig: RawConfig) {
val system: SystemConfig = rawConfig.system?.let(::SystemConfig)

View File

@ -26,7 +26,6 @@ class RawConfig(
})
return toml.to(RawConfig::class.java)
}
}
}

View File

@ -28,5 +28,4 @@ class WelcomeFeature(rawWelcome: RawWelcomeFeature) {
Util.findChannel(it)
}
val fallbackMessage: String? = rawWelcome.fallbackMessage
}

View File

@ -1,11 +1,8 @@
package moe.kageru.kagebot
import moe.kageru.kagebot.Log.log
import java.lang.System
fun main() {
//try {
Kagebot()
Kagebot()
/*} catch (e: Exception) {
log.warning("An exception occurred in the main thread, exiting.\n${e.stackTrace.joinToString("\n")}")
System.exit(1)