chore: Upgrade matrix-sdk

2 years ago · a9d360b1bd
5 changed files with 67 additions and 64 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -313,9 +313,9 @@ dependencies = [

 [[package]]
 name = "async-signal"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d"
+checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
 dependencies = [
 "async-io",
 "async-lock",
@ -1965,7 +1965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e5e874f1660252fd2ec81c602066df3633b3a6fcbe2b196f7f93c27cf069b2a"
 dependencies = [
 "chrono",
- "toml_edit 0.22.15",
+ "toml_edit 0.22.16",
 ]

 [[package]]
@ -2483,12 +2483,12 @@ dependencies = [

 [[package]]
 name = "image-webp"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d"
+checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904"
 dependencies = [
 "byteorder-lite",
- "thiserror",
+ "quick-error",
 ]

 [[package]]
@ -3040,7 +3040,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk"
 version = "0.7.1"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad#62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694"
 dependencies = [
 "anymap2",
 "aquamarine",
@ -3091,7 +3091,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.7.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad#62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694"
 dependencies = [
 "as_variant",
 "async-trait",
@ -3115,7 +3115,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.7.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad#62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694"
 dependencies = [
 "async-trait",
 "futures-core",
@ -3137,7 +3137,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.7.1"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad#62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694"
 dependencies = [
 "aes",
 "as_variant",
@ -3178,7 +3178,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-indexeddb"
 version = "0.7.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad#62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694"
 dependencies = [
 "anyhow",
 "async-trait",
@ -3206,7 +3206,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-qrcode"
 version = "0.7.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad#62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694"
 dependencies = [
 "byteorder",
 "qrcode",
@ -3218,7 +3218,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-sqlite"
 version = "0.7.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad#62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694"
 dependencies = [
 "async-trait",
 "deadpool-sqlite",
@ -3240,7 +3240,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-store-encryption"
 version = "0.7.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad#62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694"
 dependencies = [
 "base64",
 "blake3",
@ -3259,7 +3259,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-ui"
 version = "0.7.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad#62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694"
 dependencies = [
 "as_variant",
 "async-once-cell",
@ -4066,9 +4066,9 @@ dependencies = [

 [[package]]
 name = "prost"
-version = "0.12.6"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
+checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc"
 dependencies = [
 "bytes",
 "prost-derive",
@ -4076,12 +4076,12 @@ dependencies = [

 [[package]]
 name = "prost-derive"
-version = "0.12.6"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
+checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca"
 dependencies = [
 "anyhow",
- "itertools 0.12.1",
+ "itertools 0.13.0",
 "proc-macro2",
 "quote",
 "syn 2.0.71",
@ -4395,7 +4395,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.10.1"
-source = "git+https://github.com/ruma/ruma.git?rev=c37843e9be619ffac8c4d33ad3a6a175cc32610c#c37843e9be619ffac8c4d33ad3a6a175cc32610c"
+source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028"
 dependencies = [
 "assign",
 "js_int",
@ -4412,7 +4412,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.18.0"
-source = "git+https://github.com/ruma/ruma.git?rev=c37843e9be619ffac8c4d33ad3a6a175cc32610c#c37843e9be619ffac8c4d33ad3a6a175cc32610c"
+source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028"
 dependencies = [
 "as_variant",
 "assign",
@ -4435,7 +4435,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.13.0"
-source = "git+https://github.com/ruma/ruma.git?rev=c37843e9be619ffac8c4d33ad3a6a175cc32610c#c37843e9be619ffac8c4d33ad3a6a175cc32610c"
+source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028"
 dependencies = [
 "as_variant",
 "base64",
@ -4467,7 +4467,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.28.1"
-source = "git+https://github.com/ruma/ruma.git?rev=c37843e9be619ffac8c4d33ad3a6a175cc32610c#c37843e9be619ffac8c4d33ad3a6a175cc32610c"
+source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028"
 dependencies = [
 "as_variant",
 "indexmap",
@ -4485,13 +4485,14 @@ dependencies = [
 "thiserror",
 "tracing",
 "url",
+ "web-time",
 "wildmatch",
 ]

 [[package]]
 name = "ruma-federation-api"
 version = "0.9.0"
-source = "git+https://github.com/ruma/ruma.git?rev=c37843e9be619ffac8c4d33ad3a6a175cc32610c#c37843e9be619ffac8c4d33ad3a6a175cc32610c"
+source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028"
 dependencies = [
 "js_int",
 "ruma-common",
@ -4503,7 +4504,7 @@ dependencies = [
 [[package]]
 name = "ruma-html"
 version = "0.2.0"
-source = "git+https://github.com/ruma/ruma.git?rev=c37843e9be619ffac8c4d33ad3a6a175cc32610c#c37843e9be619ffac8c4d33ad3a6a175cc32610c"
+source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028"
 dependencies = [
 "as_variant",
 "html5ever",
@ -4516,7 +4517,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.9.5"
-source = "git+https://github.com/ruma/ruma.git?rev=c37843e9be619ffac8c4d33ad3a6a175cc32610c#c37843e9be619ffac8c4d33ad3a6a175cc32610c"
+source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028"
 dependencies = [
 "js_int",
 "thiserror",
@ -4525,7 +4526,7 @@ dependencies = [
 [[package]]
 name = "ruma-macros"
 version = "0.13.0"
-source = "git+https://github.com/ruma/ruma.git?rev=c37843e9be619ffac8c4d33ad3a6a175cc32610c#c37843e9be619ffac8c4d33ad3a6a175cc32610c"
+source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028"
 dependencies = [
 "once_cell",
 "proc-macro-crate",
@ -4540,7 +4541,7 @@ dependencies = [
 [[package]]
 name = "ruma-push-gateway-api"
 version = "0.9.0"
-source = "git+https://github.com/ruma/ruma.git?rev=c37843e9be619ffac8c4d33ad3a6a175cc32610c#c37843e9be619ffac8c4d33ad3a6a175cc32610c"
+source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028"
 dependencies = [
 "js_int",
 "ruma-common",
@ -5102,18 +5103,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.62"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.62"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
 "proc-macro2",
 "quote",
@ -5199,9 +5200,9 @@ dependencies = [

 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df"
 dependencies = [
 "backtrace",
 "bytes",
@ -5276,14 +5277,14 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
 dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
- "toml_edit 0.22.15",
+ "toml_edit 0.22.16",
 ]

 [[package]]
@ -5308,9 +5309,9 @@ dependencies = [

 [[package]]
 name = "toml_edit"
-version = "0.22.15"
+version = "0.22.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1"
+checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
 dependencies = [
 "indexmap",
 "serde",
@ -5581,12 +5582,14 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

 [[package]]
 name = "vodozemac"
-version = "0.6.0"
-source = "git+https://github.com/matrix-org/vodozemac/?rev=4ef989c6a8eba0bc809e285a081c56320a9bbf1e#4ef989c6a8eba0bc809e285a081c56320a9bbf1e"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "051d4af70b53b42adf2aac459a305851b8d754f210aaf11ab509e1065beff422"
 dependencies = [
 "aes",
 "arrayvec",
 "base64",
+ "base64ct",
 "cbc",
 "chacha20poly1305",
 "curve25519-dalek",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -64,7 +64,7 @@ sourceview = { package = "sourceview5", version = "0.9" }

 [dependencies.matrix-sdk]
 git = "https://github.com/matrix-org/matrix-rust-sdk.git"
-rev = "62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad"
+rev = "92b4c2a469f507696fa9db3d6bdb000a761e2694"
 features = [
    "socks",
    "sso-login",
@ -75,14 +75,14 @@ features = [

 [dependencies.matrix-sdk-ui]
 git = "https://github.com/matrix-org/matrix-rust-sdk.git"
-rev = "62137e5a3ef032a5f4c3ff77f98f5d0051bf55ad"
+rev = "92b4c2a469f507696fa9db3d6bdb000a761e2694"
 default-features = false
 features = ["e2e-encryption", "native-tls"]

 [dependencies.ruma]
 # version = "0.10"
-git = "https://github.com/ruma/ruma.git"
-rev = "c37843e9be619ffac8c4d33ad3a6a175cc32610c"
+git = "https://github.com/matrix-org/ruma.git"
+rev = "4d3d8b46fd519012e4585ccf00dbea1eb602c028"
 features = [
    "unstable-unspecified",
    "client-api-c",
--- a/src/components/avatar/image.rs
+++ b/src/components/avatar/image.rs
@ -1,6 +1,6 @@
 use gtk::{gdk, glib, glib::clone, prelude::*, subclass::prelude::*};
 use matrix_sdk::{
-    media::{MediaFormat, MediaRequest, MediaThumbnailSize},
+    media::{MediaFormat, MediaRequest, MediaThumbnailSettings},
    ruma::{
        api::client::media::get_content_thumbnail::v3::Method, events::room::MediaSource, MxcUri,
        OwnedMxcUri,
@ -139,11 +139,11 @@ impl AvatarImage {
        let needed_size = self.needed_size();
        let request = MediaRequest {
            source: MediaSource::Plain(uri),
-            format: MediaFormat::Thumbnail(MediaThumbnailSize {
-                width: needed_size.into(),
-                height: needed_size.into(),
-                method: Method::Scale,
-            }),
+            format: MediaFormat::Thumbnail(MediaThumbnailSettings::new(
+                Method::Scale,
+                needed_size.into(),
+                needed_size.into(),
+            )),
        };
        let handle =
            spawn_tokio!(async move { client.media().get_media_content(&request, true).await });
--- a/src/session/view/content/room_details/history_viewer/media_item.rs
+++ b/src/session/view/content/room_details/history_viewer/media_item.rs
@ -1,5 +1,5 @@
 use gtk::{gdk, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
-use matrix_sdk::media::{MediaEventContent, MediaThumbnailSize};
+use matrix_sdk::media::{MediaEventContent, MediaThumbnailSettings};
 use ruma::{
    api::client::media::get_content_thumbnail::v3::Method,
    events::room::message::{ImageMessageEventContent, MessageType, VideoMessageEventContent},
@ -167,11 +167,11 @@ mod imp {
                    media
                        .get_thumbnail(
                            &content,
-                            MediaThumbnailSize {
-                                method: Method::Scale,
-                                width: THUMBNAIL_SIZE.into(),
-                                height: THUMBNAIL_SIZE.into(),
-                            },
+                            MediaThumbnailSettings::new(
+                                Method::Scale,
+                                THUMBNAIL_SIZE.into(),
+                                THUMBNAIL_SIZE.into(),
+                            ),
                            true,
                        )
                        .await
--- a/src/session/view/content/room_history/message_row/media.rs
+++ b/src/session/view/content/room_history/message_row/media.rs
@ -6,7 +6,7 @@ use gtk::{
    CompositeTemplate,
 };
 use matrix_sdk::{
-    media::{MediaEventContent, MediaThumbnailSize},
+    media::{MediaEventContent, MediaThumbnailSettings},
    ruma::{
        api::client::media::get_content_thumbnail::v3::Method,
        events::{
@ -351,11 +351,11 @@ impl MessageMedia {
                    media
                        .get_thumbnail(
                            &content,
-                            MediaThumbnailSize {
-                                method: Method::Scale,
-                                width: ((MAX_THUMBNAIL_WIDTH * scale_factor) as u32).into(),
-                                height: ((MAX_THUMBNAIL_HEIGHT * scale_factor) as u32).into(),
-                            },
+                            MediaThumbnailSettings::new(
+                                Method::Scale,
+                                ((MAX_THUMBNAIL_WIDTH * scale_factor) as u32).into(),
+                                ((MAX_THUMBNAIL_HEIGHT * scale_factor) as u32).into(),
+                            ),
                            true,
                        )
                        .await