nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Avoids requesting an empty list of chats

Browse Source
This commit is contained in:
Vitor Pamplona
2023-11-28 22:23:34 -05:00
parent a02519b021
commit a85ea70e4f
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/service/NostrDiscoveryDataSource.kt
+13 -9
View File
@@ -73,7 +73,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
val follows = account.liveDiscoveryFollowLists.value?.users?.toList() val follows = account.liveDiscoveryFollowLists.value?.users?.toList()
val followChats = account.selectedChatsFollowList().toList() val followChats = account.selectedChatsFollowList().toList()
return listOf( return listOfNotNull(
TypedFilter( TypedFilter(
types = setOf(FeedType.PUBLIC_CHATS), types = setOf(FeedType.PUBLIC_CHATS),
filter = JsonFilter( filter = JsonFilter(
@@ -83,15 +83,19 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList.value)?.relayList since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList.value)?.relayList
) )
), ),
TypedFilter( if (followChats.isNotEmpty()) {
types = setOf(FeedType.PUBLIC_CHATS), TypedFilter(
filter = JsonFilter( types = setOf(FeedType.PUBLIC_CHATS),
ids = followChats, filter = JsonFilter(
kinds = listOf(ChannelCreateEvent.kind), ids = followChats,
limit = 300, kinds = listOf(ChannelCreateEvent.kind),
since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList.value)?.relayList limit = 300,
since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList.value)?.relayList
)
) )
) } else {
null
}
) )
} }