Changeset 117 in code for trunk/downstream.go

Timestamp:

Mar 18, 2020, 11:23:08 AM (5 years ago)

Author:

contact

Message:

Add basic infrastructure for bouncer service

File:

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

trunk/downstream.go

@@ -327 +327 @@
         switch msg.Command {
         case "NICK":
-                if err := parseMessageParams(msg, &dc.nick); err != nil {
-                        return err
-                }
+                var nick string
+                if err := parseMessageParams(msg, &nick); err != nil {
+                        return err
+                }
+                if nick == serviceNick {
+                        return ircError{&irc.Message{
+                                Command: irc.ERR_NICKNAMEINUSE,
+                                Params:  []string{dc.nick, nick, "Nickname reserved for bouncer service"},
+                        }}
+                }
+                dc.nick = nick
         case "USER":
-                var username string
-                if err := parseMessageParams(msg, &username, nil, nil, &dc.realname); err != nil {
-                        return err
-                }
-                dc.rawUsername = username
+                if err := parseMessageParams(msg, &dc.rawUsername, nil, nil, &dc.realname); err != nil {
+                        return err
+                }
         case "PASS":
                 if err := parseMessageParams(msg, &dc.password); err != nil {
@@ -891 +897 @@
 
                 for _, name := range strings.Split(targetsStr, ",") {
+                        if name == serviceNick {
+                                handleServicePRIVMSG(dc, text)
+                                continue
+                        }
+
                         uc, upstreamName, err := dc.unmarshalChannel(name)
                         if err != nil {