migan/discordmuffin
1
0
Fork 0
forked from pothtonswer/discordmuffin
Code Pull requests Activity

Clean up voice state updates, make them goroutine safe.

Browse source
This commit is contained in:
Chris Rhodes 2016-03-10 19:15:30 -08:00
parent 0dac7777c1
commit 6ec1c07300
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
state.go
View file

@ -460,41 +460,33 @@ func (s *State) MessageRemove(message *Message) error {
return errors.New("Message not found.")
}
func (s *State) VoiceStateUpdate(update *VoiceStateUpdate) error {
var exists bool
var guild *Guild
for _, guild = range s.Guilds {
if guild.ID == update.GuildID {
exists = true
break
}
func (s *State) voiceStateUpdate(update *VoiceStateUpdate) error {
guild, err := s.Guild(update.GuildID)
if err != nil {
return err
}
if !exists {
return nil
}
s.Lock()
defer s.Unlock()
// Handle Leaving Channel
if update.ChannelID == "" {
for i, state := range guild.VoiceStates {
if state.UserID == update.UserID {
guild.VoiceStates = append(guild.VoiceStates[:i], guild.VoiceStates[i+1:]...)
return nil
}
}
} else {
exists := false
for _, state := range guild.VoiceStates {
for i, state := range guild.VoiceStates {
if state.UserID == update.UserID {
state.ChannelID = update.ChannelID
exists = true
guild.VoiceStates[i] = update.VoiceState
return nil
}
}
if !exists {
guild.VoiceStates = append(guild.VoiceStates, update.VoiceState)
}
}
return nil
}
@ -561,7 +553,7 @@ func (s *State) onInterface(se *Session, i interface{}) (err error) {
case *MessageDelete:
err = s.MessageRemove(t.Message)
case *VoiceStateUpdate:
err = s.VoiceStateUpdate(t)
err = s.voiceStateUpdate(t)
}
return