CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests 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
Download patch file Download diff file Expand all files Collapse all files

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
func (nt *NickTimer) Touch() {
func (nt *NickTimer) Touch(rb *ResponseBuffer) {
if !nt.Enabled() {
return
}
var session *Session
if rb != nil {
session = rb.session
}
cfnick, skeleton := nt.client.uniqueIdentifiers()
account := nt.client.Account()
accountForNick, method := nt.client.server.accounts.EnforcementStatus(cfnick, skeleton)
@ -259,7 +264,16 @@ func (nt *NickTimer) Touch() {
}()
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 {
nt.client.Notice(nt.client.t("Nickname is reserved by a different account"))
nt.client.server.RandomlyRename(nt.client)