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

Don't use a pointer for device

Browse source
This commit is contained in:
Erik Johnston 2017-12-15 15:06:04 +00:00
parent 28a0522b8c
commit 90a37dc766
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
View file

@ -222,7 +222,7 @@ func (d *SyncServerDatabase) syncStreamPositionTx(
// ID. // ID.
func (d *SyncServerDatabase) IncrementalSync( func (d *SyncServerDatabase) IncrementalSync(
ctx context.Context, ctx context.Context,
device *authtypes.Device, device authtypes.Device,
fromPos, toPos types.StreamPosition, fromPos, toPos types.StreamPosition,
numRecentEventsPerRoom int, numRecentEventsPerRoom int,
) (*types.Response, error) { ) (*types.Response, error) {
@ -237,14 +237,14 @@ func (d *SyncServerDatabase) IncrementalSync(
// joined rooms, but also which rooms have membership transitions for this user between the 2 stream positions. // joined rooms, but also which rooms have membership transitions for this user between the 2 stream positions.
// This works out what the 'state' key should be for each room as well as which membership block // This works out what the 'state' key should be for each room as well as which membership block
// to put the room into. // to put the room into.
deltas, err := d.getStateDeltas(ctx, device, txn, fromPos, toPos, device.UserID) deltas, err := d.getStateDeltas(ctx, &device, txn, fromPos, toPos, device.UserID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
res := types.NewResponse(toPos) res := types.NewResponse(toPos)
for _, delta := range deltas { for _, delta := range deltas {
err = d.addRoomDeltaToResponse(ctx, device, txn, fromPos, toPos, delta, numRecentEventsPerRoom, res) err = d.addRoomDeltaToResponse(ctx, &device, txn, fromPos, toPos, delta, numRecentEventsPerRoom, res)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go
View file

@ -124,7 +124,7 @@ func (rp *RequestPool) currentSyncForUser(req syncRequest, currentPos types.Stre
if req.since == nil { if req.since == nil {
res, err = rp.db.CompleteSync(req.ctx, req.device.UserID, req.limit) res, err = rp.db.CompleteSync(req.ctx, req.device.UserID, req.limit)
} else { } else {
res, err = rp.db.IncrementalSync(req.ctx, &req.device, *req.since, currentPos, req.limit) res, err = rp.db.IncrementalSync(req.ctx, req.device, *req.since, currentPos, req.limit)
} }
if err != nil { if err != nil {