Removes some Attestation events from the feeds, adding on others

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/FilterNotificationsToPubkey.kt

@@ -20,6 +20,8 @@
  */
 package com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.nip01Notifications
 
+import com.vitorpamplona.quartz.experimental.attestations.recommendation.AttestorRecommendationEvent
+import com.vitorpamplona.quartz.experimental.attestations.request.AttestationRequestEvent
 import com.vitorpamplona.quartz.experimental.ephemChat.chat.EphemeralChatEvent
 import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryPrologueEvent
 import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStorySceneEvent
@@ -85,6 +87,12 @@ val NotificationsPerKeyKinds2 =
         InteractiveStorySceneEvent.KIND,
     )
 
+val NotificationsPerKeyKinds3 =
+    listOf(
+        AttestationRequestEvent.KIND,
+        AttestorRecommendationEvent.KIND,
+    )
+
 fun filterSummaryNotificationsToPubkey(
     relay: NormalizedRelayUrl,
     pubkey: HexKey?,
@@ -130,7 +138,17 @@ fun filterNotificationsToPubkey(
                 Filter(
                     kinds = NotificationsPerKeyKinds2,
                     tags = mapOf("p" to listOf(pubkey)),
-                    limit = 500,
+                    limit = 200,
+                    since = since,
+                ),
+        ),
+        RelayBasedFilter(
+            relay = relay,
+            filter =
+                Filter(
+                    kinds = NotificationsPerKeyKinds3,
+                    tags = mapOf("p" to listOf(pubkey)),
+                    limit = 10,
                     since = since,
                 ),
         ),
@@ -171,7 +189,17 @@ fun filterJustTheLatestNotificationsToPubkeyFromRandomRelays(
                 Filter(
                     kinds = NotificationsPerKeyKinds2,
                     tags = mapOf("p" to listOf(pubkey)),
-                    limit = 20,
+                    limit = 10,
+                    since = since,
+                ),
+        ),
+        RelayBasedFilter(
+            relay = relay,
+            filter =
+                Filter(
+                    kinds = NotificationsPerKeyKinds3,
+                    tags = mapOf("p" to listOf(pubkey)),
+                    limit = 2,
                     since = since,
                 ),
         ),

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/watchers/FilterRepliesAndReactionsToAddresses.kt

@@ -22,6 +22,7 @@ package com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.watchers
 
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
+import com.vitorpamplona.quartz.experimental.attestations.attestation.AttestationEvent
 import com.vitorpamplona.quartz.experimental.zapPolls.ZapPollEvent
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
@@ -47,6 +48,7 @@ val RepliesAndReactionsToAddressesKinds1 =
         LnZapEvent.KIND,
         ZapPollEvent.KIND,
         CommentEvent.KIND,
+        AttestationEvent.KIND,
     )
 
 val PostsAndChatMessagesToAddresses =

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/watchers/FilterRepliesAndReactionsToNotes.kt

@@ -22,6 +22,7 @@ package com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.watchers
 
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
+import com.vitorpamplona.quartz.experimental.attestations.attestation.AttestationEvent
 import com.vitorpamplona.quartz.experimental.edits.TextNoteModificationEvent
 import com.vitorpamplona.quartz.experimental.zapPolls.ZapPollEvent
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
@@ -53,6 +54,7 @@ val RepliesAndReactionsKinds =
         OtsEvent.KIND,
         TextNoteModificationEvent.KIND,
         CommentEvent.KIND,
+        AttestationEvent.KIND,
     )
 
 val RepliesAndReactionsKinds2 =

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/communities/datasource/FilterCommunityPosts.kt

@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.communities.datasource
 
+import com.vitorpamplona.quartz.experimental.attestations.attestation.AttestationEvent
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
@@ -42,6 +43,7 @@ val CommunityPostKinds =
         ClassifiedsEvent.KIND,
         LongTextNoteEvent.KIND,
         CommunityPostApprovalEvent.KIND,
+        AttestationEvent.KIND,
     )
 
 fun filterCommunityPosts(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeNewThreadFeedFilter.kt

@@ -65,9 +65,6 @@ class HomeNewThreadFeedFilter(
                 LiveChessGameChallengeEvent.KIND,
                 LiveChessGameEndEvent.KIND,
                 AttestationEvent.KIND,
-                AttestationRequestEvent.KIND,
-                AttestorRecommendationEvent.KIND,
-                AttestorProficiencyEvent.KIND,
             )
     }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByGeohashes.kt

@@ -23,6 +23,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip01Core
 import com.vitorpamplona.amethyst.model.topNavFeeds.aroundMe.LocationTopNavPerRelayFilterSet
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip22Comments.filterHomePostsByScopes
+import com.vitorpamplona.quartz.experimental.attestations.attestation.AttestationEvent
 import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryPrologueEvent
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
@@ -36,7 +37,6 @@ import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent
 import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent
 import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent
 import com.vitorpamplona.quartz.nipA0VoiceMessages.VoiceEvent
-import com.vitorpamplona.quartz.nipA0VoiceMessages.VoiceReplyEvent
 
 val HomePostsByGeohashKinds =
     listOf(
@@ -46,11 +46,11 @@ val HomePostsByGeohashKinds =
         LongTextNoteEvent.KIND,
         ClassifiedsEvent.KIND,
         HighlightEvent.KIND,
-        InteractiveStoryPrologueEvent.KIND,
         WikiNoteEvent.KIND,
         CommentEvent.KIND,
         VoiceEvent.KIND,
-        VoiceReplyEvent.KIND,
+        AttestationEvent.KIND,
+        InteractiveStoryPrologueEvent.KIND,
     )
 
 fun filterHomePostsByGeohashes(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByGlobal.kt

@@ -23,7 +23,8 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip01Core
 import com.vitorpamplona.amethyst.model.topNavFeeds.global.GlobalTopNavPerRelayFilterSet
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip65Follows.HomePostsConversationKinds
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip65Follows.HomePostsNewThreadKinds
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip65Follows.HomePostsNewThreadKinds1
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip65Follows.HomePostsNewThreadKinds2
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 
@@ -43,11 +44,20 @@ fun filterHomePostsByGlobal(
                 relay = relayUrl,
                 filter =
                     Filter(
-                        kinds = HomePostsNewThreadKinds,
+                        kinds = HomePostsNewThreadKinds1,
                         limit = 50,
                         since = since ?: newThreadSince,
                     ),
             ),
+            RelayBasedFilter(
+                relay = relayUrl,
+                filter =
+                    Filter(
+                        kinds = HomePostsNewThreadKinds2,
+                        limit = 5,
+                        since = since ?: newThreadSince,
+                    ),
+            ),
             RelayBasedFilter(
                 relay = relayUrl,
                 filter =

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip01Core/FilterHomePostsByHashtags.kt

@@ -23,6 +23,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip01Core
 import com.vitorpamplona.amethyst.model.topNavFeeds.hashtag.HashtagTopNavPerRelayFilterSet
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.datasource.nip22Comments.filterHomePostsByScopes
+import com.vitorpamplona.quartz.experimental.attestations.attestation.AttestationEvent
 import com.vitorpamplona.quartz.experimental.audio.header.AudioHeaderEvent
 import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryPrologueEvent
 import com.vitorpamplona.quartz.experimental.nipsOnNostr.NipTextEvent
@@ -39,7 +40,6 @@ import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent
 import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent
 import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent
 import com.vitorpamplona.quartz.nipA0VoiceMessages.VoiceEvent
-import com.vitorpamplona.quartz.nipA0VoiceMessages.VoiceReplyEvent
 
 val HomePostsBuHashtagsKinds =
     listOf(
@@ -50,12 +50,12 @@ val HomePostsBuHashtagsKinds =
         ClassifiedsEvent.KIND,
         HighlightEvent.KIND,
         AudioHeaderEvent.KIND,
-        InteractiveStoryPrologueEvent.KIND,
         CommentEvent.KIND,
         WikiNoteEvent.KIND,
         NipTextEvent.KIND,
         VoiceEvent.KIND,
-        VoiceReplyEvent.KIND,
+        AttestationEvent.KIND,
+        InteractiveStoryPrologueEvent.KIND,
     )
 
 fun filterHomePostsByHashtags(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip65Follows/FilterHomePostsByAuthors.kt

@@ -24,9 +24,6 @@ import com.vitorpamplona.amethyst.model.topNavFeeds.noteBased.author.AuthorsTopN
 import com.vitorpamplona.amethyst.model.topNavFeeds.noteBased.muted.MutedAuthorsTopNavPerRelayFilterSet
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.experimental.attestations.attestation.AttestationEvent
-import com.vitorpamplona.quartz.experimental.attestations.proficiency.AttestorProficiencyEvent
-import com.vitorpamplona.quartz.experimental.attestations.recommendation.AttestorRecommendationEvent
-import com.vitorpamplona.quartz.experimental.attestations.request.AttestationRequestEvent
 import com.vitorpamplona.quartz.experimental.ephemChat.chat.EphemeralChatEvent
 import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryPrologueEvent
 import com.vitorpamplona.quartz.experimental.nipsOnNostr.NipTextEvent
@@ -54,7 +51,7 @@ import com.vitorpamplona.quartz.nipA0VoiceMessages.VoiceEvent
 import com.vitorpamplona.quartz.nipA0VoiceMessages.VoiceReplyEvent
 import kotlin.math.min
 
-val HomePostsNewThreadKinds =
+val HomePostsNewThreadKinds1 =
     listOf(
         TextNoteEvent.KIND,
         RepostEvent.KIND,
@@ -62,18 +59,19 @@ val HomePostsNewThreadKinds =
         ClassifiedsEvent.KIND,
         LongTextNoteEvent.KIND,
         HighlightEvent.KIND,
-        WikiNoteEvent.KIND,
-        NipTextEvent.KIND,
         ZapPollEvent.KIND,
         PollEvent.KIND,
+        WikiNoteEvent.KIND,
+        AttestationEvent.KIND,
+        NipTextEvent.KIND,
+    )
+
+val HomePostsNewThreadKinds2 =
+    listOf(
         InteractiveStoryPrologueEvent.KIND,
         ChessGameEvent.KIND,
         LiveChessGameChallengeEvent.KIND,
         LiveChessGameEndEvent.KIND,
-        AttestationEvent.KIND,
-        AttestationRequestEvent.KIND,
-        AttestorRecommendationEvent.KIND,
-        AttestorProficiencyEvent.KIND,
     )
 
 val HomePostsConversationKinds =
@@ -99,12 +97,22 @@ fun filterNewHomePostsByAuthors(
             relay = relay,
             filter =
                 Filter(
-                    kinds = HomePostsNewThreadKinds,
+                    kinds = HomePostsNewThreadKinds1,
                     authors = authorList,
                     limit = min(authorList.size * 10, 500),
                     since = since,
                 ),
         ),
+        RelayBasedFilter(
+            relay = relay,
+            filter =
+                Filter(
+                    kinds = HomePostsNewThreadKinds2,
+                    authors = authorList,
+                    limit = min(authorList.size * 10, 5),
+                    since = since,
+                ),
+        ),
     )
 }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/dal/NotificationFeedFilter.kt

@@ -29,6 +29,7 @@ import com.vitorpamplona.amethyst.model.filterIntoSet
 import com.vitorpamplona.amethyst.ui.dal.AdditiveFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
 import com.vitorpamplona.amethyst.ui.dal.FilterByListParams
+import com.vitorpamplona.quartz.experimental.attestations.request.AttestationRequestEvent
 import com.vitorpamplona.quartz.experimental.audio.track.AudioTrackEvent
 import com.vitorpamplona.quartz.experimental.forks.IForkableEvent
 import com.vitorpamplona.quartz.experimental.nipsOnNostr.NipTextEvent
@@ -87,6 +88,7 @@ class NotificationFeedFilter(
                 VideoVerticalEvent.KIND,
                 VideoHorizontalEvent.KIND,
                 WikiNoteEvent.KIND,
+                AttestationRequestEvent.KIND,
             )
 
         val NOTIFICATION_KINDS =

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfilePosts.kt

@@ -24,9 +24,6 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.experimental.attestations.attestation.AttestationEvent
-import com.vitorpamplona.quartz.experimental.attestations.proficiency.AttestorProficiencyEvent
-import com.vitorpamplona.quartz.experimental.attestations.recommendation.AttestorRecommendationEvent
-import com.vitorpamplona.quartz.experimental.attestations.request.AttestationRequestEvent
 import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryPrologueEvent
 import com.vitorpamplona.quartz.experimental.nipsOnNostr.NipTextEvent
 import com.vitorpamplona.quartz.experimental.publicMessages.PublicMessageEvent
@@ -71,9 +68,6 @@ val UserProfilePostKinds2 =
         ZapPollEvent.KIND,
         PinListEvent.KIND,
         AttestationEvent.KIND,
-        AttestationRequestEvent.KIND,
-        AttestorRecommendationEvent.KIND,
-        AttestorProficiencyEvent.KIND,
     )
 
 fun filterUserProfilePosts(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/RelayInformationScreen.kt

@@ -128,6 +128,10 @@ import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonRow
 import com.vitorpamplona.amethyst.ui.theme.bitcoinColor
 import com.vitorpamplona.amethyst.ui.theme.redColorOnSecondSurface
+import com.vitorpamplona.quartz.experimental.attestations.attestation.AttestationEvent
+import com.vitorpamplona.quartz.experimental.attestations.proficiency.AttestorProficiencyEvent
+import com.vitorpamplona.quartz.experimental.attestations.recommendation.AttestorRecommendationEvent
+import com.vitorpamplona.quartz.experimental.attestations.request.AttestationRequestEvent
 import com.vitorpamplona.quartz.experimental.audio.header.AudioHeaderEvent
 import com.vitorpamplona.quartz.experimental.audio.track.AudioTrackEvent
 import com.vitorpamplona.quartz.experimental.edits.TextNoteModificationEvent
@@ -529,6 +533,10 @@ private fun kindDisplayName(kind: Int): Int =
         AppSpecificDataEvent.KIND -> R.string.kind_user_settings
         AudioHeaderEvent.KIND -> R.string.kind_audio_header
         AudioTrackEvent.KIND -> R.string.kind_audio_track
+        AttestationEvent.KIND -> R.string.attestation
+        AttestationRequestEvent.KIND -> R.string.attestation_request
+        AttestorRecommendationEvent.KIND -> R.string.attestor_recommendation
+        AttestorProficiencyEvent.KIND -> R.string.attestor_proficiency
         BadgeAwardEvent.KIND -> R.string.kind_badge_awards
         BadgeDefinitionEvent.KIND -> R.string.kind_badge_definitions
         BadgeProfilesEvent.KIND -> R.string.kind_profile_badges