GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-23 12:29:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #373 from slingamn/issue371

Browse Source 
fix #371
This commit is contained in:
Daniel Oaks 2019-02-14 07:20:04 +10:00 committed by GitHub
commit 3c126a2ba9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
irc/channel.go
View File

@ -394,7 +394,7 @@ func (channel *Channel) Join(client *Client, key string, isSajoin bool, rb *Resp
client.server.logger.Debug("join", fmt.Sprintf("%s joined channel %s", details.nick, chname)) client.server.logger.Debug("join", fmt.Sprintf("%s joined channel %s", details.nick, chname))
newChannel, givenMode := func() (newChannel bool, givenMode modes.Mode) { givenMode := func() (givenMode modes.Mode) {
channel.joinPartMutex.Lock() channel.joinPartMutex.Lock()
defer channel.joinPartMutex.Unlock() defer channel.joinPartMutex.Unlock()
@ -404,7 +404,7 @@ func (channel *Channel) Join(client *Client, key string, isSajoin bool, rb *Resp
channel.members.Add(client) channel.members.Add(client)
firstJoin := len(channel.members) == 1 firstJoin := len(channel.members) == 1
newChannel = firstJoin && channel.registeredFounder == "" newChannel := firstJoin && channel.registeredFounder == ""
if newChannel { if newChannel {
givenMode = modes.ChannelOperator givenMode = modes.ChannelOperator
} else { } else {
@ -454,10 +454,7 @@ func (channel *Channel) Join(client *Client, key string, isSajoin bool, rb *Resp
rb.Add(nil, details.nickMask, "JOIN", chname) rb.Add(nil, details.nickMask, "JOIN", chname)
} }
// don't send topic when it's an entirely new channel channel.SendTopic(client, rb, false)
if !newChannel {
channel.SendTopic(client, rb)
}
channel.Names(client, rb) channel.Names(client, rb)
@ -565,7 +562,7 @@ func (channel *Channel) resumeAndAnnounce(newClient, oldClient *Client) {
} else { } else {
rb.Add(nil, nickMask, "JOIN", channel.name) rb.Add(nil, nickMask, "JOIN", channel.name)
} }
channel.SendTopic(newClient, rb) channel.SendTopic(newClient, rb, false)
channel.Names(newClient, rb) channel.Names(newClient, rb)
if 0 < len(oldModes) { if 0 < len(oldModes) {
rb.Add(nil, newClient.server.name, "MODE", channel.name, oldModes, nick) rb.Add(nil, newClient.server.name, "MODE", channel.name, oldModes, nick)
@ -635,7 +632,8 @@ func (channel *Channel) replayHistoryItems(rb *ResponseBuffer, items []history.I
} }
// SendTopic sends the channel topic to the given client. // SendTopic sends the channel topic to the given client.
func (channel *Channel) SendTopic(client *Client, rb *ResponseBuffer) { // `sendNoTopic` controls whether RPL_NOTOPIC is sent when the topic is unset
func (channel *Channel) SendTopic(client *Client, rb *ResponseBuffer, sendNoTopic bool) {
if !channel.hasClient(client) { if !channel.hasClient(client) {
rb.Add(nil, client.server.name, ERR_NOTONCHANNEL, client.nick, channel.name, client.t("You're not on that channel")) rb.Add(nil, client.server.name, ERR_NOTONCHANNEL, client.nick, channel.name, client.t("You're not on that channel"))
return return
@ -649,7 +647,9 @@ func (channel *Channel) SendTopic(client *Client, rb *ResponseBuffer) {
channel.stateMutex.RUnlock() channel.stateMutex.RUnlock()
if topic == "" { if topic == "" {
if sendNoTopic {
rb.Add(nil, client.server.name, RPL_NOTOPIC, client.nick, name, client.t("No topic is set")) rb.Add(nil, client.server.name, RPL_NOTOPIC, client.nick, name, client.t("No topic is set"))
}
return return
} }

2
irc/handlers.go
View File

@ -2411,7 +2411,7 @@ func topicHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res
if len(msg.Params) > 1 { if len(msg.Params) > 1 {
channel.SetTopic(client, msg.Params[1], rb) channel.SetTopic(client, msg.Params[1], rb)
} else { } else {
channel.SendTopic(client, rb) channel.SendTopic(client, rb, true)
} }
return false return false
} }