From e28332a5aac9ca6dec667d2d18de257423b24889 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Wed, 17 Nov 2021 12:33:30 +0100
Subject: [PATCH] Add context arg to downstreamConn.welcome()

---
 downstream.go | 16 ++++++++--------
 user.go       |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/downstream.go b/downstream.go
index 6be292e..b04c693 100644
--- a/downstream.go
+++ b/downstream.go
@@ -1126,7 +1126,7 @@ func (dc *downstreamConn) register(ctx context.Context) error {
 	return nil
 }
 
-func (dc *downstreamConn) loadNetwork() error {
+func (dc *downstreamConn) loadNetwork(ctx context.Context) error {
 	if dc.networkName == "" {
 		return nil
 	}
@@ -1139,7 +1139,7 @@ func (dc *downstreamConn) loadNetwork() error {
 		}
 
 		dc.logger.Printf("trying to connect to new network %q", addr)
-		if err := sanityCheckServer(context.TODO(), addr); err != nil {
+		if err := sanityCheckServer(ctx, addr); err != nil {
 			dc.logger.Printf("failed to connect to %q: %v", addr, err)
 			return ircError{&irc.Message{
 				Command: irc.ERR_PASSWDMISMATCH,
@@ -1154,7 +1154,7 @@ func (dc *downstreamConn) loadNetwork() error {
 
 		dc.logger.Printf("auto-saving network %q", dc.networkName)
 		var err error
-		network, err = dc.user.createNetwork(context.TODO(), &Network{
+		network, err = dc.user.createNetwork(ctx, &Network{
 			Addr:    dc.networkName,
 			Nick:    nick,
 			Enabled: true,
@@ -1168,7 +1168,7 @@ func (dc *downstreamConn) loadNetwork() error {
 	return nil
 }
 
-func (dc *downstreamConn) welcome() error {
+func (dc *downstreamConn) welcome(ctx context.Context) error {
 	if dc.user == nil || !dc.registered {
 		panic("tried to welcome an unregistered connection")
 	}
@@ -1176,7 +1176,7 @@ func (dc *downstreamConn) welcome() error {
 	// TODO: doing this might take some time. We should do it in dc.register
 	// instead, but we'll potentially be adding a new network and this must be
 	// done in the user goroutine.
-	if err := dc.loadNetwork(); err != nil {
+	if err := dc.loadNetwork(ctx); err != nil {
 		return err
 	}
 
@@ -1322,7 +1322,7 @@ func (dc *downstreamConn) welcome() error {
 					return
 				}
 
-				dc.sendTargetBacklog(net, target, lastDelivered)
+				dc.sendTargetBacklog(ctx, net, target, lastDelivered)
 
 				// Fast-forward history to last message
 				targetCM := net.casemap(target)
@@ -1352,14 +1352,14 @@ func (dc *downstreamConn) messageSupportsBacklog(msg *irc.Message) bool {
 	return false
 }
 
-func (dc *downstreamConn) sendTargetBacklog(net *network, target, msgID string) {
+func (dc *downstreamConn) sendTargetBacklog(ctx context.Context, net *network, target, msgID string) {
 	if dc.caps["draft/chathistory"] || dc.user.msgStore == nil {
 		return
 	}
 
 	ch := net.channels.Value(target)
 
-	ctx, cancel := context.WithTimeout(context.TODO(), backlogTimeout)
+	ctx, cancel := context.WithTimeout(ctx, backlogTimeout)
 	defer cancel()
 
 	targetCM := net.casemap(target)
diff --git a/user.go b/user.go
index 52ea32c..3422300 100644
--- a/user.go
+++ b/user.go
@@ -314,7 +314,7 @@ func (net *network) attach(ch *Channel) {
 		}
 
 		if detachedMsgID != "" {
-			dc.sendTargetBacklog(net, ch.Name, detachedMsgID)
+			dc.sendTargetBacklog(context.TODO(), net, ch.Name, detachedMsgID)
 		}
 	})
 }
@@ -597,7 +597,7 @@ func (u *user) run() {
 				dc.monitored.SetCasemapping(dc.network.casemap)
 			}
 
-			if err := dc.welcome(); err != nil {
+			if err := dc.welcome(context.TODO()); err != nil {
 				dc.logger.Printf("failed to handle new registered connection: %v", err)
 				break
 			}