highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-20 02:51:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improves search by npubs to use all relays.

Browse Source
This commit is contained in:
Vitor Pamplona
2024-12-05 17:14:16 -05:00
parent 3aa15889c1
commit bcb9ba26ab
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt
View File

@@ -20,7 +20,7 @@
*/ */
package com.vitorpamplona.amethyst.service package com.vitorpamplona.amethyst.service
import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES import com.vitorpamplona.ammolite.relays.ALL_FEED_TYPES
import com.vitorpamplona.ammolite.relays.FeedType import com.vitorpamplona.ammolite.relays.FeedType
import com.vitorpamplona.ammolite.relays.TypedFilter import com.vitorpamplona.ammolite.relays.TypedFilter
import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
@@ -96,7 +96,7 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
listOfNotNull( listOfNotNull(
ATag.parse(it, null)?.let { aTag -> ATag.parse(it, null)?.let { aTag ->
TypedFilter( TypedFilter(
types = COMMON_FEED_TYPES, types = ALL_FEED_TYPES,
filter = filter =
SincePerRelayFilter( SincePerRelayFilter(
kinds = listOf(MetadataEvent.KIND, aTag.kind), kinds = listOf(MetadataEvent.KIND, aTag.kind),
@@ -111,19 +111,19 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
// event ids // event ids
listOf( listOf(
TypedFilter( TypedFilter(
types = COMMON_FEED_TYPES, types = ALL_FEED_TYPES,
filter = filter =
SincePerRelayFilter( SincePerRelayFilter(
ids = listOfNotNull(hexToWatch), ids = listOfNotNull(it),
), ),
), ),
// authors // authors
TypedFilter( TypedFilter(
types = COMMON_FEED_TYPES, types = ALL_FEED_TYPES,
filter = filter =
SincePerRelayFilter( SincePerRelayFilter(
kinds = listOf(MetadataEvent.KIND), kinds = listOf(MetadataEvent.KIND),
authors = listOfNotNull(hexToWatch), authors = listOfNotNull(it),
// just to be sure // just to be sure
limit = 5, limit = 5,
), ),

3
ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Relay.kt
View File

@@ -46,6 +46,9 @@ enum class FeedType {
WALLET_CONNECT, WALLET_CONNECT,
} }
val ALL_FEED_TYPES =
setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH)
val COMMON_FEED_TYPES = val COMMON_FEED_TYPES =
setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL) setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)