chore: bump ruma and axum

src/api/appservice_server.rs

@@ -1,4 +1,4 @@
-use crate::{services, utils, Error, Result, MATRIX_VERSIONS};
+use crate::{services, utils, Error, Result, SUPPORTED_VERSIONS};
 use bytes::BytesMut;
 use ruma::api::{appservice::Registration, IncomingResponse, OutgoingRequest, SendAccessToken};
 use std::{fmt::Debug, mem, time::Duration};
@@ -28,7 +28,7 @@ where
         .try_into_http_request::<BytesMut>(
             &destination,
             SendAccessToken::IfRequired(hs_token),
-            MATRIX_VERSIONS,
+            &SUPPORTED_VERSIONS,
         )
         .unwrap()
         .map(|body| body.freeze());

src/api/client_server/capabilities.rs

@@ -1,6 +1,7 @@
 use crate::{services, Result, Ruma};
 use ruma::api::client::discovery::get_capabilities::{
-    self, Capabilities, RoomVersionStability, RoomVersionsCapability,
+    self,
+    v3::{Capabilities, RoomVersionStability, RoomVersionsCapability},
 };
 use std::collections::BTreeMap;
 

src/api/client_server/sync.rs

@@ -1779,16 +1779,7 @@ pub async fn sync_events_v5_route(
                 ),
                 num_live: None, // Count events in timeline greater than global sync counter
                 bump_stamp,
-                heroes: if body
-                    .room_subscriptions
-                    .get(room_id)
-                    .map(|sub| sub.include_heroes.unwrap_or_default())
-                    .unwrap_or_default()
-                {
-                    Some(heroes)
-                } else {
-                    None
-                },
+                heroes: Some(heroes),
             },
         );
     }

src/api/ruma_wrapper/axum.rs

@@ -1,7 +1,6 @@
 use std::{collections::BTreeMap, iter::FromIterator, str};
 
 use axum::{
-    async_trait,
     body::Body,
     extract::{FromRequest, Path},
     response::{IntoResponse, Response},
@@ -34,10 +33,10 @@ enum Token {
     None,
 }
 
-#[async_trait]
 impl<T, S> FromRequest<S> for Ruma<T>
 where
     T: IncomingRequest,
+    S: Sync,
 {
     type Rejection = Error;
 
@@ -65,7 +64,13 @@ where
         };
 
         let metadata = T::METADATA;
-        let auth_header: Option<TypedHeader<Authorization<Bearer>>> = parts.extract().await?;
+        let auth_header: Option<TypedHeader<Authorization<Bearer>>> =
+            // If X-Matrix signatures are used, it causes this extraction to fail with an error
+            if metadata.authentication != AuthScheme::ServerSignatures {
+                parts.extract().await?
+            } else {
+                None
+            };
         let path_params: Path<Vec<String>> = parts.extract().await?;
 
         let query = parts.uri.query().unwrap_or_default();

src/api/server_server.rs

@@ -7,7 +7,7 @@ use crate::{
         media::FileMeta,
         pdu::{gen_event_id_canonical_json, PduBuilder},
     },
-    services, utils, Error, PduEvent, Result, Ruma, MATRIX_VERSIONS,
+    services, utils, Error, PduEvent, Result, Ruma, SUPPORTED_VERSIONS,
 };
 use axum::{response::IntoResponse, Json};
 use axum_extra::headers::{CacheControl, Header};
@@ -214,7 +214,7 @@ where
         .try_into_http_request::<Vec<u8>>(
             &actual_destination_str,
             SendAccessToken::IfRequired(""),
-            MATRIX_VERSIONS,
+            &SUPPORTED_VERSIONS,
         )
         .map_err(|e| {
             warn!(