From d6d45f8df66e6a7aba38df462efe062d89e2ae80 Mon Sep 17 00:00:00 2001
From: kageru <kageru@encode.moe>
Date: Sat, 15 Jun 2019 12:55:47 +0200
Subject: [PATCH] move main function to kagebot class

---
 build.gradle.kts                              |  2 +-
 src/main/kotlin/moe/kageru/kagebot/Kagebot.kt | 64 ++++++++++---------
 src/main/kotlin/moe/kageru/kagebot/main.kt    |  5 --
 3 files changed, 34 insertions(+), 37 deletions(-)
 delete mode 100644 src/main/kotlin/moe/kageru/kagebot/main.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 85c081c..732169c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ sourceSets {
 
 sourceSets["main"].resources.srcDir("src/main/resources")
 application {
-    mainClassName = "moe.kageru.kagebot.MainKt"
+    mainClassName = "moe.kageru.kagebot.KagebotKt"
 }
 
 group = "moe.kageru.kagebot"
diff --git a/src/main/kotlin/moe/kageru/kagebot/Kagebot.kt b/src/main/kotlin/moe/kageru/kagebot/Kagebot.kt
index c202595..3c06ec0 100644
--- a/src/main/kotlin/moe/kageru/kagebot/Kagebot.kt
+++ b/src/main/kotlin/moe/kageru/kagebot/Kagebot.kt
@@ -9,40 +9,44 @@ import org.javacord.api.event.message.MessageCreateEvent
 import org.javacord.api.event.server.member.ServerMemberJoinEvent
 import java.io.File
 
-class Kagebot {
-    companion object {
-        fun processMessage(event: MessageCreateEvent) {
-            if (event.messageAuthor.isBotUser) {
-                return
-            }
-            for (command in Globals.config.commands) {
-                if (command.matches(event.messageContent)) {
-                    command.execute(event)
-                    break
-                }
-            }
-        }
+fun main() {
+    Kagebot.init()
+}
 
-        fun welcomeUser(event: ServerMemberJoinEvent) {
-            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
-                ) {
-                    welcome.fallbackChannel.sendMessage(
-                        welcome.fallbackMessage.replace(
-                            "@@",
-                            MessageUtil.mention(event.user)
-                        )
-                    )
-                }
+object Kagebot {
+    fun processMessage(event: MessageCreateEvent) {
+        if (event.messageAuthor.isBotUser) {
+            return
+        }
+        for (command in Globals.config.commands) {
+            if (command.matches(event.messageContent)) {
+                command.execute(event)
+                break
             }
         }
     }
 
-    init {
+    fun welcomeUser(event: ServerMemberJoinEvent) {
+        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
+            ) {
+                welcome.fallbackChannel.sendMessage(
+                    welcome.fallbackMessage.replace(
+                        "@@",
+                        MessageUtil.mention(event.user)
+                    )
+                )
+            }
+        }
+    }
+
+    private fun getSecret() = File("secret").readText().replace("\n", "")
+
+    fun init() {
         Globals.api = DiscordApiBuilder().setToken(getSecret()).login().join()
         try {
             Globals.config = Config(RawConfig.read())
@@ -64,6 +68,4 @@ class Kagebot {
             }
         }
     }
-
-    private fun getSecret() = File("secret").readText().replace("\n", "")
 }
diff --git a/src/main/kotlin/moe/kageru/kagebot/main.kt b/src/main/kotlin/moe/kageru/kagebot/main.kt
deleted file mode 100644
index c01285a..0000000
--- a/src/main/kotlin/moe/kageru/kagebot/main.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package moe.kageru.kagebot
-
-fun main() {
-    Kagebot()
-}