nostr/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2024-09-30 00:40:49 +00:00
Code Issues Packages Projects Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/vitorpamplona/amethyst/service/NostrDiscoveryDataSource.kt
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,6 +83,7 @@ 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
) )
), ),
if (followChats.isNotEmpty()) {
TypedFilter( TypedFilter(
types = setOf(FeedType.PUBLIC_CHATS), types = setOf(FeedType.PUBLIC_CHATS),
filter = JsonFilter( filter = JsonFilter(
@ -92,6 +93,9 @@ 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
) )
) )
} else {
null
}
) )
} }