hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-06 03:53:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get Sytest working back to the Archive test

Browse source
This commit is contained in:
Eric Eastwood 2021-01-14 02:50:11 -06:00
parent 76e1faeaf8
commit 370b3d981e
2 changed files with 8 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
syncapi/streams/stream_pdu.go
View file

@ -268,34 +268,7 @@ func (p *PDUStreamProvider) getResponseForCompleteSync(
"recentStreamEvents": fmt.Sprintf("%+v", events), "recentStreamEvents": fmt.Sprintf("%+v", events),
}).Info("getResponseForCompleteSync") }).Info("getResponseForCompleteSync")
//recentStreamEvents, limited = p.filterStreamEventsAccordingToHistoryVisibility(recentStreamEvents, stateEvents, device, limited) 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
}
// Retrieve the backward topology position, i.e. the position of the // Retrieve the backward topology position, i.e. the position of the
// oldest event in the room's topology. // oldest event in the room's topology.

9
syncapi/sync/request.go
View file

@ -17,6 +17,7 @@ package sync
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"math"
"net/http" "net/http"
"strconv" "strconv"
"time" "time"
@ -74,10 +75,14 @@ func newSyncRequest(req *http.Request, device userapi.Device, syncDB storage.Dat
if f != nil { if f != nil {
filter = *f filter = *f
} }
limit := filter.Room.Timeline.Limit // TODO: Get a better to default these
if limit == 0 { // Ideally, we could merge the default base filter with the parsed one
if filter.Room.Timeline.Limit == 0 {
filter.Room.Timeline.Limit = defaultTimelineLimit filter.Room.Timeline.Limit = defaultTimelineLimit
} }
if filter.Room.State.Limit == 0 {
filter.Room.State.Limit = math.MaxInt32
}
// TODO: Additional query params: set_presence // TODO: Additional query params: set_presence
logger := util.GetLogger(req.Context()).WithFields(logrus.Fields{ logger := util.GetLogger(req.Context()).WithFields(logrus.Fields{