GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-22 18:52:41 +01:00
Code Issues Projects Releases Wiki Activity

fix #449

Browse Source
This commit is contained in:
Shivaram Lingamneni 2019-04-14 18:13:01 -04:00
parent c2faeed4b5
commit 4af783ed9e
6 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
irc/accounts.go
View File

@ -1227,7 +1227,7 @@ func (am *AccountManager) Login(client *Client, account ClientAccount) {
return return
} }
client.nickTimer.Touch() client.nickTimer.Touch(nil)
am.applyVHostInfo(client, account.VHost) am.applyVHostInfo(client, account.VHost)
@ -1313,7 +1313,7 @@ func (am *AccountManager) logoutOfAccount(client *Client) {
} }
client.SetAccountName("") client.SetAccountName("")
go client.nickTimer.Touch() go client.nickTimer.Touch(nil)
// dispatch account-notify // dispatch account-notify
// TODO: doing the I/O here is kind of a kludge, let's move this somewhere else // TODO: doing the I/O here is kind of a kludge, let's move this somewhere else

2
irc/client.go
View File

@ -451,7 +451,7 @@ func (client *Client) tryResume() (success bool) {
// this is a bit racey // this is a bit racey
client.resumeDetails.ResumedAt = time.Now() client.resumeDetails.ResumedAt = time.Now()
client.nickTimer.Touch() client.nickTimer.Touch(nil)
// resume successful, proceed to copy client state (nickname, flags, etc.) // resume successful, proceed to copy client state (nickname, flags, etc.)
// after this, the server thinks that `newClient` owns the nickname // after this, the server thinks that `newClient` owns the nickname

18
irc/idletimer.go
View File

@ -222,11 +222,16 @@ func (nt *NickTimer) Timeout() (timeout time.Duration) {
} }
// Touch records a nick change and updates the timer as necessary // Touch records a nick change and updates the timer as necessary
func (nt *NickTimer) Touch() { func (nt *NickTimer) Touch(rb *ResponseBuffer) {
if !nt.Enabled() { if !nt.Enabled() {
return return
} }
var session *Session
if rb != nil {
session = rb.session
}
cfnick, skeleton := nt.client.uniqueIdentifiers() cfnick, skeleton := nt.client.uniqueIdentifiers()
account := nt.client.Account() account := nt.client.Account()
accountForNick, method := nt.client.server.accounts.EnforcementStatus(cfnick, skeleton) accountForNick, method := nt.client.server.accounts.EnforcementStatus(cfnick, skeleton)
@ -259,7 +264,16 @@ func (nt *NickTimer) Touch() {
}() }()
if shouldWarn { if shouldWarn {
nt.client.Send(nil, "NickServ", "NOTICE", nt.client.Nick(), fmt.Sprintf(ircfmt.Unescape(nt.client.t(nsTimeoutNotice)), nt.Timeout())) tnick := nt.client.Nick()
message := fmt.Sprintf(ircfmt.Unescape(nt.client.t(nsTimeoutNotice)), nt.Timeout())
// #449
for _, mSession := range nt.client.Sessions() {
if mSession == session {
rb.Add(nil, "NickServ", "NOTICE", tnick, message)
} else {
mSession.Send(nil, "NickServ", "NOTICE", tnick, message)
}
}
} else if shouldRename { } else if shouldRename {
nt.client.Notice(nt.client.t("Nickname is reserved by a different account")) nt.client.Notice(nt.client.t("Nickname is reserved by a different account"))
nt.client.server.RandomlyRename(nt.client) nt.client.server.RandomlyRename(nt.client)

4
irc/nickname.go
View File

@ -57,8 +57,6 @@ func performNickChange(server *Server, client *Client, target *Client, session *
return false return false
} }
target.nickTimer.Touch()
client.server.logger.Debug("nick", fmt.Sprintf("%s changed nickname to %s [%s]", origNickMask, nickname, cfnick)) client.server.logger.Debug("nick", fmt.Sprintf("%s changed nickname to %s [%s]", origNickMask, nickname, cfnick))
if hadNick { if hadNick {
target.server.snomasks.Send(sno.LocalNicks, fmt.Sprintf(ircfmt.Unescape("$%s$r changed nickname to %s"), whowas.nick, nickname)) target.server.snomasks.Send(sno.LocalNicks, fmt.Sprintf(ircfmt.Unescape("$%s$r changed nickname to %s"), whowas.nick, nickname))
@ -71,6 +69,8 @@ func performNickChange(server *Server, client *Client, target *Client, session *
} }
} }
target.nickTimer.Touch(rb)
if target.Registered() { if target.Registered() {
client.server.monitorManager.AlertAbout(target, true) client.server.monitorManager.AlertAbout(target, true)
} }

2
irc/nickserv.go
View File

@ -31,7 +31,7 @@ var (
// 1. sent with prefix `nickserv` // 1. sent with prefix `nickserv`
// 2. contains the string "identify" // 2. contains the string "identify"
// 3. contains at least one of several other magic strings ("msg" works) // 3. contains at least one of several other magic strings ("msg" works)
nsTimeoutNotice = `This nickname is reserved. Please login within %v (using $b/msg NickServ IDENTIFY <password>$b or SASL)` nsTimeoutNotice = `This nickname is reserved. Please login within %v (using $b/msg NickServ IDENTIFY <password>$b or SASL), or switch to a different nickname.`
) )
const nickservHelp = `NickServ lets you register and login to an account. const nickservHelp = `NickServ lets you register and login to an account.

2
irc/server.go
View File

@ -816,7 +816,7 @@ func (server *Server) applyConfig(config *Config, initial bool) (err error) {
if !oldConfig.Accounts.NickReservation.Enabled && config.Accounts.NickReservation.Enabled { if !oldConfig.Accounts.NickReservation.Enabled && config.Accounts.NickReservation.Enabled {
sClient.nickTimer.Initialize(sClient) sClient.nickTimer.Initialize(sClient)
sClient.nickTimer.Touch() sClient.nickTimer.Touch(nil)
} else if oldConfig.Accounts.NickReservation.Enabled && !config.Accounts.NickReservation.Enabled { } else if oldConfig.Accounts.NickReservation.Enabled && !config.Accounts.NickReservation.Enabled {
sClient.nickTimer.Stop() sClient.nickTimer.Stop()
} }