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

channel: Don't send TOPIC on entirely new channel

Browse source
This commit is contained in:
Daniel Oaks 2017-09-26 08:01:10 +10:00
parent 2759d8f5d3
commit 79de443496
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
irc/channel.go
View file

@ -272,6 +272,7 @@ func (channel *Channel) Join(client *Client, key string) {
channel.members.Add(client) channel.members.Add(client)
// give channel mode if necessary // give channel mode if necessary
var newChannel bool
var givenMode *Mode var givenMode *Mode
client.server.registeredChannelsMutex.Lock() client.server.registeredChannelsMutex.Lock()
defer client.server.registeredChannelsMutex.Unlock() defer client.server.registeredChannelsMutex.Unlock()
@ -283,6 +284,7 @@ func (channel *Channel) Join(client *Client, key string) {
channel.createdTime = time.Now() channel.createdTime = time.Now()
channel.members[client][ChannelOperator] = true channel.members[client][ChannelOperator] = true
givenMode = &ChannelOperator givenMode = &ChannelOperator
newChannel = true
} }
} else { } else {
// we should only do this on registered channels // we should only do this on registered channels
@ -316,7 +318,10 @@ func (channel *Channel) Join(client *Client, key string) {
} else { } else {
client.Send(nil, client.nickMaskString, "JOIN", channel.name) client.Send(nil, client.nickMaskString, "JOIN", channel.name)
} }
channel.getTopicNoMutex(client) // we already have Lock // don't sent topic when it's an entirely new channel
if !newChannel {
channel.getTopicNoMutex(client) // we already have Lock
}
channel.namesNoMutex(client) channel.namesNoMutex(client)
if givenMode != nil { if givenMode != nil {
for member := range channel.members { for member := range channel.members {