Fix spurious bidi rule violations in casefolding channel names
by stripping the # before starting the casefolding.
This commit is contained in:
Shivaram Lingamneni 2018-12-05 22:35:36 -05:00
parent 70364f5f67
commit 40e63dbbe8
2 changed files with 25 additions and 7 deletions

View file

@ -39,18 +39,25 @@ func Casefold(str string) (string, error) {
// CasefoldChannel returns a casefolded version of a channel name.
func CasefoldChannel(name string) (string, error) {
lowered, err := Casefold(name)
if err != nil {
return "", err
} else if len(lowered) == 0 {
if len(name) == 0 {
return "", errStringIsEmpty
}
if lowered[0] != '#' {
// don't casefold the preceding #'s
var start int
for start = 0; start < len(name) && name[start] == '#'; start += 1 {
}
if start == 0 {
// no preceding #'s
return "", errInvalidCharacter
}
lowered, err := Casefold(name[start:])
if err != nil {
return "", err
}
// space can't be used
// , is used as a separator
// * is used in mask matching
@ -59,7 +66,7 @@ func CasefoldChannel(name string) (string, error) {
return "", errInvalidCharacter
}
return lowered, err
return name[:start] + lowered, err
}
// CasefoldName returns a casefolded version of a nick/user name.