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

reorg PduEvent strip tools and callsites

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-03-30 21:19:47 +00:00
parent dc6e9e74d9
commit bee4c6255a
13 changed files with 152 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/client/context.rs
View file

@ -182,7 +182,7 @@ pub(crate) async fn get_context_route(
.await;
Ok(get_context::v3::Response {
event: base_event.map(at!(1)).as_ref().map(PduEvent::to_room_event),
event: base_event.map(at!(1)).map(PduEvent::into_room_event),
start: events_before
.last()
@ -201,13 +201,13 @@ pub(crate) async fn get_context_route(
events_before: events_before
.into_iter()
.map(at!(1))
.map(|pdu| pdu.to_room_event())
.map(PduEvent::into_room_event)
.collect(),
events_after: events_after
.into_iter()
.map(at!(1))
.map(|pdu| pdu.to_room_event())
.map(PduEvent::into_room_event)
.collect(),
state,

2
src/api/client/message.rs
View file

@ -157,7 +157,7 @@ pub(crate) async fn get_message_events_route(
let chunk = events
.into_iter()
.map(at!(1))
.map(|pdu| pdu.to_room_event())
.map(PduEvent::into_room_event)
.collect();
Ok(get_message_events::v3::Response {

2
src/api/client/room/event.rs
View file

@ -40,5 +40,5 @@ pub(crate) async fn get_room_event_route(
event.add_age().ok();
Ok(get_room_event::v3::Response { event: event.to_room_event() })
Ok(get_room_event::v3::Response { event: event.into_room_event() })
}

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

@ -55,7 +55,7 @@ pub(crate) async fn room_initial_sync_route(
chunk: events
.into_iter()
.map(at!(1))
.map(|pdu| pdu.to_room_event())
.map(PduEvent::into_room_event)
.collect(),
};

2
src/api/client/search.rs
View file

@ -143,7 +143,7 @@ async fn category_room_events(
.map(at!(2))
.flatten()
.stream()
.map(|pdu| pdu.to_room_event())
.map(PduEvent::into_room_event)
.map(|result| SearchResult {
rank: None,
result: Some(result),

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

@ -461,7 +461,7 @@ async fn handle_left_room(
events: Vec::new(),
},
state: RoomState {
events: vec![event.to_sync_state_event()],
events: vec![event.into_sync_state_event()],
},
}));
}
@ -546,7 +546,7 @@ async fn handle_left_room(
continue;
}
left_state_events.push(pdu.to_sync_state_event());
left_state_events.push(pdu.into_sync_state_event());
}
}
@ -865,8 +865,8 @@ async fn load_joined_room(
},
state: RoomState {
events: state_events
.iter()
.map(PduEvent::to_sync_state_event)
.into_iter()
.map(PduEvent::into_sync_state_event)
.collect(),
},
ephemeral: Ephemeral { events: edus },

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

@ -6,7 +6,7 @@ use std::{
use axum::extract::State;
use conduwuit::{
Error, PduCount, Result, debug, error, extract_variant,
Error, PduCount, PduEvent, Result, debug, error, extract_variant,
utils::{
BoolExt, IterStream, ReadyExt, TryFutureExtExt,
math::{ruma_from_usize, usize_from_ruma, usize_from_u64_truncated},
@ -634,7 +634,7 @@ pub(crate) async fn sync_events_v4_route(
.state_accessor
.room_state_get(room_id, &state.0, &state.1)
.await
.map(|s| s.to_sync_state_event())
.map(PduEvent::into_sync_state_event)
.ok()
})
.collect()

4
src/api/client/sync/v5.rs
View file

@ -6,7 +6,7 @@ use std::{
use axum::extract::State;
use conduwuit::{
Error, Result, TypeStateKey, debug, error, extract_variant, trace,
Error, PduEvent, Result, TypeStateKey, debug, error, extract_variant, trace,
utils::{
BoolExt, IterStream, ReadyExt, TryFutureExtExt,
math::{ruma_from_usize, usize_from_ruma},
@ -507,7 +507,7 @@ async fn process_rooms(
.state_accessor
.room_state_get(room_id, &state.0, &state.1)
.await
.map(|s| s.to_sync_state_event())
.map(PduEvent::into_sync_state_event)
.ok()
})
.collect()

2
src/api/client/threads.rs
View file

@ -53,7 +53,7 @@ pub(crate) async fn get_threads_route(
chunk: threads
.into_iter()
.map(at!(1))
.map(|pdu| pdu.to_room_event())
.map(PduEvent::into_room_event)
.collect(),
})
}