Changeset 46 in code for trunk

Timestamp:

Feb 7, 2020, 12:08:27 PM (5 years ago)

Author:

contact

Message:

Handle downstream MODE messages

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• server.go (modified) (1 diff)
• upstream.go (modified) (3 diffs)

trunk/downstream.go

@@ -247 +247 @@
                         uc.messages <- msg
                 })
+        case "MODE":
+                var name string
+                if err := parseMessageParams(msg, &name); err != nil {
+                        return err
+                }
+
+                var modeStr string
+                if len(msg.Params) > 1 {
+                        modeStr = msg.Params[1]
+                }
+
+                if msg.Prefix.Name != name {
+                        ch, err := c.user.getChannel(name)
+                        if err != nil {
+                                return err
+                        }
+
+                        if modeStr != "" {
+                                ch.conn.messages <- msg
+                        } else {
+                                c.messages <- &irc.Message{
+                                        Prefix:  c.srv.prefix(),
+                                        Command: irc.RPL_CHANNELMODEIS,
+                                        Params:  []string{ch.Name, string(ch.modes)},
+                                }
+                        }
+                } else {
+                        if name != c.nick {
+                                return ircError{&irc.Message{
+                                        Command: irc.ERR_USERSDONTMATCH,
+                                        Params:  []string{c.nick, "Cannot change mode for other users"},
+                                }}
+                        }
+
+                        if modeStr != "" {
+                                c.user.forEachUpstream(func(uc *upstreamConn) {
+                                        uc.messages <- msg
+                                })
+                        } else {
+                                c.messages <- &irc.Message{
+                                        Prefix:  c.srv.prefix(),
+                                        Command: irc.RPL_UMODEIS,
+                                        Params:  []string{""}, // TODO
+                                }
+                        }
+                }
         default:
                 c.logger.Printf("unhandled message: %v", msg)

trunk/server.go

@@ -58 +58 @@
         }
         u.lock.Unlock()
+}
+
+func (u *user) getChannel(name string) (*upstreamChannel, error) {
+        var channel *upstreamChannel
+        var err error
+        u.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 {
+                return nil, fmt.Errorf("unknown channel %q", name)
+        }
+        return channel, nil
 }
 

trunk/upstream.go

@@ -15 +15 @@
 type upstreamChannel struct {
         Name      string
+        conn      *upstreamConn
         Topic     string
         TopicWho  string
@@ -127 +128 @@
                                 return err
                         }
-
-                        c.user.forEachDownstream(func(dc *downstreamConn) {
-                                dc.messages <- msg
-                        })
-                }
+                }
+
+                c.user.forEachDownstream(func(dc *downstreamConn) {
+                        dc.messages <- msg
+                })
         case "NOTICE":
                 c.logger.Print(msg)
@@ -183 +184 @@
                                 c.channels[ch] = &upstreamChannel{
                                         Name:    ch,
+                                        conn:    c,
                                         Members: make(map[string]membership),
                                 }