diff --git a/Cargo.lock b/Cargo.lock index 6f2511a7289..b91ff234be4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3973,7 +3973,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.7.4" -source = "git+https://github.com/ruma/ruma?rev=3f293073653847d2c56e3c094e0773e3d5b06cc2#3f293073653847d2c56e3c094e0773e3d5b06cc2" +source = "git+https://github.com/ruma/ruma?rev=00045e559f864eabff08295d603f7b3238288b6f#00045e559f864eabff08295d603f7b3238288b6f" dependencies = [ "assign", "js_int", @@ -3987,7 +3987,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.7.0" -source = "git+https://github.com/ruma/ruma?rev=3f293073653847d2c56e3c094e0773e3d5b06cc2#3f293073653847d2c56e3c094e0773e3d5b06cc2" +source = "git+https://github.com/ruma/ruma?rev=00045e559f864eabff08295d603f7b3238288b6f#00045e559f864eabff08295d603f7b3238288b6f" dependencies = [ "js_int", "ruma-common", @@ -3998,7 +3998,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.15.3" -source = "git+https://github.com/ruma/ruma?rev=3f293073653847d2c56e3c094e0773e3d5b06cc2#3f293073653847d2c56e3c094e0773e3d5b06cc2" +source = "git+https://github.com/ruma/ruma?rev=00045e559f864eabff08295d603f7b3238288b6f#00045e559f864eabff08295d603f7b3238288b6f" dependencies = [ "assign", "bytes", @@ -4015,7 +4015,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.10.5" -source = "git+https://github.com/ruma/ruma?rev=3f293073653847d2c56e3c094e0773e3d5b06cc2#3f293073653847d2c56e3c094e0773e3d5b06cc2" +source = "git+https://github.com/ruma/ruma?rev=00045e559f864eabff08295d603f7b3238288b6f#00045e559f864eabff08295d603f7b3238288b6f" dependencies = [ "base64 0.20.0", "bytes", @@ -4046,7 +4046,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.6.0" -source = "git+https://github.com/ruma/ruma?rev=3f293073653847d2c56e3c094e0773e3d5b06cc2#3f293073653847d2c56e3c094e0773e3d5b06cc2" +source = "git+https://github.com/ruma/ruma?rev=00045e559f864eabff08295d603f7b3238288b6f#00045e559f864eabff08295d603f7b3238288b6f" dependencies = [ "js_int", "ruma-common", @@ -4057,7 +4057,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.0" -source = "git+https://github.com/ruma/ruma?rev=3f293073653847d2c56e3c094e0773e3d5b06cc2#3f293073653847d2c56e3c094e0773e3d5b06cc2" +source = "git+https://github.com/ruma/ruma?rev=00045e559f864eabff08295d603f7b3238288b6f#00045e559f864eabff08295d603f7b3238288b6f" dependencies = [ "js_int", "thiserror", @@ -4066,7 +4066,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.10.5" -source = "git+https://github.com/ruma/ruma?rev=3f293073653847d2c56e3c094e0773e3d5b06cc2#3f293073653847d2c56e3c094e0773e3d5b06cc2" +source = "git+https://github.com/ruma/ruma?rev=00045e559f864eabff08295d603f7b3238288b6f#00045e559f864eabff08295d603f7b3238288b6f" dependencies = [ "once_cell", "proc-macro-crate", diff --git a/Cargo.toml b/Cargo.toml index e3c08d0455a..dd1f5edcf5d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,8 +27,8 @@ byteorder = "1.4.3" ctor = "0.1.26" dashmap = "5.2.0" http = "0.2.6" -ruma = { git = "https://github.com/ruma/ruma", rev = "3f293073653847d2c56e3c094e0773e3d5b06cc2", features = ["client-api-c"] } -ruma-common = { git = "https://github.com/ruma/ruma", rev = "3f293073653847d2c56e3c094e0773e3d5b06cc2" } +ruma = { git = "https://github.com/ruma/ruma", rev = "00045e559f864eabff08295d603f7b3238288b6f", features = ["client-api-c"] } +ruma-common = { git = "https://github.com/ruma/ruma", rev = "00045e559f864eabff08295d603f7b3238288b6f" } once_cell = "1.16.0" serde = "1.0.151" serde_html_form = "0.2.0" diff --git a/bindings/matrix-sdk-ffi/src/sliding_sync.rs b/bindings/matrix-sdk-ffi/src/sliding_sync.rs index dbb4ec39c4b..1c3d76bd48c 100644 --- a/bindings/matrix-sdk-ffi/src/sliding_sync.rs +++ b/bindings/matrix-sdk-ffi/src/sliding_sync.rs @@ -825,7 +825,6 @@ impl SlidingSyncBuilder { Arc::new(builder) } - pub fn with_all_extensions(self: Arc) -> Arc { let mut builder = unwrap_or_clone_arc(self); builder.inner = builder.inner.with_all_extensions(); diff --git a/crates/matrix-sdk/src/sliding_sync.rs b/crates/matrix-sdk/src/sliding_sync.rs index 56453a0ca6c..b660c911d8b 100644 --- a/crates/matrix-sdk/src/sliding_sync.rs +++ b/crates/matrix-sdk/src/sliding_sync.rs @@ -798,10 +798,7 @@ impl SlidingSync { /// Add the common extensions if not already configured pub fn add_common_extensions(&self) { - let mut lock = self - .extensions - .lock() - .unwrap(); + let mut lock = self.extensions.lock().unwrap(); let mut cfg = lock.get_or_insert_with(Default::default); if cfg.to_device.is_none() { cfg.to_device = Some(assign!(ToDeviceConfig::default(), {enabled : Some(true)})); @@ -812,8 +809,7 @@ impl SlidingSync { } if cfg.account_data.is_none() { - cfg.account_data = - Some(assign!(AccountDataConfig::default(), {enabled : Some(true)})); + cfg.account_data = Some(assign!(AccountDataConfig::default(), {enabled : Some(true)})); } } diff --git a/testing/sliding-sync-integration-test/assets/docker-compose.yml b/testing/sliding-sync-integration-test/assets/docker-compose.yml index 7c819a1cd83..a79713f02fc 100644 --- a/testing/sliding-sync-integration-test/assets/docker-compose.yml +++ b/testing/sliding-sync-integration-test/assets/docker-compose.yml @@ -28,8 +28,8 @@ services: - ./data/db:/var/lib/postgresql/data sliding-sync-proxy: - # image: ghcr.io/matrix-org/sliding-sync:0.98.1 - image: ghcr.io/matrix-org/sliding-sync:latest + image: ghcr.io/matrix-org/sliding-sync:v0.99.0-rc1 + # image: ghcr.io/matrix-org/sliding-sync:latest links: - synapse - postgres