External/ergo
1
0
Fork 1
mirror of https://github.com/ergochat/ergo.git synced 2025-12-20 02:00:11 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

strings: Fix nick bugs, use UsernameCaseMapped

Browse source
This commit is contained in:
Daniel Oaks 2017-01-14 02:32:15 +10:00
parent c6e8e4bef3
commit 2b240faa90
4 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
irc/strings.go
View file

@ -12,18 +12,22 @@ import (
"golang.org/x/text/secure/precis"
)
const (
casemappingName = "rfc7613"
)
var (
errInvalidCharacter = errors.New("Invalid character")
)
// Casefold returns a casefolded string, without doing any name or channel character checks.
func Casefold(str string) (string, error) {
return precis.Nickname.CompareKey(str)
return precis.UsernameCaseMapped.CompareKey(str)
}
// CasefoldChannel returns a casefolded version of a channel name.
func CasefoldChannel(name string) (string, error) {
lowered, err := precis.Nickname.CompareKey(name)
lowered, err := Casefold(name)
if err != nil {
return "", err
@ -47,7 +51,7 @@ func CasefoldChannel(name string) (string, error) {
// CasefoldName returns a casefolded version of a nick/user name.
func CasefoldName(name string) (string, error) {
lowered, err := precis.Nickname.CompareKey(name)
lowered, err := Casefold(name)
if err != nil {
return "", err