Changeset 129 in code for trunk/upstream.go

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

File:

• trunk/upstream.go (modified) (3 diffs)

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 {