bot: fix voice state struct

aria-music · May 18, 2020 · f9b5938 · f9b5938
1 parent 8e7705d
commit f9b5938
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/aria/bot.go b/aria/bot.go
@@ -282,7 +282,7 @@ func (b *bot) onMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
 
 func (b *bot) recoverVoiceConnections() {
 	v := b.voice.cloneJoined()
-	for c, g := range v {
+	for g, c := range v {
 		if err := b.joinVoice(g, c); err != nil {
 			log.Printf("failedc to recover voice: %v\n", err)
 		}
@@ -311,7 +311,7 @@ func (b *bot) disconnectVoice(guildID string) error {
 		return err
 	}
 
-	b.voice.recordDisconnect(v.ChannelID)
+	b.voice.recordDisconnect(guildID)
 	return nil
 }
 

diff --git a/aria/voice.go b/aria/voice.go
@@ -6,11 +6,11 @@ import (
 
 type voice struct {
 	sync.RWMutex
-	joined map[string]string // channelID -> guildID
+	joined map[string]string // guildID: channelID
 }
 
 type voiceState interface {
-	// cloneJoined returns map contains channelID -> guildID
+	// cloneJoined returns map contains guildID: channelID
 	cloneJoined() map[string]string
 	recordJoin(guildID, channelID string)
 	recordDisconnect(channelID string)
@@ -38,12 +38,12 @@ func (v *voice) recordJoin(guildID, channelID string) {
 	v.Lock()
 	defer v.Unlock()
 
-	v.joined[channelID] = guildID
+	v.joined[guildID] = channelID
 }
 
-func (v *voice) recordDisconnect(channelID string) {
+func (v *voice) recordDisconnect(guildID string) {
 	v.Lock()
 	defer v.Unlock()
 
-	delete(v.joined, channelID)
+	delete(v.joined, guildID)
 }