From 8f8d2f895aa38943632c406f95e60fec3dcba660 Mon Sep 17 00:00:00 2001
From: dalbodeule <11470513+dalbodeule@users.noreply.github.com>
Date: Mon, 29 Jul 2024 15:58:50 +0900
Subject: [PATCH] BUG FIX: fix #9

---
 gradle.properties                                           | 2 +-
 .../space/mori/chzzk_bot/discord/commands/AddCommand.kt     | 6 +++---
 .../space/mori/chzzk_bot/discord/commands/AlertCommand.kt   | 6 +++---
 .../space/mori/chzzk_bot/discord/commands/RemoveCommand.kt  | 6 +++---
 .../space/mori/chzzk_bot/discord/commands/UpdateCommand.kt  | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 731608b..ac14cb4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 kotlin.code.style=official
 group = space.mori
-version = 1.0.2
+version = 1.0.3
 
 org.gradle.jvmargs=-Dfile.encoding=UTF-8
 org.gradle.console=plain
diff --git a/src/main/kotlin/space/mori/chzzk_bot/discord/commands/AddCommand.kt b/src/main/kotlin/space/mori/chzzk_bot/discord/commands/AddCommand.kt
index 125263d..e48d049 100644
--- a/src/main/kotlin/space/mori/chzzk_bot/discord/commands/AddCommand.kt
+++ b/src/main/kotlin/space/mori/chzzk_bot/discord/commands/AddCommand.kt
@@ -38,12 +38,12 @@ object AddCommand : CommandInterface {
             return
         }
 
-        if (user == null) {
-            user = manager!!.user
+        if (manager != null) {
+            user = manager.user
             ManagerService.updateManager(user, event.user.idLong, event.user.effectiveName)
         }
 
-        val commands = CommandService.getCommands(user)
+        val commands = CommandService.getCommands(user!!)
         if (commands.any { it.command == label }) {
             event.hook.sendMessage("$label 명령어는 이미 있습니다! 업데이트 명령어를 써주세요.").queue()
             return
diff --git a/src/main/kotlin/space/mori/chzzk_bot/discord/commands/AlertCommand.kt b/src/main/kotlin/space/mori/chzzk_bot/discord/commands/AlertCommand.kt
index 0849c8c..177a2e0 100644
--- a/src/main/kotlin/space/mori/chzzk_bot/discord/commands/AlertCommand.kt
+++ b/src/main/kotlin/space/mori/chzzk_bot/discord/commands/AlertCommand.kt
@@ -30,12 +30,12 @@ object AlertCommand : CommandInterface {
             return
         }
 
-        if (user == null) {
-            user = manager!!.user
+        if (manager != null) {
+            user = manager.user
             ManagerService.updateManager(user, event.user.idLong, event.user.effectiveName)
         }
 
-        val chzzkChannel = Connector.getChannel(user.token)
+        val chzzkChannel = Connector.getChannel(user!!.token)
 
         try {
             val newUser = UserService.updateLiveAlert(user.id.value, channel?.guild?.idLong ?: 0L, channel?.idLong ?: 0L, content ?: "")
diff --git a/src/main/kotlin/space/mori/chzzk_bot/discord/commands/RemoveCommand.kt b/src/main/kotlin/space/mori/chzzk_bot/discord/commands/RemoveCommand.kt
index bd3f123..97a2de5 100644
--- a/src/main/kotlin/space/mori/chzzk_bot/discord/commands/RemoveCommand.kt
+++ b/src/main/kotlin/space/mori/chzzk_bot/discord/commands/RemoveCommand.kt
@@ -34,12 +34,12 @@ object RemoveCommand : CommandInterface {
             return
         }
 
-        if (user == null) {
-            user = manager!!.user
+        if (manager != null) {
+            user = manager.user
             ManagerService.updateManager(user, event.user.idLong, event.user.effectiveName)
         }
 
-        val chzzkChannel = Connector.getChannel(user.token)
+        val chzzkChannel = Connector.getChannel(user!!.token)
 
         try {
             CommandService.removeCommand(user, label)
diff --git a/src/main/kotlin/space/mori/chzzk_bot/discord/commands/UpdateCommand.kt b/src/main/kotlin/space/mori/chzzk_bot/discord/commands/UpdateCommand.kt
index 7913a0c..6c43a1f 100644
--- a/src/main/kotlin/space/mori/chzzk_bot/discord/commands/UpdateCommand.kt
+++ b/src/main/kotlin/space/mori/chzzk_bot/discord/commands/UpdateCommand.kt
@@ -38,12 +38,12 @@ object UpdateCommand : CommandInterface {
             return
         }
 
-        if (user == null) {
-            user = manager!!.user
+        if (manager != null) {
+            user = manager.user
             ManagerService.updateManager(user, event.user.idLong, event.user.effectiveName)
         }
 
-        val chzzkChannel = Connector.getChannel(user.token)
+        val chzzkChannel = Connector.getChannel(user!!.token)
 
         try {
             CommandService.updateCommand(user, label, content, failContent ?: "")