diff --git a/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt b/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt index 1984b35..67e432e 100644 --- a/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt +++ b/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/ChzzkHandler.kt @@ -27,6 +27,7 @@ import java.time.LocalDateTime object ChzzkHandler { private val handlers = mutableListOf() private val logger = LoggerFactory.getLogger(this::class.java) + lateinit var botUid: String @Volatile private var running: Boolean = false fun addUser(chzzkChannel: ChzzkChannel, user: User) { @@ -34,6 +35,7 @@ object ChzzkHandler { } fun enable() { + botUid = chzzk.loggedUser.userId UserService.getAllUsers().map { chzzk.getChannel(it.token)?.let { token -> addUser(token, it) } } diff --git a/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/MessageHandler.kt b/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/MessageHandler.kt index bb0e816..8caba6e 100644 --- a/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/MessageHandler.kt +++ b/chatbot/src/main/kotlin/space/mori/chzzk_bot/chatbot/chzzk/MessageHandler.kt @@ -243,8 +243,9 @@ class MessageHandler( } internal fun handle(msg: ChatMessage, user: User) { - val commandKey = msg.content.split(' ')[0] + if(msg.userId == ChzzkHandler.botUid) return + val commandKey = msg.content.split(' ')[0] commands[commandKey.lowercase()]?.let { it(msg, user) } }