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

fix #537

Browse source
This commit is contained in:
Shivaram Lingamneni 2019-05-30 05:33:59 -04:00
parent a521be8119
commit 3b71be3bf0
3 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

33
irc/channelmanager.go
View file

@ -65,19 +65,30 @@ func (cm *ChannelManager) Join(client *Client, name string, key string, isSajoin
return errNoSuchChannel
}
cm.Lock()
entry := cm.chans[casefoldedName]
if entry == nil {
registered := cm.registeredChannels[casefoldedName]
entry = &channelManagerEntry{
channel: NewChannel(server, name, registered),
pendingJoins: 0,
channel := func() *Channel {
cm.Lock()
defer cm.Unlock()
entry := cm.chans[casefoldedName]
if entry == nil {
registered := cm.registeredChannels[casefoldedName]
// enforce OpOnlyCreation
if !registered && server.Config().Channels.OpOnlyCreation && !client.HasRoleCapabs("chanreg") {
return nil
}
entry = &channelManagerEntry{
channel: NewChannel(server, name, registered),
pendingJoins: 0,
}
cm.chans[casefoldedName] = entry
}
cm.chans[casefoldedName] = entry
entry.pendingJoins += 1
return entry.channel
}()
if channel == nil {
return errNoSuchChannel
}
entry.pendingJoins += 1
channel := entry.channel
cm.Unlock()
channel.EnsureLoaded()
channel.Join(client, key, isSajoin, rb)