fixxes

Author: RobotHanzo

src/main/kotlin/dev/robothanzo/werewolf/game/steps/DayStep.kt

@@ -7,6 +7,7 @@ import dev.robothanzo.werewolf.game.GameStep
 import dev.robothanzo.werewolf.service.GameSessionService
 import dev.robothanzo.werewolf.service.GameStateService
 import dev.robothanzo.werewolf.service.SpeechService
+import dev.robothanzo.werewolf.utils.CmdUtils
 import org.springframework.context.annotation.Lazy
 import org.springframework.stereotype.Component
 
@@ -25,11 +26,14 @@ class DayStep(
         speechService.setAllMute(session.guildId, true) // Ensure silence for announcement
         session.courtTextChannel?.sendMessage("# **:sunny: 天亮了**")?.queue()
         session.courtVoiceChannel?.play(Audio.Resource.MORNING) {
-            gameSessionService.withLockedSession(session.guildId) { lockedSession ->
-                if (lockedSession.currentState == id) {
-                    service.nextStep(lockedSession)
+            // Audio is ~7s, add 3s delay to make total ~10s
+            CmdUtils.schedule({
+                gameSessionService.withLockedSession(session.guildId) { lockedSession ->
+                    if (lockedSession.currentState == id) {
+                        service.nextStep(lockedSession)
+                    }
                 }
-            }
+            }, 3000L)
         }
     }
 
@@ -38,7 +42,7 @@ class DayStep(
     }
 
     override fun getDurationSeconds(session: Session): Int {
-        return 41 // 40s for discussion + 1s buffer before next phase starts
+        return 10
     }
 
     override fun handleInput(session: Session, input: Map<String, Any>): Map<String, Any> {

src/main/kotlin/dev/robothanzo/werewolf/game/steps/JudgeDecisionStep.kt

@@ -56,6 +56,12 @@ class JudgeDecisionStep : GameStep {
         when (action) {
             "end_game_confirm" -> {
                 performEndGame(session)
+
+                // Finalize state change to SETUP so UI updates
+                session.stateData.pendingNextStep = null
+                session.stateData.gameEndReason = null
+                WerewolfApplication.gameStateService.startStep(session, "SETUP")
+
                 return mapOf("success" to true)
             }
 
@@ -106,26 +112,26 @@ class JudgeDecisionStep : GameStep {
             vc.upsertPermissionOverride(everyone).grant(Permission.VOICE_SPEAK).queue()
         }
 
-        // 2. Grant Court/Off-court permissions (Read/Write) to everyone
-        // "開放法院、場外的發言和閱讀權限給所有人" -> Everyone can read/speak in Court Text and Spectator Text?
-        // Usually "Off-court" means Spectator channel.
+        // 2. Grant permissions (Read/Write) to everyone
 
-        val publicRole = guild.publicRole
+        courtText?.upsertPermissionOverride(guild.publicRole)
+            ?.grant(Permission.VIEW_CHANNEL, Permission.MESSAGE_SEND)
+            ?.queue()
 
-        courtText?.upsertPermissionOverride(publicRole)
+        session.spectatorRole?.let { courtText?.upsertPermissionOverride(it) }
             ?.grant(Permission.VIEW_CHANNEL, Permission.MESSAGE_SEND)
             ?.queue()
 
-        spectatorText?.upsertPermissionOverride(publicRole)
+        spectatorText?.upsertPermissionOverride(guild.publicRole)
             ?.grant(Permission.VIEW_CHANNEL, Permission.MESSAGE_SEND)
             ?.queue()
 
         // 3. "開放死人旁觀語音發言權限" -> Dead players (Spectator Role) can speak.
         // Already covered by granting @everyone VOICE_SPEAK in court voice?
         // Just to be sure, let's explicitly grant it to Spectator Role if exists
-        val spectatorRole = session.spectatorRole
-        if (spectatorRole != null && courtVoice != null) {
-            courtVoice.upsertPermissionOverride(spectatorRole).grant(Permission.VOICE_SPEAK).queue()
+        val specRole = session.spectatorRole
+        if (specRole != null && courtVoice != null) {
+            courtVoice.upsertPermissionOverride(specRole).grant(Permission.VOICE_SPEAK).queue()
         }
     }
 }

src/main/kotlin/dev/robothanzo/werewolf/listeners/GuildJoinListener.kt

@@ -9,6 +9,7 @@ import net.dv8tion.jda.api.entities.channel.concrete.TextChannel
 import net.dv8tion.jda.api.events.guild.GuildJoinEvent
 import net.dv8tion.jda.api.events.guild.GuildLeaveEvent
 import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleAddEvent
+import net.dv8tion.jda.api.events.session.ReadyEvent
 import net.dv8tion.jda.api.hooks.ListenerAdapter
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Component
@@ -19,6 +20,19 @@ class GuildJoinListener(
 ) : ListenerAdapter() {
     private val log = LoggerFactory.getLogger(GuildJoinListener::class.java)
 
+    override fun onReady(event: ReadyEvent) {
+        log.info("JDA Ready, syncing {} guilds with sessions...", event.jda.guilds.size)
+        val allSessions = gameSessionService.getAllSessions()
+        val joinedGuildIds = event.jda.guilds.map { it.idLong }.toSet()
+
+        allSessions.forEach { session ->
+            if (!joinedGuildIds.contains(session.guildId)) {
+                log.info("Deleting stale session for guild {} (not in joined guilds)", session.guildId)
+                cleanupGuild(session.guildId)
+            }
+        }
+    }
+
     override fun onGuildJoin(event: GuildJoinEvent) {
         log.info("Bot joined guild: {} ({})", event.guild.name, event.guild.id)
         checkAndSetup(event.guild)
@@ -32,8 +46,14 @@ class GuildJoinListener(
 
     override fun onGuildLeave(event: GuildLeaveEvent) {
         log.info("Bot left guild: {}", event.guild.id)
-        gameSessionService.deleteSession(event.guild.idLong)
-        WerewolfApplication.speechService.interruptSession(event.guild.idLong)
+        cleanupGuild(event.guild.idLong)
+    }
+
+    private fun cleanupGuild(guildId: Long) {
+        gameSessionService.deleteSession(guildId)
+        WerewolfApplication.speechService.interruptSession(guildId)
+        WerewolfApplication.policeService.interrupt(guildId)
+        WerewolfApplication.expelService.endExpelPoll(guildId)
     }
 
     private fun checkAndSetup(guild: Guild) {

src/main/kotlin/dev/robothanzo/werewolf/service/impl/ExpelServiceImpl.kt

@@ -36,7 +36,6 @@ class ExpelServiceImpl : ExpelService {
 
     override fun endExpelPoll(guildId: Long) {
         sessions.remove(guildId)
-        // remove any running poll instances as well
         polls.remove(guildId)
         log.info("Ended expel poll for guild {}", guildId)
     }

src/main/kotlin/dev/robothanzo/werewolf/service/impl/PoliceServiceImpl.kt

@@ -326,12 +326,11 @@ class PoliceServiceImpl(
     }
 
     override fun interrupt(guildId: Long, triggerCallback: Boolean) {
-        val policeSession = sessions.remove(guildId)
-        if (policeSession != null) {
-            cancelPollTasks(policeSession)
-            policeSession.session.courtTextChannel?.sendMessage("警長投票已終止")?.queue()
+        sessions.remove(guildId)?.let {
+            cancelPollTasks(it)
+            it.session.courtTextChannel?.sendMessage("警長投票已終止")?.queue()
             if (triggerCallback) {
-                policeSession.finishedCallback?.invoke()
+                it.finishedCallback?.invoke()
             }
         }
     }

src/main/kotlin/dev/robothanzo/werewolf/service/impl/SpeechServiceImpl.kt

@@ -347,19 +347,15 @@ class SpeechServiceImpl(
     }
 
     override fun interruptSession(guildId: Long, triggerCallback: Boolean) {
-        val speechSession = speechSessions[guildId]
-        if (speechSession != null) {
-            val guild = WerewolfApplication.jda.getGuildById(guildId)
-            if (guild != null) {
-                val session = gameSessionService.getSession(guildId).getOrNull()
-                session?.courtTextChannel?.sendMessage("法官已強制終止發言流程")?.queue()
+        speechSessions.remove(guildId)?.let {
+            gameSessionService.getSession(guildId).getOrNull()?.let {
+                it.courtTextChannel?.sendMessage("法官已強制終止發言流程")?.queue()
             }
 
-            speechSession.order.clear()
-            stopCurrentSpeaker(speechSession)
-            speechSessions.remove(guildId)
+            it.order.clear()
+            stopCurrentSpeaker(it)
             if (triggerCallback) {
-                speechSession.finishedCallback?.invoke()
+                it.finishedCallback?.invoke()
             }
         }
     }