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

Merge pull request #1953 from slingamn/issue1886_unregistered.1

Browse source 
fix #1886
This commit is contained in:
Shivaram Lingamneni 2022-05-05 22:40:50 -04:00 • committed by GitHub
commit c454c45d6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
irc/nickserv.go
View file

@ -923,7 +923,11 @@ func nsInfoHandler(service *ircService, server *Server, client *Client, command
account, err := server.accounts.LoadAccount(accountName)
if err != nil || !account.Verified {
service.Notice(rb, client.t("Account does not exist"))
if server.accounts.accountWasUnregistered(accountName) {
service.Notice(rb, client.t("Name reserved due to a prior registration"))
} else {
service.Notice(rb, client.t("Account does not exist"))
}
return
}
@ -1035,6 +1039,8 @@ func nsSaregisterHandler(service *ircService, server *Server, client *Client, co
var errMsg string
if err == errAccountAlreadyRegistered || err == errAccountAlreadyVerified {
errMsg = client.t("Account already exists")
} else if err == errNameReserved {
errMsg = client.t(err.Error())
} else if err == errAccountBadPassphrase {
errMsg = client.t("Passphrase contains forbidden characters or is otherwise invalid")
} else {