Avoids sending filters with empty lists.
This commit is contained in:
@@ -44,9 +44,11 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
fun createMyChannelsFilter(): TypedFilter {
|
fun createMyChannelsFilter(): TypedFilter? {
|
||||||
val followingEvents = account.selectedChatsFollowList()
|
val followingEvents = account.selectedChatsFollowList()
|
||||||
|
|
||||||
|
if (followingEvents.isEmpty()) return null
|
||||||
|
|
||||||
return TypedFilter(
|
return TypedFilter(
|
||||||
types = COMMON_FEED_TYPES, // Metadata comes from any relay
|
types = COMMON_FEED_TYPES, // Metadata comes from any relay
|
||||||
filter = JsonFilter(
|
filter = JsonFilter(
|
||||||
@@ -60,6 +62,8 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
|
|||||||
fun createLastChannelInfoFilter(): List<TypedFilter>? {
|
fun createLastChannelInfoFilter(): List<TypedFilter>? {
|
||||||
val followingEvents = account.selectedChatsFollowList()
|
val followingEvents = account.selectedChatsFollowList()
|
||||||
|
|
||||||
|
if (followingEvents.isEmpty()) return null
|
||||||
|
|
||||||
return followingEvents.map {
|
return followingEvents.map {
|
||||||
TypedFilter(
|
TypedFilter(
|
||||||
types = COMMON_FEED_TYPES, // Metadata comes from any relay
|
types = COMMON_FEED_TYPES, // Metadata comes from any relay
|
||||||
@@ -75,6 +79,8 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
|
|||||||
fun createLastMessageOfEachChannelFilter(): List<TypedFilter>? {
|
fun createLastMessageOfEachChannelFilter(): List<TypedFilter>? {
|
||||||
val followingEvents = account.selectedChatsFollowList()
|
val followingEvents = account.selectedChatsFollowList()
|
||||||
|
|
||||||
|
if (followingEvents.isEmpty()) return null
|
||||||
|
|
||||||
return followingEvents.map {
|
return followingEvents.map {
|
||||||
TypedFilter(
|
TypedFilter(
|
||||||
types = setOf(FeedType.PUBLIC_CHATS),
|
types = setOf(FeedType.PUBLIC_CHATS),
|
||||||
@@ -93,7 +99,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun updateChannelFilters() {
|
override fun updateChannelFilters() {
|
||||||
val list = listOf(
|
val list = listOfNotNull(
|
||||||
createMessagesToMeFilter(),
|
createMessagesToMeFilter(),
|
||||||
createMessagesFromMeFilter(),
|
createMessagesFromMeFilter(),
|
||||||
createMyChannelsFilter()
|
createMyChannelsFilter()
|
||||||
|
|||||||
Reference in New Issue
Block a user