move room_search_result underneath room_screen mod

Author: alanpoon

src/event_preview.rs

@@ -151,7 +151,7 @@ pub fn plaintext_body_of_timeline_item(
             ).text
         }
         TimelineItemContent::OtherState(other_state) => {
-            text_preview_of_other_state(other_state.content(), true, other_state.state_key())
+            text_preview_of_other_state(other_state.content(), false, other_state.state_key())
                 .unwrap_or_else(|| TextPreview::from((
                     String::from("initiated another state change."),
                     BeforeText::UsernameWithoutColon,

src/home/mod.rs

@@ -11,7 +11,6 @@ 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;
@@ -29,7 +28,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_screen::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,10 +4,12 @@
 use bitflags::bitflags;
 use makepad_widgets::*;
 use matrix_sdk::ruma::OwnedEventId;
+use matrix_sdk_ui::timeline::InReplyToDetails;
+use ruma::events::room::message::MessageType;
 
 use crate::sliding_sync::UserPowerLevels;
 
-use super::room_screen::{Eventable, MessageAction, MessageOrSticker, MsgTypeAble};
+use super::room_screen::{MessageViewFromEvent, MessageAction, MessageOrSticker};
 
 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
@@ -246,7 +248,7 @@ bitflags! {
     }
 }
 impl MessageAbilities {
-    pub fn from_user_power_and_event_generic<T: Eventable, M: MsgTypeAble>(
+    pub fn from_user_power_and_event<T: MessageViewFromEvent, M: ContextMenuFromEvent>(
         user_power_levels: &UserPowerLevels,
         event_tl_item: &T,
         _message: &MessageOrSticker<M>,
@@ -618,3 +620,9 @@ impl NewMessageContextMenuRef {
         inner.show(cx, details)
     }
 }
+pub trait ContextMenuFromEvent {
+    fn msgtype(&self) -> &MessageType;
+    fn body(&self) -> &str;
+    fn in_reply_to(&self) -> Option<&InReplyToDetails>;
+    fn is_searched_result(&self) -> bool;
+}

src/home/room_read_receipt.rs

@@ -7,7 +7,7 @@ use makepad_widgets::*;
 use matrix_sdk::ruma::{events::receipt::Receipt, EventId, OwnedUserId, RoomId};
 use std::cmp;
 
-use super::room_screen::Eventable;
+use super::room_screen::MessageViewFromEvent;
 
 
 /// The maximum number of items to display in the read receipts AvatarRow
@@ -226,7 +226,7 @@ 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<T: Eventable>(
+pub fn populate_read_receipts<T: MessageViewFromEvent>(
     item: &WidgetRef,
     cx: &mut Cx,
     room_id: &RoomId,

src/home/room_screen.rs

@@ -16,7 +16,7 @@ use matrix_sdk::{
     }, sliding_sync::VersionBuilder, Client, ClientBuildError, Error, OwnedServerName, Room, RoomMemberships, RoomState
 };
 use matrix_sdk_ui::{
-    room_list_service::{self, RoomListLoadingState}, sync_service::{self, SyncService}, timeline::{AnyOtherFullStateEventContent, EventTimelineItem, MembershipChange, RepliedToInfo, TimelineEventItemId, TimelineItem, TimelineItemContent}, RoomListService, Timeline
+    room_list_service::{self, RoomListLoadingState}, sync_service::{self, SyncService}, timeline::{AnyOtherFullStateEventContent, EventTimelineItem, MembershipChange, RepliedToInfo, TimelineDetails, TimelineEventItemId, TimelineItem, TimelineItemContent}, RoomListService, Timeline
 };
 use robius_open::Uri;
 use tokio::{
@@ -30,7 +30,7 @@ use std::io;
 use ruma::{api::client::{filter::RoomEventFilter, search::search_events::v3::{Criteria, EventContext, OrderBy, Request}}, events::AnyTimelineEvent, uint};
 use crate::{
     app_data_dir, avatar_cache::AvatarUpdate, event_preview::text_preview_of_timeline_item, home::{
-        invite_screen::{JoinRoomAction, LeaveRoomAction}, room_screen::TimelineUpdate, room_search_result::SearchTimelineItem, rooms_list::{self, enqueue_rooms_list_update, InvitedRoomInfo, InviterInfo, JoinedRoomInfo, RoomPreviewAvatar, RoomsListUpdate}
+        invite_screen::{JoinRoomAction, LeaveRoomAction}, room_screen::{TimelineUpdate, SearchTimelineItem}, rooms_list::{self, enqueue_rooms_list_update, InvitedRoomInfo, InviterInfo, JoinedRoomInfo, RoomPreviewAvatar, RoomsListUpdate}
     }, login::login_screen::LoginAction, media_cache::{MediaCacheEntry, MediaCacheEntryRef}, persistent_state::{self, ClientSessionPersisted}, profile::{
         user_profile::{AvatarState, UserProfile},
         user_profile_cache::{enqueue_user_profile_update, UserProfileUpdate},
@@ -382,7 +382,7 @@ pub enum MatrixRequest {
         matrix_id: MatrixId,
         via: Vec<OwnedServerName>
     },
-    /// General Matrix Search API with given categorie
+    /// General Matrix Search API with given categories
     SearchMessages {
         /// The room to search for message.
         room_id: OwnedRoomId,
@@ -838,7 +838,7 @@ async fn async_worker(
 
                 let _typing_notices_task = Handle::current().spawn(async move {
                     while let Ok(user_ids) = typing_notice_receiver.recv().await {
-                        log!("Received typing notifications for room {room_id}: {user_ids:?}");
+                        //log!("Received typing notifications for room {room_id}: {user_ids:?}");
                         let mut users = Vec::with_capacity(user_ids.len());
                         for user_id in user_ids {
                             users.push(
@@ -1148,8 +1148,16 @@ async fn async_worker(
                             let mut last_room_id = None;
                             let result = response.search_categories;
                             let mut items = vec![];
+                            let mut profile_infos = BTreeMap::new();
                             for item in result.room_events.results.iter() {
                                 let Some(event) = item.result.as_ref().and_then(|f|f.deserialize().ok()) else { continue };
+                                for (user_id, profile) in item.context.profile_info.iter() {
+                                    profile_infos.entry(user_id.clone()).or_insert_with(|| TimelineDetails::Ready(matrix_sdk_ui::timeline::Profile{
+                                        display_name: profile.displayname.clone(),
+                                        display_name_ambiguous: false,
+                                        avatar_url:profile.avatar_url.clone()
+                                    }));
+                                }
                                 item.context.events_after.iter().rev().for_each(|f| {
                                     if let Ok(timeline_event) = f.deserialize() {
                                         items.push(SearchTimelineItem::ContextEvent(timeline_event));
@@ -1181,7 +1189,6 @@ async fn async_worker(
                                         if last_room_id != &room_id {
                                             *last_room_id = room_id.clone();
                                             items.push(SearchTimelineItem::RoomHeader(room_id));
-                                            
                                         }
                                     } else {
                                         last_room_id = Some(room_id.clone());
@@ -1191,7 +1198,7 @@ async fn async_worker(
                             }
                             let count = result.room_events.count.and_then(|f| f.to_string().parse().ok()).unwrap_or(0);
                             let highlights = result.room_events.highlights;
-                            if let Err(e) = sender.send(TimelineUpdate::SearchResultReceived { items, count, highlights, search_term: search_term.clone() }) {
+                            if let Err(e) = sender.send(TimelineUpdate::SearchResultReceived { items, count, highlights, search_term: search_term.clone(), profile_infos }) {
                                 error!("Failed to search message in {room_id}; error: {e:?}");
                                 enqueue_popup_notification(format!("Failed to search message. Error: {e}"));
                             }
@@ -2865,6 +2872,8 @@ fn register_core_task(
 
 async fn abort_core_task(core_task: CoreTask) {
     if let Ok(mut tasks) = CORE_TASKS.lock() {
-        tasks.remove(&core_task);
+        if let Some(handle) = tasks.remove(&core_task) {
+            handle.abort();
+        }
     }
 }