CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

fix #1886

Browse source 
Add more clarify in NS INFO and SAREGISTER about unregistered nicknames
This commit is contained in:
Shivaram Lingamneni 2022-05-05 01:04:28 -04:00
parent 03092769e7
commit b11dc1c84c
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

@ -913,7 +913,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
}
@ -1025,6 +1029,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 {