Added Sender Profile for search

alanpoon · alanpoon · commit 36fbbbc021ae · 2025-05-19T16:19:34.000+08:00
diff --git a/src/home/new_message_context_menu.rs b/src/home/new_message_context_menu.rs
@@ -377,7 +377,6 @@ impl WidgetMatchEvent for NewMessageContextMenu {
             close_menu = false;
         }
         else if self.button(id!(reply_button)).clicked(actions) {
-            println!("clicked details {:?}", details);
             cx.widget_action(
                 details.room_screen_widget_uid,
                 &scope.path,
diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
@@ -17,7 +17,7 @@ use matrix_sdk::{room::RoomMember, ruma::{
     sticker::StickerEventContent, Mentions}, matrix_uri::MatrixId, uint, EventId, MatrixToUri, MatrixUri, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedMxcUri, OwnedRoomId
 }, OwnedServerName};
 use matrix_sdk_ui::timeline::{
-    self, EventTimelineItem, InReplyToDetails, MemberProfileChange, ReactionsByKeyBySender, RepliedToInfo, RoomMembershipChange, TimelineDetails, TimelineEventItemId, TimelineItem, TimelineItemContent, TimelineItemKind, VirtualTimelineItem
+    self, EventTimelineItem, InReplyToDetails, MemberProfileChange, Profile, ReactionsByKeyBySender, RepliedToInfo, RoomMembershipChange, TimelineDetails, TimelineEventItemId, TimelineItem, TimelineItemContent, TimelineItemKind, VirtualTimelineItem
 };
 use ruma::{OwnedUserId, UserId};
 
@@ -1700,16 +1700,20 @@ impl RoomScreen {
                 TimelineUpdate::OwnUserReadReceipt(receipt) => {
                     tl.latest_own_user_receipt = Some(receipt);
                 }
-                TimelineUpdate::SearchResultReceived { items, count, highlights, search_term } => {
+                TimelineUpdate::SearchResultReceived { items, count, highlights, search_term, profile_infos } => {
                     let mut criteria = self.view.search_result(id!(search_result_plane)).get_search_criteria();
+                    if criteria.search_term != search_term {
+                        tl.search_result_state.items = Vector::new();
+                    }
+                    tl.search_result_state.profiles_info = profile_infos;
                     criteria.search_term = search_term;
                     self.view.search_result(id!(search_result_plane)).set_search_criteria(cx, criteria);
                     self.view.search_result(id!(search_result_plane)).set_result_count(cx, count);
                     self.view.view(id!(search_timeline)).set_visible(cx, true);
                     tl.search_result_state.content_drawn_since_last_update.clear();
                     tl.search_result_state.profile_drawn_since_last_update.clear();
                     for item in items {
-                         tl.search_result_state.items.push_front(item.clone());
+                        tl.search_result_state.items.push_front(item.clone());
                     }
                     search_portal_list.set_first_id_and_scroll(tl.search_result_state.items.len().saturating_sub(1), 0.0);
                     search_portal_list.set_tail_range(true);
@@ -2801,6 +2805,7 @@ pub enum TimelineUpdate {
     /// Display Search result in Makepad's widget
     SearchResultReceived {
         items: Vec<SearchTimelineItem>,
+        profile_infos: BTreeMap<OwnedUserId, TimelineDetails<Profile>>,
         count: u32,
         highlights: Vec<String>,
         search_term: String
@@ -2922,6 +2927,7 @@ pub struct SearchResultState {
     content_drawn_since_last_update: RangeSet<usize>,
     /// Same as `content_drawn_since_last_update`, but for the event **profiles** (avatar, username).
     profile_drawn_since_last_update: RangeSet<usize>,
+    profiles_info: BTreeMap<OwnedUserId, TimelineDetails<Profile>>
 }
 
 #[derive(Default, Debug)]
@@ -3713,7 +3719,6 @@ pub fn populate_message_view<T,P,M>(
             .set_text(cx, &format!("{}", ts_millis.get()));
     }
     if is_contextual {
-        //item.view(id!(overlay_message)).set_visible(cx, true);
         item.view(id!(overlay_message)).apply_over(cx, live!{
             draw_bg: {color: (vec4(1.0, 1.0, 1.0, 0.5)),}
         });
@@ -4043,7 +4048,6 @@ fn draw_replied_to_message(
     let fully_drawn: bool;
     let show_reply: bool;
     let mut replied_to_event_id = None;
-
     if let Some(in_reply_to_details) = in_reply_to {
         replied_to_event_id = Some(in_reply_to_details.event_id.to_owned());
         show_reply = true;
diff --git a/src/home/room_search_result.rs b/src/home/room_search_result.rs
@@ -1,8 +1,8 @@
-use std::ops::DerefMut;
+use std::{collections::BTreeMap, ops::DerefMut};
 
 use indexmap::IndexMap;
 use makepad_widgets::*;
-use matrix_sdk_ui::timeline::{AnyOtherFullStateEventContent, InReplyToDetails, ReactionsByKeyBySender, TimelineDetails, TimelineEventItemId};
+use matrix_sdk_ui::timeline::{AnyOtherFullStateEventContent, InReplyToDetails, Profile, ReactionsByKeyBySender, TimelineDetails, TimelineEventItemId};
 use ruma::{events::{receipt::Receipt, room::message::{AudioMessageEventContent, EmoteMessageEventContent, FileMessageEventContent, FormattedBody, ImageMessageEventContent, KeyVerificationRequestEventContent, MessageType, NoticeMessageEventContent, Relation, RoomMessageEventContent, TextMessageEventContent, VideoMessageEventContent}, AnyMessageLikeEvent, AnyMessageLikeEventContent, AnyStateEventContent, AnyTimelineEvent, FullStateEventContent}, uint, EventId, MilliSecondsSinceUnixEpoch, OwnedRoomId, OwnedUserId, UserId};
 
 use crate::{event_preview::text_preview_of_other_state, shared::room_filter_input_bar::RoomFilterAction, sliding_sync::{current_user_id, submit_async_request, MatrixRequest}, utils::unix_time_millis_to_datetime};
@@ -40,14 +40,14 @@ live_design! {
                 text_style: <MESSAGE_TEXT_STYLE> { font_size: 10 },
                 color: (TIMESTAMP_TEXT_COLOR)
             }
-            text: "Loading earlier messages..."
+            text: "Loading search results..."
         }
     }
     SearchIcon = <Icon> {
         align: {x: 0.0} // Align to top-right
         spacing: 10,
         margin: {top: 0, left: 10},
-        padding: {top: 10, bottom: 10, left: 8, right: 15}
+        padding: 10,
         width: Fit,
         height: Fit,
         draw_bg: {
@@ -130,14 +130,16 @@ live_design! {
                     text: "Search All Rooms"
                 }
                 cancel_button = <RobrixIconButton> {
-                    align: {x: 1.0}
-                    margin: {right: 10, top: 0},
                     width: Fit,
-                    height: 32,
-                    padding: {left: 15, right: 15}
+                    height: Fit,
+                    padding: 10,
+                    spacing: 0,
+                    margin: {left: 0, right: 15, top: -2},
+
                     draw_bg: {
                         border_color: (COLOR_DANGER_RED),
                         color: #fff0f0 // light red
+                        border_radius: 5
                     }
                     draw_icon: {
                         svg_file: (ICON_CLOSE),
@@ -302,8 +304,8 @@ pub fn search_result_draw_walk(room_screen: &mut RoomScreen, cx: &mut Cx2d, scop
                     continue;
                 };
                 let item_drawn_status = ItemDrawnStatus {
-                    content_drawn: tl_state.content_drawn_since_last_update.contains(&tl_idx),
-                    profile_drawn: tl_state.profile_drawn_since_last_update.contains(&tl_idx),
+                    content_drawn: tl_state.search_result_state.content_drawn_since_last_update.contains(&tl_idx),
+                    profile_drawn: tl_state.search_result_state.profile_drawn_since_last_update.contains(&tl_idx),
                 };
                 let (item, item_new_draw_status) = {
                     let current_item = timeline_item;
@@ -329,8 +331,9 @@ pub fn search_result_draw_walk(room_screen: &mut RoomScreen, cx: &mut Cx2d, scop
                                     content = replace.original_content();
                                 }
                                 match content {
-                                    Some(AnyMessageLikeEventContent::RoomMessage(mut message)) => {
+                                    Some(AnyMessageLikeEventContent::RoomMessage(message)) => {
                                         let mut in_reply_to_details = None;
+                                        let mut message = message.clone();
                                         if let Some(relation) = &message.relates_to {
                                             match relation {
                                                 Relation::Replacement(replace) => {
@@ -344,6 +347,7 @@ pub fn search_result_draw_walk(room_screen: &mut RoomScreen, cx: &mut Cx2d, scop
                                             }
                                         }
                                         let is_contextual = matches!(&current_item, SearchTimelineItem::ContextEvent(_));
+                                         
                                         if let MessageType::Text(text) = &mut message.msgtype {
                                             if let Some(ref mut formatted) = text.formatted {
                                                 for highlight in tl_state.search_result_state.highlighted_strings.iter() {
@@ -357,7 +361,7 @@ pub fn search_result_draw_walk(room_screen: &mut RoomScreen, cx: &mut Cx2d, scop
                                                 text.formatted = Some(FormattedBody::html(formated_string));
                                             }
                                         }
-                                        let event = &EventableWrapperAEI(event);
+                                        let event = &EventableWrapperAEI(event, &tl_state.search_result_state.profiles_info);
                                         // Do not use compact view if previous event is state
                                         let prev_event = prev_event.and_then(|f| if matches!(f, AnyTimelineEvent::State(_)) { None } else { Some(f) }).map(PreviousWrapperAEI);
                                         let message = MsgTypeWrapperRMC(&message, in_reply_to_details.as_ref());
@@ -377,7 +381,7 @@ pub fn search_result_draw_walk(room_screen: &mut RoomScreen, cx: &mut Cx2d, scop
                                         )
                                     }
                                     Some(AnyMessageLikeEventContent::Sticker(sticker)) => {
-                                        let event = &EventableWrapperAEI(event);
+                                        let event = &EventableWrapperAEI(event, &tl_state.search_result_state.profiles_info);
                                         let prev_event = prev_event.map(PreviousWrapperAEI);
                                         let is_contextual = matches!(&current_item, SearchTimelineItem::ContextEvent(_));
                                         populate_message_view(
@@ -405,7 +409,7 @@ pub fn search_result_draw_walk(room_screen: &mut RoomScreen, cx: &mut Cx2d, scop
                                 let state_key = state.state_key();
                                 if let Some(content) = state.original_content() {
                                     let wrapper = AnyStateEventContentWrapper(&content, state_key);
-                                    let event = &EventableWrapperAEI(event);
+                                    let event = &EventableWrapperAEI(event, &tl_state.search_result_state.profiles_info);
                                     populate_small_state_event(
                                         cx,
                                         list,
@@ -430,10 +434,10 @@ pub fn search_result_draw_walk(room_screen: &mut RoomScreen, cx: &mut Cx2d, scop
                     }
                 };
                 if item_new_draw_status.content_drawn {
-                    tl_state.content_drawn_since_last_update.insert(tl_idx .. tl_idx + 1);
+                    tl_state.search_result_state.content_drawn_since_last_update.insert(tl_idx .. tl_idx + 1);
                 }
                 if item_new_draw_status.profile_drawn {
-                    tl_state.profile_drawn_since_last_update.insert(tl_idx .. tl_idx + 1);
+                    tl_state.search_result_state.profile_drawn_since_last_update.insert(tl_idx .. tl_idx + 1);
                 }
                 item
             };
@@ -524,11 +528,9 @@ pub fn search_result_reply(cx: &mut Cx, room_screen: &RoomScreen, details: &Mess
     for (index, item) in tl.items.iter().enumerate() {
         if item.as_event().and_then(|f| f.event_id()).map(|f|Some(f.to_owned()) == details.event_id).unwrap_or(false) {
             timeline_details.item_id = index;
-            println!("index: {}", index);	
             break;
         }
     }
-    println!("search_result_reply detail{:?}", timeline_details);
     room_screen.view(id!(search_timeline)).set_visible(cx, false);
     cx.widget_action(room_screen.widget_uid(), &Scope::empty().path, RoomFilterAction::Clear);
     cx.widget_action(
@@ -594,7 +596,7 @@ impl <'a>From<&AnyStateEventContentWrapper<'a>> for Option<AnyOtherFullStateEven
         }
     }
 }
-pub struct EventableWrapperAEI<'a>(pub &'a AnyTimelineEvent);
+pub struct EventableWrapperAEI<'a>(pub &'a AnyTimelineEvent, pub &'a BTreeMap<OwnedUserId, TimelineDetails<Profile>>);
 
 impl Eventable for EventableWrapperAEI<'_> {
     fn timestamp(&self) -> MilliSecondsSinceUnixEpoch {
@@ -606,8 +608,8 @@ impl Eventable for EventableWrapperAEI<'_> {
     fn sender(&self) -> &UserId {
         self.0.sender()
     }
-    fn sender_profile(&self) -> Option<&TimelineDetails<matrix_sdk_ui::timeline::Profile>> {
-        None
+    fn sender_profile(&self) -> Option<&TimelineDetails<Profile>> {
+        self.1.get(self.sender())
     }
     fn reactions(&self) -> Option<ReactionsByKeyBySender> {
         None
diff --git a/src/sliding_sync.rs b/src/sliding_sync.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::{
@@ -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}"));
                             }

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,6 @@ impl WidgetMatchEvent for NewMessageContextMenu {`
`377`	`377`	`close_menu = false;`
`378`	`378`	`}`
`379`	`379`	`else if self.button(id!(reply_button)).clicked(actions) {`
`380`		`- println!("clicked details {:?}", details);`
`381`	`380`	`cx.widget_action(`
`382`	`381`	`details.room_screen_widget_uid,`
`383`	`382`	`&scope.path,`