From a3b132f86aa0c00f9cfc154e75ad36ab211b0ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Wed, 13 Aug 2025 10:28:28 +0200 Subject: [PATCH] Upgrade matrix-sdk Brings in fixes for sending media with the unauthenticated endpoints. --- Cargo.lock | 34 ++++++++++---------- Cargo.toml | 8 ++--- src/session/model/room/timeline/event/mod.rs | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7c162b04..052ffc63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3029,7 +3029,7 @@ dependencies = [ [[package]] name = "matrix-sdk" version = "0.13.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=872713c4bc024ac9246dfa72f834584ebe92a3d7#872713c4bc024ac9246dfa72f834584ebe92a3d7" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a9ce1c6e5822b8eb8411c5bc257049d9a9d15884#a9ce1c6e5822b8eb8411c5bc257049d9a9d15884" dependencies = [ "anymap2", "aquamarine", @@ -3086,7 +3086,7 @@ dependencies = [ [[package]] name = "matrix-sdk-base" version = "0.13.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=872713c4bc024ac9246dfa72f834584ebe92a3d7#872713c4bc024ac9246dfa72f834584ebe92a3d7" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a9ce1c6e5822b8eb8411c5bc257049d9a9d15884#a9ce1c6e5822b8eb8411c5bc257049d9a9d15884" dependencies = [ "as_variant", "async-trait", @@ -3113,7 +3113,7 @@ dependencies = [ [[package]] name = "matrix-sdk-common" version = "0.13.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=872713c4bc024ac9246dfa72f834584ebe92a3d7#872713c4bc024ac9246dfa72f834584ebe92a3d7" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a9ce1c6e5822b8eb8411c5bc257049d9a9d15884#a9ce1c6e5822b8eb8411c5bc257049d9a9d15884" dependencies = [ "eyeball-im", "futures-core", @@ -3136,7 +3136,7 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" version = "0.13.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=872713c4bc024ac9246dfa72f834584ebe92a3d7#872713c4bc024ac9246dfa72f834584ebe92a3d7" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a9ce1c6e5822b8eb8411c5bc257049d9a9d15884#a9ce1c6e5822b8eb8411c5bc257049d9a9d15884" dependencies = [ "aes", "aquamarine", @@ -3177,7 +3177,7 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" version = "0.13.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=872713c4bc024ac9246dfa72f834584ebe92a3d7#872713c4bc024ac9246dfa72f834584ebe92a3d7" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a9ce1c6e5822b8eb8411c5bc257049d9a9d15884#a9ce1c6e5822b8eb8411c5bc257049d9a9d15884" dependencies = [ "anyhow", "async-trait", @@ -3205,7 +3205,7 @@ dependencies = [ [[package]] name = "matrix-sdk-qrcode" version = "0.13.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=872713c4bc024ac9246dfa72f834584ebe92a3d7#872713c4bc024ac9246dfa72f834584ebe92a3d7" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a9ce1c6e5822b8eb8411c5bc257049d9a9d15884#a9ce1c6e5822b8eb8411c5bc257049d9a9d15884" dependencies = [ "byteorder", "qrcode", @@ -3217,7 +3217,7 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" version = "0.13.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=872713c4bc024ac9246dfa72f834584ebe92a3d7#872713c4bc024ac9246dfa72f834584ebe92a3d7" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a9ce1c6e5822b8eb8411c5bc257049d9a9d15884#a9ce1c6e5822b8eb8411c5bc257049d9a9d15884" dependencies = [ "as_variant", "async-trait", @@ -3242,7 +3242,7 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" version = "0.13.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=872713c4bc024ac9246dfa72f834584ebe92a3d7#872713c4bc024ac9246dfa72f834584ebe92a3d7" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a9ce1c6e5822b8eb8411c5bc257049d9a9d15884#a9ce1c6e5822b8eb8411c5bc257049d9a9d15884" dependencies = [ "base64", "blake3", @@ -3261,7 +3261,7 @@ dependencies = [ [[package]] name = "matrix-sdk-ui" version = "0.13.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=872713c4bc024ac9246dfa72f834584ebe92a3d7#872713c4bc024ac9246dfa72f834584ebe92a3d7" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a9ce1c6e5822b8eb8411c5bc257049d9a9d15884#a9ce1c6e5822b8eb8411c5bc257049d9a9d15884" dependencies = [ "as_variant", "async-rx", @@ -4237,7 +4237,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.12.6" -source = "git+https://github.com/ruma/ruma.git?rev=e73f302e4df7f5f0511fca1aa43853d4cf8416c8#e73f302e4df7f5f0511fca1aa43853d4cf8416c8" +source = "git+https://github.com/ruma/ruma.git?rev=a2fe858133ba932b4bda730dc7472c9c985739a0#a2fe858133ba932b4bda730dc7472c9c985739a0" dependencies = [ "assign", "js_int", @@ -4253,7 +4253,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.20.4" -source = "git+https://github.com/ruma/ruma.git?rev=e73f302e4df7f5f0511fca1aa43853d4cf8416c8#e73f302e4df7f5f0511fca1aa43853d4cf8416c8" +source = "git+https://github.com/ruma/ruma.git?rev=a2fe858133ba932b4bda730dc7472c9c985739a0#a2fe858133ba932b4bda730dc7472c9c985739a0" dependencies = [ "as_variant", "assign", @@ -4276,7 +4276,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.15.4" -source = "git+https://github.com/ruma/ruma.git?rev=e73f302e4df7f5f0511fca1aa43853d4cf8416c8#e73f302e4df7f5f0511fca1aa43853d4cf8416c8" +source = "git+https://github.com/ruma/ruma.git?rev=a2fe858133ba932b4bda730dc7472c9c985739a0#a2fe858133ba932b4bda730dc7472c9c985739a0" dependencies = [ "as_variant", "base64", @@ -4309,7 +4309,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.30.5" -source = "git+https://github.com/ruma/ruma.git?rev=e73f302e4df7f5f0511fca1aa43853d4cf8416c8#e73f302e4df7f5f0511fca1aa43853d4cf8416c8" +source = "git+https://github.com/ruma/ruma.git?rev=a2fe858133ba932b4bda730dc7472c9c985739a0#a2fe858133ba932b4bda730dc7472c9c985739a0" dependencies = [ "as_variant", "indexmap", @@ -4335,7 +4335,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.11.2" -source = "git+https://github.com/ruma/ruma.git?rev=e73f302e4df7f5f0511fca1aa43853d4cf8416c8#e73f302e4df7f5f0511fca1aa43853d4cf8416c8" +source = "git+https://github.com/ruma/ruma.git?rev=a2fe858133ba932b4bda730dc7472c9c985739a0#a2fe858133ba932b4bda730dc7472c9c985739a0" dependencies = [ "headers", "http", @@ -4353,7 +4353,7 @@ dependencies = [ [[package]] name = "ruma-html" version = "0.4.1" -source = "git+https://github.com/ruma/ruma.git?rev=e73f302e4df7f5f0511fca1aa43853d4cf8416c8#e73f302e4df7f5f0511fca1aa43853d4cf8416c8" +source = "git+https://github.com/ruma/ruma.git?rev=a2fe858133ba932b4bda730dc7472c9c985739a0#a2fe858133ba932b4bda730dc7472c9c985739a0" dependencies = [ "as_variant", "html5ever", @@ -4365,7 +4365,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.10.1" -source = "git+https://github.com/ruma/ruma.git?rev=e73f302e4df7f5f0511fca1aa43853d4cf8416c8#e73f302e4df7f5f0511fca1aa43853d4cf8416c8" +source = "git+https://github.com/ruma/ruma.git?rev=a2fe858133ba932b4bda730dc7472c9c985739a0#a2fe858133ba932b4bda730dc7472c9c985739a0" dependencies = [ "js_int", "thiserror 2.0.12", @@ -4374,7 +4374,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.15.2" -source = "git+https://github.com/ruma/ruma.git?rev=e73f302e4df7f5f0511fca1aa43853d4cf8416c8#e73f302e4df7f5f0511fca1aa43853d4cf8416c8" +source = "git+https://github.com/ruma/ruma.git?rev=a2fe858133ba932b4bda730dc7472c9c985739a0#a2fe858133ba932b4bda730dc7472c9c985739a0" dependencies = [ "cfg-if", "proc-macro-crate", diff --git a/Cargo.toml b/Cargo.toml index 5da24927..00c609e3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,23 +74,23 @@ sourceview = { package = "sourceview5", version = "0.9" } [dependencies.matrix-sdk] # version = "0.13" git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "872713c4bc024ac9246dfa72f834584ebe92a3d7" +rev = "a9ce1c6e5822b8eb8411c5bc257049d9a9d15884" features = ["socks", "sso-login", "markdown", "qrcode"] [dependencies.matrix-sdk-store-encryption] # version = "0.13" git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "872713c4bc024ac9246dfa72f834584ebe92a3d7" +rev = "a9ce1c6e5822b8eb8411c5bc257049d9a9d15884" [dependencies.matrix-sdk-ui] # version = "0.13" git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "872713c4bc024ac9246dfa72f834584ebe92a3d7" +rev = "a9ce1c6e5822b8eb8411c5bc257049d9a9d15884" [dependencies.ruma] # version = "0.12.5" git = "https://github.com/ruma/ruma.git" -rev = "e73f302e4df7f5f0511fca1aa43853d4cf8416c8" +rev = "a2fe858133ba932b4bda730dc7472c9c985739a0" features = [ "client-api-c", "markdown", diff --git a/src/session/model/room/timeline/event/mod.rs b/src/session/model/room/timeline/event/mod.rs index d24c3054..0dc36151 100644 --- a/src/session/model/room/timeline/event/mod.rs +++ b/src/session/model/room/timeline/event/mod.rs @@ -316,7 +316,7 @@ mod imp { if let Some(send_state) = item.send_state() { match send_state { - EventSendState::NotSentYet => return MessageState::Sending, + EventSendState::NotSentYet { .. } => return MessageState::Sending, EventSendState::SendingFailed { error, is_recoverable,