From 18ccdab5e81a47b12d1b0c6b41c3f67b81bcfc1e Mon Sep 17 00:00:00 2001 From: yuuaHP Date: Fri, 10 Nov 2023 06:35:14 +0900 Subject: [PATCH] fix: title not reset on afk (#53) * fix: title not reset on afk * fix: title not reset on afk (unstaged) * fix: reset title on move Co-authored-by: Tomachi <8929706+book000@users.noreply.github.com> * fix: remove unused variable --------- Co-authored-by: Tomachi <8929706+book000@users.noreply.github.com> --- src/main/kotlin/com/jaoafa/vcspeaker/Main.kt | 2 +- .../vcspeaker/events/{TitleEvent.kt => TitleResetEvent.kt} | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) rename src/main/kotlin/com/jaoafa/vcspeaker/events/{TitleEvent.kt => TitleResetEvent.kt} (92%) diff --git a/src/main/kotlin/com/jaoafa/vcspeaker/Main.kt b/src/main/kotlin/com/jaoafa/vcspeaker/Main.kt index d2180ad2..0c56797b 100644 --- a/src/main/kotlin/com/jaoafa/vcspeaker/Main.kt +++ b/src/main/kotlin/com/jaoafa/vcspeaker/Main.kt @@ -114,7 +114,7 @@ class Main : CliktCommand() { add(::VoiceJoinEvent) add(::VoiceLeaveEvent) add(::VoiceMoveEvent) - add(::TitleEvent) + add(::TitleResetEvent) add(::SelfVoiceJoinEvent) } } diff --git a/src/main/kotlin/com/jaoafa/vcspeaker/events/TitleEvent.kt b/src/main/kotlin/com/jaoafa/vcspeaker/events/TitleResetEvent.kt similarity index 92% rename from src/main/kotlin/com/jaoafa/vcspeaker/events/TitleEvent.kt rename to src/main/kotlin/com/jaoafa/vcspeaker/events/TitleResetEvent.kt index ecef5ce9..82bbbf26 100644 --- a/src/main/kotlin/com/jaoafa/vcspeaker/events/TitleEvent.kt +++ b/src/main/kotlin/com/jaoafa/vcspeaker/events/TitleResetEvent.kt @@ -4,6 +4,7 @@ import com.jaoafa.vcspeaker.features.Title.resetTitle import com.jaoafa.vcspeaker.stores.GuildStore import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.asChannelOf import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.authorOf +import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.isAfk import com.jaoafa.vcspeaker.tools.discord.DiscordExtensions.successColor import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.event @@ -12,14 +13,14 @@ import dev.kord.core.entity.channel.TextChannel import dev.kord.core.event.user.VoiceStateUpdateEvent import kotlinx.coroutines.flow.count -class TitleEvent : Extension() { +class TitleResetEvent : Extension() { override val name = this::class.simpleName!! override suspend fun setup() { event { check { failIf(event.state.getMember().isBot) - failIf(event.old?.getChannelOrNull() == null || event.state.getChannelOrNull() != null) + failIf(event.old?.getChannelOrNull() == null) failIf(event.old?.getChannelOrNull()?.voiceStates?.count { !it.getMember().isBot } != 0) }