|
@@ -17,7 +17,7 @@ import (
|
17
|
17
|
)
|
18
|
18
|
|
19
|
19
|
var (
|
20
|
|
- // anything added here MUST be casefolded:
|
|
20
|
+ // anything added here MUST be skeleton'd:
|
21
|
21
|
restrictedNicknames = map[string]bool{
|
22
|
22
|
"=scene=": true, // used for rp commands
|
23
|
23
|
"histserv": true, // TODO(slingamn) this should become a real service
|
|
@@ -27,7 +27,7 @@ var (
|
27
|
27
|
// returns whether the change succeeded or failed
|
28
|
28
|
func performNickChange(server *Server, client *Client, target *Client, session *Session, newnick string, rb *ResponseBuffer) bool {
|
29
|
29
|
nickname := strings.TrimSpace(newnick)
|
30
|
|
- cfnick, err := CasefoldName(nickname)
|
|
30
|
+ skeleton, err := Skeleton(nickname)
|
31
|
31
|
currentNick := client.Nick()
|
32
|
32
|
|
33
|
33
|
if len(nickname) < 1 {
|
|
@@ -35,7 +35,7 @@ func performNickChange(server *Server, client *Client, target *Client, session *
|
35
|
35
|
return false
|
36
|
36
|
}
|
37
|
37
|
|
38
|
|
- if err != nil || len(nickname) > server.Config().Limits.NickLen || restrictedNicknames[cfnick] {
|
|
38
|
+ if err != nil || len(nickname) > server.Config().Limits.NickLen || restrictedNicknames[skeleton] {
|
39
|
39
|
rb.Add(nil, server.name, ERR_ERRONEUSNICKNAME, currentNick, nickname, client.t("Erroneous nickname"))
|
40
|
40
|
return false
|
41
|
41
|
}
|
|
@@ -68,7 +68,7 @@ func performNickChange(server *Server, client *Client, target *Client, session *
|
68
|
68
|
}
|
69
|
69
|
histItem.Params[0] = nickname
|
70
|
70
|
|
71
|
|
- client.server.logger.Debug("nick", fmt.Sprintf("%s changed nickname to %s [%s]", origNickMask, nickname, cfnick))
|
|
71
|
+ client.server.logger.Debug("nick", fmt.Sprintf("%s changed nickname to %s [%s]", origNickMask, nickname, skeleton))
|
72
|
72
|
if hadNick {
|
73
|
73
|
if client == target {
|
74
|
74
|
target.server.snomasks.Send(sno.LocalNicks, fmt.Sprintf(ircfmt.Unescape("$%s$r changed nickname to %s"), details.nick, nickname))
|