opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix tts panic

Browse source
This commit is contained in:
Huaaudio 2026-03-21 09:03:46 +01:00
parent 6f26381c7e
commit da6f2c4a0b
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkg/channels/discord/voice.go
View file

@ -48,7 +48,14 @@ func VoiceReceiveActive(vc *discordgo.VoiceConnection) bool {
return vc != nil && vc.OpusRecv != nil return vc != nil && vc.OpusRecv != nil
} }
func streamOggOpusToDiscord(ctx context.Context, vc *discordgo.VoiceConnection, r io.Reader) error { func streamOggOpusToDiscord(ctx context.Context, vc *discordgo.VoiceConnection, r io.Reader) (retErr error) {
// Recover from panic if vc.OpusSend is closed mid-send (e.g. on disconnect)
defer func() {
if rec := recover(); rec != nil {
retErr = fmt.Errorf("voice connection closed during playback")
}
}()
// Wait for the speaking transition to register // Wait for the speaking transition to register
vc.Speaking(true) vc.Speaking(true)
defer vc.Speaking(false) defer vc.Speaking(false)
@ -140,6 +147,13 @@ func (c *DiscordChannel) receiveVoice(vc *discordgo.VoiceConnection, guildID str
case p, ok := <-vc.OpusRecv: case p, ok := <-vc.OpusRecv:
if !ok { if !ok {
logger.InfoCF("discord", "Voice channel closed", map[string]any{"guild": guildID}) logger.InfoCF("discord", "Voice channel closed", map[string]any{"guild": guildID})
// Cancel any TTS that may still be playing
c.ttsMu.Lock()
if c.cancelTTS != nil {
c.cancelTTS()
c.cancelTTS = nil
}
c.ttsMu.Unlock()
return return
} }