From 9cef34eb5cb9547e743c97486327919e7724c623 Mon Sep 17 00:00:00 2001 From: Val Lorentz Date: Wed, 22 Nov 2023 16:19:30 +0100 Subject: [PATCH] Switch to upstream matrix-sdk --- Cargo.toml | 4 ++-- src/buffers/room.rs | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5110242..955aa98 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,8 +58,8 @@ sorted-vec = "0.8.3" eyeball = "0.8.7" # data structures observer returned by matrix-sdk-ui eyeball-im = "0.4.2" # immutable data structures observer returned by matrix-sdk-ui imbl = "2.0" # ditto -matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk.git", rev = "34060957855fdcb91af820a75df20774949e41be", features = ["eyre", "markdown"] } -matrix-sdk-ui = { git = "https://github.com/matrix-org/matrix-rust-sdk.git", rev = "34060957855fdcb91af820a75df20774949e41be" } +matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk.git", rev = "5c37acb81ce624d83be54b5140cd60399b556fb2", features = ["eyre", "markdown"] } +matrix-sdk-ui = { git = "https://github.com/matrix-org/matrix-rust-sdk.git", rev = "5c37acb81ce624d83be54b5140cd60399b556fb2" } #matrix-sdk = { path = "../matrix-rust-sdk/crates/matrix-sdk", features = ["eyre", "markdown"] } #matrix-sdk-ui = { path = "../matrix-rust-sdk/crates/matrix-sdk-ui" } diff --git a/src/buffers/room.rs b/src/buffers/room.rs index 8ecfd62..30b702f 100644 --- a/src/buffers/room.rs +++ b/src/buffers/room.rs @@ -699,10 +699,18 @@ async fn compute_room_info( parents .flat_map_unordered(None, |parent| { futures::stream::iter(match parent { - ParentSpace::Reciprocal(space) | ParentSpace::WithPowerlevel(space) => { + Ok(ParentSpace::Reciprocal(space)) | Ok(ParentSpace::WithPowerlevel(space)) => { Some(space.room_id().to_owned()) }, - ParentSpace::Unverifiable(_) | ParentSpace::Illegitimate(_) => None, + Ok(ParentSpace::Unverifiable(_)) | Ok(ParentSpace::Illegitimate(_)) => None, + Err(e) => { + tracing::error!( + "Failed to confirm parent space of {}: {:?}", + room.room_id(), + e + ); + None + }, }) }) .next() // Get the first one to be ready. TODO: take the canonical space