cargo fmt

src/api/client_server/sync.rs

@@ -901,10 +901,10 @@ async fn sync_helper(
             .state_full_ids(left_shortstatehash)
             .await?;
 
-        let leave_shortstatekey = services().rooms.short.get_or_create_shortstatekey(
+        let leave_shortstatekey = services()
-            &StateEventType::RoomMember,
+            .rooms
-            &sender_user.as_str(),
+            .short
-        )?;
+            .get_or_create_shortstatekey(&StateEventType::RoomMember, &sender_user.as_str())?;
 
         left_state_ids.insert(leave_shortstatekey, left_event_id);
 

src/api/server_server.rs

@@ -1149,18 +1149,15 @@ pub async fn get_room_state_route(
 
     Ok(get_room_state::v1::Response {
         auth_chain: auth_chain_ids
-            .filter_map(|id| {
+            .filter_map(
-                match services()
+                |id| match services().rooms.timeline.get_pdu_json(&id).ok()? {
-                    .rooms
+                    Some(json) => Some(PduEvent::convert_to_outgoing_federation_event(json)),
-                    .timeline
+                    None => {
-                    .get_pdu_json(&id).ok()? {
+                        error!("Could not find event json for {id} in db.");
-                        Some(json) => Some(PduEvent::convert_to_outgoing_federation_event(json)),
+                        None
-                        None => {
-                            error!("Could not find event json for {id} in db.");
-                            None
-                        }
                     }
-            })
+                },
+            )
             .collect(),
         pdus,
     })