From 0245c907ffaa1ed33626b07d623d262d6aefc152 Mon Sep 17 00:00:00 2001 From: Believethehype <1097224+believethehype@users.noreply.github.com> Date: Tue, 14 May 2024 18:51:38 +0200 Subject: [PATCH] add nip90 events to factory --- .../amethyst/ui/dal/NIP90ContentDiscoveryFilter.kt | 2 -- .../ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt | 6 ++---- .../java/com/vitorpamplona/quartz/events/EventFactory.kt | 3 +++ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryFilter.kt index 411e76d05..54b64fdd2 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryFilter.kt @@ -57,8 +57,6 @@ open class NIP90ContentDiscoveryFilter( override fun applyFilter(collection: Set): Set { var result = innerApplyFilter(collection) - println("Test World") - println(result) return result } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt index fa9e7721d..3d45096aa 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt @@ -76,12 +76,10 @@ private fun RenderNostrNIP90ContentDiscoveryScreen( if (DVMID != null) { // TODO 1 Send KIND 5300 Event with p tag = DVMID (crashes, because cant map to event) - /*val signer: NostrSigner = NostrSignerInternal(accountViewModel.account.keyPair) - println(accountViewModel.account.keyPair.pubKey.toHexKey()) - NIP90ContentDiscoveryRequestEvent.create(DVMID, signer) { + /*NIP90ContentDiscoveryRequestEvent.create(DVMID, accountViewModel.account.signer) { Client.send(it) LocalCache.justConsume(it, null) - } */ + }*/ // var keyPair = accountViewModel.account.keyPair diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/EventFactory.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/EventFactory.kt index ed5346c3d..9acbef10f 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/events/EventFactory.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/EventFactory.kt @@ -114,6 +114,9 @@ class EventFactory { MetadataEvent.KIND -> MetadataEvent(id, pubKey, createdAt, tags, content, sig) MuteListEvent.KIND -> MuteListEvent(id, pubKey, createdAt, tags, content, sig) NNSEvent.KIND -> NNSEvent(id, pubKey, createdAt, tags, content, sig) + NIP90StatusEvent.KIND -> NIP90StatusEvent(id, pubKey, createdAt, tags, content, sig) + NIP90ContentDiscoveryRequestEvent.KIND -> NIP90ContentDiscoveryRequestEvent(id, pubKey, createdAt, tags, content, sig) + NIP90ContentDiscoveryResponseEvent.KIND -> NIP90ContentDiscoveryResponseEvent(id, pubKey, createdAt, tags, content, sig) OtsEvent.KIND -> OtsEvent(id, pubKey, createdAt, tags, content, sig) PeopleListEvent.KIND -> PeopleListEvent(id, pubKey, createdAt, tags, content, sig) PinListEvent.KIND -> PinListEvent(id, pubKey, createdAt, tags, content, sig)