From ddcff8fa157f5fed125c5f6e6d5a69cc11f8c983 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sat, 5 Aug 2023 10:44:20 -0400 Subject: [PATCH] don't return reposts and reactions in Search --- .../amethyst/model/LocalCache.kt | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt index 1e452b7d8..f57307329 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt @@ -1236,14 +1236,20 @@ object LocalCache { } return notes.values.filter { - it.event?.content()?.contains(text, true) ?: false || - it.event?.matchTag1With(text) ?: false || - it.idHex.startsWith(text, true) || - it.idNote().startsWith(text, true) + (it.event !is GenericRepostEvent && it.event !is RepostEvent && it.event !is CommunityPostApprovalEvent && it.event !is ReactionEvent) && + ( + it.event?.content()?.contains(text, true) ?: false || + it.event?.matchTag1With(text) ?: false || + it.idHex.startsWith(text, true) || + it.idNote().startsWith(text, true) + ) } + addressables.values.filter { - it.event?.content()?.contains(text, true) ?: false || - it.event?.matchTag1With(text) ?: false || - it.idHex.startsWith(text, true) + (it.event !is GenericRepostEvent && it.event !is RepostEvent && it.event !is CommunityPostApprovalEvent && it.event !is ReactionEvent) && + ( + it.event?.content()?.contains(text, true) ?: false || + it.event?.matchTag1With(text) ?: false || + it.idHex.startsWith(text, true) + ) } }