WIP: Upgrade Ruma

src/service/rooms/event_handler/mod.rs

@@ -638,8 +638,8 @@ impl Service {
                 .send_federation_request(
                     origin,
                     get_room_state_ids::v1::Request {
-                        room_id,
-                        event_id: &incoming_pdu.event_id,
+                        room_id: room_id.to_owned(),
+                        event_id: (&*incoming_pdu.event_id).to_owned(),
                     },
                 )
                 .await
@@ -1112,7 +1112,9 @@ impl Service {
                         .sending
                         .send_federation_request(
                             origin,
-                            get_event::v1::Request { event_id: &next_id },
+                            get_event::v1::Request {
+                                event_id: next_id.into(),
+                            },
                         )
                         .await
                     {
@@ -1689,7 +1691,7 @@ impl Service {
                 .send_federation_request(
                     server,
                     get_remote_server_keys::v2::Request::new(
-                        origin,
+                        origin.to_owned(),
                         MilliSecondsSinceUnixEpoch::from_system_time(
                             SystemTime::now()
                                 .checked_add(Duration::from_secs(3600))

src/service/sending/mod.rs

@@ -496,7 +496,7 @@ impl Service {
                             )
                         })?,
                     appservice::event::push_events::v1::Request {
-                        events: &pdu_jsons,
+                        events: pdu_jsons,
                         txn_id: (&*base64::encode_config(
                             calculate_hash(
                                 &events
@@ -638,9 +638,9 @@ impl Service {
                 let response = server_server::send_request(
                     server,
                     send_transaction_message::v1::Request {
-                        origin: services().globals.server_name(),
-                        pdus: &pdu_jsons,
-                        edus: &edu_jsons,
+                        origin: services().globals.server_name().to_owned(),
+                        pdus: pdu_jsons,
+                        edus: edu_jsons,
                         origin_server_ts: MilliSecondsSinceUnixEpoch::now(),
                         transaction_id: (&*base64::encode_config(
                             calculate_hash(

src/service/uiaa/mod.rs

@@ -5,7 +5,7 @@ pub use data::Data;
 use ruma::{
     api::client::{
         error::ErrorKind,
-        uiaa::{AuthType, IncomingAuthData, IncomingPassword, IncomingUserIdentifier, UiaaInfo},
+        uiaa::{AuthData, AuthType, Password, UiaaInfo, UserIdentifier},
     },
     CanonicalJsonValue, DeviceId, UserId,
 };
@@ -44,7 +44,7 @@ impl Service {
         &self,
         user_id: &UserId,
         device_id: &DeviceId,
-        auth: &IncomingAuthData,
+        auth: &AuthData,
         uiaainfo: &UiaaInfo,
     ) -> Result<(bool, UiaaInfo)> {
         let mut uiaainfo = auth
@@ -58,13 +58,13 @@ impl Service {
 
         match auth {
             // Find out what the user completed
-            IncomingAuthData::Password(IncomingPassword {
+            AuthData::Password(Password {
                 identifier,
                 password,
                 ..
             }) => {
                 let username = match identifier {
-                    IncomingUserIdentifier::UserIdOrLocalpart(username) => username,
+                    UserIdentifier::UserIdOrLocalpart(username) => username,
                     _ => {
                         return Err(Error::BadRequest(
                             ErrorKind::Unrecognized,
@@ -85,7 +85,7 @@ impl Service {
                         argon2::verify_encoded(&hash, password.as_bytes()).unwrap_or(false);
 
                     if !hash_matches {
-                        uiaainfo.auth_error = Some(ruma::api::client::error::ErrorBody {
+                        uiaainfo.auth_error = Some(ruma::api::client::error::StandardErrorBody {
                             kind: ErrorKind::Forbidden,
                             message: "Invalid username or password.".to_owned(),
                         });
@@ -96,7 +96,7 @@ impl Service {
                 // Password was correct! Let's add it to `completed`
                 uiaainfo.completed.push(AuthType::Password);
             }
-            IncomingAuthData::Dummy(_) => {
+            AuthData::Dummy(_) => {
                 uiaainfo.completed.push(AuthType::Dummy);
             }
             k => error!("type not supported: {:?}", k),

src/service/users/data.rs

@@ -1,6 +1,6 @@
 use crate::Result;
 use ruma::{
-    api::client::{device::Device, filter::IncomingFilterDefinition},
+    api::client::{device::Device, filter::FilterDefinition},
     encryption::{CrossSigningKey, DeviceKeys, OneTimeKey},
     events::AnyToDeviceEvent,
     serde::Raw,
@@ -191,11 +191,7 @@ pub trait Data: Send + Sync {
     ) -> Box<dyn Iterator<Item = Result<Device>> + 'a>;
 
     /// Creates a new sync filter. Returns the filter id.
-    fn create_filter(&self, user_id: &UserId, filter: &IncomingFilterDefinition) -> Result<String>;
+    fn create_filter(&self, user_id: &UserId, filter: &FilterDefinition) -> Result<String>;
 
-    fn get_filter(
-        &self,
-        user_id: &UserId,
-        filter_id: &str,
-    ) -> Result<Option<IncomingFilterDefinition>>;
+    fn get_filter(&self, user_id: &UserId, filter_id: &str) -> Result<Option<FilterDefinition>>;
 }

src/service/users/mod.rs

@@ -3,7 +3,7 @@ use std::{collections::BTreeMap, mem};
 
 pub use data::Data;
 use ruma::{
-    api::client::{device::Device, error::ErrorKind, filter::IncomingFilterDefinition},
+    api::client::{device::Device, error::ErrorKind, filter::FilterDefinition},
     encryption::{CrossSigningKey, DeviceKeys, OneTimeKey},
     events::AnyToDeviceEvent,
     serde::Raw,
@@ -326,11 +326,7 @@ impl Service {
     }
 
     /// Creates a new sync filter. Returns the filter id.
-    pub fn create_filter(
-        &self,
-        user_id: &UserId,
-        filter: &IncomingFilterDefinition,
-    ) -> Result<String> {
+    pub fn create_filter(&self, user_id: &UserId, filter: &FilterDefinition) -> Result<String> {
         self.db.create_filter(user_id, filter)
     }
 
@@ -338,7 +334,7 @@ impl Service {
         &self,
         user_id: &UserId,
         filter_id: &str,
-    ) -> Result<Option<IncomingFilterDefinition>> {
+    ) -> Result<Option<FilterDefinition>> {
         self.db.get_filter(user_id, filter_id)
     }
 }