CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

refactor channel join and part

Browse source
This commit is contained in:
Shivaram Lingamneni 2018-04-24 03:11:11 -04:00
parent 22ec6139bf
commit b97ae00fe3
2 changed files with 96 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

14
irc/client.go
View file

@ -409,16 +409,20 @@ func (client *Client) TryResume() {
client.nick = oldClient.nick
client.updateNickMaskNoMutex()
for channel := range oldClient.channels {
channel.stateMutex.Lock()
rejoinChannel := func(channel *Channel) {
channel.joinPartMutex.Lock()
defer channel.joinPartMutex.Unlock()
channel.stateMutex.Lock()
client.channels[channel] = true
client.resumeDetails.SendFakeJoinsFor = append(client.resumeDetails.SendFakeJoinsFor, channel.name)
oldModeSet := channel.members[oldClient]
channel.members.Remove(oldClient)
channel.members[client] = oldModeSet
channel.regenerateMembersCache(true)
channel.stateMutex.Unlock()
channel.regenerateMembersCache()
// construct fake modestring if necessary
oldModes := oldModeSet.String()
@ -447,8 +451,10 @@ func (client *Client) TryResume() {
member.Send(nil, server.name, "MODE", params...)
}
}
}
channel.stateMutex.Unlock()
for channel := range oldClient.channels {
rejoinChannel(channel)
}
server.clients.byNick[oldnick] = client