backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix api/client_server/room events

Browse source
This commit is contained in:
Charles Hall 2024-07-15 20:51:15 -07:00
parent 196c923a5a
commit 4b9c6a754c
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/api/client_server/room.rs
View file

@ -442,8 +442,8 @@ pub(crate) async fn create_room_route(
// 6. Events listed in initial_state // 6. Events listed in initial_state
for event in &body.initial_state { for event in &body.initial_state {
let mut pdu_builder = let mut pdu_builder =
event.deserialize_as::<PduBuilder>().map_err(|e| { event.deserialize_as::<PduBuilder>().map_err(|error| {
warn!("Invalid initial state event: {:?}", e); warn!(%error, "Invalid initial state event");
Error::BadRequest( Error::BadRequest(
ErrorKind::InvalidParam, ErrorKind::InvalidParam,
"Invalid initial state event.", "Invalid initial state event.",
@ -524,7 +524,7 @@ pub(crate) async fn create_room_route(
invite_helper(sender_user, user_id, &room_id, None, body.is_direct) invite_helper(sender_user, user_id, &room_id, None, body.is_direct)
.await .await
{ {
warn!(%error, "invite helper failed"); warn!(%error, "Invite helper failed");
}; };
} }
@ -537,7 +537,7 @@ pub(crate) async fn create_room_route(
services().rooms.directory.set_public(&room_id)?; services().rooms.directory.set_public(&room_id)?;
} }
info!("{} created a room", sender_user); info!(user_id = %sender_user, room_id = %room_id, "User created a room");
Ok(Ra(create_room::v3::Response::new(room_id))) Ok(Ra(create_room::v3::Response::new(room_id)))
} }
@ -555,7 +555,7 @@ pub(crate) async fn get_room_event_route(
let event = services().rooms.timeline.get_pdu(&body.event_id)?.ok_or_else( let event = services().rooms.timeline.get_pdu(&body.event_id)?.ok_or_else(
|| { || {
warn!("Event not found, event ID: {:?}", &body.event_id); warn!(event_id = %body.event_id, "Event not found");
Error::BadRequest(ErrorKind::NotFound, "Event not found.") Error::BadRequest(ErrorKind::NotFound, "Event not found.")
}, },
)?; )?;