Massive refactoring of quartz to prepare for nip-based packages.

amethyst/proguard-rules.pro

@@ -58,9 +58,7 @@
 }
 
 # JSON parsing
--keep class com.vitorpamplona.quartz.crypto.** { *; }
--keep class com.vitorpamplona.quartz.encoders.** { *; }
--keep class com.vitorpamplona.quartz.events.** { *; }
+-keep class com.vitorpamplona.quartz.** { *; }
 -keep class com.vitorpamplona.amethyst.model.** { *; }
 -keep class com.vitorpamplona.amethyst.service.** { *; }
 -keep class com.vitorpamplona.ammolite.service.** { *; }

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ImageUploadTesting.kt

@@ -36,7 +36,7 @@ import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerType
 import com.vitorpamplona.quartz.crypto.CryptoUtils
 import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.nip01Core.toHexKey
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.fail
 import kotlinx.coroutines.CoroutineScope

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/OkHttpOtsTest.kt

@@ -24,10 +24,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.vitorpamplona.amethyst.service.ots.OkHttpBlockstreamExplorer
 import com.vitorpamplona.amethyst.service.ots.OkHttpCalendarBuilder
 import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.OtsEvent
-import com.vitorpamplona.quartz.ots.OpenTimestamps
-import com.vitorpamplona.quartz.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip03Timestamp.OtsEvent
+import com.vitorpamplona.quartz.nip03Timestamp.ots.OpenTimestamps
 import junit.framework.TestCase.assertEquals
 import org.junit.Assert
 import org.junit.Before
@@ -51,21 +51,21 @@ class OkHttpOtsTest {
 
     @Test
     fun verifyNostrEvent() {
-        val ots = Event.fromJson(otsEvent) as OtsEvent
+        val ots = EventMapper.fromJson(otsEvent) as OtsEvent
         println(ots.info())
         assertEquals(1707688818L, ots.verify())
     }
 
     @Test
     fun verifyNostrEvent2() {
-        val ots = Event.fromJson(otsEvent2) as OtsEvent
+        val ots = EventMapper.fromJson(otsEvent2) as OtsEvent
         println(ots.info())
         assertEquals(1706322179L, ots.verify())
     }
 
     @Test
     fun verifyNostrPendingEvent() {
-        val ots = Event.fromJson(otsPendingEvent) as OtsEvent
+        val ots = EventMapper.fromJson(otsPendingEvent) as OtsEvent
         println(ots.info())
         assertEquals(null, ots.verify())
     }

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ThreadAssemblerTest.kt

@@ -27,8 +27,10 @@ import com.vitorpamplona.amethyst.model.AccountSettings
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.ui.dal.ThreadFeedFilter
 import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.encoders.ATag
-import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.nip01Core.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.hasValidSignature
+import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
 import junit.framework.TestCase
 import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.CoroutineScope
@@ -119,7 +121,7 @@ class ThreadAssemblerTest {
     fun threadOrderTest() =
         runBlocking {
             val eventArray =
-                Event.mapper.readValue<ArrayList<Event>>(db) as List<Event> + Event.fromJson(header)
+                EventMapper.mapper.readValue<ArrayList<Event>>(db) as List<Event> + Event.fromJson(header)
 
             var counter = 0
             eventArray.forEach {

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt

@@ -27,9 +27,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.ui.actions.buildAnnotatedStringWithUrlHighlighting
-import com.vitorpamplona.quartz.encoders.decodePublicKey
-import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.events.UserMetadata
+import com.vitorpamplona.quartz.nip01Core.UserMetadata
+import com.vitorpamplona.quartz.nip01Core.toHexKey
+import com.vitorpamplona.quartz.nip19Bech32Entities.decodePublicKey
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt

@@ -29,8 +29,8 @@ import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.getOrCreateDMChannel
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.getOrCreateZapChannel
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.GiftWrapEvent
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip59Giftwrap.GiftWrapEvent
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt

@@ -26,7 +26,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
+import com.vitorpamplona.quartz.nip02FollowList.ImmutableListOfLists
 
 @Composable
 fun TranslatableRichTextViewer(

amethyst/src/main/java/com/vitorpamplona/amethyst/DebugUtils.kt

@@ -157,15 +157,15 @@ fun debugState(context: Context) {
             " MB",
     )
 
-    val qttNotes = LocalCache.notes.countByGroup { _, it -> it.event?.kind() }
-    val qttAddressables = LocalCache.addressables.countByGroup { _, it -> it.event?.kind() }
+    val qttNotes = LocalCache.notes.countByGroup { _, it -> it.event?.kind }
+    val qttAddressables = LocalCache.addressables.countByGroup { _, it -> it.event?.kind }
 
     val bytesNotes =
         LocalCache.notes
-            .sumByGroup(groupMap = { _, it -> it.event?.kind() }, sumOf = { _, it -> it.event?.countMemory() ?: 0L })
+            .sumByGroup(groupMap = { _, it -> it.event?.kind }, sumOf = { _, it -> it.event?.countMemory() ?: 0L })
     val bytesAddressables =
         LocalCache.addressables
-            .sumByGroup(groupMap = { _, it -> it.event?.kind() }, sumOf = { _, it -> it.event?.countMemory() ?: 0L })
+            .sumByGroup(groupMap = { _, it -> it.event?.kind }, sumOf = { _, it -> it.event?.countMemory() ?: 0L })
 
     qttNotes.toList().sortedByDescending { bytesNotes.get(it.first) }.forEach { (kind, qtt) ->
         Log.d("STATE DUMP", "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesNotes.get(kind)?.div((1024 * 1024))}MB ")

amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt

@@ -45,21 +45,22 @@ import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
 import com.vitorpamplona.amethyst.ui.tor.TorType
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
 import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
-import com.vitorpamplona.quartz.encoders.hexToByteArray
-import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.encoders.toNpub
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.AppSpecificDataEvent
-import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
-import com.vitorpamplona.quartz.events.ContactListEvent
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.MuteListEvent
-import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
-import com.vitorpamplona.quartz.events.SearchRelayListEvent
+import com.vitorpamplona.quartz.experimental.edits.PrivateOutboxRelayListEvent
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.hexToByteArray
+import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
+import com.vitorpamplona.quartz.nip01Core.toHexKey
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatMessageRelayListEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.toNpub
+import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect
+import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.MuteListEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -168,7 +169,7 @@ object LocalPreferences {
                 with(encryptedPreferences()) {
                     val newSystemOfAccounts =
                         getString(PrefKeys.ALL_ACCOUNT_INFO, "[]")?.let {
-                            Event.mapper.readValue<List<AccountInfo>>(it)
+                            EventMapper.mapper.readValue<List<AccountInfo>>(it)
                         }
 
                     if (!newSystemOfAccounts.isNullOrEmpty()) {
@@ -188,7 +189,7 @@ object LocalPreferences {
 
                         savedAccounts.emit(migrated)
 
-                        edit().apply { putString(PrefKeys.ALL_ACCOUNT_INFO, Event.mapper.writeValueAsString(savedAccounts.value)) }.apply()
+                        edit().apply { putString(PrefKeys.ALL_ACCOUNT_INFO, EventMapper.mapper.writeValueAsString(savedAccounts.value)) }.apply()
                     }
                 }
             }
@@ -209,7 +210,7 @@ object LocalPreferences {
                     .apply {
                         putString(
                             PrefKeys.ALL_ACCOUNT_INFO,
-                            Event.mapper.writeValueAsString(accounts.filter { !it.isTransient }),
+                            EventMapper.mapper.writeValueAsString(accounts.filter { !it.isTransient }),
                         )
                     }.apply()
             }
@@ -315,11 +316,11 @@ object LocalPreferences {
                             settings.keyPair.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHexKey()) }
                         }
                         settings.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
-                        putString(PrefKeys.RELAYS, Event.mapper.writeValueAsString(settings.localRelays))
+                        putString(PrefKeys.RELAYS, EventMapper.mapper.writeValueAsString(settings.localRelays))
 
                         putString(
                             PrefKeys.DEFAULT_FILE_SERVER,
-                            Event.mapper.writeValueAsString(settings.defaultFileServer),
+                            EventMapper.mapper.writeValueAsString(settings.defaultFileServer),
                         )
                         putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, settings.defaultHomeFollowList.value)
                         putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, settings.defaultStoriesFollowList.value)
@@ -333,12 +334,12 @@ object LocalPreferences {
                         )
                         putString(
                             PrefKeys.ZAP_PAYMENT_REQUEST_SERVER,
-                            Event.mapper.writeValueAsString(settings.zapPaymentRequest),
+                            EventMapper.mapper.writeValueAsString(settings.zapPaymentRequest),
                         )
                         if (settings.backupContactList != null) {
                             putString(
                                 PrefKeys.LATEST_CONTACT_LIST,
-                                Event.mapper.writeValueAsString(settings.backupContactList),
+                                EventMapper.mapper.writeValueAsString(settings.backupContactList),
                             )
                         } else {
                             remove(PrefKeys.LATEST_CONTACT_LIST)
@@ -347,7 +348,7 @@ object LocalPreferences {
                         if (settings.backupUserMetadata != null) {
                             putString(
                                 PrefKeys.LATEST_USER_METADATA,
-                                Event.mapper.writeValueAsString(settings.backupUserMetadata),
+                                EventMapper.mapper.writeValueAsString(settings.backupUserMetadata),
                             )
                         } else {
                             remove(PrefKeys.LATEST_USER_METADATA)
@@ -356,7 +357,7 @@ object LocalPreferences {
                         if (settings.backupDMRelayList != null) {
                             putString(
                                 PrefKeys.LATEST_DM_RELAY_LIST,
-                                Event.mapper.writeValueAsString(settings.backupDMRelayList),
+                                EventMapper.mapper.writeValueAsString(settings.backupDMRelayList),
                             )
                         } else {
                             remove(PrefKeys.LATEST_DM_RELAY_LIST)
@@ -365,7 +366,7 @@ object LocalPreferences {
                         if (settings.backupNIP65RelayList != null) {
                             putString(
                                 PrefKeys.LATEST_NIP65_RELAY_LIST,
-                                Event.mapper.writeValueAsString(settings.backupNIP65RelayList),
+                                EventMapper.mapper.writeValueAsString(settings.backupNIP65RelayList),
                             )
                         } else {
                             remove(PrefKeys.LATEST_NIP65_RELAY_LIST)
@@ -374,7 +375,7 @@ object LocalPreferences {
                         if (settings.backupSearchRelayList != null) {
                             putString(
                                 PrefKeys.LATEST_SEARCH_RELAY_LIST,
-                                Event.mapper.writeValueAsString(settings.backupSearchRelayList),
+                                EventMapper.mapper.writeValueAsString(settings.backupSearchRelayList),
                             )
                         } else {
                             remove(PrefKeys.LATEST_SEARCH_RELAY_LIST)
@@ -389,7 +390,7 @@ object LocalPreferences {
                         if (settings.backupMuteList != null) {
                             putString(
                                 PrefKeys.LATEST_MUTE_LIST,
-                                Event.mapper.writeValueAsString(settings.backupMuteList),
+                                EventMapper.mapper.writeValueAsString(settings.backupMuteList),
                             )
                         } else {
                             remove(PrefKeys.LATEST_MUTE_LIST)
@@ -398,7 +399,7 @@ object LocalPreferences {
                         if (settings.backupPrivateHomeRelayList != null) {
                             putString(
                                 PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST,
-                                Event.mapper.writeValueAsString(settings.backupPrivateHomeRelayList),
+                                EventMapper.mapper.writeValueAsString(settings.backupPrivateHomeRelayList),
                             )
                         } else {
                             remove(PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST)
@@ -407,7 +408,7 @@ object LocalPreferences {
                         if (settings.backupAppSpecificData != null) {
                             putString(
                                 PrefKeys.LATEST_APP_SPECIFIC_DATA,
-                                Event.mapper.writeValueAsString(settings.backupAppSpecificData),
+                                EventMapper.mapper.writeValueAsString(settings.backupAppSpecificData),
                             )
                         } else {
                             remove(PrefKeys.LATEST_APP_SPECIFIC_DATA)
@@ -421,7 +422,7 @@ object LocalPreferences {
                         remove(PrefKeys.USE_PROXY)
                         remove(PrefKeys.PROXY_PORT)
 
-                        putString(PrefKeys.TOR_SETTINGS, Event.mapper.writeValueAsString(settings.torSettings.toSettings()))
+                        putString(PrefKeys.TOR_SETTINGS, EventMapper.mapper.writeValueAsString(settings.torSettings.toSettings()))
 
                         val regularMap =
                             settings.lastReadPerRoute.value.mapValues {
@@ -430,13 +431,13 @@ object LocalPreferences {
 
                         putString(
                             PrefKeys.LAST_READ_PER_ROUTE,
-                            Event.mapper.writeValueAsString(regularMap),
+                            EventMapper.mapper.writeValueAsString(regularMap),
                         )
                         putStringSet(PrefKeys.HAS_DONATED_IN_VERSION, settings.hasDonatedInVersion.value)
 
                         putString(
                             PrefKeys.PENDING_ATTESTATIONS,
-                            Event.mapper.writeValueAsString(settings.pendingAttestations.value),
+                            EventMapper.mapper.writeValueAsString(settings.pendingAttestations.value),
                         )
                     }.apply()
             }
@@ -452,7 +453,7 @@ object LocalPreferences {
     ) {
         Log.d("LocalPreferences", "Saving to shared settings")
         with(prefs.edit()) {
-            putString(PrefKeys.SHARED_SETTINGS, Event.mapper.writeValueAsString(sharedSettings))
+            putString(PrefKeys.SHARED_SETTINGS, EventMapper.mapper.writeValueAsString(sharedSettings))
             apply()
         }
     }
@@ -461,7 +462,7 @@ object LocalPreferences {
         Log.d("LocalPreferences", "Load shared settings")
         with(prefs) {
             return try {
-                getString(PrefKeys.SHARED_SETTINGS, "{}")?.let { Event.mapper.readValue<Settings>(it) }
+                getString(PrefKeys.SHARED_SETTINGS, "{}")?.let { EventMapper.mapper.readValue<Settings>(it) }
             } catch (e: Throwable) {
                 if (e is CancellationException) throw e
                 Log.w(
@@ -666,7 +667,7 @@ object LocalPreferences {
             if (T::class.java.isInstance(Event::class.java)) {
                 Event.fromJson(value) as T?
             } else {
-                Event.mapper.readValue<T?>(value)
+                EventMapper.mapper.readValue<T?>(value)
             }
         } catch (e: Throwable) {
             if (e is CancellationException) throw e

amethyst/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt

@@ -57,11 +57,11 @@ import com.vitorpamplona.amethyst.service.ots.OkHttpCalendarBuilder
 import com.vitorpamplona.amethyst.ui.tor.TorManager
 import com.vitorpamplona.amethyst.ui.tor.TorType
 import com.vitorpamplona.ammolite.relays.NostrClient
-import com.vitorpamplona.quartz.encoders.bechToBytes
-import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
-import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.events.OtsEvent
-import com.vitorpamplona.quartz.ots.OpenTimestamps
+import com.vitorpamplona.quartz.nip01Core.toHexKey
+import com.vitorpamplona.quartz.nip03Timestamp.OtsEvent
+import com.vitorpamplona.quartz.nip03Timestamp.ots.OpenTimestamps
+import com.vitorpamplona.quartz.nip19Bech32Entities.bech32.bechToBytes
+import com.vitorpamplona.quartz.nip19Bech32Entities.decodePublicKeyAsHexOrNull
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -116,7 +116,11 @@ class ServiceManager(
                     OkHttpCalendarBuilder(myAccount::shouldUseTorForMoneyOperations),
                 )
         } else {
-            OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer { false }, OkHttpCalendarBuilder { false })
+            OtsEvent.otsInstance =
+                OpenTimestamps(
+                    OkHttpBlockstreamExplorer { false },
+                    OkHttpCalendarBuilder { false },
+                )
 
             HttpClientManager.setDefaultProxy(null)
         }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -50,87 +50,94 @@ import com.vitorpamplona.ammolite.relays.RelaySetupInfo
 import com.vitorpamplona.ammolite.relays.RelaySetupInfoToConnect
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
+import com.vitorpamplona.quartz.blossom.BlossomAuthorizationEvent
+import com.vitorpamplona.quartz.blossom.BlossomServersEvent
 import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.encoders.ATag
-import com.vitorpamplona.quartz.encoders.Dimension
-import com.vitorpamplona.quartz.encoders.ETag
-import com.vitorpamplona.quartz.encoders.EventHint
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.IMetaTag
-import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
-import com.vitorpamplona.quartz.encoders.PTag
-import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
-import com.vitorpamplona.quartz.encoders.hexToByteArray
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.AppSpecificDataEvent
-import com.vitorpamplona.quartz.events.BlossomAuthorizationEvent
-import com.vitorpamplona.quartz.events.BlossomServersEvent
-import com.vitorpamplona.quartz.events.BookmarkListEvent
-import com.vitorpamplona.quartz.events.ChannelCreateEvent
-import com.vitorpamplona.quartz.events.ChannelMessageEvent
-import com.vitorpamplona.quartz.events.ChannelMetadataEvent
-import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
-import com.vitorpamplona.quartz.events.ClassifiedsEvent
-import com.vitorpamplona.quartz.events.CommentEvent
-import com.vitorpamplona.quartz.events.Contact
-import com.vitorpamplona.quartz.events.ContactListEvent
-import com.vitorpamplona.quartz.events.DeletionEvent
-import com.vitorpamplona.quartz.events.DraftEvent
-import com.vitorpamplona.quartz.events.EmojiPackEvent
-import com.vitorpamplona.quartz.events.EmojiPackSelectionEvent
-import com.vitorpamplona.quartz.events.EmojiUrl
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.EventInterface
-import com.vitorpamplona.quartz.events.FileHeaderEvent
-import com.vitorpamplona.quartz.events.FileServersEvent
-import com.vitorpamplona.quartz.events.FileStorageEvent
-import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
-import com.vitorpamplona.quartz.events.GeneralListEvent
-import com.vitorpamplona.quartz.events.GenericRepostEvent
-import com.vitorpamplona.quartz.events.GiftWrapEvent
-import com.vitorpamplona.quartz.events.GitReplyEvent
-import com.vitorpamplona.quartz.events.HTTPAuthorizationEvent
-import com.vitorpamplona.quartz.events.InteractiveStoryBaseEvent
-import com.vitorpamplona.quartz.events.InteractiveStoryPrologueEvent
-import com.vitorpamplona.quartz.events.InteractiveStoryReadingStateEvent
-import com.vitorpamplona.quartz.events.InteractiveStorySceneEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.LnZapPaymentRequestEvent
-import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
-import com.vitorpamplona.quartz.events.LnZapRequestEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.MuteListEvent
-import com.vitorpamplona.quartz.events.NIP17Factory
-import com.vitorpamplona.quartz.events.NIP17Group
-import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryRequestEvent
-import com.vitorpamplona.quartz.events.OtsEvent
-import com.vitorpamplona.quartz.events.PeopleListEvent
-import com.vitorpamplona.quartz.events.PictureEvent
-import com.vitorpamplona.quartz.events.PictureMeta
-import com.vitorpamplona.quartz.events.PollNoteEvent
-import com.vitorpamplona.quartz.events.Price
-import com.vitorpamplona.quartz.events.PrivateDmEvent
-import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
-import com.vitorpamplona.quartz.events.ProfileGalleryEntryEvent
-import com.vitorpamplona.quartz.events.ReactionEvent
-import com.vitorpamplona.quartz.events.RelayAuthEvent
-import com.vitorpamplona.quartz.events.ReportEvent
-import com.vitorpamplona.quartz.events.RepostEvent
-import com.vitorpamplona.quartz.events.Response
-import com.vitorpamplona.quartz.events.SealedGossipEvent
-import com.vitorpamplona.quartz.events.SearchRelayListEvent
-import com.vitorpamplona.quartz.events.StatusEvent
-import com.vitorpamplona.quartz.events.StoryOption
-import com.vitorpamplona.quartz.events.TextNoteEvent
-import com.vitorpamplona.quartz.events.TextNoteModificationEvent
-import com.vitorpamplona.quartz.events.TorrentCommentEvent
-import com.vitorpamplona.quartz.events.VideoHorizontalEvent
-import com.vitorpamplona.quartz.events.VideoVerticalEvent
-import com.vitorpamplona.quartz.events.WrappedEvent
-import com.vitorpamplona.quartz.events.ZapSplitSetup
-import com.vitorpamplona.quartz.signers.NostrSigner
-import com.vitorpamplona.quartz.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.experimental.edits.PrivateOutboxRelayListEvent
+import com.vitorpamplona.quartz.experimental.edits.TextNoteModificationEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryBaseEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryPrologueEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryReadingStateEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStorySceneEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.StoryOption
+import com.vitorpamplona.quartz.experimental.nip95.FileStorageEvent
+import com.vitorpamplona.quartz.experimental.nip95.FileStorageHeaderEvent
+import com.vitorpamplona.quartz.experimental.profileGallery.ProfileGalleryEntryEvent
+import com.vitorpamplona.quartz.experimental.zapPolls.PollNoteEvent
+import com.vitorpamplona.quartz.nip01Core.EventHint
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.addressables.taggedAddresses
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.events.taggedEvents
+import com.vitorpamplona.quartz.nip01Core.geohash.geohashes
+import com.vitorpamplona.quartz.nip01Core.hashtags.hashtags
+import com.vitorpamplona.quartz.nip01Core.hexToByteArray
+import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
+import com.vitorpamplona.quartz.nip01Core.people.hasAnyTaggedUser
+import com.vitorpamplona.quartz.nip01Core.people.isTaggedUser
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip02FollowList.Contact
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip03Timestamp.OtsEvent
+import com.vitorpamplona.quartz.nip04Dm.PrivateDmEvent
+import com.vitorpamplona.quartz.nip09Deletions.DeletionEvent
+import com.vitorpamplona.quartz.nip10Notes.ETag
+import com.vitorpamplona.quartz.nip10Notes.PTag
+import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatMessageRelayListEvent
+import com.vitorpamplona.quartz.nip17Dm.NIP17Factory
+import com.vitorpamplona.quartz.nip17Dm.NIP17Group
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
+import com.vitorpamplona.quartz.nip22Comments.CommentEvent
+import com.vitorpamplona.quartz.nip25Reactions.ReactionEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelCreateEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMessageEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMetadataEvent
+import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiPackEvent
+import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiPackSelectionEvent
+import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrl
+import com.vitorpamplona.quartz.nip30CustomEmoji.taggedEmojis
+import com.vitorpamplona.quartz.nip34Git.GitReplyEvent
+import com.vitorpamplona.quartz.nip35Torrents.TorrentCommentEvent
+import com.vitorpamplona.quartz.nip37Drafts.DraftEvent
+import com.vitorpamplona.quartz.nip38UserStatus.StatusEvent
+import com.vitorpamplona.quartz.nip42RelayAuth.RelayAuthEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentRequestEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentResponseEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect
+import com.vitorpamplona.quartz.nip47WalletConnect.Response
+import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.BookmarkListEvent
+import com.vitorpamplona.quartz.nip51Lists.GeneralListEvent
+import com.vitorpamplona.quartz.nip51Lists.MuteListEvent
+import com.vitorpamplona.quartz.nip51Lists.PeopleListEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.nip56Reports.ReportEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapRequestEvent
+import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup
+import com.vitorpamplona.quartz.nip59Giftwrap.GiftWrapEvent
+import com.vitorpamplona.quartz.nip59Giftwrap.SealedGossipEvent
+import com.vitorpamplona.quartz.nip59Giftwrap.WrappedEvent
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter
+import com.vitorpamplona.quartz.nip68Picture.PictureEvent
+import com.vitorpamplona.quartz.nip68Picture.PictureMeta
+import com.vitorpamplona.quartz.nip71Video.VideoHorizontalEvent
+import com.vitorpamplona.quartz.nip71Video.VideoVerticalEvent
+import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
+import com.vitorpamplona.quartz.nip90Dvms.NIP90ContentDiscoveryRequestEvent
+import com.vitorpamplona.quartz.nip92IMeta.IMetaTag
+import com.vitorpamplona.quartz.nip94FileMetadata.Dimension
+import com.vitorpamplona.quartz.nip94FileMetadata.FileHeaderEvent
+import com.vitorpamplona.quartz.nip96FileStorage.FileServersEvent
+import com.vitorpamplona.quartz.nip98HttpAuth.HTTPAuthorizationEvent
+import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent
+import com.vitorpamplona.quartz.nip99Classifieds.Price
 import com.vitorpamplona.quartz.utils.DualCase
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -501,7 +508,7 @@ class Account(
                     ?.toSet() ?: emptySet(),
             geotags =
                 latestContactList
-                    ?.unverifiedFollowGeohashSet()
+                    ?.geohashes()
                     ?.toSet() ?: emptySet(),
             addresses =
                 latestContactList
@@ -1230,7 +1237,7 @@ class Account(
     }
 
     private fun sendNewAppSpecificData(toInternal: AccountSyncedSettingsInternal) {
-        signer.nip44Encrypt(Event.mapper.writeValueAsString(toInternal), signer.pubKey) { encrypted ->
+        signer.nip44Encrypt(EventMapper.mapper.writeValueAsString(toInternal), signer.pubKey) { encrypted ->
             AppSpecificDataEvent.create(
                 dTag = APP_SPECIFIC_DATA_D_TAG,
                 description = encrypted,
@@ -1650,7 +1657,7 @@ class Account(
         }
 
         note.event?.let {
-            if (it.kind() == 1) {
+            if (it.kind == 1) {
                 RepostEvent.create(it, signer) {
                     Amethyst.instance.client.send(it)
                     LocalCache.justConsume(it, null)
@@ -1709,7 +1716,7 @@ class Account(
     }
 
     fun hasPendingAttestations(note: Note): Boolean {
-        val id = note.event?.id() ?: note.idHex
+        val id = note.event?.id ?: note.idHex
         return settings.pendingAttestations.value[id] != null
     }
 
@@ -1717,7 +1724,7 @@ class Account(
         if (!isWriteable()) return
         if (note.isDraft()) return
 
-        val id = note.event?.id() ?: note.idHex
+        val id = note.event?.id ?: note.idHex
 
         settings.addPendingAttestation(id, OtsEvent.stamp(id))
     }
@@ -2834,7 +2841,7 @@ class Account(
     ) {
         if (!isWriteable()) return
 
-        val idHex = originalNote.event?.id() ?: return
+        val idHex = originalNote.event?.id ?: return
 
         TextNoteModificationEvent.create(
             content = message,
@@ -3746,7 +3753,7 @@ class Account(
 
     fun cachedDecryptContent(note: Note): String? = cachedDecryptContent(note.event)
 
-    fun cachedDecryptContent(event: EventInterface?): String? {
+    fun cachedDecryptContent(event: Event?): String? {
         if (event == null) return null
 
         return if (event is PrivateDmEvent && isWriteable()) {
@@ -3754,7 +3761,7 @@ class Account(
         } else if (event is LnZapRequestEvent && event.isPrivateZap() && isWriteable()) {
             event.cachedPrivateZap()?.content
         } else {
-            event.content()
+            event.content
         }
     }
 
@@ -3772,7 +3779,7 @@ class Account(
                 onReady(it.content)
             }
         } else {
-            event?.content()?.let { onReady(it) }
+            event?.content?.let { onReady(it) }
         }
     }
 
@@ -4315,7 +4322,7 @@ class Account(
                 LocalCache.verifyAndConsume(event, null)
                 signer.decrypt(event.content, event.pubKey) { decrypted ->
                     try {
-                        val syncedSettings = Event.mapper.readValue<AccountSyncedSettingsInternal>(decrypted)
+                        val syncedSettings = EventMapper.mapper.readValue<AccountSyncedSettingsInternal>(decrypted)
                         settings.syncedSettings.updateFrom(syncedSettings)
                     } catch (e: Throwable) {
                         if (e is CancellationException) throw e
@@ -4408,7 +4415,7 @@ class Account(
                     signer.decrypt(it.content, it.pubKey) { decrypted ->
                         val syncedSettings =
                             try {
-                                Event.mapper.readValue<AccountSyncedSettingsInternal>(decrypted)
+                                EventMapper.mapper.readValue<AccountSyncedSettingsInternal>(decrypted)
                             } catch (e: Throwable) {
                                 if (e is CancellationException) throw e
                                 Log.w("LocalPreferences", "Error Decoding latestAppSpecificData from Preferences with value $decrypted", e)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt

@@ -30,22 +30,22 @@ import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
 import com.vitorpamplona.ammolite.relays.Constants
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
 import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
-import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
-import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.AppSpecificDataEvent
-import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
-import com.vitorpamplona.quartz.events.ContactListEvent
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.MuteListEvent
-import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
-import com.vitorpamplona.quartz.events.SearchRelayListEvent
-import com.vitorpamplona.quartz.signers.ExternalSignerLauncher
-import com.vitorpamplona.quartz.signers.NostrSignerExternal
-import com.vitorpamplona.quartz.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.experimental.edits.PrivateOutboxRelayListEvent
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip01Core.toHexKey
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatMessageRelayListEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect
+import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.MuteListEvent
+import com.vitorpamplona.quartz.nip55AndroidSigner.ExternalSignerLauncher
+import com.vitorpamplona.quartz.nip55AndroidSigner.NostrSignerExternal
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter
+import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -371,7 +371,7 @@ class AccountSettings(
         appSettings: AppSpecificDataEvent?,
         newSyncedSettings: AccountSyncedSettingsInternal,
     ) {
-        if (appSettings == null || appSettings.content().isEmpty()) return
+        if (appSettings == null || appSettings.content.isEmpty()) return
 
         // Events might be different objects, we have to compare their ids.
         if (backupAppSpecificData?.id != appSettings.id) {

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSyncedSettings.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.equalImmutableLists
-import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.MutableStateFlow

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSyncedSettingsInternal.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.model
 
 import android.content.res.Resources
 import androidx.core.os.ConfigurationCompat
-import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
 import java.util.Locale
 
 val DefaultReactions =

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt

@@ -26,9 +26,10 @@ import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.note.njumpLink
 import com.vitorpamplona.ammolite.relays.Relay
 import com.vitorpamplona.ammolite.relays.RelayStats
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.Nip19Bech32
-import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip19Bech32Entities.Nip19Parser
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
 import kotlinx.coroutines.flow.MutableStateFlow
 
 data class Spammer(
@@ -60,7 +61,7 @@ class AntiSpamFilter {
         // really long, make it ok.
         // The idea here is to avoid considering repeated "@Bot, command" messages spam, while still
         // blocking repeated "lnbc..." invoices or fishing urls
-        if (event.content.length < 180 && Nip19Bech32.nip19regex.matcher(event.content).find()) return false
+        if (event.content.length < 180 && Nip19Parser.nip19regex.matcher(event.content).find()) return false
 
         // double list strategy:
         // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
@@ -80,7 +81,7 @@ class AntiSpamFilter {
             logOffender(hash, event)
 
             if (relay != null) {
-                RelayStats.newSpam(relay.url, njumpLink(Nip19Bech32.createNEvent(event.id, event.pubKey, event.kind, relay.url)))
+                RelayStats.newSpam(relay.url, njumpLink(NEvent.create(event.id, event.pubKey, event.kind, relay.url)))
             }
 
             flowSpam.tryEmit(AntiSpamState(this))

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Channel.kt

@@ -28,12 +28,13 @@ import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.ammolite.relays.BundledUpdate
-import com.vitorpamplona.quartz.encoders.ATag
-import com.vitorpamplona.quartz.encoders.Hex
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.toNEvent
-import com.vitorpamplona.quartz.events.ChannelCreateEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesEvent
+import com.vitorpamplona.quartz.crypto.Hex
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.addressables.ATag
+import com.vitorpamplona.quartz.nip19Bech32Entities.toNAddr
+import com.vitorpamplona.quartz.nip19Bech32Entities.toNEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelCreateEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesEvent
 import kotlinx.coroutines.Dispatchers
 
 @Stable

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Chatroom.kt

@@ -23,8 +23,9 @@ package com.vitorpamplona.amethyst.model
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.events.PrivateDmEvent
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip04Dm.PrivateDmEvent
+import com.vitorpamplona.quartz.nip14Subject.subject
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Stable

amethyst/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt

@@ -50,7 +50,7 @@ import com.vitorpamplona.amethyst.ui.components.HashTag
 import com.vitorpamplona.amethyst.ui.components.RenderRegular
 import com.vitorpamplona.amethyst.ui.navigation.EmptyNav
 import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn
-import com.vitorpamplona.quartz.events.EmptyTagList
+import com.vitorpamplona.quartz.nip02FollowList.EmptyTagList
 
 @Preview
 @Composable

amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt

@@ -31,106 +31,120 @@ import com.vitorpamplona.amethyst.model.observables.LatestByKindWithETag
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.ammolite.relays.BundledInsert
 import com.vitorpamplona.ammolite.relays.Relay
-import com.vitorpamplona.quartz.encoders.ATag
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.HexValidator
-import com.vitorpamplona.quartz.encoders.decodeEventIdAsHexOrNull
-import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
-import com.vitorpamplona.quartz.events.AddressableEvent
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.AppDefinitionEvent
-import com.vitorpamplona.quartz.events.AppRecommendationEvent
-import com.vitorpamplona.quartz.events.AppSpecificDataEvent
-import com.vitorpamplona.quartz.events.AudioHeaderEvent
-import com.vitorpamplona.quartz.events.AudioTrackEvent
-import com.vitorpamplona.quartz.events.BadgeAwardEvent
-import com.vitorpamplona.quartz.events.BadgeDefinitionEvent
-import com.vitorpamplona.quartz.events.BadgeProfilesEvent
-import com.vitorpamplona.quartz.events.BaseAddressableEvent
-import com.vitorpamplona.quartz.events.BaseTextNoteEvent
-import com.vitorpamplona.quartz.events.BlossomServersEvent
-import com.vitorpamplona.quartz.events.BookmarkListEvent
-import com.vitorpamplona.quartz.events.CalendarDateSlotEvent
-import com.vitorpamplona.quartz.events.CalendarEvent
-import com.vitorpamplona.quartz.events.CalendarRSVPEvent
-import com.vitorpamplona.quartz.events.CalendarTimeSlotEvent
-import com.vitorpamplona.quartz.events.ChannelCreateEvent
-import com.vitorpamplona.quartz.events.ChannelHideMessageEvent
-import com.vitorpamplona.quartz.events.ChannelListEvent
-import com.vitorpamplona.quartz.events.ChannelMessageEvent
-import com.vitorpamplona.quartz.events.ChannelMetadataEvent
-import com.vitorpamplona.quartz.events.ChannelMuteUserEvent
-import com.vitorpamplona.quartz.events.ChatMessageEncryptedFileHeaderEvent
-import com.vitorpamplona.quartz.events.ChatMessageEvent
-import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
-import com.vitorpamplona.quartz.events.ChatroomKey
-import com.vitorpamplona.quartz.events.ClassifiedsEvent
-import com.vitorpamplona.quartz.events.CommentEvent
-import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
-import com.vitorpamplona.quartz.events.CommunityListEvent
-import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
-import com.vitorpamplona.quartz.events.ContactListEvent
-import com.vitorpamplona.quartz.events.DeletionEvent
-import com.vitorpamplona.quartz.events.DraftEvent
-import com.vitorpamplona.quartz.events.EmojiPackEvent
-import com.vitorpamplona.quartz.events.EmojiPackSelectionEvent
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.FhirResourceEvent
-import com.vitorpamplona.quartz.events.FileHeaderEvent
-import com.vitorpamplona.quartz.events.FileServersEvent
-import com.vitorpamplona.quartz.events.FileStorageEvent
-import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
-import com.vitorpamplona.quartz.events.GenericRepostEvent
-import com.vitorpamplona.quartz.events.GiftWrapEvent
-import com.vitorpamplona.quartz.events.GitIssueEvent
-import com.vitorpamplona.quartz.events.GitPatchEvent
-import com.vitorpamplona.quartz.events.GitReplyEvent
-import com.vitorpamplona.quartz.events.GitRepositoryEvent
-import com.vitorpamplona.quartz.events.HighlightEvent
-import com.vitorpamplona.quartz.events.InteractiveStoryPrologueEvent
-import com.vitorpamplona.quartz.events.InteractiveStoryReadingStateEvent
-import com.vitorpamplona.quartz.events.InteractiveStorySceneEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesEvent
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.LnZapPaymentRequestEvent
-import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
-import com.vitorpamplona.quartz.events.LnZapRequestEvent
-import com.vitorpamplona.quartz.events.LongTextNoteEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.MuteListEvent
-import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryRequestEvent
-import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryResponseEvent
-import com.vitorpamplona.quartz.events.NIP90StatusEvent
-import com.vitorpamplona.quartz.events.NIP90UserDiscoveryRequestEvent
-import com.vitorpamplona.quartz.events.NIP90UserDiscoveryResponseEvent
-import com.vitorpamplona.quartz.events.NNSEvent
-import com.vitorpamplona.quartz.events.OtsEvent
-import com.vitorpamplona.quartz.events.PeopleListEvent
-import com.vitorpamplona.quartz.events.PictureEvent
-import com.vitorpamplona.quartz.events.PinListEvent
-import com.vitorpamplona.quartz.events.PollNoteEvent
-import com.vitorpamplona.quartz.events.PrivateDmEvent
-import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
-import com.vitorpamplona.quartz.events.ProfileGalleryEntryEvent
-import com.vitorpamplona.quartz.events.ReactionEvent
-import com.vitorpamplona.quartz.events.RecommendRelayEvent
-import com.vitorpamplona.quartz.events.RelationshipStatusEvent
-import com.vitorpamplona.quartz.events.RelaySetEvent
-import com.vitorpamplona.quartz.events.ReportEvent
-import com.vitorpamplona.quartz.events.RepostEvent
-import com.vitorpamplona.quartz.events.SealedGossipEvent
-import com.vitorpamplona.quartz.events.SearchRelayListEvent
-import com.vitorpamplona.quartz.events.StatusEvent
-import com.vitorpamplona.quartz.events.TextNoteEvent
-import com.vitorpamplona.quartz.events.TextNoteModificationEvent
-import com.vitorpamplona.quartz.events.TorrentCommentEvent
-import com.vitorpamplona.quartz.events.TorrentEvent
-import com.vitorpamplona.quartz.events.VerificationState
-import com.vitorpamplona.quartz.events.VideoHorizontalEvent
-import com.vitorpamplona.quartz.events.VideoVerticalEvent
-import com.vitorpamplona.quartz.events.WikiNoteEvent
-import com.vitorpamplona.quartz.events.WrappedEvent
+import com.vitorpamplona.quartz.blossom.BlossomServersEvent
+import com.vitorpamplona.quartz.crypto.Hex
+import com.vitorpamplona.quartz.experimental.audio.AudioHeaderEvent
+import com.vitorpamplona.quartz.experimental.audio.AudioTrackEvent
+import com.vitorpamplona.quartz.experimental.edits.PrivateOutboxRelayListEvent
+import com.vitorpamplona.quartz.experimental.edits.TextNoteModificationEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryPrologueEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryReadingStateEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStorySceneEvent
+import com.vitorpamplona.quartz.experimental.medical.FhirResourceEvent
+import com.vitorpamplona.quartz.experimental.nip95.FileStorageEvent
+import com.vitorpamplona.quartz.experimental.nip95.FileStorageHeaderEvent
+import com.vitorpamplona.quartz.experimental.nns.NNSEvent
+import com.vitorpamplona.quartz.experimental.profileGallery.ProfileGalleryEntryEvent
+import com.vitorpamplona.quartz.experimental.relationshipStatus.RelationshipStatusEvent
+import com.vitorpamplona.quartz.experimental.zapPolls.PollNoteEvent
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.addressables.BaseAddressableEvent
+import com.vitorpamplona.quartz.nip01Core.addressables.mapTaggedAddress
+import com.vitorpamplona.quartz.nip01Core.addressables.taggedAddresses
+import com.vitorpamplona.quartz.nip01Core.checkSignature
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.core.matchTag1With
+import com.vitorpamplona.quartz.nip01Core.events.forEachTaggedEvent
+import com.vitorpamplona.quartz.nip01Core.events.isTaggedEvent
+import com.vitorpamplona.quartz.nip01Core.events.mapTaggedEvent
+import com.vitorpamplona.quartz.nip01Core.events.taggedEvents
+import com.vitorpamplona.quartz.nip01Core.hasValidSignature
+import com.vitorpamplona.quartz.nip01Core.people.isTaggedUsers
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip03Timestamp.OtsEvent
+import com.vitorpamplona.quartz.nip03Timestamp.VerificationState
+import com.vitorpamplona.quartz.nip04Dm.PrivateDmEvent
+import com.vitorpamplona.quartz.nip09Deletions.DeletionEvent
+import com.vitorpamplona.quartz.nip10Notes.BaseTextNoteEvent
+import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatMessageEncryptedFileHeaderEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatMessageEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatMessageRelayListEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatroomKey
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.decodeEventIdAsHexOrNull
+import com.vitorpamplona.quartz.nip19Bech32Entities.decodePublicKeyAsHexOrNull
+import com.vitorpamplona.quartz.nip19Bech32Entities.isATag
+import com.vitorpamplona.quartz.nip19Bech32Entities.parse
+import com.vitorpamplona.quartz.nip22Comments.CommentEvent
+import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent
+import com.vitorpamplona.quartz.nip25Reactions.ReactionEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelCreateEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelHideMessageEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelListEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMessageEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMetadataEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMuteUserEvent
+import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiPackEvent
+import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiPackSelectionEvent
+import com.vitorpamplona.quartz.nip34Git.GitIssueEvent
+import com.vitorpamplona.quartz.nip34Git.GitPatchEvent
+import com.vitorpamplona.quartz.nip34Git.GitReplyEvent
+import com.vitorpamplona.quartz.nip34Git.GitRepositoryEvent
+import com.vitorpamplona.quartz.nip35Torrents.TorrentCommentEvent
+import com.vitorpamplona.quartz.nip35Torrents.TorrentEvent
+import com.vitorpamplona.quartz.nip37Drafts.DraftEvent
+import com.vitorpamplona.quartz.nip38UserStatus.StatusEvent
+import com.vitorpamplona.quartz.nip40Expiration.expiration
+import com.vitorpamplona.quartz.nip40Expiration.isExpirationBefore
+import com.vitorpamplona.quartz.nip40Expiration.isExpired
+import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentRequestEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentResponseEvent
+import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.BookmarkListEvent
+import com.vitorpamplona.quartz.nip51Lists.MuteListEvent
+import com.vitorpamplona.quartz.nip51Lists.PeopleListEvent
+import com.vitorpamplona.quartz.nip51Lists.PinListEvent
+import com.vitorpamplona.quartz.nip51Lists.RelaySetEvent
+import com.vitorpamplona.quartz.nip52Calendar.CalendarDateSlotEvent
+import com.vitorpamplona.quartz.nip52Calendar.CalendarEvent
+import com.vitorpamplona.quartz.nip52Calendar.CalendarRSVPEvent
+import com.vitorpamplona.quartz.nip52Calendar.CalendarTimeSlotEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesEvent
+import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent
+import com.vitorpamplona.quartz.nip56Reports.ReportEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapRequestEvent
+import com.vitorpamplona.quartz.nip58Badges.BadgeAwardEvent
+import com.vitorpamplona.quartz.nip58Badges.BadgeDefinitionEvent
+import com.vitorpamplona.quartz.nip58Badges.BadgeProfilesEvent
+import com.vitorpamplona.quartz.nip59Giftwrap.GiftWrapEvent
+import com.vitorpamplona.quartz.nip59Giftwrap.SealedGossipEvent
+import com.vitorpamplona.quartz.nip59Giftwrap.WrappedEvent
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip68Picture.PictureEvent
+import com.vitorpamplona.quartz.nip71Video.VideoHorizontalEvent
+import com.vitorpamplona.quartz.nip71Video.VideoVerticalEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityListEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
+import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent
+import com.vitorpamplona.quartz.nip89AppHandlers.AppDefinitionEvent
+import com.vitorpamplona.quartz.nip89AppHandlers.AppRecommendationEvent
+import com.vitorpamplona.quartz.nip90Dvms.NIP90ContentDiscoveryRequestEvent
+import com.vitorpamplona.quartz.nip90Dvms.NIP90ContentDiscoveryResponseEvent
+import com.vitorpamplona.quartz.nip90Dvms.NIP90StatusEvent
+import com.vitorpamplona.quartz.nip90Dvms.NIP90UserDiscoveryRequestEvent
+import com.vitorpamplona.quartz.nip90Dvms.NIP90UserDiscoveryResponseEvent
+import com.vitorpamplona.quartz.nip94FileMetadata.FileHeaderEvent
+import com.vitorpamplona.quartz.nip96FileStorage.FileServersEvent
+import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentSetOf
@@ -289,7 +303,7 @@ object LocalCache {
                 // upgrade to the latest
                 val newNote = checkGetOrCreateAddressableNote(noteEvent.address().toTag())
 
-                if (newNote != null && noteEvent is Event && newNote.event == null) {
+                if (newNote != null && newNote.event == null) {
                     val author = note.author ?: getOrCreateUser(noteEvent.pubKey)
                     newNote.loadEvent(noteEvent as Event, author, emptyList())
                     note.moveAllReferencesTo(newNote)
@@ -352,7 +366,7 @@ object LocalCache {
         if (key.isBlank()) return false
         if (key.contains(":")) return false
 
-        return HexValidator.isHex(key)
+        return Hex.isHex(key)
     }
 
     fun checkGetOrCreateAddressableNote(key: String): AddressableNote? =
@@ -567,7 +581,7 @@ object LocalCache {
         }
 
         // Already processed this event.
-        if (note.event?.id() == event.id()) return
+        if (note.event?.id == event.id) return
 
         if (antiSpam.isSpam(event, relay)) {
             return
@@ -601,7 +615,7 @@ object LocalCache {
         }
 
         // Already processed this event.
-        if (note.event?.id() == event.id()) return
+        if (note.event?.id == event.id) return
 
         if (antiSpam.isSpam(event, relay)) {
             return
@@ -691,7 +705,7 @@ object LocalCache {
             version.moveAllReferencesTo(note)
         }
 
-        if (note.event?.id() == event.id()) return
+        if (note.event?.id == event.id) return
 
         if (event.createdAt > (note.createdAt() ?: 0)) {
             note.loadEvent(event, author, emptyList())
@@ -862,7 +876,7 @@ object LocalCache {
         }
 
         // Already processed this event.
-        if (note.event?.id() == event.id()) return
+        if (note.event?.id == event.id) return
 
         if (event.createdAt > (note.createdAt() ?: 0)) {
             note.loadEvent(event, author, emptyList())
@@ -888,7 +902,7 @@ object LocalCache {
         val author = getOrCreateUser(event.pubKey)
 
         // Already processed this event.
-        if (version.event?.id() == event.id()) return
+        if (version.event?.id == event.id) return
 
         // makes sure the OTS has a valid certificate
         if (event.cacheVerify() is VerificationState.Error) return // no valid OTS
@@ -919,7 +933,7 @@ object LocalCache {
         }
 
         // Already processed this event.
-        if (note.event?.id() == event.id()) return
+        if (note.event?.id == event.id) return
 
         val replyTo = computeReplyTo(event)
 
@@ -998,7 +1012,7 @@ object LocalCache {
         }
 
         // Already processed this event.
-        if (note.event?.id() == event.id()) return
+        if (note.event?.id == event.id) return
 
         if (event.createdAt > (note.createdAt() ?: 0)) {
             note.loadEvent(event, author, replyTos)
@@ -1021,11 +1035,6 @@ object LocalCache {
         consumeBaseReplaceable(event, relay)
     }
 
-    @Suppress("UNUSED_PARAMETER")
-    fun consume(event: RecommendRelayEvent) {
-        //        // Log.d("RR", event.toJson())
-    }
-
     fun consume(
         event: PrivateDmEvent,
         relay: Relay?,
@@ -1109,7 +1118,7 @@ object LocalCache {
             notes.forEach { key, note ->
                 val noteEvent = note.event
                 if (noteEvent is AddressableEvent && noteEvent.addressTag() in addressSet) {
-                    if (noteEvent.pubKey() == event.pubKey && noteEvent.createdAt() <= event.createdAt) {
+                    if (noteEvent.pubKey == event.pubKey && noteEvent.createdAt <= event.createdAt) {
                         deleteNote(note)
                         deletedAtLeastOne = true
                     }
@@ -1129,7 +1138,7 @@ object LocalCache {
 
         val mentions =
             deleteNote.event
-                ?.tags()
+                ?.tags
                 ?.filter { it.firstOrNull() == "p" }
                 ?.mapNotNull { it.getOrNull(1) }
                 ?.mapNotNull { checkGetOrCreateUser(it) }
@@ -1404,7 +1413,7 @@ object LocalCache {
 
         note.loadEvent(event, author, replyTo)
 
-        // Log.d("CM", "New Chat Note (${note.author?.toBestDisplayName()} ${note.event?.content()}
+        // Log.d("CM", "New Chat Note (${note.author?.toBestDisplayName()} ${note.event?.content}
         // ${formattedDateTime(event.createdAt)}")
 
         // Counts the replies
@@ -1777,9 +1786,7 @@ object LocalCache {
 
         requestNote?.let { request -> zappedNote?.addZapPayment(request, note) }
 
-        if (responseCallback != null) {
-            responseCallback(event)
-        }
+        responseCallback(event)
     }
 
     fun findUsersStartingWith(
@@ -1843,7 +1850,7 @@ object LocalCache {
                 return@filter false
             }
 
-            if (note.event?.matchTag1With(text) == true ||
+            if (note.event?.tags?.matchTag1With(text) == true ||
                 note.idHex.startsWith(text, true)
             ) {
                 if (!note.isHiddenFor(forAccount.flowHiddenUsers.value)) {
@@ -1855,7 +1862,7 @@ object LocalCache {
 
             if (note.event?.isContentEncoded() == false) {
                 if (!note.isHiddenFor(forAccount.flowHiddenUsers.value)) {
-                    return@filter note.event?.content()?.contains(text, true) ?: false
+                    return@filter note.event?.content?.contains(text, true) ?: false
                 } else {
                     return@filter false
                 }
@@ -1874,7 +1881,7 @@ object LocalCache {
                     return@filter false
                 }
 
-                if (addressable.event?.matchTag1With(text) == true ||
+                if (addressable.event?.tags?.matchTag1With(text) == true ||
                     addressable.idHex.startsWith(text, true)
                 ) {
                     if (!addressable.isHiddenFor(forAccount.flowHiddenUsers.value)) {
@@ -1886,7 +1893,7 @@ object LocalCache {
 
                 if (addressable.event?.isContentEncoded() == false) {
                     if (!addressable.isHiddenFor(forAccount.flowHiddenUsers.value)) {
-                        return@filter addressable.event?.content()?.contains(text, true) ?: false
+                        return@filter addressable.event?.content?.contains(text, true) ?: false
                     } else {
                         return@filter false
                     }
@@ -1923,7 +1930,7 @@ object LocalCache {
                         !noteEvent.isExpired() &&
                         noteEvent.content.isNotBlank()
                 )
-            }.sortedWith(compareBy({ it.event?.expiration() ?: it.event?.createdAt() }, { it.idHex }))
+            }.sortedWith(compareBy({ it.event?.expiration() ?: it.event?.createdAt }, { it.idHex }))
             .reversed()
             .toImmutableList()
     }
@@ -2073,8 +2080,8 @@ object LocalCache {
             notes.filter { _, note ->
                 val noteEvent = note.event
                 if (noteEvent is AddressableEvent) {
-                    noteEvent.createdAt() <
-                        (addressables.get(noteEvent.address().toTag())?.event?.createdAt() ?: 0)
+                    noteEvent.createdAt <
+                        (addressables.get(noteEvent.address().toTag())?.event?.createdAt ?: 0)
                 } else {
                     false
                 }
@@ -2215,7 +2222,7 @@ object LocalCache {
             account.liveHiddenUsers.value
                 ?.hiddenUsers
                 ?.map { userHex ->
-                    (notes.filter { _, it -> it.event?.pubKey() == userHex } + addressables.filter { _, it -> it.event?.pubKey() == userHex }).toSet()
+                    (notes.filter { _, it -> it.event?.pubKey == userHex } + addressables.filter { _, it -> it.event?.pubKey == userHex }).toSet()
                 }?.flatten()
                 ?: emptyList()
 
@@ -2451,7 +2458,7 @@ object LocalCache {
             // updates relay with a new event.
             getAddressableNoteIfExists(event.addressTag())?.let {
                 it.event?.let { existingEvent ->
-                    if (existingEvent.createdAt() > event.createdAt) {
+                    if (existingEvent.createdAt > event.createdAt) {
                         Log.d("LocalCache", "Updating ${relay.url} with a new version of ${event.toJson()} to ${existingEvent.toJson()}")
                         relay.send(existingEvent)
                     }
@@ -2548,7 +2555,6 @@ object LocalCache {
                 is PeopleListEvent -> consume(event, relay)
                 is PollNoteEvent -> consume(event, relay)
                 is ReactionEvent -> consume(event)
-                is RecommendRelayEvent -> consume(event)
                 is RelationshipStatusEvent -> consume(event, relay)
                 is RelaySetEvent -> consume(event, relay)
                 is ReportEvent -> consume(event, relay)
@@ -2580,7 +2586,7 @@ object LocalCache {
         if (notificationEvent is AddressableEvent) {
             val note = addressables.get(notificationEvent.addressTag())
             val noteEvent = note?.event
-            noteEvent != null && notificationEvent.createdAt <= noteEvent.createdAt()
+            noteEvent != null && notificationEvent.createdAt <= noteEvent.createdAt
         } else {
             val note = notes.get(notificationEvent.id)
             note?.event != null

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt

@@ -37,33 +37,36 @@ import com.vitorpamplona.ammolite.relays.BundledUpdate
 import com.vitorpamplona.ammolite.relays.Relay
 import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
 import com.vitorpamplona.ammolite.relays.filters.EOSETime
-import com.vitorpamplona.quartz.encoders.ATag
-import com.vitorpamplona.quartz.encoders.Hex
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
-import com.vitorpamplona.quartz.encoders.Nip19Bech32
-import com.vitorpamplona.quartz.events.AddressableEvent
-import com.vitorpamplona.quartz.events.BaseTextNoteEvent
-import com.vitorpamplona.quartz.events.ChannelCreateEvent
-import com.vitorpamplona.quartz.events.ChannelMessageEvent
-import com.vitorpamplona.quartz.events.ChannelMetadataEvent
-import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
-import com.vitorpamplona.quartz.events.DraftEvent
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.EventInterface
-import com.vitorpamplona.quartz.events.GenericRepostEvent
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
-import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesEvent
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.LnZapPaymentRequestEvent
-import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
-import com.vitorpamplona.quartz.events.LnZapRequestEvent
-import com.vitorpamplona.quartz.events.LongTextNoteEvent
-import com.vitorpamplona.quartz.events.PayInvoiceSuccessResponse
-import com.vitorpamplona.quartz.events.RepostEvent
-import com.vitorpamplona.quartz.events.WrappedEvent
-import com.vitorpamplona.quartz.signers.NostrSigner
+import com.vitorpamplona.quartz.crypto.Hex
+import com.vitorpamplona.quartz.lightning.LnInvoiceUtil
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.hashtags.anyHashTag
+import com.vitorpamplona.quartz.nip01Core.hashtags.isTaggedHash
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip02FollowList.ImmutableListOfLists
+import com.vitorpamplona.quartz.nip10Notes.BaseTextNoteEvent
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.toNAddr
+import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelCreateEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMessageEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMetadataEvent
+import com.vitorpamplona.quartz.nip36SensitiveContent.isSensitiveOrNSFW
+import com.vitorpamplona.quartz.nip37Drafts.DraftEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentRequestEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentResponseEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.PayInvoiceSuccessResponse
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapRequestEvent
+import com.vitorpamplona.quartz.nip59Giftwrap.WrappedEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityPostApprovalEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.utils.containsAny
 import kotlinx.coroutines.CancellationException
@@ -91,7 +94,7 @@ class AddressableNote(
         if (event == null) return null
 
         val publishedAt = (event as? LongTextNoteEvent)?.publishedAt() ?: Long.MAX_VALUE
-        val lastCreatedAt = event?.createdAt() ?: Long.MAX_VALUE
+        val lastCreatedAt = event?.createdAt ?: Long.MAX_VALUE
 
         return minOf(publishedAt, lastCreatedAt)
     }
@@ -103,7 +106,7 @@ class AddressableNote(
         deletionAddressables: Set<ATag>,
     ): Boolean {
         val thisEvent = event
-        return deletionAddressables.contains(address) || (thisEvent != null && deletionEvents.contains(thisEvent.id()))
+        return deletionAddressables.contains(address) || (thisEvent != null && deletionEvents.contains(thisEvent.id))
     }
 }
 
@@ -113,7 +116,7 @@ open class Note(
 ) {
     // These fields are only available after the Text Note event is received.
     // They are immutable after that.
-    var event: EventInterface? = null
+    var event: Event? = null
     var author: User? = null
     var replyTo: List<Note>? = null
 
@@ -152,17 +155,17 @@ open class Note(
         return if (myEvent is WrappedEvent) {
             val host = myEvent.host
             if (host != null) {
-                Nip19Bech32.createNEvent(
+                NEvent.create(
                     host.id,
                     host.pubKey,
                     host.kind,
                     relayHintUrl(),
                 )
             } else {
-                Nip19Bech32.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relayHintUrl())
+                NEvent.create(idHex, author?.pubkeyHex, event?.kind, relayHintUrl())
             }
         } else {
-            Nip19Bech32.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relayHintUrl())
+            NEvent.create(idHex, author?.pubkeyHex, event?.kind, relayHintUrl())
         }
     }
 
@@ -203,7 +206,7 @@ open class Note(
 
     open fun address(): ATag? = null
 
-    open fun createdAt() = event?.createdAt()
+    open fun createdAt() = event?.createdAt
 
     fun isDraft() = event is DraftEvent
 
@@ -212,7 +215,7 @@ open class Note(
         author: User,
         replyTo: List<Note>,
     ) {
-        if (this.event?.id() != event.id()) {
+        if (this.event?.id != event.id) {
             this.event = event
             this.author = author
             this.replyTo = replyTo
@@ -282,8 +285,8 @@ open class Note(
     }
 
     fun removeReaction(note: Note) {
-        val tags = note.event?.tags() ?: emptyArray()
-        val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
+        val tags = note.event?.tags ?: emptyArray()
+        val reaction = note.event?.content?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
 
         if (reactions[reaction]?.contains(note) == true) {
             reactions[reaction]?.let {
@@ -396,8 +399,8 @@ open class Note(
     }
 
     fun addReaction(note: Note) {
-        val tags = note.event?.tags() ?: emptyArray()
-        val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
+        val tags = note.event?.tags ?: emptyArray()
+        val reaction = note.event?.content?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
 
         val listOfAuthors = reactions[reaction]
         if (listOfAuthors == null) {
@@ -701,7 +704,7 @@ open class Note(
             .any {
                 val pledgeValue =
                     try {
-                        BigDecimal(it.event?.content())
+                        BigDecimal(it.event?.content)
                     } catch (e: Exception) {
                         if (e is CancellationException) throw e
                         null
@@ -716,7 +719,7 @@ open class Note(
             .filter { it.event?.isTaggedHash("bounty-added-reward") ?: false }
             .mapNotNull {
                 try {
-                    BigDecimal(it.event?.content())
+                    BigDecimal(it.event?.content)
                 } catch (e: Exception) {
                     if (e is CancellationException) throw e
                     null
@@ -808,7 +811,7 @@ open class Note(
 
     fun isHiddenFor(accountChoices: Account.LiveHiddenUsers): Boolean {
         val thisEvent = event ?: return false
-        val hash = thisEvent.pubKey().hashCode()
+        val hash = thisEvent.pubKey.hashCode()
 
         // if the author is hidden by spam or blocked
         if (accountChoices.hiddenUsersHashCodes.contains(hash) ||
@@ -818,7 +821,7 @@ open class Note(
         }
 
         // if the post is sensitive and the user doesn't want to see sensitive content
-        if (accountChoices.showSensitiveContent == false && thisEvent.isSensitive()) {
+        if (accountChoices.showSensitiveContent == false && thisEvent.isSensitiveOrNSFW()) {
             return true
         }
 
@@ -986,7 +989,7 @@ class NoteLiveSet(
 
     val boostCount = innerBoosts.map { it.note.boosts.size }.distinctUntilChanged()
 
-    val content = innerMetadata.map { it.note.event?.content() ?: "" }
+    val content = innerMetadata.map { it.note.event?.content ?: "" }
 
     fun isInUse(): Boolean =
         metadata.hasObservers() ||

amethyst/src/main/java/com/vitorpamplona/amethyst/model/ParticipantListBuilder.kt

@@ -20,7 +20,7 @@
  */
 package com.vitorpamplona.amethyst.model
 
-import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.nip01Core.HexKey
 
 class ParticipantListBuilder {
     private fun addFollowsThatDirectlyParticipateOnToSet(

amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt

@@ -22,10 +22,10 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.quartz.encoders.ATag
-import com.vitorpamplona.quartz.events.AddressableEvent
-import com.vitorpamplona.quartz.events.GenericRepostEvent
-import com.vitorpamplona.quartz.events.RepostEvent
+import com.vitorpamplona.quartz.nip01Core.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.toImmutableSet
 
@@ -42,7 +42,7 @@ class ThreadAssembler {
 
         val markedAsRoot =
             note.event
-                ?.tags()
+                ?.tags
                 ?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }
                 ?.getOrNull(1)
         if (markedAsRoot != null) {

amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadLevelCalculator.kt

@@ -20,9 +20,9 @@
  */
 package com.vitorpamplona.amethyst.model
 
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.events.GenericRepostEvent
-import com.vitorpamplona.quartz.events.RepostEvent
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
 import java.lang.Long.min
 import java.time.Instant
 import java.time.ZoneId

amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt

@@ -31,20 +31,23 @@ import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.ammolite.relays.BundledUpdate
 import com.vitorpamplona.ammolite.relays.Relay
 import com.vitorpamplona.ammolite.relays.filters.EOSETime
-import com.vitorpamplona.quartz.encoders.Hex
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.Lud06
-import com.vitorpamplona.quartz.encoders.Nip19Bech32
-import com.vitorpamplona.quartz.encoders.toNpub
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.BookmarkListEvent
-import com.vitorpamplona.quartz.events.ChatroomKey
-import com.vitorpamplona.quartz.events.ContactListEvent
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.ReportEvent
-import com.vitorpamplona.quartz.events.UserMetadata
-import com.vitorpamplona.quartz.events.toImmutableListOfLists
+import com.vitorpamplona.quartz.crypto.Hex
+import com.vitorpamplona.quartz.lightning.Lud06
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.UserMetadata
+import com.vitorpamplona.quartz.nip01Core.geohash.isTaggedGeoHash
+import com.vitorpamplona.quartz.nip01Core.hashtags.isTaggedHash
+import com.vitorpamplona.quartz.nip01Core.people.isTaggedUser
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip02FollowList.toImmutableListOfLists
+import com.vitorpamplona.quartz.nip17Dm.ChatroomKey
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NProfile
+import com.vitorpamplona.quartz.nip19Bech32Entities.toNpub
+import com.vitorpamplona.quartz.nip51Lists.BookmarkListEvent
+import com.vitorpamplona.quartz.nip56Reports.ReportEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.utils.DualCase
 import com.vitorpamplona.quartz.utils.containsAny
 import kotlinx.collections.immutable.persistentSetOf
@@ -86,7 +89,7 @@ class User(
     fun toNProfile(): String {
         val relayList = (LocalCache.getAddressableNoteIfExists(AdvertisedRelayListEvent.createAddressTag(pubkeyHex))?.event as? AdvertisedRelayListEvent)?.writeRelays()
 
-        return Nip19Bech32.createNProfile(
+        return NProfile.create(
             pubkeyHex,
             relayList?.take(3) ?: listOfNotNull(latestMetadataRelay),
         )

amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/CreatedAtComparator.kt

@@ -38,7 +38,7 @@ object CreatedAtComparator : Comparator<Note> {
         } else if (secondEvent == null) {
             -1
         } else {
-            firstEvent.createdAt().compareTo(secondEvent.createdAt())
+            firstEvent.createdAt.compareTo(secondEvent.createdAt)
         }
     }
 }
@@ -58,7 +58,7 @@ object CreatedAtComparatorAddresses : Comparator<AddressableNote> {
         } else if (secondEvent == null) {
             -1
         } else {
-            firstEvent.createdAt().compareTo(secondEvent.createdAt())
+            firstEvent.createdAt.compareTo(secondEvent.createdAt)
         }
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindAndAuthor.kt

@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.model.observables
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.nip01Core.core.Event
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 
@@ -53,7 +53,7 @@ class LatestByKindAndAuthor<T : Event>(
                     .maxOrNullOf(
                         filter = { idHex: String, note: AddressableNote ->
                             note.event?.let {
-                                it.kind() == kind && it.pubKey() == pubkey
+                                it.kind == kind && it.pubKey == pubkey
                             } == true
                         },
                         comparator = CreatedAtComparatorAddresses,
@@ -63,7 +63,7 @@ class LatestByKindAndAuthor<T : Event>(
                     .maxOrNullOf(
                         filter = { idHex: String, note: Note ->
                             note.event?.let {
-                                it.kind() == kind && it.pubKey() == pubkey
+                                it.kind == kind && it.pubKey == pubkey
                             } == true
                         },
                         comparator = CreatedAtComparator,

amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindWithETag.kt

@@ -22,7 +22,8 @@ package com.vitorpamplona.amethyst.model.observables
 
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.events.isTaggedEvent
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 
@@ -51,7 +52,7 @@ class LatestByKindWithETag<T : Event>(
                 .maxOrNullOf(
                     filter = { idHex: String, note: Note ->
                         note.event?.let {
-                            it.kind() == kind && it.isTaggedEvent(eTag)
+                            it.kind == kind && it.isTaggedEvent(eTag)
                         } == true
                     },
                     comparator = CreatedAtComparator,

amethyst/src/main/java/com/vitorpamplona/amethyst/service/AmethystNostrDataSource.kt

@@ -24,8 +24,8 @@ import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.ammolite.relays.NostrDataSource
 import com.vitorpamplona.ammolite.relays.Relay
-import com.vitorpamplona.quartz.events.AddressableEvent
-import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.Event
 
 abstract class AmethystNostrDataSource(
     debugName: String,

amethyst/src/main/java/com/vitorpamplona/amethyst/service/Base64Image.kt

@@ -35,7 +35,7 @@ import coil3.request.ImageRequest
 import coil3.request.Options
 import com.vitorpamplona.amethyst.commons.richtext.RichTextParser.Companion.base64contentPattern
 import com.vitorpamplona.quartz.crypto.CryptoUtils
-import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.nip01Core.toHexKey
 import java.util.Base64
 
 @Stable

amethyst/src/main/java/com/vitorpamplona/amethyst/service/CachedRichTextParser.kt

@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.service
 import android.util.LruCache
 import com.vitorpamplona.amethyst.commons.richtext.RichTextParser
 import com.vitorpamplona.amethyst.commons.richtext.RichTextViewerState
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
+import com.vitorpamplona.quartz.nip02FollowList.ImmutableListOfLists
 
 object CachedRichTextParser {
     private val richTextCache = LruCache<Int, RichTextViewerState>(50)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt

@@ -23,6 +23,7 @@ package com.vitorpamplona.amethyst.service
 import android.content.Context
 import android.util.LruCache
 import androidx.compose.runtime.Immutable
+import com.fasterxml.jackson.databind.node.JsonNodeFactory
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.amethyst.R
@@ -30,8 +31,7 @@ import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.amethyst.ui.components.GenericLoadable
 import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.nip01Core.toHexKey
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.serialization.ExperimentalSerializationApi
@@ -279,7 +279,7 @@ class CashuProcessor {
             val url = "$mintAddress/checkfees" // Melt cashu tokens at Mint
             val client = HttpClientManager.getHttpClient(forceProxy(url))
 
-            val factory = Event.mapper.nodeFactory
+            val factory = JsonNodeFactory.instance
 
             val jsonObject = factory.objectNode()
             jsonObject.put("pr", invoice)
@@ -343,7 +343,7 @@ class CashuProcessor {
             val url = token.mint + "/melt" // Melt cashu tokens at Mint
             val client = HttpClientManager.getHttpClient(forceProxy(url))
 
-            val factory = Event.mapper.nodeFactory
+            val factory = JsonNodeFactory.instance
 
             val jsonObject = factory.objectNode()
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/EmojiUtils.kt

@@ -20,7 +20,7 @@
  */
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
+import com.vitorpamplona.quartz.nip02FollowList.ImmutableListOfLists
 
 fun String.isUTF16Char(pos: Int): Boolean = Character.charCount(this.codePointAt(pos)) == 2
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip11RelayInfoRetriever.kt

@@ -23,8 +23,8 @@ package com.vitorpamplona.amethyst.service
 import android.util.Log
 import android.util.LruCache
 import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
-import com.vitorpamplona.quartz.encoders.Nip11RelayInformation
-import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
+import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation
+import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter
 import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.coroutines.CancellationException
 import okhttp3.Call

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt

@@ -30,47 +30,46 @@ import com.vitorpamplona.ammolite.relays.Relay
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.EOSETime
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.AppSpecificDataEvent
-import com.vitorpamplona.quartz.events.BadgeAwardEvent
-import com.vitorpamplona.quartz.events.BadgeProfilesEvent
-import com.vitorpamplona.quartz.events.BlossomServersEvent
-import com.vitorpamplona.quartz.events.BookmarkListEvent
-import com.vitorpamplona.quartz.events.CalendarDateSlotEvent
-import com.vitorpamplona.quartz.events.CalendarRSVPEvent
-import com.vitorpamplona.quartz.events.CalendarTimeSlotEvent
-import com.vitorpamplona.quartz.events.ChannelMessageEvent
-import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
-import com.vitorpamplona.quartz.events.CommentEvent
-import com.vitorpamplona.quartz.events.ContactListEvent
-import com.vitorpamplona.quartz.events.DraftEvent
-import com.vitorpamplona.quartz.events.EmojiPackSelectionEvent
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.EventInterface
-import com.vitorpamplona.quartz.events.FileServersEvent
-import com.vitorpamplona.quartz.events.GenericRepostEvent
-import com.vitorpamplona.quartz.events.GiftWrapEvent
-import com.vitorpamplona.quartz.events.GitIssueEvent
-import com.vitorpamplona.quartz.events.GitPatchEvent
-import com.vitorpamplona.quartz.events.GitReplyEvent
-import com.vitorpamplona.quartz.events.HighlightEvent
-import com.vitorpamplona.quartz.events.InteractiveStoryPrologueEvent
-import com.vitorpamplona.quartz.events.InteractiveStorySceneEvent
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.MuteListEvent
-import com.vitorpamplona.quartz.events.PeopleListEvent
-import com.vitorpamplona.quartz.events.PollNoteEvent
-import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
-import com.vitorpamplona.quartz.events.ReactionEvent
-import com.vitorpamplona.quartz.events.ReportEvent
-import com.vitorpamplona.quartz.events.RepostEvent
-import com.vitorpamplona.quartz.events.SealedGossipEvent
-import com.vitorpamplona.quartz.events.SearchRelayListEvent
-import com.vitorpamplona.quartz.events.StatusEvent
-import com.vitorpamplona.quartz.events.TextNoteEvent
+import com.vitorpamplona.quartz.blossom.BlossomServersEvent
+import com.vitorpamplona.quartz.experimental.edits.PrivateOutboxRelayListEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryPrologueEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStorySceneEvent
+import com.vitorpamplona.quartz.experimental.zapPolls.PollNoteEvent
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatMessageRelayListEvent
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
+import com.vitorpamplona.quartz.nip22Comments.CommentEvent
+import com.vitorpamplona.quartz.nip25Reactions.ReactionEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMessageEvent
+import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiPackSelectionEvent
+import com.vitorpamplona.quartz.nip34Git.GitIssueEvent
+import com.vitorpamplona.quartz.nip34Git.GitPatchEvent
+import com.vitorpamplona.quartz.nip34Git.GitReplyEvent
+import com.vitorpamplona.quartz.nip37Drafts.DraftEvent
+import com.vitorpamplona.quartz.nip38UserStatus.StatusEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentResponseEvent
+import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.BookmarkListEvent
+import com.vitorpamplona.quartz.nip51Lists.MuteListEvent
+import com.vitorpamplona.quartz.nip51Lists.PeopleListEvent
+import com.vitorpamplona.quartz.nip52Calendar.CalendarDateSlotEvent
+import com.vitorpamplona.quartz.nip52Calendar.CalendarRSVPEvent
+import com.vitorpamplona.quartz.nip52Calendar.CalendarTimeSlotEvent
+import com.vitorpamplona.quartz.nip56Reports.ReportEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip58Badges.BadgeAwardEvent
+import com.vitorpamplona.quartz.nip58Badges.BadgeProfilesEvent
+import com.vitorpamplona.quartz.nip59Giftwrap.GiftWrapEvent
+import com.vitorpamplona.quartz.nip59Giftwrap.SealedGossipEvent
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
+import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent
+import com.vitorpamplona.quartz.nip96FileStorage.FileServersEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 // TODO: Migrate this to a property of AccountVi
@@ -315,7 +314,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
             is PrivateOutboxRelayListEvent -> {
                 val note = LocalCache.getAddressableNoteIfExists(event.addressTag())
                 val noteEvent = note?.event
-                if (noteEvent == null || event.createdAt > noteEvent.createdAt()) {
+                if (noteEvent == null || event.createdAt > noteEvent.createdAt) {
                     event.privateTags(account.signer) {
                         LocalCache.justConsume(event, relay)
                     }
@@ -329,7 +328,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
                     val note = LocalCache.getAddressableNoteIfExists(event.addressTag())
                     val noteEvent = note?.event
                     if (noteEvent != null) {
-                        if (event.createdAt > noteEvent.createdAt() || relay.brief !in note.relays) {
+                        if (event.createdAt > noteEvent.createdAt || relay.brief !in note.relays) {
                             LocalCache.consume(event, relay)
                         }
                     } else {
@@ -431,10 +430,10 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
     }
 
     private fun markInnerAsSeenOnRelay(
-        newNoteEvent: EventInterface,
+        newNoteEvent: Event,
         relay: Relay,
     ) {
-        markInnerAsSeenOnRelay(newNoteEvent.id(), relay)
+        markInnerAsSeenOnRelay(newNoteEvent.id, relay)
     }
 
     private fun markInnerAsSeenOnRelay(

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt

@@ -27,8 +27,8 @@ import com.vitorpamplona.amethyst.model.PublicChatChannel
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.ChannelMessageEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMessageEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesChatMessageEvent
 
 object NostrChannelDataSource : AmethystNostrDataSource("ChatroomFeed") {
     var account: Account? = null

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomDataSource.kt

@@ -25,8 +25,8 @@ import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.ChatroomKey
-import com.vitorpamplona.quartz.events.PrivateDmEvent
+import com.vitorpamplona.quartz.nip04Dm.PrivateDmEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatroomKey
 
 object NostrChatroomDataSource : AmethystNostrDataSource("ChatroomFeed") {
     lateinit var account: Account

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomListDataSource.kt

@@ -26,10 +26,10 @@ import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.ChannelCreateEvent
-import com.vitorpamplona.quartz.events.ChannelMessageEvent
-import com.vitorpamplona.quartz.events.ChannelMetadataEvent
-import com.vitorpamplona.quartz.events.PrivateDmEvent
+import com.vitorpamplona.quartz.nip04Dm.PrivateDmEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelCreateEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMessageEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMetadataEvent
 
 object NostrChatroomListDataSource : AmethystNostrDataSource("MailBoxFeed") {
     lateinit var account: Account

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrCommunityDataSource.kt

@@ -24,8 +24,8 @@ import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
-import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityPostApprovalEvent
 
 object NostrCommunityDataSource : AmethystNostrDataSource("SingleCommunityFeed") {
     private var communityToWatch: AddressableNote? = null

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrDiscoveryDataSource.kt

@@ -27,15 +27,15 @@ import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SinceAuthorPerRelayFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.AppDefinitionEvent
-import com.vitorpamplona.quartz.events.ChannelCreateEvent
-import com.vitorpamplona.quartz.events.ChannelMessageEvent
-import com.vitorpamplona.quartz.events.ChannelMetadataEvent
-import com.vitorpamplona.quartz.events.ClassifiedsEvent
-import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
-import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelCreateEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMessageEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMetadataEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.nip89AppHandlers.AppDefinitionEvent
+import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrGeohashDataSource.kt

@@ -23,16 +23,16 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.AudioHeaderEvent
-import com.vitorpamplona.quartz.events.AudioTrackEvent
-import com.vitorpamplona.quartz.events.ChannelMessageEvent
-import com.vitorpamplona.quartz.events.ClassifiedsEvent
-import com.vitorpamplona.quartz.events.CommentEvent
-import com.vitorpamplona.quartz.events.HighlightEvent
-import com.vitorpamplona.quartz.events.LongTextNoteEvent
-import com.vitorpamplona.quartz.events.PollNoteEvent
-import com.vitorpamplona.quartz.events.TextNoteEvent
-import com.vitorpamplona.quartz.events.WikiNoteEvent
+import com.vitorpamplona.quartz.experimental.audio.AudioHeaderEvent
+import com.vitorpamplona.quartz.experimental.audio.AudioTrackEvent
+import com.vitorpamplona.quartz.experimental.zapPolls.PollNoteEvent
+import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent
+import com.vitorpamplona.quartz.nip22Comments.CommentEvent
+import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMessageEvent
+import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent
+import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent
+import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent
 
 object NostrGeohashDataSource : AmethystNostrDataSource("SingleGeoHashFeed") {
     private var geohashToWatch: String? = null

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHashtagDataSource.kt

@@ -23,18 +23,18 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.AudioHeaderEvent
-import com.vitorpamplona.quartz.events.AudioTrackEvent
-import com.vitorpamplona.quartz.events.ChannelMessageEvent
-import com.vitorpamplona.quartz.events.ClassifiedsEvent
-import com.vitorpamplona.quartz.events.CommentEvent
-import com.vitorpamplona.quartz.events.HighlightEvent
-import com.vitorpamplona.quartz.events.InteractiveStorySceneEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
-import com.vitorpamplona.quartz.events.LongTextNoteEvent
-import com.vitorpamplona.quartz.events.PollNoteEvent
-import com.vitorpamplona.quartz.events.TextNoteEvent
-import com.vitorpamplona.quartz.events.WikiNoteEvent
+import com.vitorpamplona.quartz.experimental.audio.AudioHeaderEvent
+import com.vitorpamplona.quartz.experimental.audio.AudioTrackEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStorySceneEvent
+import com.vitorpamplona.quartz.experimental.zapPolls.PollNoteEvent
+import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent
+import com.vitorpamplona.quartz.nip22Comments.CommentEvent
+import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMessageEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent
+import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent
+import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent
 
 object NostrHashtagDataSource : AmethystNostrDataSource("SingleHashtagFeed") {
     private var hashtagToWatch: String? = null

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt

@@ -27,24 +27,24 @@ import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SinceAuthorPerRelayFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.AudioHeaderEvent
-import com.vitorpamplona.quartz.events.AudioTrackEvent
-import com.vitorpamplona.quartz.events.ClassifiedsEvent
-import com.vitorpamplona.quartz.events.CommentEvent
-import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
-import com.vitorpamplona.quartz.events.GenericRepostEvent
-import com.vitorpamplona.quartz.events.HighlightEvent
-import com.vitorpamplona.quartz.events.InteractiveStoryPrologueEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesEvent
-import com.vitorpamplona.quartz.events.LongTextNoteEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.PinListEvent
-import com.vitorpamplona.quartz.events.PollNoteEvent
-import com.vitorpamplona.quartz.events.RepostEvent
-import com.vitorpamplona.quartz.events.TextNoteEvent
-import com.vitorpamplona.quartz.events.WikiNoteEvent
+import com.vitorpamplona.quartz.experimental.audio.AudioHeaderEvent
+import com.vitorpamplona.quartz.experimental.audio.AudioTrackEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryPrologueEvent
+import com.vitorpamplona.quartz.experimental.zapPolls.PollNoteEvent
+import com.vitorpamplona.quartz.nip01Core.MetadataEvent
+import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
+import com.vitorpamplona.quartz.nip22Comments.CommentEvent
+import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent
+import com.vitorpamplona.quartz.nip51Lists.PinListEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesEvent
+import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent
+import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrLnZapPaymentResponseDataSource.kt

@@ -23,8 +23,8 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
-import com.vitorpamplona.quartz.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentResponseEvent
 
 class NostrLnZapPaymentResponseDataSource(
     private val fromServiceHex: String,

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt

@@ -24,35 +24,42 @@ import com.vitorpamplona.ammolite.relays.ALL_FEED_TYPES
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
+import com.vitorpamplona.quartz.crypto.Hex
 import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.encoders.ATag
-import com.vitorpamplona.quartz.encoders.Hex
-import com.vitorpamplona.quartz.encoders.HexValidator
-import com.vitorpamplona.quartz.encoders.Nip19Bech32
-import com.vitorpamplona.quartz.encoders.bechToBytes
-import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.events.AudioHeaderEvent
-import com.vitorpamplona.quartz.events.AudioTrackEvent
-import com.vitorpamplona.quartz.events.BadgeDefinitionEvent
-import com.vitorpamplona.quartz.events.BookmarkListEvent
-import com.vitorpamplona.quartz.events.ChannelCreateEvent
-import com.vitorpamplona.quartz.events.ChannelMetadataEvent
-import com.vitorpamplona.quartz.events.ClassifiedsEvent
-import com.vitorpamplona.quartz.events.CommentEvent
-import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
-import com.vitorpamplona.quartz.events.EmojiPackEvent
-import com.vitorpamplona.quartz.events.HighlightEvent
-import com.vitorpamplona.quartz.events.InteractiveStoryPrologueEvent
-import com.vitorpamplona.quartz.events.InteractiveStorySceneEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesEvent
-import com.vitorpamplona.quartz.events.LongTextNoteEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.NNSEvent
-import com.vitorpamplona.quartz.events.PeopleListEvent
-import com.vitorpamplona.quartz.events.PinListEvent
-import com.vitorpamplona.quartz.events.PollNoteEvent
-import com.vitorpamplona.quartz.events.TextNoteEvent
-import com.vitorpamplona.quartz.events.WikiNoteEvent
+import com.vitorpamplona.quartz.experimental.audio.AudioHeaderEvent
+import com.vitorpamplona.quartz.experimental.audio.AudioTrackEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryPrologueEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStorySceneEvent
+import com.vitorpamplona.quartz.experimental.nns.NNSEvent
+import com.vitorpamplona.quartz.experimental.zapPolls.PollNoteEvent
+import com.vitorpamplona.quartz.nip01Core.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.toHexKey
+import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.Nip19Parser
+import com.vitorpamplona.quartz.nip19Bech32Entities.bech32.bechToBytes
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NAddress
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEmbed
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NProfile
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NPub
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NRelay
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NSec
+import com.vitorpamplona.quartz.nip19Bech32Entities.parse
+import com.vitorpamplona.quartz.nip22Comments.CommentEvent
+import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelCreateEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMetadataEvent
+import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiPackEvent
+import com.vitorpamplona.quartz.nip51Lists.BookmarkListEvent
+import com.vitorpamplona.quartz.nip51Lists.PeopleListEvent
+import com.vitorpamplona.quartz.nip51Lists.PinListEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesEvent
+import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent
+import com.vitorpamplona.quartz.nip58Badges.BadgeDefinitionEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent
+import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent
 import kotlin.coroutines.cancellation.CancellationException
 
 object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFeed") {
@@ -67,21 +74,21 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
         val hexToWatch =
             try {
                 val isAStraightHex =
-                    if (HexValidator.isHex(mySearchString)) {
+                    if (Hex.isHex(mySearchString)) {
                         Hex.decode(mySearchString).toHexKey()
                     } else {
                         null
                     }
 
-                when (val parsed = Nip19Bech32.uriToRoute(mySearchString)?.entity) {
-                    is Nip19Bech32.NSec -> KeyPair(privKey = parsed.hex.bechToBytes()).pubKey.toHexKey()
-                    is Nip19Bech32.NPub -> parsed.hex
-                    is Nip19Bech32.NProfile -> parsed.hex
-                    is Nip19Bech32.Note -> parsed.hex
-                    is Nip19Bech32.NEvent -> parsed.hex
-                    is Nip19Bech32.NEmbed -> parsed.event.id
-                    is Nip19Bech32.NRelay -> null
-                    is Nip19Bech32.NAddress -> parsed.atag
+                when (val parsed = Nip19Parser.uriToRoute(mySearchString)?.entity) {
+                    is NSec -> KeyPair(privKey = parsed.hex.bechToBytes()).pubKey.toHexKey()
+                    is NPub -> parsed.hex
+                    is NProfile -> parsed.hex
+                    is com.vitorpamplona.quartz.nip19Bech32Entities.entities.Note -> parsed.hex
+                    is NEvent -> parsed.hex
+                    is NEmbed -> parsed.event.id
+                    is NRelay -> null
+                    is NAddress -> parsed.aTag()
                     else -> isAStraightHex
                 }
             } catch (e: Exception) {

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleChannelDataSource.kt

@@ -27,8 +27,8 @@ import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.ChannelCreateEvent
-import com.vitorpamplona.quartz.events.ChannelMetadataEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelCreateEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMetadataEvent
 
 object NostrSingleChannelDataSource : AmethystNostrDataSource("SingleChannelFeed") {
     private var channelsToWatch = setOf<Channel>()

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt

@@ -27,22 +27,22 @@ import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.EOSETime
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
-import com.vitorpamplona.quartz.events.DeletionEvent
-import com.vitorpamplona.quartz.events.GenericRepostEvent
-import com.vitorpamplona.quartz.events.GitReplyEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryResponseEvent
-import com.vitorpamplona.quartz.events.NIP90StatusEvent
-import com.vitorpamplona.quartz.events.OtsEvent
-import com.vitorpamplona.quartz.events.PollNoteEvent
-import com.vitorpamplona.quartz.events.ReactionEvent
-import com.vitorpamplona.quartz.events.ReportEvent
-import com.vitorpamplona.quartz.events.RepostEvent
-import com.vitorpamplona.quartz.events.TextNoteEvent
-import com.vitorpamplona.quartz.events.TextNoteModificationEvent
-import com.vitorpamplona.quartz.events.TorrentCommentEvent
+import com.vitorpamplona.quartz.experimental.edits.TextNoteModificationEvent
+import com.vitorpamplona.quartz.experimental.zapPolls.PollNoteEvent
+import com.vitorpamplona.quartz.nip03Timestamp.OtsEvent
+import com.vitorpamplona.quartz.nip09Deletions.DeletionEvent
+import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
+import com.vitorpamplona.quartz.nip25Reactions.ReactionEvent
+import com.vitorpamplona.quartz.nip34Git.GitReplyEvent
+import com.vitorpamplona.quartz.nip35Torrents.TorrentCommentEvent
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.nip56Reports.ReportEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.nip90Dvms.NIP90ContentDiscoveryResponseEvent
+import com.vitorpamplona.quartz.nip90Dvms.NIP90StatusEvent
 
 object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
     private var nextEventsToWatch = setOf<Note>()

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleUserDataSource.kt

@@ -25,12 +25,12 @@ import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.EOSETime
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.RelationshipStatusEvent
-import com.vitorpamplona.quartz.events.ReportEvent
-import com.vitorpamplona.quartz.events.StatusEvent
+import com.vitorpamplona.quartz.experimental.relationshipStatus.RelationshipStatusEvent
+import com.vitorpamplona.quartz.nip01Core.MetadataEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatMessageRelayListEvent
+import com.vitorpamplona.quartz.nip38UserStatus.StatusEvent
+import com.vitorpamplona.quartz.nip56Reports.ReportEvent
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
 
 object NostrSingleUserDataSource : AmethystNostrDataSource("SingleUserFeed") {
     private var usersToWatch = setOf<User>()

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt

@@ -42,7 +42,7 @@ object NostrThreadDataSource : AmethystNostrDataSource("SingleThreadFeed") {
                 .ifEmpty { null }
 
         val address = if (branch.root is AddressableNote) branch.root.idHex else null
-        val event = if (branch.root !is AddressableNote) branch.root.idHex else branch.root.event?.id()
+        val event = if (branch.root !is AddressableNote) branch.root.idHex else branch.root.event?.id
 
         return listOfNotNull(
             eventsToLoad?.let {

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt

@@ -24,32 +24,32 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.AppRecommendationEvent
-import com.vitorpamplona.quartz.events.AudioHeaderEvent
-import com.vitorpamplona.quartz.events.AudioTrackEvent
-import com.vitorpamplona.quartz.events.BadgeAwardEvent
-import com.vitorpamplona.quartz.events.BadgeProfilesEvent
-import com.vitorpamplona.quartz.events.BookmarkListEvent
-import com.vitorpamplona.quartz.events.CommentEvent
-import com.vitorpamplona.quartz.events.ContactListEvent
-import com.vitorpamplona.quartz.events.GenericRepostEvent
-import com.vitorpamplona.quartz.events.HighlightEvent
-import com.vitorpamplona.quartz.events.InteractiveStoryPrologueEvent
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.LongTextNoteEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
-import com.vitorpamplona.quartz.events.PeopleListEvent
-import com.vitorpamplona.quartz.events.PictureEvent
-import com.vitorpamplona.quartz.events.PinListEvent
-import com.vitorpamplona.quartz.events.PollNoteEvent
-import com.vitorpamplona.quartz.events.ProfileGalleryEntryEvent
-import com.vitorpamplona.quartz.events.RepostEvent
-import com.vitorpamplona.quartz.events.TextNoteEvent
-import com.vitorpamplona.quartz.events.TorrentCommentEvent
-import com.vitorpamplona.quartz.events.TorrentEvent
-import com.vitorpamplona.quartz.events.VideoHorizontalEvent
-import com.vitorpamplona.quartz.events.VideoVerticalEvent
-import com.vitorpamplona.quartz.events.WikiNoteEvent
+import com.vitorpamplona.quartz.experimental.audio.AudioHeaderEvent
+import com.vitorpamplona.quartz.experimental.audio.AudioTrackEvent
+import com.vitorpamplona.quartz.experimental.interactiveStories.InteractiveStoryPrologueEvent
+import com.vitorpamplona.quartz.experimental.profileGallery.ProfileGalleryEntryEvent
+import com.vitorpamplona.quartz.experimental.zapPolls.PollNoteEvent
+import com.vitorpamplona.quartz.nip01Core.MetadataEvent
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
+import com.vitorpamplona.quartz.nip22Comments.CommentEvent
+import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent
+import com.vitorpamplona.quartz.nip35Torrents.TorrentCommentEvent
+import com.vitorpamplona.quartz.nip35Torrents.TorrentEvent
+import com.vitorpamplona.quartz.nip51Lists.BookmarkListEvent
+import com.vitorpamplona.quartz.nip51Lists.PeopleListEvent
+import com.vitorpamplona.quartz.nip51Lists.PinListEvent
+import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip58Badges.BadgeAwardEvent
+import com.vitorpamplona.quartz.nip58Badges.BadgeProfilesEvent
+import com.vitorpamplona.quartz.nip68Picture.PictureEvent
+import com.vitorpamplona.quartz.nip71Video.VideoHorizontalEvent
+import com.vitorpamplona.quartz.nip71Video.VideoVerticalEvent
+import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent
+import com.vitorpamplona.quartz.nip89AppHandlers.AppRecommendationEvent
 
 object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
     var user: User? = null

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrVideoDataSource.kt

@@ -27,11 +27,11 @@ import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SinceAuthorPerRelayFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
-import com.vitorpamplona.quartz.events.FileHeaderEvent
-import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
-import com.vitorpamplona.quartz.events.PictureEvent
-import com.vitorpamplona.quartz.events.VideoHorizontalEvent
-import com.vitorpamplona.quartz.events.VideoVerticalEvent
+import com.vitorpamplona.quartz.experimental.nip95.FileStorageHeaderEvent
+import com.vitorpamplona.quartz.nip68Picture.PictureEvent
+import com.vitorpamplona.quartz.nip71Video.VideoHorizontalEvent
+import com.vitorpamplona.quartz.nip71Video.VideoVerticalEvent
+import com.vitorpamplona.quartz.nip94FileMetadata.FileHeaderEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ZapPaymentHandler.kt

@@ -31,12 +31,13 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource.user
 import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.AppDefinitionEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesEvent
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.PayInvoiceErrorResponse
-import com.vitorpamplona.quartz.events.ZapSplitSetup
+import com.vitorpamplona.quartz.nip47WalletConnect.PayInvoiceErrorResponse
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup
+import com.vitorpamplona.quartz.nip57Zaps.zapSplitSetup
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip89AppHandlers.AppDefinitionEvent
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers

amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/CachedLnInvoice.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.service.lnurl
 
 import android.util.LruCache
 import androidx.compose.runtime.Stable
-import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
+import com.vitorpamplona.quartz.lightning.LnInvoiceUtil
 import kotlinx.coroutines.CancellationException
 import java.text.NumberFormat
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt

@@ -28,8 +28,8 @@ import com.vitorpamplona.amethyst.service.HttpStatusMessages
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
-import com.vitorpamplona.quartz.encoders.Lud06
+import com.vitorpamplona.quartz.lightning.LnInvoiceUtil
+import com.vitorpamplona.quartz.lightning.Lud06
 import okhttp3.Request
 import okhttp3.Response
 import java.math.BigDecimal

amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt

@@ -34,18 +34,21 @@ import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendDM
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendZapNotification
 import com.vitorpamplona.amethyst.ui.note.showAmount
 import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.quartz.encoders.toNpub
-import com.vitorpamplona.quartz.events.ChatMessageEncryptedFileHeaderEvent
-import com.vitorpamplona.quartz.events.ChatMessageEvent
-import com.vitorpamplona.quartz.events.DraftEvent
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.GiftWrapEvent
-import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.LnZapRequestEvent
-import com.vitorpamplona.quartz.events.PrivateDmEvent
-import com.vitorpamplona.quartz.events.SealedGossipEvent
-import com.vitorpamplona.quartz.signers.NostrSigner
-import com.vitorpamplona.quartz.signers.NostrSignerExternal
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.people.isTaggedUser
+import com.vitorpamplona.quartz.nip01Core.people.taggedUsers
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip04Dm.PrivateDmEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatMessageEncryptedFileHeaderEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatMessageEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.toNpub
+import com.vitorpamplona.quartz.nip21UriScheme.toNostrUri
+import com.vitorpamplona.quartz.nip37Drafts.DraftEvent
+import com.vitorpamplona.quartz.nip55AndroidSigner.NostrSignerExternal
+import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
+import com.vitorpamplona.quartz.nip57Zaps.LnZapRequestEvent
+import com.vitorpamplona.quartz.nip59Giftwrap.GiftWrapEvent
+import com.vitorpamplona.quartz.nip59Giftwrap.SealedGossipEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 import java.math.BigDecimal
 import kotlin.coroutines.cancellation.CancellationException
@@ -223,7 +226,7 @@ class EventNotificationConsumer(
                 )
 
             if (isKnownRoom) {
-                val content = chatNote.event?.content() ?: ""
+                val content = chatNote.event?.content ?: ""
                 val user = chatNote.author?.toBestDisplayName() ?: ""
                 val userPicture = chatNote.author?.profilePicture()
                 val noteUri = chatNote.toNEvent() + "?account=" + acc.keyPair.pubKey.toNpub()
@@ -268,7 +271,7 @@ class EventNotificationConsumer(
                 )
 
             if (isKnownRoom) {
-                val content = chatNote.event?.content() ?: ""
+                val content = chatNote.event?.content ?: ""
                 val user = chatNote.author?.toBestDisplayName() ?: ""
                 val userPicture = chatNote.author?.profilePicture()
                 val noteUri = chatNote.toNEvent() + "?account=" + acc.keyPair.pubKey.toNpub()
@@ -350,7 +353,7 @@ class EventNotificationConsumer(
                 onReady(it.content)
             }
         } else {
-            event?.content()?.let { onReady(it) }
+            event?.content?.let { onReady(it) }
         }
     }
 
@@ -391,7 +394,7 @@ class EventNotificationConsumer(
                     val author = LocalCache.getOrCreateUser(it.pubKey)
                     val senderInfo = Pair(author, it.content.ifBlank { null })
 
-                    if (noteZapped.event?.content() != null) {
+                    if (noteZapped.event?.content != null) {
                         decryptContent(noteZapped, signer) {
                             Log.d(TAG, "Notify Decrypted if Private Note")
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/PokeyReceiver.kt

@@ -24,7 +24,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.util.Log
-import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.nip01Core.core.Event
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -50,7 +50,9 @@ class PokeyReceiver : BroadcastReceiver() {
 
             scope.launch(Dispatchers.IO) {
                 try {
-                    EventNotificationConsumer(context.applicationContext).findAccountAndConsume(Event.fromJson(eventStr))
+                    EventNotificationConsumer(context.applicationContext).findAccountAndConsume(
+                        Event.fromJson(eventStr),
+                    )
                 } catch (e: Exception) {
                     Log.e(TAG, "Failed to parse Pokey Event", e)
                 }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt

@@ -29,8 +29,8 @@ import com.vitorpamplona.amethyst.launchAndWaitAll
 import com.vitorpamplona.amethyst.model.AccountSettings
 import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.amethyst.tryAndWait
-import com.vitorpamplona.quartz.events.RelayAuthEvent
-import com.vitorpamplona.quartz.signers.NostrSignerExternal
+import com.vitorpamplona.quartz.nip42RelayAuth.RelayAuthEvent
+import com.vitorpamplona.quartz.nip55AndroidSigner.NostrSignerExternal
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/EncryptedBlobInterceptor.kt

@@ -21,8 +21,8 @@
 package com.vitorpamplona.amethyst.service.okhttp
 
 import android.util.Log
-import com.vitorpamplona.quartz.crypto.nip17.AESGCM
-import com.vitorpamplona.quartz.crypto.nip17.NostrCipher
+import com.vitorpamplona.quartz.nip17Dm.AESGCM
+import com.vitorpamplona.quartz.nip17Dm.NostrCipher
 import okhttp3.Interceptor
 import okhttp3.Response
 import okhttp3.ResponseBody.Companion.toResponseBody

amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/EncryptionKeyCache.kt

@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.service.okhttp
 
 import android.util.LruCache
-import com.vitorpamplona.quartz.crypto.nip17.NostrCipher
+import com.vitorpamplona.quartz.nip17Dm.NostrCipher
 
 /**
  * Neigther ExoPlayer, nor Coil support passing key and nonce to the Interceptor via

amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/HttpClientManager.kt

@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.service.okhttp
 
 import android.util.Log
-import com.vitorpamplona.quartz.crypto.nip17.NostrCipher
+import com.vitorpamplona.quartz.nip17Dm.NostrCipher
 import okhttp3.OkHttpClient
 import java.net.InetSocketAddress
 import java.net.Proxy

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpBlockstreamExplorer.kt

@@ -25,9 +25,9 @@ import android.util.LruCache
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
-import com.vitorpamplona.quartz.ots.BitcoinExplorer
-import com.vitorpamplona.quartz.ots.BlockHeader
-import com.vitorpamplona.quartz.ots.exceptions.UrlException
+import com.vitorpamplona.quartz.nip03Timestamp.ots.BitcoinExplorer
+import com.vitorpamplona.quartz.nip03Timestamp.ots.BlockHeader
+import com.vitorpamplona.quartz.nip03Timestamp.ots.exceptions.UrlException
 import okhttp3.Request
 
 class OkHttpBlockstreamExplorer(
@@ -65,7 +65,8 @@ class OkHttpBlockstreamExplorer(
             if (it.isSuccessful) {
                 val jsonObject = jacksonObjectMapper().readTree(it.body.string())
 
-                val blockHeader = BlockHeader()
+                val blockHeader =
+                    BlockHeader()
                 blockHeader.merkleroot = jsonObject["merkle_root"].asText()
                 blockHeader.setTime(jsonObject["timestamp"].asInt().toString())
                 blockHeader.blockHash = hash
@@ -75,7 +76,9 @@ class OkHttpBlockstreamExplorer(
 
                 return blockHeader
             } else {
-                throw UrlException("Couldn't open $url: " + it.message + " " + it.code)
+                throw UrlException(
+                    "Couldn't open $url: " + it.message + " " + it.code,
+                )
             }
         }
     }
@@ -114,7 +117,9 @@ class OkHttpBlockstreamExplorer(
                 cacheHeights.put(height, blockHash)
                 return blockHash
             } else {
-                throw UrlException("Couldn't open $url: " + it.message + " " + it.code)
+                throw UrlException(
+                    "Couldn't open $url: " + it.message + " " + it.code,
+                )
             }
         }
     }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendar.kt

@@ -22,14 +22,14 @@ package com.vitorpamplona.amethyst.service.ots
 
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
-import com.vitorpamplona.quartz.encoders.Hex
-import com.vitorpamplona.quartz.ots.ICalendar
-import com.vitorpamplona.quartz.ots.StreamDeserializationContext
-import com.vitorpamplona.quartz.ots.Timestamp
-import com.vitorpamplona.quartz.ots.exceptions.CommitmentNotFoundException
-import com.vitorpamplona.quartz.ots.exceptions.DeserializationException
-import com.vitorpamplona.quartz.ots.exceptions.ExceededSizeException
-import com.vitorpamplona.quartz.ots.exceptions.UrlException
+import com.vitorpamplona.quartz.crypto.Hex
+import com.vitorpamplona.quartz.nip03Timestamp.ots.ICalendar
+import com.vitorpamplona.quartz.nip03Timestamp.ots.StreamDeserializationContext
+import com.vitorpamplona.quartz.nip03Timestamp.ots.Timestamp
+import com.vitorpamplona.quartz.nip03Timestamp.ots.exceptions.CommitmentNotFoundException
+import com.vitorpamplona.quartz.nip03Timestamp.ots.exceptions.DeserializationException
+import com.vitorpamplona.quartz.nip03Timestamp.ots.exceptions.ExceededSizeException
+import com.vitorpamplona.quartz.nip03Timestamp.ots.exceptions.UrlException
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody
 
@@ -70,10 +70,15 @@ class OkHttpCalendar(
 
             client.newCall(request).execute().use {
                 if (it.isSuccessful) {
-                    val ctx = StreamDeserializationContext(it.body.bytes())
+                    val ctx =
+                        StreamDeserializationContext(
+                            it.body.bytes(),
+                        )
                     return Timestamp.deserialize(ctx, digest)
                 } else {
-                    throw UrlException("Failed to open $url")
+                    throw UrlException(
+                        "Failed to open $url",
+                    )
                 }
             }
         } catch (e: ExceededSizeException) {
@@ -118,10 +123,15 @@ class OkHttpCalendar(
 
             client.newCall(request).execute().use {
                 if (it.isSuccessful) {
-                    val ctx = StreamDeserializationContext(it.body.bytes())
+                    val ctx =
+                        StreamDeserializationContext(
+                            it.body.bytes(),
+                        )
                     return Timestamp.deserialize(ctx, commitment)
                 } else {
-                    throw CommitmentNotFoundException("Calendar response a status code != 200: " + it.code)
+                    throw CommitmentNotFoundException(
+                        "Calendar response a status code != 200: " + it.code,
+                    )
                 }
             }
         } catch (e: DeserializationException) {

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarAsyncSubmit.kt

@@ -22,9 +22,9 @@ package com.vitorpamplona.amethyst.service.ots
 
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
-import com.vitorpamplona.quartz.ots.ICalendarAsyncSubmit
-import com.vitorpamplona.quartz.ots.StreamDeserializationContext
-import com.vitorpamplona.quartz.ots.Timestamp
+import com.vitorpamplona.quartz.nip03Timestamp.ots.ICalendarAsyncSubmit
+import com.vitorpamplona.quartz.nip03Timestamp.ots.StreamDeserializationContext
+import com.vitorpamplona.quartz.nip03Timestamp.ots.Timestamp
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody
 import java.util.Optional
@@ -64,7 +64,10 @@ class OkHttpCalendarAsyncSubmit(
 
         client.newCall(request).execute().use {
             if (it.isSuccessful) {
-                val ctx = StreamDeserializationContext(it.body.bytes())
+                val ctx =
+                    StreamDeserializationContext(
+                        it.body.bytes(),
+                    )
                 val timestamp = Timestamp.deserialize(ctx, digest)
                 val of = Optional.of(timestamp)
                 queue!!.add(of)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarBuilder.kt

@@ -20,9 +20,9 @@
  */
 package com.vitorpamplona.amethyst.service.ots
 
-import com.vitorpamplona.quartz.ots.CalendarBuilder
-import com.vitorpamplona.quartz.ots.ICalendar
-import com.vitorpamplona.quartz.ots.ICalendarAsyncSubmit
+import com.vitorpamplona.quartz.nip03Timestamp.ots.CalendarBuilder
+import com.vitorpamplona.quartz.nip03Timestamp.ots.ICalendar
+import com.vitorpamplona.quartz.nip03Timestamp.ots.ICalendarAsyncSubmit
 
 class OkHttpCalendarBuilder(
     val forceProxy: (String) -> Boolean,

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/EncryptFiles.kt

@@ -24,8 +24,8 @@ import android.content.Context
 import android.net.Uri
 import androidx.core.net.toUri
 import com.vitorpamplona.quartz.crypto.CryptoUtils
-import com.vitorpamplona.quartz.crypto.nip17.NostrCipher
-import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.nip01Core.toHexKey
+import com.vitorpamplona.quartz.nip17Dm.NostrCipher
 import java.io.File
 
 class EncryptFilesResult(

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/FileHeader.kt

@@ -31,8 +31,8 @@ import android.util.Log
 import com.vitorpamplona.amethyst.commons.blurhash.toBlurhash
 import com.vitorpamplona.amethyst.service.Blurhash
 import com.vitorpamplona.quartz.crypto.CryptoUtils
-import com.vitorpamplona.quartz.encoders.Dimension
-import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.nip01Core.toHexKey
+import com.vitorpamplona.quartz.nip94FileMetadata.Dimension
 import kotlinx.coroutines.CancellationException
 import java.io.IOException
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MediaUploadResult.kt

@@ -20,8 +20,8 @@
  */
 package com.vitorpamplona.amethyst.service.uploads
 
-import com.vitorpamplona.quartz.encoders.Dimension
-import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip94FileMetadata.Dimension
 
 data class MediaUploadResult(
     // A publicly accessible URL to the BUD-01 GET /<sha256> endpoint (optionally with a file extension)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MultiOrchestrator.kt

@@ -26,7 +26,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
 import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMedia
 import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMediaProcessing
-import com.vitorpamplona.quartz.crypto.nip17.NostrCipher
+import com.vitorpamplona.quartz.nip17Dm.NostrCipher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.joinAll

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/UploadOrchestrator.kt

@@ -29,7 +29,7 @@ import com.vitorpamplona.amethyst.service.uploads.blossom.BlossomUploader
 import com.vitorpamplona.amethyst.service.uploads.nip96.Nip96Uploader
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerType
-import com.vitorpamplona.quartz.crypto.nip17.NostrCipher
+import com.vitorpamplona.quartz.nip17Dm.NostrCipher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 import kotlin.coroutines.cancellation.CancellationException

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/blossom/BlossomUploader.kt

@@ -35,10 +35,10 @@ import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.amethyst.service.uploads.MediaUploadResult
 import com.vitorpamplona.amethyst.service.uploads.nip96.randomChars
 import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.quartz.blossom.BlossomAuthorizationEvent
 import com.vitorpamplona.quartz.crypto.CryptoUtils
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.events.BlossomAuthorizationEvent
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.toHexKey
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip96/Nip96Uploader.kt

@@ -35,8 +35,8 @@ import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.amethyst.service.uploads.MediaUploadResult
 import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.quartz.encoders.Dimension
-import com.vitorpamplona.quartz.events.HTTPAuthorizationEvent
+import com.vitorpamplona.quartz.nip94FileMetadata.Dimension
+import com.vitorpamplona.quartz.nip98HttpAuth.HTTPAuthorizationEvent
 import kotlinx.coroutines.delay
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.MultipartBody

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt

@@ -47,14 +47,20 @@ import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
 import com.vitorpamplona.amethyst.ui.tor.TorManager
-import com.vitorpamplona.quartz.encoders.Nip19Bech32
-import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
-import com.vitorpamplona.quartz.events.ChannelCreateEvent
-import com.vitorpamplona.quartz.events.ChannelMessageEvent
-import com.vitorpamplona.quartz.events.ChannelMetadataEvent
-import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesEvent
-import com.vitorpamplona.quartz.events.PrivateDmEvent
+import com.vitorpamplona.quartz.nip04Dm.PrivateDmEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.Nip19Parser
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NAddress
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEmbed
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NProfile
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NPub
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.Note
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelCreateEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMessageEvent
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMetadataEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect
+import com.vitorpamplona.quartz.nip53LiveActivities.LiveActivitiesEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityDefinitionEvent
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
@@ -262,12 +268,12 @@ fun uriToRoute(uri: String?): String? =
         if (uri?.startsWith("hashtag?id=") == true || uri?.startsWith("nostr:hashtag?id=") == true) {
             Route.Hashtag.route.replace("{id}", uri.removePrefix("nostr:").removePrefix("hashtag?id="))
         } else {
-            val nip19 = Nip19Bech32.uriToRoute(uri)?.entity
+            val nip19 = Nip19Parser.uriToRoute(uri)?.entity
             when (nip19) {
-                is Nip19Bech32.NPub -> "User/${nip19.hex}"
-                is Nip19Bech32.NProfile -> "User/${nip19.hex}"
-                is Nip19Bech32.Note -> "Note/${nip19.hex}"
-                is Nip19Bech32.NEvent -> {
+                is NPub -> "User/${nip19.hex}"
+                is NProfile -> "User/${nip19.hex}"
+                is Note -> "Note/${nip19.hex}"
+                is NEvent -> {
                     if (nip19.kind == PrivateDmEvent.KIND) {
                         nip19.author?.let { "RoomByAuthor/$it" }
                     } else if (
@@ -281,17 +287,17 @@ fun uriToRoute(uri: String?): String? =
                     }
                 }
 
-                is Nip19Bech32.NAddress -> {
+                is NAddress -> {
                     if (nip19.kind == CommunityDefinitionEvent.KIND) {
-                        "Community/${nip19.atag}"
+                        "Community/${nip19.aTag()}"
                     } else if (nip19.kind == LiveActivitiesEvent.KIND) {
-                        "Channel/${nip19.atag}"
+                        "Channel/${nip19.aTag()}"
                     } else {
-                        "Event/${nip19.atag}"
+                        "Event/${nip19.aTag()}"
                     }
                 }
 
-                is Nip19Bech32.NEmbed -> {
+                is NEmbed -> {
                     if (LocalCache.getNoteIfExists(nip19.event.id) == null) {
                         LocalCache.verifyAndConsume(nip19.event, null)
                     }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostViewModel.kt

@@ -46,10 +46,10 @@ import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMediaProcessing
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
-import com.vitorpamplona.quartz.encoders.IMetaTag
-import com.vitorpamplona.quartz.encoders.IMetaTagBuilder
-import com.vitorpamplona.quartz.events.FileStorageEvent
-import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
+import com.vitorpamplona.quartz.experimental.nip95.FileStorageEvent
+import com.vitorpamplona.quartz.experimental.nip95.FileStorageHeaderEvent
+import com.vitorpamplona.quartz.nip92IMeta.IMetaTag
+import com.vitorpamplona.quartz.nip92IMeta.IMetaTagBuilder
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -103,7 +103,7 @@ open class EditPostViewModel : ViewModel() {
         canAddInvoice = accountViewModel.userProfile().info?.lnAddress() != null
         multiOrchestrator = null
 
-        message = TextFieldValue(versionLookingAt?.event?.content() ?: edit.event?.content() ?: "")
+        message = TextFieldValue(versionLookingAt?.event?.content ?: edit.event?.content ?: "")
         urlPreview = findUrlInMessage()
 
         editedFromNote = edit

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMessageTagger.kt

@@ -24,11 +24,18 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.encoders.Bech32
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.Nip19Bech32
-import com.vitorpamplona.quartz.encoders.bechToBytes
-import com.vitorpamplona.quartz.encoders.toNpub
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip19Bech32Entities.Nip19Parser
+import com.vitorpamplona.quartz.nip19Bech32Entities.bech32.Bech32
+import com.vitorpamplona.quartz.nip19Bech32Entities.bech32.bechToBytes
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NAddress
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEmbed
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NProfile
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NPub
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NRelay
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NSec
+import com.vitorpamplona.quartz.nip19Bech32Entities.toNpub
 import kotlinx.coroutines.CancellationException
 
 class NewMessageTagger(
@@ -63,22 +70,22 @@ class NewMessageTagger(
                 val results = parseDirtyWordForKey(word)
 
                 when (val entity = results?.key?.entity) {
-                    is Nip19Bech32.NPub -> addUserToMentions(dao.getOrCreateUser(entity.hex))
-                    is Nip19Bech32.NProfile -> addUserToMentions(dao.getOrCreateUser(entity.hex))
+                    is NPub -> addUserToMentions(dao.getOrCreateUser(entity.hex))
+                    is NProfile -> addUserToMentions(dao.getOrCreateUser(entity.hex))
 
-                    is Nip19Bech32.Note -> addNoteToReplyTos(dao.getOrCreateNote(entity.hex))
-                    is Nip19Bech32.NEvent -> addNoteToReplyTos(dao.getOrCreateNote(entity.hex))
-                    is Nip19Bech32.NEmbed -> addNoteToReplyTos(dao.getOrCreateNote(entity.event.id))
+                    is com.vitorpamplona.quartz.nip19Bech32Entities.entities.Note -> addNoteToReplyTos(dao.getOrCreateNote(entity.hex))
+                    is NEvent -> addNoteToReplyTos(dao.getOrCreateNote(entity.hex))
+                    is NEmbed -> addNoteToReplyTos(dao.getOrCreateNote(entity.event.id))
 
-                    is Nip19Bech32.NAddress -> {
-                        val note = dao.checkGetOrCreateAddressableNote(entity.atag)
+                    is NAddress -> {
+                        val note = dao.checkGetOrCreateAddressableNote(entity.aTag())
                         if (note != null) {
                             addNoteToReplyTos(note)
                         }
                     }
 
-                    is Nip19Bech32.NSec -> {}
-                    is Nip19Bech32.NRelay -> {}
+                    is NSec -> {}
+                    is NRelay -> {}
                 }
             }
         }
@@ -93,22 +100,22 @@ class NewMessageTagger(
                         .map { word: String ->
                             val results = parseDirtyWordForKey(word)
                             when (val entity = results?.key?.entity) {
-                                is Nip19Bech32.NPub -> {
+                                is NPub -> {
                                     getNostrAddress(dao.getOrCreateUser(entity.hex).toNProfile(), results.restOfWord)
                                 }
-                                is Nip19Bech32.NProfile -> {
+                                is NProfile -> {
                                     getNostrAddress(dao.getOrCreateUser(entity.hex).toNProfile(), results.restOfWord)
                                 }
 
-                                is Nip19Bech32.Note -> {
+                                is com.vitorpamplona.quartz.nip19Bech32Entities.entities.Note -> {
                                     getNostrAddress(dao.getOrCreateNote(entity.hex).toNEvent(), results.restOfWord)
                                 }
-                                is Nip19Bech32.NEvent -> {
+                                is NEvent -> {
                                     getNostrAddress(dao.getOrCreateNote(entity.hex).toNEvent(), results.restOfWord)
                                 }
 
-                                is Nip19Bech32.NAddress -> {
-                                    val note = dao.checkGetOrCreateAddressableNote(entity.atag)
+                                is NAddress -> {
+                                    val note = dao.checkGetOrCreateAddressableNote(entity.aTag())
                                     if (note != null) {
                                         getNostrAddress(note.idNote(), results.restOfWord)
                                     } else {
@@ -116,15 +123,15 @@ class NewMessageTagger(
                                     }
                                 }
 
-                                is Nip19Bech32.NEmbed -> {
+                                is NEmbed -> {
                                     word
                                 }
 
-                                is Nip19Bech32.NSec -> {
+                                is NSec -> {
                                     word
                                 }
 
-                                is Nip19Bech32.NRelay -> {
+                                is NRelay -> {
                                     word
                                 }
 
@@ -151,7 +158,7 @@ class NewMessageTagger(
         }
 
     @Immutable data class DirtyKeyInfo(
-        val key: Nip19Bech32.ParseReturn,
+        val key: Nip19Parser.ParseReturn,
         val restOfWord: String?,
     )
 
@@ -173,7 +180,7 @@ class NewMessageTagger(
                 val restOfWord = key.substring(63)
                 // Converts to npub
                 val pubkey =
-                    Nip19Bech32.uriToRoute(KeyPair(privKey = keyB32.bechToBytes()).pubKey.toNpub()) ?: return null
+                    Nip19Parser.uriToRoute(KeyPair(privKey = keyB32.bechToBytes()).pubKey.toNpub()) ?: return null
 
                 return DirtyKeyInfo(pubkey, restOfWord.ifEmpty { null })
             } else if (key.startsWith("npub1", true)) {
@@ -184,7 +191,7 @@ class NewMessageTagger(
                 val keyB32 = key.substring(0, 63)
                 val restOfWord = key.substring(63)
 
-                val pubkey = Nip19Bech32.uriToRoute(keyB32) ?: return null
+                val pubkey = Nip19Parser.uriToRoute(keyB32) ?: return null
 
                 return DirtyKeyInfo(pubkey, restOfWord.ifEmpty { null })
             } else if (key.startsWith("note1", true)) {
@@ -195,19 +202,19 @@ class NewMessageTagger(
                 val keyB32 = key.substring(0, 63)
                 val restOfWord = key.substring(63)
 
-                val noteId = Nip19Bech32.uriToRoute(keyB32) ?: return null
+                val noteId = Nip19Parser.uriToRoute(keyB32) ?: return null
 
                 return DirtyKeyInfo(noteId, restOfWord.ifEmpty { null })
             } else if (key.startsWith("nprofile", true)) {
-                val pubkeyRelay = Nip19Bech32.uriToRoute(key) ?: return null
+                val pubkeyRelay = Nip19Parser.uriToRoute(key) ?: return null
 
                 return DirtyKeyInfo(pubkeyRelay, pubkeyRelay.additionalChars)
             } else if (key.startsWith("nevent1", true)) {
-                val noteRelayId = Nip19Bech32.uriToRoute(key) ?: return null
+                val noteRelayId = Nip19Parser.uriToRoute(key) ?: return null
 
                 return DirtyKeyInfo(noteRelayId, noteRelayId.additionalChars)
             } else if (key.startsWith("naddr1", true)) {
-                val address = Nip19Bech32.uriToRoute(key) ?: return null
+                val address = Nip19Parser.uriToRoute(key) ?: return null
 
                 return DirtyKeyInfo(
                     address,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt

@@ -20,7 +20,6 @@
  */
 package com.vitorpamplona.amethyst.ui.actions
 
-import android.R.attr.mimeType
 import android.content.Context
 import android.util.Log
 import android.webkit.MimeTypeMap
@@ -56,33 +55,38 @@ import com.vitorpamplona.amethyst.ui.components.Split
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
-import com.vitorpamplona.quartz.encoders.Hex
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.IMetaTag
-import com.vitorpamplona.quartz.encoders.IMetaTagBuilder
-import com.vitorpamplona.quartz.encoders.Nip30CustomEmoji
-import com.vitorpamplona.quartz.encoders.toNpub
-import com.vitorpamplona.quartz.events.AddressableEvent
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.BaseTextNoteEvent
-import com.vitorpamplona.quartz.events.ClassifiedsEvent
-import com.vitorpamplona.quartz.events.CommentEvent
-import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
-import com.vitorpamplona.quartz.events.DraftEvent
-import com.vitorpamplona.quartz.events.EmojiUrl
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.FileStorageEvent
-import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
-import com.vitorpamplona.quartz.events.GitIssueEvent
-import com.vitorpamplona.quartz.events.NIP17Group
-import com.vitorpamplona.quartz.events.Price
-import com.vitorpamplona.quartz.events.PrivateDmEvent
-import com.vitorpamplona.quartz.events.RootScope
-import com.vitorpamplona.quartz.events.TextNoteEvent
-import com.vitorpamplona.quartz.events.TorrentCommentEvent
-import com.vitorpamplona.quartz.events.TorrentEvent
-import com.vitorpamplona.quartz.events.ZapSplitSetup
-import com.vitorpamplona.quartz.events.findURLs
+import com.vitorpamplona.quartz.crypto.Hex
+import com.vitorpamplona.quartz.experimental.nip95.FileStorageEvent
+import com.vitorpamplona.quartz.experimental.nip95.FileStorageHeaderEvent
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.addressables.AddressableEvent
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.geohash.getGeoHash
+import com.vitorpamplona.quartz.nip04Dm.PrivateDmEvent
+import com.vitorpamplona.quartz.nip10Notes.BaseTextNoteEvent
+import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent
+import com.vitorpamplona.quartz.nip10Notes.findURLs
+import com.vitorpamplona.quartz.nip14Subject.subject
+import com.vitorpamplona.quartz.nip17Dm.NIP17Group
+import com.vitorpamplona.quartz.nip19Bech32Entities.toNpub
+import com.vitorpamplona.quartz.nip22Comments.CommentEvent
+import com.vitorpamplona.quartz.nip22Comments.RootScope
+import com.vitorpamplona.quartz.nip30CustomEmoji.CustomEmoji
+import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrl
+import com.vitorpamplona.quartz.nip34Git.GitIssueEvent
+import com.vitorpamplona.quartz.nip35Torrents.TorrentCommentEvent
+import com.vitorpamplona.quartz.nip35Torrents.TorrentEvent
+import com.vitorpamplona.quartz.nip36SensitiveContent.isSensitiveOrNSFW
+import com.vitorpamplona.quartz.nip37Drafts.DraftEvent
+import com.vitorpamplona.quartz.nip57Zaps.ZapSplitSetup
+import com.vitorpamplona.quartz.nip57Zaps.zapSplitSetup
+import com.vitorpamplona.quartz.nip57Zaps.zapraiserAmount
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.nip92IMeta.IMetaTag
+import com.vitorpamplona.quartz.nip92IMeta.IMetaTagBuilder
+import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent
+import com.vitorpamplona.quartz.nip99Classifieds.Price
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
@@ -300,10 +304,10 @@ open class NewPostViewModel : ViewModel() {
             }
 
             fork?.let {
-                message = TextFieldValue(version?.event?.content() ?: it.event?.content() ?: "")
+                message = TextFieldValue(version?.event?.content ?: it.event?.content ?: "")
                 urlPreview = findUrlInMessage()
 
-                it.event?.isSensitive()?.let {
+                it.event?.isSensitiveOrNSFW()?.let {
                     if (it) wantsToMarkAsSensitive = true
                 }
 
@@ -364,7 +368,7 @@ open class NewPostViewModel : ViewModel() {
         canAddZapRaiser = accountViewModel.userProfile().info?.lnAddress() != null
         multiOrchestrator = null
 
-        val localfowardZapTo = draftEvent.tags().filter { it.size > 1 && it[0] == "zap" }
+        val localfowardZapTo = draftEvent.tags.filter { it.size > 1 && it[0] == "zap" }
         forwardZapTo = Split()
         localfowardZapTo.forEach {
             val user = LocalCache.getOrCreateUser(it[1])
@@ -374,15 +378,15 @@ open class NewPostViewModel : ViewModel() {
         forwardZapToEditting = TextFieldValue("")
         wantsForwardZapTo = localfowardZapTo.isNotEmpty()
 
-        wantsToMarkAsSensitive = draftEvent.tags().any { it.size > 1 && it[0] == "content-warning" }
+        wantsToMarkAsSensitive = draftEvent.tags.any { it.size > 1 && it[0] == "content-warning" }
 
         val geohash = draftEvent.getGeoHash()
         wantsToAddGeoHash = geohash != null
         if (geohash != null) {
-            wantsExclusiveGeoPost = draftEvent.kind() == CommentEvent.KIND
+            wantsExclusiveGeoPost = draftEvent.kind == CommentEvent.KIND
         }
 
-        val zapraiser = draftEvent.tags().filter { it.size > 1 && it[0] == "zapraiser" }
+        val zapraiser = draftEvent.tags.filter { it.size > 1 && it[0] == "zapraiser" }
         wantsZapraiser = zapraiser.isNotEmpty()
         zapRaiserAmount = null
         if (wantsZapraiser) {
@@ -390,26 +394,26 @@ open class NewPostViewModel : ViewModel() {
         }
 
         eTags =
-            draftEvent.tags().filter { it.size > 1 && (it[0] == "e" || it[0] == "a") && it.getOrNull(3) != "fork" }.mapNotNull {
+            draftEvent.tags.filter { it.size > 1 && (it[0] == "e" || it[0] == "a") && it.getOrNull(3) != "fork" }.mapNotNull {
                 val note = LocalCache.checkGetOrCreateNote(it[1])
                 note
             }
 
         if (draftEvent !is PrivateDmEvent && draftEvent !is NIP17Group) {
             pTags =
-                draftEvent.tags().filter { it.size > 1 && it[0] == "p" }.map {
+                draftEvent.tags.filter { it.size > 1 && it[0] == "p" }.map {
                     LocalCache.getOrCreateUser(it[1])
                 }
         }
 
-        draftEvent.tags().filter { it.size > 3 && (it[0] == "e" || it[0] == "a") && it.get(3) == "fork" }.forEach {
+        draftEvent.tags.filter { it.size > 3 && (it[0] == "e" || it[0] == "a") && it.get(3) == "fork" }.forEach {
             val note = LocalCache.checkGetOrCreateNote(it[1])
             forkedFromNote = note
         }
 
         originalNote =
             draftEvent
-                .tags()
+                .tags
                 .filter { it.size > 1 && (it[0] == "e" || it[0] == "a") && it.getOrNull(3) == "reply" }
                 .map {
                     LocalCache.checkGetOrCreateNote(it[1])
@@ -418,7 +422,7 @@ open class NewPostViewModel : ViewModel() {
         if (originalNote == null) {
             originalNote =
                 draftEvent
-                    .tags()
+                    .tags
                     .filter { it.size > 1 && (it[0] == "e" || it[0] == "a") && it.getOrNull(3) == "root" }
                     .map {
                         LocalCache.checkGetOrCreateNote(it[1])
@@ -431,14 +435,14 @@ open class NewPostViewModel : ViewModel() {
             wantsForwardZapTo = true
         }
 
-        val polls = draftEvent.tags().filter { it.size > 1 && it[0] == "poll_option" }
+        val polls = draftEvent.tags.filter { it.size > 1 && it[0] == "poll_option" }
         wantsPoll = polls.isNotEmpty()
 
         polls.forEach {
             pollOptions[it[1].toInt()] = it[2]
         }
 
-        val minMax = draftEvent.tags().filter { it.size > 1 && (it[0] == "value_minimum" || it[0] == "value_maximum") }
+        val minMax = draftEvent.tags.filter { it.size > 1 && (it[0] == "value_minimum" || it[0] == "value_maximum") }
         minMax.forEach {
             if (it[0] == "value_maximum") {
                 valueMaximum = it[1].toInt()
@@ -447,12 +451,12 @@ open class NewPostViewModel : ViewModel() {
             }
         }
 
-        wantsProduct = draftEvent.kind() == 30402
+        wantsProduct = draftEvent.kind == 30402
 
         title =
             TextFieldValue(
                 draftEvent
-                    .tags()
+                    .tags
                     .filter { it.size > 1 && it[0] == "title" }
                     .map { it[1] }
                     ?.firstOrNull() ?: "",
@@ -460,7 +464,7 @@ open class NewPostViewModel : ViewModel() {
         price =
             TextFieldValue(
                 draftEvent
-                    .tags()
+                    .tags
                     .filter { it.size > 1 && it[0] == "price" }
                     .map { it[1] }
                     ?.firstOrNull() ?: "",
@@ -468,7 +472,7 @@ open class NewPostViewModel : ViewModel() {
         category =
             TextFieldValue(
                 draftEvent
-                    .tags()
+                    .tags
                     .filter { it.size > 1 && it[0] == "t" }
                     .map { it[1] }
                     ?.firstOrNull() ?: "",
@@ -476,7 +480,7 @@ open class NewPostViewModel : ViewModel() {
         locationText =
             TextFieldValue(
                 draftEvent
-                    .tags()
+                    .tags
                     .filter { it.size > 1 && it[0] == "location" }
                     .map { it[1] }
                     ?.firstOrNull() ?: "",
@@ -484,7 +488,7 @@ open class NewPostViewModel : ViewModel() {
         condition = ClassifiedsEvent.CONDITION.entries.firstOrNull {
             it.value ==
                 draftEvent
-                    .tags()
+                    .tags
                     .filter { it.size > 1 && it[0] == "condition" }
                     .map { it[1] }
                     .firstOrNull()
@@ -502,7 +506,7 @@ open class NewPostViewModel : ViewModel() {
                 toUsers = TextFieldValue("@$recepientNpub")
                 TextFieldValue(draftEvent.cachedContentFor(accountViewModel.account.signer) ?: "")
             } else {
-                TextFieldValue(draftEvent.content())
+                TextFieldValue(draftEvent.content)
             }
 
         requiresNIP17 = draftEvent is NIP17Group
@@ -907,7 +911,7 @@ open class NewPostViewModel : ViewModel() {
         myEmojiSet: List<Account.EmojiMedia>?,
     ): List<EmojiUrl> {
         if (myEmojiSet == null) return emptyList()
-        return Nip30CustomEmoji.findAllEmojiCodes(message).mapNotNull { possibleEmoji ->
+        return CustomEmoji.findAllEmojiCodes(message).mapNotNull { possibleEmoji ->
             myEmojiSet.firstOrNull { it.code == possibleEmoji }?.let { EmojiUrl(it.code, it.url.url) }
         }
     }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt

@@ -35,9 +35,10 @@ import com.vitorpamplona.amethyst.service.uploads.nip96.Nip96Uploader
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerType
 import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMedia
 import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.quartz.events.GitHubIdentity
-import com.vitorpamplona.quartz.events.MastodonIdentity
-import com.vitorpamplona.quartz.events.TwitterIdentity
+import com.vitorpamplona.quartz.nip39ExtIdentities.GitHubIdentity
+import com.vitorpamplona.quartz.nip39ExtIdentities.MastodonIdentity
+import com.vitorpamplona.quartz.nip39ExtIdentities.TwitterIdentity
+import com.vitorpamplona.quartz.nip39ExtIdentities.identityClaims
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlin.coroutines.cancellation.CancellationException

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NotifyRequestDialog.kt

@@ -46,7 +46,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.Size16dp
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
-import com.vitorpamplona.quartz.events.EmptyTagList
+import com.vitorpamplona.quartz.nip02FollowList.EmptyTagList
 
 @Composable
 fun NotifyRequestDialog(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelaySelectionDialog.kt

@@ -56,7 +56,7 @@ import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.FeedPadding
 import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
-import com.vitorpamplona.quartz.encoders.Nip11RelayInformation
+import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/UrlUserTagTransformation.kt

@@ -31,8 +31,8 @@ import androidx.compose.ui.text.input.TransformedText
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextDecoration
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.quartz.encoders.decodePublicKey
-import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.nip01Core.toHexKey
+import com.vitorpamplona.quartz.nip19Bech32Entities.decodePublicKey
 import kotlin.coroutines.cancellation.CancellationException
 
 data class RangesChanges(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/mediaServers/MediaServerEditField.kt

@@ -40,7 +40,7 @@ import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
-import com.vitorpamplona.quartz.encoders.HttpUrlFormatter
+import com.vitorpamplona.quartz.nip96FileStorage.HttpUrlFormatter
 
 @Composable
 fun MediaServerEditField(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfo.kt

@@ -24,7 +24,7 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
 import com.vitorpamplona.ammolite.relays.RelayStat
-import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.nip01Core.HexKey
 
 @Immutable
 data class BasicRelaySetupInfo(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoModel.kt

@@ -25,7 +25,7 @@ import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.Nip11CachedRetriever
 import com.vitorpamplona.ammolite.relays.RelayStats
-import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
+import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListView.kt

@@ -95,7 +95,7 @@ import com.vitorpamplona.ammolite.relays.Constants.activeTypesGlobalChats
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
 import com.vitorpamplona.ammolite.relays.RelayStat
-import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
+import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter
 import kotlinx.coroutines.launch
 
 @Composable

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListViewModel.kt

@@ -30,8 +30,8 @@ import com.vitorpamplona.ammolite.relays.Constants.activeTypesGlobalChats
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
 import com.vitorpamplona.ammolite.relays.RelayStats
-import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
-import com.vitorpamplona.quartz.utils.RelayListRecommendationProcessor
+import com.vitorpamplona.quartz.nip65RelayList.RelayListRecommendationProcessor
+import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Nip65RelayListViewModel.kt

@@ -26,8 +26,8 @@ import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.Nip11CachedRetriever
 import com.vitorpamplona.ammolite.relays.RelayStats
-import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayInformationDialog.kt

@@ -71,8 +71,8 @@ import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.largeRelayIconModifier
 import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
 import com.vitorpamplona.ammolite.relays.RelayStats
-import com.vitorpamplona.quartz.encoders.Nip11RelayInformation
-import com.vitorpamplona.quartz.events.EmptyTagList
+import com.vitorpamplona.quartz.nip02FollowList.EmptyTagList
+import com.vitorpamplona.quartz.nip11RelayInfo.Nip11RelayInformation
 import kotlinx.collections.immutable.toImmutableList
 
 @OptIn(ExperimentalLayoutApi::class)

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayUrlEditField.kt

@@ -41,7 +41,7 @@ import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.ammolite.relays.RelayStat
-import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
+import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter
 
 @Composable
 fun RelayUrlEditField(onNewRelay: (BasicRelaySetupInfo) -> Unit) {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt

@@ -63,35 +63,43 @@ import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.note.LoadChannel
 import com.vitorpamplona.amethyst.ui.note.njumpLink
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.Nip19Bech32
-import com.vitorpamplona.quartz.encoders.Nip30CustomEmoji
-import com.vitorpamplona.quartz.events.ChannelCreateEvent
-import com.vitorpamplona.quartz.events.EmptyTagList
-import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
-import com.vitorpamplona.quartz.events.PrivateDmEvent
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip02FollowList.EmptyTagList
+import com.vitorpamplona.quartz.nip02FollowList.ImmutableListOfLists
+import com.vitorpamplona.quartz.nip04Dm.PrivateDmEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.Nip19Parser
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NAddress
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEmbed
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NProfile
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NPub
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NRelay
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NSec
+import com.vitorpamplona.quartz.nip19Bech32Entities.toNIP19
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelCreateEvent
+import com.vitorpamplona.quartz.nip30CustomEmoji.CustomEmoji
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
 
 @Composable
 fun ClickableRoute(
     word: String,
-    nip19: Nip19Bech32.ParseReturn,
+    nip19: Nip19Parser.ParseReturn,
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {
     when (val entity = nip19.entity) {
-        is Nip19Bech32.NPub -> DisplayUser(entity.hex, nip19.nip19raw, nip19.additionalChars, accountViewModel, nav)
-        is Nip19Bech32.NProfile -> DisplayUser(entity.hex, nip19.nip19raw, nip19.additionalChars, accountViewModel, nav)
-        is Nip19Bech32.Note -> DisplayEvent(entity.hex, null, nip19.nip19raw, nip19.additionalChars, accountViewModel, nav)
-        is Nip19Bech32.NEvent -> DisplayEvent(entity.hex, entity.kind, nip19.nip19raw, nip19.additionalChars, accountViewModel, nav)
-        is Nip19Bech32.NEmbed -> LoadAndDisplayEvent(entity.event, nip19.additionalChars, accountViewModel, nav)
-        is Nip19Bech32.NAddress -> DisplayAddress(entity, nip19.nip19raw, nip19.additionalChars, accountViewModel, nav)
-        is Nip19Bech32.NRelay -> {
+        is NPub -> DisplayUser(entity.hex, nip19.nip19raw, nip19.additionalChars, accountViewModel, nav)
+        is NProfile -> DisplayUser(entity.hex, nip19.nip19raw, nip19.additionalChars, accountViewModel, nav)
+        is com.vitorpamplona.quartz.nip19Bech32Entities.entities.Note -> DisplayEvent(entity.hex, null, nip19.nip19raw, nip19.additionalChars, accountViewModel, nav)
+        is NEvent -> DisplayEvent(entity.hex, entity.kind, nip19.nip19raw, nip19.additionalChars, accountViewModel, nav)
+        is NEmbed -> LoadAndDisplayEvent(entity.event, nip19.additionalChars, accountViewModel, nav)
+        is NAddress -> DisplayAddress(entity, nip19.nip19raw, nip19.additionalChars, accountViewModel, nav)
+        is NRelay -> {
             Text(word)
         }
-        is Nip19Bech32.NSec -> {
+        is NSec -> {
             Text(word)
         }
         else -> {
@@ -230,24 +238,24 @@ private fun DisplayNoteLink(
 
 @Composable
 private fun DisplayAddress(
-    nip19: Nip19Bech32.NAddress,
+    nip19: NAddress,
     originalNip19: String,
     additionalChars: String?,
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {
-    var noteBase by remember(nip19) { mutableStateOf(accountViewModel.getNoteIfExists(nip19.atag)) }
+    var noteBase by remember(nip19) { mutableStateOf(accountViewModel.getNoteIfExists(nip19.aTag())) }
 
     if (noteBase == null) {
-        LaunchedEffect(key1 = nip19.atag) {
-            accountViewModel.checkGetOrCreateAddressableNote(nip19.atag) { noteBase = it }
+        LaunchedEffect(key1 = nip19) {
+            accountViewModel.checkGetOrCreateAddressableNote(nip19.aTag()) { noteBase = it }
         }
     }
 
     noteBase?.let {
         val noteState by it.live().metadata.observeAsState()
 
-        val route = remember(noteState) { "Note/${nip19.atag}" }
+        val route = remember(noteState) { "Note/${nip19.aTag()}" }
         val displayName = remember(noteState) { "@${noteState?.note?.idDisplayNote()}" }
 
         CreateClickableText(
@@ -433,20 +441,20 @@ fun CustomEmojiChecker(
     text: String,
     tags: ImmutableListOfLists<String>?,
     onRegularText: @Composable (String) -> Unit,
-    onEmojiText: @Composable (ImmutableList<Nip30CustomEmoji.Renderable>) -> Unit,
+    onEmojiText: @Composable (ImmutableList<CustomEmoji.Renderable>) -> Unit,
 ) {
     val mayContainEmoji by remember(text, tags) {
-        mutableStateOf(Nip30CustomEmoji.fastMightContainEmoji(text, tags))
+        mutableStateOf(CustomEmoji.fastMightContainEmoji(text, tags))
     }
 
     if (mayContainEmoji) {
         var emojiList by
             remember(text, tags) {
-                mutableStateOf<ImmutableList<Nip30CustomEmoji.Renderable>?>(null)
+                mutableStateOf<ImmutableList<CustomEmoji.Renderable>?>(null)
             }
 
         LaunchedEffect(text, tags) {
-            val newEmojiList = Nip30CustomEmoji.assembleAnnotatedList(text, tags)
+            val newEmojiList = CustomEmoji.assembleAnnotatedList(text, tags)
             if (newEmojiList != null) {
                 emojiList = newEmojiList
             }
@@ -467,20 +475,20 @@ fun CustomEmojiChecker(
     text: String,
     emojis: ImmutableMap<String, String>,
     onRegularText: @Composable (String) -> Unit,
-    onEmojiText: @Composable (ImmutableList<Nip30CustomEmoji.Renderable>) -> Unit,
+    onEmojiText: @Composable (ImmutableList<CustomEmoji.Renderable>) -> Unit,
 ) {
     val mayContainEmoji by remember(text, emojis) {
-        mutableStateOf(Nip30CustomEmoji.fastMightContainEmoji(text, emojis))
+        mutableStateOf(CustomEmoji.fastMightContainEmoji(text, emojis))
     }
 
     if (mayContainEmoji) {
         var emojiList by
             remember(text, emojis) {
-                mutableStateOf<ImmutableList<Nip30CustomEmoji.Renderable>?>(null)
+                mutableStateOf<ImmutableList<CustomEmoji.Renderable>?>(null)
             }
 
         LaunchedEffect(text, emojis) {
-            val newEmojiList = Nip30CustomEmoji.assembleAnnotatedList(text, emojis)
+            val newEmojiList = CustomEmoji.assembleAnnotatedList(text, emojis)
             if (newEmojiList != null) {
                 emojiList = newEmojiList
             }
@@ -667,7 +675,7 @@ fun CreateClickableTextWithEmoji(
 
 @Composable
 fun ClickableInLineIconRenderer(
-    wordsInOrder: ImmutableList<Nip30CustomEmoji.Renderable>,
+    wordsInOrder: ImmutableList<CustomEmoji.Renderable>,
     maxLines: Int = Int.MAX_VALUE,
     style: SpanStyle,
     suffix: String? = null,
@@ -686,7 +694,7 @@ fun ClickableInLineIconRenderer(
     val inlineContent =
         wordsInOrder
             .mapIndexedNotNull { idx, value ->
-                if (value is Nip30CustomEmoji.ImageUrlType) {
+                if (value is CustomEmoji.ImageUrlType) {
                     Pair(
                         "inlineContent$idx",
                         InlineTextContent(
@@ -717,9 +725,9 @@ fun ClickableInLineIconRenderer(
                 withStyle(
                     style,
                 ) {
-                    if (value is Nip30CustomEmoji.TextType) {
+                    if (value is CustomEmoji.TextType) {
                         append(value.text)
-                    } else if (value is Nip30CustomEmoji.ImageUrlType) {
+                    } else if (value is CustomEmoji.ImageUrlType) {
                         appendInlineContent("inlineContent$idx", "[icon]")
                     }
                 }
@@ -751,7 +759,7 @@ fun ClickableInLineIconRenderer(
 
 @Composable
 fun InLineIconRenderer(
-    wordsInOrder: ImmutableList<Nip30CustomEmoji.Renderable>,
+    wordsInOrder: ImmutableList<CustomEmoji.Renderable>,
     style: SpanStyle,
     fontSize: TextUnit = TextUnit.Unspecified,
     maxLines: Int = Int.MAX_VALUE,
@@ -770,7 +778,7 @@ fun InLineIconRenderer(
     val inlineContent =
         wordsInOrder
             .mapIndexedNotNull { idx, value ->
-                if (value is Nip30CustomEmoji.ImageUrlType) {
+                if (value is CustomEmoji.ImageUrlType) {
                     Pair(
                         "inlineContent$idx",
                         InlineTextContent(
@@ -802,9 +810,9 @@ fun InLineIconRenderer(
                     withStyle(
                         style,
                     ) {
-                        if (value is Nip30CustomEmoji.TextType) {
+                        if (value is CustomEmoji.TextType) {
                             append(value.text)
-                        } else if (value is Nip30CustomEmoji.ImageUrlType) {
+                        } else if (value is CustomEmoji.ImageUrlType) {
                             appendInlineContent("inlineContent$idx", "[icon]")
                         }
                     }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableWithdrawal.kt

@@ -39,7 +39,7 @@ import com.vitorpamplona.amethyst.ui.note.ErrorMessageDialog
 import com.vitorpamplona.amethyst.ui.note.payViaIntent
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.quartz.encoders.LnWithdrawalUtil
+import com.vitorpamplona.quartz.lightning.LnWithdrawalUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/DisplayNotifyMessages.kt

@@ -27,7 +27,7 @@ import com.vitorpamplona.amethyst.ui.actions.NotifyRequestDialog
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
+import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter
 
 @Composable
 fun DisplayNotifyMessages(

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt

@@ -51,7 +51,7 @@ import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.ButtonPadding
 import com.vitorpamplona.amethyst.ui.theme.StdTopPadding
 import com.vitorpamplona.amethyst.ui.theme.secondaryButtonBackground
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
+import com.vitorpamplona.quartz.nip02FollowList.ImmutableListOfLists
 
 object ShowFullTextCache {
     val cache = LruCache<String, Boolean>(10)

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt

@@ -96,8 +96,8 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.mockAccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.HalfVertPadding
 import com.vitorpamplona.amethyst.ui.theme.inlinePlaceholder
 import com.vitorpamplona.amethyst.ui.theme.innerPostModifier
-import com.vitorpamplona.quartz.events.EmptyTagList
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
+import com.vitorpamplona.quartz.nip02FollowList.EmptyTagList
+import com.vitorpamplona.quartz.nip02FollowList.ImmutableListOfLists
 
 fun isMarkdown(content: String): Boolean =
     content.startsWith("> ") ||

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SensitivityWarning.kt

@@ -57,7 +57,8 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.ButtonPadding
-import com.vitorpamplona.quartz.events.EventInterface
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip36SensitiveContent.isSensitiveOrNSFW
 
 @Composable
 fun SensitivityWarning(
@@ -70,11 +71,11 @@ fun SensitivityWarning(
 
 @Composable
 fun SensitivityWarning(
-    event: EventInterface,
+    event: Event,
     accountViewModel: AccountViewModel,
     content: @Composable () -> Unit,
 ) {
-    val hasSensitiveContent = remember(event) { event.isSensitive() }
+    val hasSensitiveContent = remember(event) { event.isSensitiveOrNSFW() }
 
     SensitivityWarning(hasSensitiveContent, accountViewModel, content)
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt

@@ -119,7 +119,7 @@ import com.vitorpamplona.amethyst.ui.theme.Size75dp
 import com.vitorpamplona.amethyst.ui.theme.VolumeBottomIconSize
 import com.vitorpamplona.amethyst.ui.theme.imageModifier
 import com.vitorpamplona.amethyst.ui.theme.videoGalleryModifier
-import com.vitorpamplona.quartz.encoders.Dimension
+import com.vitorpamplona.quartz.nip94FileMetadata.Dimension
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt

@@ -94,9 +94,10 @@ import com.vitorpamplona.amethyst.ui.theme.Size75dp
 import com.vitorpamplona.amethyst.ui.theme.hashVerifierMark
 import com.vitorpamplona.amethyst.ui.theme.imageModifier
 import com.vitorpamplona.quartz.crypto.CryptoUtils
-import com.vitorpamplona.quartz.encoders.Dimension
-import com.vitorpamplona.quartz.encoders.Nip19Bech32
-import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.nip01Core.toHexKey
+import com.vitorpamplona.quartz.nip19Bech32Entities.Nip19Parser
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
+import com.vitorpamplona.quartz.nip94FileMetadata.Dimension
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.Dispatchers
@@ -676,7 +677,7 @@ fun ShareImageAction(
                 text = { Text(stringRes(R.string.add_media_to_gallery)) },
                 onClick = {
                     if (videoUri != null) {
-                        val n19 = Nip19Bech32.uriToRoute(postNostrUri)?.entity as? Nip19Bech32.NEvent
+                        val n19 = Nip19Parser.uriToRoute(postNostrUri)?.entity as? NEvent
                         if (n19 != null) {
                             accountViewModel.addMediaToGallery(n19.hex, videoUri, n19.relay[0], blurhash, dim, hash, mimeType) // TODO Whole list or first?
                             accountViewModel.toast(R.string.media_added, R.string.media_added_to_profile_gallery)

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt

@@ -48,9 +48,15 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.LoadedBechLink
 import com.vitorpamplona.amethyst.ui.theme.Font17SP
 import com.vitorpamplona.amethyst.ui.theme.Size17Modifier
-import com.vitorpamplona.quartz.encoders.Nip19Bech32
-import com.vitorpamplona.quartz.events.EmptyTagList
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
+import com.vitorpamplona.quartz.nip02FollowList.EmptyTagList
+import com.vitorpamplona.quartz.nip02FollowList.ImmutableListOfLists
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NAddress
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEmbed
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NEvent
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NProfile
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NPub
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NRelay
+import com.vitorpamplona.quartz.nip19Bech32Entities.entities.NSec
 import kotlinx.coroutines.runBlocking
 
 class MarkdownMediaRenderer(
@@ -164,14 +170,14 @@ class MarkdownMediaRenderer(
             }
         } else if (loadedLink?.nip19 != null) {
             when (val entity = loadedLink.nip19.entity) {
-                is Nip19Bech32.NPub -> renderObservableUser(entity.hex, loadedLink.nip19.nip19raw, richTextStringBuilder)
-                is Nip19Bech32.NProfile -> renderObservableUser(entity.hex, loadedLink.nip19.nip19raw, richTextStringBuilder)
-                is Nip19Bech32.Note -> renderObservableShortNoteUri(loadedLink, uri, richTextStringBuilder)
-                is Nip19Bech32.NEvent -> renderObservableShortNoteUri(loadedLink, uri, richTextStringBuilder)
-                is Nip19Bech32.NEmbed -> renderObservableShortNoteUri(loadedLink, uri, richTextStringBuilder)
-                is Nip19Bech32.NAddress -> renderObservableShortNoteUri(loadedLink, uri, richTextStringBuilder)
-                is Nip19Bech32.NRelay -> renderShortNostrURI(uri, richTextStringBuilder)
-                is Nip19Bech32.NSec -> renderShortNostrURI(uri, richTextStringBuilder)
+                is NPub -> renderObservableUser(entity.hex, loadedLink.nip19.nip19raw, richTextStringBuilder)
+                is NProfile -> renderObservableUser(entity.hex, loadedLink.nip19.nip19raw, richTextStringBuilder)
+                is com.vitorpamplona.quartz.nip19Bech32Entities.entities.Note -> renderObservableShortNoteUri(loadedLink, uri, richTextStringBuilder)
+                is NEvent -> renderObservableShortNoteUri(loadedLink, uri, richTextStringBuilder)
+                is NEmbed -> renderObservableShortNoteUri(loadedLink, uri, richTextStringBuilder)
+                is NAddress -> renderObservableShortNoteUri(loadedLink, uri, richTextStringBuilder)
+                is NRelay -> renderShortNostrURI(uri, richTextStringBuilder)
+                is NSec -> renderShortNostrURI(uri, richTextStringBuilder)
                 else -> renderShortNostrURI(uri, richTextStringBuilder)
             }
         } else {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/RenderContentAsMarkdown.kt

@@ -49,10 +49,10 @@ import com.vitorpamplona.amethyst.ui.theme.MarkdownTextStyle
 import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonRow
 import com.vitorpamplona.amethyst.ui.theme.markdownStyle
 import com.vitorpamplona.amethyst.ui.uriToRoute
-import com.vitorpamplona.quartz.events.EmptyTagList
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
-import com.vitorpamplona.quartz.events.LongTextNoteEvent
-import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.MetadataEvent
+import com.vitorpamplona.quartz.nip02FollowList.EmptyTagList
+import com.vitorpamplona.quartz.nip02FollowList.ImmutableListOfLists
+import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomFeedFilter.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.quartz.events.ChatroomKey
+import com.vitorpamplona.quartz.nip17Dm.ChatroomKey
 
 class ChatroomFeedFilter(
     val withUser: ChatroomKey,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt

@@ -24,9 +24,10 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.actions.relays.updated
-import com.vitorpamplona.quartz.events.ChannelMessageEvent
-import com.vitorpamplona.quartz.events.ChatroomKey
-import com.vitorpamplona.quartz.events.ChatroomKeyable
+import com.vitorpamplona.quartz.nip01Core.events.taggedEvents
+import com.vitorpamplona.quartz.nip17Dm.ChatroomKey
+import com.vitorpamplona.quartz.nip17Dm.ChatroomKeyable
+import com.vitorpamplona.quartz.nip28PublicChat.ChannelMessageEvent
 
 class ChatroomListKnownFeedFilter(
     val account: Account,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt

@@ -23,9 +23,9 @@ package com.vitorpamplona.amethyst.ui.dal
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.actions.relays.updated
-import com.vitorpamplona.quartz.events.ChatroomKey
-import com.vitorpamplona.quartz.events.ChatroomKeyable
-import com.vitorpamplona.quartz.events.PrivateDmEvent
+import com.vitorpamplona.quartz.nip04Dm.PrivateDmEvent
+import com.vitorpamplona.quartz.nip17Dm.ChatroomKey
+import com.vitorpamplona.quartz.nip17Dm.ChatroomKeyable
 
 class ChatroomListNewFeedFilter(
     val account: Account,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/CommunityFeedFilter.kt

@@ -24,8 +24,9 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.addressables.isTaggedAddressableNote
+import com.vitorpamplona.quartz.nip72ModCommunities.CommunityPostApprovalEvent
 
 class CommunityFeedFilter(
     val note: AddressableNote,