Changeset 42 in code for trunk

Timestamp:

Feb 7, 2020, 11:19:42 AM (5 years ago)

Author:

contact

Message:

Allow changing nickname

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• upstream.go (modified) (6 diffs)

trunk/downstream.go

@@ -235 +235 @@
 func (c *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
         switch msg.Command {
-        case "NICK", "USER":
+        case "USER":
                 return ircError{&irc.Message{
                         Command: irc.ERR_ALREADYREGISTERED,
-                        Params: []string{
-                                c.nick,
-                                "You may not reregister",
-                        },
+                        Params:  []string{c.nick, "You may not reregister"},
                 }}
+        case "NICK":
+                c.user.forEachUpstream(func(uc *upstreamConn) {
+                        uc.messages <- msg
+                })
         default:
                 c.logger.Printf("unhandled message: %v", msg)
                 return newUnknownCommandError(msg.Command)
         }
-}
+        return nil
+}

trunk/upstream.go

@@ -39 +39 @@
 
         registered bool
+        nick       string
         closed     bool
         modes      modeSet
@@ -113 +114 @@
 
                 if name == msg.Prefix.Name { // user mode change
-                        if name != c.upstream.Nick {
+                        if name != c.nick {
                                 return fmt.Errorf("received MODE message for unknow nick %q", name)
                         }
@@ -152 +153 @@
                         c.channelModesWithParam = msg.Params[5]
                 }
+        case "NICK":
+                if len(msg.Params) < 1 {
+                        return newNeedMoreParamsError(msg.Command)
+                }
+                newNick := msg.Params[0]
+
+                if msg.Prefix.Name == c.nick {
+                        c.logger.Printf("changed nick from %q to %q", c.nick, newNick)
+                        c.nick = newNick
+                }
+
+                for _, ch := range c.channels {
+                        if membership, ok := ch.Members[msg.Prefix.Name]; ok {
+                                delete(ch.Members, msg.Prefix.Name)
+                                ch.Members[newNick] = membership
+                        }
+                }
+
+                c.user.forEachDownstream(func(dc *downstreamConn) {
+                        dc.messages <- msg
+                })
         case "JOIN":
                 if len(msg.Params) < 1 {
@@ -158 +180 @@
 
                 for _, ch := range strings.Split(msg.Params[0], ",") {
-                        if msg.Prefix.Name == c.upstream.Nick {
+                        if msg.Prefix.Name == c.nick {
                                 c.logger.Printf("joined channel %q", ch)
                                 c.channels[ch] = &upstreamChannel{
@@ -182 +204 @@
 
                 for _, ch := range strings.Split(msg.Params[0], ",") {
-                        if msg.Prefix.Name == c.upstream.Nick {
+                        if msg.Prefix.Name == c.nick {
                                 c.logger.Printf("parted channel %q", ch)
                                 delete(c.channels, ch)
@@ -296 +318 @@
         defer c.Close()
 
+        c.nick = c.upstream.Nick
         c.messages <- &irc.Message{
                 Command: "NICK",