|
|
@ -1197,14 +1197,11 @@ pub async fn sync_events_v4_route(
|
|
|
|
|
|
|
|
|
|
|
|
if globalsince == 0 {
|
|
|
|
if globalsince == 0 {
|
|
|
|
if let Some(conn_id) = &body.conn_id {
|
|
|
|
if let Some(conn_id) = &body.conn_id {
|
|
|
|
services()
|
|
|
|
services().users.forget_sync_request_connection(
|
|
|
|
.users
|
|
|
|
|
|
|
|
.forget_sync_request_connection(
|
|
|
|
|
|
|
|
sender_user.clone(),
|
|
|
|
sender_user.clone(),
|
|
|
|
sender_device.clone(),
|
|
|
|
sender_device.clone(),
|
|
|
|
conn_id.clone(),
|
|
|
|
conn_id.clone(),
|
|
|
|
)
|
|
|
|
)
|
|
|
|
.await
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -1474,17 +1471,14 @@ pub async fn sync_events_v4_route(
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(conn_id) = &body.conn_id {
|
|
|
|
if let Some(conn_id) = &body.conn_id {
|
|
|
|
services()
|
|
|
|
services().users.update_sync_known_rooms(
|
|
|
|
.users
|
|
|
|
|
|
|
|
.update_sync_known_rooms(
|
|
|
|
|
|
|
|
sender_user.clone(),
|
|
|
|
sender_user.clone(),
|
|
|
|
sender_device.clone(),
|
|
|
|
sender_device.clone(),
|
|
|
|
conn_id.clone(),
|
|
|
|
conn_id.clone(),
|
|
|
|
list_id,
|
|
|
|
list_id,
|
|
|
|
new_known_rooms,
|
|
|
|
new_known_rooms,
|
|
|
|
globalsince,
|
|
|
|
globalsince,
|
|
|
|
)
|
|
|
|
);
|
|
|
|
.await;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -1516,29 +1510,23 @@ pub async fn sync_events_v4_route(
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(conn_id) = &body.conn_id {
|
|
|
|
if let Some(conn_id) = &body.conn_id {
|
|
|
|
services()
|
|
|
|
services().users.update_sync_known_rooms(
|
|
|
|
.users
|
|
|
|
|
|
|
|
.update_sync_known_rooms(
|
|
|
|
|
|
|
|
sender_user.clone(),
|
|
|
|
sender_user.clone(),
|
|
|
|
sender_device.clone(),
|
|
|
|
sender_device.clone(),
|
|
|
|
conn_id.clone(),
|
|
|
|
conn_id.clone(),
|
|
|
|
"subscriptions".to_owned(),
|
|
|
|
"subscriptions".to_owned(),
|
|
|
|
known_subscription_rooms,
|
|
|
|
known_subscription_rooms,
|
|
|
|
globalsince,
|
|
|
|
globalsince,
|
|
|
|
)
|
|
|
|
);
|
|
|
|
.await;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(conn_id) = &body.conn_id {
|
|
|
|
if let Some(conn_id) = &body.conn_id {
|
|
|
|
services()
|
|
|
|
services().users.update_sync_subscriptions(
|
|
|
|
.users
|
|
|
|
|
|
|
|
.update_sync_subscriptions(
|
|
|
|
|
|
|
|
sender_user.clone(),
|
|
|
|
sender_user.clone(),
|
|
|
|
sender_device.clone(),
|
|
|
|
sender_device.clone(),
|
|
|
|
conn_id.clone(),
|
|
|
|
conn_id.clone(),
|
|
|
|
body.room_subscriptions,
|
|
|
|
body.room_subscriptions,
|
|
|
|
)
|
|
|
|
);
|
|
|
|
.await;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
let mut rooms = BTreeMap::new();
|
|
|
|
let mut rooms = BTreeMap::new();
|
|
|
|