TW-2111: Fix replies do not appear in search results.

linagora · Dec 11, 2024 · 519c3d2 · 519c3d2
1 parent 3881846
commit 519c3d2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/lib/pages/search/server_search_controller.dart b/lib/pages/search/server_search_controller.dart
@@ -100,8 +100,10 @@ class ServerSearchController with SearchDebouncerMixin {
                   ...success.results ?? <Result>[],
                 ]
                     .where(
-                      (result) =>
-                          result.isDisplayableResult(context: currentContext),
+                      (result) => result.isDisplayableResult(
+                        context: currentContext,
+                        searchWord: _searchCategories!.searchTerm,
+                      ),
                     )
                     .toList(),
               );
@@ -118,8 +120,10 @@ class ServerSearchController with SearchDebouncerMixin {
                 ...success.results ?? <Result>[],
               ]
                   .where(
-                    (result) =>
-                        result.isDisplayableResult(context: currentContext),
+                    (result) => result.isDisplayableResult(
+                      context: currentContext,
+                      searchWord: _searchCategories!.searchTerm,
+                    ),
                   )
                   .toList(),
             );

diff --git a/lib/utils/matrix_sdk_extensions/result_extension.dart b/lib/utils/matrix_sdk_extensions/result_extension.dart
@@ -1,6 +1,8 @@
+import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:matrix/matrix.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 extension ResultExtension on Result {
   Event? getEvent(BuildContext context) {
@@ -14,13 +16,25 @@ extension ResultExtension on Result {
     return Event.fromMatrixEvent(result!, room);
   }
 
-  bool isDisplayableResult({BuildContext? context}) {
+  bool isDisplayableResult({
+    BuildContext? context,
+    required String searchWord,
+  }) {
     if (context == null) {
       return false;
     }
     final event = getEvent(context);
-    return event != null &&
-        (event.relationshipType == null ||
-            event.relationshipType != RelationshipTypes.reply);
+    if (event == null) {
+      return false;
+    }
+    final bodyContent = event.calcLocalizedBodyFallback(
+      MatrixLocals(L10n.of(context)!),
+      hideEdit: true,
+      hideReply: true,
+      plaintextBody: true,
+      removeMarkdown: true,
+    );
+
+    return bodyContent.toLowerCase().contains(searchWord.toLowerCase());
   }
 }