fix: prevent the bot from joining afk channels (#46)

Co-authored-by: yuua <yuuahp@icloud.com>
jaoafa · Oct 29, 2023 · 4520067 · 4520067
1 parent 01815ca
commit 4520067
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 14 deletions.
diff --git a/src/main/kotlin/com/jaoafa/vcspeaker/Main.kt b/src/main/kotlin/com/jaoafa/vcspeaker/Main.kt
@@ -115,6 +115,7 @@ class Main : CliktCommand() {
                     add(::VoiceLeaveEvent)
                     add(::VoiceMoveEvent)
                     add(::TitleEvent)
+                    add(::SelfVoiceJoinEvent)
                 }
             }
 

diff --git a/src/main/kotlin/com/jaoafa/vcspeaker/commands/JoinCommand.kt b/src/main/kotlin/com/jaoafa/vcspeaker/commands/JoinCommand.kt
@@ -1,6 +1,7 @@
 package com.jaoafa.vcspeaker.commands
 
 import com.jaoafa.vcspeaker.tools.discord.ChatCommandExtensions.chatCommand
+import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.isAfk
 import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.orFallbackOf
 import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.respond
 import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.selfVoiceChannel
@@ -11,6 +12,8 @@ import com.jaoafa.vcspeaker.tools.discord.VoiceExtensions.move
 import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalChannel
 import com.kotlindiscord.kord.extensions.extensions.Extension
 import dev.kord.common.entity.ChannelType
+import dev.kord.core.behavior.GuildBehavior
+import dev.kord.core.behavior.channel.BaseVoiceChannelBehavior
 
 class JoinCommand : Extension() {
     override val name = this::class.simpleName!!
@@ -23,6 +26,22 @@ class JoinCommand : Extension() {
         }
     }
 
+    private suspend fun processJoin(
+        channel: BaseVoiceChannelBehavior,
+        guild: GuildBehavior,
+        replier: suspend (String) -> Unit
+    ) {
+        if (channel.isAfk()) {
+            replier("**:zzz: AFK チャンネルには接続できません。**")
+            return
+        }
+
+        val selfChannel = guild.selfVoiceChannel()
+
+        if (selfChannel != null) channel.move(replier)
+        else channel.join(replier)
+    }
+
     override suspend fun setup() {
         publicSlashCommand("join", "VC に接続します。", ::JoinOptions) {
             action {
@@ -31,11 +50,9 @@ class JoinCommand : Extension() {
                     respond(it)
                 } ?: return@action
 
-                val selfChannel = guild!!.selfVoiceChannel()
-                val replier: suspend (String) -> Unit = { respond(it) }
-
-                if (selfChannel != null) channel.move(replier)
-                else channel.join(replier)
+                processJoin(channel, guild!!) {
+                    respond(it)
+                }
             }
         }
 
@@ -48,11 +65,9 @@ class JoinCommand : Extension() {
                     return@action
                 }
 
-                val selfChannel = guild!!.selfVoiceChannel()
-                val replier: suspend (String) -> Unit = { respond(it) }
-
-                if (selfChannel != null) channel.move(replier)
-                else channel.join(replier)
+                processJoin(channel, guild!!) {
+                    respond(it)
+                }
             }
         }
     }

diff --git a/src/main/kotlin/com/jaoafa/vcspeaker/commands/ResetTitleCommand.kt b/src/main/kotlin/com/jaoafa/vcspeaker/commands/ResetTitleCommand.kt
@@ -4,16 +4,14 @@ import com.jaoafa.vcspeaker.features.Title.resetTitle
 import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.authorOf
 import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.errorColor
 import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.orFallbackOf
-import com.jaoafa.vcspeaker.tools.discord.SlashCommandExtensions.publicSlashCommand
 import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.respond
 import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.respondEmbed
 import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.successColor
 import com.jaoafa.vcspeaker.tools.discord.Options
+import com.jaoafa.vcspeaker.tools.discord.SlashCommandExtensions.publicSlashCommand
 import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalChannel
 import com.kotlindiscord.kord.extensions.extensions.Extension
 import dev.kord.common.entity.ChannelType
-import dev.kord.core.behavior.channel.asChannelOf
-import dev.kord.core.entity.channel.VoiceChannel
 
 class ResetTitleCommand : Extension() {
     override val name = this::class.simpleName!!

diff --git a/src/main/kotlin/com/jaoafa/vcspeaker/events/SelfVoiceJoinEvent.kt b/src/main/kotlin/com/jaoafa/vcspeaker/events/SelfVoiceJoinEvent.kt
@@ -0,0 +1,36 @@
+package com.jaoafa.vcspeaker.events
+
+import com.jaoafa.vcspeaker.VCSpeaker
+import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.asChannelOf
+import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.getSettings
+import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.isAfk
+import com.jaoafa.vcspeaker.tools.discord.VoiceExtensions.join
+import com.kotlindiscord.kord.extensions.extensions.Extension
+import com.kotlindiscord.kord.extensions.extensions.event
+import dev.kord.core.entity.channel.TextChannel
+import dev.kord.core.event.user.VoiceStateUpdateEvent
+
+class SelfVoiceJoinEvent : Extension() {
+    override val name = this::class.simpleName!!
+
+    override suspend fun setup() {
+        event<VoiceStateUpdateEvent> {
+            check {
+                failIf(event.state.getMember().id != VCSpeaker.kord.selfId)
+                failIf(!(event.state.getChannelOrNull()?.isAfk() ?: false))
+            }
+
+            action {
+                val guild = event.state.getGuildOrNull() ?: return@action // checked
+                val channelLeft = event.old?.getChannelOrNull()
+                val textChannel = guild.getSettings().channelId?.asChannelOf<TextChannel>()
+
+                channelLeft?.join {
+                    textChannel?.createMessage(
+                        "**:zzz: AFK チャンネルには接続できないので、${channelLeft.mention} に戻りました。**"
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/com/jaoafa/vcspeaker/tools/discord/DiscordExtensions.kt b/src/main/kotlin/com/jaoafa/vcspeaker/tools/discord/DiscordExtensions.kt
@@ -31,6 +31,7 @@ typealias Options = Arguments
  * Discord 関連の拡張関数をまとめたオブジェクト。
  */
 object DiscordExtensions {
+    fun Guild.getSettings() = GuildStore.getOrDefault(this.id)
     /**
      * 自動入退室が有効化されているかどうか。
      */

diff --git a/src/main/kotlin/com/jaoafa/vcspeaker/voicetext/Scheduler.kt b/src/main/kotlin/com/jaoafa/vcspeaker/voicetext/Scheduler.kt
@@ -26,7 +26,7 @@ class Scheduler(
         val file = if (!CacheStore.exists(text, voice)) {
             val audio = try {
                 VCSpeaker.voicetext.generateSpeech(text, voice)
-            } catch (_: Exception) {
+            } catch (exception: Exception) {
                 message?.reply {
                     embed {
                         title = ":interrobang: Error!"
@@ -40,6 +40,8 @@ class Scheduler(
                     }
                 }
 
+                exception.printStackTrace()
+
                 return
             }