Changeset 127 in code for trunk

Timestamp:

Mar 19, 2020, 11:29:03 PM (5 years ago)

Author:

delthas

Message:

Add WHO support

Location:

trunk

Files:

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

trunk/downstream.go

@@ -170 +170 @@
 }
 
-func (dc *downstreamConn) unmarshalChannel(name string) (*upstreamConn, string, error) {
+func (dc *downstreamConn) unmarshalEntity(name string) (*upstreamConn, string, error) {
         if uc := dc.upstream(); uc != nil {
                 return uc, name, nil
         }
 
-        network := ""
+        var conn *upstreamConn
         if i := strings.LastIndexByte(name, '/'); i >= 0 {
-                network = name[i+1:]
+                network := name[i+1:]
                 name = name[:i]
-        }
-
-        if network != "" {
-                var conn *upstreamConn
+
                 dc.forEachUpstream(func(uc *upstreamConn) {
                         if network != uc.network.GetName() {
@@ -189 +186 @@
                         conn = uc
                 })
-                return conn, name, nil
-        }
-
-        var channel *upstreamChannel
-        var err error
-        dc.forEachUpstream(func(uc *upstreamConn) {
-                if err != nil {
-                        return
-                }
-                if ch, ok := uc.channels[name]; ok {
-                        if channel != nil {
-                                err = fmt.Errorf("ambiguous channel name %q", name)
-                        } else {
-                                channel = ch
-                        }
-                }
-        })
-        if channel == nil {
+        }
+
+        if conn == nil {
                 return nil, "", ircError{&irc.Message{
                         Command: irc.ERR_NOSUCHCHANNEL,
@@ -212 +194 @@
                 }}
         }
-        return channel.conn, channel.Name, nil
+        return conn, name, nil
 }
 
@@ -844 +826 @@
                 }
 
-                uc, upstreamName, err := dc.unmarshalChannel(name)
+                uc, upstreamName, err := dc.unmarshalEntity(name)
                 if err != nil {
                         return ircError{&irc.Message{
@@ -886 +868 @@
 
                 if msg.Prefix.Name != name {
-                        uc, upstreamName, err := dc.unmarshalChannel(name)
+                        uc, upstreamName, err := dc.unmarshalEntity(name)
                         if err != nil {
                                 return err
@@ -934 +916 @@
                         }
                 }
+        case "WHO":
+                if len(msg.Params) == 0 {
+                        // TODO: support WHO without parameters
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: irc.RPL_ENDOFWHO,
+                                Params:  []string{dc.nick, "*", "End of /WHO list."},
+                        })
+                        return nil
+                }
+
+                // TODO: support WHO masks
+                entity := msg.Params[0]
+
+                uc, upstreamName, err := dc.unmarshalEntity(entity)
+                if err != nil {
+                        return err
+                }
+
+                var params []string
+                if len(msg.Params) == 2 {
+                        params = []string{upstreamName, msg.Params[1]}
+                } else {
+                        params = []string{upstreamName}
+                }
+
+                uc.SendMessage(&irc.Message{
+                        Command: "WHO",
+                        Params:  params,
+                })
         case "PRIVMSG":
                 var targetsStr, text string
@@ -946 +958 @@
                         }
 
-                        uc, upstreamName, err := dc.unmarshalChannel(name)
+                        uc, upstreamName, err := dc.unmarshalEntity(name)
                         if err != nil {
                                 return err

trunk/upstream.go

@@ -558 +558 @@
                         forwardChannel(dc, ch)
                 })
+        case irc.RPL_WHOREPLY:
+                var channel, username, host, server, nick, mode, trailing string
+                if err := parseMessageParams(msg, nil, &channel, &username, &host, &server, &nick, &mode, &trailing); err != nil {
+                        return err
+                }
+
+                parts := strings.SplitN(trailing, " ", 2)
+                if len(parts) != 2 {
+                        return fmt.Errorf("received malformed RPL_WHOREPLY: wrong trailing parameter: %s", trailing)
+                }
+                realname := parts[1]
+                hops, err := strconv.Atoi(parts[0])
+                if err != nil {
+                        return fmt.Errorf("received malformed RPL_WHOREPLY: wrong hop count: %s", parts[0])
+                }
+                hops++
+
+                trailing = strconv.Itoa(hops) + " " + realname
+
+                uc.forEachDownstream(func(dc *downstreamConn) {
+                        channel := channel
+                        if channel != "*" {
+                                channel = dc.marshalChannel(uc, channel)
+                        }
+                        nick := dc.marshalNick(uc, nick)
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: irc.RPL_WHOREPLY,
+                                Params:  []string{dc.nick, channel, username, host, server, nick, mode, trailing},
+                        })
+                })
+        case irc.RPL_ENDOFWHO:
+                var name string
+                if err := parseMessageParams(msg, nil, &name); err != nil {
+                        return err
+                }
+
+                uc.forEachDownstream(func(dc *downstreamConn) {
+                        name := name
+                        if name != "*" {
+                                // TODO: support WHO masks
+                                name = dc.marshalEntity(uc, name)
+                        }
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: irc.RPL_ENDOFWHO,
+                                Params:  []string{dc.nick, name, "End of /WHO list."},
+                        })
+                })
         case "PRIVMSG":
                 if msg.Prefix == nil {