pothtonswer/discordmuffin
1
0
Fork 1
Code Issues 2 Pull requests 1 Projects 2 Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Bruce Marriner 2016-04-22 10:20:15 -05:00
commit 5549070372
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
state.go
View file

@ -105,6 +105,8 @@ func (s *State) GuildRemove(guild *Guild) error {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
delete(s.guildMap, guild.ID)
for i, g := range s.Guilds { for i, g := range s.Guilds {
if g.ID == guild.ID { if g.ID == guild.ID {
@ -113,8 +115,6 @@ func (s *State) GuildRemove(guild *Guild) error {
} }
} }
delete(s.guildMap, guild.ID)
return nil return nil
} }
@ -267,7 +267,7 @@ func (s *State) ChannelRemove(channel *Channel) error {
for i, c := range s.PrivateChannels { for i, c := range s.PrivateChannels {
if c.ID == channel.ID { if c.ID == channel.ID {
s.PrivateChannels = append(s.PrivateChannels[:i], s.PrivateChannels[i+1:]...) s.PrivateChannels = append(s.PrivateChannels[:i], s.PrivateChannels[i+1:]...)
return nil break
} }
} }
} else { } else {
@ -282,11 +282,11 @@ func (s *State) ChannelRemove(channel *Channel) error {
for i, c := range guild.Channels { for i, c := range guild.Channels {
if c.ID == channel.ID { if c.ID == channel.ID {
guild.Channels = append(guild.Channels[:i], guild.Channels[i+1:]...) guild.Channels = append(guild.Channels[:i], guild.Channels[i+1:]...)
return nil break
} }
} }
} }
delete(s.channelMap, channel.ID) delete(s.channelMap, channel.ID)
return nil return nil