From 370b3d981e659a8f34c7acd69b30525b33b44f80 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Thu, 14 Jan 2021 02:50:11 -0600
Subject: [PATCH] Get Sytest working back to the Archive test

---
 syncapi/streams/stream_pdu.go | 29 +----------------------------
 syncapi/sync/request.go       |  9 +++++++--
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/syncapi/streams/stream_pdu.go b/syncapi/streams/stream_pdu.go
index 6c51a2b7..2fb23f74 100644
--- a/syncapi/streams/stream_pdu.go
+++ b/syncapi/streams/stream_pdu.go
@@ -268,34 +268,7 @@ func (p *PDUStreamProvider) getResponseForCompleteSync(
 		"recentStreamEvents":         fmt.Sprintf("%+v", events),
 	}).Info("getResponseForCompleteSync")
 
-	//recentStreamEvents, limited = p.filterStreamEventsAccordingToHistoryVisibility(recentStreamEvents, stateEvents, device, limited)
-
-	// TODO FIXME: We don't fully implement history visibility yet. To avoid leaking events which the
-	// user shouldn't see, we check the recent events and remove any prior to the join event of the user
-	// which is equiv to history_visibility: joined
-	joinEventIndex := -1
-	for i := len(recentStreamEvents) - 1; i >= 0; i-- {
-		ev := recentStreamEvents[i]
-		if ev.Type() == gomatrixserverlib.MRoomMember && ev.StateKeyEquals(device.UserID) {
-			membership, _ := ev.Membership()
-			if membership == "join" {
-				joinEventIndex = i
-				if i > 0 {
-					// the create event happens before the first join, so we should cut it at that point instead
-					if recentStreamEvents[i-1].Type() == gomatrixserverlib.MRoomCreate && recentStreamEvents[i-1].StateKeyEquals("") {
-						joinEventIndex = i - 1
-						break
-					}
-				}
-				break
-			}
-		}
-	}
-	if joinEventIndex != -1 {
-		// cut all events earlier than the join (but not the join itself)
-		recentStreamEvents = recentStreamEvents[joinEventIndex:]
-		limited = false // so clients know not to try to backpaginate
-	}
+	recentStreamEvents, limited = p.filterStreamEventsAccordingToHistoryVisibility(recentStreamEvents, stateEvents, device, limited)
 
 	// Retrieve the backward topology position, i.e. the position of the
 	// oldest event in the room's topology.
diff --git a/syncapi/sync/request.go b/syncapi/sync/request.go
index 96d0bfa0..88e376e3 100644
--- a/syncapi/sync/request.go
+++ b/syncapi/sync/request.go
@@ -17,6 +17,7 @@ package sync
 import (
 	"encoding/json"
 	"fmt"
+	"math"
 	"net/http"
 	"strconv"
 	"time"
@@ -74,10 +75,14 @@ func newSyncRequest(req *http.Request, device userapi.Device, syncDB storage.Dat
 	if f != nil {
 		filter = *f
 	}
-	limit := filter.Room.Timeline.Limit
-	if limit == 0 {
+	// TODO: Get a better to default these
+	// Ideally, we could merge the default base filter with the parsed one
+	if filter.Room.Timeline.Limit == 0 {
 		filter.Room.Timeline.Limit = defaultTimelineLimit
 	}
+	if filter.Room.State.Limit == 0 {
+		filter.Room.State.Limit = math.MaxInt32
+	}
 	// TODO: Additional query params: set_presence
 
 	logger := util.GetLogger(req.Context()).WithFields(logrus.Fields{