Changeset 17 in code for trunk

Timestamp:

Feb 6, 2020, 5:07:35 PM (5 years ago)

Author:

contact

Message:

Handle MODE messages from upstream servers

File:

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

trunk/upstream.go

@@ -6 +6 @@
         "io"
         "net"
+        "strings"
 
         "gopkg.in/irc.v3"
@@ -15 +16 @@
 )
 
+type modeSet string
+
+func (ms modeSet) Has(c byte) bool {
+        return strings.IndexByte(string(ms), c) >= 0
+}
+
+func (ms *modeSet) Add(c byte) {
+        if !ms.Has(c) {
+                *ms += modeSet(c)
+        }
+}
+
+func (ms *modeSet) Del(c byte) {
+        i := strings.IndexByte(string(*ms), c)
+        if i >= 0 {
+                *ms = (*ms)[:i] + (*ms)[i+1:]
+        }
+}
+
+func (ms *modeSet) Apply(s string) error {
+        var plusMinus byte
+        for i := 0; i < len(s); i++ {
+                switch c := s[i]; c {
+                case '+', '-':
+                        plusMinus = c
+                default:
+                        switch plusMinus {
+                        case '+':
+                                ms.Add(c)
+                        case '-':
+                                ms.Del(c)
+                        default:
+                                return fmt.Errorf("malformed modestring %q: missing plus/minus", s)
+                        }
+                }
+        }
+        return nil
+}
+
 type upstreamConn struct {
         upstream   *Upstream
@@ -21 +61 @@
         srv        *Server
         registered bool
+        modes      modeSet
 
         serverName            string
@@ -36 +77 @@
                         Params:  []string{c.srv.Hostname},
                 })
+        case "MODE":
+                if len(msg.Params) < 2 {
+                        return newNeedMoreParamsError(msg.Command)
+                }
+                if nick := msg.Params[0]; nick != c.upstream.Nick {
+                        return fmt.Errorf("received MODE message for unknow nick %q", nick)
+                }
+                return c.modes.Apply(msg.Params[1])
         case irc.RPL_WELCOME:
                 c.registered = true