diff --git a/Cargo.toml b/Cargo.toml
index 9e23c3648b781173fc9a29406196b32420d8b25b..8b29be8f393d7d0b542053e2eac3d0e4fc311255 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ state-res = { git = "https://github.com/timokoesters/state-res", branch = "spec-
# Used for long polling
tokio = "0.2.22"
# Used for storing data permanently
-sled = "0.34.4"
+sled = { version = "0.34.4", default-features = false }
# Used for emitting log entries
log = "0.4.11"
# Used for rocket<->ruma conversions
diff --git a/src/client_server/account.rs b/src/client_server/account.rs
index 09d9f18469bb4423da67d23542fa80443e778311..fad59c37c2638243288ae400603c69bf92437c94 100644
--- a/src/client_server/account.rs
+++ b/src/client_server/account.rs
@@ -14,8 +14,14 @@
},
},
events::{
- room::canonical_alias, room::guest_access, room::history_visibility, room::join_rules,
- room::member, room::name, room::topic, EventType,
+ room::canonical_alias,
+ room::guest_access,
+ room::history_visibility,
+ room::join_rules,
+ room::member,
+ room::name,
+ room::{message, topic},
+ EventType,
},
RoomAliasId, RoomId, RoomVersionId, UserId,
};
@@ -36,7 +42,7 @@
feature = "conduit_bin",
get("/_matrix/client/r0/register/available", data = "<body>")
)]
-pub fn get_register_available_route(
+pub async fn get_register_available_route(
db: State<'_, Database>,
body: Ruma<get_username_availability::Request<'_>>,
) -> ConduitResult<get_username_availability::Response> {
@@ -464,8 +470,36 @@ pub async fn register_route(
&db.sending,
&db.account_data,
)?;
+
+ // Send welcome message
+ db.rooms.build_and_append_pdu(
+ PduBuilder {
+ event_type: EventType::RoomMessage,
+ content: serde_json::to_value(message::MessageEventContent::Text(
+ message::TextMessageEventContent {
+ body: "Thanks for trying out Conduit! This software is still in development, so expect many bugs and missing features. If you have federation enabled, you can join the Conduit chat room by typing `/join #conduit:matrix.org`. **Important: Please don't join any other Matrix rooms over federation without permission from the room's admins.** Some actions might trigger bugs in other server implementations, breaking the chat for everyone else.".to_owned(),
+ formatted: Some(message::FormattedBody {
+ format: message::MessageFormat::Html,
+ body: "Thanks for trying out Conduit! This software is still in development, so expect many bugs and missing features. If you have federation enabled, you can join the Conduit chat room by typing <code>/join #conduit:matrix.org</code>. <strong>Important: Please don't join any other Matrix rooms over federation without permission from the room's admins.</strong> Some actions might trigger bugs in other server implementations, breaking the chat for everyone else.".to_owned(),
+ }),
+ relates_to: None,
+ },
+ ))
+ .expect("event is valid, we just created it"),
+ unsigned: None,
+ state_key: None,
+ redacts: None,
+ },
+ &conduit_user,
+ &room_id,
+ &db.globals,
+ &db.sending,
+ &db.account_data,
+ )?;
}
+ db.flush().await?;
+
Ok(register::Response {
access_token: Some(token),
user_id,
@@ -485,7 +519,7 @@ pub async fn register_route(
feature = "conduit_bin",
post("/_matrix/client/r0/account/password", data = "<body>")
)]
-pub fn change_password_route(
+pub async fn change_password_route(
db: State<'_, Database>,
body: Ruma<change_password::Request<'_>>,
) -> ConduitResult<change_password::Response> {
@@ -535,6 +569,8 @@ pub fn change_password_route(
db.users.remove_device(&sender_user, &id)?;
}
+ db.flush().await?;
+
Ok(change_password::Response.into())
}
@@ -547,7 +583,7 @@ pub fn change_password_route(
feature = "conduit_bin",
get("/_matrix/client/r0/account/whoami", data = "<body>")
)]
-pub fn whoami_route(body: Ruma<whoami::Request>) -> ConduitResult<whoami::Response> {
+pub async fn whoami_route(body: Ruma<whoami::Request>) -> ConduitResult<whoami::Response> {
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
Ok(whoami::Response {
user_id: sender_user.clone(),
@@ -637,6 +673,8 @@ pub async fn deactivate_route(
// Remove devices and mark account as deactivated
db.users.deactivate_account(&sender_user)?;
+ db.flush().await?;
+
Ok(deactivate::Response {
id_server_unbind_result: ThirdPartyIdRemovalStatus::NoSupport,
}
diff --git a/src/client_server/alias.rs b/src/client_server/alias.rs
index c2c3eb9c5d16dcba6bf342f780f1c49d83a5343e..094e70a2fc54ce95e72c1c285abb8121f94df83d 100644
--- a/src/client_server/alias.rs
+++ b/src/client_server/alias.rs
@@ -18,7 +18,7 @@
feature = "conduit_bin",
put("/_matrix/client/r0/directory/room/<_>", data = "<body>")
)]
-pub fn create_alias_route(
+pub async fn create_alias_route(
db: State<'_, Database>,
body: Ruma<create_alias::Request<'_>>,
) -> ConduitResult<create_alias::Response> {
@@ -29,6 +29,8 @@ pub fn create_alias_route(
db.rooms
.set_alias(&body.room_alias, Some(&body.room_id), &db.globals)?;
+ db.flush().await?;
+
Ok(create_alias::Response::new().into())
}
@@ -36,12 +38,14 @@ pub fn create_alias_route(
feature = "conduit_bin",
delete("/_matrix/client/r0/directory/room/<_>", data = "<body>")
)]
-pub fn delete_alias_route(
+pub async fn delete_alias_route(
db: State<'_, Database>,
body: Ruma<delete_alias::Request<'_>>,
) -> ConduitResult<delete_alias::Response> {
db.rooms.set_alias(&body.room_alias, None, &db.globals)?;
+ db.flush().await?;
+
Ok(delete_alias::Response::new().into())
}
diff --git a/src/client_server/backup.rs b/src/client_server/backup.rs
index 6e02198c37446e754f0cfd589a8b5ea0d22d290b..c84af0a6a21a83a1fc191ed4d3cff6efc19e9968 100644
--- a/src/client_server/backup.rs
+++ b/src/client_server/backup.rs
@@ -17,7 +17,7 @@
feature = "conduit_bin",
post("/_matrix/client/unstable/room_keys/version", data = "<body>")
)]
-pub fn create_backup_route(
+pub async fn create_backup_route(
db: State<'_, Database>,
body: Ruma<create_backup::Request>,
) -> ConduitResult<create_backup::Response> {
@@ -26,6 +26,8 @@ pub fn create_backup_route(
.key_backups
.create_backup(&sender_user, &body.algorithm, &db.globals)?;
+ db.flush().await?;
+
Ok(create_backup::Response { version }.into())
}
@@ -33,7 +35,7 @@ pub fn create_backup_route(
feature = "conduit_bin",
put("/_matrix/client/unstable/room_keys/version/<_>", data = "<body>")
)]
-pub fn update_backup_route(
+pub async fn update_backup_route(
db: State<'_, Database>,
body: Ruma<update_backup::Request<'_>>,
) -> ConduitResult<update_backup::Response> {
@@ -41,6 +43,8 @@ pub fn update_backup_route(
db.key_backups
.update_backup(&sender_user, &body.version, &body.algorithm, &db.globals)?;
+ db.flush().await?;
+
Ok(update_backup::Response.into())
}
@@ -48,7 +52,7 @@ pub fn update_backup_route(
feature = "conduit_bin",
get("/_matrix/client/unstable/room_keys/version", data = "<body>")
)]
-pub fn get_latest_backup_route(
+pub async fn get_latest_backup_route(
db: State<'_, Database>,
body: Ruma<get_latest_backup::Request>,
) -> ConduitResult<get_latest_backup::Response> {
@@ -75,7 +79,7 @@ pub fn get_latest_backup_route(
feature = "conduit_bin",
get("/_matrix/client/unstable/room_keys/version/<_>", data = "<body>")
)]
-pub fn get_backup_route(
+pub async fn get_backup_route(
db: State<'_, Database>,
body: Ruma<get_backup::Request<'_>>,
) -> ConduitResult<get_backup::Response> {
@@ -101,7 +105,7 @@ pub fn get_backup_route(
feature = "conduit_bin",
delete("/_matrix/client/unstable/room_keys/version/<_>", data = "<body>")
)]
-pub fn delete_backup_route(
+pub async fn delete_backup_route(
db: State<'_, Database>,
body: Ruma<delete_backup::Request>,
) -> ConduitResult<delete_backup::Response> {
@@ -109,6 +113,8 @@ pub fn delete_backup_route(
db.key_backups.delete_backup(&sender_user, &body.version)?;
+ db.flush().await?;
+
Ok(delete_backup::Response.into())
}
@@ -117,7 +123,7 @@ pub fn delete_backup_route(
feature = "conduit_bin",
put("/_matrix/client/unstable/room_keys/keys", data = "<body>")
)]
-pub fn add_backup_keys_route(
+pub async fn add_backup_keys_route(
db: State<'_, Database>,
body: Ruma<add_backup_keys::Request<'_>>,
) -> ConduitResult<add_backup_keys::Response> {
@@ -136,6 +142,8 @@ pub fn add_backup_keys_route(
}
}
+ db.flush().await?;
+
Ok(add_backup_keys::Response {
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
etag: db.key_backups.get_etag(sender_user, &body.version)?,
@@ -148,7 +156,7 @@ pub fn add_backup_keys_route(
feature = "conduit_bin",
put("/_matrix/client/unstable/room_keys/keys/<_>", data = "<body>")
)]
-pub fn add_backup_key_sessions_route(
+pub async fn add_backup_key_sessions_route(
db: State<'_, Database>,
body: Ruma<add_backup_key_sessions::Request>,
) -> ConduitResult<add_backup_key_sessions::Response> {
@@ -165,6 +173,8 @@ pub fn add_backup_key_sessions_route(
)?
}
+ db.flush().await?;
+
Ok(add_backup_key_sessions::Response {
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
etag: db.key_backups.get_etag(sender_user, &body.version)?,
@@ -177,7 +187,7 @@ pub fn add_backup_key_sessions_route(
feature = "conduit_bin",
put("/_matrix/client/unstable/room_keys/keys/<_>/<_>", data = "<body>")
)]
-pub fn add_backup_key_session_route(
+pub async fn add_backup_key_session_route(
db: State<'_, Database>,
body: Ruma<add_backup_key_session::Request>,
) -> ConduitResult<add_backup_key_session::Response> {
@@ -192,6 +202,8 @@ pub fn add_backup_key_session_route(
&db.globals,
)?;
+ db.flush().await?;
+
Ok(add_backup_key_session::Response {
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
etag: db.key_backups.get_etag(sender_user, &body.version)?,
@@ -203,7 +215,7 @@ pub fn add_backup_key_session_route(
feature = "conduit_bin",
get("/_matrix/client/unstable/room_keys/keys", data = "<body>")
)]
-pub fn get_backup_keys_route(
+pub async fn get_backup_keys_route(
db: State<'_, Database>,
body: Ruma<get_backup_keys::Request<'_>>,
) -> ConduitResult<get_backup_keys::Response> {
@@ -218,7 +230,7 @@ pub fn get_backup_keys_route(
feature = "conduit_bin",
get("/_matrix/client/unstable/room_keys/keys/<_>", data = "<body>")
)]
-pub fn get_backup_key_sessions_route(
+pub async fn get_backup_key_sessions_route(
db: State<'_, Database>,
body: Ruma<get_backup_key_sessions::Request>,
) -> ConduitResult<get_backup_key_sessions::Response> {
@@ -235,7 +247,7 @@ pub fn get_backup_key_sessions_route(
feature = "conduit_bin",
get("/_matrix/client/unstable/room_keys/keys/<_>/<_>", data = "<body>")
)]
-pub fn get_backup_key_session_route(
+pub async fn get_backup_key_session_route(
db: State<'_, Database>,
body: Ruma<get_backup_key_session::Request>,
) -> ConduitResult<get_backup_key_session::Response> {
@@ -252,7 +264,7 @@ pub fn get_backup_key_session_route(
feature = "conduit_bin",
delete("/_matrix/client/unstable/room_keys/keys", data = "<body>")
)]
-pub fn delete_backup_keys_route(
+pub async fn delete_backup_keys_route(
db: State<'_, Database>,
body: Ruma<delete_backup_keys::Request>,
) -> ConduitResult<delete_backup_keys::Response> {
@@ -261,6 +273,8 @@ pub fn delete_backup_keys_route(
db.key_backups
.delete_all_keys(&sender_user, &body.version)?;
+ db.flush().await?;
+
Ok(delete_backup_keys::Response {
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
etag: db.key_backups.get_etag(sender_user, &body.version)?,
@@ -272,7 +286,7 @@ pub fn delete_backup_keys_route(
feature = "conduit_bin",
delete("/_matrix/client/unstable/room_keys/keys/<_>", data = "<body>")
)]
-pub fn delete_backup_key_sessions_route(
+pub async fn delete_backup_key_sessions_route(
db: State<'_, Database>,
body: Ruma<delete_backup_key_sessions::Request>,
) -> ConduitResult<delete_backup_key_sessions::Response> {
@@ -281,6 +295,8 @@ pub fn delete_backup_key_sessions_route(
db.key_backups
.delete_room_keys(&sender_user, &body.version, &body.room_id)?;
+ db.flush().await?;
+
Ok(delete_backup_key_sessions::Response {
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
etag: db.key_backups.get_etag(sender_user, &body.version)?,
@@ -292,7 +308,7 @@ pub fn delete_backup_key_sessions_route(
feature = "conduit_bin",
delete("/_matrix/client/unstable/room_keys/keys/<_>/<_>", data = "<body>")
)]
-pub fn delete_backup_key_session_route(
+pub async fn delete_backup_key_session_route(
db: State<'_, Database>,
body: Ruma<delete_backup_key_session::Request>,
) -> ConduitResult<delete_backup_key_session::Response> {
@@ -301,6 +317,8 @@ pub fn delete_backup_key_session_route(
db.key_backups
.delete_room_key(&sender_user, &body.version, &body.room_id, &body.session_id)?;
+ db.flush().await?;
+
Ok(delete_backup_key_session::Response {
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
etag: db.key_backups.get_etag(sender_user, &body.version)?,
diff --git a/src/client_server/capabilities.rs b/src/client_server/capabilities.rs
index ddf90f83c40af80347b1fa4e8cb765ccc1ee9c92..54c08ba883d237015e2769fb16fed93c28161afc 100644
--- a/src/client_server/capabilities.rs
+++ b/src/client_server/capabilities.rs
@@ -9,7 +9,7 @@
///
/// Get information on this server's supported feature set and other relevent capabilities.
#[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/capabilities"))]
-pub fn get_capabilities_route() -> ConduitResult<get_capabilities::Response> {
+pub async fn get_capabilities_route() -> ConduitResult<get_capabilities::Response> {
let mut available = BTreeMap::new();
available.insert(
RoomVersionId::Version5,
diff --git a/src/client_server/config.rs b/src/client_server/config.rs
index adff05a094b58ea802a11a51443d2bcdb3b94625..dd8de640f7f1230163f8500aafc5f9648ee7c073 100644
--- a/src/client_server/config.rs
+++ b/src/client_server/config.rs
@@ -16,7 +16,7 @@
feature = "conduit_bin",
put("/_matrix/client/r0/user/<_>/account_data/<_>", data = "<body>")
)]
-pub fn set_global_account_data_route(
+pub async fn set_global_account_data_route(
db: State<'_, Database>,
body: Ruma<set_global_account_data::Request<'_>>,
) -> ConduitResult<set_global_account_data::Response> {
@@ -40,6 +40,8 @@ pub fn set_global_account_data_route(
&db.globals,
)?;
+ db.flush().await?;
+
Ok(set_global_account_data::Response.into())
}
@@ -47,7 +49,7 @@ pub fn set_global_account_data_route(
feature = "conduit_bin",
get("/_matrix/client/r0/user/<_>/account_data/<_>", data = "<body>")
)]
-pub fn get_global_account_data_route(
+pub async fn get_global_account_data_route(
db: State<'_, Database>,
body: Ruma<get_global_account_data::Request<'_>>,
) -> ConduitResult<get_global_account_data::Response> {
@@ -58,5 +60,7 @@ pub fn get_global_account_data_route(
.get::<Raw<ruma::events::AnyBasicEvent>>(None, sender_user, body.event_type.clone().into())?
.ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
+ db.flush().await?;
+
Ok(get_global_account_data::Response { account_data: data }.into())
}
diff --git a/src/client_server/context.rs b/src/client_server/context.rs
index a1b848a5dd86c09ea4c760e315693808b0beb6f9..f2a8cd43f75ac939158e3726cda337fe6f6c38e8 100644
--- a/src/client_server/context.rs
+++ b/src/client_server/context.rs
@@ -10,7 +10,7 @@
feature = "conduit_bin",
get("/_matrix/client/r0/rooms/<_>/context/<_>", data = "<body>")
)]
-pub fn get_context_route(
+pub async fn get_context_route(
db: State<'_, Database>,
body: Ruma<get_context::Request<'_>>,
) -> ConduitResult<get_context::Response> {
diff --git a/src/client_server/device.rs b/src/client_server/device.rs
index 233d2332f50712d6bfe2839fde806ae27c8fa845..86ac511c03caf0bc00cb9826d1a82d5c140cee0f 100644
--- a/src/client_server/device.rs
+++ b/src/client_server/device.rs
@@ -16,7 +16,7 @@
feature = "conduit_bin",
get("/_matrix/client/r0/devices", data = "<body>")
)]
-pub fn get_devices_route(
+pub async fn get_devices_route(
db: State<'_, Database>,
body: Ruma<get_devices::Request>,
) -> ConduitResult<get_devices::Response> {
@@ -35,7 +35,7 @@ pub fn get_devices_route(
feature = "conduit_bin",
get("/_matrix/client/r0/devices/<_>", data = "<body>")
)]
-pub fn get_device_route(
+pub async fn get_device_route(
db: State<'_, Database>,
body: Ruma<get_device::Request<'_>>,
) -> ConduitResult<get_device::Response> {
@@ -53,7 +53,7 @@ pub fn get_device_route(
feature = "conduit_bin",
put("/_matrix/client/r0/devices/<_>", data = "<body>")
)]
-pub fn update_device_route(
+pub async fn update_device_route(
db: State<'_, Database>,
body: Ruma<update_device::Request<'_>>,
) -> ConduitResult<update_device::Response> {
@@ -69,6 +69,8 @@ pub fn update_device_route(
db.users
.update_device_metadata(&sender_user, &body.device_id, &device)?;
+ db.flush().await?;
+
Ok(update_device::Response.into())
}
@@ -76,7 +78,7 @@ pub fn update_device_route(
feature = "conduit_bin",
delete("/_matrix/client/r0/devices/<_>", data = "<body>")
)]
-pub fn delete_device_route(
+pub async fn delete_device_route(
db: State<'_, Database>,
body: Ruma<delete_device::Request<'_>>,
) -> ConduitResult<delete_device::Response> {
@@ -115,6 +117,8 @@ pub fn delete_device_route(
db.users.remove_device(&sender_user, &body.device_id)?;
+ db.flush().await?;
+
Ok(delete_device::Response.into())
}
@@ -122,7 +126,7 @@ pub fn delete_device_route(
feature = "conduit_bin",
post("/_matrix/client/r0/delete_devices", data = "<body>")
)]
-pub fn delete_devices_route(
+pub async fn delete_devices_route(
db: State<'_, Database>,
body: Ruma<delete_devices::Request<'_>>,
) -> ConduitResult<delete_devices::Response> {
@@ -163,5 +167,7 @@ pub fn delete_devices_route(
db.users.remove_device(&sender_user, &device_id)?
}
+ db.flush().await?;
+
Ok(delete_devices::Response.into())
}
diff --git a/src/client_server/directory.rs b/src/client_server/directory.rs
index c82a15f02db63bce8bc4c8069fd403e822aad152..202417e3232fad9039a3f7b4343a19f34a80ce88 100644
--- a/src/client_server/directory.rs
+++ b/src/client_server/directory.rs
@@ -87,6 +87,8 @@ pub async fn set_room_visibility_route(
room::Visibility::Private => db.rooms.set_public(&body.room_id, false)?,
}
+ db.flush().await?;
+
Ok(set_room_visibility::Response.into())
}
diff --git a/src/client_server/filter.rs b/src/client_server/filter.rs
index 4b1c3a000e2f1a058e6db26a3f986f95730d523a..b6dc583a056cbbbc220fb9dcbd0a82a32f9a3181 100644
--- a/src/client_server/filter.rs
+++ b/src/client_server/filter.rs
@@ -5,7 +5,7 @@
use rocket::{get, post};
#[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/user/<_>/filter/<_>"))]
-pub fn get_filter_route() -> ConduitResult<get_filter::Response> {
+pub async fn get_filter_route() -> ConduitResult<get_filter::Response> {
// TODO
Ok(get_filter::Response::new(filter::IncomingFilterDefinition {
event_fields: None,
@@ -18,7 +18,7 @@ pub fn get_filter_route() -> ConduitResult<get_filter::Response> {
}
#[cfg_attr(feature = "conduit_bin", post("/_matrix/client/r0/user/<_>/filter"))]
-pub fn create_filter_route() -> ConduitResult<create_filter::Response> {
+pub async fn create_filter_route() -> ConduitResult<create_filter::Response> {
// TODO
Ok(create_filter::Response::new(utils::random_string(10)).into())
}
diff --git a/src/client_server/keys.rs b/src/client_server/keys.rs
index 2af88cf069c9cc4f0d641e522eaaffc03a203343..58c79dad08b8d25853f04aea0aeb7e5ab012a6da 100644
--- a/src/client_server/keys.rs
+++ b/src/client_server/keys.rs
@@ -22,7 +22,7 @@
feature = "conduit_bin",
post("/_matrix/client/r0/keys/upload", data = "<body>")
)]
-pub fn upload_keys_route(
+pub async fn upload_keys_route(
db: State<'_, Database>,
body: Ruma<upload_keys::Request<'_>>,
) -> ConduitResult<upload_keys::Response> {
@@ -58,6 +58,8 @@ pub fn upload_keys_route(
}
}
+ db.flush().await?;
+
Ok(upload_keys::Response {
one_time_key_counts: db.users.count_one_time_keys(sender_user, sender_device)?,
}
@@ -68,7 +70,7 @@ pub fn upload_keys_route(
feature = "conduit_bin",
post("/_matrix/client/r0/keys/query", data = "<body>")
)]
-pub fn get_keys_route(
+pub async fn get_keys_route(
db: State<'_, Database>,
body: Ruma<get_keys::Request<'_>>,
) -> ConduitResult<get_keys::Response> {
@@ -148,7 +150,7 @@ pub fn get_keys_route(
feature = "conduit_bin",
post("/_matrix/client/r0/keys/claim", data = "<body>")
)]
-pub fn claim_keys_route(
+pub async fn claim_keys_route(
db: State<'_, Database>,
body: Ruma<claim_keys::Request>,
) -> ConduitResult<claim_keys::Response> {
@@ -168,6 +170,8 @@ pub fn claim_keys_route(
one_time_keys.insert(user_id.clone(), container);
}
+ db.flush().await?;
+
Ok(claim_keys::Response {
failures: BTreeMap::new(),
one_time_keys,
@@ -179,7 +183,7 @@ pub fn claim_keys_route(
feature = "conduit_bin",
post("/_matrix/client/unstable/keys/device_signing/upload", data = "<body>")
)]
-pub fn upload_signing_keys_route(
+pub async fn upload_signing_keys_route(
db: State<'_, Database>,
body: Ruma<upload_signing_keys::Request<'_>>,
) -> ConduitResult<upload_signing_keys::Response> {
@@ -227,6 +231,8 @@ pub fn upload_signing_keys_route(
)?;
}
+ db.flush().await?;
+
Ok(upload_signing_keys::Response.into())
}
@@ -234,7 +240,7 @@ pub fn upload_signing_keys_route(
feature = "conduit_bin",
post("/_matrix/client/unstable/keys/signatures/upload", data = "<body>")
)]
-pub fn upload_signatures_route(
+pub async fn upload_signatures_route(
db: State<'_, Database>,
body: Ruma<upload_signatures::Request>,
) -> ConduitResult<upload_signatures::Response> {
@@ -285,6 +291,8 @@ pub fn upload_signatures_route(
}
}
+ db.flush().await?;
+
Ok(upload_signatures::Response.into())
}
@@ -292,7 +300,7 @@ pub fn upload_signatures_route(
feature = "conduit_bin",
get("/_matrix/client/r0/keys/changes", data = "<body>")
)]
-pub fn get_key_changes_route(
+pub async fn get_key_changes_route(
db: State<'_, Database>,
body: Ruma<get_key_changes::Request<'_>>,
) -> ConduitResult<get_key_changes::Response> {
diff --git a/src/client_server/media.rs b/src/client_server/media.rs
index 551546bd10acd0e1ae5c96b4de6f19254f1613b3..96874cc4438c02fcf7a99fafef3143877609b6ef 100644
--- a/src/client_server/media.rs
+++ b/src/client_server/media.rs
@@ -14,7 +14,7 @@
const MXC_LENGTH: usize = 32;
#[cfg_attr(feature = "conduit_bin", get("/_matrix/media/r0/config"))]
-pub fn get_media_config_route(
+pub async fn get_media_config_route(
db: State<'_, Database>,
) -> ConduitResult<get_media_config::Response> {
Ok(get_media_config::Response {
@@ -27,7 +27,7 @@ pub fn get_media_config_route(
feature = "conduit_bin",
post("/_matrix/media/r0/upload", data = "<body>")
)]
-pub fn create_content_route(
+pub async fn create_content_route(
db: State<'_, Database>,
body: Ruma<create_content::Request<'_>>,
) -> ConduitResult<create_content::Response> {
@@ -43,6 +43,8 @@ pub fn create_content_route(
&body.file,
)?;
+ db.flush().await?;
+
Ok(create_content::Response { content_uri: mxc }.into())
}
diff --git a/src/client_server/membership.rs b/src/client_server/membership.rs
index 5d028d9c071f9f2e06d0fee05e0c7f6dd329aff9..33806013f14be6c6906cf0d419c4d17ee18cd9ea 100644
--- a/src/client_server/membership.rs
+++ b/src/client_server/membership.rs
@@ -65,17 +65,19 @@ pub async fn join_room_by_id_or_alias_route(
}
};
+ let join_room_response = join_room_by_id_helper(
+ &db,
+ body.sender_user.as_ref(),
+ &room_id,
+ &servers,
+ body.third_party_signed.as_ref(),
+ )
+ .await?;
+
+ db.flush().await?;
+
Ok(join_room_by_id_or_alias::Response {
- room_id: join_room_by_id_helper(
- &db,
- body.sender_user.as_ref(),
- &room_id,
- &servers,
- body.third_party_signed.as_ref(),
- )
- .await?
- .0
- .room_id,
+ room_id: join_room_response.0.room_id,
}
.into())
}
@@ -124,6 +126,8 @@ pub async fn leave_room_route(
&db.account_data,
)?;
+ db.flush().await?;
+
Ok(leave_room::Response::new().into())
}
@@ -160,6 +164,8 @@ pub async fn invite_user_route(
&db.account_data,
)?;
+ db.flush().await?;
+
Ok(invite_user::Response.into())
} else {
Err(Error::BadRequest(ErrorKind::NotFound, "User not found."))
@@ -211,6 +217,8 @@ pub async fn kick_user_route(
&db.account_data,
)?;
+ db.flush().await?;
+
Ok(kick_user::Response::new().into())
}
@@ -267,6 +275,8 @@ pub async fn ban_user_route(
&db.account_data,
)?;
+ db.flush().await?;
+
Ok(ban_user::Response::new().into())
}
@@ -314,6 +324,8 @@ pub async fn unban_user_route(
&db.account_data,
)?;
+ db.flush().await?;
+
Ok(unban_user::Response::new().into())
}
@@ -321,7 +333,7 @@ pub async fn unban_user_route(
feature = "conduit_bin",
post("/_matrix/client/r0/rooms/<_>/forget", data = "<body>")
)]
-pub fn forget_room_route(
+pub async fn forget_room_route(
db: State<'_, Database>,
body: Ruma<forget_room::Request<'_>>,
) -> ConduitResult<forget_room::Response> {
@@ -329,6 +341,8 @@ pub fn forget_room_route(
db.rooms.forget(&body.room_id, &sender_user)?;
+ db.flush().await?;
+
Ok(forget_room::Response::new().into())
}
@@ -336,7 +350,7 @@ pub fn forget_room_route(
feature = "conduit_bin",
get("/_matrix/client/r0/joined_rooms", data = "<body>")
)]
-pub fn joined_rooms_route(
+pub async fn joined_rooms_route(
db: State<'_, Database>,
body: Ruma<joined_rooms::Request>,
) -> ConduitResult<joined_rooms::Response> {
@@ -356,7 +370,7 @@ pub fn joined_rooms_route(
feature = "conduit_bin",
get("/_matrix/client/r0/rooms/<_>/members", data = "<body>")
)]
-pub fn get_member_events_route(
+pub async fn get_member_events_route(
db: State<'_, Database>,
body: Ruma<get_member_events::Request<'_>>,
) -> ConduitResult<get_member_events::Response> {
@@ -384,7 +398,7 @@ pub fn get_member_events_route(
feature = "conduit_bin",
get("/_matrix/client/r0/rooms/<_>/joined_members", data = "<body>")
)]
-pub fn joined_members_route(
+pub async fn joined_members_route(
db: State<'_, Database>,
body: Ruma<joined_members::Request<'_>>,
) -> ConduitResult<joined_members::Response> {
diff --git a/src/client_server/message.rs b/src/client_server/message.rs
index 9b038bf86666b1061998cb64fb65abc517647fed..f9c8ba10862dc5e0781cda4e6cf559f03e3c7d7b 100644
--- a/src/client_server/message.rs
+++ b/src/client_server/message.rs
@@ -77,6 +77,8 @@ pub async fn send_message_event_route(
event_id.as_bytes(),
)?;
+ db.flush().await?;
+
Ok(send_message_event::Response::new(event_id).into())
}
@@ -84,7 +86,7 @@ pub async fn send_message_event_route(
feature = "conduit_bin",
get("/_matrix/client/r0/rooms/<_>/messages", data = "<body>")
)]
-pub fn get_message_events_route(
+pub async fn get_message_events_route(
db: State<'_, Database>,
body: Ruma<get_message_events::Request<'_>>,
) -> ConduitResult<get_message_events::Response> {
diff --git a/src/client_server/mod.rs b/src/client_server/mod.rs
index e5a36f3a4425428e0b6b7e439e8995805c995648..672957b3ce741334b64ac2e82dd61071533574a2 100644
--- a/src/client_server/mod.rs
+++ b/src/client_server/mod.rs
@@ -75,6 +75,6 @@
#[cfg(feature = "conduit_bin")]
#[options("/<_..>")]
-pub fn options_route() -> ConduitResult<send_event_to_device::Response> {
+pub async fn options_route() -> ConduitResult<send_event_to_device::Response> {
Ok(send_event_to_device::Response.into())
}
diff --git a/src/client_server/presence.rs b/src/client_server/presence.rs
index c529932199cde3b142d3b1201250eb682cd7594e..e597c698276671812e1dad8e1a5b6d85a28ddb8d 100644
--- a/src/client_server/presence.rs
+++ b/src/client_server/presence.rs
@@ -10,7 +10,7 @@
feature = "conduit_bin",
put("/_matrix/client/r0/presence/<_>/status", data = "<body>")
)]
-pub fn set_presence_route(
+pub async fn set_presence_route(
db: State<'_, Database>,
body: Ruma<set_presence::Request<'_>>,
) -> ConduitResult<set_presence::Response> {
@@ -41,5 +41,7 @@ pub fn set_presence_route(
)?;
}
+ db.flush().await?;
+
Ok(set_presence::Response.into())
}
diff --git a/src/client_server/profile.rs b/src/client_server/profile.rs
index d6b92123857768a2f561977cad83b4bca2227989..d754aceb7f76e3bb19a1de07421e848d7908a81b 100644
--- a/src/client_server/profile.rs
+++ b/src/client_server/profile.rs
@@ -90,6 +90,8 @@ pub async fn set_displayname_route(
)?;
}
+ db.flush().await?;
+
Ok(set_display_name::Response.into())
}
@@ -97,7 +99,7 @@ pub async fn set_displayname_route(
feature = "conduit_bin",
get("/_matrix/client/r0/profile/<_>/displayname", data = "<body>")
)]
-pub fn get_displayname_route(
+pub async fn get_displayname_route(
db: State<'_, Database>,
body: Ruma<get_display_name::Request<'_>>,
) -> ConduitResult<get_display_name::Response> {
@@ -182,6 +184,8 @@ pub async fn set_avatar_url_route(
)?;
}
+ db.flush().await?;
+
Ok(set_avatar_url::Response.into())
}
@@ -189,7 +193,7 @@ pub async fn set_avatar_url_route(
feature = "conduit_bin",
get("/_matrix/client/r0/profile/<_>/avatar_url", data = "<body>")
)]
-pub fn get_avatar_url_route(
+pub async fn get_avatar_url_route(
db: State<'_, Database>,
body: Ruma<get_avatar_url::Request<'_>>,
) -> ConduitResult<get_avatar_url::Response> {
@@ -203,7 +207,7 @@ pub fn get_avatar_url_route(
feature = "conduit_bin",
get("/_matrix/client/r0/profile/<_>", data = "<body>")
)]
-pub fn get_profile_route(
+pub async fn get_profile_route(
db: State<'_, Database>,
body: Ruma<get_profile::Request<'_>>,
) -> ConduitResult<get_profile::Response> {
diff --git a/src/client_server/push.rs b/src/client_server/push.rs
index 568d30c5f2e358582d4e6d7eddd7168254191250..05ba8d065b6b1228aa45a8a3b1aa85a1c796afcc 100644
--- a/src/client_server/push.rs
+++ b/src/client_server/push.rs
@@ -16,7 +16,7 @@
feature = "conduit_bin",
get("/_matrix/client/r0/pushrules", data = "<body>")
)]
-pub fn get_pushrules_all_route(
+pub async fn get_pushrules_all_route(
db: State<'_, Database>,
body: Ruma<get_pushrules_all::Request>,
) -> ConduitResult<get_pushrules_all::Response> {
@@ -40,11 +40,15 @@ pub fn get_pushrules_all_route(
"/_matrix/client/r0/pushrules/<_>/<_>/<_>",
//data = "<body>"
))]
-pub fn set_pushrule_route(//db: State<'_, Database>,
+pub async fn set_pushrule_route(
+ db: State<'_, Database>,
//body: Ruma<set_pushrule::Request>,
) -> ConduitResult<set_pushrule::Response> {
// TODO
warn!("TODO: set_pushrule_route");
+
+ db.flush().await?;
+
Ok(set_pushrule::Response.into())
}
@@ -52,14 +56,19 @@ pub fn set_pushrule_route(//db: State<'_, Database>,
feature = "conduit_bin",
put("/_matrix/client/r0/pushrules/<_>/<_>/<_>/enabled")
)]
-pub fn set_pushrule_enabled_route() -> ConduitResult<set_pushrule_enabled::Response> {
+pub async fn set_pushrule_enabled_route(
+ db: State<'_, Database>,
+) -> ConduitResult<set_pushrule_enabled::Response> {
// TODO
warn!("TODO: set_pushrule_enabled_route");
+
+ db.flush().await?;
+
Ok(set_pushrule_enabled::Response.into())
}
#[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/pushers"))]
-pub fn get_pushers_route() -> ConduitResult<get_pushers::Response> {
+pub async fn get_pushers_route() -> ConduitResult<get_pushers::Response> {
Ok(get_pushers::Response {
pushers: Vec::new(),
}
@@ -67,7 +76,9 @@ pub fn get_pushers_route() -> ConduitResult<get_pushers::Response> {
}
#[cfg_attr(feature = "conduit_bin", post("/_matrix/client/r0/pushers/set"))]
-pub fn set_pushers_route() -> ConduitResult<get_pushers::Response> {
+pub async fn set_pushers_route(db: State<'_, Database>) -> ConduitResult<get_pushers::Response> {
+ db.flush().await?;
+
Ok(get_pushers::Response {
pushers: Vec::new(),
}
diff --git a/src/client_server/read_marker.rs b/src/client_server/read_marker.rs
index 77b4141c60d410256092b62c4b3dde391dd4b82e..f3e7211d75eb4029519a2fc5b3956cf65353a22f 100644
--- a/src/client_server/read_marker.rs
+++ b/src/client_server/read_marker.rs
@@ -13,7 +13,7 @@
feature = "conduit_bin",
post("/_matrix/client/r0/rooms/<_>/read_markers", data = "<body>")
)]
-pub fn set_read_marker_route(
+pub async fn set_read_marker_route(
db: State<'_, Database>,
body: Ruma<set_read_marker::Request<'_>>,
) -> ConduitResult<set_read_marker::Response> {
@@ -71,5 +71,8 @@ pub fn set_read_marker_route(
&db.globals,
)?;
}
+
+ db.flush().await?;
+
Ok(set_read_marker::Response.into())
}
diff --git a/src/client_server/redact.rs b/src/client_server/redact.rs
index b4fc4bb93b7f1743a25510fed8691d8d956c1196..486eb6c87169a608938f57952778d8533fc13a81 100644
--- a/src/client_server/redact.rs
+++ b/src/client_server/redact.rs
@@ -36,5 +36,7 @@ pub async fn redact_event_route(
&db.account_data,
)?;
+ db.flush().await?;
+
Ok(redact_event::Response { event_id }.into())
}
diff --git a/src/client_server/room.rs b/src/client_server/room.rs
index 92d8b8e14caeabac03611f21810a2ac05c620238..d1d051f1e55a80f87458945bbe904844f5efc77f 100644
--- a/src/client_server/room.rs
+++ b/src/client_server/room.rs
@@ -313,6 +313,8 @@ pub async fn create_room_route(
db.rooms.set_public(&room_id, true)?;
}
+ db.flush().await?;
+
Ok(create_room::Response::new(room_id).into())
}
@@ -320,7 +322,7 @@ pub async fn create_room_route(
feature = "conduit_bin",
get("/_matrix/client/r0/rooms/<_>/event/<_>", data = "<body>")
)]
-pub fn get_room_event_route(
+pub async fn get_room_event_route(
db: State<'_, Database>,
body: Ruma<get_room_event::Request<'_>>,
) -> ConduitResult<get_room_event::Response> {
@@ -531,6 +533,8 @@ pub async fn upgrade_room_route(
&db.account_data,
)?;
+ db.flush().await?;
+
// Return the replacement room id
Ok(upgrade_room::Response { replacement_room }.into())
}
diff --git a/src/client_server/search.rs b/src/client_server/search.rs
index 6e2b7ff36604c15890dc911cdc356ef9beea83ab..0950b25af40f233e805656645914edc7ffd8b440 100644
--- a/src/client_server/search.rs
+++ b/src/client_server/search.rs
@@ -11,7 +11,7 @@
feature = "conduit_bin",
post("/_matrix/client/r0/search", data = "<body>")
)]
-pub fn search_events_route(
+pub async fn search_events_route(
db: State<'_, Database>,
body: Ruma<search_events::Request<'_>>,
) -> ConduitResult<search_events::Response> {
diff --git a/src/client_server/session.rs b/src/client_server/session.rs
index f10bf71136ccc0b382cfb03685b1377eb0bddae4..c8775ef5db7d848270821abaa8ae1bd598aa8cf5 100644
--- a/src/client_server/session.rs
+++ b/src/client_server/session.rs
@@ -16,7 +16,7 @@
/// Get the homeserver's supported login types. One of these should be used as the `type` field
/// when logging in.
#[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/login"))]
-pub fn get_login_types_route() -> ConduitResult<get_login_types::Response> {
+pub async fn get_login_types_route() -> ConduitResult<get_login_types::Response> {
Ok(get_login_types::Response::new(vec![get_login_types::LoginType::Password]).into())
}
@@ -34,7 +34,7 @@ pub fn get_login_types_route() -> ConduitResult<get_login_types::Response> {
feature = "conduit_bin",
post("/_matrix/client/r0/login", data = "<body>")
)]
-pub fn login_route(
+pub async fn login_route(
db: State<'_, Database>,
body: Ruma<login::Request<'_>>,
) -> ConduitResult<login::Response> {
@@ -93,6 +93,8 @@ pub fn login_route(
body.initial_device_display_name.clone(),
)?;
+ db.flush().await?;
+
Ok(login::Response {
user_id,
access_token: token,
@@ -113,7 +115,7 @@ pub fn login_route(
feature = "conduit_bin",
post("/_matrix/client/r0/logout", data = "<body>")
)]
-pub fn logout_route(
+pub async fn logout_route(
db: State<'_, Database>,
body: Ruma<logout::Request>,
) -> ConduitResult<logout::Response> {
@@ -122,6 +124,8 @@ pub fn logout_route(
db.users.remove_device(&sender_user, sender_device)?;
+ db.flush().await?;
+
Ok(logout::Response::new().into())
}
@@ -138,7 +142,7 @@ pub fn logout_route(
feature = "conduit_bin",
post("/_matrix/client/r0/logout/all", data = "<body>")
)]
-pub fn logout_all_route(
+pub async fn logout_all_route(
db: State<'_, Database>,
body: Ruma<logout_all::Request>,
) -> ConduitResult<logout_all::Response> {
@@ -150,5 +154,7 @@ pub fn logout_all_route(
}
}
+ db.flush().await?;
+
Ok(logout_all::Response::new().into())
}
diff --git a/src/client_server/state.rs b/src/client_server/state.rs
index 90abac71452ad59c3cbac1a2d85e46232c4c9f03..eae96b5bb6a1d6a73e02f2e4350d366a9f63d10a 100644
--- a/src/client_server/state.rs
+++ b/src/client_server/state.rs
@@ -37,18 +37,19 @@ pub async fn send_state_event_for_key_route(
)
.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?;
- Ok(send_state_event_for_key::Response::new(
- send_state_event_for_key_helper(
- &db,
- sender_user,
- &body.content,
- content,
- &body.room_id,
- Some(body.state_key.to_owned()),
- )
- .await?,
+ let event_id = send_state_event_for_key_helper(
+ &db,
+ sender_user,
+ &body.content,
+ content,
+ &body.room_id,
+ Some(body.state_key.to_owned()),
)
- .into())
+ .await?;
+
+ db.flush().await?;
+
+ Ok(send_state_event_for_key::Response { event_id }.into())
}
#[cfg_attr(
@@ -75,27 +76,28 @@ pub async fn send_state_event_for_empty_key_route(
)
.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?;
- Ok(send_state_event_for_empty_key::Response::new(
- send_state_event_for_key_helper(
- &db,
- sender_user
- .as_ref()
- .expect("no user for send state empty key rout"),
- &body.content,
- json,
- &body.room_id,
- Some("".into()),
- )
- .await?,
+ let event_id = send_state_event_for_key_helper(
+ &db,
+ sender_user
+ .as_ref()
+ .expect("no user for send state empty key rout"),
+ &body.content,
+ json,
+ &body.room_id,
+ Some("".into()),
)
- .into())
+ .await?;
+
+ db.flush().await?;
+
+ Ok(send_state_event_for_empty_key::Response { event_id }.into())
}
#[cfg_attr(
feature = "conduit_bin",
get("/_matrix/client/r0/rooms/<_>/state", data = "<body>")
)]
-pub fn get_state_events_route(
+pub async fn get_state_events_route(
db: State<'_, Database>,
body: Ruma<get_state_events::Request>,
) -> ConduitResult<get_state_events::Response> {
@@ -140,7 +142,7 @@ pub fn get_state_events_route(
feature = "conduit_bin",
get("/_matrix/client/r0/rooms/<_>/state/<_>/<_>", data = "<body>")
)]
-pub fn get_state_events_for_key_route(
+pub async fn get_state_events_for_key_route(
db: State<'_, Database>,
body: Ruma<get_state_events_for_key::Request>,
) -> ConduitResult<get_state_events_for_key::Response> {
@@ -189,7 +191,7 @@ pub fn get_state_events_for_key_route(
feature = "conduit_bin",
get("/_matrix/client/r0/rooms/<_>/state/<_>", data = "<body>")
)]
-pub fn get_state_events_for_empty_key_route(
+pub async fn get_state_events_for_empty_key_route(
db: State<'_, Database>,
body: Ruma<get_state_events_for_empty_key::Request>,
) -> ConduitResult<get_state_events_for_empty_key::Response> {
diff --git a/src/client_server/tag.rs b/src/client_server/tag.rs
index c60531331436373f997ca1324a1f6abd6cf108f7..7bbf9e8d65dd1200a54bc757fbe871c55ff4ea42 100644
--- a/src/client_server/tag.rs
+++ b/src/client_server/tag.rs
@@ -13,7 +13,7 @@
feature = "conduit_bin",
put("/_matrix/client/r0/user/<_>/rooms/<_>/tags/<_>", data = "<body>")
)]
-pub fn update_tag_route(
+pub async fn update_tag_route(
db: State<'_, Database>,
body: Ruma<create_tag::Request<'_>>,
) -> ConduitResult<create_tag::Response> {
@@ -40,6 +40,8 @@ pub fn update_tag_route(
&db.globals,
)?;
+ db.flush().await?;
+
Ok(create_tag::Response.into())
}
@@ -47,7 +49,7 @@ pub fn update_tag_route(
feature = "conduit_bin",
delete("/_matrix/client/r0/user/<_>/rooms/<_>/tags/<_>", data = "<body>")
)]
-pub fn delete_tag_route(
+pub async fn delete_tag_route(
db: State<'_, Database>,
body: Ruma<delete_tag::Request<'_>>,
) -> ConduitResult<delete_tag::Response> {
@@ -71,6 +73,8 @@ pub fn delete_tag_route(
&db.globals,
)?;
+ db.flush().await?;
+
Ok(delete_tag::Response.into())
}
@@ -78,7 +82,7 @@ pub fn delete_tag_route(
feature = "conduit_bin",
get("/_matrix/client/r0/user/<_>/rooms/<_>/tags", data = "<body>")
)]
-pub fn get_tags_route(
+pub async fn get_tags_route(
db: State<'_, Database>,
body: Ruma<get_tags::Request<'_>>,
) -> ConduitResult<get_tags::Response> {
diff --git a/src/client_server/thirdparty.rs b/src/client_server/thirdparty.rs
index d9b540b3be96aeb15db0373e3737d546e4288ceb..c775e9b050de7d7acd273ceb8e60068fbd001c37 100644
--- a/src/client_server/thirdparty.rs
+++ b/src/client_server/thirdparty.rs
@@ -10,7 +10,7 @@
feature = "conduit_bin",
get("/_matrix/client/r0/thirdparty/protocols")
)]
-pub fn get_protocols_route() -> ConduitResult<get_protocols::Response> {
+pub async fn get_protocols_route() -> ConduitResult<get_protocols::Response> {
warn!("TODO: get_protocols_route");
Ok(get_protocols::Response {
protocols: BTreeMap::new(),
diff --git a/src/client_server/to_device.rs b/src/client_server/to_device.rs
index 6719daeee56f12a704efdf7e35fe2ce0fb34dc3b..8cc3e299c66a3deb2755a60cc4b59db2359ed1c9 100644
--- a/src/client_server/to_device.rs
+++ b/src/client_server/to_device.rs
@@ -12,7 +12,7 @@
feature = "conduit_bin",
put("/_matrix/client/r0/sendToDevice/<_>/<_>", data = "<body>")
)]
-pub fn send_event_to_device_route(
+pub async fn send_event_to_device_route(
db: State<'_, Database>,
body: Ruma<send_event_to_device::Request<'_>>,
) -> ConduitResult<send_event_to_device::Response> {
@@ -66,5 +66,7 @@ pub fn send_event_to_device_route(
db.transaction_ids
.add_txnid(sender_user, sender_device, &body.txn_id, &[])?;
+ db.flush().await?;
+
Ok(send_event_to_device::Response.into())
}
diff --git a/src/client_server/unversioned.rs b/src/client_server/unversioned.rs
index ea7f6338101ccea6fa318e29b984bb0dcaa2bcdb..e51ed56539a92aa4ee57f7a2e2b96556e030b45f 100644
--- a/src/client_server/unversioned.rs
+++ b/src/client_server/unversioned.rs
@@ -15,7 +15,7 @@
/// Note: Unstable features are used while developing new features. Clients should avoid using
/// unstable features in their stable releases
#[cfg_attr(feature = "conduit_bin", get("/_matrix/client/versions"))]
-pub fn get_supported_versions_route() -> ConduitResult<get_supported_versions::Response> {
+pub async fn get_supported_versions_route() -> ConduitResult<get_supported_versions::Response> {
let mut resp =
get_supported_versions::Response::new(vec!["r0.5.0".to_owned(), "r0.6.0".to_owned()]);
diff --git a/src/client_server/user_directory.rs b/src/client_server/user_directory.rs
index dcf48fe3c7862e570e0b3f8b03ce3696ebc508e5..5829364169f2afe6afd1fb2fc1bdde3a73b2dabf 100644
--- a/src/client_server/user_directory.rs
+++ b/src/client_server/user_directory.rs
@@ -9,7 +9,7 @@
feature = "conduit_bin",
post("/_matrix/client/r0/user_directory/search", data = "<body>")
)]
-pub fn search_users_route(
+pub async fn search_users_route(
db: State<'_, Database>,
body: Ruma<search_users::Request<'_>>,
) -> ConduitResult<search_users::Response> {
diff --git a/src/client_server/voip.rs b/src/client_server/voip.rs
index 33080eae34359d8504217fd8321cbd973a4ea62d..a8db62af1578a29ecd954cb36a03c6a51f8dd155 100644
--- a/src/client_server/voip.rs
+++ b/src/client_server/voip.rs
@@ -5,7 +5,7 @@
use rocket::get;
#[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/voip/turnServer"))]
-pub fn turn_server_route() -> ConduitResult<send_message_event::Response> {
+pub async fn turn_server_route() -> ConduitResult<send_message_event::Response> {
Err(Error::BadRequest(
ErrorKind::NotFound,
"There is no turn server yet.",
diff --git a/src/database.rs b/src/database.rs
index 4b2cba10ad90de825f0475e27cde72394a52ab1b..883ef853eb3fb02a836f597a0df067673d5e7448 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -10,12 +10,11 @@
use crate::{Error, Result};
use directories::ProjectDirs;
-use log::info;
-use std::fs::remove_dir_all;
-
use futures::StreamExt;
+use log::info;
use rocket::{futures, Config};
use ruma::{DeviceId, UserId};
+use std::{convert::TryFrom, fs::remove_dir_all};
pub struct Database {
pub globals: globals::Globals,
@@ -66,7 +65,19 @@ pub fn load_or_create(config: &Config) -> Result<Self> {
.to_owned())
})?;
- let db = sled::open(&path)?;
+ let db = sled::Config::default()
+ .path(&path)
+ .cache_capacity(
+ u64::try_from(
+ config
+ .get_int("cache_capacity")
+ .unwrap_or(1024 * 1024 * 1024),
+ )
+ .map_err(|_| Error::BadConfig("Cache capacity needs to be a u64."))?,
+ )
+ .print_profile_on_drop(false)
+ .open()?;
+
info!("Opened sled database at {}", path);
Ok(Self {
@@ -227,4 +238,9 @@ pub async fn watch(&self, user_id: &UserId, device_id: &DeviceId) {
// Wait until one of them finds something
futures.next().await;
}
+
+ pub async fn flush(&self) -> Result<()> {
+ self._db.flush_async().await?;
+ Ok(())
+ }
}