From b1fd943ad6f73d6c4650cc4efbe8014894c28300 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Sat, 28 Mar 2020 17:36:09 +0100
Subject: [PATCH] Use clientName to decide whether or not history should be
 sent

Closes: https://todo.sr.ht/~emersion/soju/31
---
 downstream.go | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/downstream.go b/downstream.go
index 4076c21..5796277 100644
--- a/downstream.go
+++ b/downstream.go
@@ -687,7 +687,14 @@ func (dc *downstreamConn) welcome() error {
 		return err
 	}
 
-	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{
 		Prefix:  dc.srv.prefix(),
@@ -731,9 +738,7 @@ func (dc *downstreamConn) welcome() error {
 	})
 
 	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)
 	})
 
 	return nil
@@ -748,12 +753,10 @@ func (dc *downstreamConn) runNetwork(net *network, loadHistory bool) {
 		panic("network not suitable for downstream connection")
 	}
 
-	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 {
 			seqPtr = &seq
@@ -780,10 +783,12 @@ func (dc *downstreamConn) runNetwork(net *network, loadHistory bool) {
 			}
 		}
 
+		// 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()
 	}()
 }