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

Fix depth and previous events not being set

Browse source
This commit is contained in:
Brendan Abolivier 2017-07-24 14:48:46 +01:00
parent 8b708d4c41
commit 790a5634f4
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/github.com/matrix-org/dendrite/clientapi/readers/profile.go
View file

@ -299,6 +299,9 @@ func buildMembershipEvents(
return nil, err return nil, err
} }
builder.Depth = queryRes.Depth
builder.PrevEvents = queryRes.LatestEvents
authEvents := gomatrixserverlib.NewAuthEvents(nil) authEvents := gomatrixserverlib.NewAuthEvents(nil)
for i := range queryRes.StateEvents { for i := range queryRes.StateEvents {

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

@ -100,18 +100,6 @@ func (d *SyncServerDatabase) WriteEvent(
} }
streamPos = types.StreamPosition(pos) streamPos = types.StreamPosition(pos)
if len(addStateEvents) == 0 {
// If the event is a m.room.member event, and has unsigned content,
// we need to save it as it is very likely to be a membership update
// (e.g. if a user updates their profile)
if ev.Type() == "m.room.member" && len(ev.Unsigned()) > 0 {
addStateEvents = append(addStateEvents, *ev)
} else if len(removeStateEventIDs) == 0 {
// Nothing to do, the event may have just been a message event.
return nil
}
}
return d.updateRoomState(txn, removeStateEventIDs, addStateEvents, streamPos) return d.updateRoomState(txn, removeStateEventIDs, addStateEvents, streamPos)
}) })
return return