diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/drafts/FilterDraftsAndReportsFromKey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/drafts/FilterDraftsAndReportsFromKey.kt index 4f7ed60e8f..80b768321d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/drafts/FilterDraftsAndReportsFromKey.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/drafts/FilterDraftsAndReportsFromKey.kt @@ -44,7 +44,7 @@ fun filterDraftsFromKey( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MODERATION, kinds = DraftKinds, authors = listOf(pubkey), since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/marmot/MarmotGroupEventsEoseManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/marmot/MarmotGroupEventsEoseManager.kt index 4dc904d02e..fe34cca31b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/marmot/MarmotGroupEventsEoseManager.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/marmot/MarmotGroupEventsEoseManager.kt @@ -21,6 +21,8 @@ package com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.marmot import com.vitorpamplona.amethyst.commons.model.chats.ChatFeedType +import com.vitorpamplona.amethyst.commons.relayClient.subscriptions.ExplainedFilter +import com.vitorpamplona.amethyst.commons.relayClient.subscriptions.SubPurpose import com.vitorpamplona.amethyst.model.User import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.launchChatFeedToggleObserver @@ -89,7 +91,7 @@ class MarmotGroupEventsEoseManager( "(metadataRelays=${groupRelays?.size ?: 0}, usingFallback=${groupRelays.isNullOrEmpty()}): ${relaysForGroup.map { it.url }}" } for (relay in relaysForGroup) { - result.add(RelayBasedFilter(relay = relay, filter = filter)) + result.add(RelayBasedFilter(relay = relay, filter = ExplainedFilter.of(filter, SubPurpose.ENCRYPTED_GROUPS, "MLS group messages"))) } } @@ -97,7 +99,7 @@ class MarmotGroupEventsEoseManager( if (fallbackRelays.isNotEmpty()) { val ownKeyPackageFilter = manager.subscriptionManager.ownKeyPackageFilter() for (relay in fallbackRelays) { - result.add(RelayBasedFilter(relay = relay, filter = ownKeyPackageFilter)) + result.add(RelayBasedFilter(relay = relay, filter = ExplainedFilter.of(ownKeyPackageFilter, SubPurpose.ENCRYPTED_GROUPS, "own MLS key package"))) } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterAccountInfoAndListsFromKey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterAccountInfoAndListsFromKey.kt index 783b3ce15c..35d9288085 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterAccountInfoAndListsFromKey.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterAccountInfoAndListsFromKey.kt @@ -119,7 +119,7 @@ fun filterAccountInfoAndListsFromKey( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.PROFILE_METADATA, + purpose = SubPurpose.ACCOUNT_DATA, kinds = AccountInfoAndListsFromKeyKinds, authors = listOf(pubkey), limit = 20, @@ -130,7 +130,7 @@ fun filterAccountInfoAndListsFromKey( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.PROFILE_METADATA, + purpose = SubPurpose.ACCOUNT_DATA, kinds = AccountInfoAndListsFromKeyKinds2, authors = listOf(pubkey), limit = 80, @@ -148,7 +148,7 @@ fun filterAccountInfoAndListsFromKey( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.PROFILE_METADATA, + purpose = SubPurpose.ACCOUNT_DATA, kinds = AmethystMetadataKinds, authors = listOf(pubkey), tags = AmethystMetadataTagMapFilter, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBasicAccountInfoFromKeys.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBasicAccountInfoFromKeys.kt index 7948d3438a..b9985891fc 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBasicAccountInfoFromKeys.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBasicAccountInfoFromKeys.kt @@ -87,7 +87,7 @@ fun filterBasicAccountInfoFromKeys( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.PROFILE_METADATA, + purpose = SubPurpose.ACCOUNT_DATA, kinds = BasicAccountInfoKinds, authors = otherAccounts.toList(), limit = otherAccounts.size * BasicAccountInfoKinds.size, @@ -98,7 +98,7 @@ fun filterBasicAccountInfoFromKeys( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.PROFILE_METADATA, + purpose = SubPurpose.ACCOUNT_DATA, kinds = BasicAccountInfoKinds2, authors = otherAccounts.toList(), limit = otherAccounts.size * BasicAccountInfoKinds2.size, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBookmarksAndReportsFromKey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBookmarksAndReportsFromKey.kt index 8d2b5681c0..edde979296 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBookmarksAndReportsFromKey.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBookmarksAndReportsFromKey.kt @@ -54,7 +54,7 @@ fun filterBookmarksAndReportsFromKey( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.PROFILE_METADATA, + purpose = SubPurpose.ACCOUNT_DATA, kinds = ReportsAndBookmarksFromKeyKinds, authors = listOf(pubkey), since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterFollowsAndMutesFromKey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterFollowsAndMutesFromKey.kt index d046e3cedf..ce53c3f448 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterFollowsAndMutesFromKey.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterFollowsAndMutesFromKey.kt @@ -58,7 +58,7 @@ fun filterFollowsAndMutesFromKey( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.FOLLOW_LISTS, + purpose = SubPurpose.ACCOUNT_DATA, kinds = FollowAndMutesFromKeyKinds, authors = listOf(pubkey), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterLastPostsFromKey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterLastPostsFromKey.kt index 10e98a959e..e0a534ae4e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterLastPostsFromKey.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterLastPostsFromKey.kt @@ -38,7 +38,7 @@ fun filterLastPostsFromKey( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.PROFILE_METADATA, + purpose = SubPurpose.ACCOUNT_DATA, authors = listOf(pubkey), limit = 100, since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip47WalletConnect/NwcNotificationsEoseManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip47WalletConnect/NwcNotificationsEoseManager.kt index 3fc03aed4a..62594bacc4 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip47WalletConnect/NwcNotificationsEoseManager.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip47WalletConnect/NwcNotificationsEoseManager.kt @@ -90,7 +90,7 @@ class NwcNotificationsEoseManager( relay = wallet.uri.relayUri, filter = ExplainedFilter( - purpose = SubPurpose.NOTIFICATIONS, + purpose = SubPurpose.WALLET, kinds = listOf(NwcNotificationEvent.KIND, NwcNotificationEvent.LEGACY_KIND), authors = listOf(wallet.uri.pubKeyHex), tags = mapOf("p" to listOf(signer.pubKey)), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/nip28PublicChats/FilterChannelMetadataCreationById.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/nip28PublicChats/FilterChannelMetadataCreationById.kt index daf39c13a2..c02515c72a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/nip28PublicChats/FilterChannelMetadataCreationById.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/channel/nip28PublicChats/FilterChannelMetadataCreationById.kt @@ -56,7 +56,7 @@ fun filterMissingChannelsById(keys: List): List>): if (it.value.isNotEmpty()) { RelayBasedFilter( relay = it.key, - filter = ExplainedFilter(purpose = SubPurpose.SCREEN_CONTENT, ids = it.value.sorted()), + filter = ExplainedFilter(purpose = SubPurpose.REFERENCED_EVENTS, ids = it.value.sorted()), ) } else { null diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/watchers/FilterRepliesAndReactionsToAddresses.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/watchers/FilterRepliesAndReactionsToAddresses.kt index bd312710ab..7a172477d8 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/watchers/FilterRepliesAndReactionsToAddresses.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/watchers/FilterRepliesAndReactionsToAddresses.kt @@ -93,7 +93,7 @@ fun filterRepliesAndReactionsToAddresses( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ENGAGEMENT, kinds = RepliesAndReactionsToAddressesKinds1, tags = mapOf("a" to sortedList), since = since, @@ -105,7 +105,7 @@ fun filterRepliesAndReactionsToAddresses( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ENGAGEMENT, kinds = PostsAndChatMessagesToAddresses, tags = mapOf("a" to sortedList), since = since, @@ -117,7 +117,7 @@ fun filterRepliesAndReactionsToAddresses( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ENGAGEMENT, kinds = DeletionKindList, tags = mapOf("a" to sortedList), since = since, @@ -129,7 +129,7 @@ fun filterRepliesAndReactionsToAddresses( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ENGAGEMENT, kinds = TextNoteKindList, tags = mapOf("q" to sortedList), since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/watchers/FilterRepliesAndReactionsToNotes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/watchers/FilterRepliesAndReactionsToNotes.kt index bb5815838d..494ee84209 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/watchers/FilterRepliesAndReactionsToNotes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/watchers/FilterRepliesAndReactionsToNotes.kt @@ -100,7 +100,7 @@ fun filterRepliesAndReactionsToNotes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ENGAGEMENT, kinds = RepliesAndReactionsKinds, tags = mapOf("e" to sortedList), since = since, @@ -112,7 +112,7 @@ fun filterRepliesAndReactionsToNotes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ENGAGEMENT, kinds = RepliesAndReactionsKinds2, tags = mapOf("e" to sortedList), since = since, @@ -123,7 +123,7 @@ fun filterRepliesAndReactionsToNotes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ENGAGEMENT, kinds = listOf(TextNoteEvent.KIND, CommentEvent.KIND), tags = mapOf("q" to sortedList), since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/watchers/FilterReportsToKey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/watchers/FilterReportsToKey.kt index 36a3ad2efc..0e5d73a549 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/watchers/FilterReportsToKey.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/watchers/FilterReportsToKey.kt @@ -40,7 +40,7 @@ fun filterReportsToKeysFromTrusted( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.PROFILE_METADATA, + purpose = SubPurpose.MODERATION, kinds = ReportKindList, authors = trustedAccounts, tags = mapOf("p" to targets.sorted()), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/FilterByAuthor.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/FilterByAuthor.kt index 9d46b41164..70973ab169 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/FilterByAuthor.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/FilterByAuthor.kt @@ -55,7 +55,7 @@ fun filterByAuthor( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.SEARCH, kinds = MetadataKindList, authors = myUser, ), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/SearchPeopleByName.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/SearchPeopleByName.kt index ac59e2cb63..53e4dae18f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/SearchPeopleByName.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/SearchPeopleByName.kt @@ -35,7 +35,7 @@ fun searchPeopleByName( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.SEARCH, kinds = listOf(MetadataEvent.KIND), search = searchString, limit = 1000, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/SearchPostsByText.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/SearchPostsByText.kt index 12d6cb4888..69014e6708 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/SearchPostsByText.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/SearchPostsByText.kt @@ -114,7 +114,7 @@ fun searchPostsByText( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.SEARCH, kinds = SearchPostsByTextKinds1, search = searchString, limit = 100, @@ -124,7 +124,7 @@ fun searchPostsByText( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.SEARCH, kinds = SearchPostsByTextKinds2, search = searchString, limit = 100, @@ -134,7 +134,7 @@ fun searchPostsByText( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.SEARCH, kinds = SearchPostsByTextKinds3, search = searchString, limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/apps/recommendations/datasource/FilterAppRecommendations.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/apps/recommendations/datasource/FilterAppRecommendations.kt index dcdfb26baf..62b8d3fec7 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/apps/recommendations/datasource/FilterAppRecommendations.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/apps/recommendations/datasource/FilterAppRecommendations.kt @@ -44,7 +44,7 @@ fun filterMyAppRecommendations( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ADD_ONS, kinds = listOf(AppRecommendationEvent.KIND), authors = authors, limit = 100, @@ -64,7 +64,7 @@ fun filterRecentAppDefinitions(relays: Set): List = listOf( RelayBasedFilter( relay = groupId.relayUrl, - filter = ExplainedFilter(purpose = SubPurpose.CHATS, kinds = RELAY_GROUP_METADATA_KINDS, tags = mapOf(GroupIdTag.TAG_NAME to listOf(groupId.id))), + filter = ExplainedFilter(purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_METADATA_KINDS, tags = mapOf(GroupIdTag.TAG_NAME to listOf(groupId.id))), ), // Pins stay in their own filter for the same reason the directory filters split them out. RelayBasedFilter( relay = groupId.relayUrl, - filter = ExplainedFilter(purpose = SubPurpose.CHATS, kinds = RELAY_GROUP_PIN_KINDS, tags = mapOf(GroupIdTag.TAG_NAME to listOf(groupId.id))), + filter = ExplainedFilter(purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_PIN_KINDS, tags = mapOf(GroupIdTag.TAG_NAME to listOf(groupId.id))), ), ) @@ -287,8 +287,8 @@ fun buildRelayGroupStateFilters( val scope = mapOf(D_TAG to ids.distinct()) val since = sinceForRelay(relay) listOf( - RelayBasedFilter(relay = relay, filter = ExplainedFilter(purpose = SubPurpose.CHATS, kinds = RELAY_GROUP_METADATA_KINDS, tags = scope, since = since)), - RelayBasedFilter(relay = relay, filter = ExplainedFilter(purpose = SubPurpose.CHATS, kinds = RELAY_GROUP_PIN_KINDS, tags = scope, since = since)), + RelayBasedFilter(relay = relay, filter = ExplainedFilter(purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_METADATA_KINDS, tags = scope, since = since)), + RelayBasedFilter(relay = relay, filter = ExplainedFilter(purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_PIN_KINDS, tags = scope, since = since)), ) } @@ -326,7 +326,7 @@ fun buildRelayGroupJoinedChatTailFilter( relay = groupId.relayUrl, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_ALL_TIMELINE_KINDS, tags = mapOf(GroupIdTag.TAG_NAME to listOf(groupId.id)), since = sinceEpoch, @@ -362,7 +362,7 @@ fun buildRelayGroupPreviewFilter( relay = groupId.relayUrl, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_ALL_TIMELINE_KINDS, tags = mapOf(GroupIdTag.TAG_NAME to listOf(groupId.id)), since = sinceEpoch, @@ -383,7 +383,7 @@ fun buildRelayGroupAuxFilter( relay = groupId.relayUrl, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_AUX_KINDS, tags = mapOf(GroupIdTag.TAG_NAME to listOf(groupId.id)), since = sinceEpoch, @@ -400,7 +400,7 @@ fun buildRelayGroupOpenChatTailFilter( relay = groupId.relayUrl, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_OPEN_TAIL_KINDS, tags = mapOf(GroupIdTag.TAG_NAME to listOf(groupId.id)), since = sinceEpoch, @@ -424,7 +424,7 @@ fun buildRelayGroupHistoryFilters( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_ALL_TIMELINE_KINDS, tags = mapOf(GroupIdTag.TAG_NAME to listOf(groupId.id)), until = until, @@ -445,7 +445,7 @@ fun buildRelayGroupDirectoryFilter( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_DIRECTORY_KINDS, limit = RELAY_GROUP_DIRECTORY_LIMIT, since = sinceEpoch, @@ -469,7 +469,7 @@ fun buildRelayGroupThreadsHistoryFilters( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_THREAD_KINDS, tags = mapOf(GroupIdTag.TAG_NAME to listOf(groupId.id)), until = until, @@ -487,7 +487,7 @@ fun buildRelayGroupThreadsFilter( relay = groupId.relayUrl, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_THREAD_KINDS, tags = mapOf(GroupIdTag.TAG_NAME to listOf(groupId.id)), since = sinceEpoch, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsByAuthors.kt index 3c226fbc4f..70fd3d0684 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsByAuthors.kt @@ -70,7 +70,7 @@ fun filterRelayGroupsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, authors = authorList, kinds = listOf(GroupMetadataEvent.KIND), limit = 200, @@ -82,7 +82,7 @@ fun filterRelayGroupsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf(GroupAdminsEvent.KIND, GroupMembersEvent.KIND), tags = mapOf(PTag.TAG_NAME to authorList), limit = 200, @@ -102,7 +102,7 @@ fun filterRelayGroupsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf(GroupMetadataEvent.KIND), tags = mapOf(DTag.TAG_NAME to rosterGroupIds), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsByGeohashes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsByGeohashes.kt index e1cea18d21..a1d83e48fd 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsByGeohashes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsByGeohashes.kt @@ -41,7 +41,7 @@ fun filterRelayGroupsByGeohashes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf(GroupMetadataEvent.KIND), tags = mapOf(GeoHashTag.TAG_NAME to geotags.map { it.lowercase() }.sorted()), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsByHashtag.kt index 7c860fd57d..5c5b113e9a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsByHashtag.kt @@ -39,7 +39,7 @@ fun filterRelayGroupsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf(GroupMetadataEvent.KIND), tags = mapOf(HashtagTag.TAG_NAME to hashtags.map { it.lowercase() }), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsDirectory.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsDirectory.kt index d0286410bb..d6deb84bf5 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsDirectory.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/relayGroup/datasource/subassemblies/FilterRelayGroupsDirectory.kt @@ -53,7 +53,7 @@ fun filterRelayGroupsDirectory( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = RELAY_GROUP_DISCOVERY_KINDS, limit = 500, since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingEphemeralChats.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingEphemeralChats.kt index 64d35f7ba6..a5897a49f3 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingEphemeralChats.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingEphemeralChats.kt @@ -54,7 +54,7 @@ fun filterFollowingEphemeralChats( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf(EphemeralChatEvent.KIND), tags = mapOf("d" to it.value.sorted()), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingGeohashChats.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingGeohashChats.kt index 3d75e69a24..1ac81ad02c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingGeohashChats.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingGeohashChats.kt @@ -55,7 +55,7 @@ fun filterFollowingGeohashChats( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf(GeohashChatEvent.KIND), tags = mapOf("g" to cells), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingPublicChats.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingPublicChats.kt index c5d827e9be..000fab8036 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingPublicChats.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterFollowingPublicChats.kt @@ -58,7 +58,7 @@ fun filterFollowingPublicChatsCreationEvent( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf(ChannelCreateEvent.KIND), ids = it.value.sorted(), since = since?.get(it.key)?.time, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterLastMessageFollowingPublicChats.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterLastMessageFollowingPublicChats.kt index 18623f9d1f..600e75815e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterLastMessageFollowingPublicChats.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterLastMessageFollowingPublicChats.kt @@ -59,7 +59,7 @@ fun filterLastMessageFollowingPublicChats( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf(ChannelMetadataEvent.KIND), tags = mapOf("e" to it.value.sorted()), since = since?.get(it.key)?.time, @@ -70,7 +70,7 @@ fun filterLastMessageFollowingPublicChats( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf(ChannelMessageEvent.KIND), tags = mapOf("e" to it.value.sorted()), since = since?.get(it.key)?.time, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterNip04DMsFromMe.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterNip04DMsFromMe.kt index f3dc3fac05..29edf0025d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterNip04DMsFromMe.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterNip04DMsFromMe.kt @@ -38,7 +38,7 @@ fun filterNip04DMsFromMe( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.DIRECT_MESSAGES, kinds = listOf(PrivateDmEvent.KIND), authors = listOf(user.pubkeyHex), since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterNip04DMsToMe.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterNip04DMsToMe.kt index 9ef0d41e03..dbe23014ae 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterNip04DMsToMe.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/datasource/FilterNip04DMsToMe.kt @@ -38,7 +38,7 @@ fun filterNip04DMsToMe( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.DIRECT_MESSAGES, kinds = listOf(PrivateDmEvent.KIND), tags = mapOf("p" to listOf(user.pubkeyHex)), since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/CommunityRulesFilterSubAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/CommunityRulesFilterSubAssembler.kt index bd01433817..5649dbd192 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/CommunityRulesFilterSubAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/CommunityRulesFilterSubAssembler.kt @@ -66,7 +66,7 @@ class CommunityRulesFilterSubAssembler( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, kinds = listOf(CommunityRulesEvent.KIND), authors = signers.sorted(), tags = mapOf("a" to listOf(commEvent.addressTag())), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/FilterCommunityPosts.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/FilterCommunityPosts.kt index 7a1fe9b11e..143da7c09a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/FilterCommunityPosts.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/FilterCommunityPosts.kt @@ -56,7 +56,7 @@ fun filterCommunityPosts( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, authors = community.moderatorKeys(), tags = mapOf("a" to listOf(community.addressTag())), kinds = CommunityPostKinds, @@ -75,7 +75,7 @@ fun filterCommunityPostsFromModerators( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, authors = authors.sorted(), tags = mapOf("a" to listOf(community.addressTag())), kinds = CommunityPostKinds, @@ -93,7 +93,7 @@ fun filterCommunityPostsFromEverybody( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, tags = mapOf("a" to listOf(community.addressTag())), kinds = CommunityPostKinds, limit = 100, 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 7b4dfdb34b..1d773ea040 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 @@ -42,7 +42,7 @@ fun filterLongFormAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -58,7 +58,7 @@ fun filterLongFormAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, tags = mapOf("k" to listOf("5300"), "a" to communityList), kinds = listOf(LongTextNoteEvent.KIND), limit = 30, 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 f823a69bb6..e87828fa52 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 @@ -41,7 +41,7 @@ fun filterLongFormAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authorList, kinds = listOf(LongTextNoteEvent.KIND), limit = 200, 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 330672bb08..ec867450d8 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 @@ -42,7 +42,7 @@ fun filterLongFormByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -59,7 +59,7 @@ fun filterLongFormByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authors, tags = mapOf("k" to listOf("5300"), "a" to listOf(community)), kinds = listOf(LongTextNoteEvent.KIND), 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 b0f6f57c1c..e753b72ce0 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 @@ -43,7 +43,7 @@ fun filterLongFormByGeohash( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(LongTextNoteEvent.KIND), tags = mapOf("g" to geoHashes), limit = 100, 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 2ebbdb16a4..5a11af780c 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 @@ -43,7 +43,7 @@ fun filterLongFormByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(LongTextNoteEvent.KIND), tags = mapOf("t" to hashtags), limit = 200, 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 8732d949b2..c68babe190 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 @@ -41,7 +41,7 @@ fun filterLongFormGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(LongTextNoteEvent.KIND), limit = 100, since = since, 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 47983b6b80..38244e6737 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 @@ -44,7 +44,7 @@ fun filterPublicChatsAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -60,7 +60,7 @@ fun filterPublicChatsAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, tags = mapOf("k" to listOf("5300"), "a" to communityList), kinds = listOf( 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 9b6642d92d..b4da28138c 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 @@ -43,7 +43,7 @@ fun filterPublicChatsAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, authors = authorList, kinds = listOf( 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 22148c2286..1973662fab 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 @@ -44,7 +44,7 @@ fun filterPublicChatsByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -61,7 +61,7 @@ fun filterPublicChatsByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, authors = authors, tags = mapOf("k" to listOf("5300"), "a" to listOf(community)), kinds = 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 a4261d080b..bc60f7d6f8 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 @@ -44,7 +44,7 @@ fun filterPublicChatsByGeohash( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf( ChannelCreateEvent.KIND, 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 35447b6ef7..f3c2ed65a6 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 @@ -45,7 +45,7 @@ fun filterPublicChatsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf( ChannelCreateEvent.KIND, 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 5d2ea4f71c..3342839f42 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 @@ -44,7 +44,7 @@ fun filterPublicChatsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf( ChannelCreateEvent.KIND, @@ -58,7 +58,7 @@ fun filterPublicChatsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.PUBLIC_CHATS, kinds = listOf( ChannelMessageEvent.KIND, 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 d82f308332..74fd1d9bf3 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 @@ -45,7 +45,7 @@ fun filterLiveActivitiesAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -61,7 +61,7 @@ fun filterLiveActivitiesAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, tags = mapOf("k" to listOf("5300"), "a" to communityList), kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND, MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), limit = 300, 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 cf607a6a22..a51b12f82e 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 @@ -44,7 +44,7 @@ fun filterLiveActivitiesAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authorList, kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND, MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), limit = 300, @@ -56,7 +56,7 @@ fun filterLiveActivitiesAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, tags = mapOf("p" to authorList), kinds = listOf(LiveActivitiesEvent.KIND, MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), limit = 100, 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 2f5532ab29..449cdbdb96 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 @@ -45,7 +45,7 @@ fun filterLiveActivitiesByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -62,7 +62,7 @@ fun filterLiveActivitiesByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authors, tags = mapOf("k" to listOf("5300"), "a" to listOf(community)), kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND, MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), 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 b2c1ed117e..5eea6e7c53 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 @@ -45,7 +45,7 @@ fun filterLiveActivitiesByGeohash( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND, MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), tags = mapOf("g" to geoHashes), limit = 300, 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 82342ce2bd..28b5de9f64 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 @@ -46,7 +46,7 @@ fun filterLiveActivitiesByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND, MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), tags = mapOf("t" to hashtags), limit = 300, 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 06b2d03af4..f55370b6ce 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 @@ -46,7 +46,7 @@ fun filterLiveActivitiesGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(LiveActivitiesEvent.KIND, MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), limit = 30, since = since ?: TimeUtils.oneWeekAgo(), @@ -56,7 +56,7 @@ fun filterLiveActivitiesGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(LiveActivitiesChatMessageEvent.KIND), limit = 50, since = since ?: TimeUtils.oneDayAgo(), 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 424960a7c9..89bc8c6e52 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 @@ -42,7 +42,7 @@ fun filterCommunitiesAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf("a" to communityList), limit = 300, @@ -54,7 +54,7 @@ fun filterCommunitiesAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, tags = mapOf("a" to communityList), kinds = listOf(ClassifiedsEvent.KIND), limit = 300, 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 529f1d6cd4..27b1047080 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 @@ -42,7 +42,7 @@ fun filterCommunitiesAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authorList, kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND), limit = 300, 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 898c32272d..6f928b6ff7 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 @@ -42,7 +42,7 @@ fun filterClassifiedsByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = listOf(community.pubKeyHex), kinds = listOf(CommunityDefinitionEvent.KIND), tags = mapOf("d" to listOf(community.dTag)), 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 42d37f298b..304469da3b 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 @@ -43,7 +43,7 @@ fun filterCommunitiesByGeohash( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND), tags = mapOf("g" to geoHashes), limit = 100, 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 c1f879bd82..620abd126f 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 @@ -44,7 +44,7 @@ fun filterCommunitiesByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND), tags = mapOf("t" to hashtags), limit = 100, 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 51f837f044..ad580b93c3 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 @@ -43,7 +43,7 @@ fun filterCommunitiesGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(CommunityDefinitionEvent.KIND), limit = 200, since = since, @@ -53,7 +53,7 @@ fun filterCommunitiesGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, limit = 100, since = since ?: TimeUtils.oneMonthAgo(), 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 746791944c..708eff563e 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 @@ -42,7 +42,7 @@ fun filterContentDVMsAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -58,7 +58,7 @@ fun filterContentDVMsAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, tags = mapOf("k" to listOf("5300"), "a" to communityList), kinds = listOf(AppDefinitionEvent.KIND), limit = 300, 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 cc65567771..9820641f47 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 @@ -41,7 +41,7 @@ fun filterContentDVMsAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authorList, kinds = listOf(AppDefinitionEvent.KIND), tags = mapOf("k" to listOf("5300")), 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 409f9ece20..c83c695711 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 @@ -42,7 +42,7 @@ fun filterContentDVMsByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -59,7 +59,7 @@ fun filterContentDVMsByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authors, tags = mapOf("k" to listOf("5300"), "a" to listOf(community)), kinds = listOf(AppDefinitionEvent.KIND), 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 69cf77ab24..1b53060611 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 @@ -42,7 +42,7 @@ fun filterContentDVMsByGeohash( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(AppDefinitionEvent.KIND), tags = mapOf("k" to listOf("5300"), "g" to geoHashes), limit = 300, 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 4e2029ca7f..d6437759ce 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 @@ -43,7 +43,7 @@ fun filterContentDVMsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(AppDefinitionEvent.KIND), tags = mapOf("k" to listOf("5300"), "t" to hashtags), limit = 300, 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 f172435535..618c3c1ecf 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 @@ -41,7 +41,7 @@ fun filterContentDVMsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(AppDefinitionEvent.KIND), tags = mapOf("k" to listOf("5300")), limit = 30, 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 3539ea66bd..31e717ed13 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 @@ -42,7 +42,7 @@ fun filterClassifiedsAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -58,7 +58,7 @@ fun filterClassifiedsAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, tags = mapOf("a" to communityList), kinds = listOf(ClassifiedsEvent.KIND), limit = 300, 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 e763c1f898..307f970e53 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 @@ -41,7 +41,7 @@ fun filterClassifiedsAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authorList, kinds = listOf(ClassifiedsEvent.KIND), limit = authorList.size * 10, 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 530c01efab..f7027966ae 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 @@ -42,7 +42,7 @@ fun filterClassifiedsByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -59,7 +59,7 @@ fun filterClassifiedsByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, authors = authors, tags = mapOf("a" to listOf(community)), kinds = listOf(ClassifiedsEvent.KIND), 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 1791c2c032..366449b616 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 @@ -42,7 +42,7 @@ fun filterClassifiedsByGeohash( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(ClassifiedsEvent.KIND), tags = mapOf("g" to geoHashes), limit = 300, 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 93695bec05..709af9ca9e 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 @@ -43,7 +43,7 @@ fun filterClassifiedsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(ClassifiedsEvent.KIND), tags = mapOf("t" to hashtags), limit = 300, 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 ecd0ace2c8..f2ed19d8cb 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 @@ -42,7 +42,7 @@ fun filterClassifiedsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.DISCOVER_FEED, kinds = listOf(ClassifiedsEvent.KIND), limit = 30, since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/emojipacks/browse/datasource/subassemblies/FilterBrowseEmojiSetsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/emojipacks/browse/datasource/subassemblies/FilterBrowseEmojiSetsByAuthors.kt index fd431a2a25..605cc42df7 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/emojipacks/browse/datasource/subassemblies/FilterBrowseEmojiSetsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/emojipacks/browse/datasource/subassemblies/FilterBrowseEmojiSetsByAuthors.kt @@ -43,7 +43,7 @@ fun filterBrowseEmojiSetsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ADD_ONS, authors = authors.sorted(), kinds = listOf(EmojiPackEvent.KIND), limit = BROWSE_EMOJI_SETS_FEED_LIMIT, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/emojipacks/browse/datasource/subassemblies/FilterBrowseEmojiSetsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/emojipacks/browse/datasource/subassemblies/FilterBrowseEmojiSetsByHashtag.kt index 6465dd0277..9eabf847df 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/emojipacks/browse/datasource/subassemblies/FilterBrowseEmojiSetsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/emojipacks/browse/datasource/subassemblies/FilterBrowseEmojiSetsByHashtag.kt @@ -40,7 +40,7 @@ fun filterBrowseEmojiSetsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, kinds = listOf(EmojiPackEvent.KIND), tags = mapOf("t" to hashtags.toList()), limit = BROWSE_EMOJI_SETS_FEED_LIMIT, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/emojipacks/browse/datasource/subassemblies/FilterBrowseEmojiSetsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/emojipacks/browse/datasource/subassemblies/FilterBrowseEmojiSetsGlobal.kt index a4e2a5dc9d..9cd2bb4184 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/emojipacks/browse/datasource/subassemblies/FilterBrowseEmojiSetsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/emojipacks/browse/datasource/subassemblies/FilterBrowseEmojiSetsGlobal.kt @@ -43,7 +43,7 @@ fun filterBrowseEmojiSetsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ADD_ONS, kinds = listOf(EmojiPackEvent.KIND), limit = BROWSE_EMOJI_SETS_FEED_LIMIT, since = sinceValue, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/datasource/FilterPostsByGeohash.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/datasource/FilterPostsByGeohash.kt index 63049951d1..0fabbeae26 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/datasource/FilterPostsByGeohash.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/geohash/datasource/FilterPostsByGeohash.kt @@ -79,7 +79,7 @@ fun filterPostsByGeohash( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, tags = geohashesToFollowMap, kinds = PostsByGeohashKinds, limit = 100, @@ -90,7 +90,7 @@ fun filterPostsByGeohash( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, tags = geohashesScoreMap, kinds = CommentKinds, limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepo/datasource/FilterRepositoryContent.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepo/datasource/FilterRepositoryContent.kt index 3078cd0a2d..924f9dbf96 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepo/datasource/FilterRepositoryContent.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepo/datasource/FilterRepositoryContent.kt @@ -55,7 +55,7 @@ fun filterRepositoryContent( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TOPIC_FEED, tags = mapOf("a" to listOf(repository.addressTag())), kinds = RepositoryContentKinds, limit = 500, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByAllCommunities.kt index db232b27a1..3cb32b21af 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByAllCommunities.kt @@ -53,7 +53,7 @@ fun filterGitRepositoriesFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -69,7 +69,7 @@ fun filterGitRepositoriesFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, tags = mapOf("a" to communityList), kinds = GitRepositoriesFromCommunityKinds, limit = communityList.size * 20, @@ -109,7 +109,7 @@ fun filterGitRepositoriesFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -126,7 +126,7 @@ fun filterGitRepositoriesFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, authors = authors, tags = mapOf("a" to listOf(community)), kinds = GitRepositoriesFromCommunityKinds, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByAuthors.kt index 8101155951..4316cac70e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByAuthors.kt @@ -41,7 +41,7 @@ fun filterGitRepositoriesByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TOPIC_FEED, authors = authorList, kinds = listOf(GitRepositoryEvent.KIND), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByGeohashes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByGeohashes.kt index 262fcfc87d..0762319d4d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByGeohashes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByGeohashes.kt @@ -40,7 +40,7 @@ fun filterGitRepositoriesByGeohashes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, kinds = listOf(GitRepositoryEvent.KIND), tags = mapOf("g" to geotags.sorted()), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByHashtag.kt index af76ce5426..4dd1939660 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesByHashtag.kt @@ -38,7 +38,7 @@ fun filterGitRepositoriesByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, kinds = listOf(GitRepositoryEvent.KIND), tags = mapOf("t" to hashtags.toList()), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesGlobal.kt index 7d3c31815a..d3f40af9d6 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/gitRepositories/datasource/subassemblies/FilterGitRepositoriesGlobal.kt @@ -41,7 +41,7 @@ fun filterGitRepositoriesGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TOPIC_FEED, kinds = listOf(GitRepositoryEvent.KIND), limit = 200, since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/datasource/FilterHashtagLabels.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/datasource/FilterHashtagLabels.kt index 07116fb9dd..670eff235a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/datasource/FilterHashtagLabels.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/datasource/FilterHashtagLabels.kt @@ -64,7 +64,7 @@ fun filterHashtagLabels( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, kinds = listOf(LabelEvent.KIND), authors = authorList, tags = mapOf("l" to labelValues), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/datasource/FilterPostsByHashtags.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/datasource/FilterPostsByHashtags.kt index 0e3927e13b..fcf9ab032f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/datasource/FilterPostsByHashtags.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/hashtag/datasource/FilterPostsByHashtags.kt @@ -88,7 +88,7 @@ fun filterPostsByHashtags( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, tags = hashtagsToFollowMap, kinds = PostsByHashtagsKinds, limit = 400, @@ -99,7 +99,7 @@ fun filterPostsByHashtags( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, tags = hashtagsToFollowMap, kinds = PostsByHashtagKinds2, limit = 100, @@ -110,7 +110,7 @@ fun filterPostsByHashtags( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, tags = hashtagScoreMap, kinds = CommentKinds, limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsByAuthors.kt index 25b3b2b447..500ccfabef 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsByAuthors.kt @@ -41,7 +41,7 @@ fun filterHighlightsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TOPIC_FEED, authors = authorList, kinds = listOf(HighlightEvent.KIND), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsByGeohashes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsByGeohashes.kt index f41b282833..625683fb71 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsByGeohashes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsByGeohashes.kt @@ -40,7 +40,7 @@ fun filterHighlightsByGeohashes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, kinds = listOf(HighlightEvent.KIND), tags = mapOf("g" to geotags.sorted()), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsByHashtag.kt index 4106d9a7f3..4a075c18c9 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsByHashtag.kt @@ -38,7 +38,7 @@ fun filterHighlightsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, kinds = listOf(HighlightEvent.KIND), tags = mapOf("t" to hashtags.toList()), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsGlobal.kt index 0534105d1e..b4ba6fb4be 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/highlights/datasource/subassemblies/FilterHighlightsGlobal.kt @@ -41,7 +41,7 @@ fun filterHighlightsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TOPIC_FEED, kinds = listOf(HighlightEvent.KIND), limit = 200, since = since, 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 7baa061791..be5512ae2d 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 @@ -114,7 +114,7 @@ fun filterNewHomePostsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.FOLLOW_LISTS, + purpose = SubPurpose.RELAY_LISTS, kinds = HomePostsNewThreadKinds1, authors = authorList, limit = min(authorList.size * 10, 500), @@ -125,7 +125,7 @@ fun filterNewHomePostsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.FOLLOW_LISTS, + purpose = SubPurpose.RELAY_LISTS, kinds = HomePostsNewThreadKinds2, authors = authorList, limit = min(authorList.size * 10, 5), @@ -147,7 +147,7 @@ fun filterReplyHomePostsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.FOLLOW_LISTS, + purpose = SubPurpose.RELAY_LISTS, kinds = HomePostsConversationKinds, authors = authorList, limit = min(authorList.size * 10, 500), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByAllCommunities.kt index 16871b2ca2..7e5c287cbd 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByAllCommunities.kt @@ -56,7 +56,7 @@ fun filterLongsFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -72,7 +72,7 @@ fun filterLongsFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, tags = mapOf("a" to communityList), kinds = LongsFromCommunityKinds, limit = communityList.size * 20, @@ -112,7 +112,7 @@ fun filterLongsFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -129,7 +129,7 @@ fun filterLongsFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authors, tags = mapOf("a" to listOf(community)), kinds = LongsFromCommunityKinds, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByAuthors.kt index 73f5ed1eaa..7abcb602d2 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByAuthors.kt @@ -42,7 +42,7 @@ fun filterLongsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authorList, kinds = listOf(VideoNormalEvent.KIND, VideoHorizontalEvent.KIND), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByGeohashes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByGeohashes.kt index 0a2abe96a9..e9ad6f93eb 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByGeohashes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByGeohashes.kt @@ -41,7 +41,7 @@ fun filterLongsByGeohashes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = listOf(VideoNormalEvent.KIND, VideoHorizontalEvent.KIND), tags = mapOf("g" to geotags.sorted()), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByHashtag.kt index 4f7b25a4a9..3af9195851 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsByHashtag.kt @@ -39,7 +39,7 @@ fun filterLongsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = listOf(VideoNormalEvent.KIND, VideoHorizontalEvent.KIND), tags = mapOf("t" to hashtags.toList()), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsGlobal.kt index 817a3d0c83..34577f364a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/longs/datasource/subassemblies/FilterLongsGlobal.kt @@ -42,7 +42,7 @@ fun filterLongsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = listOf(VideoNormalEvent.KIND, VideoHorizontalEvent.KIND), limit = 200, since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByAuthors.kt index 8410b07d11..6820936028 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByAuthors.kt @@ -51,7 +51,7 @@ fun filterMusicEventsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authorList, kinds = kinds, limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByCommunities.kt index 055120a439..0e315e84e8 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByCommunities.kt @@ -49,7 +49,7 @@ fun filterMusicEventsFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -64,7 +64,7 @@ fun filterMusicEventsFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = kinds, tags = mapOf("a" to communityList), limit = communityList.size * 20, @@ -107,7 +107,7 @@ fun filterMusicEventsFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authorList, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -123,7 +123,7 @@ fun filterMusicEventsFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authorList, kinds = kinds, tags = mapOf("a" to listOf(community)), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByGeohashes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByGeohashes.kt index 60381612ba..2a1d14a505 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByGeohashes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByGeohashes.kt @@ -40,7 +40,7 @@ fun filterMusicEventsByGeohashes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = kinds, tags = mapOf("g" to geotags.sorted()), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByHashtag.kt index a214d7ea45..15748ceafe 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsByHashtag.kt @@ -38,7 +38,7 @@ fun filterMusicEventsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = kinds, tags = mapOf("t" to hashtags.sorted()), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsGlobal.kt index 638b3a378c..05164fffa3 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/music/datasource/subassemblies/FilterMusicEventsGlobal.kt @@ -45,7 +45,7 @@ fun filterMusicEventsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = kinds, limit = 200, since = sinceForRelay, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/datasource/subassemblies/FilterNappletsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/datasource/subassemblies/FilterNappletsByAuthors.kt index ef69c79137..6c415a452a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/datasource/subassemblies/FilterNappletsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/datasource/subassemblies/FilterNappletsByAuthors.kt @@ -43,7 +43,7 @@ fun filterNappletsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ADD_ONS, authors = authorList, kinds = listOf(RootNappletEvent.KIND, NamedNappletEvent.KIND), limit = NAPPLET_PAGE_LIMIT, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/datasource/subassemblies/FilterNappletsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/datasource/subassemblies/FilterNappletsGlobal.kt index 5cb5cbbdcd..929a24de6b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/datasource/subassemblies/FilterNappletsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/datasource/subassemblies/FilterNappletsGlobal.kt @@ -44,7 +44,7 @@ fun filterNappletsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ADD_ONS, kinds = listOf(RootNappletEvent.KIND, NamedNappletEvent.KIND), limit = NAPPLET_PAGE_LIMIT, since = since?.get(it.key)?.time ?: defaultSince, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/NestRoomFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/NestRoomFilterAssembler.kt index 5452966918..f3dd500d6c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/NestRoomFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/NestRoomFilterAssembler.kt @@ -93,7 +93,7 @@ class NestRoomFilterSubAssembler( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, kinds = listOf( LiveActivitiesChatMessageEvent.KIND, @@ -110,7 +110,7 @@ class NestRoomFilterSubAssembler( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, kinds = listOf(AdminCommandEvent.KIND), tags = mapOf("a" to listOf(key.note.idHex), "p" to listOf(key.account.pubKey)), since = since?.get(relay)?.time, @@ -129,7 +129,7 @@ class NestRoomFilterSubAssembler( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, kinds = listOf(MeetingSpaceEvent.KIND), authors = listOf(key.note.address.pubKeyHex), tags = mapOf("d" to listOf(key.note.address.dTag)), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/NestRoomLivenessProbeAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/NestRoomLivenessProbeAssembler.kt index 64f0fe82f0..3ae8d18843 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/NestRoomLivenessProbeAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/NestRoomLivenessProbeAssembler.kt @@ -84,7 +84,7 @@ class NestRoomLivenessSubAssembler( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, kinds = listOf(MeetingRoomPresenceEvent.KIND), tags = mapOf("a" to listOf(key.note.idHex)), // limit=1: the badge only needs the freshest diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByAllCommunities.kt index 724525b124..89d166c8bb 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByAllCommunities.kt @@ -44,7 +44,7 @@ fun filterNestsAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -60,7 +60,7 @@ fun filterNestsAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, tags = mapOf("k" to listOf("5300"), "a" to communityList), kinds = listOf(MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), limit = 300, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByAuthors.kt index 7193db4568..7a29bef733 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByAuthors.kt @@ -42,7 +42,7 @@ fun filterNestsAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, authors = authorList, kinds = listOf(MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), limit = 300, @@ -54,7 +54,7 @@ fun filterNestsAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, tags = mapOf("p" to authorList), kinds = listOf(MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByCommunity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByCommunity.kt index 30f784649a..3cb5722213 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByCommunity.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByCommunity.kt @@ -43,7 +43,7 @@ fun filterNestsByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -60,7 +60,7 @@ fun filterNestsByCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, authors = authors, tags = mapOf("k" to listOf("5300"), "a" to listOf(community)), kinds = listOf(MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByGeohash.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByGeohash.kt index 53097b8192..a044bca29d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByGeohash.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByGeohash.kt @@ -43,7 +43,7 @@ fun filterNestsByGeohash( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, kinds = listOf(MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), tags = mapOf("g" to geoHashes), limit = 300, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByHashtag.kt index 86fda37ee5..b9a558630e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsByHashtag.kt @@ -44,7 +44,7 @@ fun filterNestsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, kinds = listOf(MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), tags = mapOf("t" to hashtags), limit = 300, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsGlobal.kt index b46b99ba7d..966966fe7b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/datasource/subassemblies/FilterNestsGlobal.kt @@ -56,7 +56,7 @@ fun filterNestsPresence(relay: NormalizedRelayUrl): RelayBasedFilter = relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, kinds = listOf(MeetingRoomPresenceEvent.KIND), limit = 500, since = TimeUtils.now() - PRESENCE_LOOKBACK_SECONDS, @@ -78,7 +78,7 @@ fun filterNestsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.LIVE_ROOMS, kinds = listOf(MeetingSpaceEvent.KIND, MeetingRoomEvent.KIND), limit = 300, since = roomsSince ?: TimeUtils.oneWeekAgo(), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nsites/datasource/subassemblies/FilterNsitesByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nsites/datasource/subassemblies/FilterNsitesByAuthors.kt index 4c0b896a73..9c4154105d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nsites/datasource/subassemblies/FilterNsitesByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nsites/datasource/subassemblies/FilterNsitesByAuthors.kt @@ -43,7 +43,7 @@ fun filterNsitesByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ADD_ONS, authors = authorList, kinds = listOf(RootSiteEvent.KIND, NamedSiteEvent.KIND), limit = NSITE_PAGE_LIMIT, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nsites/datasource/subassemblies/FilterNsitesGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nsites/datasource/subassemblies/FilterNsitesGlobal.kt index add70b0565..f39af90993 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nsites/datasource/subassemblies/FilterNsitesGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nsites/datasource/subassemblies/FilterNsitesGlobal.kt @@ -44,7 +44,7 @@ fun filterNsitesGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ADD_ONS, kinds = listOf(RootSiteEvent.KIND, NamedSiteEvent.KIND), limit = NSITE_PAGE_LIMIT, since = since?.get(it.key)?.time ?: defaultSince, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByAllCommunities.kt index 2e4418c11c..f1992e40fb 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByAllCommunities.kt @@ -53,7 +53,7 @@ fun filterPicturesFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -69,7 +69,7 @@ fun filterPicturesFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, tags = mapOf("a" to communityList), kinds = PicturesFromCommunityKinds, limit = communityList.size * 20, @@ -109,7 +109,7 @@ fun filterPicturesFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -126,7 +126,7 @@ fun filterPicturesFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authors, tags = mapOf("a" to listOf(community)), kinds = PicturesFromCommunityKinds, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByAuthors.kt index 0ff545f665..f9e769998e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByAuthors.kt @@ -41,7 +41,7 @@ fun filterPicturesByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authorList, kinds = listOf(PictureEvent.KIND), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByGeohashes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByGeohashes.kt index 1cee1532c5..23a3762bf4 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByGeohashes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByGeohashes.kt @@ -40,7 +40,7 @@ fun filterPicturesByGeohashes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = listOf(PictureEvent.KIND), tags = mapOf("g" to geotags.sorted()), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByHashtag.kt index 1c028ba724..4913579efd 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesByHashtag.kt @@ -38,7 +38,7 @@ fun filterPicturesByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = listOf(PictureEvent.KIND), tags = mapOf("t" to hashtags.toList()), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesGlobal.kt index a677839366..9d898918eb 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/pictures/datasource/subassemblies/FilterPicturesGlobal.kt @@ -41,7 +41,7 @@ fun filterPicturesGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = listOf(PictureEvent.KIND), limit = 200, since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/FilterMyPodcast.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/FilterMyPodcast.kt index 6757d8e46e..482a1dfbc4 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/FilterMyPodcast.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/FilterMyPodcast.kt @@ -60,7 +60,7 @@ fun filterMyPodcast( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authors, kinds = listOf(Podcasting20EpisodeEvent.KIND, Podcasting20TrailerEvent.KIND), since = sinceTime, @@ -71,7 +71,7 @@ fun filterMyPodcast( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authors, kinds = listOf(AppSpecificDataEvent.KIND), tags = mapOf("d" to listOf(Podcasting20PodcastMetadata.PODCAST_METADATA_D_TAG)), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/FilterOnePodcast.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/FilterOnePodcast.kt index c291fd3a1a..074e00b411 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/FilterOnePodcast.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/FilterOnePodcast.kt @@ -60,7 +60,7 @@ fun filterOnePodcast( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = OnePodcastKinds, authors = listOf(user.pubkeyHex), limit = 500, @@ -73,7 +73,7 @@ fun filterOnePodcast( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = listOf(AppSpecificDataEvent.KIND), authors = listOf(user.pubkeyHex), tags = mapOf("d" to listOf(Podcasting20PodcastMetadata.PODCAST_METADATA_D_TAG)), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByAuthors.kt index f1a7d8b593..75a6410dbe 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByAuthors.kt @@ -84,7 +84,7 @@ fun filterPodcastEventsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authorList, kinds = kinds, tags = additionalTags, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByCommunities.kt index 7bb561c4cd..4aad2b6400 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByCommunities.kt @@ -44,7 +44,7 @@ fun filterPodcastEventsFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -59,7 +59,7 @@ fun filterPodcastEventsFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = kinds, tags = mergeFilterTags(mapOf("a" to communityList), additionalTags), limit = communityList.size * 20, @@ -104,7 +104,7 @@ fun filterPodcastEventsFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authorList, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -120,7 +120,7 @@ fun filterPodcastEventsFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authorList, kinds = kinds, tags = mergeFilterTags(mapOf("a" to listOf(community)), additionalTags), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByGeohashes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByGeohashes.kt index 3bc67fbfab..f0e511d112 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByGeohashes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByGeohashes.kt @@ -41,7 +41,7 @@ fun filterPodcastEventsByGeohashes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = kinds, tags = mergeFilterTags(mapOf("g" to geotags.sorted()), additionalTags), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByHashtag.kt index 3bb2b20cec..d6b189ed23 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsByHashtag.kt @@ -39,7 +39,7 @@ fun filterPodcastEventsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = kinds, tags = mergeFilterTags(mapOf("t" to hashtags.sorted()), additionalTags), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsGlobal.kt index be9c9a7508..093f5c3b45 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/podcasts/datasource/subassemblies/FilterPodcastEventsGlobal.kt @@ -43,7 +43,7 @@ fun filterPodcastEventsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = kinds, tags = additionalTags, limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByAllCommunities.kt index 1dfa5faa35..3c7f65da1f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByAllCommunities.kt @@ -56,7 +56,7 @@ fun filterPollsFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -72,7 +72,7 @@ fun filterPollsFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, tags = mapOf("a" to communityList), kinds = PollsFromCommunityKinds, limit = communityList.size * 20, @@ -112,7 +112,7 @@ fun filterPollsFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -129,7 +129,7 @@ fun filterPollsFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, authors = authors, tags = mapOf("a" to listOf(community)), kinds = PollsFromCommunityKinds, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByAuthors.kt index da1d4cdca1..72ac8ebd89 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByAuthors.kt @@ -42,7 +42,7 @@ fun filterPollsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TOPIC_FEED, authors = authorList, kinds = listOf(PollEvent.KIND, ZapPollEvent.KIND), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByGeohashes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByGeohashes.kt index 2085722e70..fecc93a0c1 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByGeohashes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByGeohashes.kt @@ -41,7 +41,7 @@ fun filterPollsByGeohashes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, kinds = listOf(PollEvent.KIND, ZapPollEvent.KIND), tags = mapOf("g" to geotags.sorted()), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByHashtag.kt index baa8fedac3..dffbab4c0d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsByHashtag.kt @@ -39,7 +39,7 @@ fun filterPollsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, kinds = listOf(PollEvent.KIND, ZapPollEvent.KIND), tags = mapOf("t" to hashtags.toList()), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsGlobal.kt index c497e78810..0216068391 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/polls/datasource/subassemblies/FilterPollsGlobal.kt @@ -42,7 +42,7 @@ fun filterPollsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TOPIC_FEED, kinds = listOf(PollEvent.KIND, ZapPollEvent.KIND), limit = 200, since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileFollowers.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileFollowers.kt index 578c2f4c57..35c9ae52e0 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileFollowers.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileFollowers.kt @@ -44,7 +44,7 @@ fun filterUserProfileFollowers( relay = it, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.USER_PROFILE, kinds = UserProfileFollowersKinds, tags = mapOf("p" to listOf(user.pubkeyHex)), since = since?.get(it)?.time, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileLastSeen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileLastSeen.kt index 9b21f728fe..a4a362359f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileLastSeen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileLastSeen.kt @@ -37,7 +37,7 @@ fun filterUserProfileLastSeen( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.USER_PROFILE, authors = it.value.sorted(), since = since?.get(it.key)?.time, ), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileLists.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileLists.kt index 781d47ca5d..3f59327dc6 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileLists.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileLists.kt @@ -55,7 +55,7 @@ fun filterUserProfileLists( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.USER_PROFILE, kinds = UserProfileListKinds, authors = it.value.sorted(), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileMedia.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileMedia.kt index 1f330f9108..9fdd6c2abe 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileMedia.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileMedia.kt @@ -59,7 +59,7 @@ fun filterUserProfileMedia( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.USER_PROFILE, kinds = UserProfileMediaKinds, authors = listOf(user.pubkeyHex), limit = 200, @@ -72,7 +72,7 @@ fun filterUserProfileMedia( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.USER_PROFILE, kinds = listOf(LiveActivitiesClipEvent.KIND), tags = mapOf("p" to listOf(user.pubkeyHex)), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileMetadata.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileMetadata.kt index 8c3abadfec..966a12ce15 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileMetadata.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileMetadata.kt @@ -51,7 +51,7 @@ fun filterUserProfileMetadata( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.PROFILE_METADATA, + purpose = SubPurpose.USER_PROFILE, kinds = UserProfileMetadataKinds, authors = it.value.sorted(), since = since?.get(it.key)?.time, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfilePosts.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfilePosts.kt index 7c8b263b87..cffc751c84 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfilePosts.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfilePosts.kt @@ -105,7 +105,7 @@ fun filterUserProfilePosts( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.USER_PROFILE, kinds = UserProfilePostKinds1, authors = listOf(user.pubkeyHex), limit = 500, @@ -116,7 +116,7 @@ fun filterUserProfilePosts( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.USER_PROFILE, kinds = UserProfilePostKinds2, authors = listOf(user.pubkeyHex), limit = 50, @@ -127,7 +127,7 @@ fun filterUserProfilePosts( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.USER_PROFILE, kinds = UserProfileAppKinds, authors = listOf(user.pubkeyHex), limit = 50, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileZapReceived.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileZapReceived.kt index ca537f2821..f913c42159 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileZapReceived.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfileZapReceived.kt @@ -46,7 +46,7 @@ fun filterUserProfileZapsReceived( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.USER_PROFILE, kinds = UserProfileZapReceiverKinds, tags = mapOf("p" to listOf(user.pubkeyHex)), limit = 1000, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relay/datasource/FilterPostsByRelay.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relay/datasource/FilterPostsByRelay.kt index f4b6755601..3c9a3ce21f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relay/datasource/FilterPostsByRelay.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relay/datasource/FilterPostsByRelay.kt @@ -80,7 +80,7 @@ fun filterPostsByRelay( relay = relayUrl, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.RELAY_INFO, kinds = PostsByRelayKinds, limit = 400, since = sinceTime, @@ -90,7 +90,7 @@ fun filterPostsByRelay( relay = relayUrl, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.RELAY_INFO, kinds = PostsByRelayKinds2, limit = 100, since = sinceTime, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/datasource/RelayInfoNip66FilterSubAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/datasource/RelayInfoNip66FilterSubAssembler.kt index b0c1de7b6e..ad1cc723eb 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/datasource/RelayInfoNip66FilterSubAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/datasource/RelayInfoNip66FilterSubAssembler.kt @@ -43,7 +43,7 @@ class RelayInfoNip66FilterSubAssembler( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.RELAY_INFO, kinds = listOf(RelayDiscoveryEvent.KIND), tags = mapOf("d" to listOf(relayUrl)), limit = 20, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterPollsByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterPollsByAllCommunities.kt index 4b98621fac..15a3c51460 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterPollsByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterPollsByAllCommunities.kt @@ -56,7 +56,7 @@ fun filterShortsFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -72,7 +72,7 @@ fun filterShortsFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, tags = mapOf("a" to communityList), kinds = ShortsFromCommunityKinds, limit = communityList.size * 20, @@ -112,7 +112,7 @@ fun filterShortsFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -129,7 +129,7 @@ fun filterShortsFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authors, tags = mapOf("a" to listOf(community)), kinds = ShortsFromCommunityKinds, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsByAuthors.kt index cc528e6f36..fcade6e8c9 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsByAuthors.kt @@ -42,7 +42,7 @@ fun filterShortsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authorList, kinds = listOf(VideoShortEvent.KIND, VideoVerticalEvent.KIND), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsByGeohashes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsByGeohashes.kt index 1cf52cd61d..117ca69717 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsByGeohashes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsByGeohashes.kt @@ -41,7 +41,7 @@ fun filterShortsByGeohashes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = listOf(VideoShortEvent.KIND, VideoVerticalEvent.KIND), tags = mapOf("g" to geotags.sorted()), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsByHashtag.kt index 640bc36417..a0df247758 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsByHashtag.kt @@ -39,7 +39,7 @@ fun filterShortsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = listOf(VideoShortEvent.KIND, VideoVerticalEvent.KIND), tags = mapOf("t" to hashtags.toList()), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsGlobal.kt index a5c93f3ad7..d9975d402b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/shorts/datasource/subassemblies/FilterShortsGlobal.kt @@ -42,7 +42,7 @@ fun filterShortsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = listOf(VideoShortEvent.KIND, VideoVerticalEvent.KIND), limit = 200, since = since, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/softwareapps/datasource/subassemblies/FilterSoftwareAppsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/softwareapps/datasource/subassemblies/FilterSoftwareAppsByAuthors.kt index a664958d18..d24de2b9bf 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/softwareapps/datasource/subassemblies/FilterSoftwareAppsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/softwareapps/datasource/subassemblies/FilterSoftwareAppsByAuthors.kt @@ -42,7 +42,7 @@ fun filterSoftwareAppsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ADD_ONS, authors = authorList, kinds = listOf(SoftwareApplicationEvent.KIND, SoftwareReleaseEvent.KIND), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/softwareapps/datasource/subassemblies/FilterSoftwareAppsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/softwareapps/datasource/subassemblies/FilterSoftwareAppsByHashtag.kt index 48af996e21..3c32ed466a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/softwareapps/datasource/subassemblies/FilterSoftwareAppsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/softwareapps/datasource/subassemblies/FilterSoftwareAppsByHashtag.kt @@ -44,7 +44,7 @@ fun filterSoftwareAppsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, kinds = listOf(SoftwareApplicationEvent.KIND, SoftwareReleaseEvent.KIND), tags = mapOf("t" to expanded), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/softwareapps/datasource/subassemblies/FilterSoftwareAppsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/softwareapps/datasource/subassemblies/FilterSoftwareAppsGlobal.kt index 778965d85d..62298cbf96 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/softwareapps/datasource/subassemblies/FilterSoftwareAppsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/softwareapps/datasource/subassemblies/FilterSoftwareAppsGlobal.kt @@ -56,7 +56,7 @@ fun filterSoftwareAppsGlobal( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ADD_ONS, kinds = listOf(SoftwareApplicationEvent.KIND, SoftwareReleaseEvent.KIND), // Keep the limit < 100. Relays such as zapstore's score filter // specificity and treat a limit >= 100 (or none) as too vague, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/datasources/subassembies/FilterEventsInThreadForRoot.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/datasources/subassembies/FilterEventsInThreadForRoot.kt index ea9d38c759..8ae53c3d4f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/datasources/subassembies/FilterEventsInThreadForRoot.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/datasources/subassembies/FilterEventsInThreadForRoot.kt @@ -44,7 +44,7 @@ fun filterEventsInThreadForRoot( relay = it, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.THREAD, tags = mapOf("a" to listOf(addressRoot)), since = since, ), @@ -53,7 +53,7 @@ fun filterEventsInThreadForRoot( relay = it, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.THREAD, tags = mapOf("A" to listOf(addressRoot)), since = since, ), @@ -70,7 +70,7 @@ fun filterEventsInThreadForRoot( relay = it, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.THREAD, tags = mapOf("e" to listOf(eventRoot)), since = since, ), @@ -79,7 +79,7 @@ fun filterEventsInThreadForRoot( relay = it, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.THREAD, tags = mapOf("E" to listOf(eventRoot)), since = since, ), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/url/datasource/FilterPostsByUrl.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/url/datasource/FilterPostsByUrl.kt index e19d24d17f..e18789b4aa 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/url/datasource/FilterPostsByUrl.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/url/datasource/FilterPostsByUrl.kt @@ -42,7 +42,7 @@ fun filterPostsByUrl( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.OTHER, tags = urlScopeMap, kinds = CommentKinds, limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip01Core/FilterPictureAndVideoByGeohash.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip01Core/FilterPictureAndVideoByGeohash.kt index a807761425..dc785068bd 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip01Core/FilterPictureAndVideoByGeohash.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip01Core/FilterPictureAndVideoByGeohash.kt @@ -42,7 +42,7 @@ fun filterPictureAndVideoGeohash( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = PictureAndVideoKinds, tags = mapOf("g" to geoHashes), limit = 200, @@ -53,7 +53,7 @@ fun filterPictureAndVideoGeohash( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = PictureAndVideoLegacyKinds, tags = mapOf( 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 b2afe876cc..b0d29d160d 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 @@ -43,7 +43,7 @@ fun filterPictureAndVideoHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = PictureAndVideoKinds, tags = mapOf("t" to hashtags), limit = 100, @@ -54,7 +54,7 @@ fun filterPictureAndVideoHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = PictureAndVideoLegacyKinds, tags = mapOf( diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip01Core/FilterPictureAndVideoGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip01Core/FilterPictureAndVideoGlobal.kt index 7350844617..8ffb150967 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip01Core/FilterPictureAndVideoGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip01Core/FilterPictureAndVideoGlobal.kt @@ -43,7 +43,7 @@ fun filterPictureAndVideoGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = PictureAndVideoKinds, limit = 50, since = since, @@ -53,7 +53,7 @@ fun filterPictureAndVideoGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = PictureAndVideoLegacyKinds, tags = LegacyMimeTypeMap, limit = 50, 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 d2b1ce1a12..bb5d27a75d 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 @@ -44,7 +44,7 @@ fun filterPictureAndVideoAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.FOLLOW_LISTS, + purpose = SubPurpose.RELAY_LISTS, authors = authorList, kinds = PictureAndVideoKinds, limit = if (since == null) max(authorList.size * 20, 200) else null, @@ -55,7 +55,7 @@ fun filterPictureAndVideoAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.FOLLOW_LISTS, + purpose = SubPurpose.RELAY_LISTS, authors = authorList, kinds = PictureAndVideoLegacyKinds, tags = LegacyMimeTypeMap, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip72Communities/FilterPictureAndVideoByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip72Communities/FilterPictureAndVideoByAllCommunities.kt index 863d208797..1d9a517d3f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip72Communities/FilterPictureAndVideoByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/datasource/subassemblies/nip72Communities/FilterPictureAndVideoByAllCommunities.kt @@ -47,7 +47,7 @@ fun filterPictureAndVideoAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -63,7 +63,7 @@ fun filterPictureAndVideoAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, tags = mapOf("a" to communityList), kinds = PictureAndVideoKinds, limit = 200, @@ -75,7 +75,7 @@ fun filterPictureAndVideoAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -91,7 +91,7 @@ fun filterPictureAndVideoAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, tags = mapOf( "a" to communityList, 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 45faca0799..2bdec3af51 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 @@ -46,7 +46,7 @@ fun filterPictureAndVideoCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -63,7 +63,7 @@ fun filterPictureAndVideoCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authors, tags = mapOf("a" to listOf(community)), kinds = PictureAndVideoKinds, @@ -76,7 +76,7 @@ fun filterPictureAndVideoCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -93,7 +93,7 @@ fun filterPictureAndVideoCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.MEDIA_FEED, authors = authors, tags = mapOf( diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/wallet/datasource/OnchainZapsFilterAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/wallet/datasource/OnchainZapsFilterAssembler.kt index 76b31da7c3..f13764f410 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/wallet/datasource/OnchainZapsFilterAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/wallet/datasource/OnchainZapsFilterAssembler.kt @@ -75,7 +75,7 @@ private fun filterOnchainZaps( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.WALLET, kinds = listOf(OnchainZapEvent.KIND), tags = mapOf("p" to listOf(pubkey)), limit = PER_FILTER_LIMIT, @@ -86,7 +86,7 @@ private fun filterOnchainZaps( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.WALLET, kinds = listOf(OnchainZapEvent.KIND), authors = listOf(pubkey), limit = PER_FILTER_LIMIT, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByAllCommunities.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByAllCommunities.kt index 155ceb0c1e..31e074a6aa 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByAllCommunities.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByAllCommunities.kt @@ -53,7 +53,7 @@ fun filterWorkoutsFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = mapOf( @@ -69,7 +69,7 @@ fun filterWorkoutsFromAllCommunities( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, tags = mapOf("a" to communityList), kinds = WorkoutsFromCommunityKinds, limit = communityList.size * 20, @@ -109,7 +109,7 @@ fun filterWorkoutsFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, authors = authors, kinds = CommunityPostApprovalEvent.KIND_LIST, tags = @@ -126,7 +126,7 @@ fun filterWorkoutsFromCommunity( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.COMMUNITY_FEED, authors = authors, tags = mapOf("a" to listOf(community)), kinds = WorkoutsFromCommunityKinds, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByAuthors.kt index 353e2626c7..13382e375f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByAuthors.kt @@ -41,7 +41,7 @@ fun filterWorkoutsByAuthors( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TOPIC_FEED, authors = authorList, kinds = listOf(WorkoutRecordEvent.KIND), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByGeohashes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByGeohashes.kt index 6e8390ad0a..6d0f83cd41 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByGeohashes.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByGeohashes.kt @@ -40,7 +40,7 @@ fun filterWorkoutsByGeohashes( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, kinds = listOf(WorkoutRecordEvent.KIND), tags = mapOf("g" to geotags.sorted()), limit = 100, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByHashtag.kt index 481662285a..117e8137f6 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByHashtag.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsByHashtag.kt @@ -38,7 +38,7 @@ fun filterWorkoutsByHashtag( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TAG_FEED, kinds = listOf(WorkoutRecordEvent.KIND), tags = mapOf("t" to hashtags.toList()), limit = 200, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsGlobal.kt index ee8d5a8bec..d798092b08 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/datasource/subassemblies/FilterWorkoutsGlobal.kt @@ -41,7 +41,7 @@ fun filterWorkoutsGlobal( relay = it.key, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.TOPIC_FEED, kinds = listOf(WorkoutRecordEvent.KIND), limit = 200, since = since, diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/actions/ConcordSubscriptionPlanner.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/actions/ConcordSubscriptionPlanner.kt index 32ea1e3ad6..6e8dff7700 100644 --- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/actions/ConcordSubscriptionPlanner.kt +++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/actions/ConcordSubscriptionPlanner.kt @@ -178,7 +178,7 @@ object ConcordSubscriptionPlanner { val filter = if (lastRead > 0L) { ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.COMMUNITY_CHATS, purposeDetail = "concord community planes", kinds = listOf(ConcordStreamEnvelope.KIND_WRAP), authors = authors.toList(), @@ -189,7 +189,7 @@ object ConcordSubscriptionPlanner { ) } else { ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.COMMUNITY_CHATS, purposeDetail = "concord community planes", kinds = listOf(ConcordStreamEnvelope.KIND_WRAP), authors = authors.toList(), @@ -270,7 +270,7 @@ object ConcordSubscriptionPlanner { relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.CHATS, + purpose = SubPurpose.COMMUNITY_CHATS, // Stored plane wraps (1059) plus ephemeral ones (21059) — the latter carry the // live-only typing heartbeats a relay broadcasts but never stores. kinds = listOf(ConcordStreamEnvelope.KIND_WRAP, ConcordStreamEnvelope.KIND_WRAP_EPHEMERAL), diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/nip64Chess/subscription/ChessFilterBuilder.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/nip64Chess/subscription/ChessFilterBuilder.kt index 364a41e9c4..7d0e0880a8 100644 --- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/nip64Chess/subscription/ChessFilterBuilder.kt +++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/nip64Chess/subscription/ChessFilterBuilder.kt @@ -105,7 +105,7 @@ object ChessFilterBuilder { ): List { val filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.GAMES, kinds = listOf(JESTER_KIND), tags = mapOf("p" to listOf(userPubkey)), limit = 100, @@ -134,7 +134,7 @@ object ChessFilterBuilder { ): List { val filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.GAMES, kinds = listOf(JESTER_KIND), tags = mapOf("e" to listOf(JesterProtocol.START_POSITION_HASH)), limit = 100, @@ -174,7 +174,7 @@ object ChessFilterBuilder { // This catches all moves/events for these games val gameFilter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.GAMES, purposeDetail = "live chess games on screen", kinds = listOf(JESTER_KIND), tags = mapOf("e" to startEventIds.toList()), @@ -188,7 +188,7 @@ object ChessFilterBuilder { // Also filter by p-tag (opponent tagged us) for redundancy val tagFilter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.GAMES, purposeDetail = "live chess games on screen", kinds = listOf(JESTER_KIND), tags = mapOf("p" to listOf(userPubkey)), @@ -203,7 +203,7 @@ object ChessFilterBuilder { if (opponentPubkeys.isNotEmpty()) { val authorFilter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.GAMES, purposeDetail = "live chess games on screen", kinds = listOf(JESTER_KIND), authors = opponentPubkeys.toList(), @@ -229,7 +229,7 @@ object ChessFilterBuilder { ): List { val filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.GAMES, kinds = listOf(JESTER_KIND), limit = 100, ) @@ -257,7 +257,7 @@ object ChessFilterBuilder { */ fun gameEventsFilter(startEventId: String): Filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.GAMES, purposeDetail = "live chess games on screen", kinds = listOf(JESTER_KIND), tags = mapOf("e" to listOf(startEventId)), @@ -273,7 +273,7 @@ object ChessFilterBuilder { fun challengesFilter(userPubkey: String? = null): Filter { val now = TimeUtils.now() return ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.GAMES, purposeDetail = "live chess games on screen", kinds = listOf(JESTER_KIND), tags = mapOf("e" to listOf(JesterProtocol.START_POSITION_HASH)), @@ -289,7 +289,7 @@ object ChessFilterBuilder { fun recentGamesFilter(): Filter { val now = TimeUtils.now() return ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.GAMES, purposeDetail = "live chess games on screen", kinds = listOf(JESTER_KIND), since = now - ChessTimeWindows.GAME_EVENT_WINDOW_SECONDS, @@ -304,7 +304,7 @@ object ChessFilterBuilder { fun userGamesFilter(userPubkey: String): Filter { val now = TimeUtils.now() return ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.GAMES, purposeDetail = "live chess games on screen", kinds = listOf(JESTER_KIND), authors = listOf(userPubkey), @@ -320,7 +320,7 @@ object ChessFilterBuilder { fun userTaggedFilter(userPubkey: String): Filter { val now = TimeUtils.now() return ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.GAMES, purposeDetail = "live chess games on screen", kinds = listOf(JESTER_KIND), tags = mapOf("p" to listOf(userPubkey)), diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/assemblers/ContactCardFilters.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/assemblers/ContactCardFilters.kt index 742265289c..4bdfb7623e 100644 --- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/assemblers/ContactCardFilters.kt +++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/assemblers/ContactCardFilters.kt @@ -46,7 +46,7 @@ fun filterContactCardsToTargetKeysFromTrustedAccountsInTheRelay( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.PROFILE_METADATA, kinds = ContactCardKindList, authors = trustedAccounts, // kind:30382 addresses the target user in the d-tag @@ -71,7 +71,7 @@ fun filterContactCardsByAuthorInTheRelay( relay = relay, filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.PROFILE_METADATA, kinds = ContactCardKindList, authors = listOf(author), limit = limit, diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/assemblers/ReactionsFilterAssembler.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/assemblers/ReactionsFilterAssembler.kt index 0b2f8717f9..d897f238e8 100644 --- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/assemblers/ReactionsFilterAssembler.kt +++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/assemblers/ReactionsFilterAssembler.kt @@ -74,7 +74,7 @@ class ReactionsFilterAssembler( // Create filter for reactions (Kind 7) targeting these notes via e-tags val filter = ExplainedFilter( - purpose = SubPurpose.SCREEN_CONTENT, + purpose = SubPurpose.ENGAGEMENT, purposeDetail = "reactions on notes currently on screen", kinds = listOf(ReactionEvent.KIND), tags = mapOf("e" to noteIdList), diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/subscriptions/SubPurpose.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/subscriptions/SubPurpose.kt index c5c52bbd06..c9014a3965 100644 --- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/subscriptions/SubPurpose.kt +++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/subscriptions/SubPurpose.kt @@ -23,46 +23,142 @@ package com.vitorpamplona.amethyst.commons.relayClient.subscriptions /** * Why a subscription exists — the client-side answer to "what is this relay doing for me?". * - * Attached to an [ExplainedFilter] and **never sent to a relay** (see [ExplainedFilter]). It exists - * so the app can account for its own connections: the always-on notification reports a bare - * "connected to N relays", which is emergent rather than curated — nothing today can tell you - * whether those N are carrying your DMs or just re-dialling a stale outbox hint. + * Attached to an [ExplainedFilter] and **never sent to a relay**. It exists so the app can account + * for its own connections: the always-on notification reports a bare "connected to N relays", which + * is emergent rather than curated — nothing today can tell you whether those N are carrying your DMs + * or re-dialling a stale outbox hint. * - * An enum rather than a free-form string so the UI can group and localize by a stable key instead of - * matching on text. Use [other] with a label when a subscription genuinely doesn't fit a category — - * that keeps one-off debug filters describable without diluting the buckets a user sees. + * ## Two levels on purpose + * + * The fine value names the actual job; [group] rolls it up. A relay screen or a bug report wants the + * fine value ("hashtag feed" vs "thread you are reading"); a notification a user glances at wants the + * group. Adding a fine value is cheap because the UI can keep rendering groups. + * + * ## Lifetime is the other axis + * + * [isBackground] marks the purposes *allowed* to outlive the foreground — the ones the always-on + * notification is actually about. Read it as a ceiling, not a promise: a background-capable purpose + * with nothing to fetch is simply absent, so absence proves nothing. The direction that does hold is + * the other one — **a purpose with `isBackground = false` appearing while backgrounded is a leak**, + * and that is now assertable. + * + * Measured on device (cold start, then HOME): foreground carried 13 purposes; backgrounded carried 9, + * every one of them `isBackground = true`. `HOME_FEED` (337 relays) and `ENGAGEMENT` (20) — the only + * two `false` entries in flight — were both gone, while the transient account loaders + * ([RELAY_LISTS], [FOLLOW_LISTS]) were idle rather than torn down. */ -enum class SubPurpose { - /** Mentions, reactions, reposts, zaps addressed to me (`#p` = me). Inbox relays. */ - NOTIFICATIONS, +enum class SubPurpose( + val group: SubPurposeGroup, + /** True when this subscription is permitted to stay active while the app is backgrounded. */ + val isBackground: Boolean = false, +) { + // ---- the account itself: always on ------------------------------------- + + /** My own profile, settings and app-specific data. */ + ACCOUNT_DATA(SubPurposeGroup.ACCOUNT, isBackground = true), + + /** Profiles (kind 0) of everyone we render. */ + PROFILE_METADATA(SubPurposeGroup.ACCOUNT, isBackground = true), + + /** NIP-65 relay lists, DM relay lists, blocked/trusted relay sets — outbox discovery. */ + RELAY_LISTS(SubPurposeGroup.ACCOUNT, isBackground = true), + + /** Kind-3 follows and the web-of-trust sets derived from them. */ + FOLLOW_LISTS(SubPurposeGroup.ACCOUNT, isBackground = true), + + /** Reports (kind 1984), mute lists, spam and ban state. */ + MODERATION(SubPurposeGroup.ACCOUNT, isBackground = true), + + /** Cashu wallet, nutzaps, mints and NWC. */ + WALLET(SubPurposeGroup.ACCOUNT, isBackground = true), + + // ---- things addressed to me: always on --------------------------------- + + /** Mentions, reactions, reposts and zaps addressed to me (`#p` = me). Inbox relays. */ + NOTIFICATIONS(SubPurposeGroup.MESSAGES, isBackground = true), /** NIP-17 gift wraps and NIP-04 legacy DMs. DM relays. */ - DIRECT_MESSAGES, + DIRECT_MESSAGES(SubPurposeGroup.MESSAGES, isBackground = true), + + /** NIP-28/29 public channels and relay groups. */ + PUBLIC_CHATS(SubPurposeGroup.MESSAGES, isBackground = true), + + /** Concord and Buzz community planes. */ + COMMUNITY_CHATS(SubPurposeGroup.MESSAGES, isBackground = true), + + /** Marmot / MLS encrypted group messaging. */ + ENCRYPTED_GROUPS(SubPurposeGroup.MESSAGES, isBackground = true), + + /** Live audio rooms (NIP-53 nests) and their presence. */ + LIVE_ROOMS(SubPurposeGroup.MESSAGES), + + // ---- feeds: on while their tab is alive -------------------------------- /** Posts from the people I follow. Outbox relays. */ - HOME_FEED, + HOME_FEED(SubPurposeGroup.FEEDS), - /** Profiles (kind 0) — mine and everyone I render. */ - PROFILE_METADATA, + /** The Discover tab: live streams, DVM feeds, marketplaces, community suggestions. */ + DISCOVER_FEED(SubPurposeGroup.FEEDS), - /** Relay lists (NIP-65), DM relay lists, blocked/trusted relay sets. */ - RELAY_LISTS, + /** Video, shorts, pictures, music, podcasts and long-form tabs. */ + MEDIA_FEED(SubPurposeGroup.FEEDS), - /** Follow lists and follow-list-derived sets (kind 3, web of trust). */ - FOLLOW_LISTS, + /** A hashtag or geohash feed. */ + TAG_FEED(SubPurposeGroup.FEEDS), - /** Group, channel and community chat (NIP-28/29, Concord, Buzz). */ - CHATS, + /** NIP-72 community feeds. */ + COMMUNITY_FEED(SubPurposeGroup.FEEDS), - /** Reports and moderation state (kind 1984, mute lists). */ - MODERATION, + /** Calendars, polls, workouts, git repos, highlights and other typed feeds. */ + TOPIC_FEED(SubPurposeGroup.FEEDS), - /** Cashu wallet, nutzaps and mint directories. */ - WALLET, + // ---- whatever is on screen right now ----------------------------------- - /** A thread, profile page, hashtag or anything else opened on demand. Short-lived. */ - SCREEN_CONTENT, + /** The conversation currently open. */ + THREAD(SubPurposeGroup.CURRENT_SCREEN), + + /** A profile page currently open. */ + USER_PROFILE(SubPurposeGroup.CURRENT_SCREEN), + + /** Search results. */ + SEARCH(SubPurposeGroup.CURRENT_SCREEN), + + /** Replies, reactions and zaps on the notes currently rendered. */ + ENGAGEMENT(SubPurposeGroup.CURRENT_SCREEN), + + /** + * Events something on screen points at but we do not hold — a quoted note, the parent of a + * reply, an addressable a card renders. Distinct from [ENGAGEMENT], which is inbound reactions + * *to* what we already have; this is outbound resolution of references. + */ + REFERENCED_EVENTS(SubPurposeGroup.CURRENT_SCREEN), + + /** Badges, emoji packs, napplets, nSites, software apps and other add-ons. */ + ADD_ONS(SubPurposeGroup.CURRENT_SCREEN), + + /** Games — chess and friends. */ + GAMES(SubPurposeGroup.CURRENT_SCREEN), + + /** Relay information screens probing a relay directly. */ + RELAY_INFO(SubPurposeGroup.CURRENT_SCREEN), /** Anything not worth its own bucket; carry detail in [ExplainedFilter.purposeDetail]. */ + OTHER(SubPurposeGroup.OTHER), +} + +/** Coarse roll-up of [SubPurpose], for surfaces that should not list two dozen categories. */ +enum class SubPurposeGroup { + /** Keeping the account itself current: profile, follows, relays, moderation, wallet. */ + ACCOUNT, + + /** Anything addressed to me or to a room I am in. */ + MESSAGES, + + /** Timelines the user browses. */ + FEEDS, + + /** Bound to a screen that is open right now. */ + CURRENT_SCREEN, + OTHER, }