oss/continuwuity
oss/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-10-03 18:50:45 +00:00
Code Wiki Activity

Cleanup/improve other async queries in some client handlers.

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-04-27 00:58:56 +00:00 • committed by Jade Ellis
parent 116f85360f
commit af4f66c768
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
16 changed files with 2977 additions and 2818 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/api/client/room/initial_sync.rs
View file

@ -1,9 +1,9 @@
use axum::extract::State;
use conduwuit::{
Err, Event, Result, at,
utils::{BoolExt, stream::TryTools},
utils::{BoolExt, future::TryExtExt, stream::TryTools},
};
use futures::TryStreamExt;
use futures::{FutureExt, TryStreamExt, future::try_join4};
use ruma::api::client::room::initial_sync::v3::{PaginationChunk, Request, Response};
use crate::Ruma;
@ -25,22 +25,31 @@ pub(crate) async fn room_initial_sync_route(
return Err!(Request(Forbidden("No room preview available.")));
}
let limit = LIMIT_MAX;
let events: Vec<_> = services
let membership = services
.rooms
.timeline
.pdus_rev(None, room_id, None)
.try_take(limit)
.try_collect()
.await?;
.state_cache
.user_membership(body.sender_user(), room_id)
.map(Ok);
let state: Vec<_> = services
let visibility = services.rooms.directory.visibility(room_id).map(Ok);
let state = services
.rooms
.state_accessor
.room_state_full_pdus(room_id)
.map_ok(Event::into_format)
.try_collect()
.await?;
.try_collect::<Vec<_>>();
let limit = LIMIT_MAX;
let events = services
.rooms
.timeline
.pdus_rev(None, room_id, None)
.try_take(limit)
.try_collect::<Vec<_>>();
let (membership, visibility, state, events) =
try_join4(membership, visibility, state, events).await?;
let messages = PaginationChunk {
start: events.last().map(at!(0)).as_ref().map(ToString::to_string),
@ -64,11 +73,7 @@ pub(crate) async fn room_initial_sync_route(
account_data: None,
state: state.into(),
messages: messages.chunk.is_empty().or_some(messages),
visibility: services.rooms.directory.visibility(room_id).await.into(),
membership: services
.rooms
.state_cache
.user_membership(body.sender_user(), room_id)
.await,
visibility: visibility.into(),
membership,
})
}