val/ratatrix
1
0
Fork 0
Code Issues 4 Pull Requests Actions Activity

Switch to upstream matrix-sdk
Some checks failed
CI / lint (push) Successful in 4m13s
Details
CI / Build and test (, 1.73.0) (push) Failing after 7m32s
Details
CI / Build and test (, beta) (push) Failing after 7m54s
Details
CI / Build and test (, nightly) (push) Failing after 4m32s
Details

Browse Source
This commit is contained in:
Val Lorentz
2023-11-22 16:19:30 +01:00
parent 1c8c6d3e3e
commit 9cef34eb5c
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -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" }

12
src/buffers/room.rs
View File

@ -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