diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByAllCommunities.kt index 1d62339373..e7aedaf0b9 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByAllCommunities.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterLongFormAllCommunities( @@ -73,14 +72,12 @@ fun filterLongFormByAllCommunities( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterLongFormAllCommunities( relay = it.key, communities = it.value.communities, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByAuthors.kt index 40f3f914de..73355dc066 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByAuthors.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten import kotlin.collections.mapNotNull @@ -58,8 +57,6 @@ fun filterLongFormByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -68,7 +65,7 @@ fun filterLongFormByAuthors( filterLongFormAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() @@ -80,8 +77,6 @@ fun filterLongFormByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -90,7 +85,7 @@ fun filterLongFormByAuthors( filterLongFormAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByCommunity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByCommunity.kt index 7cb866ad01..bd57e55d9e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByCommunity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByCommunity.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterLongFormByCommunity( @@ -75,15 +74,13 @@ fun filterLongFormByCommunity( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterLongFormByCommunity( relay = it.key, community = it.value.community, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByFollows.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByFollows.kt index c3e1a7d47f..ea986583c3 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByFollows.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByFollows.kt @@ -23,7 +23,6 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip23LongForm.sub import com.vitorpamplona.amethyst.model.topNavFeeds.allFollows.AllFollowsByOutboxTopNavPerRelayFilterSet import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatMap fun filterLongFormByFollows( @@ -32,10 +31,8 @@ fun filterLongFormByFollows( ): List { if (followsSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return followsSet.set.flatMap { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time val relay = it.key listOfNotNull( diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByGeohash.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByGeohash.kt index 138a4fca2d..b0bedecce1 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByGeohash.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByGeohash.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterLongFormByGeohash( @@ -59,8 +58,6 @@ fun filterLongFormByGeohash( ): List { if (geoSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return geoSet.set .mapNotNull { if (it.value.geotags.isEmpty()) { @@ -69,7 +66,7 @@ fun filterLongFormByGeohash( filterLiveActivitiesByGeohash( relay = it.key, geotags = it.value.geotags, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByHashtag.kt index 07c36e21be..e197ce8c2e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormByHashtag.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtagAlts import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterLongFormByHashtag( @@ -59,8 +58,6 @@ fun filterLongFormByHashtag( ): List { if (hashSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return hashSet.set .mapNotNull { relayHashSet -> if (relayHashSet.value.hashtags.isEmpty()) { @@ -69,7 +66,7 @@ fun filterLongFormByHashtag( filterLongFormByHashtag( relay = relayHashSet.key, hashtags = relayHashSet.value.hashtags, - since = since?.get(relayHashSet.key)?.time ?: defaultSince, + since = since?.get(relayHashSet.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormGlobal.kt index c5445f7f21..026affbdd7 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/subassemblies/FilterLongFormGlobal.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent -import com.vitorpamplona.quartz.utils.TimeUtils fun filterLongFormGlobal( relays: GlobalTopNavPerRelayFilterSet, @@ -33,10 +32,8 @@ fun filterLongFormGlobal( ): List { if (relays.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return relays.set.map { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time RelayBasedFilter( relay = it.key, filter = diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByAllCommunities.kt index 656e396f33..518dfe54c3 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByAllCommunities.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelMetadataEvent import com.vitorpamplona.quartz.nip28PublicChat.message.ChannelMessageEvent import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterPublicChatsAllCommunities( @@ -79,15 +78,12 @@ fun filterPublicChatsByAllCommunities( since: SincePerRelayMap?, ): List { if (communitySet.set.isEmpty()) return emptyList() - - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterPublicChatsAllCommunities( relay = it.key, communities = it.value.communities, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByAuthors.kt index aa3a7a7f8a..c40160aecd 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByAuthors.kt @@ -30,7 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelMetadataEvent import com.vitorpamplona.quartz.nip28PublicChat.message.ChannelMessageEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten import kotlin.collections.mapNotNull @@ -65,8 +64,6 @@ fun filterPublicChatsByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -75,7 +72,7 @@ fun filterPublicChatsByAuthors( filterPublicChatsAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() @@ -87,8 +84,6 @@ fun filterPublicChatsByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -97,7 +92,7 @@ fun filterPublicChatsByAuthors( filterPublicChatsAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByCommunity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByCommunity.kt index 98d183db45..690ae70b11 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByCommunity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByCommunity.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelMetadataEvent import com.vitorpamplona.quartz.nip28PublicChat.message.ChannelMessageEvent import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterPublicChatsByCommunity( @@ -82,15 +81,13 @@ fun filterPublicChatsByCommunity( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterPublicChatsByCommunity( relay = it.key, community = it.value.community, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByFollows.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByFollows.kt index 1c57ba3741..c71864df9f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByFollows.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByFollows.kt @@ -23,7 +23,6 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip28Chats.subass import com.vitorpamplona.amethyst.model.topNavFeeds.allFollows.AllFollowsByOutboxTopNavPerRelayFilterSet import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatMap fun filterPublicChatsByFollows( @@ -32,10 +31,8 @@ fun filterPublicChatsByFollows( ): List { if (followsSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return followsSet.set.flatMap { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time val relay = it.key listOfNotNull( diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByGeohash.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByGeohash.kt index 2e03857e5d..f41fe12280 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByGeohash.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByGeohash.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelMetadataEvent import com.vitorpamplona.quartz.nip28PublicChat.message.ChannelMessageEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterPublicChatsByGeohash( @@ -65,8 +64,6 @@ fun filterPublicChatsByGeohash( ): List { if (geoSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return geoSet.set .mapNotNull { if (it.value.geotags.isEmpty()) { @@ -75,7 +72,7 @@ fun filterPublicChatsByGeohash( filterPublicChatsByGeohash( relay = it.key, geotags = it.value.geotags, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByHashtag.kt index 1f70a7a73b..f71ecdb885 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsByHashtag.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtagAlts import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelMetadataEvent import com.vitorpamplona.quartz.nip28PublicChat.message.ChannelMessageEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterPublicChatsByHashtag( @@ -66,8 +65,6 @@ fun filterPublicChatsByHashtag( ): List { if (hashSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return hashSet.set .mapNotNull { relayHashSet -> if (relayHashSet.value.hashtags.isEmpty()) { @@ -76,7 +73,7 @@ fun filterPublicChatsByHashtag( filterPublicChatsByHashtag( relay = relayHashSet.key, hashtags = relayHashSet.value.hashtags, - since = since?.get(relayHashSet.key)?.time ?: defaultSince, + since = since?.get(relayHashSet.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsGlobal.kt index 3b4062471f..d1bb4587d3 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip28Chats/subassemblies/FilterPublicChatsGlobal.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelMetadataEvent import com.vitorpamplona.quartz.nip28PublicChat.message.ChannelMessageEvent -import com.vitorpamplona.quartz.utils.TimeUtils fun filterPublicChatsGlobal( relays: GlobalTopNavPerRelayFilterSet, @@ -35,10 +34,8 @@ fun filterPublicChatsGlobal( ): List { if (relays.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return relays.set.map { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time RelayBasedFilter( relay = it.key, filter = diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByAllCommunities.kt index 93ca8f70e6..eb8c9bc958 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByAllCommunities.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip51Lists.FollowListEvent import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterFollowSetsAllCommunities( @@ -74,14 +73,12 @@ fun filterFollowSetsByAllCommunities( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterContentDVMsAllCommunities( relay = it.key, communities = it.value.communities, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByAuthors.kt index 3d08502c2a..032303bf30 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByAuthors.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip51Lists.FollowListEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten import kotlin.collections.mapNotNull @@ -58,8 +57,6 @@ fun filterFollowSetsByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -68,7 +65,7 @@ fun filterFollowSetsByAuthors( filterFollowSetsAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() @@ -80,8 +77,6 @@ fun filterFollowSetsByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -90,7 +85,7 @@ fun filterFollowSetsByAuthors( filterFollowSetsAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByCommunity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByCommunity.kt index 09a9be8984..bf7f27e293 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByCommunity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByCommunity.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip51Lists.FollowListEvent import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterFollowSetsByCommunity( @@ -75,15 +74,13 @@ fun filterFollowSetsByCommunity( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterFollowSetsByCommunity( relay = it.key, community = it.value.community, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByFollows.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByFollows.kt index 60acbeabba..cdc321d1e5 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByFollows.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByFollows.kt @@ -23,7 +23,6 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip51FollowSets.s import com.vitorpamplona.amethyst.model.topNavFeeds.allFollows.AllFollowsByOutboxTopNavPerRelayFilterSet import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatMap fun filterFollowSetsByFollows( @@ -32,10 +31,8 @@ fun filterFollowSetsByFollows( ): List { if (followsSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return followsSet.set.flatMap { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time val relay = it.key listOfNotNull( diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByGeohash.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByGeohash.kt index 21195dd0ec..5f27987d25 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByGeohash.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByGeohash.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip51Lists.FollowListEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterFollowSetsByGeohash( @@ -58,8 +57,6 @@ fun filterFollowSetsByGeohash( ): List { if (geoSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return geoSet.set .mapNotNull { if (it.value.geotags.isEmpty()) { @@ -68,7 +65,7 @@ fun filterFollowSetsByGeohash( filterFollowSetsByGeohash( relay = it.key, geotags = it.value.geotags, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByHashtag.kt index f5e8e4caf0..93d638c066 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsByHashtag.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtagAlts import com.vitorpamplona.quartz.nip51Lists.FollowListEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterFollowSetsByHashtag( @@ -59,8 +58,6 @@ fun filterFollowSetsByHashtag( ): List { if (hashSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return hashSet.set .mapNotNull { relayHashSet -> if (relayHashSet.value.hashtags.isEmpty()) { @@ -69,7 +66,7 @@ fun filterFollowSetsByHashtag( filterFollowSetsByHashtag( relay = relayHashSet.key, hashtags = relayHashSet.value.hashtags, - since = since?.get(relayHashSet.key)?.time ?: defaultSince, + since = since?.get(relayHashSet.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsGlobal.kt index ebc2943481..17223c80c1 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip51FollowSets/subassemblies/FilterFollowSetsGlobal.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip51Lists.FollowListEvent -import com.vitorpamplona.quartz.utils.TimeUtils fun filterFollowSetsGlobal( relays: GlobalTopNavPerRelayFilterSet, @@ -33,10 +32,8 @@ fun filterFollowSetsGlobal( ): List { if (relays.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return relays.set.map { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time RelayBasedFilter( relay = it.key, filter = diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByAllCommunities.kt index 6354b18c61..1d1d7b2d76 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByAllCommunities.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEvent import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterLiveActivitiesAllCommunities( @@ -75,14 +74,12 @@ fun filterLiveActivitiesByAllCommunities( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterContentDVMsAllCommunities( relay = it.key, communities = it.value.communities, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByAuthors.kt index 8d32112266..7bbb51135f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByAuthors.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten import kotlin.collections.mapNotNull @@ -70,8 +69,6 @@ fun filterLiveActivitiesByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -80,7 +77,7 @@ fun filterLiveActivitiesByAuthors( filterLiveActivitiesAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() @@ -92,8 +89,6 @@ fun filterLiveActivitiesByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -102,7 +97,7 @@ fun filterLiveActivitiesByAuthors( filterLiveActivitiesAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByCommunity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByCommunity.kt index 0141bb8b70..dc4499e277 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByCommunity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByCommunity.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEvent import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterLiveActivitiesByCommunity( @@ -76,15 +75,13 @@ fun filterLiveActivitiesByCommunity( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterLiveActivitiesByCommunity( relay = it.key, community = it.value.community, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByFollows.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByFollows.kt index 40ee82d9b1..bbce0a5227 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByFollows.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByFollows.kt @@ -23,7 +23,6 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip53LiveActiviti import com.vitorpamplona.amethyst.model.topNavFeeds.allFollows.AllFollowsByOutboxTopNavPerRelayFilterSet import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatMap fun filterLiveActivitiesByFollows( @@ -32,10 +31,8 @@ fun filterLiveActivitiesByFollows( ): List { if (followsSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return followsSet.set.flatMap { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time val relay = it.key listOfNotNull( diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByGeohash.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByGeohash.kt index 875bf036b8..fc0c789348 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByGeohash.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByGeohash.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterLiveActivitiesByGeohash( @@ -59,8 +58,6 @@ fun filterLiveActivitiesByGeohash( ): List { if (geoSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return geoSet.set .mapNotNull { if (it.value.geotags.isEmpty()) { @@ -69,7 +66,7 @@ fun filterLiveActivitiesByGeohash( filterLiveActivitiesByGeohash( relay = it.key, geotags = it.value.geotags, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByHashtag.kt index 5e7e7b4bdb..9d8be1f461 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesByHashtag.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtagAlts import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterLiveActivitiesByHashtag( @@ -60,8 +59,6 @@ fun filterLiveActivitiesByHashtag( ): List { if (hashSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return hashSet.set .mapNotNull { relayHashSet -> if (relayHashSet.value.hashtags.isEmpty()) { @@ -70,7 +67,7 @@ fun filterLiveActivitiesByHashtag( filterLiveActivitiesByHashtag( relay = relayHashSet.key, hashtags = relayHashSet.value.hashtags, - since = since?.get(relayHashSet.key)?.time ?: defaultSince, + since = since?.get(relayHashSet.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesGlobal.kt index 5b9c7edd54..c49b471e3e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/subassemblies/FilterLiveActivitiesGlobal.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEvent -import com.vitorpamplona.quartz.utils.TimeUtils fun filterLiveActivitiesGlobal( relays: GlobalTopNavPerRelayFilterSet, @@ -34,10 +33,8 @@ fun filterLiveActivitiesGlobal( ): List { if (relays.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return relays.set.map { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time RelayBasedFilter( relay = it.key, filter = diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByAllCommunities.kt index 07f1637a0c..7920bfb56b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByAllCommunities.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterCommunitiesAllCommunities( @@ -69,14 +68,12 @@ fun filterCommunitiesByAllCommunities( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterCommunitiesAllCommunities( relay = it.key, communities = it.value.communities, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByAuthors.kt index 7557077b84..44f4fbd0d4 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByAuthors.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent import com.vitorpamplona.quartz.nip72ModCommunities.definition.CommunityDefinitionEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten import kotlin.collections.mapNotNull @@ -59,8 +58,6 @@ fun filterCommunitiesByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -69,7 +66,7 @@ fun filterCommunitiesByAuthors( filterCommunitiesAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() @@ -81,8 +78,6 @@ fun filterCommunitiesByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -91,7 +86,7 @@ fun filterCommunitiesByAuthors( filterCommunitiesAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByCommunity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByCommunity.kt index 6697fd72c2..062a4b5a75 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByCommunity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByCommunity.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip72ModCommunities.definition.CommunityDefinitionEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterClassifiedsByCommunity( @@ -58,15 +57,13 @@ fun filterCommunitiesByCommunity( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterClassifiedsByCommunity( relay = it.key, community = it.value.community, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByFollows.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByFollows.kt index 014ac2d36f..b4719b5abc 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByFollows.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByFollows.kt @@ -23,7 +23,6 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip72Communities. import com.vitorpamplona.amethyst.model.topNavFeeds.allFollows.AllFollowsByOutboxTopNavPerRelayFilterSet import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatMap fun filterCommunitiesByFollows( @@ -32,10 +31,8 @@ fun filterCommunitiesByFollows( ): List { if (followsSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return followsSet.set.flatMap { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time val relay = it.key listOfNotNull( diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByGeohash.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByGeohash.kt index a3f87648d8..1f3bf415c2 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByGeohash.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByGeohash.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent import com.vitorpamplona.quartz.nip72ModCommunities.definition.CommunityDefinitionEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterCommunitiesByGeohash( @@ -59,8 +58,6 @@ fun filterCommunitiesByGeohash( ): List { if (geoSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return geoSet.set .mapNotNull { if (it.value.geotags.isEmpty()) { @@ -69,7 +66,7 @@ fun filterCommunitiesByGeohash( filterCommunitiesByGeohash( relay = it.key, geotags = it.value.geotags, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByHashtag.kt index 59dc98a02c..2e88e90a8b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByHashtag.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtagAlts import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent import com.vitorpamplona.quartz.nip72ModCommunities.definition.CommunityDefinitionEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterCommunitiesByHashtag( @@ -60,8 +59,6 @@ fun filterCommunitiesByHashtag( ): List { if (hashSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return hashSet.set .mapNotNull { relayHashSet -> if (relayHashSet.value.hashtags.isEmpty()) { @@ -70,7 +67,7 @@ fun filterCommunitiesByHashtag( filterCommunitiesByHashtag( relay = relayHashSet.key, hashtags = relayHashSet.value.hashtags, - since = since?.get(relayHashSet.key)?.time ?: defaultSince, + since = since?.get(relayHashSet.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesGlobal.kt index 68e42b47a4..4835e9d21b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesGlobal.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent import com.vitorpamplona.quartz.nip72ModCommunities.definition.CommunityDefinitionEvent -import com.vitorpamplona.quartz.utils.TimeUtils fun filterCommunitiesGlobal( relays: GlobalTopNavPerRelayFilterSet, @@ -34,10 +33,8 @@ fun filterCommunitiesGlobal( ): List { if (relays.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return relays.set.flatMap { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time listOf( RelayBasedFilter( relay = it.key, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByAllCommunities.kt index 0af5469578..43bf3702fb 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByAllCommunities.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent import com.vitorpamplona.quartz.nip89AppHandlers.definition.AppDefinitionEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterContentDVMsAllCommunities( @@ -73,14 +72,12 @@ fun filterContentDVMsByAllCommunities( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterContentDVMsAllCommunities( relay = it.key, communities = it.value.communities, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByAuthors.kt index cd5769e97c..bf5f9eec91 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByAuthors.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip89AppHandlers.definition.AppDefinitionEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten import kotlin.collections.mapNotNull @@ -59,8 +58,6 @@ fun filterContentDVMsByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -69,7 +66,7 @@ fun filterContentDVMsByAuthors( filterContentDVMsAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() @@ -81,8 +78,6 @@ fun filterContentDVMsByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -91,7 +86,7 @@ fun filterContentDVMsByAuthors( filterContentDVMsAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByCommunity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByCommunity.kt index 1cdb07be4f..1413d5a106 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByCommunity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByCommunity.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent import com.vitorpamplona.quartz.nip89AppHandlers.definition.AppDefinitionEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterContentDVMsByCommunity( @@ -75,15 +74,13 @@ fun filterContentDVMsByCommunity( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterContentDVMsByCommunity( relay = it.key, community = it.value.community, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByFollows.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByFollows.kt index 6cf4306250..cf5c2527f1 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByFollows.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByFollows.kt @@ -23,7 +23,6 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip90DVMs.subasse import com.vitorpamplona.amethyst.model.topNavFeeds.allFollows.AllFollowsByOutboxTopNavPerRelayFilterSet import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatMap fun filterContentDVMsByFollows( @@ -32,10 +31,8 @@ fun filterContentDVMsByFollows( ): List { if (followsSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return followsSet.set.flatMap { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time val relay = it.key listOfNotNull( diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByGeohash.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByGeohash.kt index 23f3342b39..dad6a5ea53 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByGeohash.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByGeohash.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip89AppHandlers.definition.AppDefinitionEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterContentDVMsByGeohash( @@ -58,8 +57,6 @@ fun filterContentDVMsByGeohash( ): List { if (geoSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return geoSet.set .mapNotNull { if (it.value.geotags.isEmpty()) { @@ -68,7 +65,7 @@ fun filterContentDVMsByGeohash( filterContentDVMsByGeohash( relay = it.key, geotags = it.value.geotags, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByHashtag.kt index 615c014384..876a9bf3e1 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsByHashtag.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtagAlts import com.vitorpamplona.quartz.nip89AppHandlers.definition.AppDefinitionEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterContentDVMsByHashtag( @@ -59,8 +58,6 @@ fun filterContentDVMsByHashtag( ): List { if (hashSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return hashSet.set .mapNotNull { relayHashSet -> if (relayHashSet.value.hashtags.isEmpty()) { @@ -69,7 +66,7 @@ fun filterContentDVMsByHashtag( filterContentDVMsByHashtag( relay = relayHashSet.key, hashtags = relayHashSet.value.hashtags, - since = since?.get(relayHashSet.key)?.time ?: defaultSince, + since = since?.get(relayHashSet.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsGlobal.kt index 2f44bd1999..317aa48578 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/subassemblies/FilterContentDVMsGlobal.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip89AppHandlers.definition.AppDefinitionEvent -import com.vitorpamplona.quartz.utils.TimeUtils fun filterContentDVMsGlobal( relays: GlobalTopNavPerRelayFilterSet, @@ -33,10 +32,8 @@ fun filterContentDVMsGlobal( ): List { if (relays.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return relays.set.flatMap { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time listOf( RelayBasedFilter( relay = it.key, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByAllCommunities.kt index 3ba7cd6193..5d372b2bc9 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByAllCommunities.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterClassifiedsAllCommunities( @@ -73,14 +72,12 @@ fun filterClassifiedsByAllCommunities( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterClassifiedsAllCommunities( relay = it.key, communities = it.value.communities, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByAuthors.kt index 838c6f04e6..7b399a45f7 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByAuthors.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten import kotlin.collections.mapNotNull @@ -58,8 +57,6 @@ fun filterClassifiedsByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -68,7 +65,7 @@ fun filterClassifiedsByAuthors( filterClassifiedsAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() @@ -80,8 +77,6 @@ fun filterClassifiedsByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -90,7 +85,7 @@ fun filterClassifiedsByAuthors( filterClassifiedsAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByCommunity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByCommunity.kt index 1ee093d0cc..77a50c174d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByCommunity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByCommunity.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterClassifiedsByCommunity( @@ -75,15 +74,13 @@ fun filterClassifiedsByCommunity( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterClassifiedsByCommunity( relay = it.key, community = it.value.community, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByFollows.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByFollows.kt index 0a6924668f..b8613876e3 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByFollows.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByFollows.kt @@ -23,7 +23,6 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.discover.nip99Classifieds. import com.vitorpamplona.amethyst.model.topNavFeeds.allFollows.AllFollowsByOutboxTopNavPerRelayFilterSet import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterClassifiedsByFollows( @@ -32,10 +31,8 @@ fun filterClassifiedsByFollows( ): List { if (followsSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return followsSet.set.flatMap { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time val relay = it.key listOfNotNull( diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByGeohash.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByGeohash.kt index 5225b0a2f4..e0a5b7756a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByGeohash.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByGeohash.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterClassifiedsByGeohash( @@ -58,8 +57,6 @@ fun filterClassifiedsByGeohash( ): List { if (geoSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return geoSet.set .mapNotNull { if (it.value.geotags.isEmpty()) { @@ -68,7 +65,7 @@ fun filterClassifiedsByGeohash( filterClassifiedsByGeohash( relay = it.key, geotags = it.value.geotags, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByHashtag.kt index 8aa3322181..f9d68f0469 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByHashtag.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtagAlts import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull fun filterClassifiedsByHashtag( @@ -59,8 +58,6 @@ fun filterClassifiedsByHashtag( ): List { if (hashSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return hashSet.set .mapNotNull { relayHashSet -> if (relayHashSet.value.hashtags.isEmpty()) { @@ -69,7 +66,7 @@ fun filterClassifiedsByHashtag( filterClassifiedsByHashtag( relay = relayHashSet.key, hashtags = relayHashSet.value.hashtags, - since = since?.get(relayHashSet.key)?.time ?: defaultSince, + since = since?.get(relayHashSet.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsGlobal.kt index 57c0f48397..b711f3e0a9 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsGlobal.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent -import com.vitorpamplona.quartz.utils.TimeUtils fun filterClassifiedsGlobal( relays: GlobalTopNavPerRelayFilterSet, @@ -33,10 +32,8 @@ fun filterClassifiedsGlobal( ): List { if (relays.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return relays.set.flatMap { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time listOf( RelayBasedFilter( relay = it.key, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByGeohashes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByGeohashes.kt index e6b332fcea..8d14c4423f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByGeohashes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByGeohashes.kt @@ -35,7 +35,6 @@ import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten import kotlin.collections.mapNotNull import kotlin.collections.sorted @@ -80,8 +79,6 @@ fun filterHomePostsByGeohashes( ): List { if (geoSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return geoSet.set .mapNotNull { if (it.value.geotags.isEmpty()) { @@ -90,12 +87,12 @@ fun filterHomePostsByGeohashes( filterHomePostsByGeohashes( relay = it.key, geotags = it.value.geotags, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) + filterHomePostsByScopes( relay = it.key, scopesToLoad = it.value.geotagScopes, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByGlobal.kt index 98d6cc60e4..1a6cc8e689 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByGlobal.kt @@ -39,7 +39,6 @@ import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEven import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent -import com.vitorpamplona.quartz.utils.TimeUtils val HomePostsByGlobalKinds = listOf( @@ -70,10 +69,8 @@ fun filterHomePostsByGlobal( ): List { if (relays.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return relays.set.flatMap { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time val relayUrl = it.key listOf( RelayBasedFilter( diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByHashtags.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByHashtags.kt index fb65c4851d..602d2aca3d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByHashtags.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByHashtags.kt @@ -37,7 +37,6 @@ import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten import kotlin.collections.mapNotNull @@ -84,14 +83,12 @@ fun filterHomePostsByHashtags( ): List { if (hashtagSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return hashtagSet.set .mapNotNull { if (it.value.hashtags.isEmpty()) { null } else { - val since = since?.get(it.key)?.time ?: defaultSince + val since = since?.get(it.key)?.time return filterHomePostsByHashtags( relay = it.key, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip65Follows/FilterHomePostsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip65Follows/FilterHomePostsByAuthors.kt index 4fd05a4bb3..a823073eeb 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip65Follows/FilterHomePostsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip65Follows/FilterHomePostsByAuthors.kt @@ -42,7 +42,6 @@ import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEven import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.mapNotNull val HomePostsKinds = @@ -105,8 +104,6 @@ fun filterHomePostsByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -115,7 +112,7 @@ fun filterHomePostsByAuthors( filterHomePostsByAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() @@ -127,8 +124,6 @@ fun filterHomePostsByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -137,7 +132,7 @@ fun filterHomePostsByAuthors( filterHomePostsByAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip72Communities/FilterHomePostsByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip72Communities/FilterHomePostsByAllCommunities.kt index 0eaf28b7fd..9376353807 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip72Communities/FilterHomePostsByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip72Communities/FilterHomePostsByAllCommunities.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterHomePostsFromAllCommunities( @@ -72,14 +71,12 @@ fun filterHomePostsByAllCommunities( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterHomePostsFromAllCommunities( relay = it.key, communities = it.value.communities, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip72Communities/FilterHomePostsFromCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip72Communities/FilterHomePostsFromCommunities.kt index 30a90c8578..7ff8d1db43 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip72Communities/FilterHomePostsFromCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip72Communities/FilterHomePostsFromCommunities.kt @@ -33,7 +33,6 @@ import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten import kotlin.collections.mapNotNull @@ -106,15 +105,13 @@ fun filterHomePostsByCommunity( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterHomePostsFromCommunity( relay = it.key, community = it.value.community, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip01Core/FilterPictureAndVideoByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip01Core/FilterPictureAndVideoByHashtag.kt index 7c40f44526..259a1470f3 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip01Core/FilterPictureAndVideoByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip01Core/FilterPictureAndVideoByHashtag.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtagAlts -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterPictureAndVideoHashtag( @@ -73,8 +72,6 @@ fun filterPictureAndVideoByHashtag( ): List { if (hashSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return hashSet.set .mapNotNull { relayHashSet -> if (relayHashSet.value.hashtags.isEmpty()) { @@ -83,7 +80,7 @@ fun filterPictureAndVideoByHashtag( filterPictureAndVideoHashtag( relay = relayHashSet.key, hashtags = relayHashSet.value.hashtags, - since = since?.get(relayHashSet.key)?.time ?: defaultSince, + since = since?.get(relayHashSet.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip65Follows/FilterPictureAndVideoByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip65Follows/FilterPictureAndVideoByAuthors.kt index 25e1423955..3ba1d739e5 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip65Follows/FilterPictureAndVideoByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip65Follows/FilterPictureAndVideoByAuthors.kt @@ -30,7 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten import kotlin.collections.mapNotNull @@ -71,8 +70,6 @@ fun filterPictureAndVideoByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -81,7 +78,7 @@ fun filterPictureAndVideoByAuthors( filterPictureAndVideoAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() @@ -93,8 +90,6 @@ fun filterPictureAndVideoByAuthors( ): List { if (authorSet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return authorSet.set .mapNotNull { if (it.value.authors.isEmpty()) { @@ -103,7 +98,7 @@ fun filterPictureAndVideoByAuthors( filterPictureAndVideoAuthors( relay = it.key, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) } }.flatten() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip72Communities/FilterPictureAndVideoByCommunity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip72Communities/FilterPictureAndVideoByCommunity.kt index a6c532b049..2dca47d3fd 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip72Communities/FilterPictureAndVideoByCommunity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip72Communities/FilterPictureAndVideoByCommunity.kt @@ -31,7 +31,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent -import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.collections.flatten fun filterPictureAndVideoCommunity( @@ -111,15 +110,13 @@ fun filterPictureAndVideoByCommunity( ): List { if (communitySet.set.isEmpty()) return emptyList() - val defaultSince = TimeUtils.oneWeekAgo() - return communitySet.set .mapNotNull { filterPictureAndVideoCommunity( relay = it.key, community = it.value.community, authors = it.value.authors, - since = since?.get(it.key)?.time ?: defaultSince, + since = since?.get(it.key)?.time, ) }.flatten() }