Merge pull request #507 from slingamn/strict

make strict enforcement the default

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 {

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) {

oragono.yaml

@@ -303,7 +303,7 @@ accounts:
         #             already logged-in using SASL or NickServ
         #   optional: no enforcement by default, but allow users to opt in to
         #             the enforcement level of their choice
-        method: timeout
+        method: strict
 
         # allow users to set their own nickname enforcement status, e.g.,
         # to opt in to strict enforcement