hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-02 06:12:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cancel any peeks when we join a room

Browse source
This commit is contained in:
Matthew Hodgson 2020-08-31 18:58:10 +03:00
parent f006b37bf0
commit 6c3a896910
5 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
syncapi/sync/notifier.go
View file

@ -248,7 +248,7 @@ func (n *Notifier) wakeupUsers(userIDs []string, peekingDevices []types.PeekingD
if peekingDevices != nil {
for _, peekingDevice := range peekingDevices {
// TODO: don't bother waking up for devices whose users we already woke up
if stream := n.fetchUserDeviceStream(peekingDevice.UserID, peekingDevice.ID, false); stream != nil {
if stream := n.fetchUserDeviceStream(peekingDevice.UserID, peekingDevice.DeviceID, false); stream != nil {
stream.Broadcast(newPos) // wake up all goroutines Wait()ing on this stream
}
}
@ -337,7 +337,7 @@ func (n *Notifier) addPeekingDevice(roomID, userID, deviceID string) {
if _, ok := n.roomIDToPeekingDevices[roomID]; !ok {
n.roomIDToPeekingDevices[roomID] = make(peekingDeviceSet)
}
n.roomIDToPeekingDevices[roomID].add(types.PeekingDevice{deviceID, userID})
n.roomIDToPeekingDevices[roomID].add(types.PeekingDevice{userID, deviceID})
}
// Not thread-safe: must be called on the OnNewEvent goroutine only
@ -346,7 +346,7 @@ func (n *Notifier) removePeekingDevice(roomID, userID, deviceID string) {
n.roomIDToPeekingDevices[roomID] = make(peekingDeviceSet)
}
// XXX: is this going to work as a key?
n.roomIDToPeekingDevices[roomID].remove(types.PeekingDevice{deviceID, userID})
n.roomIDToPeekingDevices[roomID].remove(types.PeekingDevice{userID, deviceID})
}
// Not thread-safe: must be called on the OnNewEvent goroutine only