arch/soju
1
0
Fork 0
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

Fix joining only one saved channel per network

Browse source 
This fixes a serious bug added in 276ce12e, where in newNetwork all
channels point to the same channel, which causes soju to only join a
single channel when connecting to an upstream network.

This also adds the same kind of reassignment of a for loop variable in
user.run(), even though that function currently works correctly, as a
sanity improvement in case this function is changed in the future.
This commit is contained in:
delthas 2020-05-01 02:02:41 +02:00 committed by Simon Ser
parent bbb5e79f59
commit a99d6dd019
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
user.go
View file

@ -65,6 +65,7 @@ type network struct {
func newNetwork(user *user, record *Network, channels []Channel) *network { func newNetwork(user *user, record *Network, channels []Channel) *network {
m := make(map[string]*Channel, len(channels)) m := make(map[string]*Channel, len(channels))
for _, ch := range channels { for _, ch := range channels {
ch := ch
m[ch.Name] = &ch m[ch.Name] = &ch
} }
@ -229,6 +230,7 @@ func (u *user) run() {
} }
for _, record := range networks { for _, record := range networks {
record := record
channels, err := u.srv.db.ListChannels(record.ID) channels, err := u.srv.db.ListChannels(record.ID)
if err != nil { if err != nil {
u.srv.Logger.Printf("failed to list channels for user %q, network %q: %v", u.Username, record.GetName(), err) u.srv.Logger.Printf("failed to list channels for user %q, network %q: %v", u.Username, record.GetName(), err)