diamondburned/arikawa
1
0
Fork 0
mirror of https://github.com/diamondburned/arikawa.git synced 2025-07-06 04:16:41 +00:00
Code Issues Releases Activity

State: Fixed bug where range values are dereferenced incorrectly

Browse source 
https://github.com/golang/go/wiki/CommonMistakes#using-reference-to-loop-iterator-variable
This commit is contained in:
diamondburned (Forefront) 2020-02-07 00:22:41 -08:00
parent 0761dfabee
commit 5acf01d984
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
state/state.go
View file

@ -193,6 +193,8 @@ func (s *State) Channels(guildID discord.Snowflake) ([]discord.Channel, error) {
} }
for _, ch := range c { for _, ch := range c {
ch := ch
if err := s.Store.ChannelSet(&ch); err != nil { if err := s.Store.ChannelSet(&ch); err != nil {
return nil, err return nil, err
} }
@ -272,6 +274,8 @@ func (s *State) Guilds() ([]discord.Guild, error) {
} }
for _, ch := range c { for _, ch := range c {
ch := ch
if err := s.Store.GuildSet(&ch); err != nil { if err := s.Store.GuildSet(&ch); err != nil {
return nil, err return nil, err
} }
@ -444,6 +448,8 @@ func (s *State) Role(
var role *discord.Role var role *discord.Role
for _, r := range rs { for _, r := range rs {
r := r
if r.ID == roleID { if r.ID == roleID {
role = &r role = &r
} }
@ -468,6 +474,8 @@ func (s *State) Roles(guildID discord.Snowflake) ([]discord.Role, error) {
} }
for _, r := range rs { for _, r := range rs {
r := r
if err := s.RoleSet(guildID, &r); err != nil { if err := s.RoleSet(guildID, &r); err != nil {
return rs, err return rs, err
} }

13
state/state_events.go
View file

@ -24,6 +24,8 @@ func (s *State) onEvent(iface interface{}) {
case *gateway.ReadyEvent: case *gateway.ReadyEvent:
// Handle guilds // Handle guilds
for _, g := range ev.Guilds { for _, g := range ev.Guilds {
g := g
if err := s.Store.GuildSet(&g); err != nil { if err := s.Store.GuildSet(&g); err != nil {
s.stateErr(err, "Failed to set guild in state") s.stateErr(err, "Failed to set guild in state")
} }
@ -31,6 +33,8 @@ func (s *State) onEvent(iface interface{}) {
// Handle private channels // Handle private channels
for _, ch := range ev.PrivateChannels { for _, ch := range ev.PrivateChannels {
ch := ch
if err := s.Store.ChannelSet(&ch); err != nil { if err := s.Store.ChannelSet(&ch); err != nil {
s.stateErr(err, "Failed to set channel in state") s.stateErr(err, "Failed to set channel in state")
} }
@ -50,12 +54,15 @@ func (s *State) onEvent(iface interface{}) {
} }
for _, m := range ev.Members { for _, m := range ev.Members {
m := m
if err := s.Store.MemberSet(ev.Guild.ID, &m); err != nil { if err := s.Store.MemberSet(ev.Guild.ID, &m); err != nil {
s.stateErr(err, "Failed to add a member from guild in state") s.stateErr(err, "Failed to add a member from guild in state")
} }
} }
for _, ch := range ev.Channels { for _, ch := range ev.Channels {
ch := ch
ch.GuildID = ev.Guild.ID // just to make sure ch.GuildID = ev.Guild.ID // just to make sure
if err := s.Store.ChannelSet(&ch); err != nil { if err := s.Store.ChannelSet(&ch); err != nil {
@ -64,6 +71,8 @@ func (s *State) onEvent(iface interface{}) {
} }
for _, p := range ev.Presences { for _, p := range ev.Presences {
p := p
if err := s.Store.PresenceSet(ev.Guild.ID, &p); err != nil { if err := s.Store.PresenceSet(ev.Guild.ID, &p); err != nil {
s.stateErr(err, "Failed to add a presence from guild in state") s.stateErr(err, "Failed to add a presence from guild in state")
} }
@ -101,12 +110,16 @@ func (s *State) onEvent(iface interface{}) {
case *gateway.GuildMembersChunkEvent: case *gateway.GuildMembersChunkEvent:
for _, m := range ev.Members { for _, m := range ev.Members {
m := m
if err := s.Store.MemberSet(ev.GuildID, &m); err != nil { if err := s.Store.MemberSet(ev.GuildID, &m); err != nil {
s.stateErr(err, "Failed to add a member from chunk in state") s.stateErr(err, "Failed to add a member from chunk in state")
} }
} }
for _, p := range ev.Presences { for _, p := range ev.Presences {
p := p
if err := s.Store.PresenceSet(ev.GuildID, &p); err != nil { if err := s.Store.PresenceSet(ev.GuildID, &p); err != nil {
s.stateErr(err, "Failed to add a presence from chunk in state") s.stateErr(err, "Failed to add a presence from chunk in state")
} }