GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2025-01-03 08:32:43 +01:00
Code Issues Projects Releases Wiki Activity

fix double application of guest prefix

Browse Source
This commit is contained in:
Shivaram Lingamneni 2020-03-19 05:08:53 -04:00
parent 5d9a03f031
commit ca3be51028
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
irc/client_lookup_set.go
View File

@ -151,10 +151,19 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick
} }
if account == "" && config.Accounts.NickReservation.ForceGuestFormat { if account == "" && config.Accounts.NickReservation.ForceGuestFormat {
newcfnick, err = CasefoldName(newNick)
if err != nil {
return "", errNicknameInvalid
}
if !config.Accounts.NickReservation.guestRegexpFolded.MatchString(newcfnick) {
newNick = strings.Replace(config.Accounts.NickReservation.GuestFormat, "*", newNick, 1) newNick = strings.Replace(config.Accounts.NickReservation.GuestFormat, "*", newNick, 1)
newcfnick = "" // re-fold it below
}
} }
if newcfnick == "" {
newcfnick, err = CasefoldName(newNick) newcfnick, err = CasefoldName(newNick)
}
if err != nil { if err != nil {
return "", errNicknameInvalid return "", errNicknameInvalid
} }