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

workaround some large type name length issues

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-03-30 22:59:29 +00:00
parent db99d3a001
commit d60920c728
14 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/service/rooms/event_handler/mod.rs
View file

@ -18,11 +18,7 @@ use std::{
};
use async_trait::async_trait;
use conduwuit::{
Err, PduEvent, Result, RoomVersion, Server,
utils::{MutexMap, TryFutureExtExt},
};
use futures::TryFutureExt;
use conduwuit::{Err, PduEvent, Result, RoomVersion, Server, utils::MutexMap};
use ruma::{
OwnedEventId, OwnedRoomId, RoomId, RoomVersionId,
events::room::create::RoomCreateEventContent,
@ -103,13 +99,8 @@ impl Service {
self.services.timeline.pdu_exists(&event_id).await
}
async fn event_fetch(&self, event_id: OwnedEventId) -> Option<Arc<PduEvent>> {
self.services
.timeline
.get_pdu(&event_id)
.map_ok(Arc::new)
.ok()
.await
async fn event_fetch(&self, event_id: OwnedEventId) -> Option<PduEvent> {
self.services.timeline.get_pdu(&event_id).await.ok()
}
}

6
src/service/rooms/event_handler/resolve_state.rs
View file

@ -110,12 +110,14 @@ pub async fn state_resolution<'a, StateSets>(
where
StateSets: Iterator<Item = &'a StateMap<OwnedEventId>> + Clone + Send,
{
let event_fetch = |event_id| self.event_fetch(event_id);
let event_exists = |event_id| self.event_exists(event_id);
state_res::resolve(
room_version,
state_sets,
auth_chain_sets,
&|event_id| self.event_fetch(event_id),
&|event_id| self.event_exists(event_id),
&event_fetch,
&event_exists,
automatic_width(),
)
.map_err(|e| err!(error!("State resolution failed: {e:?}")))