backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-18 00:01:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

SSS: fix to-device event deletion

Browse source 
This is the one major fix in SSS: only delete to-device events when the
client confirms receipt of the previous response, not simply on every
request!
This commit is contained in:
Lambda 2025-05-29 20:01:11 +00:00
parent 96a9632438
commit 8e3e1b1f8d
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/api/client_server/sync/msc4186.rs
View file

@ -384,14 +384,6 @@ pub(crate) async fn sync_events_v5_route(
let all_joined_rooms = joined_rooms_data(&sender_user); let all_joined_rooms = joined_rooms_data(&sender_user);
if body.extensions.to_device.enabled.unwrap_or(false) {
services().users.remove_to_device_events(
&sender_user,
&sender_device,
globalsince,
)?;
}
#[allow(clippy::if_then_some_else_none)] #[allow(clippy::if_then_some_else_none)]
let e2ee = if body.extensions.e2ee.enabled == Some(true) { let e2ee = if body.extensions.e2ee.enabled == Some(true) {
Some(sync_events::v5::response::E2EE { Some(sync_events::v5::response::E2EE {
@ -458,6 +450,17 @@ pub(crate) async fn sync_events_v5_route(
); );
let to_device = if body.extensions.to_device.enabled == Some(true) { let to_device = if body.extensions.to_device.enabled == Some(true) {
if let Some(until) =
body.extensions.to_device.since.and_then(|s| s.parse().ok())
{
debug!(until, "Deleting to-device events");
services().users.remove_to_device_events(
&sender_user,
&sender_device,
until,
)?;
}
let events = services() let events = services()
.users .users
.get_to_device_events(&sender_user, &sender_device)?; .get_to_device_events(&sender_user, &sender_device)?;