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