Changeset 129 in code for trunk

Timestamp:

Mar 20, 2020, 9:11:27 AM (5 years ago)

Author:

delthas

Message:

Fix MODE downstream support

• Fix replies without client as first argument
• Replace wrong prefix check with a proper entity type check

Location:

trunk

Files:

• downstream.go (modified) (6 diffs)
• upstream.go (modified) (3 diffs)

trunk/downstream.go

@@ -151 +151 @@
 }
 
-func (dc *downstreamConn) marshalEntity(uc *upstreamConn, name string) string {
-        for _, r := range name {
-                switch r {
-                // TODO: support upstream ISUPPORT channel prefixes
-                case '#', '&', '+', '!':
-                        return dc.marshalChannel(uc, name)
-                }
-                break
-        }
-        return dc.marshalNick(uc, name)
+func (dc *downstreamConn) marshalEntity(uc *upstreamConn, entity string) string {
+        if uc.isChannel(entity) {
+                return dc.marshalChannel(uc, entity)
+        }
+        return dc.marshalNick(uc, entity)
 }
 
@@ -853 +848 @@
                 }
         case "MODE":
-                if msg.Prefix == nil {
-                        return fmt.Errorf("missing prefix")
-                }
-
                 var name string
                 if err := parseMessageParams(msg, &name); err != nil {
@@ -867 +858 @@
                 }
 
-                if msg.Prefix.Name != name {
-                        uc, upstreamName, err := dc.unmarshalEntity(name)
-                        if err != nil {
-                                return err
-                        }
-
+                uc, upstreamName, err := dc.unmarshalEntity(name)
+                if err != nil {
+                        return err
+                }
+
+                if uc.isChannel(upstreamName) {
+                        // TODO: handle MODE channel mode arguments
                         if modeStr != "" {
                                 uc.SendMessage(&irc.Message{
@@ -883 +875 @@
                                         return ircError{&irc.Message{
                                                 Command: irc.ERR_NOSUCHCHANNEL,
-                                                Params:  []string{name, "No such channel"},
+                                                Params:  []string{dc.nick, name, "No such channel"},
                                         }}
                                 }
@@ -890 +882 @@
                                         Prefix:  dc.srv.prefix(),
                                         Command: irc.RPL_CHANNELMODEIS,
-                                        Params:  []string{name, string(ch.modes)},
+                                        Params:  []string{dc.nick, name, string(ch.modes)},
                                 })
                         }
@@ -912 +904 @@
                                         Prefix:  dc.srv.prefix(),
                                         Command: irc.RPL_UMODEIS,
-                                        Params:  []string{""}, // TODO
+                                        Params:  []string{dc.nick, ""}, // TODO
                                 })
                         }

trunk/upstream.go

@@ -135 +135 @@
 }
 
+func (uc *upstreamConn) isChannel(entity string) bool {
+        for _, r := range entity {
+                switch r {
+                // TODO: support upstream ISUPPORT channel prefixes
+                case '#', '&', '+', '!':
+                        return true
+                }
+                break
+        }
+        return false
+}
+
 func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
         switch msg.Command {
@@ -144 +156 @@
                 return nil
         case "MODE":
-                if msg.Prefix == nil {
-                        return fmt.Errorf("missing prefix")
-                }
-
                 var name, modeStr string
                 if err := parseMessageParams(msg, &name, &modeStr); err != nil {
@@ -153 +161 @@
                 }
 
-                if name == msg.Prefix.Name { // user mode change
+                if !uc.isChannel(name) { // user mode change
                         if name != uc.nick {
-                                return fmt.Errorf("received MODE message for unknow nick %q", name)
+                                return fmt.Errorf("received MODE message for unknown nick %q", name)
                         }
                         return uc.modes.Apply(modeStr)
                 } else { // channel mode change
+                        // TODO: handle MODE channel mode arguments
                         ch, err := uc.getChannel(name)
                         if err != nil {