diff --git a/irc/idletimer.go b/irc/idletimer.go index 8b7bc8e8..637d6919 100644 --- a/irc/idletimer.go +++ b/irc/idletimer.go @@ -269,9 +269,9 @@ func (nt *NickTimer) Touch(rb *ResponseBuffer) { // #449 for _, mSession := range nt.client.Sessions() { if mSession == session { - rb.Add(nil, "NickServ", "NOTICE", tnick, message) + rb.Add(nil, nsPrefix, "NOTICE", tnick, message) } else { - mSession.Send(nil, "NickServ", "NOTICE", tnick, message) + mSession.Send(nil, nsPrefix, "NOTICE", tnick, message) } } } else if shouldRename { diff --git a/irc/nickserv.go b/irc/nickserv.go index ab139df5..6e8da5c8 100644 --- a/irc/nickserv.go +++ b/irc/nickserv.go @@ -32,7 +32,8 @@ func servCmdRequiresBouncerEnabled(config *Config) bool { return config.Accounts.Bouncer.Enabled } -var ( +const ( + nsPrefix = "NickServ!NickServ@localhost" // ZNC's nickserv module will not detect this unless it is: // 1. sent with prefix `nickserv` // 2. contains the string "identify" @@ -267,7 +268,7 @@ information on the settings and their possible values, see HELP SET.`, func nsNotice(rb *ResponseBuffer, text string) { // XXX i can't figure out how to use OragonoServices[servicename].prefix here // without creating a compile-time initialization loop - rb.Add(nil, "NickServ!NickServ@localhost", "NOTICE", rb.target.Nick(), text) + rb.Add(nil, nsPrefix, "NOTICE", rb.target.Nick(), text) } func nsGetHandler(server *Server, client *Client, command string, params []string, rb *ResponseBuffer) {