GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-23 11:12:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #507 from slingamn/strict

Browse Source 
make strict enforcement the default
This commit is contained in:
Daniel Oaks 2019-05-22 09:08:34 +10:00 committed by GitHub
commit eaf0328608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
irc/idletimer.go
View File

@ -269,9 +269,9 @@ func (nt *NickTimer) Touch(rb *ResponseBuffer) {
// #449 // #449
for _, mSession := range nt.client.Sessions() { for _, mSession := range nt.client.Sessions() {
if mSession == session { if mSession == session {
rb.Add(nil, "NickServ", "NOTICE", tnick, message) rb.Add(nil, nsPrefix, "NOTICE", tnick, message)
} else { } else {
mSession.Send(nil, "NickServ", "NOTICE", tnick, message) mSession.Send(nil, nsPrefix, "NOTICE", tnick, message)
} }
} }
} else if shouldRename { } else if shouldRename {

5
irc/nickserv.go
View File

@ -32,7 +32,8 @@ func servCmdRequiresBouncerEnabled(config *Config) bool {
return config.Accounts.Bouncer.Enabled return config.Accounts.Bouncer.Enabled
} }
var ( const (
nsPrefix = "NickServ!NickServ@localhost"
// ZNC's nickserv module will not detect this unless it is: // ZNC's nickserv module will not detect this unless it is:
// 1. sent with prefix `nickserv` // 1. sent with prefix `nickserv`
// 2. contains the string "identify" // 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) { func nsNotice(rb *ResponseBuffer, text string) {
// XXX i can't figure out how to use OragonoServices[servicename].prefix here // XXX i can't figure out how to use OragonoServices[servicename].prefix here
// without creating a compile-time initialization loop // 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) { func nsGetHandler(server *Server, client *Client, command string, params []string, rb *ResponseBuffer) {

2
oragono.yaml
View File

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