Changeset 140 in code for trunk

Timestamp:

Mar 25, 2020, 8:47:26 AM (5 years ago)

Author:

delthas

Message:

Add downstream NAMES support

NAMES reply for channels currently joined will be returned from cache;
requests for channels not joined will be forwarded from upstream.

Location:

trunk

Files:

• bridge.go (modified) (1 diff)
• downstream.go (modified) (2 diffs)
• upstream.go (modified) (2 diffs)

trunk/bridge.go

@@ -27 +27 @@
 
         // TODO: rpl_topicwhotime
+        sendNames(dc, ch)
+}
 
+func sendNames(dc *downstreamConn, ch *upstreamChannel) {
         // TODO: send multiple members in each message
+
+        downstreamName := dc.marshalChannel(ch.conn, ch.Name)
+
         for nick, membership := range ch.Members {
                 s := membership.String() + dc.marshalNick(ch.conn, nick)

trunk/downstream.go

@@ -914 +914 @@
                         })
                 }
+        case "NAMES":
+                if len(msg.Params) == 0 {
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: irc.RPL_ENDOFNAMES,
+                                Params:  []string{dc.nick, "*", "End of /NAMES list"},
+                        })
+                        return nil
+                }
+
+                channels := strings.Split(msg.Params[0], ",")
+                for _, channel := range channels {
+                        uc, upstreamChannel, err := dc.unmarshalEntity(channel)
+                        if err != nil {
+                                return err
+                        }
+
+                        ch, ok := uc.channels[upstreamChannel]
+                        if ok {
+                                sendNames(dc, ch)
+                        } else {
+                                // NAMES on a channel we have not joined, ask upstream
+                                uc.SendMessage(&irc.Message{
+                                        Command: "NAMES",
+                                        Params:  []string{upstreamChannel},
+                                })
+                        }
+                }
         case "WHO":
                 if len(msg.Params) == 0 {
@@ -920 +948 @@
                                 Prefix:  dc.srv.prefix(),
                                 Command: irc.RPL_ENDOFWHO,
-                                Params:  []string{dc.nick, "*", "End of /WHO list."},
+                                Params:  []string{dc.nick, "*", "End of /WHO list"},
                         })
                         return nil

trunk/upstream.go

@@ -652 +652 @@
                         return err
                 }
-                ch, err := uc.getChannel(name)
-                if err != nil {
-                        return err
+
+                ch, ok := uc.channels[name]
+                if !ok {
+                        // NAMES on a channel we have not joined, forward to downstream
+                        uc.forEachDownstream(func(dc *downstreamConn) {
+                                channel := dc.marshalChannel(uc, name)
+                                members := strings.Split(members, " ")
+                                for i, member := range members {
+                                        membership, nick := uc.parseMembershipPrefix(member)
+                                        members[i] = membership.String() + dc.marshalNick(uc, nick)
+                                }
+                                memberStr := strings.Join(members, " ")
+
+                                dc.SendMessage(&irc.Message{
+                                        Prefix:  dc.srv.prefix(),
+                                        Command: irc.RPL_NAMREPLY,
+                                        Params:  []string{dc.nick, statusStr, channel, memberStr},
+                                })
+                        })
+                        return nil
                 }
 
@@ -672 +689 @@
                         return err
                 }
-                ch, err := uc.getChannel(name)
-                if err != nil {
-                        return err
+
+                ch, ok := uc.channels[name]
+                if !ok {
+                        // NAMES on a channel we have not joined, forward to downstream
+                        uc.forEachDownstream(func(dc *downstreamConn) {
+                                channel := dc.marshalChannel(uc, name)
+
+                                dc.SendMessage(&irc.Message{
+                                        Prefix:  dc.srv.prefix(),
+                                        Command: irc.RPL_ENDOFNAMES,
+                                        Params:  []string{dc.nick, channel, "End of /NAMES list"},
+                                })
+                        })
+                        return nil
                 }