Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions crates/matrix-sdk/src/room_preview.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use ruma::{
use tokio::try_join;
use tracing::{instrument, warn};

use crate::{room_directory_search::RoomDirectorySearch, Client, Room};
use crate::{room_directory_search::RoomDirectorySearch, Client, Error, Room};

/// The preview of a room, be it invited/joined/left, or not.
#[derive(Debug, Clone)]
Expand Down Expand Up @@ -172,8 +172,21 @@ impl RoomPreview {
}
}

// Resort to using the room state endpoint, as well as the joined members one.
Self::from_state_events(client, &room_id).await
// Try using the room state endpoint, as well as the joined members one.
match Self::from_state_events(client, &room_id).await {
Ok(res) => return Ok(res),
Err(err) => {
warn!("error when building room preview from state events: {err}");
}
}

// Finally, if everything else fails, try to build the room from information
// that the client itself might have about it.
if let Some(room) = client.get_room(&room_id) {
Ok(Self::from_known_room(&room).await)
} else {
Err(Error::InsufficientData)
}
}

/// Get a [`RoomPreview`] by searching in the room directory for the
Expand Down
22 changes: 22 additions & 0 deletions crates/matrix-sdk/tests/integration/room_preview.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,28 @@ async fn test_room_preview_leave_invited() {
assert_eq!(client.get_room(room_id).unwrap().state(), RoomState::Left);
}

#[async_test]
async fn test_room_preview_invite_leave_room_summary_disabled() {
let (client, server) = logged_in_client_with_server().await;
let room_id = room_id!("!room:localhost");

let mut sync_builder = SyncResponseBuilder::new();
sync_builder.add_invited_room(InvitedRoomBuilder::new(room_id));

mock_sync(&server, sync_builder.build_json_sync_response(), None).await;
client.sync_once(SyncSettings::default()).await.unwrap();
server.reset().await;

mock_leave(room_id, &server).await;

let room_preview = client.get_room_preview(room_id.into(), Vec::new()).await.unwrap();
assert_eq!(room_preview.state.unwrap(), RoomState::Invited);

client.get_room(room_id).unwrap().leave().await.unwrap();

assert_eq!(client.get_room(room_id).unwrap().state(), RoomState::Left);
}

#[async_test]
async fn test_room_preview_leave_knocked() {
let (client, server) = logged_in_client_with_server().await;
Expand Down