Changeset 216 in code for trunk/downstream.go

Timestamp:

Apr 3, 2020, 6:48:23 PM (5 years ago)

Author:

contact

Message:

Add time tag to all messages

File:

• trunk/downstream.go (modified) (11 diffs)

trunk/downstream.go

@@ -72 +72 @@
         negociatingCaps bool
         capVersion      int
-        caps            map[string]bool
 
         saslServer sasl.Server
@@ -78 +77 @@
         lock        sync.Mutex
         ourMessages map[*irc.Message]struct{}
+        caps        map[string]bool
 }
 
@@ -86 +86 @@
                 id:            id,
                 ringConsumers: make(map[*network]*RingConsumer),
+                ourMessages:   make(map[*irc.Message]struct{}),
                 caps:          make(map[string]bool),
-                ourMessages:   make(map[*irc.Message]struct{}),
         }
         dc.hostname = netConn.RemoteAddr().String()
@@ -210 +210 @@
 }
 
+func (dc *downstreamConn) getCap(name string) bool {
+        dc.lock.Lock()
+        defer dc.lock.Unlock()
+        return dc.caps[name]
+}
+
 func (dc *downstreamConn) SendMessage(msg *irc.Message) {
-        // TODO: strip tags if the client doesn't support them (see runNetwork)
+        if !dc.getCap("message-tags") {
+                msg = msg.Copy()
+                for name := range msg.Tags {
+                        supported := false
+                        switch name {
+                        case "time":
+                                supported = dc.getCap("server-time")
+                        }
+                        if !supported {
+                                delete(msg.Tags, name)
+                        }
+                }
+        }
+
         dc.conn.SendMessage(msg)
 }
@@ -259 +278 @@
                 }
         case "AUTHENTICATE":
-                if !dc.caps["sasl"] {
+                if !dc.getCap("sasl") {
                         return ircError{&irc.Message{
                                 Command: irc.ERR_SASLFAIL,
@@ -400 +419 @@
         case "LIST":
                 var caps []string
+                dc.lock.Lock()
                 for name := range dc.caps {
                         caps = append(caps, name)
                 }
+                dc.lock.Unlock()
 
                 // TODO: multi-line replies
@@ -420 +441 @@
                 caps := strings.Fields(args[0])
                 ack := true
+                dc.lock.Lock()
                 for _, name := range caps {
                         name = strings.ToLower(name)
@@ -439 +461 @@
                         }
                 }
+                dc.lock.Unlock()
 
                 reply := "NAK"
@@ -664 +687 @@
         }
 
-        // TODO: can't be enabled/disabled on-the-fly
-        msgTagsEnabled := dc.caps["message-tags"]
-        serverTimeEnabled := dc.caps["server-time"]
-        echoMessageEnabled := dc.caps["echo-message"]
-
         consumer, ch := net.ring.NewConsumer(seqPtr)
 
@@ -694 +712 @@
                                 delete(dc.ourMessages, msg)
                                 dc.lock.Unlock()
-                                if ours && !echoMessageEnabled {
+                                if ours && !dc.getCap("echo-message") {
                                         // The message comes from our connection, don't echo it
                                         // back
@@ -708 +726 @@
                                 default:
                                         panic("expected to consume a PRIVMSG message")
-                                }
-
-                                if !msgTagsEnabled {
-                                        for name := range msg.Tags {
-                                                supported := false
-                                                switch name {
-                                                case "time":
-                                                        supported = serverTimeEnabled
-                                                }
-                                                if !supported {
-                                                        delete(msg.Tags, name)
-                                                }
-                                        }
                                 }