fixup! fixup! fixup! fixup! test(sdk): Add integration test for search

Author: dragonfly1033

crates/matrix-sdk-search/src/schema.rs

@@ -124,15 +124,15 @@ impl MatrixSearchIndexSchema for RoomMessageSchema {
 
     fn handle_event(&self, event: AnyMessageLikeEvent) -> Result<RoomIndexOperation, IndexError> {
         match event {
-            // old m.room.message behaviour
+            // m.room.message behaviour
             AnyMessageLikeEvent::RoomMessage(event) => self
                 .make_doc(event, |content| match &content.msgtype {
                     MessageType::Text(content) => Ok(content.body.clone()),
                     _ => Err(IndexError::MessageTypeNotSupported),
                 })
                 .map(RoomIndexOperation::Add),
 
-            // new m.message behaviour
+            // new MSC-1767 m.message behaviour
             AnyMessageLikeEvent::Message(event) => self
                 .make_doc(event, |content| {
                     content.text.find_plain().ok_or(IndexError::EmptyMessage).map(|v| v.to_owned())

crates/matrix-sdk/src/client/search.rs

@@ -117,7 +117,7 @@ impl SearchIndexGuard<'_> {
 
     /// Search a [`Room`]'s index for the query and return at most
     /// max_number_of_results results.
-    pub(crate) fn search_index(
+    pub(crate) fn search(
         &self,
         query: &str,
         max_number_of_results: usize,

crates/matrix-sdk/src/event_cache/room/mod.rs

@@ -545,7 +545,7 @@ impl RoomEventCacheInner {
         #[cfg(feature = "experimental-search")]
         let Some(room) = self.weak_room.get() else {
             warn!("Couldn't get room while handling timeline");
-            return Err(EventCacheError::RoomNotFound { room_id: self.room_id.clone() });
+            return Ok(());
         };
 
         let (stored_prev_batch_token, timeline_event_diffs) = self
@@ -1474,7 +1474,7 @@ mod private {
             match maybe_try_event {
                 Some(Ok(event)) => Some(event),
                 Some(Err(e)) => {
-                    warn!("failed to index event: {e:?}");
+                    warn!("failed to parse event: {e:?}");
                     None
                 }
                 None => None,

crates/matrix-sdk/src/room/mod.rs

@@ -3690,23 +3690,19 @@ impl Room {
     /// Search this room's [`RoomIndex`] for query and return at most
     /// max_number_of_results results.
     #[cfg(feature = "experimental-search")]
-    pub async fn search_index(
+    pub async fn search(
         &self,
         query: &str,
         max_number_of_results: usize,
     ) -> Option<Vec<OwnedEventId>> {
-        self.commit_and_reload().await;
+        self.commit_and_reload_search_index().await;
 
-        self.client.search_index().lock().await.search_index(
-            query,
-            max_number_of_results,
-            self.room_id(),
-        )
+        self.client.search_index().lock().await.search(query, max_number_of_results, self.room_id())
     }
 
     /// Commit a [`Room`]'s [`RoomIndex`] and reload searchers
     #[cfg(feature = "experimental-search")]
-    pub(crate) async fn commit_and_reload(&self) {
+    pub(crate) async fn commit_and_reload_search_index(&self) {
         self.client.search_index().lock().await.commit_and_reload(self.room_id());
     }
 

crates/matrix-sdk/tests/integration/room/joined.rs

@@ -753,7 +753,7 @@ async fn test_sending_message_indexes_message() {
     let user_id = user_id!("@user_id:localost");
 
     let event_factory = EventFactory::new();
-    mock_server
+    let room = mock_server
         .sync_room(
             &client,
             JoinedRoomBuilder::new(room_id).add_timeline_bulk(vec![event_factory
@@ -764,9 +764,7 @@ async fn test_sending_message_indexes_message() {
         )
         .await;
 
-    let room = client.get_room(room_id).unwrap();
-
-    let response = room.search_index("this", 5).await.expect("search should have 1 result");
+    let response = room.search("this", 5).await.expect("search should have 1 result");
 
     assert_eq!(response.len(), 1, "unexpected numbers of responses: {response:?}");
     assert_eq!(response[0], event_id, "event id doesn't match: {response:?}");