Browse Source

Merge pull request #1790 from slingamn/unknowncommand

fix #1530
tags/v2.8.0-rc1
Shivaram Lingamneni 2 years ago
parent
commit
d02eecd8ec
No account linked to committer's email address
2 changed files with 10 additions and 2 deletions
  1. 9
    1
      irc/handlers.go
  2. 1
    1
      irctest

+ 9
- 1
irc/handlers.go View File

@@ -3531,7 +3531,15 @@ func zncHandler(server *Server, client *Client, msg ircmsg.Message, rb *Response
3531 3531
 
3532 3532
 // fake handler for unknown commands
3533 3533
 func unknownCommandHandler(server *Server, client *Client, msg ircmsg.Message, rb *ResponseBuffer) bool {
3534
-	rb.Add(nil, server.name, ERR_UNKNOWNCOMMAND, client.Nick(), utils.SafeErrorParam(msg.Command), client.t("Unknown command"))
3534
+	var message string
3535
+	if strings.HasPrefix(msg.Command, "/") {
3536
+		message = fmt.Sprintf(client.t("Unknown command; if you are using /QUOTE, the correct syntax is /QUOTE %s, not /QUOTE %s"),
3537
+			strings.TrimPrefix(msg.Command, "/"), msg.Command)
3538
+	} else {
3539
+		message = client.t("Unknown command")
3540
+	}
3541
+
3542
+	rb.Add(nil, server.name, ERR_UNKNOWNCOMMAND, client.Nick(), utils.SafeErrorParam(msg.Command), message)
3535 3543
 	return false
3536 3544
 }
3537 3545
 

+ 1
- 1
irctest

@@ -1 +1 @@
1
-Subproject commit 125a1cc106655b8c34705fd74a2704fccb8ec91e
1
+Subproject commit f86e11a288a88e2016d579c7a4bbb3c58869f879

Loading…
Cancel
Save