Changeset 125 in code for trunk/downstream.go

Timestamp:

Mar 19, 2020, 1:51:45 PM (5 years ago)

Author:

contact

Message:

Remove some IRCv3 constants

go-irc v3.1.2 adds some missing IRCv3 constants.

File:

• trunk/downstream.go (modified) (9 diffs)

trunk/downstream.go

@@ -398 +398 @@
                 if !dc.caps["sasl"] {
                         return ircError{&irc.Message{
-                                Command: err_saslfail,
+                                Command: irc.ERR_SASLFAIL,
                                 Params:  []string{"*", "AUTHENTICATE requires the \"sasl\" capability to be enabled"},
                         }}
@@ -404 +404 @@
                 if len(msg.Params) == 0 {
                         return ircError{&irc.Message{
-                                Command: err_saslfail,
+                                Command: irc.ERR_SASLFAIL,
                                 Params:  []string{"*", "Missing AUTHENTICATE argument"},
                         }}
@@ -410 +410 @@
                 if dc.nick == "" {
                         return ircError{&irc.Message{
-                                Command: err_saslfail,
+                                Command: irc.ERR_SASLFAIL,
                                 Params:  []string{"*", "Expected NICK command before AUTHENTICATE"},
                         }}
@@ -425 +425 @@
                         default:
                                 return ircError{&irc.Message{
-                                        Command: err_saslfail,
+                                        Command: irc.ERR_SASLFAIL,
                                         Params:  []string{"*", fmt.Sprintf("Unsupported SASL mechanism %q", mech)},
                                 }}
@@ -432 +432 @@
                         dc.saslServer = nil
                         return ircError{&irc.Message{
-                                Command: err_saslaborted,
+                                Command: irc.ERR_SASLABORTED,
                                 Params:  []string{"*", "SASL authentication aborted"},
                         }}
@@ -444 +444 @@
                                 dc.saslServer = nil
                                 return ircError{&irc.Message{
-                                        Command: err_saslfail,
+                                        Command: irc.ERR_SASLFAIL,
                                         Params:  []string{"*", "Invalid base64-encoded response"},
                                 }}
@@ -455 +455 @@
                         if ircErr, ok := err.(ircError); ok && ircErr.Message.Command == irc.ERR_PASSWDMISMATCH {
                                 return ircError{&irc.Message{
-                                        Command: err_saslfail,
+                                        Command: irc.ERR_SASLFAIL,
                                         Params:  []string{"*", ircErr.Message.Params[1]},
                                 }}
@@ -461 +461 @@
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
-                                Command: err_saslfail,
+                                Command: irc.ERR_SASLFAIL,
                                 Params:  []string{"*", "SASL error"},
                         })
@@ -469 +469 @@
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
-                                Command: rpl_loggedin,
+                                Command: irc.RPL_LOGGEDIN,
                                 Params:  []string{dc.nick, dc.nick, dc.user.Username, "You are now logged in"},
                         })
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
-                                Command: rpl_saslsuccess,
+                                Command: irc.RPL_SASLSUCCESS,
                                 Params:  []string{dc.nick, "SASL authentication successful"},
                         })