From fd908498029509f1bd5e6587cb95f5d374859b0c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 27 Sep 2020 00:31:56 +0100
Subject: [PATCH] fix comment

---
 federationsender/internal/perform.go  | 10 +++++-----
 federationsender/storage/interface.go |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/federationsender/internal/perform.go b/federationsender/internal/perform.go
index 211314503..9d7c28fca 100644
--- a/federationsender/internal/perform.go
+++ b/federationsender/internal/perform.go
@@ -391,13 +391,13 @@ func (r *FederationSenderInternalAPI) performOutboundPeekUsingServer(
 	}
 
 	respState := respPeek.ToRespState()
-	// logrus.Warnf("converted respPeek %#v to respState %#v", respPeek, respState)
+	// logrus.Warnf("got respPeek %#v", respPeek)
 	// Send the newly returned state to the roomserver to update our local view.
-	if err = roomserverAPI.SendEventWithState(
+	if err = roomserverAPI.SendEventWithRewrite(
 		ctx, r.rsAPI,
 		&respState,
-		respPeek.LatestEvent.Headered(respPeek.RoomVersion), nil,
-		respPeek.RoomVersion,
+		respPeek.LatestEvent.Headered(respPeek.RoomVersion),
+		nil,
 	); err != nil {
 		return fmt.Errorf("r.producer.SendEventWithState: %w", err)
 	}
@@ -578,4 +578,4 @@ func (r *FederationSenderInternalAPI) PerformBroadcastEDU(
 	}
 
 	return nil
-}
+}
\ No newline at end of file
diff --git a/federationsender/storage/interface.go b/federationsender/storage/interface.go
index 035c0d265..0d38527fb 100644
--- a/federationsender/storage/interface.go
+++ b/federationsender/storage/interface.go
@@ -50,7 +50,7 @@ type Database interface {
 	GetPendingPDUServerNames(ctx context.Context) ([]gomatrixserverlib.ServerName, error)
 	GetPendingEDUServerNames(ctx context.Context) ([]gomatrixserverlib.ServerName, error)
 
-	// XXX: why don't these have contexts passed in?
+	// these don't have contexts passed in as we want things to happen regardless of the request context
 	AddServerToBlacklist(serverName gomatrixserverlib.ServerName) error
 	RemoveServerFromBlacklist(serverName gomatrixserverlib.ServerName) error
 	IsServerBlacklisted(serverName gomatrixserverlib.ServerName) (bool, error)