Merge pull request #619 from kevinaboos/fetch_room_previews_dynamically

Author: kevinaboos

src/app.rs

@@ -571,7 +571,7 @@ impl App {
             return;
         }
 
-        log!("Navigating to destination room: {}, closing room {room_to_close:?}", destination_room.room_id);
+        log!("Navigating to destination room {} ({:?}), closing room {room_to_close:?}", destination_room.room_id, destination_room.room_name);
 
         // Select and scroll to the destination room in the rooms list.
         let new_selected_room = SelectedRoom::JoinedRoom {

src/home/invite_screen.rs

@@ -8,7 +8,7 @@ use std::ops::Deref;
 use makepad_widgets::*;
 use matrix_sdk::ruma::OwnedRoomId;
 
-use crate::{app::AppStateAction, home::rooms_list::RoomsListRef, join_leave_room_modal::{JoinLeaveModalKind, JoinLeaveRoomModalAction}, room::{BasicRoomDetails, RoomPreviewAvatar}, shared::{avatar::AvatarWidgetRefExt, popup_list::{enqueue_popup_notification, PopupItem, PopupKind}, restore_status_view::RestoreStatusViewWidgetExt}, sliding_sync::{submit_async_request, MatrixRequest}, utils::{self, room_name_or_id}};
+use crate::{app::AppStateAction, home::rooms_list::RoomsListRef, join_leave_room_modal::{JoinLeaveModalKind, JoinLeaveRoomModalAction}, room::{BasicRoomDetails, FetchedRoomAvatar}, shared::{avatar::AvatarWidgetRefExt, popup_list::{enqueue_popup_notification, PopupItem, PopupKind}, restore_status_view::RestoreStatusViewWidgetExt}, sliding_sync::{submit_async_request, MatrixRequest}, utils::{self, room_name_or_id}};
 
 use super::rooms_list::{InviteState, InviterInfo};
 
@@ -451,15 +451,15 @@ impl Widget for InviteScreen {
         let room_view = self.view.view(id!(room_view));
         let room_avatar = room_view.avatar(id!(room_avatar));
         match &info.room_avatar {
-            RoomPreviewAvatar::Text(text) => {
+            FetchedRoomAvatar::Text(text) => {
                 room_avatar.show_text(
                     cx,
                     None,
                     None, // don't make this avatar clickable.
                     text,
                 );
             }
-            RoomPreviewAvatar::Image(avatar_bytes) => {
+            FetchedRoomAvatar::Image(avatar_bytes) => {
                 let _ = room_avatar.show_image(
                     cx,
                     None, // don't make this avatar clickable.

src/home/mod.rs

@@ -10,10 +10,10 @@ pub mod loading_pane;
 pub mod location_preview;
 pub mod main_desktop_ui;
 pub mod main_mobile_ui;
-pub mod room_preview;
 pub mod room_screen;
 pub mod room_read_receipt;
 pub mod rooms_list;
+pub mod rooms_list_entry;
 pub mod rooms_list_header;
 pub mod rooms_sidebar;
 pub mod spaces_dock;
@@ -26,9 +26,9 @@ pub fn live_design(cx: &mut Cx) {
     home_screen::live_design(cx);
     loading_pane::live_design(cx);
     location_preview::live_design(cx);
-    rooms_list::live_design(cx);
+    rooms_list_entry::live_design(cx);
     rooms_list_header::live_design(cx);
-    room_preview::live_design(cx);
+    rooms_list::live_design(cx);
     edited_indicator::live_design(cx);
     editing_pane::live_design(cx);
     new_message_context_menu::live_design(cx);

src/home/room_screen.rs

@@ -19,14 +19,14 @@ use matrix_sdk::{
             sticker::{StickerEventContent, StickerMediaSource},
         },
         matrix_uri::MatrixId, uint, EventId, MatrixToUri, MatrixUri, OwnedEventId, OwnedMxcUri, OwnedRoomId, UserId
-    }, OwnedServerName, SuccessorRoom
+    }, OwnedServerName
 };
 use matrix_sdk_ui::timeline::{
     self, EmbeddedEvent, EncryptedMessage, EventTimelineItem, InReplyToDetails, MemberProfileChange, MsgLikeContent, MsgLikeKind, OtherMessageLike, PollState, RoomMembershipChange, TimelineDetails, TimelineEventItemId, TimelineItem, TimelineItemContent, TimelineItemKind, VirtualTimelineItem
 };
 
 use crate::{
-    app::AppStateAction, avatar_cache, event_preview::{plaintext_body_of_timeline_item, text_preview_of_encrypted_message, text_preview_of_member_profile_change, text_preview_of_other_message_like, text_preview_of_other_state, text_preview_of_redacted_message, text_preview_of_room_membership_change, text_preview_of_timeline_item}, home::{edited_indicator::EditedIndicatorWidgetRefExt, link_preview::{LinkPreviewCache, LinkPreviewRef, LinkPreviewWidgetRefExt}, loading_pane::{LoadingPaneState, LoadingPaneWidgetExt}, rooms_list::RoomsListRef}, media_cache::{MediaCache, MediaCacheEntry}, profile::{
+    app::AppStateAction, avatar_cache, event_preview::{plaintext_body_of_timeline_item, text_preview_of_encrypted_message, text_preview_of_member_profile_change, text_preview_of_other_message_like, text_preview_of_other_state, text_preview_of_redacted_message, text_preview_of_room_membership_change, text_preview_of_timeline_item}, home::{edited_indicator::EditedIndicatorWidgetRefExt, link_preview::{LinkPreviewCache, LinkPreviewRef, LinkPreviewWidgetRefExt}, loading_pane::{LoadingPaneState, LoadingPaneWidgetExt}, rooms_list::RoomsListRef, tombstone_footer::SuccessorRoomDetails}, media_cache::{MediaCache, MediaCacheEntry}, profile::{
         user_profile::{AvatarState, ShowUserProfileAction, UserProfile, UserProfileAndRoomId, UserProfilePaneInfo, UserProfileSlidingPaneRef, UserProfileSlidingPaneWidgetExt},
         user_profile_cache,
     },
@@ -1393,10 +1393,10 @@ impl RoomScreen {
                 TimelineUpdate::OwnUserReadReceipt(receipt) => {
                     tl.latest_own_user_receipt = Some(receipt);
                 }
-                TimelineUpdate::Tombstoned(successor_room) => {
+                TimelineUpdate::Tombstoned(successor_room_details) => {
                     self.view.room_input_bar(id!(room_input_bar))
-                        .update_tombstone_footer(cx, &tl.room_id, successor_room.as_ref());
-                    tl.tombstone_info = successor_room;
+                        .update_tombstone_footer(cx, &tl.room_id, Some(&successor_room_details));
+                    tl.tombstone_info = Some(successor_room_details);
                 }
             }
         }
@@ -1954,6 +1954,17 @@ impl RoomScreen {
                 successor_room,
             } = timeline_endpoints;
 
+            // Start with the basic tombstone info, and fetch the full details
+            // if the room has been tombstoned.
+            let tombstone_info = if let Some(sr) = successor_room {
+                submit_async_request(MatrixRequest::GetSuccessorRoomDetails {
+                    tombstoned_room_id: room_id.clone(),
+                });
+                Some(SuccessorRoomDetails::Basic(sr))
+            } else {
+                None
+            };
+
             let tl_state = TimelineUiState {
                 room_id: room_id.clone(),
                 // Initially, we assume the user has all power levels by default.
@@ -1978,7 +1989,7 @@ impl RoomScreen {
                 prev_first_index: None,
                 scrolled_past_read_marker: false,
                 latest_own_user_receipt: None,
-                tombstone_info: successor_room,
+                tombstone_info,
             };
             (tl_state, true)
         };
@@ -2147,6 +2158,7 @@ impl RoomScreen {
             cx,
             &tl_state.room_id,
             saved_room_input_bar_state,
+            tl_state.user_power,
             tl_state.tombstone_info.as_ref(),
         );
     }
@@ -2168,7 +2180,7 @@ impl RoomScreen {
         self.room_id = Some(room_id.clone());
 
         // We initially tell every MentionableTextInput widget that the current user
-        // *does not* has privileges to notify the entire room;
+        // *does not* have privileges to notify the entire room;
         // this gets properly updated when room PowerLevels get fetched.
         cx.action(MentionableTextInputAction::PowerLevelsUpdated {
             room_id: room_id.clone(),
@@ -2418,10 +2430,9 @@ pub enum TimelineUpdate {
     UserPowerLevels(UserPowerLevels),
     /// An update to the currently logged-in user's own read receipt for this room.
     OwnUserReadReceipt(Receipt),
-    /// A notice that the given room has been tombstoned,
-    /// includes a `SuccessorRoom` that contains the successor room.
-    /// If the room is not tombstoned, then the `SuccessorRoom` is `None`.
-    Tombstoned(Option<SuccessorRoom>),
+    /// A notice that the given room has been tombstoned (closed)
+    /// and replaced by the given successor room.
+    Tombstoned(SuccessorRoomDetails),
 }
 
 thread_local! {
@@ -2534,9 +2545,9 @@ struct TimelineUiState {
     scrolled_past_read_marker: bool,
     latest_own_user_receipt: Option<Receipt>,
 
-    /// If this room has been tombstoned, this has details of its successor room.
-    /// If the room is not tombstoned, this is `None`.
-    tombstone_info: Option<SuccessorRoom>,
+    /// If `Some`, this room has been tombstoned and the details of its successor room
+    /// are contained within. If `None`, the room has not been tombstoned.
+    tombstone_info: Option<SuccessorRoomDetails>,
 }
 
 #[derive(Default, Debug)]

src/home/rooms_list.rs

@@ -4,14 +4,14 @@ use makepad_widgets::*;
 use matrix_sdk::{ruma::{events::tag::Tags, MilliSecondsSinceUnixEpoch, OwnedRoomAliasId, OwnedRoomId, OwnedUserId}, RoomState};
 use crate::{
     app::{AppState, SelectedRoom},
-    room::{room_display_filter::{RoomDisplayFilter, RoomDisplayFilterBuilder, RoomFilterCriteria, SortFn}, RoomPreviewAvatar},
+    room::{room_display_filter::{RoomDisplayFilter, RoomDisplayFilterBuilder, RoomFilterCriteria, SortFn}, FetchedRoomAvatar},
     shared::{collapsible_header::{CollapsibleHeaderAction, CollapsibleHeaderWidgetRefExt, HeaderCategory}, jump_to_bottom_button::UnreadMessageCount, popup_list::{enqueue_popup_notification, PopupItem, PopupKind}, room_filter_input_bar::RoomFilterAction},
     sliding_sync::{submit_async_request, MatrixRequest, PaginationDirection}, utils::room_name_or_id,
 };
-use super::room_preview::RoomPreviewAction;
+use super::rooms_list_entry::RoomsListEntryAction;
 
 /// Whether to pre-paginate visible rooms at least once in order to
-/// be able to display the latest message in the room preview,
+/// be able to display the latest message in a room's RoomsListEntry,
 /// and to have something to immediately show when a user first opens a room.
 const PREPAGINATE_VISIBLE_ROOMS: bool = true;
 
@@ -54,7 +54,7 @@ live_design! {
     use crate::shared::avatar::Avatar;
     use crate::shared::html_or_plaintext::HtmlOrPlaintext;
     use crate::shared::collapsible_header::*;
-    use crate::home::room_preview::*;
+    use crate::home::rooms_list_entry::*;
 
     StatusLabel = <View> {
         width: Fill, height: Fit,
@@ -86,7 +86,7 @@ live_design! {
             flow: Down, spacing: 0.0
 
             collapsible_header = <CollapsibleHeader> {}
-            room_preview = <RoomPreview> {}
+            rooms_list_entry = <RoomsListEntry> {}
             empty = <View> {}
             status_label = <StatusLabel> {}
             bottom_filler = <View> {
@@ -137,7 +137,7 @@ pub enum RoomsListUpdate {
     /// Update the avatar (image) for the given room.
     UpdateRoomAvatar {
         room_id: OwnedRoomId,
-        avatar: RoomPreviewAvatar,
+        avatar: FetchedRoomAvatar,
     },
     /// Update whether the given room is a direct room.
     UpdateIsDirect {
@@ -218,10 +218,10 @@ pub struct JoinedRoomInfo {
     pub latest: Option<(MilliSecondsSinceUnixEpoch, String)>,
     /// The avatar for this room: either an array of bytes holding the avatar image
     /// or a string holding the first Unicode character of the room name.
-    pub avatar: RoomPreviewAvatar,
+    pub avatar: FetchedRoomAvatar,
     /// Whether this room has been paginated at least once.
     /// We pre-paginate visible rooms at least once in order to
-    /// be able to display the latest message in the room preview,
+    /// be able to display the latest message in the RoomsListEntry
     /// and to have something to immediately show when a user first opens a room.
     pub has_been_paginated: bool,
     /// Whether this room is currently selected in the UI.
@@ -247,7 +247,7 @@ pub struct InvitedRoomInfo {
     pub alt_aliases: Vec<OwnedRoomAliasId>,
     /// The avatar for this room: either an array of bytes holding the avatar image
     /// or a string holding the first Unicode character of the room name.
-    pub room_avatar: RoomPreviewAvatar,
+    pub room_avatar: FetchedRoomAvatar,
     /// Info about the user who invited us to this room, if available.
     pub inviter_info: Option<InviterInfo>,
     /// The timestamp and Html text content of the latest message in this room.
@@ -309,7 +309,7 @@ pub struct RoomsList {
     /// This is a shared reference to the thread-local [`ALL_INVITED_ROOMS`] variable.
     #[rust] invited_rooms: Rc<RefCell<HashMap<OwnedRoomId, InvitedRoomInfo>>>,
 
-    /// The set of all joined rooms and their cached preview info.
+    /// The set of all joined rooms and their cached info.
     /// This includes both direct rooms and regular rooms.
     #[rust] all_joined_rooms: HashMap<OwnedRoomId, JoinedRoomInfo>,
 
@@ -828,16 +828,6 @@ impl RoomsList {
             regular_rooms_indexes,
         )
     }
-
-    /// Returns a room's avatar and displayable name.
-    pub fn get_room_avatar_and_name(&self, room_id: &OwnedRoomId) -> Option<(RoomPreviewAvatar, Option<String>)> {
-        self.all_joined_rooms.get(room_id)
-            .map(|room_info| (room_info.avatar.clone(), room_info.room_name.clone()))
-            .or_else(|| {
-                self.invited_rooms.borrow().get(room_id)
-                    .map(|room_info| (room_info.room_avatar.clone(), room_info.room_name.clone()))
-            })
-    }
 }
 
 impl Widget for RoomsList {
@@ -856,7 +846,7 @@ impl Widget for RoomsList {
             |cx| self.view.handle_event(cx, event, &mut Scope::with_props(&props))
         );
         for list_action in list_actions {
-            if let RoomPreviewAction::Clicked(clicked_room_id) = list_action.as_widget_action().cast() {
+            if let RoomsListEntryAction::Clicked(clicked_room_id) = list_action.as_widget_action().cast() {
                 let new_selected_room = if let Some(jr) = self.all_joined_rooms.get(&clicked_room_id) {
                     SelectedRoom::JoinedRoom {
                         room_id: jr.room_id.clone().into(),
@@ -970,10 +960,10 @@ impl Widget for RoomsList {
                 else if let Some(invited_room_id) = get_invited_room_id(portal_list_index) {
                     let mut invited_rooms_mut = self.invited_rooms.borrow_mut();
                     if let Some(invited_room) = invited_rooms_mut.get_mut(invited_room_id) {
-                        let item = list.item(cx, portal_list_index, live_id!(room_preview));
+                        let item = list.item(cx, portal_list_index, live_id!(rooms_list_entry));
                         invited_room.is_selected =
                             self.current_active_room.as_deref() == Some(invited_room_id);
-                        // Pass the room info down to the RoomPreview widget via Scope.
+                        // Pass the room info down to the RoomsListEntry widget via Scope.
                         scope = Scope::with_props(&*invited_room);
                         item.draw_all(cx, &mut scope);
                     } else {
@@ -995,7 +985,7 @@ impl Widget for RoomsList {
                 }
                 else if let Some(direct_room_id) = get_direct_room_id(portal_list_index) {
                     if let Some(direct_room) = self.all_joined_rooms.get_mut(direct_room_id) {
-                        let item = list.item(cx, portal_list_index, live_id!(room_preview));
+                        let item = list.item(cx, portal_list_index, live_id!(rooms_list_entry));
                         direct_room.is_selected =
                             self.current_active_room.as_ref() == Some(direct_room_id);
 
@@ -1008,7 +998,7 @@ impl Widget for RoomsList {
                                 direction: PaginationDirection::Backwards,
                             });
                         }
-                        // Pass the room info down to the RoomPreview widget via Scope.
+                        // Pass the room info down to the RoomsListEntry widget via Scope.
                         scope = Scope::with_props(&*direct_room);
                         item.draw_all(cx, &mut scope);
                     } else {
@@ -1030,7 +1020,7 @@ impl Widget for RoomsList {
                 }
                 else if let Some(regular_room_id) = get_regular_room_id(portal_list_index) {
                     if let Some(regular_room) = self.all_joined_rooms.get_mut(regular_room_id) {
-                        let item = list.item(cx, portal_list_index, live_id!(room_preview));
+                        let item = list.item(cx, portal_list_index, live_id!(rooms_list_entry));
                         regular_room.is_selected =
                             self.current_active_room.as_ref() == Some(regular_room_id);
 
@@ -1043,7 +1033,7 @@ impl Widget for RoomsList {
                                 direction: PaginationDirection::Backwards,
                             });
                         }
-                        // Pass the room info down to the RoomPreview widget via Scope.
+                        // Pass the room info down to the RoomsListEntry widget via Scope.
                         scope = Scope::with_props(&*regular_room);
                         item.draw_all(cx, &mut scope);
                     } else {
@@ -1087,13 +1077,8 @@ impl RoomsListRef {
         };
         inner.is_room_loaded(room_id)
     }
-
-    /// See [`RoomsList::get_room_avatar_and_name()`].
-    pub fn get_room_avatar_and_name(&self, room_id: &OwnedRoomId) -> Option<(RoomPreviewAvatar, Option<String>)> {
-        let inner = self.borrow()?;
-        inner.get_room_avatar_and_name(room_id)
-    }
 }
+
 pub struct RoomsListScopeProps {
     /// Whether the RoomsList's inner PortalList was scrolling
     /// when the latest finger down event occurred.