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

Cancel peeks on join again

Browse source
This commit is contained in:
Neil Alexander 2020-09-04 14:20:00 +01:00
parent 2b8f0b8f59
commit 56d772fafc
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
syncapi/storage/shared/syncserver.go
View file

@ -1129,8 +1129,10 @@ func (d *Database) getStateDeltasForFullStateSync(
} }
// Add full states for all peeking rooms // Add full states for all peeking rooms
peeking := make(map[string]bool)
newPeeks := false newPeeks := false
for _, peek := range peeks { for _, peek := range peeks {
peeking[peek.RoomID] = true
if peek.New { if peek.New {
newPeeks = true newPeeks = true
} }
@ -1192,6 +1194,16 @@ func (d *Database) getStateDeltasForFullStateSync(
if stateErr != nil { if stateErr != nil {
return nil, nil, stateErr return nil, nil, stateErr
} }
if peeking[joinedRoomID] {
// we automatically cancel our peeks when we join a room
if err = d.Writer.Do(d.DB, txn, func(txn *sql.Tx) error {
// XXX: is it correct that we're discarding the streamid here?
_, err = d.Peeks.DeletePeeks(ctx, txn, joinedRoomID, userID)
return err
}); err != nil {
return nil, nil, err
}
}
deltas[joinedRoomID] = stateDelta{ deltas[joinedRoomID] = stateDelta{
membership: gomatrixserverlib.Join, membership: gomatrixserverlib.Join,
stateEvents: d.StreamEventsToEvents(device, s), stateEvents: d.StreamEventsToEvents(device, s),