highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-11-10 16:36:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Community Load up with Global filter

Browse Source
This commit is contained in:
Vitor Pamplona
2024-09-05 18:00:17 -04:00
parent 20115c7080
commit d2b4a859bf
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
View File

@@ -632,7 +632,7 @@ class Account(
authorsPerRelay( authorsPerRelay(
liveHomeFollowLists.value?.usersPlusMe?.map { getNIP65RelayListNote(it) } ?: emptyList(), liveHomeFollowLists.value?.usersPlusMe?.map { getNIP65RelayListNote(it) } ?: emptyList(),
connectToRelays.value.filter { it.feedTypes.contains(FeedType.FOLLOWS) && it.read }.map { it.url }, connectToRelays.value.filter { it.feedTypes.contains(FeedType.FOLLOWS) && it.read }.map { it.url },
), ).ifEmpty { null },
) )
} }
@@ -708,7 +708,7 @@ class Account(
authorsPerRelay( authorsPerRelay(
liveStoriesFollowLists.value?.usersPlusMe?.map { getNIP65RelayListNote(it) } ?: emptyList(), liveStoriesFollowLists.value?.usersPlusMe?.map { getNIP65RelayListNote(it) } ?: emptyList(),
connectToRelays.value.filter { it.feedTypes.contains(FeedType.FOLLOWS) && it.read }.map { it.url }, connectToRelays.value.filter { it.feedTypes.contains(FeedType.FOLLOWS) && it.read }.map { it.url },
), ).ifEmpty { null },
) )
} }
@@ -761,8 +761,8 @@ class Account(
SharingStarted.Eagerly, SharingStarted.Eagerly,
authorsPerRelay( authorsPerRelay(
liveDiscoveryFollowLists.value?.usersPlusMe?.map { getNIP65RelayListNote(it) } ?: emptyList(), liveDiscoveryFollowLists.value?.usersPlusMe?.map { getNIP65RelayListNote(it) } ?: emptyList(),
connectToRelays.value.filter { it.feedTypes.contains(FeedType.FOLLOWS) && it.read }.map { it.url }, connectToRelays.value.filter { it.read }.map { it.url },
), ).ifEmpty { null },
) )
} }

6
amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrDiscoveryDataSource.kt
View File

@@ -170,7 +170,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
return listOfNotNull( return listOfNotNull(
TypedFilter( TypedFilter(
types = setOf(FeedType.GLOBAL), types = if (follows == null) setOf(FeedType.GLOBAL) else setOf(FeedType.FOLLOWS),
filter = filter =
SinceAuthorPerRelayFilter( SinceAuthorPerRelayFilter(
authors = followsRelays, authors = followsRelays,
@@ -185,7 +185,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
), ),
follows?.let { follows?.let {
TypedFilter( TypedFilter(
types = setOf(FeedType.GLOBAL), types = setOf(FeedType.FOLLOWS),
filter = filter =
SincePerRelayFilter( SincePerRelayFilter(
tags = mapOf("p" to it), tags = mapOf("p" to it),
@@ -246,7 +246,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
val follows = account.liveDiscoveryListAuthorsPerRelay.value val follows = account.liveDiscoveryListAuthorsPerRelay.value
return TypedFilter( return TypedFilter(
types = setOf(FeedType.GLOBAL), types = if (follows == null) setOf(FeedType.GLOBAL) else setOf(FeedType.FOLLOWS),
filter = filter =
SinceAuthorPerRelayFilter( SinceAuthorPerRelayFilter(
authors = follows, authors = follows,