diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-01-10 12:11:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-10 12:11:44 +0000 |
| commit | 3bd023e74d0bd9a213066f69d3131cf17788426c (patch) | |
| tree | b89f700c6a29f0ca145d25d8a69e3ee5b2961ad5 /syncapi/sync/requestpool.go | |
| parent | 9e489845eb64636821c180bbf07ffe5e0bcf1ed6 (diff) | |
Federation fixes (#845)
* Update gomatrixserverlib to p2p commit 92c0338, other tweaks
* Update gomatrixserverlib to p2p commit e5dcc65
* Rewrite getAuthChain
* Update gomatrixserverlib in go.mod/go.sum
* Correct a couple of package refs for updated gmsl/gomatrix
* Update gomatrixserverlib ref in go.mod/go.sum
* Update getAuthChain comments following @babolivier review
Diffstat (limited to 'syncapi/sync/requestpool.go')
| -rw-r--r-- | syncapi/sync/requestpool.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go index 82505e68..d75f07e6 100644 --- a/syncapi/sync/requestpool.go +++ b/syncapi/sync/requestpool.go @@ -24,6 +24,7 @@ import ( "github.com/matrix-org/dendrite/clientapi/jsonerror" "github.com/matrix-org/dendrite/syncapi/storage" "github.com/matrix-org/dendrite/syncapi/types" + "github.com/matrix-org/gomatrix" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" log "github.com/sirupsen/logrus" @@ -141,14 +142,14 @@ func (rp *RequestPool) currentSyncForUser(req syncRequest, latestPos types.SyncP return } - accountDataFilter := gomatrixserverlib.DefaultFilterPart() // TODO: use filter provided in req instead + accountDataFilter := gomatrix.DefaultFilterPart() // TODO: use filter provided in req instead res, err = rp.appendAccountData(res, req.device.UserID, req, latestPos.PDUPosition, &accountDataFilter) return } func (rp *RequestPool) appendAccountData( data *types.Response, userID string, req syncRequest, currentPos int64, - accountDataFilter *gomatrixserverlib.FilterPart, + accountDataFilter *gomatrix.FilterPart, ) (*types.Response, error) { // TODO: Account data doesn't have a sync position of its own, meaning that // account data might be sent multiple time to the client if multiple account |