From 828845f230e88bec5c0c36c36241ac1dd10a82e3 Mon Sep 17 00:00:00 2001
From: kageru <kageru@encode.moe>
Date: Tue, 17 Sep 2019 23:22:22 +0200
Subject: [PATCH] Simplify message handling

---
 src/main/kotlin/moe/kageru/kagebot/Kagebot.kt | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/kotlin/moe/kageru/kagebot/Kagebot.kt b/src/main/kotlin/moe/kageru/kagebot/Kagebot.kt
index fcc56d2..3b55738 100644
--- a/src/main/kotlin/moe/kageru/kagebot/Kagebot.kt
+++ b/src/main/kotlin/moe/kageru/kagebot/Kagebot.kt
@@ -18,19 +18,20 @@ fun main() {
 object Kagebot {
     fun MessageCreateEvent.process() {
         if (messageAuthor.isBotUser) {
-            if (messageAuthor.isYourself) {
-                val loggedMessage =
-                    if (readableMessageContent.isBlank()) "[embed]" else readableMessageContent
-                Log.info("<Self> $loggedMessage")
-            }
+            handleOwn()
             return
         }
         for (command in Config.commands) {
-            if (command.matches(readableMessageContent)) {
-                if (command.execute(this)) {
-                    break
-                }
-            }
+            // execute returns true if the command was actually executed (not denied due to permissions)
+            command.matches(readableMessageContent) && command.execute(this) && break
+        }
+    }
+
+    private fun MessageCreateEvent.handleOwn() {
+        if (messageAuthor.isYourself) {
+            val loggedMessage =
+                if (readableMessageContent.isBlank()) "[embed]" else readableMessageContent
+            Log.info("<Self> $loggedMessage")
         }
     }