Changeset 185 in code for trunk

Timestamp:

Mar 28, 2020, 4:36:09 PM (5 years ago)

Author:

contact

Message:

Use clientName to decide whether or not history should be sent

Closes: ​https://todo.sr.ht/~emersion/soju/31

File:

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

trunk/downstream.go

@@ -688 +688 @@
         }
 
-        firstDownstream := len(dc.user.downstreamConns) == 0
+        // Only send history if we're the first connected client with that name and
+        // network
+        sendHistory := true
+        dc.user.forEachDownstream(func(conn *downstreamConn) {
+                if dc.clientName == conn.clientName && dc.network == conn.network {
+                        sendHistory = false
+                }
+        })
 
         dc.SendMessage(&irc.Message{
@@ -732 +739 @@
 
         dc.forEachNetwork(func(net *network) {
-                // TODO: need to take dc.network into account when deciding whether or
-                // not to load history
-                dc.runNetwork(net, firstDownstream)
+                dc.runNetwork(net, sendHistory)
         })
 
@@ -749 +754 @@
         }
 
-        historyName := dc.rawUsername
-
         var seqPtr *uint64
         if loadHistory {
                 net.lock.Lock()
-                seq, ok := net.history[historyName]
+                seq, ok := net.history[dc.clientName]
                 net.lock.Unlock()
                 if ok {
@@ -781 +784 @@
                 }
 
+                // TODO: close the consumer from the user goroutine, so we don't need
+                // that net.history lock
                 seq := consumer.Close()
 
                 net.lock.Lock()
-                net.history[historyName] = seq
+                net.history[dc.clientName] = seq
                 net.lock.Unlock()
         }()