summaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
authorgirlbossceo <june@girlboss.ceo>2023-07-29 14:30:48 +0000
committergirlbossceo <june@girlboss.ceo>2023-07-29 14:30:48 +0000
commitd7061e69841526f16d33b3c6739ef8c853d777b9 (patch)
tree942da8e6e19f337e563ffa0065fc8ce2a3a990b2 /src/api
parent3494d7759e0c371ce436ed34dcc87bd03a10ca70 (diff)
downloadconduit-d7061e69841526f16d33b3c6739ef8c853d777b9.zip
cargo fmt
Signed-off-by: girlbossceo <june@girlboss.ceo>
Diffstat (limited to 'src/api')
-rw-r--r--src/api/client_server/room.rs11
-rw-r--r--src/api/client_server/state.rs19
-rw-r--r--src/api/server_server.rs6
3 files changed, 20 insertions, 16 deletions
diff --git a/src/api/client_server/room.rs b/src/api/client_server/room.rs
index 7bdccae..5c98028 100644
--- a/src/api/client_server/room.rs
+++ b/src/api/client_server/room.rs
@@ -425,13 +425,10 @@ pub async fn get_room_event_route(
) -> Result<get_room_event::v3::Response> {
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
- let event = services()
- .rooms
- .timeline
- .get_pdu(&body.event_id)?
- .ok_or({
- warn!("Event not found, event ID: {:?}", &body.event_id);
- Error::BadRequest(ErrorKind::NotFound, "Event not found.")})?;
+ let event = services().rooms.timeline.get_pdu(&body.event_id)?.ok_or({
+ warn!("Event not found, event ID: {:?}", &body.event_id);
+ Error::BadRequest(ErrorKind::NotFound, "Event not found.")
+ })?;
if !services().rooms.state_accessor.user_can_see_event(
sender_user,
diff --git a/src/api/client_server/state.rs b/src/api/client_server/state.rs
index 5ea7e99..6a37489 100644
--- a/src/api/client_server/state.rs
+++ b/src/api/client_server/state.rs
@@ -131,10 +131,12 @@ pub async fn get_state_events_for_key_route(
.state_accessor
.room_state_get(&body.room_id, &body.event_type, &body.state_key)?
.ok_or({
- warn!("State event {:?} not found in room {:?}", &body.event_type, &body.room_id);
- Error::BadRequest(ErrorKind::NotFound,
- "State event not found.",
- )})?;
+ warn!(
+ "State event {:?} not found in room {:?}",
+ &body.event_type, &body.room_id
+ );
+ Error::BadRequest(ErrorKind::NotFound, "State event not found.")
+ })?;
Ok(get_state_events_for_key::v3::Response {
content: serde_json::from_str(event.content.get())
@@ -168,9 +170,12 @@ pub async fn get_state_events_for_empty_key_route(
.state_accessor
.room_state_get(&body.room_id, &body.event_type, "")?
.ok_or({
- warn!("State event {:?} not found in room {:?}", &body.event_type, &body.room_id);
- Error::BadRequest(ErrorKind::NotFound,
- "State event not found.",)})?;
+ warn!(
+ "State event {:?} not found in room {:?}",
+ &body.event_type, &body.room_id
+ );
+ Error::BadRequest(ErrorKind::NotFound, "State event not found.")
+ })?;
Ok(get_state_events_for_key::v3::Response {
content: serde_json::from_str(event.content.get())
diff --git a/src/api/server_server.rs b/src/api/server_server.rs
index 95716e7..8c54e92 100644
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
@@ -955,7 +955,8 @@ pub async fn get_event_route(
.get_pdu_json(&body.event_id)?
.ok_or({
warn!("Event not found, event ID: {:?}", &body.event_id);
- Error::BadRequest(ErrorKind::NotFound, "Event not found.")})?;
+ Error::BadRequest(ErrorKind::NotFound, "Event not found.")
+ })?;
let room_id_str = event
.get("room_id")
@@ -1197,7 +1198,8 @@ pub async fn get_event_authorization_route(
.get_pdu_json(&body.event_id)?
.ok_or({
warn!("Event not found, event ID: {:?}", &body.event_id);
- Error::BadRequest(ErrorKind::NotFound, "Event not found.")})?;
+ Error::BadRequest(ErrorKind::NotFound, "Event not found.")
+ })?;
let room_id_str = event
.get("room_id")