mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 05:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linting

Browse source
This commit is contained in:
Kegan Dougal 2020-08-03 12:29:20 +01:00
parent afe5b5ebf0
commit e1a7e90919
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
syncapi/sync/requestpool.go
View file

@ -192,8 +192,9 @@ func (rp *RequestPool) OnIncomingKeyChangeRequest(req *http.Request, device *use
} }
} }
func (rp *RequestPool) currentSyncForUser(req syncRequest, latestPos types.StreamingToken) (res *types.Response, err error) { // nolint:gocyclo
res = types.NewResponse() func (rp *RequestPool) currentSyncForUser(req syncRequest, latestPos types.StreamingToken) (*types.Response, error) {
res := types.NewResponse()
since := types.NewStreamToken(0, 0, nil) since := types.NewStreamToken(0, 0, nil)
if req.since != nil { if req.since != nil {
@ -213,21 +214,21 @@ func (rp *RequestPool) currentSyncForUser(req syncRequest, latestPos types.Strea
res, err = rp.db.IncrementalSync(req.ctx, res, req.device, *req.since, latestPos, req.limit, req.wantFullState) res, err = rp.db.IncrementalSync(req.ctx, res, req.device, *req.since, latestPos, req.limit, req.wantFullState)
} }
if err != nil { if err != nil {
return return res, err
} }
accountDataFilter := gomatrixserverlib.DefaultEventFilter() // TODO: use filter provided in req instead accountDataFilter := gomatrixserverlib.DefaultEventFilter() // TODO: use filter provided in req instead
res, err = rp.appendAccountData(res, req.device.UserID, req, latestPos.PDUPosition(), &accountDataFilter) res, err = rp.appendAccountData(res, req.device.UserID, req, latestPos.PDUPosition(), &accountDataFilter)
if err != nil { if err != nil {
return return res, err
} }
res, err = rp.appendDeviceLists(res, req.device.UserID, since, latestPos) res, err = rp.appendDeviceLists(res, req.device.UserID, since, latestPos)
if err != nil { if err != nil {
return return res, err
} }
err = internal.DeviceOTKCounts(req.ctx, rp.keyAPI, req.device.UserID, req.device.ID, res) err = internal.DeviceOTKCounts(req.ctx, rp.keyAPI, req.device.UserID, req.device.ID, res)
if err != nil { if err != nil {
return return res, err
} }
// Before we return the sync response, make sure that we take action on // Before we return the sync response, make sure that we take action on
@ -237,7 +238,7 @@ func (rp *RequestPool) currentSyncForUser(req syncRequest, latestPos types.Strea
// Handle the updates and deletions in the database. // Handle the updates and deletions in the database.
err = rp.db.CleanSendToDeviceUpdates(context.Background(), updates, deletions, since) err = rp.db.CleanSendToDeviceUpdates(context.Background(), updates, deletions, since)
if err != nil { if err != nil {
return return res, err
} }
} }
if len(events) > 0 { if len(events) > 0 {
@ -254,7 +255,7 @@ func (rp *RequestPool) currentSyncForUser(req syncRequest, latestPos types.Strea
} }
} }
return return res, err
} }
func (rp *RequestPool) appendDeviceLists( func (rp *RequestPool) appendDeviceLists(