Searching messages in a room (not encrypted)

Cargo.toml

@@ -55,6 +55,7 @@ bytesize = "1.3.0"
 bitflags = "2.6.0"
 indexmap = "2.6.0"
 blurhash = { version = "0.2.3", default-features = false }
+ruma = { git = "https://github.com/ruma/ruma", rev = "7755c7cbc580f8d8aea30d78cc1a6850b1a6fd39", default-features = false, features = ["api", "client-api-c"] }
 
 [package.metadata.docs.rs]
 all-features = true

src/event_preview.rs

@@ -89,7 +89,7 @@ pub fn text_preview_of_timeline_item(
             text_preview_of_member_profile_change(profile_change, sender_username, true)
         }
         TimelineItemContent::OtherState(other_state) => {
-            text_preview_of_other_state(other_state, true)
+            text_preview_of_other_state(other_state.content(), true, other_state.state_key())
                 .unwrap_or_else(|| TextPreview::from((
                     String::from("<i>initiated another state change</i>"),
                     BeforeText::UsernameWithoutColon,
@@ -151,7 +151,7 @@ pub fn plaintext_body_of_timeline_item(
             ).text
         }
         TimelineItemContent::OtherState(other_state) => {
-            text_preview_of_other_state(other_state, false)
+            text_preview_of_other_state(other_state.content(), true, other_state.state_key())
                 .unwrap_or_else(|| TextPreview::from((
                     String::from("initiated another state change."),
                     BeforeText::UsernameWithoutColon,
@@ -312,13 +312,13 @@ pub fn text_preview_of_redacted_message(
     TextPreview::from((text, BeforeText::Nothing))
 }
 
-
 /// Returns a text preview of the given other state event as an Html-formatted string.
 pub fn text_preview_of_other_state(
-    other_state: &timeline::OtherState,
+    other_state: &AnyOtherFullStateEventContent,
     format_as_html: bool,
+    state_key: &str,
 ) -> Option<TextPreview> {
-    let text = match other_state.content() {
+    let text = match other_state {
         AnyOtherFullStateEventContent::RoomAliases(FullStateEventContent::Original { content, .. }) => {
             let mut s = String::from("set this room's aliases to ");
             let last_alias = content.aliases.len() - 1;
@@ -404,17 +404,17 @@ pub fn text_preview_of_other_state(
         }
         AnyOtherFullStateEventContent::SpaceParent(_) => {
             let state_key  = if format_as_html {
-                htmlize::escape_text(other_state.state_key())
+                htmlize::escape_text(state_key)
             } else {
-                Cow::Borrowed(other_state.state_key())
+                Cow::Borrowed(state_key)
             };
             Some(format!("set this room's parent space to \"{state_key}\"."))
         }
         AnyOtherFullStateEventContent::SpaceChild(_) => {
             let state_key  = if format_as_html {
-                htmlize::escape_text(other_state.state_key())
+                htmlize::escape_text(state_key)
             } else {
-                Cow::Borrowed(other_state.state_key())
+                Cow::Borrowed(state_key)
             };
             Some(format!("added a new child to this space: \"{state_key}\"."))
         }

src/home/main_desktop_ui.rs

@@ -2,9 +2,8 @@ use makepad_widgets::*;
 use matrix_sdk::ruma::OwnedRoomId;
 use std::collections::HashMap;
 
-use crate::{app::{AppState, AppStateAction, SelectedRoom}, utils::room_name_or_id};
+use crate::{app::{AppState, AppStateAction, SelectedRoom}, shared::room_filter_input_bar::RoomFilterAction, utils::room_name_or_id};
 use super::{invite_screen::InviteScreenWidgetRefExt, room_screen::RoomScreenWidgetRefExt, rooms_list::RoomsListAction};
-
 live_design! {
     use link::theme::*;
     use link::shaders::*;
@@ -210,6 +209,7 @@ impl MainDesktopUI {
         dock.close_tab(cx, tab_id);
         self.tab_to_close = None;
         self.open_rooms.remove(&tab_id);
+        cx.widget_action(self.widget_uid(), &Scope::empty().path, RoomFilterAction::Clear);
     }
 
     /// Replaces an invite with a joined room in the dock.

src/home/mod.rs

@@ -11,6 +11,7 @@ pub mod main_mobile_ui;
 pub mod room_preview;
 pub mod room_screen;
 pub mod room_read_receipt;
+pub mod room_search_result;
 pub mod rooms_list;
 pub mod rooms_sidebar;
 pub mod spaces_dock;
@@ -28,6 +29,7 @@ pub fn live_design(cx: &mut Cx) {
     new_message_context_menu::live_design(cx);
     invite_screen::live_design(cx);
     room_screen::live_design(cx);
+    room_search_result::live_design(cx);
     room_read_receipt::live_design(cx);
     rooms_sidebar::live_design(cx);
     main_mobile_ui::live_design(cx);

src/home/new_message_context_menu.rs

@@ -4,11 +4,10 @@
 use bitflags::bitflags;
 use makepad_widgets::*;
 use matrix_sdk::ruma::OwnedEventId;
-use matrix_sdk_ui::timeline::EventTimelineItem;
 
 use crate::sliding_sync::UserPowerLevels;
 
-use super::room_screen::{MessageAction, MessageOrSticker};
+use super::room_screen::{Eventable, MessageAction, MessageOrSticker, MsgTypeAble};
 
 const BUTTON_HEIGHT: f64 = 35.0; // KEEP IN SYNC WITH BUTTON_HEIGHT BELOW
 const MENU_WIDTH: f64 = 215.0;   // KEEP IN SYNC WITH MENU_WIDTH BELOW
@@ -247,10 +246,10 @@ bitflags! {
     }
 }
 impl MessageAbilities {
-    pub fn from_user_power_and_event(
+    pub fn from_user_power_and_event_generic<T: Eventable, M: MsgTypeAble>(
         user_power_levels: &UserPowerLevels,
-        event_tl_item: &EventTimelineItem,
-        _message: &MessageOrSticker,
+        event_tl_item: &T,
+        _message: &MessageOrSticker<M>,
         has_html: bool,
     ) -> Self {
         let mut abilities = Self::empty();
@@ -269,7 +268,6 @@ impl MessageAbilities {
         abilities.set(Self::HasHtml, has_html);
         abilities
     }
-
 }
 
 /// Details about the message that define its context menu content.

src/home/room_read_receipt.rs

@@ -5,9 +5,10 @@ use crate::utils::human_readable_list;
 use indexmap::IndexMap;
 use makepad_widgets::*;
 use matrix_sdk::ruma::{events::receipt::Receipt, EventId, OwnedUserId, RoomId};
-use matrix_sdk_ui::timeline::EventTimelineItem;
 use std::cmp;
 
+use super::room_screen::Eventable;
+
 
 /// The maximum number of items to display in the read receipts AvatarRow
 /// and its accompanying tooltip.
@@ -225,18 +226,20 @@ impl AvatarRowRef {
 /// room ID, and an EventTimelineItem, this will populate the avatar
 /// row of the item with the read receipts of the event.
 ///
-pub fn populate_read_receipts(
+pub fn populate_read_receipts<T: Eventable>(
     item: &WidgetRef,
     cx: &mut Cx,
     room_id: &RoomId,
-    event_tl_item: &EventTimelineItem,
+    event_tl_item: &T,
 ) {
-    item.avatar_row(id!(avatar_row)).set_avatar_row(
-        cx,
-        room_id,
-        event_tl_item.event_id(),
-        event_tl_item.read_receipts(),
-    );
+    if let Some(read_receipts) = event_tl_item.read_receipts() {
+        item.avatar_row(id!(avatar_row)).set_avatar_row(
+            cx,
+            room_id,
+            event_tl_item.event_id(),
+            read_receipts,
+        );
+    }
 }
 
 /// Populate the tooltip text for a read receipts avatar row.