Upgrade ruma

src/appservice_server.rs

@@ -1,7 +1,8 @@
 use crate::{utils, Error, Result};
+use bytes::BytesMut;
 use http::header::{HeaderValue, CONTENT_TYPE};
 use log::warn;
-use ruma::api::{IncomingResponse, OutgoingRequest};
+use ruma::api::{IncomingResponse, OutgoingRequest, SendAccessToken};
 use std::{
     convert::{TryFrom, TryInto},
     fmt::Debug,
@@ -20,8 +21,9 @@ where
     let hs_token = registration.get("hs_token").unwrap().as_str().unwrap();
 
     let mut http_request = request
-        .try_into_http_request(&destination, Some(""))
-        .unwrap();
+        .try_into_http_request::<BytesMut>(&destination, SendAccessToken::IfRequired(""))
+        .unwrap()
+        .map(|body| body.freeze());
 
     let mut parts = http_request.uri().clone().into_parts();
     let old_path_and_query = parts.path_and_query.unwrap().as_str().to_owned();

src/database/pusher.rs

@@ -1,4 +1,5 @@
 use crate::{Database, Error, PduEvent, Result};
+use bytes::BytesMut;
 use log::{error, info, warn};
 use ruma::{
     api::{
@@ -7,7 +8,7 @@ use ruma::{
             self,
             v1::{Device, Notification, NotificationCounts, NotificationPriority},
         },
-        IncomingResponse, OutgoingRequest,
+        IncomingResponse, OutgoingRequest, SendAccessToken,
     },
     events::{room::power_levels::PowerLevelsEventContent, EventType},
     push::{Action, PushConditionRoomCtx, PushFormat, Ruleset, Tweak},
@@ -99,11 +100,12 @@ where
     let destination = destination.replace("/_matrix/push/v1/notify", "");
 
     let http_request = request
-        .try_into_http_request(&destination, Some(""))
+        .try_into_http_request::<BytesMut>(&destination, SendAccessToken::IfRequired(""))
         .map_err(|e| {
             warn!("Failed to find destination {}: {}", destination, e);
             Error::BadServerResponse("Invalid destination")
-        })?;
+        })?
+        .map(|body| body.freeze());
 
     let reqwest_request = reqwest::Request::try_from(http_request)
         .expect("all http requests are valid reqwest requests");

src/ruma_wrapper.rs

@@ -316,7 +316,7 @@ where
     fn respond_to(self, _: &'r Request<'_>) -> response::Result<'o> {
         let http_response = self
             .0
-            .try_into_http_response()
+            .try_into_http_response::<Vec<u8>>()
             .map_err(|_| Status::InternalServerError)?;
 
         let mut response = rocket::response::Response::build();

src/server_server.rs

@@ -23,7 +23,7 @@ use ruma::{
             query::{get_profile_information, get_room_information},
             transactions::{edu::Edu, send_transaction_message},
         },
-        IncomingResponse, OutgoingRequest, OutgoingResponse,
+        IncomingResponse, OutgoingRequest, OutgoingResponse, SendAccessToken,
     },
     directory::{IncomingFilter, IncomingRoomNetwork},
     events::{
@@ -141,7 +141,7 @@ where
     };
 
     let mut http_request = request
-        .try_into_http_request(&actual_destination, Some(""))
+        .try_into_http_request::<Vec<u8>>(&actual_destination, SendAccessToken::IfRequired(""))
         .map_err(|e| {
             warn!("Failed to find destination {}: {}", actual_destination, e);
             Error::BadServerResponse("Invalid destination")
@@ -454,7 +454,7 @@ pub fn get_server_keys_route(db: State<'_, Database>) -> Json<String> {
                 valid_until_ts: SystemTime::now() + Duration::from_secs(60 * 2),
             },
         }
-        .try_into_http_response()
+        .try_into_http_response::<Vec<u8>>()
         .unwrap()
         .body(),
     )