Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Server search - Bug fixes 11 Dec #2180

Merged
merged 3 commits into from
Dec 17, 2024
Merged

Server search - Bug fixes 11 Dec #2180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3881846
TW-2152: Fix full-word search for unencrypted messages isn't performe…
nqhhdev Dec 11, 2024
519c3d2
TW-2111: Fix replies do not appear in search results.
nqhhdev Dec 11, 2024
644697d
TW-2111: Add unit test for `isDisplayableResult` func
nqhhdev Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/domain/model/search/server_side_search_categories.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ class ServerSideSearchCategories with EquatableMixin {
groupings: Groupings(
groupBy: [Group(key: GroupKey.roomId)],
),
keys: [KeyKind.contentBody],
hoangdat marked this conversation as resolved.
Show resolved Hide resolved
orderBy: SearchOrder.recent,
filter: searchFilter,
),
Expand Down
22 changes: 18 additions & 4 deletions lib/pages/search/server_search_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import 'package:fluffychat/domain/usecase/search/server_search_interactor.dart';
import 'package:fluffychat/presentation/model/search/presentation_server_side_state.dart';
import 'package:fluffychat/presentation/model/search/presentation_server_side_empty_search.dart';
import 'package:fluffychat/presentation/model/search/presentation_server_side_search.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/result_extension.dart';
import 'package:fluffychat/utils/string_extension.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -100,8 +102,14 @@ class ServerSearchController with SearchDebouncerMixin {
...success.results ?? <Result>[],
]
.where(
(result) =>
result.isDisplayableResult(context: currentContext),
(result) => result.isDisplayableResult(
context: currentContext,
event: result.getEvent(currentContext),
matrixLocalizations: currentContext == null
? const MatrixDefaultLocalizations()
: MatrixLocals(L10n.of(currentContext!)!),
searchWord: _searchCategories!.searchTerm,
),
)
.toList(),
);
Expand All @@ -118,8 +126,14 @@ class ServerSearchController with SearchDebouncerMixin {
...success.results ?? <Result>[],
]
.where(
(result) =>
result.isDisplayableResult(context: currentContext),
(result) => result.isDisplayableResult(
context: currentContext,
event: result.getEvent(currentContext),
matrixLocalizations: currentContext == null
? const MatrixDefaultLocalizations()
: MatrixLocals(L10n.of(currentContext!)!),
searchWord: _searchCategories!.searchTerm,
),
)
.toList(),
);
Expand Down
28 changes: 22 additions & 6 deletions lib/utils/matrix_sdk_extensions/result_extension.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import 'package:flutter/material.dart';
import 'package:matrix/matrix.dart';

extension ResultExtension on Result {
Event? getEvent(BuildContext context) {
Event? getEvent(BuildContext? context) {
if (context == null) {
return null;
}
if (result?.roomId == null) {
return null;
}
Expand All @@ -14,13 +17,26 @@ extension ResultExtension on Result {
return Event.fromMatrixEvent(result!, room);
}

bool isDisplayableResult({BuildContext? context}) {
bool isDisplayableResult({
BuildContext? context,
Event? event,
required String searchWord,
required MatrixLocalizations matrixLocalizations,
}) {
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(
matrixLocalizations,
hideEdit: true,
hideReply: true,
plaintextBody: true,
removeMarkdown: true,
);

return bodyContent.toLowerCase().contains(searchWord.toLowerCase());
}
}
Loading
Loading