Changeset 737 in code for trunk

Timestamp:

Dec 2, 2021, 4:58:56 PM (4 years ago)

Author:

contact

Message:

Mark ACCOUNT_REQUIRED error as permanent connection failure

There's no point in retrying to connect in this case.

File:

• trunk/upstream.go (modified) (2 diffs)

trunk/upstream.go

@@ -58 +58 @@
         // Only return false if we're 100% sure that fixing the error requires a
         // network configuration change
-        return err.Command != irc.ERR_PASSWDMISMATCH && err.Command != irc.ERR_ERRONEUSNICKNAME
+        switch err.Command {
+        case irc.ERR_PASSWDMISMATCH, irc.ERR_ERRONEUSNICKNAME:
+                return false
+        case "FAIL":
+                return err.Params[1] != "ACCOUNT_REQUIRED"
+        default:
+                return true
+        }
 }
 
@@ -1619 +1626 @@
                 })
         case "FAIL":
-                var command string
-                if err := parseMessageParams(msg, &command); err != nil {
-                        return err
+                var command, code string
+                if err := parseMessageParams(msg, &command, &code); err != nil {
+                        return err
+                }
+
+                if !uc.registered && command == "*" && code == "ACCOUNT_REQUIRED" {
+                        return registrationError{msg}
                 }