GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix missing Unescape call

This commit is contained in:
Shivaram Lingamneni 2019-02-17 22:59:13 -05:00
parent 729d4b377c
commit 29c6db593a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
irc/idletimer.go
View File

@ -8,6 +8,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/goshuirc/irc-go/ircfmt"
"github.com/oragono/oragono/irc/caps" "github.com/oragono/oragono/irc/caps"
) )
@ -254,12 +255,7 @@ func (nt *NickTimer) Stop() {
} }
func (nt *NickTimer) sendWarning() { func (nt *NickTimer) sendWarning() {
// ZNC's nickserv module will not detect this unless it is: nt.client.Send(nil, "NickServ", "NOTICE", nt.client.Nick(), fmt.Sprintf(ircfmt.Unescape(nt.client.t(nsTimeoutNotice)), nt.timeout))
// 1. sent with prefix `nickserv`
// 2. contains the string "identify"
// 3. contains at least one of several other magic strings ("authenticate" works)
baseNotice := "This nickname is reserved. Please login within %v (using $b/msg NickServ IDENTIFY <password>$b or SASL)"
nt.client.Send(nil, "NickServ", "NOTICE", nt.client.Nick(), fmt.Sprintf(nt.client.t(baseNotice), nt.timeout))
} }
func (nt *NickTimer) processTimeout() { func (nt *NickTimer) processTimeout() {

8
irc/nickserv.go
View File

@ -26,6 +26,14 @@ func nsEnforceEnabled(config *Config) bool {
return servCmdRequiresNickRes(config) && config.Accounts.NickReservation.AllowCustomEnforcement return servCmdRequiresNickRes(config) && config.Accounts.NickReservation.AllowCustomEnforcement
} }
var (
// ZNC's nickserv module will not detect this unless it is:
// 1. sent with prefix `nickserv`
// 2. contains the string "identify"
// 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)`
)
const nickservHelp = `NickServ lets you register and login to an account. const nickservHelp = `NickServ lets you register and login to an account.
To see in-depth help for a specific NickServ command, try: To see in-depth help for a specific NickServ command, try: