From b6907f0d85e100105dbafae94bb41facf836998e Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 9 Sep 2020 15:58:41 +0100
Subject: [PATCH] Tweaks

---
 federationsender/consumers/roomserver.go         | 1 -
 roomserver/api/input.go                          | 6 +++---
 roomserver/internal/input/input_latest_events.go | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/federationsender/consumers/roomserver.go b/federationsender/consumers/roomserver.go
index 670cfeda9..9e7472814 100644
--- a/federationsender/consumers/roomserver.go
+++ b/federationsender/consumers/roomserver.go
@@ -110,7 +110,6 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
 // processMessage updates the list of currently joined hosts in the room
 // and then sends the event to the hosts that were joined before the event.
 func (s *OutputRoomEventConsumer) processMessage(ore api.OutputNewRoomEvent) error {
-
 	addsJoinedHosts, err := joinedHostsFromEvents(gomatrixserverlib.UnwrapEventHeaders(ore.AddsState()))
 	if err != nil {
 		return err
diff --git a/roomserver/api/input.go b/roomserver/api/input.go
index de339eabf..651c0e9f8 100644
--- a/roomserver/api/input.go
+++ b/roomserver/api/input.go
@@ -33,9 +33,9 @@ const (
 	// KindBackfill event extend the contiguous graph going backwards.
 	// They always have state.
 	KindBackfill = 3
-	// KindRewrite events are used to rewrite the head of the graph.
-	// They are used in state, forward extremity and membership updates
-	// but are not sent as output events.
+	// KindRewrite events are used when rewriting the head of the room
+	// graph with entirely new state. The output events generated will
+	// be state events rather than timeline events.
 	KindRewrite = 4
 )
 
diff --git a/roomserver/internal/input/input_latest_events.go b/roomserver/internal/input/input_latest_events.go
index 174d2c4dc..ce0f4ebaf 100644
--- a/roomserver/internal/input/input_latest_events.go
+++ b/roomserver/internal/input/input_latest_events.go
@@ -54,7 +54,7 @@ func (r *Inputer) updateLatestEvents(
 	event gomatrixserverlib.Event,
 	sendAsServer string,
 	transactionID *api.TransactionID,
-	sendOutput bool,
+	isHistorical bool,
 ) (err error) {
 	updater, err := r.DB.GetLatestEventsForUpdate(ctx, *roomInfo)
 	if err != nil {
@@ -72,7 +72,7 @@ func (r *Inputer) updateLatestEvents(
 		event:         event,
 		sendAsServer:  sendAsServer,
 		transactionID: transactionID,
-		isHistorical:  sendOutput,
+		isHistorical:  isHistorical,
 	}
 
 	if err = u.doUpdateLatestEvents(); err != nil {