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

Tweaks

Browse source
This commit is contained in:
Neil Alexander 2021-01-07 17:21:07 +00:00
parent e91d71ebca
commit 0aa91059a9
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
syncapi/consumers/keychange.go
View file

@ -121,8 +121,5 @@ func (s *OutputKeyChangeEventConsumer) onMessage(msg *sarama.ConsumerMessage) er
s.streams.DeviceListStreamProvider.Advance(posUpdate) s.streams.DeviceListStreamProvider.Advance(posUpdate)
//for userID := range queryRes.UserIDsToCount {
// s.notifier.OnNewKeyChange(posUpdate, userID, output.UserID)
//}
return nil return nil
} }

22
syncapi/consumers/roomserver.go
View file

@ -292,9 +292,9 @@ func (s *OutputRoomEventConsumer) onRetireInviteEvent(
}).Panicf("roomserver output log: remove invite failure") }).Panicf("roomserver output log: remove invite failure")
return nil return nil
} }
// Notify any active sync requests that the invite has been retired. // Notify any active sync requests that the invite has been retired.
// Invites share the same stream counter as PDUs // Invites share the same stream counter as PDUs
s.streams.InviteStreamProvider.Advance(pduPos) s.streams.InviteStreamProvider.Advance(pduPos)
return nil return nil
@ -311,12 +311,12 @@ func (s *OutputRoomEventConsumer) onNewPeek(
}).Panicf("roomserver output log: write peek failure") }).Panicf("roomserver output log: write peek failure")
return nil return nil
} }
// tell the notifier about the new peek so it knows to wake up new devices // tell the notifier about the new peek so it knows to wake up new devices
//s.notifier.OnNewPeek(msg.RoomID, msg.UserID, msg.DeviceID) // TODO: This only works because the peeks table is reusing the same
_ = sp // index as PDUs, but we should fix this
// we need to wake up the users who might need to now be peeking into this room, s.streams.PDUStreamProvider.Advance(sp)
// so we send in a dummy event to trigger a wakeup
//s.notifier.OnNewEvent(nil, msg.RoomID, nil, types.StreamingToken{PDUPosition: sp})
return nil return nil
} }
@ -331,12 +331,12 @@ func (s *OutputRoomEventConsumer) onRetirePeek(
}).Panicf("roomserver output log: write peek failure") }).Panicf("roomserver output log: write peek failure")
return nil return nil
} }
// tell the notifier about the new peek so it knows to wake up new devices // tell the notifier about the new peek so it knows to wake up new devices
//s.notifier.OnRetirePeek(msg.RoomID, msg.UserID, msg.DeviceID) // TODO: This only works because the peeks table is reusing the same
_ = sp // index as PDUs, but we should fix this
// we need to wake up the users who might need to now be peeking into this room, s.streams.PDUStreamProvider.Advance(sp)
// so we send in a dummy event to trigger a wakeup
//s.notifier.OnNewEvent(nil, msg.RoomID, nil, types.StreamingToken{PDUPosition: sp})
return nil return nil
} }