Update to new Ruma version

Cargo.toml

@@ -17,7 +17,7 @@ edition = "2018"
 rocket = { git = "https://github.com/SergioBenitez/Rocket.git", rev = "801e04bd5369eb39e126c75f6d11e1e9597304d8", features = ["tls"] } # Used to handle requests
 
 # Used for matrix spec type definitions and helpers
-ruma = { git = "https://github.com/ruma/ruma", rev = "174555857ef90d49e4b9a672be9e2fe0acdc2687", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
+ruma = { git = "https://github.com/ruma/ruma", rev = "4985b9bddbf970a4d4b7b394af1164c54e1008cc", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
 #ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
 
 # Used for long polling and federation sender, should be the same as rocket::tokio

src/client_server/account.rs

@@ -269,6 +269,7 @@ pub async fn register_route(
                     avatar_url: None,
                     is_direct: None,
                     third_party_invite: None,
+                    blurhash: None,
                 })
                 .expect("event is valid, we just created it"),
                 unsigned: None,
@@ -426,6 +427,7 @@ pub async fn register_route(
                     avatar_url: None,
                     is_direct: None,
                     third_party_invite: None,
+                    blurhash: None,
                 })
                 .expect("event is valid, we just created it"),
                 unsigned: None,
@@ -445,6 +447,7 @@ pub async fn register_route(
                     avatar_url: None,
                     is_direct: None,
                     third_party_invite: None,
+                    blurhash: None,
                 })
                 .expect("event is valid, we just created it"),
                 unsigned: None,
@@ -557,7 +560,7 @@ pub async fn change_password_route(
 
     db.flush().await?;
 
-    Ok(change_password::Response.into())
+    Ok(change_password::Response {}.into())
 }
 
 /// # `GET _matrix/client/r0/account/whoami`
@@ -645,6 +648,7 @@ pub async fn deactivate_route(
             avatar_url: None,
             is_direct: None,
             third_party_invite: None,
+            blurhash: None,
         };
 
         db.rooms.build_and_append_pdu(

src/client_server/backup.rs

@@ -49,7 +49,7 @@ pub async fn update_backup_route(
 
     db.flush().await?;
 
-    Ok(update_backup::Response.into())
+    Ok(update_backup::Response {}.into())
 }
 
 #[cfg_attr(
@@ -122,7 +122,7 @@ pub async fn delete_backup_route(
 
     db.flush().await?;
 
-    Ok(delete_backup::Response.into())
+    Ok(delete_backup::Response {}.into())
 }
 
 /// Add the received backup keys to the database.

src/client_server/config.rs

@@ -48,7 +48,7 @@ pub async fn set_global_account_data_route(
 
     db.flush().await?;
 
-    Ok(set_global_account_data::Response.into())
+    Ok(set_global_account_data::Response {}.into())
 }
 
 #[cfg_attr(
@@ -83,7 +83,7 @@ pub async fn set_room_account_data_route(
 
     db.flush().await?;
 
-    Ok(set_room_account_data::Response.into())
+    Ok(set_room_account_data::Response {}.into())
 }
 
 #[cfg_attr(

src/client_server/device.rs

@@ -76,7 +76,7 @@ pub async fn update_device_route(
 
     db.flush().await?;
 
-    Ok(update_device::Response.into())
+    Ok(update_device::Response {}.into())
 }
 
 #[cfg_attr(
@@ -130,7 +130,7 @@ pub async fn delete_device_route(
 
     db.flush().await?;
 
-    Ok(delete_device::Response.into())
+    Ok(delete_device::Response {}.into())
 }
 
 #[cfg_attr(
@@ -186,5 +186,5 @@ pub async fn delete_devices_route(
 
     db.flush().await?;
 
-    Ok(delete_devices::Response.into())
+    Ok(delete_devices::Response {}.into())
 }

src/client_server/directory.rs

@@ -105,7 +105,7 @@ pub async fn set_room_visibility_route(
 
     db.flush().await?;
 
-    Ok(set_room_visibility::Response.into())
+    Ok(set_room_visibility::Response {}.into())
 }
 
 #[cfg_attr(

src/client_server/keys.rs

@@ -168,7 +168,7 @@ pub async fn upload_signing_keys_route(
 
     db.flush().await?;
 
-    Ok(upload_signing_keys::Response.into())
+    Ok(upload_signing_keys::Response {}.into())
 }
 
 #[cfg_attr(
@@ -229,7 +229,7 @@ pub async fn upload_signatures_route(
 
     db.flush().await?;
 
-    Ok(upload_signatures::Response.into())
+    Ok(upload_signatures::Response {}.into())
 }
 
 #[cfg_attr(

src/client_server/membership.rs

@@ -161,7 +161,7 @@ pub async fn invite_user_route(
     if let invite_user::IncomingInvitationRecipient::UserId { user_id } = &body.recipient {
         invite_helper(sender_user, user_id, &body.room_id, &db, false).await?;
         db.flush().await?;
-        Ok(invite_user::Response.into())
+        Ok(invite_user::Response {}.into())
     } else {
         Err(Error::BadRequest(ErrorKind::NotFound, "User not found."))
     }
@@ -244,6 +244,7 @@ pub async fn ban_user_route(
                 avatar_url: db.users.avatar_url(&body.user_id)?,
                 is_direct: None,
                 third_party_invite: None,
+                blurhash: None,
             }),
             |event| {
                 let mut event = serde_json::from_value::<Raw<member::MemberEventContent>>(
@@ -503,6 +504,7 @@ async fn join_room_by_id_helper(
                 avatar_url: db.users.avatar_url(&sender_user)?,
                 is_direct: None,
                 third_party_invite: None,
+                blurhash: None,
             })
             .expect("event is valid, we just created it"),
         );
@@ -639,6 +641,7 @@ async fn join_room_by_id_helper(
             avatar_url: db.users.avatar_url(&sender_user)?,
             is_direct: None,
             third_party_invite: None,
+            blurhash: None,
         };
 
         db.rooms.build_and_append_pdu(
@@ -774,6 +777,7 @@ pub async fn invite_helper(
             is_direct: Some(is_direct),
             membership: MembershipState::Invite,
             third_party_invite: None,
+            blurhash: None,
         })
         .expect("member event is valid value");
 
@@ -940,6 +944,7 @@ pub async fn invite_helper(
                 avatar_url: db.users.avatar_url(&user_id)?,
                 is_direct: Some(is_direct),
                 third_party_invite: None,
+                blurhash: None,
             })
             .expect("event is valid, we just created it"),
             unsigned: None,

src/client_server/mod.rs

@@ -77,5 +77,5 @@ pub const SESSION_ID_LENGTH: usize = 256;
 #[options("/<_..>")]
 #[tracing::instrument]
 pub async fn options_route() -> ConduitResult<send_event_to_device::Response> {
-    Ok(send_event_to_device::Response.into())
+    Ok(send_event_to_device::Response {}.into())
 }

src/client_server/presence.rs

@@ -44,7 +44,7 @@ pub async fn set_presence_route(
 
     db.flush().await?;
 
-    Ok(set_presence::Response.into())
+    Ok(set_presence::Response {}.into())
 }
 
 #[cfg_attr(

src/client_server/profile.rs

@@ -99,7 +99,7 @@ pub async fn set_displayname_route(
 
     db.flush().await?;
 
-    Ok(set_display_name::Response.into())
+    Ok(set_display_name::Response {}.into())
 }
 
 #[cfg_attr(
@@ -201,7 +201,7 @@ pub async fn set_avatar_url_route(
 
     db.flush().await?;
 
-    Ok(set_avatar_url::Response.into())
+    Ok(set_avatar_url::Response {}.into())
 }
 
 #[cfg_attr(

src/client_server/push.rs

@@ -197,7 +197,7 @@ pub async fn set_pushrule_route(
 
     db.flush().await?;
 
-    Ok(set_pushrule::Response.into())
+    Ok(set_pushrule::Response {}.into())
 }
 
 #[cfg_attr(
@@ -330,7 +330,7 @@ pub async fn set_pushrule_actions_route(
 
     db.flush().await?;
 
-    Ok(set_pushrule_actions::Response.into())
+    Ok(set_pushrule_actions::Response {}.into())
 }
 
 #[cfg_attr(
@@ -470,7 +470,7 @@ pub async fn set_pushrule_enabled_route(
 
     db.flush().await?;
 
-    Ok(set_pushrule_enabled::Response.into())
+    Ok(set_pushrule_enabled::Response {}.into())
 }
 
 #[cfg_attr(
@@ -539,7 +539,7 @@ pub async fn delete_pushrule_route(
 
     db.flush().await?;
 
-    Ok(delete_pushrule::Response.into())
+    Ok(delete_pushrule::Response {}.into())
 }
 
 #[cfg_attr(

src/client_server/read_marker.rs

@@ -78,7 +78,7 @@ pub async fn set_read_marker_route(
 
     db.flush().await?;
 
-    Ok(set_read_marker::Response.into())
+    Ok(set_read_marker::Response {}.into())
 }
 
 #[cfg_attr(
@@ -131,5 +131,5 @@ pub async fn create_receipt_route(
 
     db.flush().await?;
 
-    Ok(create_receipt::Response.into())
+    Ok(create_receipt::Response {}.into())
 }

src/client_server/room.rs

@@ -79,6 +79,7 @@ pub async fn create_room_route(
                 avatar_url: db.users.avatar_url(&sender_user)?,
                 is_direct: Some(body.is_direct),
                 third_party_invite: None,
+                blurhash: None,
             })
             .expect("event is valid, we just created it"),
             unsigned: None,
@@ -407,6 +408,7 @@ pub async fn upgrade_room_route(
                 avatar_url: db.users.avatar_url(&sender_user)?,
                 is_direct: None,
                 third_party_invite: None,
+                blurhash: None,
             })
             .expect("event is valid, we just created it"),
             unsigned: None,

src/client_server/tag.rs

@@ -43,7 +43,7 @@ pub async fn update_tag_route(
 
     db.flush().await?;
 
-    Ok(create_tag::Response.into())
+    Ok(create_tag::Response {}.into())
 }
 
 #[cfg_attr(
@@ -77,7 +77,7 @@ pub async fn delete_tag_route(
 
     db.flush().await?;
 
-    Ok(delete_tag::Response.into())
+    Ok(delete_tag::Response {}.into())
 }
 
 #[cfg_attr(

src/client_server/to_device.rs

@@ -28,7 +28,7 @@ pub async fn send_event_to_device_route(
         .existing_txnid(sender_user, sender_device, &body.txn_id)?
         .is_some()
     {
-        return Ok(send_event_to_device::Response.into());
+        return Ok(send_event_to_device::Response {}.into());
     }
 
     for (target_user_id, map) in &body.messages {
@@ -69,5 +69,5 @@ pub async fn send_event_to_device_route(
 
     db.flush().await?;
 
-    Ok(send_event_to_device::Response.into())
+    Ok(send_event_to_device::Response {}.into())
 }

src/client_server/typing.rs

@@ -32,5 +32,5 @@ pub fn create_typing_event_route(
             .typing_remove(&sender_user, &body.room_id, &db.globals)?;
     }
 
-    Ok(create_typing_event::Response.into())
+    Ok(create_typing_event::Response {}.into())
 }

src/server_server.rs

@@ -1972,6 +1972,7 @@ pub fn create_join_event_template_route(
         is_direct: None,
         membership: MembershipState::Join,
         third_party_invite: None,
+        blurhash: None,
     })
     .expect("member event is valid value");