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

simplify get_pdu() interface; eliminate unconditional Arc

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-11-29 08:26:27 +00:00
parent 58be22e695
commit 6175e72f1c
16 changed files with 51 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,7 +103,7 @@ pub(crate) async fn get_context_route(
.collect()
.await;
let lazy = once(&(base_token, (*base_event).clone()))
let lazy = once(&(base_token, base_event.clone()))
.chain(events_before.iter())
.chain(events_after.iter())
.stream()

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

@ -137,7 +137,7 @@ pub(crate) async fn report_event_route(
/// check if reporting user is in the reporting room
async fn is_event_report_valid(
services: &Services, event_id: &EventId, room_id: &RoomId, sender_user: &UserId, reason: Option<&String>,
score: Option<ruma::Int>, pdu: &std::sync::Arc<PduEvent>,
score: Option<ruma::Int>, pdu: &PduEvent,
) -> Result<()> {
debug_info!("Checking if report from user {sender_user} for event {event_id} in room {room_id} is valid");

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

@ -18,7 +18,7 @@ pub(crate) async fn get_room_event_route(
event: services
.rooms
.timeline
.get_pdu_owned(&body.event_id)
.get_pdu(&body.event_id)
.map_err(|_| err!(Request(NotFound("Event {} not found.", &body.event_id))))
.and_then(|event| async move {
services

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

@ -181,11 +181,7 @@ async fn procure_room_state(services: &Services, room_id: &RoomId) -> Result<Roo
.room_state_full(room_id)
.await?;
let state_events = state_map
.values()
.map(AsRef::as_ref)
.map(PduEvent::to_state_event)
.collect();
let state_events = state_map.values().map(PduEvent::to_state_event).collect();
Ok(state_events)
}

4
src/api/client/state.rs
View file

@ -1,7 +1,7 @@
use std::sync::Arc;
use axum::extract::State;
use conduit::{err, pdu::PduBuilder, utils::BoolExt, Err, Error, Result};
use conduit::{err, pdu::PduBuilder, utils::BoolExt, Err, Error, PduEvent, Result};
use ruma::{
api::client::{
error::ErrorKind,
@ -97,7 +97,7 @@ pub(crate) async fn get_state_events_route(
.room_state_full(&body.room_id)
.await?
.values()
.map(|pdu| pdu.to_state_event())
.map(PduEvent::to_state_event)
.collect(),
})
}

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

@ -1021,7 +1021,7 @@ async fn load_joined_room(
state: RoomState {
events: state_events
.iter()
.map(|pdu| pdu.to_sync_state_event())
.map(PduEvent::to_sync_state_event)
.collect(),
},
ephemeral: Ephemeral {