Browse Source

Merge pull request #1633 from slingamn/register_400

fix FAIL REGISTER INVALID_USERNAME case
tags/v2.7.0-rc1
Shivaram Lingamneni 3 years ago
parent
commit
973d7dc1dc
No account linked to committer's email address
1 changed files with 3 additions and 2 deletions
  1. 3
    2
      irc/handlers.go

+ 3
- 2
irc/handlers.go View File

@@ -2528,8 +2528,9 @@ func registerHandler(server *Server, client *Client, msg ircmsg.Message, rb *Res
2528 2528
 	}
2529 2529
 	// check that accountName is valid as a non-final parameter;
2530 2530
 	// this is necessary for us to be valid and it will prevent us from emitting invalid error lines
2531
-	if accountName == "*" || accountName != utils.SafeErrorParam(accountName) {
2532
-		rb.Add(nil, server.name, "FAIL", "REGISTER", "INVALID_USERNAME", accountName, client.t("Username invalid or not given"))
2531
+	nickErrorParam := utils.SafeErrorParam(accountName)
2532
+	if accountName == "*" || accountName != nickErrorParam {
2533
+		rb.Add(nil, server.name, "FAIL", "REGISTER", "INVALID_USERNAME", nickErrorParam, client.t("Username invalid or not given"))
2533 2534
 		return
2534 2535
 	}
2535 2536
 

Loading…
Cancel
Save