magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor account_data.changes_since to stream

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-11-19 03:08:09 +00:00
parent fd4c447a2d
commit 5da42fb859
4 changed files with 39 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/api/client/sync/v3.rs
View file

@ -275,10 +275,9 @@ pub(crate) async fn sync_events_route(
events: services
.account_data
.changes_since(None, &sender_user, since)
.await?
.into_iter()
.filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Global))
.collect(),
.ready_filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Global))
.collect()
.await,
},
device_lists: DeviceLists {
changed: device_list_updates.into_iter().collect(),
@ -1023,10 +1022,9 @@ async fn load_joined_room(
events: services
.account_data
.changes_since(Some(room_id), sender_user, since)
.await?
.into_iter()
.filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Room))
.collect(),
.ready_filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Room))
.collect()
.await,
},
summary: RoomSummary {
heroes,

21
src/api/client/sync/v4.rs
View file

@ -136,10 +136,9 @@ pub(crate) async fn sync_events_v4_route(
account_data.global = services
.account_data
.changes_since(None, sender_user, globalsince)
.await?
.into_iter()
.filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Global))
.collect();
.ready_filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Global))
.collect()
.await;
if let Some(rooms) = body.extensions.account_data.rooms {
for room in rooms {
@ -148,10 +147,9 @@ pub(crate) async fn sync_events_v4_route(
services
.account_data
.changes_since(Some(&room), sender_user, globalsince)
.await?
.into_iter()
.filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Room))
.collect(),
.ready_filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Room))
.collect()
.await,
);
}
}
@ -487,10 +485,9 @@ pub(crate) async fn sync_events_v4_route(
services
.account_data
.changes_since(Some(room_id), sender_user, *roomsince)
.await?
.into_iter()
.filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Room))
.collect(),
.ready_filter_map(|e| extract_variant!(e, AnyRawAccountDataEvent::Room))
.collect()
.await,
);
let vector: Vec<_> = services