Skip to content

Commit 9a186f8

Browse files
slingamnValwareIRC
andauthored
Fix invalid FAIL codes in REGISTER (#2269)
* nickserv.go: Update FAIL codes to match spec * handlers.go: Fix FAIL code * use ACCOUNT_EXISTS for errNameReserved * bump irctest to development version --------- Co-authored-by: Valerie Liu <79415174+ValwareIRC@users.noreply.github.com>
1 parent 7828218 commit 9a186f8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

irc/handlers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2974,7 +2974,7 @@ func registerHandler(server *Server, client *Client, msg ircmsg.Message, rb *Res
29742974
announcePendingReg(client, rb, accountName)
29752975
}
29762976
case errAccountAlreadyRegistered, errAccountAlreadyUnregistered, errAccountMustHoldNick:
2977-
rb.Add(nil, server.name, "FAIL", "REGISTER", "USERNAME_EXISTS", accountName, client.t("Username is already registered or otherwise unavailable"))
2977+
rb.Add(nil, server.name, "FAIL", "REGISTER", "ACCOUNT_EXISTS", accountName, client.t("Username is already registered or otherwise unavailable"))
29782978
case errAccountBadPassphrase:
29792979
rb.Add(nil, server.name, "FAIL", "REGISTER", "INVALID_PASSWORD", accountName, client.t("Password was invalid"))
29802980
default:

irc/nickserv.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,10 +1055,10 @@ func nsSaregisterHandler(service *ircService, server *Server, client *Client, co
10551055
var failCode string
10561056
if err == errAccountAlreadyRegistered || err == errAccountAlreadyVerified {
10571057
errMsg = client.t("Account already exists")
1058-
failCode = "USERNAME_EXISTS"
1058+
failCode = "ACCOUNT_EXISTS"
10591059
} else if err == errNameReserved {
10601060
errMsg = client.t(err.Error())
1061-
failCode = "USERNAME_EXISTS"
1061+
failCode = "ACCOUNT_EXISTS"
10621062
} else if err == errAccountBadPassphrase {
10631063
errMsg = client.t("Passphrase contains forbidden characters or is otherwise invalid")
10641064
failCode = "INVALID_PASSWORD"

0 commit comments

Comments
 (0)