0.25.2

Pr/273

.github/workflows/build.yml

@@ -27,6 +27,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
+      - name: Linter (gradle)
+        run: ./gradlew ktlintCheck
+
       - name: Test (gradle)
         run: ./gradlew test --no-daemon
 

.gitignore

@@ -1,5 +1,3 @@
-*.iml
-.gradle
 /local.properties
 /.idea/caches
 /.idea/libraries
@@ -11,9 +9,7 @@
 .DS_Store
 /build
 /captures
-.externalNativeBuild
 .cxx
-local.properties
 
 
 # Built application files
@@ -36,6 +32,7 @@ out/
 # release/
 
 # Gradle files
+.gradle
 .gradle/
 build/
 
@@ -48,25 +45,50 @@ proguard/
 # Log Files
 *.log
 
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
 captures/
+.navigation/
+*.ipr
+*~
+*.swp
 
 # IntelliJ
 *.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-# Android Studio 3 in .gitignore file.
-.idea/caches
-.idea/modules.xml
-# Comment next line if keeping position of elements in Navigation Editor is relevant for you
-.idea/navEditor.xml
+*.iws
+/out/
+deploymentTargetDropdown.xml
+render.experimental.xml
+
+# User-specific configurations
+.idea/**/caches/
+.idea/**/libraries/
+.idea/**/shelf/
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/.name
+.idea/**/compiler.xml
+.idea/**/copyright/profiles_settings.xml
+.idea/**/encodings.xml
+.idea/**/misc.xml
+.idea/**/modules.xml
+.idea/**/scopes/scope_settings.xml
+.idea/**/dictionaries
+.idea/**/vcs.xml
+.idea/**/jsLibraryMappings.xml
+.idea/**/datasources.xml
+.idea/**/dataSources.ids
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/assetWizardSettings.xml
+.idea/**/gradle.xml
+.idea/**/jarRepositories.xml
+.idea/**/navEditor.xml
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.

.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>

.idea/misc.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

README.md

@@ -29,6 +29,9 @@ Amethyst brings the best social network to your Android phone. Just insert your
 - [x] Identity Verification (NIP-05)
 - [x] Long-form Content (NIP-23)
 - [x] Parameterized Replaceable Events (NIP-33)
+- [x] Online Relay Search (NIP-50)
+- [x] Internationalization
+- [x] Badges (NIP-58)
 - [ ] Local Database 
 - [ ] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
 - [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
@@ -38,12 +41,9 @@ Amethyst brings the best social network to your Android phone. Just insert your
 - [ ] Generic Tags (NIP-12)
 - [ ] Proof of Work in the Phone (NIP-13, NIP-20)
 - [ ] Events with a Subject (NIP-14)
-- [ ] Online Relay Search (NIP-50)
 - [ ] Workspaces
 - [ ] Expiration Support (NIP-40)
-- [ ] Internationalization
 - [ ] Infinity Scroll
-- [ ] Badges (NIP-58)
 - [ ] Relay List Metadata (NIP-65)
 - [ ] Signing Requests (NIP-46)
 - [ ] Delegated Event Signing (NIP-26)
@@ -97,6 +97,12 @@ Build the app:
 ./gradlew connectedAndroidTest
 ```
 
+## Linting
+```bash
+./gradlew ktlintCheck
+./gradlew ktlintFormat
+```
+
 ## Installing on device
 ```bash
 ./gradlew installDebug
@@ -121,6 +127,24 @@ openssl base64 < <my-release-key.keystore> | tr -d '\n' | tee some_signing_key.j
 7. Add your CHANGE LOG to the description of the new release
 8. Download the `aab` file and upload it to the` PlayStore.
 
+# Privacy on Relays & nostr
+Your internet protocol (IP) address is exposed to the relays you connect to. If you want to improve your privacy, consider utilizing a service that masks your IP address (e.g. a VPN) from trackers online. 
+
+The relay also learns which public keys you are requesting, meaning your public key will be tied to your IP address.
+
+Relays have all your data in raw text. They know your IP, your name, your location (guessed from IP), your pub key, all your contacts, and other relays, and can read every action you do (post, like, boost, quote, report, etc) with the exception of Private Zaps and Private DMs.
+
+# DM Privacy #
+While the content of direct messages (DMs) is only visible to you, and your DM nostr counterparty, everyone can see that and when you and your counterparty are DM-ing each other.
+
+# Visibility & Permanence of Your Content on nostr
+## Information Visibility ##
+Content that you share can be shared to other relays. 
+Information that you share is publicly visible to anyone reading from relays that have your information. Your information may also be visible to nostr users who do not share relays with you.
+
+## Information Permanence ##
+Information shared on nostr should be assumed permanent for privacy purposes. There is no way to guarantee deleting or editing any content once posted. 
+
 # Contributing
 
 [Issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) are very welcome.

app/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'org.jlleitschuh.gradle.ktlint' version "11.3.1"
 }
 
 android {
@@ -11,8 +12,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 84
-        versionName "0.22.1"
+        versionCode 94
+        versionName "0.25.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -58,14 +59,17 @@ dependencies {
     implementation "androidx.compose.ui:ui:$compose_ui_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
 
+    // Needs this to open gallery / image upload
+    implementation "androidx.fragment:fragment-ktx:$fragment_version"
+
     // Navigation
     implementation("androidx.navigation:navigation-compose:$nav_version")
 
     // Observe Live data as State
-    implementation 'androidx.compose.runtime:runtime-livedata:1.4.0-beta01'
+    implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version"
 
-    implementation 'androidx.compose.material:material:1.4.0-beta02'
-    implementation "androidx.compose.material:material-icons-extended:1.4.0-beta02"
+    implementation "androidx.compose.material:material:$compose_ui_version"
+    implementation "androidx.compose.material:material-icons-extended:$compose_ui_version"
 
     // Lifecycle
     implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
@@ -73,8 +77,8 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
 
-    // Swipe Refresh
-    implementation 'com.google.accompanist:accompanist-swiperefresh:0.29.1-alpha'
+    // Biometrics
+    implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 
     // Bitcoin secp256k1 bindings to Android
     implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.7.1'
@@ -86,15 +90,12 @@ dependencies {
         exclude module: 'guava-testlib'
     }
 
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     // Websockets API
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
 
-    // Json Serialization
+    // Json Serialization TODO: We might need to converge between gson and Jackson (we are usin both)
     implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2'
-
-    // Robohash for Avatars
-    implementation group: 'com.github.vitorpamplona', name: 'android-robohash', version: 'master-SNAPSHOT', ext: 'aar'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
     // link preview
     implementation 'tw.com.oneup.www:Baha-UrlPreview:1.0.1'
@@ -103,7 +104,7 @@ dependencies {
     implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha05'
 
     // view videos
-    implementation 'com.google.android.exoplayer:exoplayer:2.18.3'
+    implementation 'com.google.android.exoplayer:exoplayer:2.18.4'
 
     // Load images from the web.
     implementation "io.coil-kt:coil-compose:2.2.2"
@@ -126,36 +127,31 @@ dependencies {
 
     // For QR generation
     implementation 'com.google.zxing:core:3.5.1'
-    implementation "androidx.camera:camera-camera2:1.2.1"
-    implementation 'androidx.camera:camera-lifecycle:1.2.1'
-    implementation 'androidx.camera:camera-view:1.2.1'
+    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 
     // Markdown
     implementation "com.halilibo.compose-richtext:richtext-ui:0.16.0"
     implementation "com.halilibo.compose-richtext:richtext-ui-material:0.16.0"
     implementation "com.halilibo.compose-richtext:richtext-commonmark:0.16.0"
 
-    // For QR Scanning
-    implementation 'com.google.mlkit:vision-common:17.3.0'
-
-    // Local Barcode Scanning model
-    // The idea is to make it work for degoogled phones
-    implementation 'com.google.mlkit:barcode-scanning:17.0.3'
-
     // Local model for language identification
     implementation 'com.google.mlkit:language-id:17.0.4'
 
     // Google services model the translate text
     implementation 'com.google.mlkit:translate:17.0.1'
 
-
     // Automatic memory leak detection
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
 
     testImplementation 'junit:junit:4.13.2'
+    testImplementation "io.mockk:mockk:1.13.4"
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
     debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
-}
+}
+
+ktlint {
+    disabledRules.set(["no-wildcard-imports"])
+}

app/proguard-rules.pro

@@ -25,7 +25,7 @@
 -keep class fr.acinq.secp256k1.jni.** { *; }
 # For the NostrPostr library
 -keep class nostr.postr.** { *; }
--keep class nostr.postr.events.** { *; }
+-keep class com.vitorpamplona.amethyst.service.model.** { *; }
 # Json parsing
 -keep class com.google.gson.reflect.** { *; }
 -keep class * extends com.google.gson.reflect.TypeToken

app/src/androidTest/java/com/vitorpamplona/amethyst/EventSigCheck.kt

@@ -0,0 +1,23 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.gson.JsonElement
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.relays.Client
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class EventSigCheck {
+
+    val payload1 = "[\"EVENT\",\"40b9\",{\"id\":\"48a72b485d38338627ec9d427583551f9af4f016c739b8ec0d6313540a8b12cf\",\"kind\":1,\"pubkey\":\"3d842afecd5e293f28b6627933704a3fb8ce153aa91d790ab11f6a752d44a42d\",\"created_at\":1677940007,\"content\":\"I got asked about follower count again today. Why does my follower count go down when I delete public relays (in our list) and replace them with filter.nostr.wine? \\n\\nI’ll give you one final explanation to rule them all. First, let’s go over how clients calculate your follower count.\\n\\n1. Your client sends a request to all your connected relays asking for accounts who follow you\\n2. Relays answer back with the events requested\\n3. The client aggregates the event total and displays it\\n\\nEach relay has a set limit on how many stored events it will return per request. For some relays it’s 500, others 1000, some as high as 5000. Let’s say for simplicity that all your public relays use 500 as their limit. If you ask 10 relays for your followers the max possible answer you can get is 5000. That won’t change if you have 20,000 followers or 100,000. You may get back a “different” 5000 each time, but you’ll still cap out at 5000 because that is the most events your client will receive.\u2028\u2028Our limit on filter.nostr.wine is 2000 events. If you replace 10 public relays with only filter.nostr.wine, the MOST followers you will ever get back from our filter relay is 2000. That doesn’t mean you only have 2000 followers or that your reach is reduced in any way.\\n\\nAs long as you are writing to and reading from the same public relays, neither your reach nor any content was lost. That concludes my TED talk. I hope you all have a fantastic day and weekend.\",\"tags\":[],\"sig\":\"dcaf8ab98bb9179017b35bd814092850d1062b26c263dff89fb1ae8c019a324139d1729012d9d05ff0a517f76b1117d869b2cc7d36bea8aa5f4b94c5e2548aa8\"}]"
+
+    @Test
+    fun testUnicode2028and2029ShouldNotBeEscaped() {
+        val msg = Event.gson.fromJson(payload1, JsonElement::class.java).asJsonArray
+        val event = Event.fromJson(msg[2], Client.lenient)
+
+        // Should pass
+        event.checkSignature()
+    }
+}

app/src/androidTest/java/com/vitorpamplona/amethyst/TranslationsTest.kt

@@ -11,68 +11,70 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class TranslationsTest {
 
-  fun translatePT(text: String, translateTo: String): String? {
-    val task = LanguageTranslatorService.autoTranslate(text, emptySet(), translateTo)
-    return Tasks.await(task).result
-  }
+    fun translatePT(text: String, translateTo: String): String? {
+        val task = LanguageTranslatorService.autoTranslate(text, emptySet(), translateTo)
+        return Tasks.await(task).result
+    }
 
-  fun assertTranslate(expected: String, input: String, translateTo: String) {
-    assertEquals(null, expected, translatePT(input, translateTo))
-  }
+    fun assertTranslate(expected: String, input: String, translateTo: String) {
+        assertEquals(null, expected, translatePT(input, translateTo))
+    }
 
-  fun assertTranslateContains(expected: String, input: String, translateTo: String) {
-    val translated = translatePT(input, translateTo)!!
-    assertTrue("'$translated' does not contain '$expected'", translated.contains(expected))
-  }
+    fun assertTranslateContains(expected: String, input: String, translateTo: String) {
+        val translated = translatePT(input, translateTo)!!
+        assertTrue("'$translated' does not contain '$expected'", translated.contains(expected))
+    }
 
-  @Test
-  fun testTranslation() {
-    assertTranslate("Olá mundo", "Hello World", "pt")
-  }
+    @Test
+    fun testTranslation() {
+        assertTranslate("Olá mundo", "Hello World", "pt")
+    }
 
-  @Test
-  fun testTranslationName() {
-    assertTranslate("Olá Vitor, como você está?", "Hello Vitor, how are you doing?", "pt")
-  }
+    @Test
+    fun testTranslationName() {
+        assertTranslate("Olá Vitor, como você está?", "Hello Vitor, how are you doing?", "pt")
+    }
 
-  @Test
-  fun testTranslationTag() {
-    assertTranslate("Você já viu isso, #[0]", "Have you seen this, #[0]", "pt")
-  }
+    @Test
+    fun testTranslationTag() {
+        assertTranslate("Você já viu isso, #[0]", "Have you seen this, #[0]", "pt")
+    }
 
-  @Test
-  fun testTranslationUrl() {
-    assertTranslateContains("https://t.me/mygroup", "Have you seen this https://t.me/mygroup", "pt")
-    assertTranslateContains("http://bananas.com", "Have you seen this http://bananas.com", "pt")
-    assertTranslateContains("http://bananas.com/myimage.jpg", "Have you seen this http://bananas.com/myimage.jpg", "pt")
-    assertTranslateContains("http://bananas.com?search=true&image=myimage.jpg", "Have you seen this http://bananas.com?search=true&image=myimage.jpg", "pt")
-    assertTranslate("https://i.imgur.com/EZ3QPsw.jpg", "https://i.imgur.com/EZ3QPsw.jpg", "pt")
-    assertTranslate("https://HaveYouSeenThis.com", "https://HaveYouSeenThis.com", "pt")
-    assertTranslate("https://haveyouseenthis.com", "https://haveyouseenthis.com", "pt")
-    assertTranslate("https://i.imgur.com/asdEZ3QPsw.jpg", "https://i.imgur.com/asdEZ3QPsw.jpg", "pt")
-    assertTranslateContains("https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg", "Hi there! \n How are you doing? \n https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg", "pt")
-  }
+    @Test
+    fun testTranslationUrl() {
+        assertTranslateContains("https://t.me/mygroup", "Have you seen this https://t.me/mygroup", "pt")
+        assertTranslateContains("http://bananas.com", "Have you seen this http://bananas.com", "pt")
+        assertTranslateContains("http://bananas.com/myimage.jpg", "Have you seen this http://bananas.com/myimage.jpg", "pt")
+        assertTranslateContains("http://bananas.com?search=true&image=myimage.jpg", "Have you seen this http://bananas.com?search=true&image=myimage.jpg", "pt")
+        assertTranslate("https://i.imgur.com/EZ3QPsw.jpg", "https://i.imgur.com/EZ3QPsw.jpg", "pt")
+        assertTranslate("https://HaveYouSeenThis.com", "https://HaveYouSeenThis.com", "pt")
+        assertTranslate("https://haveyouseenthis.com", "https://haveyouseenthis.com", "pt")
+        assertTranslate("https://i.imgur.com/asdEZ3QPsw.jpg", "https://i.imgur.com/asdEZ3QPsw.jpg", "pt")
+        assertTranslateContains("https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg", "Hi there! \n How are you doing? \n https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg", "pt")
+    }
 
-  @Test
-  fun testChineseWithUrlDetector() {
-    assertTranslate("I entered your home page is very carton, perhaps your attention or other data is too much, and the homepage of others is not so carton. From aMethyst client", "我进入你的主页很卡顿，也许是你的关注人数或者其他数据太多了，其他人主页没有这么卡顿。来自amethyst客户端", "en")
-  }
+    @Test
+    fun testChineseWithUrlDetector() {
+        assertTranslate("I entered your home page is very carton, perhaps your attention or other data is too much, and the homepage of others is not so carton. From aMethyst client", "我进入你的主页很卡顿，也许是你的关注人数或者其他数据太多了，其他人主页没有这么卡顿。来自amethyst客户端", "en")
+    }
 
-  @Test
-  fun testTranslationEmail() {
-    assertTranslateContains("vitor@amethyst.social", "Have you seen this vitor@amethyst.social", "pt")
-  }
+    @Test
+    fun testTranslationEmail() {
+        assertTranslateContains("vitor@amethyst.social", "Have you seen this vitor@amethyst.social", "pt")
+    }
 
-  @Test
-  fun testTranslationLnInvoice() {
-    assertTranslateContains(
-      "lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn",
-      "Have you seen this: lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn I think I have to pay", "pt"
-    )
+    @Test
+    fun testTranslationLnInvoice() {
+        assertTranslateContains(
+            "lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn",
+            "Have you seen this: lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn I think I have to pay",
+            "pt"
+        )
 
-    assertTranslateContains(
-      "lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
-      "Test lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v", "pt"
-    )
-  }
-}
+        assertTranslateContains(
+            "lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
+            "Test lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
+            "pt"
+        )
+    }
+}

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

@@ -9,7 +9,7 @@ import com.vitorpamplona.amethyst.model.UserMetadata
 import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.ui.actions.buildAnnotatedStringWithUrlHighlighting
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -19,82 +19,81 @@ import org.junit.runner.RunWith
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 @RunWith(AndroidJUnit4::class)
-class EUrlUserTagTransformationTest {
-  @Test
-  fun useAppContext() {
-    // Context of the app under test.
-    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-    assertEquals("com.vitorpamplona.amethyst", appContext.packageName.removeSuffix(".debug"))
-  }
+class UrlUserTagTransformationTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.vitorpamplona.amethyst", appContext.packageName.removeSuffix(".debug"))
+    }
 
-  @Test
-  fun transformationText() {
-    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
-    user.info = UserMetadata()
-    user.info?.displayName = "Vitor Pamplona"
+    @Test
+    fun transformationText() {
+        val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
+        user.info = UserMetadata()
+        user.info?.displayName = "Vitor Pamplona"
 
-    var transformedText = buildAnnotatedStringWithUrlHighlighting(
-      AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
-      Color.Red
-    )
+        val transformedText = buildAnnotatedStringWithUrlHighlighting(
+            AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
+            Color.Red
+        )
 
-    assertEquals("New Hey @Vitor Pamplona", transformedText.text.text)
+        assertEquals("New Hey @Vitor Pamplona", transformedText.text.text)
 
-    assertEquals(0, transformedText.offsetMapping.originalToTransformed(0)) // Before N
-    assertEquals(4, transformedText.offsetMapping.originalToTransformed(4)) // Before H
-    assertEquals(8, transformedText.offsetMapping.originalToTransformed(8)) // Before @
-    assertEquals(8, transformedText.offsetMapping.originalToTransformed(9)) // Before n
-    assertEquals(8, transformedText.offsetMapping.originalToTransformed(10)) // Before p
-    assertEquals(9, transformedText.offsetMapping.originalToTransformed(11)) // Before u
-    assertEquals(9, transformedText.offsetMapping.originalToTransformed(12)) // Before b
-    assertEquals(9, transformedText.offsetMapping.originalToTransformed(13)) // Before 1
+        assertEquals(0, transformedText.offsetMapping.originalToTransformed(0)) // Before N
+        assertEquals(4, transformedText.offsetMapping.originalToTransformed(4)) // Before H
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(8)) // Before @
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(9)) // Before n
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(10)) // Before p
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(11)) // Before u
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(12)) // Before b
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(13)) // Before 1
 
-    assertEquals(23, transformedText.offsetMapping.originalToTransformed(71))
-    assertEquals(23, transformedText.offsetMapping.originalToTransformed(72))
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(71))
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(72))
 
+        assertEquals(0, transformedText.offsetMapping.transformedToOriginal(0))
+        assertEquals(4, transformedText.offsetMapping.transformedToOriginal(4))
+        assertEquals(8, transformedText.offsetMapping.transformedToOriginal(8))
+        assertEquals(12, transformedText.offsetMapping.transformedToOriginal(9))
 
-    assertEquals(0, transformedText.offsetMapping.transformedToOriginal(0))
-    assertEquals(4, transformedText.offsetMapping.transformedToOriginal(4))
-    assertEquals(8, transformedText.offsetMapping.transformedToOriginal(8))
-    assertEquals(12, transformedText.offsetMapping.transformedToOriginal(9))
+        assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23))
+        assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24))
+    }
 
-    assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23))
-    assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24))
-  }
+    @Test
+    fun transformationTextTwoKeys() {
+        val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
+        user.info = UserMetadata()
+        user.info?.displayName = "Vitor Pamplona"
 
-  @Test
-  fun transformationTextTwoKeys() {
-    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
-    user.info = UserMetadata()
-    user.info?.displayName = "Vitor Pamplona"
+        val transformedText = buildAnnotatedStringWithUrlHighlighting(
+            AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z and @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
+            Color.Red
+        )
 
-    var transformedText = buildAnnotatedStringWithUrlHighlighting(
-      AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z and @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
-      Color.Red
-    )
+        assertEquals("New Hey @Vitor Pamplona and @Vitor Pamplona", transformedText.text.text)
 
-    assertEquals("New Hey @Vitor Pamplona and @Vitor Pamplona", transformedText.text.text)
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(11))
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(12))
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(13))
 
-    assertEquals(9, transformedText.offsetMapping.originalToTransformed(11))
-    assertEquals(9, transformedText.offsetMapping.originalToTransformed(12))
-    assertEquals(9, transformedText.offsetMapping.originalToTransformed(13))
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(70)) // Before 5
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(71)) // Before z
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(72)) // Before <space>
+        assertEquals(24, transformedText.offsetMapping.originalToTransformed(73)) // Before a
+        assertEquals(25, transformedText.offsetMapping.originalToTransformed(74)) // Before n
+        assertEquals(26, transformedText.offsetMapping.originalToTransformed(75)) // Before d
+        assertEquals(27, transformedText.offsetMapping.originalToTransformed(76)) // Before <space>
+        assertEquals(28, transformedText.offsetMapping.originalToTransformed(77)) // Before @
+        assertEquals(28, transformedText.offsetMapping.originalToTransformed(78)) // Before n
 
-    assertEquals(23, transformedText.offsetMapping.originalToTransformed(70)) // Before 5
-    assertEquals(23, transformedText.offsetMapping.originalToTransformed(71)) // Before z
-    assertEquals(23, transformedText.offsetMapping.originalToTransformed(72)) // Before <space>
-    assertEquals(24, transformedText.offsetMapping.originalToTransformed(73)) // Before a
-    assertEquals(25, transformedText.offsetMapping.originalToTransformed(74)) // Before n
-    assertEquals(26, transformedText.offsetMapping.originalToTransformed(75)) // Before d
-    assertEquals(27, transformedText.offsetMapping.originalToTransformed(76)) // Before <space>
-    assertEquals(28, transformedText.offsetMapping.originalToTransformed(77)) // Before @
-    assertEquals(28, transformedText.offsetMapping.originalToTransformed(78)) // Before n
-
-    assertEquals(68, transformedText.offsetMapping.transformedToOriginal(22)) // Before a
-    assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23)) // Before <space>
-    assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24)) // Before a
-    assertEquals(74, transformedText.offsetMapping.transformedToOriginal(25)) // Before n
-    assertEquals(75, transformedText.offsetMapping.transformedToOriginal(26)) // Before d
-    assertEquals(76, transformedText.offsetMapping.transformedToOriginal(27)) // Before <space>
-    assertEquals(77, transformedText.offsetMapping.transformedToOriginal(28)) // Before @
-  }
-}
+        assertEquals(68, transformedText.offsetMapping.transformedToOriginal(22)) // Before a
+        assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23)) // Before <space>
+        assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24)) // Before a
+        assertEquals(74, transformedText.offsetMapping.transformedToOriginal(25)) // Before n
+        assertEquals(75, transformedText.offsetMapping.transformedToOriginal(26)) // Before d
+        assertEquals(76, transformedText.offsetMapping.transformedToOriginal(27)) // Before <space>
+        assertEquals(77, transformedText.offsetMapping.transformedToOriginal(28)) // Before @
+    }
+}

app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
 
     <application
         android:allowBackup="false"
+        android:name=".Amethyst"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@drawable/amethyst"
@@ -22,6 +23,7 @@
         android:theme="@style/Theme.Amethyst"
         android:largeHeap="true"
         android:usesCleartextTraffic="true"
+        android:hardwareAccelerated="true"
         tools:targetApi="33">
         <activity
             android:name=".ui.MainActivity"
@@ -45,6 +47,11 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
+
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="fullSensor"
+            tools:replace="screenOrientation" />
     </application>
 
 </manifest>

app/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt

@@ -0,0 +1,15 @@
+package com.vitorpamplona.amethyst
+
+import android.app.Application
+
+class Amethyst : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        instance = this
+    }
+
+    companion object {
+        lateinit var instance: Amethyst
+            private set
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/EncryptedStorage.kt

@@ -1,22 +1,29 @@
 package com.vitorpamplona.amethyst
 
-import android.content.Context
 import androidx.security.crypto.EncryptedSharedPreferences
-import androidx.security.crypto.MasterKeys
+import androidx.security.crypto.MasterKey
 
-class EncryptedStorage {
+object EncryptedStorage {
+    private const val PREFERENCES_NAME = "secret_keeper"
 
-  fun preferences(context: Context): EncryptedSharedPreferences {
-    val secretKey: String = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC);
-    val preferencesName = "secret_keeper"
+    fun prefsFileName(npub: String? = null): String {
+        return if (npub == null) PREFERENCES_NAME else "${PREFERENCES_NAME}_$npub"
+    }
 
-    return EncryptedSharedPreferences.create(
-      preferencesName,
-      secretKey,
-      context,
-      EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-      EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-    ) as EncryptedSharedPreferences
-  }
+    fun preferences(npub: String? = null): EncryptedSharedPreferences {
+        val context = Amethyst.instance
+        val masterKey: MasterKey = MasterKey.Builder(context, MasterKey.DEFAULT_MASTER_KEY_ALIAS)
+            .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+            .build()
 
-}
+        val preferencesName = prefsFileName(npub)
+
+        return EncryptedSharedPreferences.create(
+            context,
+            preferencesName,
+            masterKey,
+            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+        ) as EncryptedSharedPreferences
+    }
+}

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

@@ -1,117 +1,302 @@
 package com.vitorpamplona.amethyst
 
+import android.annotation.SuppressLint
 import android.content.Context
+import android.content.SharedPreferences
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.model.toByteArray
-import java.util.Locale
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.Event.Companion.getRefinedEvent
+import fr.acinq.secp256k1.Hex
 import nostr.postr.Persona
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.Event
-import nostr.postr.events.Event.Companion.getRefinedEvent
 import nostr.postr.toHex
+import nostr.postr.toNpub
+import java.io.File
+import java.util.Locale
 
-class LocalPreferences(context: Context) {
-  val encryptedPreferences = EncryptedStorage().preferences(context)
-  val gson = GsonBuilder().create()
+// Release mode (!BuildConfig.DEBUG) always uses encrypted preferences
+// To use plaintext SharedPreferences for debugging, set this to true
+// It will only apply in Debug builds
+private const val DEBUG_PLAINTEXT_PREFERENCES = false
+private const val DEBUG_PREFERENCES_NAME = "debug_prefs"
 
-  fun clearEncryptedStorage() {
-    encryptedPreferences.edit().apply {
-      remove("nostr_privkey")
-      remove("nostr_pubkey")
-      remove("following_channels")
-      remove("hidden_users")
-      remove("relays")
-      remove("dontTranslateFrom")
-      remove("languagePreferences")
-      remove("translateTo")
-      remove("zapAmounts")
-      remove("latestContactList")
-    }.apply()
-  }
+data class AccountInfo(
+    val npub: String,
+    val hasPrivKey: Boolean,
+    val current: Boolean,
+    val displayName: String?,
+    val profilePicture: String?
+)
 
-  fun saveToEncryptedStorage(account: Account) {
-    encryptedPreferences.edit().apply {
-      account.loggedIn.privKey?.let { putString("nostr_privkey", it.toHex()) }
-      account.loggedIn.pubKey.let { putString("nostr_pubkey", it.toHex()) }
-      account.followingChannels.let { putStringSet("following_channels", it) }
-      account.hiddenUsers.let { putStringSet("hidden_users", it) }
-      account.localRelays.let { putString("relays", gson.toJson(it)) }
-      account.dontTranslateFrom.let { putStringSet("dontTranslateFrom", it) }
-      account.languagePreferences.let { putString("languagePreferences", gson.toJson(it)) }
-      account.translateTo.let { putString("translateTo", it) }
-      account.zapAmountChoices.let { putString("zapAmounts", gson.toJson(it)) }
-      account.backupContactList.let { putString("latestContactList", Event.gson.toJson(it)) }
-    }.apply()
-  }
+private object PrefKeys {
+    const val CURRENT_ACCOUNT = "currently_logged_in_account"
+    const val SAVED_ACCOUNTS = "all_saved_accounts"
+    const val NOSTR_PRIVKEY = "nostr_privkey"
+    const val NOSTR_PUBKEY = "nostr_pubkey"
+    const val DISPLAY_NAME = "display_name"
+    const val PROFILE_PICTURE_URL = "profile_picture"
+    const val FOLLOWING_CHANNELS = "following_channels"
+    const val HIDDEN_USERS = "hidden_users"
+    const val RELAYS = "relays"
+    const val DONT_TRANSLATE_FROM = "dontTranslateFrom"
+    const val LANGUAGE_PREFS = "languagePreferences"
+    const val TRANSLATE_TO = "translateTo"
+    const val ZAP_AMOUNTS = "zapAmounts"
+    const val LATEST_CONTACT_LIST = "latestContactList"
+    const val HIDE_DELETE_REQUEST_INFO = "hideDeleteRequestInfo"
+    val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
+}
 
-  fun loadFromEncryptedStorage(): Account? {
-    encryptedPreferences.apply {
-      val privKey = getString("nostr_privkey", null)
-      val pubKey = getString("nostr_pubkey", null)
-      val followingChannels = getStringSet("following_channels", null) ?: setOf()
-      val hiddenUsers = getStringSet("hidden_users", emptySet()) ?: setOf()
-      val localRelays = gson.fromJson(
-        getString("relays", "[]"),
-        object : TypeToken<Set<RelaySetupInfo>>() {}.type
-      ) ?: setOf<RelaySetupInfo>()
+private val gson = GsonBuilder().create()
 
-      val dontTranslateFrom = getStringSet("dontTranslateFrom", null) ?: setOf()
-      val translateTo = getString("translateTo", null) ?: Locale.getDefault().language
+object LocalPreferences {
+    private const val comma = ","
 
-      val zapAmountChoices = gson.fromJson(
-        getString("zapAmounts", "[]"),
-        object : TypeToken<List<Long>>() {}.type
-      ) ?: listOf(500L, 1000L, 5000L)
-
-      val latestContactList = try {
-        getString("latestContactList", null)?.let {
-          Event.gson.fromJson(it, Event::class.java).getRefinedEvent(true) as ContactListEvent
+    private var currentAccount: String?
+        get() = encryptedPreferences().getString(PrefKeys.CURRENT_ACCOUNT, null)
+        set(npub) {
+            val prefs = encryptedPreferences()
+            prefs.edit().apply {
+                putString(PrefKeys.CURRENT_ACCOUNT, npub)
+            }.apply()
         }
-      } catch (e: Throwable) {
-        e.printStackTrace()
-        null
-      }
 
-      val languagePreferences = try {
-        getString("languagePreferences", null)?.let {
-          gson.fromJson(it, object : TypeToken<Map<String, String>>() {}.type) as Map<String, String>
-        } ?: mapOf<String,String>()
-      } catch (e: Throwable) {
-        e.printStackTrace()
-        mapOf<String,String>()
-      }
+    private val savedAccounts: List<String>
+        get() = encryptedPreferences()
+            .getString(PrefKeys.SAVED_ACCOUNTS, null)?.split(comma) ?: listOf()
 
-      if (pubKey != null) {
-        return Account(
-          Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()),
-          followingChannels,
-          hiddenUsers,
-          localRelays,
-          dontTranslateFrom,
-          languagePreferences,
-          translateTo,
-          zapAmountChoices,
-          latestContactList
+    private val prefsDirPath: String
+        get() = "${Amethyst.instance.filesDir.parent}/shared_prefs/"
+
+    private fun addAccount(npub: String) {
+        val accounts = savedAccounts.toMutableList()
+        if (npub !in accounts) {
+            accounts.add(npub)
+        }
+        val prefs = encryptedPreferences()
+        prefs.edit().apply {
+            putString(PrefKeys.SAVED_ACCOUNTS, accounts.joinToString(comma).ifBlank { null })
+        }.apply()
+    }
+
+    private fun setCurrentAccount(account: Account) {
+        val npub = account.userProfile().pubkeyNpub()
+        currentAccount = npub
+        addAccount(npub)
+    }
+
+    fun switchToAccount(npub: String) {
+        currentAccount = npub
+    }
+
+    /**
+     * Removes the account from the app level shared preferences
+     */
+    private fun removeAccount(npub: String) {
+        val accounts = savedAccounts.toMutableList()
+        if (accounts.remove(npub)) {
+            val prefs = encryptedPreferences()
+            prefs.edit().apply {
+                putString(PrefKeys.SAVED_ACCOUNTS, accounts.joinToString(comma).ifBlank { null })
+            }.apply()
+        }
+    }
+
+    /**
+     * Deletes the npub-specific shared preference file
+     */
+    private fun deleteUserPreferenceFile(npub: String) {
+        val prefsDir = File(prefsDirPath)
+        prefsDir.list()?.forEach {
+            if (it.contains(npub)) {
+                File(prefsDir, it).delete()
+            }
+        }
+    }
+
+    private fun encryptedPreferences(npub: String? = null): SharedPreferences {
+        return if (BuildConfig.DEBUG && DEBUG_PLAINTEXT_PREFERENCES) {
+            val preferenceFile = if (npub == null) DEBUG_PREFERENCES_NAME else "${DEBUG_PREFERENCES_NAME}_$npub"
+            Amethyst.instance.getSharedPreferences(preferenceFile, Context.MODE_PRIVATE)
+        } else {
+            return EncryptedStorage.preferences(npub)
+        }
+    }
+
+    /**
+     * Clears the preferences for a given npub, deletes the preferences xml file,
+     * and switches the user to the first account in the list if it exists
+     *
+     * We need to use `commit()` to write changes to disk and release the file
+     * lock so that it can be deleted. If we use `apply()` there is a race
+     * condition and the file will probably not be deleted
+     */
+    @SuppressLint("ApplySharedPref")
+    fun updatePrefsForLogout(npub: String) {
+        val userPrefs = encryptedPreferences(npub)
+        userPrefs.edit().clear().commit()
+        removeAccount(npub)
+        deleteUserPreferenceFile(npub)
+
+        if (savedAccounts.isEmpty()) {
+            val appPrefs = encryptedPreferences()
+            appPrefs.edit().clear().apply()
+        } else if (currentAccount == npub) {
+            currentAccount = savedAccounts.elementAt(0)
+        }
+    }
+
+    fun updatePrefsForLogin(account: Account) {
+        setCurrentAccount(account)
+        saveToEncryptedStorage(account)
+    }
+
+    fun allSavedAccounts(): List<AccountInfo> {
+        return savedAccounts.map { npub ->
+            val prefs = encryptedPreferences(npub)
+            val hasPrivKey = prefs.getString(PrefKeys.NOSTR_PRIVKEY, null) != null
+
+            AccountInfo(
+                npub = npub,
+                hasPrivKey = hasPrivKey,
+                current = npub == currentAccount,
+                displayName = prefs.getString(PrefKeys.DISPLAY_NAME, null),
+                profilePicture = prefs.getString(PrefKeys.PROFILE_PICTURE_URL, null)
+            )
+        }
+    }
+
+    fun saveToEncryptedStorage(account: Account) {
+        val prefs = encryptedPreferences(account.userProfile().pubkeyNpub())
+        prefs.edit().apply {
+            account.loggedIn.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHex()) }
+            account.loggedIn.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHex()) }
+            putStringSet(PrefKeys.FOLLOWING_CHANNELS, account.followingChannels)
+            putStringSet(PrefKeys.HIDDEN_USERS, account.hiddenUsers)
+            putString(PrefKeys.RELAYS, gson.toJson(account.localRelays))
+            putStringSet(PrefKeys.DONT_TRANSLATE_FROM, account.dontTranslateFrom)
+            putString(PrefKeys.LANGUAGE_PREFS, gson.toJson(account.languagePreferences))
+            putString(PrefKeys.TRANSLATE_TO, account.translateTo)
+            putString(PrefKeys.ZAP_AMOUNTS, gson.toJson(account.zapAmountChoices))
+            putString(PrefKeys.LATEST_CONTACT_LIST, Event.gson.toJson(account.backupContactList))
+            putBoolean(PrefKeys.HIDE_DELETE_REQUEST_INFO, account.hideDeleteRequestInfo)
+            putString(PrefKeys.DISPLAY_NAME, account.userProfile().toBestDisplayName())
+            putString(PrefKeys.PROFILE_PICTURE_URL, account.userProfile().profilePicture())
+        }.apply()
+    }
+
+    fun loadFromEncryptedStorage(): Account? {
+        encryptedPreferences(currentAccount).apply {
+            val pubKey = getString(PrefKeys.NOSTR_PUBKEY, null) ?: return null
+            val privKey = getString(PrefKeys.NOSTR_PRIVKEY, null)
+            val followingChannels = getStringSet(PrefKeys.FOLLOWING_CHANNELS, null) ?: setOf()
+            val hiddenUsers = getStringSet(PrefKeys.HIDDEN_USERS, emptySet()) ?: setOf()
+            val localRelays = gson.fromJson(
+                getString(PrefKeys.RELAYS, "[]"),
+                object : TypeToken<Set<RelaySetupInfo>>() {}.type
+            ) ?: setOf<RelaySetupInfo>()
+
+            val dontTranslateFrom = getStringSet(PrefKeys.DONT_TRANSLATE_FROM, null) ?: setOf()
+            val translateTo = getString(PrefKeys.TRANSLATE_TO, null) ?: Locale.getDefault().language
+
+            val zapAmountChoices = gson.fromJson(
+                getString(PrefKeys.ZAP_AMOUNTS, "[]"),
+                object : TypeToken<List<Long>>() {}.type
+            ) ?: listOf(500L, 1000L, 5000L)
+
+            val latestContactList = try {
+                getString(PrefKeys.LATEST_CONTACT_LIST, null)?.let {
+                    Event.gson.fromJson(it, Event::class.java)
+                        .getRefinedEvent(true) as ContactListEvent
+                }
+            } catch (e: Throwable) {
+                e.printStackTrace()
+                null
+            }
+
+            val languagePreferences = try {
+                getString(PrefKeys.LANGUAGE_PREFS, null)?.let {
+                    gson.fromJson(
+                        it,
+                        object : TypeToken<Map<String, String>>() {}.type
+                    ) as Map<String, String>
+                } ?: mapOf()
+            } catch (e: Throwable) {
+                e.printStackTrace()
+                mapOf()
+            }
+
+            val hideDeleteRequestInfo = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_INFO, false)
+
+            return Account(
+                Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()),
+                followingChannels,
+                hiddenUsers,
+                localRelays,
+                dontTranslateFrom,
+                languagePreferences,
+                translateTo,
+                zapAmountChoices,
+                hideDeleteRequestInfo,
+                latestContactList
+            )
+        }
+    }
+
+    fun saveLastRead(route: String, timestampInSecs: Long) {
+        encryptedPreferences(currentAccount).edit().apply {
+            putLong(PrefKeys.LAST_READ(route), timestampInSecs)
+        }.apply()
+    }
+
+    fun loadLastRead(route: String): Long {
+        encryptedPreferences(currentAccount).run {
+            return getLong(PrefKeys.LAST_READ(route), 0)
+        }
+    }
+
+    fun migrateSingleUserPrefs() {
+        if (currentAccount != null) return
+
+        val pubkey = encryptedPreferences().getString(PrefKeys.NOSTR_PUBKEY, null) ?: return
+        val npub = Hex.decode(pubkey).toNpub()
+
+        val stringPrefs = listOf(
+            PrefKeys.NOSTR_PRIVKEY,
+            PrefKeys.NOSTR_PUBKEY,
+            PrefKeys.RELAYS,
+            PrefKeys.LANGUAGE_PREFS,
+            PrefKeys.TRANSLATE_TO,
+            PrefKeys.ZAP_AMOUNTS,
+            PrefKeys.LATEST_CONTACT_LIST
         )
-      } else {
-        return null
-      }
+
+        val stringSetPrefs = listOf(
+            PrefKeys.FOLLOWING_CHANNELS,
+            PrefKeys.HIDDEN_USERS,
+            PrefKeys.DONT_TRANSLATE_FROM
+        )
+
+        encryptedPreferences().apply {
+            val appPrefs = this
+            encryptedPreferences(npub).edit().apply {
+                val userPrefs = this
+
+                stringPrefs.forEach { userPrefs.putString(it, appPrefs.getString(it, null)) }
+                stringSetPrefs.forEach { userPrefs.putStringSet(it, appPrefs.getStringSet(it, null)) }
+                userPrefs.putBoolean(
+                    PrefKeys.HIDE_DELETE_REQUEST_INFO,
+                    appPrefs.getBoolean(PrefKeys.HIDE_DELETE_REQUEST_INFO, false)
+                )
+            }.apply()
+        }
+
+        encryptedPreferences().edit().clear().apply()
+        addAccount(npub)
+        currentAccount = npub
     }
-  }
-
-  fun saveLastRead(route: String, timestampInSecs: Long) {
-    encryptedPreferences.edit().apply {
-      putLong("last_read_route_${route}", timestampInSecs)
-    }.apply()
-  }
-
-  fun loadLastRead(route: String): Long {
-    encryptedPreferences.run {
-      return getLong("last_read_route_${route}", 0)
-    }
-  }
-
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/NotificationCache.kt

@@ -1,8 +1,6 @@
 package com.vitorpamplona.amethyst
 
-import android.content.Context
 import androidx.lifecycle.LiveData
-import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -10,60 +8,61 @@ import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.util.concurrent.atomic.AtomicBoolean
 
 object NotificationCache {
-  val lastReadByRoute = mutableMapOf<String, Long>()
+    val lastReadByRoute = mutableMapOf<String, Long>()
 
-  fun markAsRead(route: String, timestampInSecs: Long, context: Context) {
-    val lastTime = lastReadByRoute[route]
-    if (lastTime == null || timestampInSecs > lastTime) {
-      lastReadByRoute.put(route, timestampInSecs)
+    fun markAsRead(route: String, timestampInSecs: Long) {
+        val lastTime = lastReadByRoute[route]
+        if (lastTime == null || timestampInSecs > lastTime) {
+            lastReadByRoute.put(route, timestampInSecs)
 
-      val scope = CoroutineScope(Job() + Dispatchers.IO)
-      scope.launch {
-        LocalPreferences(context).saveLastRead(route, timestampInSecs)
-        live.invalidateData()
-      }
-    }
-  }
-
-  fun load(route: String, context: Context): Long {
-    var lastTime = lastReadByRoute[route]
-    if (lastTime == null) {
-      lastTime = LocalPreferences(context).loadLastRead(route)
-      lastReadByRoute[route] = lastTime
-    }
-    return lastTime
-  }
-
-  // Observers line up here.
-  val live: NotificationLiveData = NotificationLiveData(this)
-}
-
-class NotificationLiveData(val cache: NotificationCache): LiveData<NotificationState>(NotificationState(cache)) {
-  // Refreshes observers in batches.
-  var handlerWaiting = AtomicBoolean()
-
-  fun invalidateData() {
-    if (!hasActiveObservers()) return
-    if (handlerWaiting.getAndSet(true)) return
-
-    val scope = CoroutineScope(Job() + Dispatchers.Main)
-    scope.launch {
-      try {
-        delay(100)
-        refresh()
-      } finally {
-        withContext(NonCancellable) {
-          handlerWaiting.set(false)
+            val scope = CoroutineScope(Job() + Dispatchers.IO)
+            scope.launch {
+                LocalPreferences.saveLastRead(route, timestampInSecs)
+                live.invalidateData()
+            }
         }
-      }
     }
-  }
 
-  fun refresh() {
-    postValue(NotificationState(cache))
-  }
+    fun load(route: String): Long {
+        var lastTime = lastReadByRoute[route]
+        if (lastTime == null) {
+            lastTime = LocalPreferences.loadLastRead(route)
+            lastReadByRoute[route] = lastTime
+        }
+        return lastTime
+    }
+
+    // Observers line up here.
+    val live: NotificationLiveData = NotificationLiveData(this)
 }
 
-class NotificationState(val cache: NotificationCache)
+class NotificationLiveData(val cache: NotificationCache) : LiveData<NotificationState>(NotificationState(cache)) {
+    // Refreshes observers in batches.
+    var handlerWaiting = AtomicBoolean()
+
+    fun invalidateData() {
+        if (!hasActiveObservers()) return
+        if (handlerWaiting.getAndSet(true)) return
+
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            try {
+                delay(100)
+                refresh()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
+        }
+    }
+
+    fun refresh() {
+        postValue(NotificationState(cache))
+    }
+}
+
+class NotificationState(val cache: NotificationCache)

app/src/main/java/com/vitorpamplona/amethyst/RoboHashCache.kt

@@ -1,169 +0,0 @@
-package com.vitorpamplona.amethyst
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.util.LruCache
-import androidx.compose.ui.graphics.ImageBitmap
-import androidx.compose.ui.graphics.asImageBitmap
-import java.util.UUID
-import name.neuhalfen.projects.android.robohash.buckets.VariableSizeHashing
-import name.neuhalfen.projects.android.robohash.handle.Handle
-import name.neuhalfen.projects.android.robohash.handle.HandleFactory
-import name.neuhalfen.projects.android.robohash.paths.Configuration
-import name.neuhalfen.projects.android.robohash.repository.ImageRepository
-
-object RoboHashCache {
-
-  lateinit var robots: MyRoboHash
-
-  lateinit var defaultAvatar: ImageBitmap
-
-  @Synchronized
-  fun get(context: Context, hash: String): ImageBitmap {
-    if (!this::robots.isInitialized) {
-      robots = MyRoboHash(context)
-
-      defaultAvatar = robots.imageForHandle(robots.calculateHandleFromUUID(UUID.nameUUIDFromBytes("aaaa".toByteArray()))).asImageBitmap()
-    }
-
-    return defaultAvatar
-  }
-
-}
-
-
-/**
- * Recreates RoboHash to use a custom configuration
- */
-class MyRoboHash(context: Context) {
-  private val configuration: Configuration = ModifiedSet1Configuration()
-  private val repository: ImageRepository
-  private val hashing = VariableSizeHashing(configuration.bucketSizes)
-
-  // Optional
-  private var memoryCache: LruCache<String, Bitmap>? = null
-
-  init {
-    repository = ImageRepository(context.assets)
-  }
-
-  fun useCache(memoryCache: LruCache<String, Bitmap>?) {
-    this.memoryCache = memoryCache
-  }
-
-  fun calculateHandleFromUUID(uuid: UUID?): Handle {
-    val data = hashing.createBuckets(uuid)
-    return handleFactory.calculateHandle(data)
-  }
-
-  fun imageForHandle(handle: Handle): Bitmap {
-    if (null != memoryCache) {
-      val cached = memoryCache!![handle.toString()]
-      if (null != cached) return cached
-    }
-    val bucketValues = handle.bucketValues()
-    val paths = configuration.convertToFacetParts(bucketValues)
-    val sampleSize = 1
-    val buffer = repository.createBuffer(configuration.width(), configuration.height())
-    val target = buffer.copy(Bitmap.Config.ARGB_8888, true)
-    val merged = Canvas(target)
-    val paint = Paint(0)
-
-    // The first image is not added as copy form the buffer
-    for (i in paths.indices) {
-      merged.drawBitmap(repository.getInto(buffer, paths[i], sampleSize), 0f, 0f, paint)
-    }
-    repository.returnBuffer(buffer)
-    if (null != memoryCache) {
-      memoryCache!!.put(handle.toString(), target)
-    }
-    return target
-  }
-
-  companion object {
-    private val handleFactory = HandleFactory()
-  }
-}
-
-/**
- * Custom configuration to avoid the use of String.format in the GeneratePath
- * This uses the default location and ends up encoding number in the local language
- */
-class ModifiedSet1Configuration : Configuration {
-  override fun convertToFacetParts(bucketValues: ByteArray): Array<String> {
-    require(bucketValues.size == BUCKET_COUNT)
-    val color = INT_TO_COLOR[bucketValues[BUCKET_COLOR].toInt()]
-    val paths = mutableListOf<String>()
-
-    // e.g.
-    //   blue face  #2
-    //   blue nose  #7
-    //   blue
-    val firstFacetBucket = BUCKET_COLOR + 1
-    for (facet in 0 until FACET_COUNT) {
-      val bucketValue = bucketValues[firstFacetBucket + facet].toInt()
-      paths.add(generatePath(FACET_PATH_TEMPLATES[facet], color, bucketValue))
-    }
-    return paths.toTypedArray()
-  }
-
-  private fun generatePath(facetPathTemplate: String, color: String, bucketValue: Int): String {
-    // TODO: Make more efficient
-    return facetPathTemplate.replace("#ROOT#", ROOT).replace("#COLOR#".toRegex(), color)
-      .replace("#ITEM#".toRegex(), (bucketValue + 1).toString().padStart(2, '0'))
-  }
-
-  override fun getBucketSizes(): ByteArray {
-    return BUCKET_SIZES
-  }
-
-  override fun width(): Int {
-    return 300
-  }
-
-  override fun height(): Int {
-    return 300
-  }
-
-  companion object {
-    private const val ROOT = "sets/set1"
-    private const val BUCKET_COLOR = 0
-    private const val COLOR_COUNT = 10
-    private const val BODY_COUNT = 10
-    private const val FACE_COUNT = 10
-    private const val MOUTH_COUNT = 10
-    private const val EYES_COUNT = 10
-    private const val ACCESSORY_COUNT = 10
-    private const val BUCKET_COUNT = 6
-    private const val FACET_COUNT = 5
-    private val BUCKET_SIZES = byteArrayOf(
-      COLOR_COUNT.toByte(),
-      BODY_COUNT.toByte(),
-      FACE_COUNT.toByte(),
-      MOUTH_COUNT.toByte(),
-      EYES_COUNT.toByte(),
-      ACCESSORY_COUNT.toByte()
-    )
-    private val INT_TO_COLOR = arrayOf(
-      "blue",
-      "brown",
-      "green",
-      "grey",
-      "orange",
-      "pink",
-      "purple",
-      "red",
-      "white",
-      "yellow"
-    )
-    private val FACET_PATH_TEMPLATES = arrayOf(
-      "#ROOT#/#COLOR#/01Body/#COLOR#_body-#ITEM#.png",
-      "#ROOT#/#COLOR#/02Face/#COLOR#_face-#ITEM#.png",
-      "#ROOT#/#COLOR#/Mouth/#COLOR#_mouth-#ITEM#.png",
-      "#ROOT#/#COLOR#/Eyes/#COLOR#_eyes-#ITEM#.png",
-      "#ROOT#/#COLOR#/Accessory/#COLOR#_accessory-#ITEM#.png"
-    )
-  }
-}

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

@@ -16,64 +16,62 @@ import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Constants
 
 object ServiceManager {
-  private var account: Account? = null
+    private var account: Account? = null
 
-  fun start(account: Account) {
-    this.account = account
-    start()
-  }
-
-  fun start() {
-    val myAccount = account
-
-    if (myAccount != null) {
-      Client.connect(myAccount.activeRelays() ?: myAccount.convertLocalRelays())
-
-      // start services
-      NostrAccountDataSource.account = myAccount
-      NostrHomeDataSource.account = myAccount
-      NostrChatroomListDataSource.account = myAccount
-
-      // Notification Elements
-      NostrAccountDataSource.start()
-      NostrHomeDataSource.start()
-      NostrChatroomListDataSource.start()
-
-      // More Info Data Sources
-      NostrSingleEventDataSource.start()
-      NostrSingleChannelDataSource.start()
-      NostrSingleUserDataSource.start()
-    } else {
-      // if not logged in yet, start a basic service wit default relays
-      Client.connect(Constants.convertDefaultRelays())
+    fun start(account: Account) {
+        this.account = account
+        start()
     }
-  }
 
-  fun pause() {
-    NostrAccountDataSource.stop()
-    NostrHomeDataSource.stop()
-    NostrChannelDataSource.stop()
-    NostrChatroomListDataSource.stop()
-    NostrUserProfileDataSource.stop()
+    fun start() {
+        val myAccount = account
 
-    NostrGlobalDataSource.stop()
-    NostrSingleChannelDataSource.stop()
-    NostrSingleEventDataSource.stop()
-    NostrSingleUserDataSource.stop()
-    NostrThreadDataSource.stop()
-    NostrUserProfileDataSource.stop()
+        if (myAccount != null) {
+            Client.connect(myAccount.activeRelays() ?: myAccount.convertLocalRelays())
 
-    Client.disconnect()
-  }
+            // start services
+            NostrAccountDataSource.account = myAccount
+            NostrHomeDataSource.account = myAccount
+            NostrChatroomListDataSource.account = myAccount
 
-  fun cleanUp() {
-    LocalCache.cleanObservers()
+            // Notification Elements
+            NostrAccountDataSource.start()
+            NostrHomeDataSource.start()
+            NostrChatroomListDataSource.start()
 
-    account?.let {
-      LocalCache.pruneOldAndHiddenMessages(it)
-      LocalCache.pruneHiddenMessages(it)
-      //LocalCache.pruneNonFollows(it)
+            // More Info Data Sources
+            NostrSingleEventDataSource.start()
+            NostrSingleChannelDataSource.start()
+            NostrSingleUserDataSource.start()
+        } else {
+            // if not logged in yet, start a basic service wit default relays
+            Client.connect(Constants.convertDefaultRelays())
+        }
     }
-  }
 
-}
+    fun pause() {
+        NostrAccountDataSource.stop()
+        NostrHomeDataSource.stop()
+        NostrChannelDataSource.stop()
+        NostrChatroomListDataSource.stop()
+
+        NostrGlobalDataSource.stop()
+        NostrSingleChannelDataSource.stop()
+        NostrSingleEventDataSource.stop()
+        NostrSingleUserDataSource.stop()
+        NostrThreadDataSource.stop()
+        NostrUserProfileDataSource.stop()
+
+        Client.disconnect()
+    }
+
+    fun cleanUp() {
+        LocalCache.cleanObservers()
+
+        account?.let {
+            LocalCache.pruneOldAndHiddenMessages(it)
+            LocalCache.pruneHiddenMessages(it)
+            // LocalCache.pruneNonFollows(it)
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/VideoCache.kt

@@ -9,33 +9,33 @@ import com.google.android.exoplayer2.upstream.cache.SimpleCache
 
 object VideoCache {
 
-  var exoPlayerCacheSize: Long = 90 * 1024 * 1024 // 90MB
+    var exoPlayerCacheSize: Long = 90 * 1024 * 1024 // 90MB
 
-  var leastRecentlyUsedCacheEvictor = LeastRecentlyUsedCacheEvictor(exoPlayerCacheSize)
+    var leastRecentlyUsedCacheEvictor = LeastRecentlyUsedCacheEvictor(exoPlayerCacheSize)
 
-  lateinit var exoDatabaseProvider: StandaloneDatabaseProvider
-  lateinit var simpleCache: SimpleCache
+    lateinit var exoDatabaseProvider: StandaloneDatabaseProvider
+    lateinit var simpleCache: SimpleCache
 
-  lateinit var cacheDataSourceFactory: CacheDataSource.Factory
+    lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
-  fun get(context: Context): CacheDataSource.Factory {
-    if (!this::simpleCache.isInitialized) {
-      exoDatabaseProvider = StandaloneDatabaseProvider(context)
+    fun get(context: Context): CacheDataSource.Factory {
+        if (!this::simpleCache.isInitialized) {
+            exoDatabaseProvider = StandaloneDatabaseProvider(context)
 
-      simpleCache = SimpleCache(
-        context.cacheDir,
-        leastRecentlyUsedCacheEvictor,
-        exoDatabaseProvider
-      )
+            simpleCache = SimpleCache(
+                context.cacheDir,
+                leastRecentlyUsedCacheEvictor,
+                exoDatabaseProvider
+            )
 
-      cacheDataSourceFactory = CacheDataSource.Factory()
-        .setCache(simpleCache)
-        .setUpstreamDataSourceFactory(
-          DefaultHttpDataSource.Factory().setAllowCrossProtocolRedirects(true)
-        )
-        .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+            cacheDataSourceFactory = CacheDataSource.Factory()
+                .setCache(simpleCache)
+                .setUpstreamDataSourceFactory(
+                    DefaultHttpDataSource.Factory().setAllowCrossProtocolRedirects(true)
+                )
+                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+        }
+
+        return cacheDataSourceFactory
     }
-
-    return cacheDataSourceFactory
-  }
-}
+}

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

@@ -3,7 +3,7 @@ package com.vitorpamplona.amethyst.model
 import android.util.Log
 import android.util.LruCache
 import androidx.lifecycle.LiveData
-import java.util.concurrent.atomic.AtomicBoolean
+import com.vitorpamplona.amethyst.service.model.Event
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -11,84 +11,77 @@ import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import nostr.postr.events.Event
-import nostr.postr.toHex
+import java.util.concurrent.atomic.AtomicBoolean
 
 data class Spammer(val pubkeyHex: HexKey, var duplicatedMessages: Set<HexKey>)
 
 class AntiSpamFilter {
-  val recentMessages = LruCache<Int, String>(1000)
-  val spamMessages = LruCache<Int, Spammer>(1000)
+    val recentMessages = LruCache<Int, String>(1000)
+    val spamMessages = LruCache<Int, Spammer>(1000)
 
-  @Synchronized
-  fun isSpam(event: Event): Boolean {
-    val idHex = event.id.toHexKey()
+    @Synchronized
+    fun isSpam(event: Event): Boolean {
+        val idHex = event.id
 
-    // if already processed, ok
-    if (LocalCache.notes[idHex] != null) return false
+        // if short message, ok
+        if (event.content.length < 50) return false
 
-    // if short message, ok
-    if (event.content.length < 50) return false
+        // double list strategy:
+        // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
 
-    // double list strategy:
-    // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
+        // Considers tags so that same replies to different people don't count.
+        val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
 
-    // Considers tags so that same replies to different people don't count.
-    val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
+        if ((recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null) {
+            Log.w("Potential SPAM Message", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${event.content.replace("\n", " | ")}")
 
-    if ((recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null) {
-      Log.w("Potential SPAM Message", "${event.id.toHex()} ${recentMessages[hash]} ${spamMessages[hash] != null} ${event.content.replace("\n", " | ")}")
+            // Log down offenders
+            if (spamMessages.get(hash) == null) {
+                spamMessages.put(hash, Spammer(event.pubKey, setOf(recentMessages[hash], event.id)))
+                liveSpam.invalidateData()
+            } else {
+                val spammer = spamMessages.get(hash)
+                spammer.duplicatedMessages = spammer.duplicatedMessages + event.id
 
-      // Log down offenders
-      if (spamMessages.get(hash) == null) {
-        spamMessages.put(hash, Spammer(event.pubKey.toHexKey(), setOf(recentMessages[hash], event.id.toHex())))
-        liveSpam.invalidateData()
-      } else {
-        val spammer = spamMessages.get(hash)
-        spammer.duplicatedMessages = spammer.duplicatedMessages + event.id.toHex()
+                liveSpam.invalidateData()
+            }
 
-        liveSpam.invalidateData()
-      }
-
-      return true
-    }
-
-    recentMessages.put(hash, idHex)
-
-    return false
-  }
-
-  val liveSpam: AntiSpamLiveData = AntiSpamLiveData(this)
-}
-
-
-class AntiSpamLiveData(val cache: AntiSpamFilter): LiveData<AntiSpamState>(AntiSpamState(cache)) {
-
-  // Refreshes observers in batches.
-  var handlerWaiting = AtomicBoolean()
-
-  fun invalidateData() {
-    if (!hasActiveObservers()) return
-    if (handlerWaiting.getAndSet(true)) return
-
-    val scope = CoroutineScope(Job() + Dispatchers.Main)
-    scope.launch {
-      try {
-        delay(100)
-        refresh()
-      } finally {
-        withContext(NonCancellable) {
-          handlerWaiting.set(false)
+            return true
         }
-      }
-    }
-  }
 
-  private fun refresh() {
-    postValue(AntiSpamState(cache))
-  }
+        recentMessages.put(hash, idHex)
+
+        return false
+    }
+
+    val liveSpam: AntiSpamLiveData = AntiSpamLiveData(this)
 }
 
-class AntiSpamState(val cache: AntiSpamFilter) {
+class AntiSpamLiveData(val cache: AntiSpamFilter) : LiveData<AntiSpamState>(AntiSpamState(cache)) {
 
-}
+    // Refreshes observers in batches.
+    var handlerWaiting = AtomicBoolean()
+
+    fun invalidateData() {
+        if (!hasActiveObservers()) return
+        if (handlerWaiting.getAndSet(true)) return
+
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            try {
+                delay(100)
+                refresh()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
+        }
+    }
+
+    private fun refresh() {
+        postValue(AntiSpamState(cache))
+    }
+}
+
+class AntiSpamState(val cache: AntiSpamFilter)

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

@@ -11,7 +11,7 @@ class Channel(val idHex: String) {
     var creator: User? = null
     var info = ChannelCreateEvent.ChannelData(null, null, null)
 
-    var updatedMetadataAt: Long = 0;
+    var updatedMetadataAt: Long = 0
 
     val notes = ConcurrentHashMap<HexKey, Note>()
 
@@ -66,8 +66,7 @@ class Channel(val idHex: String) {
     }
 }
 
-
-class ChannelLiveData(val channel: Channel): LiveData<ChannelState>(ChannelState(channel)) {
+class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelState(channel)) {
     fun refresh() {
         postValue(ChannelState(channel))
     }

app/src/main/java/com/vitorpamplona/amethyst/model/Hex.kt

@@ -1,11 +1,13 @@
 package com.vitorpamplona.amethyst.model
 
+import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
 import nostr.postr.Bech32
 import nostr.postr.Persona
 import nostr.postr.bechToBytes
 import nostr.postr.toHex
+import nostr.postr.toNpub
 
 /** Makes the distinction between String and Hex **/
 typealias HexKey = String
@@ -14,70 +16,87 @@ typealias NPubKey = String
 typealias NoteId = String
 
 fun NPubKey.toDisplayKey(): String {
-  return this.toShortenHex()
+    return this.toShortenHex()
 }
 
 fun NoteId.toDisplayId(): String {
-  return this.toShortenHex()
+    return this.toShortenHex()
 }
 
 fun ByteArray.toNote() = Bech32.encodeBytes(hrp = "note", this, Bech32.Encoding.Bech32)
 
 fun ByteArray.toHexKey(): HexKey {
-  return toHex()
+    return toHex()
 }
 
 fun HexKey.toByteArray(): ByteArray {
-  return Hex.decode(this)
+    return Hex.decode(this)
 }
 
 fun HexKey.toDisplayHexKey(): String {
-  return this.toShortenHex()
+    return this.toShortenHex()
 }
 
 fun decodePublicKey(key: String): ByteArray {
-  return if (key.startsWith("nsec")) {
-    Persona(privKey = key.bechToBytes()).pubKey
-  } else if (key.startsWith("npub")) {
-    key.bechToBytes()
-  } else if (key.startsWith("note")) {
-    key.bechToBytes()
-  } else { //if (pattern.matcher(key).matches()) {
-  //} else {
-    Hex.decode(key)
-  }
+    return if (key.startsWith("nsec")) {
+        Persona(privKey = key.bechToBytes()).pubKey
+    } else if (key.startsWith("npub")) {
+        key.bechToBytes()
+    } else if (key.startsWith("note")) {
+        key.bechToBytes()
+    } else { // if (pattern.matcher(key).matches()) {
+        // } else {
+        Hex.decode(key)
+    }
 }
 
-data class DirtyKeyInfo(val type: String, val keyHex: String, val restOfWord: String)
+data class DirtyKeyInfo(val key: Nip19.Return, val restOfWord: String)
 
 fun parseDirtyWordForKey(mightBeAKey: String): DirtyKeyInfo? {
-  var key = mightBeAKey
-  if (key.startsWith("nostr:", true)) {
-    key = key.substring("nostr:".length)
-  }
-
-  key = key.removePrefix("@")
-
-  if (key.length < 63)
-    return null
-
-  try {
-
-    val keyB32 = key.substring(0, 63)
-    val restOfWord = key.substring(63)
-
-    if (key.startsWith("nsec1", true)) {
-      return DirtyKeyInfo("npub", Persona(privKey = keyB32.bechToBytes()).pubKey.toHexKey(), restOfWord)
-    } else if (key.startsWith("npub1", true)) {
-      return DirtyKeyInfo("npub", keyB32.bechToBytes().toHexKey(), restOfWord)
-    } else if (key.startsWith("note1", true)) {
-      return DirtyKeyInfo("note", keyB32.bechToBytes().toHexKey(), restOfWord)
+    var key = mightBeAKey
+    if (key.startsWith("nostr:", true)) {
+        key = key.substring("nostr:".length)
     }
 
+    key = key.removePrefix("@")
 
-  } catch (e: Exception) {
-    e.printStackTrace()
-  }
+    if (key.length < 63) {
+        return null
+    }
 
-  return null
-}
+    try {
+        val keyB32 = key.substring(0, 63)
+        val restOfWord = key.substring(63)
+
+        if (key.startsWith("nsec1", true)) {
+            // Converts to npub
+            val pubkey = Nip19.uriToRoute(Persona(privKey = keyB32.bechToBytes()).pubKey.toNpub()) ?: return null
+
+            return DirtyKeyInfo(pubkey, restOfWord)
+        } else if (key.startsWith("npub1", true)) {
+            val pubkey = Nip19.uriToRoute(keyB32) ?: return null
+
+            return DirtyKeyInfo(pubkey, restOfWord)
+        } else if (key.startsWith("note1", true)) {
+            val noteId = Nip19.uriToRoute(keyB32) ?: return null
+
+            return DirtyKeyInfo(noteId, restOfWord)
+        } else if (key.startsWith("nprofile", true)) {
+            val pubkeyRelay = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
+
+            return DirtyKeyInfo(pubkeyRelay, restOfWord)
+        } else if (key.startsWith("nevent", true)) {
+            val noteRelayId = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
+
+            return DirtyKeyInfo(noteRelayId, restOfWord)
+        } else if (key.startsWith("naddr1", true)) {
+            val address = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
+
+            return DirtyKeyInfo(address, "") // no way to know when they address ends and dirt begins
+        }
+    } catch (e: Exception) {
+        e.printStackTrace()
+    }
+
+    return null
+}

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

@@ -2,24 +2,10 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
-import com.vitorpamplona.amethyst.service.model.ATag
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
-import java.math.BigDecimal
-import java.time.Instant
-import java.time.ZoneId
-import java.time.format.DateTimeFormatter
-import java.util.Date
-import java.util.concurrent.atomic.AtomicBoolean
-import java.util.regex.Pattern
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -27,22 +13,27 @@ import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import nostr.postr.events.Event
+import java.math.BigDecimal
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.util.Date
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.regex.Pattern
 
 val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
 
-
-class AddressableNote(val address: ATag): Note(address.toNAddr()) {
+class AddressableNote(val address: ATag) : Note(address.toTag()) {
     override fun idNote() = address.toNAddr()
     override fun idDisplayNote() = idNote().toShortenHex()
     override fun address() = address
-    override fun createdAt() = (event as? LongTextNoteEvent)?.publishedAt() ?: event?.createdAt
+    override fun createdAt() = (event as? LongTextNoteEvent)?.publishedAt() ?: event?.createdAt()
 }
 
 open class Note(val idHex: String) {
     // These fields are only available after the Text Note event is received.
     // They are immutable after that.
-    var event: Event? = null
+    var event: EventInterface? = null
     var author: User? = null
     var mentions: List<User>? = null
     var replyTo: List<Note>? = null
@@ -70,16 +61,16 @@ open class Note(val idHex: String) {
 
     fun channel(): Channel? {
         val channelHex =
-            (event as? ChannelMessageEvent)?.channel() ?:
-            (event as? ChannelMetadataEvent)?.channel() ?:
-            (event as? ChannelCreateEvent)?.let { it.id.toHexKey() }
+            (event as? ChannelMessageEvent)?.channel()
+                ?: (event as? ChannelMetadataEvent)?.channel()
+                ?: (event as? ChannelCreateEvent)?.let { it.id }
 
         return channelHex?.let { LocalCache.checkGetOrCreateChannel(it) }
     }
 
     open fun address() = (event as? LongTextNoteEvent)?.address()
 
-    open fun createdAt() = event?.createdAt
+    open fun createdAt() = event?.createdAt()
 
     fun loadEvent(event: Event, author: User, mentions: List<User>, replyTo: List<Note>) {
         this.event = event
@@ -145,7 +136,7 @@ open class Note(val idHex: String) {
     fun removeReport(deleteNote: Note) {
         val author = deleteNote.author ?: return
 
-        if (author in reports.keys && reports[author]?.contains(deleteNote) == true ) {
+        if (author in reports.keys && reports[author]?.contains(deleteNote) == true) {
             reports[author]?.let {
                 reports = reports + Pair(author, it.minus(deleteNote))
                 liveSet?.reports?.invalidateData()
@@ -164,7 +155,6 @@ open class Note(val idHex: String) {
         }
     }
 
-
     fun addBoost(note: Note) {
         if (note !in boosts) {
             boosts = boosts + note
@@ -229,6 +219,10 @@ open class Note(val idHex: String) {
         return reports.keys.filter { it in users }
     }
 
+    fun countReportAuthorsBy(users: Set<User>): Int {
+        return reports.keys.count { it in users }
+    }
+
     fun reportsBy(users: Set<User>): List<Note> {
         return reportAuthorsBy(users).mapNotNull {
             reports[it]
@@ -244,36 +238,52 @@ open class Note(val idHex: String) {
     }
 
     fun hasAnyReports(): Boolean {
-        val dayAgo = Date().time / 1000 - 24*60*60
+        val dayAgo = Date().time / 1000 - 24 * 60 * 60
         return reports.isNotEmpty() ||
-          (author?.reports?.values?.filter {
-              it.firstOrNull { ( it.createdAt() ?: 0 ) > dayAgo } != null
-          }?.isNotEmpty() ?: false)
+            (
+                author?.reports?.values?.filter {
+                    it.firstOrNull { (it.createdAt() ?: 0) > dayAgo } != null
+                }?.isNotEmpty() ?: false
+                )
+    }
+
+    fun directlyCiteUsersHex(): Set<HexKey> {
+        val matcher = tagSearch.matcher(event?.content() ?: "")
+        val returningList = mutableSetOf<String>()
+        while (matcher.find()) {
+            try {
+                val tag = matcher.group(1)?.let { event?.tags()?.get(it.toInt()) }
+                if (tag != null && tag[0] == "p") {
+                    returningList.add(tag[1])
+                }
+            } catch (e: Exception) {
+            }
+        }
+        return returningList
     }
 
     fun directlyCiteUsers(): Set<User> {
-        val matcher = tagSearch.matcher(event?.content ?: "")
+        val matcher = tagSearch.matcher(event?.content() ?: "")
         val returningList = mutableSetOf<User>()
         while (matcher.find()) {
             try {
-                val tag = matcher.group(1)?.let { event?.tags?.get(it.toInt()) }
+                val tag = matcher.group(1)?.let { event?.tags()?.get(it.toInt()) }
                 if (tag != null && tag[0] == "p") {
                     LocalCache.checkGetOrCreateUser(tag[1])?.let {
                         returningList.add(it)
                     }
                 }
             } catch (e: Exception) {
-
             }
         }
         return returningList
     }
 
     fun directlyCites(userProfile: User): Boolean {
-        return author == userProfile
-          || (userProfile in directlyCiteUsers())
-          || (event is ReactionEvent && replyTo?.lastOrNull()?.directlyCites(userProfile) == true)
-          || (event is RepostEvent && replyTo?.lastOrNull()?.directlyCites(userProfile) == true)
+        return author == userProfile ||
+            (userProfile in directlyCiteUsers()) ||
+            (event is ReactionEvent && replyTo?.lastOrNull()?.directlyCites(userProfile) == true) ||
+            (event is RepostEvent && replyTo?.lastOrNull()?.directlyCites(userProfile) == true)
     }
 
     fun isNewThread(): Boolean {
@@ -289,12 +299,12 @@ open class Note(val idHex: String) {
     }
 
     fun reactedBy(loggedIn: User, content: String): List<Note> {
-        return reactions.filter { it.author == loggedIn && it.event?.content == content }
+        return reactions.filter { it.author == loggedIn && it.event?.content() == content }
     }
 
     fun hasBoostedInTheLast5Minutes(loggedIn: User): Boolean {
         val currentTime = Date().time / 1000
-        return boosts.firstOrNull { it.author == loggedIn && (it.createdAt() ?: 0) > currentTime - (60 * 5)} != null // 5 minute protection
+        return boosts.firstOrNull { it.author == loggedIn && (it.createdAt() ?: 0) > currentTime - (60 * 5) } != null // 5 minute protection
     }
 
     fun boostedBy(loggedIn: User): List<Note> {
@@ -317,7 +327,6 @@ open class Note(val idHex: String) {
     }
 }
 
-
 class NoteLiveSet(u: Note) {
     // Observers line up here.
     val metadata: NoteLiveData = NoteLiveData(u)
@@ -330,17 +339,17 @@ class NoteLiveSet(u: Note) {
     val zaps: NoteLiveData = NoteLiveData(u)
 
     fun isInUse(): Boolean {
-        return metadata.hasObservers()
-          || reactions.hasObservers()
-          || boosts.hasObservers()
-          || replies.hasObservers()
-          || reports.hasObservers()
-          || relays.hasObservers()
-          || zaps.hasObservers()
+        return metadata.hasObservers() ||
+            reactions.hasObservers() ||
+            boosts.hasObservers() ||
+            replies.hasObservers() ||
+            reports.hasObservers() ||
+            relays.hasObservers() ||
+            zaps.hasObservers()
     }
 }
 
-class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
+class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
     var handlerWaiting = AtomicBoolean()
 
@@ -361,7 +370,7 @@ class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
         }
     }
 
-    fun refresh() {
+    private fun refresh() {
         postValue(NoteState(note))
     }
 
@@ -372,7 +381,6 @@ class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
         } else {
             NostrSingleEventDataSource.add(note)
         }
-
     }
 
     override fun onInactive() {

app/src/main/java/com/vitorpamplona/amethyst/model/RelaySetupInfo.kt

@@ -11,4 +11,4 @@ data class RelaySetupInfo(
     val uploadCount: Int = 0,
     val spamCount: Int = 0,
     val feedTypes: Set<FeedType>
-)
+)

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

@@ -6,71 +6,72 @@ import kotlin.time.measureTimedValue
 
 class ThreadAssembler {
 
-  fun searchRoot(note: Note, testedNotes: MutableSet<Note> = mutableSetOf()): Note? {
-    if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
+    fun searchRoot(note: Note, testedNotes: MutableSet<Note> = mutableSetOf()): Note? {
+        if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
 
-    testedNotes.add(note)
+        testedNotes.add(note)
 
-    val markedAsRoot = note.event?.tags?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1)
-    if (markedAsRoot != null) return LocalCache.checkGetOrCreateNote(markedAsRoot)
+        val markedAsRoot = note.event?.tags()?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1)
+        if (markedAsRoot != null) return LocalCache.checkGetOrCreateNote(markedAsRoot)
 
-    val hasNoReplyTo = note.replyTo?.firstOrNull { it.replyTo?.isEmpty() == true }
-    if (hasNoReplyTo != null) return hasNoReplyTo
+        val hasNoReplyTo = note.replyTo?.firstOrNull { it.replyTo?.isEmpty() == true }
+        if (hasNoReplyTo != null) return hasNoReplyTo
 
-    // recursive
-    val roots = note.replyTo?.map {
-      if (it !in testedNotes)
-        searchRoot(it, testedNotes)
-      else
-        null
-    }?.filterNotNull()
+        // recursive
+        val roots = note.replyTo?.map {
+            if (it !in testedNotes) {
+                searchRoot(it, testedNotes)
+            } else {
+                null
+            }
+        }?.filterNotNull()
 
-    if (roots != null && roots.isNotEmpty()) {
-      return roots[0]
+        if (roots != null && roots.isNotEmpty()) {
+            return roots[0]
+        }
+
+        return null
     }
 
-    return null
-  }
+    @OptIn(ExperimentalTime::class)
+    fun findThreadFor(noteId: String): Set<Note> {
+        val (result, elapsed) = measureTimedValue {
+            val note = if (noteId.contains(":")) {
+                val aTag = ATag.parse(noteId, null)
+                if (aTag != null) {
+                    LocalCache.getOrCreateAddressableNote(aTag)
+                } else {
+                    return emptySet()
+                }
+            } else {
+                LocalCache.getOrCreateNote(noteId)
+            }
 
-  @OptIn(ExperimentalTime::class)
-  fun findThreadFor(noteId: String): Set<Note> {
-    val (result, elapsed) = measureTimedValue {
-      val note = if (noteId.startsWith("naddr")) {
-        val aTag = ATag.parse(noteId)
-        if (aTag != null)
-          LocalCache.getOrCreateAddressableNote(aTag)
-        else
-          return emptySet()
-      } else {
-        LocalCache.getOrCreateNote(noteId)
-      }
+            if (note.event != null) {
+                val thread = mutableSetOf<Note>()
 
+                val threadRoot = searchRoot(note, thread) ?: note
 
-      if (note.event != null) {
-        val thread = mutableSetOf<Note>()
+                loadDown(threadRoot, thread)
 
-        val threadRoot = searchRoot(note, thread) ?: note
+                thread.toSet()
+            } else {
+                setOf(note)
+            }
+        }
 
-        loadDown(threadRoot, thread)
+        println("Model Refresh: Thread loaded in $elapsed")
 
-        thread.toSet()
-      } else {
-        setOf(note)
-      }
+        return result
     }
 
-    println("Model Refresh: Thread loaded in ${elapsed}")
+    fun loadDown(note: Note, thread: MutableSet<Note>) {
+        if (note !in thread) {
+            thread.add(note)
 
-    return result
-  }
-
-  fun loadDown(note: Note, thread: MutableSet<Note>) {
-    if (note !in thread) {
-      thread.add(note)
-
-      note.replies.forEach {
-        loadDown(it, thread)
-      }
+            note.replies.forEach {
+                loadDown(it, thread)
+            }
+        }
     }
-  }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt

@@ -13,60 +13,63 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 
 object UrlCachedPreviewer {
-  var cache = mapOf<String, UrlInfoItem>()
-    private set
-  var failures = mapOf<String, Throwable>()
-    private set
+    var cache = mapOf<String, UrlInfoItem>()
+        private set
+    var failures = mapOf<String, Throwable>()
+        private set
 
-  fun previewInfo(url: String, callback: IUrlPreviewCallback? = null) {
-    cache[url]?.let {
-      callback?.onComplete(it)
-      return
-    }
-
-    failures[url]?.let {
-      callback?.onFailed(it)
-      return
-    }
-
-    val scope = CoroutineScope(Job() + Dispatchers.IO)
-    scope.launch {
-      BahaUrlPreview(url, object : IUrlPreviewCallback {
-        override fun onComplete(urlInfo: UrlInfoItem) {
-          cache = cache + Pair(url, urlInfo)
-          callback?.onComplete(urlInfo)
+    fun previewInfo(url: String, callback: IUrlPreviewCallback? = null) {
+        cache[url]?.let {
+            callback?.onComplete(it)
+            return
         }
 
-        override fun onFailed(throwable: Throwable) {
-          failures = failures + Pair(url, throwable)
-          callback?.onFailed(throwable)
+        failures[url]?.let {
+            callback?.onFailed(it)
+            return
         }
-      }).fetchUrlPreview()
-    }
-  }
 
-  fun findUrlsInMessage(message: String): List<String> {
-    return message.split('\n').map { paragraph ->
-      paragraph.split(' ').filter { word: String ->
-        isValidURL(word) || noProtocolUrlValidator.matcher(word).matches()
-      }
-    }.flatten()
-  }
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            BahaUrlPreview(
+                url,
+                object : IUrlPreviewCallback {
+                    override fun onComplete(urlInfo: UrlInfoItem) {
+                        cache = cache + Pair(url, urlInfo)
+                        callback?.onComplete(urlInfo)
+                    }
 
-  fun preloadPreviewsFor(note: Note) {
-    note.event?.content?.let {
-      findUrlsInMessage(it).forEach {
-        val removedParamsFromUrl = it.split("?")[0].toLowerCase()
-        if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-          // Preload Images? Isn't this too heavy?
-        } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
-          // Do nothing for now.
-        } else if (isValidURL(removedParamsFromUrl)) {
-          previewInfo(it)
-        } else {
-          previewInfo("https://${it}")
+                    override fun onFailed(throwable: Throwable) {
+                        failures = failures + Pair(url, throwable)
+                        callback?.onFailed(throwable)
+                    }
+                }
+            ).fetchUrlPreview()
         }
-      }
     }
-  }
-}
+
+    fun findUrlsInMessage(message: String): List<String> {
+        return message.split('\n').map { paragraph ->
+            paragraph.split(' ').filter { word: String ->
+                isValidURL(word) || noProtocolUrlValidator.matcher(word).matches()
+            }
+        }.flatten()
+    }
+
+    fun preloadPreviewsFor(note: Note) {
+        note.event?.content()?.let {
+            findUrlsInMessage(it).forEach {
+                val removedParamsFromUrl = it.split("?")[0].lowercase()
+                if (imageExtension.matcher(removedParamsFromUrl).matches()) {
+                    // Preload Images? Isn't this too heavy?
+                } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
+                    // Do nothing for now.
+                } else if (isValidURL(removedParamsFromUrl)) {
+                    previewInfo(it)
+                } else {
+                    previewInfo("https://$it")
+                }
+            }
+        }
+    }
+}

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

@@ -2,14 +2,13 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
-import java.math.BigDecimal
-import java.util.concurrent.atomic.AtomicBoolean
-import java.util.regex.Pattern
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -18,16 +17,19 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import nostr.postr.Bech32
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.MetadataEvent
 import nostr.postr.toNpub
+import java.math.BigDecimal
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.regex.Pattern
 
 val lnurlpPattern = Pattern.compile("(?i:http|https):\\/\\/((.+)\\/)*\\.well-known\\/lnurlp\\/(.*)")
 
+class Badges(val definition: Note, val awardees: Set<Note>)
+
 class User(val pubkeyHex: String) {
     var info: UserMetadata? = null
 
-    var updatedFollowsAt: Long = 0;
+    var updatedFollowsAt: Long = 0
     var latestContactList: ContactListEvent? = null
 
     var follows = setOf<User>()
@@ -43,6 +45,7 @@ class User(val pubkeyHex: String) {
 
     var reports = mapOf<User, Set<Note>>()
         private set
+
     var latestReportTime: Long = 0
 
     var zaps = mapOf<Note, Note?>()
@@ -57,10 +60,14 @@ class User(val pubkeyHex: String) {
     var privateChatrooms = mapOf<User, Chatroom>()
         private set
 
+    var acceptedBadges: AddressableNote? = null
+
     fun pubkey() = Hex.decode(pubkeyHex)
     fun pubkeyNpub() = pubkey().toNpub()
     fun pubkeyDisplayHex() = pubkeyNpub().toShortenHex()
 
+    override fun toString(): String = pubkeyHex
+
     fun toBestDisplayName(): String {
         return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex()
     }
@@ -82,7 +89,7 @@ class User(val pubkeyHex: String) {
         return info?.picture
     }
 
-    fun follow(user: User, followedAt: Long) {
+    fun follow(user: User) {
         follows = follows + user
         user.followers = user.followers + this
 
@@ -98,7 +105,7 @@ class User(val pubkeyHex: String) {
         user.liveSet?.follows?.invalidateData()
     }
 
-    fun follow(users: Set<User>, followedAt: Long) {
+    fun follow(users: Set<User>) {
         follows = follows + users
         users.forEach {
             if (this !in it.followers && it.liveSet?.isInUse() == true) {
@@ -167,7 +174,7 @@ class User(val pubkeyHex: String) {
     fun removeReport(deleteNote: Note) {
         val author = deleteNote.author ?: return
 
-        if (author in reports.keys && reports[author]?.contains(deleteNote) == true ) {
+        if (author in reports.keys && reports[author]?.contains(deleteNote) == true) {
             reports[author]?.let {
                 reports = reports + Pair(author, it.minus(deleteNote))
                 liveSet?.reports?.invalidateData()
@@ -175,6 +182,11 @@ class User(val pubkeyHex: String) {
         }
     }
 
+    fun updateAcceptedBadges(note: AddressableNote) {
+        acceptedBadges = note
+        liveSet?.badges?.invalidateData()
+    }
+
     fun addZap(zapRequest: Note, zap: Note?) {
         if (zapRequest !in zaps.keys) {
             zaps = zaps + Pair(zapRequest, zap)
@@ -201,6 +213,10 @@ class User(val pubkeyHex: String) {
         return reports.keys.filter { it in users }
     }
 
+    fun countReportAuthorsBy(users: Set<User>): Int {
+        return reports.keys.count { it in users }
+    }
+
     fun reportsBy(users: Set<User>): List<Note> {
         return reportAuthorsBy(users).mapNotNull {
             reports[it]
@@ -237,12 +253,12 @@ class User(val pubkeyHex: String) {
 
         liveSet?.relayInfo?.invalidateData()
     }
-    
+
     fun updateFollows(newFollows: Set<User>, updateAt: Long) {
         val toBeAdded = newFollows - follows
         val toBeRemoved = follows - newFollows
 
-        follow(toBeAdded, updateAt)
+        follow(toBeAdded)
         unfollow(toBeRemoved)
 
         updatedFollowsAt = updateAt
@@ -259,7 +275,7 @@ class User(val pubkeyHex: String) {
         info?.latestMetadata = latestMetadata
         info?.updatedMetadataAt = latestMetadata.createdAt
 
-        if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.toLowerCase()?.startsWith("lnurl") == true) {
+        if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.lowercase()?.startsWith("lnurl") == true) {
             try {
                 val url = String(Bech32.decodeBytes(newUserInfo.lud06!!, false).second)
 
@@ -290,7 +306,7 @@ class User(val pubkeyHex: String) {
 
     fun hasReport(loggedIn: User, type: ReportEvent.ReportType): Boolean {
         return reports[loggedIn]?.firstOrNull() {
-              it.event is ReportEvent && (it.event as ReportEvent).reportedAuthor().any { it.reportType == type }
+            it.event is ReportEvent && (it.event as ReportEvent).reportedAuthor().any { it.reportType == type }
         } != null
     }
 
@@ -323,19 +339,21 @@ class UserLiveSet(u: User) {
     val relayInfo: UserLiveData = UserLiveData(u)
     val metadata: UserLiveData = UserLiveData(u)
     val zaps: UserLiveData = UserLiveData(u)
+    val badges: UserLiveData = UserLiveData(u)
 
     fun isInUse(): Boolean {
-        return follows.hasObservers()
-          || reports.hasObservers()
-          || messages.hasObservers()
-          || relays.hasObservers()
-          || relayInfo.hasObservers()
-          || metadata.hasObservers()
-          || zaps.hasObservers()
+        return follows.hasObservers() ||
+            reports.hasObservers() ||
+            messages.hasObservers() ||
+            relays.hasObservers() ||
+            relayInfo.hasObservers() ||
+            metadata.hasObservers() ||
+            zaps.hasObservers() ||
+            badges.hasObservers()
     }
 }
 
-data class RelayInfo (
+data class RelayInfo(
     val url: String,
     var lastEvent: Long,
     var counter: Long
@@ -343,7 +361,6 @@ data class RelayInfo (
 
 data class Chatroom(var roomMessages: Set<Note>)
 
-
 class UserMetadata {
     var name: String? = null
     var username: String? = null
@@ -367,16 +384,16 @@ class UserMetadata {
     var main_relay: String? = null
     var twitter: String? = null
 
-    var updatedMetadataAt: Long = 0;
+    var updatedMetadataAt: Long = 0
     var latestMetadata: MetadataEvent? = null
 
     fun anyNameStartsWith(prefix: String): Boolean {
         return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
-              .any { it.startsWith(prefix, true) }
+            .any { it.startsWith(prefix, true) }
     }
 }
 
-class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {
+class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
 
     // Refreshes observers in batches.
     var handlerWaiting = AtomicBoolean()
@@ -413,4 +430,3 @@ class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {
 }
 
 class UserState(val user: User)
-

app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt

@@ -13,81 +13,86 @@ import okhttp3.Request
 import okhttp3.Response
 
 class Nip05Verifier {
-  val client = OkHttpClient.Builder().build()
+    val client = OkHttpClient.Builder().build()
 
-  fun assembleUrl(nip05address: String): String? {
-    val parts = nip05address.trim().split("@")
+    fun assembleUrl(nip05address: String): String? {
+        val parts = nip05address.trim().split("@")
 
-    if (parts.size == 2) {
-      return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
+        if (parts.size == 2) {
+            return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
+        }
+
+        return null
     }
 
-    return null
-  }
-
-  fun fetchNip05Json(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-    val scope = CoroutineScope(Job() + Dispatchers.IO)
-    scope.launch {
-      fetchNip05JsonSuspend(lnaddress, onSuccess, onError)
-    }
-  }
-
-  private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-    val url = assembleUrl(nip05)
-
-    if (url == null) {
-      onError("Could not assemble url from Nip05: \"${nip05}\". Check the user's setup")
-      return
+    fun fetchNip05Json(nip05address: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            fetchNip05JsonSuspend(nip05address, onSuccess, onError)
+        }
     }
 
-    withContext(Dispatchers.IO) {
-      try {
-        val request: Request = Request.Builder().url(url).build()
+    private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val url = assembleUrl(nip05)
 
-        client.newCall(request).enqueue(object : Callback {
-          override fun onResponse(call: Call, response: Response) {
-            response.use {
-              if (it.isSuccessful)
-                onSuccess(it.body.string())
-              else
-                onError("Could not resolve ${nip05}. Error: ${it.code}. Check if the server up and if the address ${nip05} is correct")
+        if (url == null) {
+            onError("Could not assemble url from Nip05: \"${nip05}\". Check the user's setup")
+            return
+        }
+
+        withContext(Dispatchers.IO) {
+            try {
+                val request = Request.Builder()
+                    .header("User-Agent", "Amethyst")
+                    .url(url)
+                    .build()
+
+                client.newCall(request).enqueue(object : Callback {
+                    override fun onResponse(call: Call, response: Response) {
+                        response.use {
+                            if (it.isSuccessful) {
+                                onSuccess(it.body.string())
+                            } else {
+                                onError("Could not resolve $nip05. Error: ${it.code}. Check if the server up and if the address $nip05 is correct")
+                            }
+                        }
+                    }
+
+                    override fun onFailure(call: Call, e: java.io.IOException) {
+                        onError("Could not resolve $url. Check if the server up and if the address $nip05 is correct")
+                        e.printStackTrace()
+                    }
+                })
+            } catch (e: java.lang.Exception) {
+                onError("Could not resolve '$url': ${e.message}")
             }
-          }
-
-          override fun onFailure(call: Call, e: java.io.IOException) {
-            onError("Could not resolve ${url}. Check if the server up and if the address ${nip05} is correct")
-            e.printStackTrace()
-          }
-        })
-      } catch (e: java.lang.Exception) {
-        onError("Could not resolve '${url}': ${e.message}")
-      }
+        }
     }
-  }
 
-  fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-    val mapper = jacksonObjectMapper()
+    fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val mapper = jacksonObjectMapper()
 
-    fetchNip05Json(nip05,
-      onSuccess = {
-        val nip05url = try {
-          mapper.readTree(it)
-        } catch (t: Throwable) {
-          onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
-          null
-        }
+        fetchNip05Json(
+            nip05,
+            onSuccess = {
+                val nip05url = try {
+                    mapper.readTree(it)
+                } catch (t: Throwable) {
+                    onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
+                    null
+                }
 
-        val user = nip05.split("@")[0]
+                val user = nip05.split("@")[0]
 
-        val hexKey = nip05url?.get("names")?.get(user)?.asText()
+                val hexKey = nip05url?.get("names")?.get(user)?.asText()
 
-        if (hexKey == null) {
-          onError("Username not found in the NIP05 JSON")
-        } else {
-          onSuccess(hexKey)
-        }
-      },
-      onError = onError
-    )
-  }
-}
+                if (hexKey == null) {
+                    onError("Username not found in the NIP05 JSON")
+                } else {
+                    onSuccess(hexKey)
+                }
+            },
+            onError = onError
+        )
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/Nip19.kt

@@ -1,96 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.model.toByteArray
-import com.vitorpamplona.amethyst.model.toHexKey
-import com.vitorpamplona.amethyst.service.model.ATag
-import java.nio.ByteBuffer
-import java.nio.ByteOrder
-import nostr.postr.Bech32
-import nostr.postr.bechToBytes
-import nostr.postr.toByteArray
-
-class Nip19 {
-
-  enum class Type {
-    USER, NOTE, RELAY, ADDRESS
-  }
-  data class Return(val type: Type, val hex: String)
-
-  fun uriToRoute(uri: String?): Return? {
-    try {
-      val key = uri?.removePrefix("nostr:")
-
-      if (key != null) {
-        val bytes = key.bechToBytes()
-        if (key.startsWith("npub")) {
-          return Return(Type.USER, bytes.toHexKey())
-        }
-        if (key.startsWith("note")) {
-          return Return(Type.NOTE, bytes.toHexKey())
-        }
-        if (key.startsWith("nprofile")) {
-          val tlv = parseTLV(bytes)
-          val hex = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toHexKey()
-          if (hex != null)
-            return Return(Type.USER, hex)
-        }
-        if (key.startsWith("nevent")) {
-          val tlv = parseTLV(bytes)
-          val hex = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toHexKey()
-          if (hex != null)
-            return Return(Type.USER, hex)
-        }
-        if (key.startsWith("nrelay")) {
-          val tlv = parseTLV(bytes)
-          val relayUrl = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toString(Charsets.UTF_8)
-          if (relayUrl != null)
-            return Return(Type.RELAY, relayUrl)
-        }
-        if (key.startsWith("naddr")) {
-          val tlv = parseTLV(bytes)
-          val d = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toString(Charsets.UTF_8)
-          val relay = tlv.get(NIP19TLVTypes.RELAY.id)?.get(0)?.toString(Charsets.UTF_8)
-          val author = tlv.get(NIP19TLVTypes.AUTHOR.id)?.get(0)?.toHexKey()
-          val kind = tlv.get(NIP19TLVTypes.KIND.id)?.get(0)?.let { toInt32(it) }
-          if (d != null)
-            return Return(Type.ADDRESS, "$kind:$author:$d")
-        }
-      }
-    } catch (e: Throwable) {
-      println("Issue trying to Decode NIP19 ${uri}: ${e.message}")
-      //e.printStackTrace()
-    }
-
-    return null
-  }
-}
-
-enum class NIP19TLVTypes(val id: Byte) { //classes should start with an uppercase letter in kotlin
-  SPECIAL(0),
-  RELAY(1),
-  AUTHOR(2),
-  KIND(3);
-}
-
-fun toInt32(bytes: ByteArray): Int {
-  require(bytes.size == 4) { "length must be 4, got: ${bytes.size}" }
-  return ByteBuffer.wrap(bytes, 0, 4).order(ByteOrder.BIG_ENDIAN).int
-}
-
-fun parseTLV(data: ByteArray): Map<Byte, List<ByteArray>> {
-  var result = mutableMapOf<Byte, MutableList<ByteArray>>()
-  var rest = data
-  while (rest.isNotEmpty()) {
-    val t = rest[0]
-    val l = rest[1]
-    val v = rest.sliceArray(IntRange(2, (2 + l) - 1))
-    rest = rest.sliceArray(IntRange(2 + l, rest.size-1))
-    if (v.size < l) continue
-
-    if (!result.containsKey(t)) {
-      result.put(t, mutableListOf())
-    }
-    result.get(t)?.add(v)
-  }
-  return result
-}

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

@@ -1,73 +1,93 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
+import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.JsonFilter
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.MetadataEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
-object NostrAccountDataSource: NostrDataSource("AccountData") {
-  lateinit var account: Account
+object NostrAccountDataSource : NostrDataSource("AccountData") {
+    lateinit var account: Account
 
-  fun createAccountContactListFilter(): TypedFilter {
-    return TypedFilter(
-      types = FeedType.values().toSet(),
-      filter = JsonFilter(
-        kinds = listOf(ContactListEvent.kind),
-        authors = listOf(account.userProfile().pubkeyHex),
-        limit = 1
-      )
+    fun createAccountContactListFilter(): TypedFilter {
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(ContactListEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 1
+            )
+        )
+    }
+
+    fun createAccountMetadataFilter(): TypedFilter {
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(MetadataEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 1
+            )
+        )
+    }
+
+    fun createAccountAcceptedAwardsFilter(): TypedFilter {
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(BadgeProfilesEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 1
+            )
+        )
+    }
+
+    fun createAccountReportsFilter(): TypedFilter {
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(ReportEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex)
+            )
+        )
+    }
+
+    fun createNotificationFilter() = TypedFilter(
+        types = FeedType.values().toSet(),
+        filter = JsonFilter(
+            kinds = listOf(
+                TextNoteEvent.kind,
+                ReactionEvent.kind,
+                RepostEvent.kind,
+                ReportEvent.kind,
+                LnZapEvent.kind,
+                ChannelMessageEvent.kind,
+                BadgeAwardEvent.kind
+            ),
+            tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+            limit = 200
+        )
     )
-  }
 
-  fun createAccountMetadataFilter(): TypedFilter {
-    return TypedFilter(
-      types = FeedType.values().toSet(),
-      filter = JsonFilter(
-        kinds = listOf(MetadataEvent.kind),
-        authors = listOf(account.userProfile().pubkeyHex),
-        limit = 1
-      )
-    )
-  }
+    val accountChannel = requestNewChannel()
 
-  fun createAccountReportsFilter(): TypedFilter {
-    return TypedFilter(
-      types = FeedType.values().toSet(),
-      filter = JsonFilter(
-        kinds = listOf(ReportEvent.kind),
-        authors = listOf(account.userProfile().pubkeyHex)
-      )
-    )
-  }
-
-  fun createNotificationFilter() = TypedFilter(
-    types = FeedType.values().toSet(),
-    filter = JsonFilter(
-      kinds = listOf(
-        TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind, ChannelMessageEvent.kind
-      ),
-      tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
-      limit = 200
-    )
-  )
-
-  val accountChannel = requestNewChannel()
-
-  override fun updateChannelFilters() {
-    // gets everthing about the user logged in
-    accountChannel.typedFilters = listOf(
-      createAccountMetadataFilter(),
-      createAccountContactListFilter(),
-      createNotificationFilter(),
-      createAccountReportsFilter()
-    ).ifEmpty { null }
-  }
-}
+    override fun updateChannelFilters() {
+        // gets everthing about the user logged in
+        accountChannel.typedFilters = listOf(
+            createAccountMetadataFilter(),
+            createAccountContactListFilter(),
+            createNotificationFilter(),
+            createAccountReportsFilter(),
+            createAccountAcceptedAwardsFilter()
+        ).ifEmpty { null }
+    }
+}

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

@@ -4,34 +4,34 @@ import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.JsonFilter
 
-object NostrChannelDataSource: NostrDataSource("ChatroomFeed") {
-  var channel: Channel? = null
+object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
+    var channel: Channel? = null
 
-  fun loadMessagesBetween(channelId: String) {
-    channel = LocalCache.getOrCreateChannel(channelId)
-    resetFilters()
-  }
-
-  fun createMessagesToChannelFilter(): TypedFilter? {
-    if (channel != null) {
-      return TypedFilter(
-        types = setOf(FeedType.PUBLIC_CHATS),
-        filter = JsonFilter(
-          kinds = listOf(ChannelMessageEvent.kind),
-          tags = mapOf("e" to listOfNotNull(channel?.idHex)),
-          limit = 200
-        )
-      )
+    fun loadMessagesBetween(channelId: String) {
+        channel = LocalCache.getOrCreateChannel(channelId)
+        resetFilters()
     }
-    return null
-  }
 
-  val messagesChannel = requestNewChannel()
+    fun createMessagesToChannelFilter(): TypedFilter? {
+        if (channel != null) {
+            return TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter = JsonFilter(
+                    kinds = listOf(ChannelMessageEvent.kind),
+                    tags = mapOf("e" to listOfNotNull(channel?.idHex)),
+                    limit = 200
+                )
+            )
+        }
+        return null
+    }
 
-  override fun updateChannelFilters() {
-    messagesChannel.typedFilters = listOfNotNull(createMessagesToChannelFilter()).ifEmpty { null }
-  }
-}
+    val messagesChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        messagesChannel.typedFilters = listOfNotNull(createMessagesToChannelFilter()).ifEmpty { null }
+    }
+}

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

@@ -3,58 +3,58 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.JsonFilter
-import nostr.postr.events.PrivateDmEvent
 
-object NostrChatroomDataSource: NostrDataSource("ChatroomFeed") {
-  lateinit var account: Account
-  var withUser: User? = null
+object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
+    lateinit var account: Account
+    var withUser: User? = null
 
-  fun loadMessagesBetween(accountIn: Account, userId: String) {
-    account = accountIn
-    withUser = LocalCache.users[userId]
-    resetFilters()
-  }
-
-  fun createMessagesToMeFilter(): TypedFilter? {
-    val myPeer = withUser
-    
-    return if (myPeer != null) {
-      TypedFilter(
-        types = setOf(FeedType.PRIVATE_DMS),
-        filter = JsonFilter(
-          kinds = listOf(PrivateDmEvent.kind),
-          authors = listOf(myPeer.pubkeyHex) ,
-          tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
-        )
-      )
-    } else {
-      null
+    fun loadMessagesBetween(accountIn: Account, userId: String) {
+        account = accountIn
+        withUser = LocalCache.users[userId]
+        resetFilters()
     }
-  }
 
-  fun createMessagesFromMeFilter(): TypedFilter? {
-    val myPeer = withUser
-    
-    return if (myPeer != null) {
-      TypedFilter(
-        types = setOf(FeedType.PRIVATE_DMS),
-        filter = JsonFilter(
-          kinds = listOf(PrivateDmEvent.kind),
-          authors = listOf(account.userProfile().pubkeyHex),
-          tags = mapOf("p" to listOf(myPeer.pubkeyHex))
-        )
-      )
-    } else {
-      null
+    fun createMessagesToMeFilter(): TypedFilter? {
+        val myPeer = withUser
+
+        return if (myPeer != null) {
+            TypedFilter(
+                types = setOf(FeedType.PRIVATE_DMS),
+                filter = JsonFilter(
+                    kinds = listOf(PrivateDmEvent.kind),
+                    authors = listOf(myPeer.pubkeyHex),
+                    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+                )
+            )
+        } else {
+            null
+        }
     }
-  }
 
-  val inandoutChannel = requestNewChannel()
+    fun createMessagesFromMeFilter(): TypedFilter? {
+        val myPeer = withUser
 
-  override fun updateChannelFilters() {
-    inandoutChannel.typedFilters = listOfNotNull(createMessagesToMeFilter(), createMessagesFromMeFilter()).ifEmpty { null }
-  }
-}
+        return if (myPeer != null) {
+            TypedFilter(
+                types = setOf(FeedType.PRIVATE_DMS),
+                filter = JsonFilter(
+                    kinds = listOf(PrivateDmEvent.kind),
+                    authors = listOf(account.userProfile().pubkeyHex),
+                    tags = mapOf("p" to listOf(myPeer.pubkeyHex))
+                )
+            )
+        } else {
+            null
+        }
+    }
+
+    val inandoutChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        inandoutChannel.typedFilters = listOfNotNull(createMessagesToMeFilter(), createMessagesFromMeFilter()).ifEmpty { null }
+    }
+}

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

@@ -4,85 +4,85 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.JsonFilter
-import nostr.postr.events.PrivateDmEvent
 
-object NostrChatroomListDataSource: NostrDataSource("MailBoxFeed") {
-  lateinit var account: Account
+object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
+    lateinit var account: Account
 
-  fun createMessagesToMeFilter() = TypedFilter(
-    types = setOf(FeedType.PRIVATE_DMS),
-      filter = JsonFilter(
-      kinds = listOf(PrivateDmEvent.kind),
-      tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
-    )
-  )
-
-  fun createMessagesFromMeFilter() = TypedFilter(
-    types = setOf(FeedType.PRIVATE_DMS),
-      filter = JsonFilter(
-      kinds = listOf(PrivateDmEvent.kind),
-      authors = listOf(account.userProfile().pubkeyHex)
-    )
-  )
-
-  fun createChannelsCreatedbyMeFilter() = TypedFilter(
-    types = setOf(FeedType.PUBLIC_CHATS),
-      filter = JsonFilter(
-      kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind),
-      authors = listOf(account.userProfile().pubkeyHex)
-    )
-  )
-
-  fun createMyChannelsFilter() = TypedFilter(
-    types = FeedType.values().toSet(), // Metadata comes from any relay
-      filter = JsonFilter(
-      kinds = listOf(ChannelCreateEvent.kind),
-      ids = account.followingChannels.toList()
-    )
-  )
-
-  fun createLastChannelInfoFilter(): List<TypedFilter> {
-    return account.followingChannels.map {
-      TypedFilter(
-        types = FeedType.values().toSet(), // Metadata comes from any relay
+    fun createMessagesToMeFilter() = TypedFilter(
+        types = setOf(FeedType.PRIVATE_DMS),
         filter = JsonFilter(
-          kinds = listOf(ChannelMetadataEvent.kind),
-          tags = mapOf("e" to listOf(it)),
-          limit = 1
+            kinds = listOf(PrivateDmEvent.kind),
+            tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
         )
-      )
-    }
-  }
+    )
 
-  fun createLastMessageOfEachChannelFilter(): List<TypedFilter> {
-    return account.followingChannels.map {
-      TypedFilter(
+    fun createMessagesFromMeFilter() = TypedFilter(
+        types = setOf(FeedType.PRIVATE_DMS),
+        filter = JsonFilter(
+            kinds = listOf(PrivateDmEvent.kind),
+            authors = listOf(account.userProfile().pubkeyHex)
+        )
+    )
+
+    fun createChannelsCreatedbyMeFilter() = TypedFilter(
         types = setOf(FeedType.PUBLIC_CHATS),
         filter = JsonFilter(
-          kinds = listOf(ChannelMessageEvent.kind),
-          tags = mapOf("e" to listOf(it)),
-          limit = 100 // Remember to consider spam that is being removed from the UI
+            kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind),
+            authors = listOf(account.userProfile().pubkeyHex)
         )
-      )
-    }
-  }
-
-  val chatroomListChannel = requestNewChannel()
-
-  override fun updateChannelFilters() {
-    val list = listOf(
-      createMessagesToMeFilter(),
-      createMessagesFromMeFilter(),
-      createMyChannelsFilter()
     )
 
-    chatroomListChannel.typedFilters = listOfNotNull(
-      list,
-      createLastChannelInfoFilter(),
-      createLastMessageOfEachChannelFilter()
-    ).flatten().ifEmpty { null }
-  }
-}
+    fun createMyChannelsFilter() = TypedFilter(
+        types = FeedType.values().toSet(), // Metadata comes from any relay
+        filter = JsonFilter(
+            kinds = listOf(ChannelCreateEvent.kind),
+            ids = account.followingChannels.toList()
+        )
+    )
+
+    fun createLastChannelInfoFilter(): List<TypedFilter> {
+        return account.followingChannels.map {
+            TypedFilter(
+                types = FeedType.values().toSet(), // Metadata comes from any relay
+                filter = JsonFilter(
+                    kinds = listOf(ChannelMetadataEvent.kind),
+                    tags = mapOf("e" to listOf(it)),
+                    limit = 1
+                )
+            )
+        }
+    }
+
+    fun createLastMessageOfEachChannelFilter(): List<TypedFilter> {
+        return account.followingChannels.map {
+            TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter = JsonFilter(
+                    kinds = listOf(ChannelMessageEvent.kind),
+                    tags = mapOf("e" to listOf(it)),
+                    limit = 100 // Remember to consider spam that is being removed from the UI
+                )
+            )
+        }
+    }
+
+    val chatroomListChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        val list = listOf(
+            createMessagesToMeFilter(),
+            createMessagesFromMeFilter(),
+            createMyChannelsFilter()
+        )
+
+        chatroomListChannel.typedFilters = listOfNotNull(
+            list,
+            createLastChannelInfoFilter(),
+            createLastMessageOfEachChannelFilter()
+        ).flatten().ifEmpty { null }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/NostrDataSource.kt

@@ -1,24 +1,31 @@
 package com.vitorpamplona.amethyst.service
 
+import android.util.Log
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
+import com.vitorpamplona.amethyst.service.model.BadgeDefinitionEvent
+import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.DeletionEvent
+import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.RecommendRelayEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.Subscription
-import com.vitorpamplona.amethyst.service.relays.hasValidSignature
-import java.util.Date
-import java.util.UUID
-import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -26,200 +33,190 @@ import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.DeletionEvent
-import nostr.postr.events.Event
-import nostr.postr.events.MetadataEvent
-import nostr.postr.events.PrivateDmEvent
-import nostr.postr.events.RecommendRelayEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import java.util.Date
+import java.util.UUID
+import java.util.concurrent.atomic.AtomicBoolean
 
 abstract class NostrDataSource(val debugName: String) {
-  private var subscriptions = mapOf<String, Subscription>()
-  data class Counter(var counter:Int)
+    private var subscriptions = mapOf<String, Subscription>()
+    data class Counter(var counter: Int)
 
-  private var eventCounter = mapOf<String, Counter>()
+    private var eventCounter = mapOf<String, Counter>()
 
-  fun printCounter() {
-    eventCounter.forEach {
-      println("AAA Count ${it.key}: ${it.value.counter}")
-    }
-  }
-
-
-  private val clientListener = object : Client.Listener() {
-    override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
-      if (subscriptionId in subscriptions.keys) {
-        if (!event.hasValidSignature()) return
-
-        val key = "${debugName} ${subscriptionId} ${event.kind}"
-        val keyValue = eventCounter.get(key)
-        if (keyValue != null) {
-          keyValue.counter++
-        } else {
-          eventCounter = eventCounter + Pair(key, Counter(1))
+    fun printCounter() {
+        eventCounter.forEach {
+            Log.d("STATE DUMP", "Received Events ${it.key}: ${it.value.counter}")
         }
+    }
 
-        try {
-          when (event) {
-            is MetadataEvent -> LocalCache.consume(event)
-            //is TextNoteEvent -> LocalCache.consume(event, relay) overrides default TextNote
-            is RecommendRelayEvent -> LocalCache.consume(event)
-            is ContactListEvent -> LocalCache.consume(event)
-            is PrivateDmEvent -> LocalCache.consume(event, relay)
-            is DeletionEvent -> LocalCache.consume(event)
-            else -> when (event.kind) {
-              TextNoteEvent.kind -> LocalCache.consume(TextNoteEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig), relay)
+    private val clientListener = object : Client.Listener() {
+        override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
+            if (subscriptionId in subscriptions.keys) {
+                if (!event.hasValidSignature()) return
 
-              RepostEvent.kind -> {
-                val repostEvent = RepostEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig)
+                val key = "$debugName $subscriptionId ${event.kind}"
+                val keyValue = eventCounter.get(key)
+                if (keyValue != null) {
+                    keyValue.counter++
+                } else {
+                    eventCounter = eventCounter + Pair(key, Counter(1))
+                }
 
-                repostEvent.containedPost()?.let { onEvent(it, subscriptionId, relay) }
-                LocalCache.consume(repostEvent)
-              }
-              ReactionEvent.kind -> LocalCache.consume(ReactionEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-              ReportEvent.kind -> LocalCache.consume(ReportEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig), relay)
+                try {
+                    when (event) {
+                        is BadgeAwardEvent -> LocalCache.consume(event)
+                        is BadgeDefinitionEvent -> LocalCache.consume(event)
+                        is BadgeProfilesEvent -> LocalCache.consume(event)
+                        is ChannelCreateEvent -> LocalCache.consume(event)
+                        is ChannelHideMessageEvent -> LocalCache.consume(event)
+                        is ChannelMessageEvent -> LocalCache.consume(event, relay)
+                        is ChannelMetadataEvent -> LocalCache.consume(event)
+                        is ChannelMuteUserEvent -> LocalCache.consume(event)
+                        is ContactListEvent -> LocalCache.consume(event)
+                        is DeletionEvent -> LocalCache.consume(event)
 
-              LnZapEvent.kind -> {
-                val zapEvent = LnZapEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig)
-
-                zapEvent.containedPost()?.let { onEvent(it, subscriptionId, relay) }
-                LocalCache.consume(zapEvent)
-              }
-              LnZapRequestEvent.kind -> LocalCache.consume(LnZapRequestEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-
-              ChannelCreateEvent.kind -> LocalCache.consume(ChannelCreateEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-              ChannelMetadataEvent.kind -> LocalCache.consume(ChannelMetadataEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-              ChannelMessageEvent.kind -> LocalCache.consume(ChannelMessageEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig), relay)
-              ChannelHideMessageEvent.kind -> LocalCache.consume(ChannelHideMessageEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-              ChannelMuteUserEvent.kind -> LocalCache.consume(ChannelMuteUserEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-
-              LongTextNoteEvent.kind -> LocalCache.consume(LongTextNoteEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig), relay)
+                        is LnZapEvent -> {
+                            event.containedPost()?.let { onEvent(it, subscriptionId, relay) }
+                            LocalCache.consume(event)
+                        }
+                        is LnZapRequestEvent -> LocalCache.consume(event)
+                        is LongTextNoteEvent -> LocalCache.consume(event, relay)
+                        is MetadataEvent -> LocalCache.consume(event)
+                        is PrivateDmEvent -> LocalCache.consume(event, relay)
+                        is ReactionEvent -> LocalCache.consume(event)
+                        is RecommendRelayEvent -> LocalCache.consume(event)
+                        is ReportEvent -> LocalCache.consume(event, relay)
+                        is RepostEvent -> {
+                            event.containedPost()?.let { onEvent(it, subscriptionId, relay) }
+                            LocalCache.consume(event)
+                        }
+                        is TextNoteEvent -> LocalCache.consume(event, relay)
+                        else -> {
+                            Log.w("Event Not Supported", event.toJson())
+                        }
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
             }
-          }
-        } catch (e: Exception) {
-          e.printStackTrace()
         }
-      }
-    }
 
-    override fun onError(error: Error, subscriptionId: String, relay: Relay) {
-      //Log.e("ERROR", "Relay ${relay.url}: ${error.message}")
-    }
-
-    override fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) {
-      //Log.d("RELAY", "Relay ${relay.url} ${when (type) {
-      //  Relay.Type.CONNECT -> "connected."
-      //  Relay.Type.DISCONNECT -> "disconnected."
-      //  Relay.Type.DISCONNECTING -> "disconnecting."
-      //  Relay.Type.EOSE -> "sent all events it had stored."
-      //}}")
-
-      if (type == Relay.Type.EOSE && channel != null) {
-        // updates a per subscripton since date
-        subscriptions[channel]?.updateEOSE(Date().time / 1000)
-      }
-    }
-
-    override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
-
-    }
-  }
-
-  init {
-    Client.subscribe(clientListener)
-  }
-
-  open fun start() {
-    println("DataSource: ${this.javaClass.simpleName} Start")
-    resetFilters()
-  }
-
-  open fun stop() {
-    println("DataSource: ${this.javaClass.simpleName} Stop")
-    subscriptions.values.forEach { channel ->
-      Client.close(channel.id)
-      channel.typedFilters = null
-    }
-  }
-
-  fun requestNewChannel(onEOSE: ((Long) -> Unit)? = null): Subscription {
-    val newSubscription = Subscription(UUID.randomUUID().toString().substring(0,4), onEOSE)
-    subscriptions = subscriptions + Pair(newSubscription.id, newSubscription)
-    return newSubscription
-  }
-
-  fun dismissChannel(subscription: Subscription) {
-    Client.close(subscription.id)
-    subscriptions = subscriptions.minus(subscription.id)
-  }
-
-  // Refreshes observers in batches.
-  var handlerWaiting = AtomicBoolean()
-
-  fun invalidateFilters() {
-    if (handlerWaiting.getAndSet(true)) return
-
-    println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
-
-    val scope = CoroutineScope(Job() + Dispatchers.IO)
-    scope.launch {
-      try {
-        delay(200)
-        resetFiltersSuspend()
-      } finally {
-        withContext(NonCancellable) {
-          handlerWaiting.set(false)
+        override fun onError(error: Error, subscriptionId: String, relay: Relay) {
+            // Log.e("ERROR", "Relay ${relay.url}: ${error.message}")
         }
-      }
-    }
-  }
 
-  fun resetFilters() {
-    val scope = CoroutineScope(Job() + Dispatchers.IO)
-    scope.launch {
-      resetFiltersSuspend()
-    }
-  }
+        override fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) {
+            // Log.d("RELAY", "Relay ${relay.url} ${when (type) {
+            //  Relay.Type.CONNECT -> "connected."
+            //  Relay.Type.DISCONNECT -> "disconnected."
+            //  Relay.Type.DISCONNECTING -> "disconnecting."
+            //  Relay.Type.EOSE -> "sent all events it had stored."
+            // }}")
 
-  fun resetFiltersSuspend() {
-    // saves the channels that are currently active
-    val activeSubscriptions = subscriptions.values.filter { it.typedFilters != null }
-    // saves the current content to only update if it changes
-    val currentFilters = activeSubscriptions.associate { it.id to it.toJson()  }
-
-    updateChannelFilters()
-
-    // Makes sure to only send an updated filter when it actually changes.
-    subscriptions.values.forEach { updatedSubscription ->
-      val updatedSubscriotionNewFilters = updatedSubscription.typedFilters
-
-      if (updatedSubscription.id in currentFilters.keys) {
-        if (updatedSubscriotionNewFilters == null) {
-          // was active and is not active anymore, just close.
-          Client.close(updatedSubscription.id)
-        } else {
-          // was active and is still active, check if it has changed.
-          if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
-            Client.close(updatedSubscription.id)
-            Client.sendFilter(updatedSubscription.id, updatedSubscriotionNewFilters)
-          } else {
-            // hasn't changed, does nothing.
-            Client.sendFilterOnlyIfDisconnected(updatedSubscription.id, updatedSubscriotionNewFilters)
-          }
+            if (type == Relay.Type.EOSE && channel != null) {
+                // updates a per subscripton since date
+                subscriptions[channel]?.updateEOSE(Date().time / 1000)
+            }
         }
-      } else {
-        if (updatedSubscriotionNewFilters == null) {
-          // was not active and is still not active, does nothing
-        } else {
-          // was not active and becomes active, sends the filter.
-          if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
-            Client.sendFilter(updatedSubscription.id, updatedSubscriotionNewFilters)
-          }
-        }
-      }
-    }
-  }
 
-  abstract fun updateChannelFilters()
-}
+        override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
+        }
+    }
+
+    init {
+        Client.subscribe(clientListener)
+    }
+
+    open fun start() {
+        println("DataSource: ${this.javaClass.simpleName} Start")
+        resetFilters()
+    }
+
+    open fun stop() {
+        println("DataSource: ${this.javaClass.simpleName} Stop")
+        subscriptions.values.forEach { channel ->
+            Client.close(channel.id)
+            channel.typedFilters = null
+        }
+    }
+
+    fun requestNewChannel(onEOSE: ((Long) -> Unit)? = null): Subscription {
+        val newSubscription = Subscription(UUID.randomUUID().toString().substring(0, 4), onEOSE)
+        subscriptions = subscriptions + Pair(newSubscription.id, newSubscription)
+        return newSubscription
+    }
+
+    fun dismissChannel(subscription: Subscription) {
+        Client.close(subscription.id)
+        subscriptions = subscriptions.minus(subscription.id)
+    }
+
+    // Refreshes observers in batches.
+    var handlerWaiting = AtomicBoolean()
+
+    fun invalidateFilters() {
+        if (handlerWaiting.getAndSet(true)) return
+
+        println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
+
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            try {
+                delay(200)
+                resetFiltersSuspend()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
+        }
+    }
+
+    fun resetFilters() {
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            resetFiltersSuspend()
+        }
+    }
+
+    fun resetFiltersSuspend() {
+        // saves the channels that are currently active
+        val activeSubscriptions = subscriptions.values.filter { it.typedFilters != null }
+        // saves the current content to only update if it changes
+        val currentFilters = activeSubscriptions.associate { it.id to it.toJson() }
+
+        updateChannelFilters()
+
+        // Makes sure to only send an updated filter when it actually changes.
+        subscriptions.values.forEach { updatedSubscription ->
+            val updatedSubscriotionNewFilters = updatedSubscription.typedFilters
+
+            if (updatedSubscription.id in currentFilters.keys) {
+                if (updatedSubscriotionNewFilters == null) {
+                    // was active and is not active anymore, just close.
+                    Client.close(updatedSubscription.id)
+                } else {
+                    // was active and is still active, check if it has changed.
+                    if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
+                        Client.close(updatedSubscription.id)
+                        Client.sendFilter(updatedSubscription.id, updatedSubscriotionNewFilters)
+                    } else {
+                        // hasn't changed, does nothing.
+                        Client.sendFilterOnlyIfDisconnected(updatedSubscription.id, updatedSubscriotionNewFilters)
+                    }
+                }
+            } else {
+                if (updatedSubscriotionNewFilters == null) {
+                    // was not active and is still not active, does nothing
+                } else {
+                    // was not active and becomes active, sends the filter.
+                    if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
+                        Client.sendFilter(updatedSubscription.id, updatedSubscriotionNewFilters)
+                    }
+                }
+            }
+        }
+    }
+
+    abstract fun updateChannelFilters()
+}

app/src/main/java/com/vitorpamplona/amethyst/service/NostrGlobalDataSource.kt

@@ -2,23 +2,23 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.JsonFilter
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
-object NostrGlobalDataSource: NostrDataSource("GlobalFeed") {
-  fun createGlobalFilter() = TypedFilter(
-    types = setOf(FeedType.GLOBAL),
-    filter = JsonFilter(
-      kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind),
-      limit = 200
+object NostrGlobalDataSource : NostrDataSource("GlobalFeed") {
+    fun createGlobalFilter() = TypedFilter(
+        types = setOf(FeedType.GLOBAL),
+        filter = JsonFilter(
+            kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind),
+            limit = 200
+        )
     )
-  )
 
-  val globalFeedChannel = requestNewChannel()
+    val globalFeedChannel = requestNewChannel()
 
-  override fun updateChannelFilters() {
-    globalFeedChannel.typedFilters = listOf(createGlobalFilter()).ifEmpty { null }
-  }
-}
+    override fun updateChannelFilters() {
+        globalFeedChannel.typedFilters = listOf(createGlobalFilter()).ifEmpty { null }
+    }
+}

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

@@ -3,61 +3,64 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.UserState
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import nostr.postr.JsonFilter
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
-object NostrHomeDataSource: NostrDataSource("HomeFeed") {
-  lateinit var account: Account
+object NostrHomeDataSource : NostrDataSource("HomeFeed") {
+    lateinit var account: Account
 
-  private val cacheListener: (UserState) -> Unit = {
-    invalidateFilters()
-  }
-
-  override fun start() {
-    if (this::account.isInitialized) {
-      GlobalScope.launch(Dispatchers.Main) {
-        account.userProfile().live().follows.observeForever(cacheListener)
-      }
-    }
-    super.start()
-  }
-
-  override fun stop() {
-    super.stop()
-    if (this::account.isInitialized) {
-      GlobalScope.launch(Dispatchers.Main) {
-        account.userProfile().live().follows.removeObserver(cacheListener)
-      }
-    }
-  }
-
-  fun createFollowAccountsFilter(): TypedFilter {
-    val follows = account.userProfile().follows
-
-    val followKeys = follows.map {
-      it.pubkeyHex.substring(0, 6)
+    private val cacheListener: (UserState) -> Unit = {
+        invalidateFilters()
     }
 
-    val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun start() {
+        if (this::account.isInitialized) {
+            GlobalScope.launch(Dispatchers.Main) {
+                account.userProfile().live().follows.observeForever(cacheListener)
+            }
+        }
+        super.start()
+    }
 
-    return TypedFilter(
-      types = setOf(FeedType.FOLLOWS),
-      filter = JsonFilter(
-        kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
-        authors = followSet,
-        limit = 400
-      )
-    )
-  }
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun stop() {
+        super.stop()
+        if (this::account.isInitialized) {
+            GlobalScope.launch(Dispatchers.Main) {
+                account.userProfile().live().follows.removeObserver(cacheListener)
+            }
+        }
+    }
 
-  val followAccountChannel = requestNewChannel()
+    fun createFollowAccountsFilter(): TypedFilter {
+        val follows = account.userProfile().follows
 
-  override fun updateChannelFilters() {
-    followAccountChannel.typedFilters = listOf(createFollowAccountsFilter()).ifEmpty { null }
-  }
-}
+        val followKeys = follows.map {
+            it.pubkeyHex.substring(0, 6)
+        }
+
+        val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter = JsonFilter(
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
+                authors = followSet,
+                limit = 400
+            )
+        )
+    }
+
+    val followAccountChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        followAccountChannel.typedFilters = listOf(createFollowAccountsFilter()).ifEmpty { null }
+    }
+}

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

@@ -1,62 +1,90 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.decodePublicKey
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.JsonFilter
 import nostr.postr.bechToBytes
-import nostr.postr.events.MetadataEvent
 import nostr.postr.toHex
 
-object NostrSearchEventOrUserDataSource: NostrDataSource("SingleEventFeed") {
-  private var hexToWatch: String? = null
+object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
+    private var searchString: String? = null
 
-  private fun createAnythingWithIDFilter(): List<TypedFilter>? {
-    if (hexToWatch == null) {
-      return null
+    private fun createAnythingWithIDFilter(): List<TypedFilter>? {
+        val mySearchString = searchString
+        if (mySearchString == null) {
+            return null
+        }
+
+        val hexToWatch = try {
+            if (mySearchString.startsWith("npub") || mySearchString.startsWith("nsec")) {
+                decodePublicKey(mySearchString).toHex()
+            } else if (mySearchString.startsWith("note")) {
+                mySearchString.bechToBytes().toHex()
+            } else {
+                mySearchString
+            }
+        } catch (e: Exception) {
+            // Usually when people add an incomplete npub or note.
+            null
+        }
+
+        if (hexToWatch == null) {
+            return null
+        }
+
+        // downloads all the reactions to a given event.
+        return listOf(
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    ids = listOfNotNull(hexToWatch)
+                )
+            ),
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(MetadataEvent.kind),
+                    authors = listOfNotNull(hexToWatch)
+                )
+            ),
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(MetadataEvent.kind),
+                    search = mySearchString,
+                    limit = 20
+                )
+            ),
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ChannelMetadataEvent.kind, ChannelCreateEvent.kind, ChannelMessageEvent.kind),
+                    search = mySearchString,
+                    limit = 20
+                )
+            )
+        )
     }
 
-    // downloads all the reactions to a given event.
-    return listOf(
-      TypedFilter(
-        types = FeedType.values().toSet(),
-        filter = JsonFilter(
-          ids = listOfNotNull(hexToWatch)
-        )
-      ),
-      TypedFilter(
-        types = FeedType.values().toSet(),
-        filter = JsonFilter(
-          kinds = listOf(MetadataEvent.kind),
-          authors = listOfNotNull(hexToWatch)
-        )
-      )
-    )
-  }
+    val searchChannel = requestNewChannel()
 
-  val searchChannel = requestNewChannel()
-
-  override fun updateChannelFilters() {
-    searchChannel.typedFilters = createAnythingWithIDFilter()
-  }
-
-  fun search(eventId: String) {
-    try {
-      val hex = if (eventId.startsWith("npub") || eventId.startsWith("nsec")) {
-        decodePublicKey(eventId).toHex()
-      } else if (eventId.startsWith("note")) {
-        eventId.bechToBytes().toHex()
-      } else {
-        eventId
-      }
-      hexToWatch = hex
-      invalidateFilters()
-    } catch (e: Exception) {
-      // Usually when people add an incomplete npub or note.
+    override fun updateChannelFilters() {
+        searchChannel.typedFilters = createAnythingWithIDFilter()
     }
-  }
 
-  fun clear() {
-    hexToWatch = null
-  }
-}
+    fun search(searchString: String) {
+        this.searchString = searchString
+        invalidateFilters()
+    }
+
+    fun clear() {
+        searchString = null
+    }
+}

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

@@ -4,66 +4,66 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.JsonFilter
 
-object NostrSingleChannelDataSource: NostrDataSource("SingleChannelFeed") {
-  private var channelsToWatch = setOf<String>()
+object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
+    private var channelsToWatch = setOf<String>()
 
-  private fun createRepliesAndReactionsFilter(): TypedFilter? {
-    val reactionsToWatch = channelsToWatch.map { it }
+    private fun createRepliesAndReactionsFilter(): TypedFilter? {
+        val reactionsToWatch = channelsToWatch.map { it }
 
-    if (reactionsToWatch.isEmpty()) {
-      return null
+        if (reactionsToWatch.isEmpty()) {
+            return null
+        }
+
+        // downloads all the reactions to a given event.
+        return TypedFilter(
+            types = setOf(FeedType.PUBLIC_CHATS),
+            filter = JsonFilter(
+                kinds = listOf(ChannelMetadataEvent.kind),
+                tags = mapOf("e" to reactionsToWatch)
+            )
+        )
     }
 
-    // downloads all the reactions to a given event.
-    return TypedFilter(
-      types = setOf(FeedType.PUBLIC_CHATS),
-      filter = JsonFilter(
-        kinds = listOf(ChannelMetadataEvent.kind),
-        tags = mapOf("e" to reactionsToWatch)
-      )
-    )
-  }
+    fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
+        val directEventsToLoad = channelsToWatch
+            .map { LocalCache.getOrCreateChannel(it) }
+            .filter { it.notes.isEmpty() }
 
-  fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
-    val directEventsToLoad = channelsToWatch
-      .map { LocalCache.getOrCreateChannel(it) }
-      .filter { it.notes.isEmpty() }
+        val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
 
-    val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
+        if (interestedEvents.isEmpty()) {
+            return null
+        }
 
-    if (interestedEvents.isEmpty()) {
-      return null
+        // downloads linked events to this event.
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(ChannelCreateEvent.kind),
+                ids = interestedEvents.toList()
+            )
+        )
     }
 
-    // downloads linked events to this event.
-    return TypedFilter(
-      types = FeedType.values().toSet(),
-      filter = JsonFilter(
-        kinds = listOf(ChannelCreateEvent.kind),
-        ids = interestedEvents.toList()
-      )
-    )
-  }
+    val singleChannelChannel = requestNewChannel()
 
-  val singleChannelChannel = requestNewChannel()
+    override fun updateChannelFilters() {
+        val reactions = createRepliesAndReactionsFilter()
+        val missing = createLoadEventsIfNotLoadedFilter()
 
-  override fun updateChannelFilters() {
-    val reactions = createRepliesAndReactionsFilter()
-    val missing = createLoadEventsIfNotLoadedFilter()
+        singleChannelChannel.typedFilters = listOfNotNull(reactions, missing).ifEmpty { null }
+    }
 
-    singleChannelChannel.typedFilters = listOfNotNull(reactions, missing).ifEmpty { null }
-  }
+    fun add(eventId: String) {
+        channelsToWatch = channelsToWatch.plus(eventId)
+        invalidateFilters()
+    }
 
-  fun add(eventId: String) {
-    channelsToWatch = channelsToWatch.plus(eventId)
-    invalidateFilters()
-  }
-
-  fun remove(eventId: String) {
-    channelsToWatch = channelsToWatch.minus(eventId)
-    invalidateFilters()
-  }
-}
+    fun remove(eventId: String) {
+        channelsToWatch = channelsToWatch.minus(eventId)
+        invalidateFilters()
+    }
+}

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

@@ -1,6 +1,10 @@
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
+import com.vitorpamplona.amethyst.service.model.BadgeDefinitionEvent
+import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
@@ -10,136 +14,172 @@ import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import java.util.Date
-import nostr.postr.JsonFilter
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
-object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
-  private var eventsToWatch = setOf<Note>()
-  private var addressesToWatch = setOf<Note>()
+object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
+    private var eventsToWatch = setOf<Note>()
+    private var addressesToWatch = setOf<Note>()
 
-  private fun createAddressFilter(): List<TypedFilter>? {
-    val addressesToWatch = eventsToWatch.filter { it.address() != null } + addressesToWatch
+    private fun createTagToAddressFilter(): List<TypedFilter>? {
+        val addressesToWatch = eventsToWatch.filter { it.address() != null } + addressesToWatch
 
-    if (addressesToWatch.isEmpty()) {
-      return null
+        if (addressesToWatch.isEmpty()) {
+            return null
+        }
+
+        val now = Date().time / 1000
+
+        return addressesToWatch.filter {
+            val lastTime = it.lastReactionsDownloadTime
+            lastTime == null || lastTime < (now - 10)
+        }.mapNotNull {
+            it.address()?.let { aTag ->
+                TypedFilter(
+                    types = FeedType.values().toSet(),
+                    filter = JsonFilter(
+                        kinds = listOf(
+                            TextNoteEvent.kind, LongTextNoteEvent.kind,
+                            ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind,
+                            LnZapEvent.kind, LnZapRequestEvent.kind,
+                            BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind
+                        ),
+                        tags = mapOf("a" to listOf(aTag.toTag())),
+                        since = it.lastReactionsDownloadTime
+                    )
+                )
+            }
+        }
     }
 
-    val now = Date().time / 1000
+    private fun createAddressFilter(): List<TypedFilter>? {
+        val addressesToWatch = addressesToWatch.filter { it.event == null }
 
-    return addressesToWatch.filter {
-      val lastTime = it.lastReactionsDownloadTime
-      lastTime == null || lastTime < (now - 10)
-    }.mapNotNull {
-      it.address()?.let { aTag ->
-        TypedFilter(
-          types = FeedType.values().toSet(),
-          filter = JsonFilter(
-            kinds = listOf(
-              TextNoteEvent.kind, LongTextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind
-            ),
-            tags = mapOf("a" to listOf(aTag.toTag())),
-            since = it.lastReactionsDownloadTime
-          )
+        if (addressesToWatch.isEmpty()) {
+            return null
+        }
+
+        val now = Date().time / 1000
+
+        return addressesToWatch.filter {
+            val lastTime = it.lastReactionsDownloadTime
+            lastTime == null || lastTime < (now - 10)
+        }.mapNotNull {
+            it.address()?.let { aTag ->
+                TypedFilter(
+                    types = FeedType.values().toSet(),
+                    filter = JsonFilter(
+                        kinds = listOf(aTag.kind),
+                        tags = mapOf("d" to listOf(aTag.dTag)),
+                        authors = listOf(aTag.pubKeyHex.substring(0, 8))
+                    )
+                )
+            }
+        }
+    }
+
+    private fun createRepliesAndReactionsFilter(): List<TypedFilter>? {
+        val reactionsToWatch = eventsToWatch
+
+        if (reactionsToWatch.isEmpty()) {
+            return null
+        }
+
+        val now = Date().time / 1000
+
+        return reactionsToWatch.filter {
+            val lastTime = it.lastReactionsDownloadTime
+            lastTime == null || lastTime < (now - 10)
+        }.map {
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(
+                        TextNoteEvent.kind,
+                        LongTextNoteEvent.kind,
+                        ReactionEvent.kind,
+                        RepostEvent.kind,
+                        ReportEvent.kind,
+                        LnZapEvent.kind,
+                        LnZapRequestEvent.kind
+                    ),
+                    tags = mapOf("e" to listOf(it.idHex)),
+                    since = it.lastReactionsDownloadTime
+                )
+            )
+        }
+    }
+
+    fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter>? {
+        val directEventsToLoad = eventsToWatch
+            .filter { it.event == null }
+
+        val threadingEventsToLoad = eventsToWatch
+            .mapNotNull { it.replyTo }
+            .flatten()
+            .filter { it !is AddressableNote && it.event == null }
+
+        val interestedEvents =
+            (directEventsToLoad + threadingEventsToLoad)
+                .map { it.idHex }.toSet()
+
+        if (interestedEvents.isEmpty()) {
+            return null
+        }
+
+        // downloads linked events to this event.
+        return listOf(
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(
+                        TextNoteEvent.kind, LongTextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind,
+                        ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind, BadgeDefinitionEvent.kind, BadgeAwardEvent.kind, BadgeProfilesEvent.kind
+                    ),
+                    ids = interestedEvents.toList()
+                )
+            )
         )
-      }
-    }
-  }
-
-  private fun createRepliesAndReactionsFilter(): List<TypedFilter>? {
-    val reactionsToWatch = eventsToWatch
-
-    if (reactionsToWatch.isEmpty()) {
-      return null
     }
 
-    val now = Date().time / 1000
-
-    return reactionsToWatch.filter {
-      val lastTime = it.lastReactionsDownloadTime
-      lastTime == null || lastTime < (now - 10)
-    }.map {
-      TypedFilter(
-        types = FeedType.values().toSet(),
-        filter = JsonFilter(
-          kinds = listOf(
-            TextNoteEvent.kind, LongTextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind
-          ),
-          tags = mapOf("e" to listOf(it.idHex)),
-          since = it.lastReactionsDownloadTime
-        )
-      )
-    }
-  }
-
-  fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter>? {
-    val directEventsToLoad = eventsToWatch
-      .filter { it.event == null }
-
-    val threadingEventsToLoad = eventsToWatch
-      .mapNotNull { it.replyTo }
-      .flatten()
-      .filter { it.event == null }
-
-    val interestedEvents =
-      (directEventsToLoad + threadingEventsToLoad)
-      .map { it.idHex }.toSet()
-
-    if (interestedEvents.isEmpty()) {
-      return null
+    val singleEventChannel = requestNewChannel { time ->
+        eventsToWatch.forEach {
+            it.lastReactionsDownloadTime = time
+        }
+        // Many relays operate with limits in the amount of filters.
+        // As information comes, the filters will be rotated to get more data.
+        invalidateFilters()
     }
 
-    // downloads linked events to this event.
-    return listOf(
-      TypedFilter(
-        types = FeedType.values().toSet(),
-        filter = JsonFilter(
-          kinds = listOf(
-            TextNoteEvent.kind, LongTextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind,
-            ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind
-          ),
-          ids = interestedEvents.toList()
-        )
-      )
-    )
-  }
+    override fun updateChannelFilters() {
+        val reactions = createRepliesAndReactionsFilter()
+        val missing = createLoadEventsIfNotLoadedFilter()
+        val addresses = createAddressFilter()
+        val addressReactions = createTagToAddressFilter()
 
-  val singleEventChannel = requestNewChannel { time ->
-    eventsToWatch.forEach {
-      it.lastReactionsDownloadTime = time
+        singleEventChannel.typedFilters = listOfNotNull(reactions, missing, addresses, addressReactions).flatten().ifEmpty { null }
     }
-    // Many relays operate with limits in the amount of filters.
-    // As information comes, the filters will be rotated to get more data.
-    invalidateFilters()
-  }
 
-  override fun updateChannelFilters() {
-    val reactions = createRepliesAndReactionsFilter()
-    val missing = createLoadEventsIfNotLoadedFilter()
-    val addresses = createAddressFilter()
+    fun add(eventId: Note) {
+        eventsToWatch = eventsToWatch.plus(eventId)
+        invalidateFilters()
+    }
 
-    singleEventChannel.typedFilters = listOfNotNull(reactions, missing, addresses).flatten().ifEmpty { null }
-  }
+    fun remove(eventId: Note) {
+        eventsToWatch = eventsToWatch.minus(eventId)
+        invalidateFilters()
+    }
 
-  fun add(eventId: Note) {
-    eventsToWatch = eventsToWatch.plus(eventId)
-    invalidateFilters()
-  }
+    fun addAddress(aTag: Note) {
+        addressesToWatch = addressesToWatch.plus(aTag)
+        invalidateFilters()
+    }
 
-  fun remove(eventId: Note) {
-    eventsToWatch = eventsToWatch.minus(eventId)
-    invalidateFilters()
-  }
-
-  fun addAddress(aTag: Note) {
-    addressesToWatch = addressesToWatch.plus(aTag)
-    invalidateFilters()
-  }
-
-  fun removeAddress(aTag: Note) {
-    addressesToWatch = addressesToWatch.minus(aTag)
-    invalidateFilters()
-  }
-}
+    fun removeAddress(aTag: Note) {
+        addressesToWatch = addressesToWatch.minus(aTag)
+        invalidateFilters()
+    }
+}

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

@@ -1,65 +1,65 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.JsonFilter
-import nostr.postr.events.MetadataEvent
 
-object NostrSingleUserDataSource: NostrDataSource("SingleUserFeed") {
-  var usersToWatch = setOf<User>()
+object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
+    var usersToWatch = setOf<User>()
 
-  fun createUserFilter(): List<TypedFilter>? {
-    if (usersToWatch.isEmpty()) return null
+    fun createUserFilter(): List<TypedFilter>? {
+        if (usersToWatch.isEmpty()) return null
 
-    return usersToWatch.filter { it.info?.latestMetadata == null }.map {
-      TypedFilter(
-        types = FeedType.values().toSet(),
-        filter = JsonFilter(
-          kinds = listOf(MetadataEvent.kind),
-          authors = listOf(it.pubkeyHex),
-          limit = 1
-        )
-      )
+        return usersToWatch.filter { it.info?.latestMetadata == null }.map {
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(MetadataEvent.kind),
+                    authors = listOf(it.pubkeyHex),
+                    limit = 1
+                )
+            )
+        }
     }
-  }
 
-  fun createUserReportFilter(): List<TypedFilter>? {
-    if (usersToWatch.isEmpty()) return null
+    fun createUserReportFilter(): List<TypedFilter>? {
+        if (usersToWatch.isEmpty()) return null
 
-    return usersToWatch.map {
-      TypedFilter(
-        types = FeedType.values().toSet(),
-        filter = JsonFilter(
-          kinds = listOf(ReportEvent.kind),
-          tags = mapOf("p" to listOf(it.pubkeyHex)),
-          since = it.latestReportTime
-        )
-      )
+        return usersToWatch.map {
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(ReportEvent.kind),
+                    tags = mapOf("p" to listOf(it.pubkeyHex)),
+                    since = it.latestReportTime
+                )
+            )
+        }
     }
-  }
 
-  val userChannel = requestNewChannel(){
-    // Many relays operate with limits in the amount of filters.
-    // As information comes, the filters will be rotated to get more data.
-    invalidateFilters()
-  }
+    val userChannel = requestNewChannel() {
+        // Many relays operate with limits in the amount of filters.
+        // As information comes, the filters will be rotated to get more data.
+        invalidateFilters()
+    }
 
-  val userChannelOnce = requestNewChannel()
+    val userChannelOnce = requestNewChannel()
 
-  override fun updateChannelFilters() {
-    userChannel.typedFilters = listOfNotNull(createUserFilter()).flatten().ifEmpty { null }
-    userChannelOnce.typedFilters = listOfNotNull(createUserReportFilter()).flatten().ifEmpty { null }
-  }
+    override fun updateChannelFilters() {
+        userChannel.typedFilters = listOfNotNull(createUserFilter()).flatten().ifEmpty { null }
+        userChannelOnce.typedFilters = listOfNotNull(createUserReportFilter()).flatten().ifEmpty { null }
+    }
 
-  fun add(user: User) {
-    usersToWatch = usersToWatch.plus(user)
-    invalidateFilters()
-  }
+    fun add(user: User) {
+        usersToWatch = usersToWatch.plus(user)
+        invalidateFilters()
+    }
 
-  fun remove(user: User) {
-    usersToWatch = usersToWatch.minus(user)
-    invalidateFilters()
-  }
-}
+    fun remove(user: User) {
+        usersToWatch = usersToWatch.minus(user)
+        invalidateFilters()
+    }
+}

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

@@ -2,42 +2,42 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.ThreadAssembler
 import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.JsonFilter
 
-object NostrThreadDataSource: NostrDataSource("SingleThreadFeed") {
-  private var eventToWatch: String? = null
+object NostrThreadDataSource : NostrDataSource("SingleThreadFeed") {
+    private var eventToWatch: String? = null
 
-  fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
-    val threadToLoad = eventToWatch ?: return null
+    fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
+        val threadToLoad = eventToWatch ?: return null
 
-    val eventsToLoad = ThreadAssembler().findThreadFor(threadToLoad)
-      .filter { it.event == null }
-      .map { it.idHex }
-      .toSet()
-      .ifEmpty { null } ?: return null
+        val eventsToLoad = ThreadAssembler().findThreadFor(threadToLoad)
+            .filter { it.event == null }
+            .map { it.idHex }
+            .toSet()
+            .ifEmpty { null } ?: return null
 
-    return TypedFilter(
-      types = FeedType.values().toSet(),
-      filter = JsonFilter(
-        ids = eventsToLoad.map { it.substring(0, 8) }
-      )
-    )
-  }
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                ids = eventsToLoad.map { it.substring(0, 8) }
+            )
+        )
+    }
 
-  val loadEventsChannel = requestNewChannel(){
-    // Many relays operate with limits in the amount of filters.
-    // As information comes, the filters will be rotated to get more data.
-    invalidateFilters()
-  }
+    val loadEventsChannel = requestNewChannel() {
+        // Many relays operate with limits in the amount of filters.
+        // As information comes, the filters will be rotated to get more data.
+        invalidateFilters()
+    }
 
-  override fun updateChannelFilters() {
-    loadEventsChannel.typedFilters = listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
-  }
+    override fun updateChannelFilters() {
+        loadEventsChannel.typedFilters = listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
+    }
 
-  fun loadThread(noteId: String?) {
-    eventToWatch = noteId
+    fun loadThread(noteId: String?) {
+        eventToWatch = noteId
 
-    invalidateFilters()
-  }
-}
+        invalidateFilters()
+    }
+}

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

@@ -2,90 +2,116 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
+import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.JsonFilter
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.MetadataEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
-object NostrUserProfileDataSource: NostrDataSource("UserProfileFeed") {
-  var user: User? = null
+object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
+    var user: User? = null
 
-  fun loadUserProfile(userId: String?) {
-    if (userId != null) {
-      user = LocalCache.getOrCreateUser(userId)
-    } else {
-      user = null
+    fun loadUserProfile(userId: String?) {
+        if (userId != null) {
+            user = LocalCache.getOrCreateUser(userId)
+        } else {
+            user = null
+        }
+
+        resetFilters()
     }
 
-    resetFilters()
-  }
+    fun createUserInfoFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(MetadataEvent.kind),
+                authors = listOf(it.pubkeyHex),
+                limit = 1
+            )
+        )
+    }
 
-  fun createUserInfoFilter() = user?.let {
-    TypedFilter(
-      types = FeedType.values().toSet(),
-      filter = JsonFilter(
-        kinds = listOf(MetadataEvent.kind),
-        authors = listOf(it.pubkeyHex),
-        limit = 1
-      )
-    )
-  }
+    fun createUserPostsFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
+                authors = listOf(it.pubkeyHex),
+                limit = 200
+            )
+        )
+    }
 
-  fun createUserPostsFilter() = user?.let {
-    TypedFilter(
-      types = FeedType.values().toSet(),
-      filter = JsonFilter(
-        kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
-        authors = listOf(it.pubkeyHex),
-        limit = 200
-      )
-    )
-  }
+    fun createUserReceivedZapsFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(LnZapEvent.kind),
+                tags = mapOf("p" to listOf(it.pubkeyHex))
+            )
+        )
+    }
 
-  fun createUserReceivedZapsFilter() = user?.let {
-    TypedFilter(
-      types = FeedType.values().toSet(),
-      filter = JsonFilter(
-        kinds = listOf(LnZapEvent.kind),
-        tags = mapOf("p" to listOf(it.pubkeyHex))
-      )
-    )
-  }
+    fun createFollowFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(ContactListEvent.kind),
+                authors = listOf(it.pubkeyHex),
+                limit = 1
+            )
+        )
+    }
 
-  fun createFollowFilter() = user?.let {
-    TypedFilter(
-      types = FeedType.values().toSet(),
-      filter = JsonFilter(
-        kinds = listOf(ContactListEvent.kind),
-        authors = listOf(it.pubkeyHex),
-        limit = 1
-      )
-    )
-  }
+    fun createFollowersFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(ContactListEvent.kind),
+                tags = mapOf("p" to listOf(it.pubkeyHex))
+            )
+        )
+    }
 
-  fun createFollowersFilter() = user?.let {
-    TypedFilter(
-      types = FeedType.values().toSet(),
-      filter = JsonFilter(
-        kinds = listOf(ContactListEvent.kind),
-        tags = mapOf("p" to listOf(it.pubkeyHex))
-      )
-    )
-  }
+    fun createAcceptedAwardsFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(BadgeProfilesEvent.kind),
+                authors = listOf(it.pubkeyHex),
+                limit = 1
+            )
+        )
+    }
 
-  val userInfoChannel = requestNewChannel()
+    fun createReceivedAwardsFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(BadgeAwardEvent.kind),
+                tags = mapOf("p" to listOf(it.pubkeyHex)),
+                limit = 20
+            )
+        )
+    }
 
-  override fun updateChannelFilters() {
-    userInfoChannel.typedFilters = listOfNotNull(
-      createUserInfoFilter(),
-      createUserPostsFilter(),
-      createFollowFilter(),
-      createFollowersFilter(),
-      createUserReceivedZapsFilter()
-    ).ifEmpty { null }
-  }
-}
+    val userInfoChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        userInfoChannel.typedFilters = listOfNotNull(
+            createUserInfoFilter(),
+            createUserPostsFilter(),
+            createFollowFilter(),
+            createFollowersFilter(),
+            createUserReceivedZapsFilter(),
+            createAcceptedAwardsFilter(),
+            createReceivedAwardsFilter()
+        ).ifEmpty { null }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt

@@ -13,123 +13,122 @@ import com.linkedin.urls.detection.UrlDetectorOptions
 import java.util.regex.Pattern
 
 class ResultOrError(
-  var result: String?,
-  var sourceLang: String?,
-  var targetLang: String?,
-  var error: Exception?
+    var result: String?,
+    var sourceLang: String?,
+    var targetLang: String?,
+    var error: Exception?
 )
 
 object LanguageTranslatorService {
-  private val languageIdentification = LanguageIdentification.getClient()
-  val lnRegex = Pattern.compile("\\blnbc[a-z0-9]+\\b")
+    private val languageIdentification = LanguageIdentification.getClient()
+    val lnRegex = Pattern.compile("\\blnbc[a-z0-9]+\\b")
 
-  private val translators =
-    object : LruCache<TranslatorOptions, Translator>(10) {
-      override fun create(options: TranslatorOptions): Translator {
-        return Translation.getClient(options)
-      }
+    private val translators =
+        object : LruCache<TranslatorOptions, Translator>(10) {
+            override fun create(options: TranslatorOptions): Translator {
+                return Translation.getClient(options)
+            }
 
-      override fun entryRemoved(
-        evicted: Boolean,
-        key: TranslatorOptions,
-        oldValue: Translator,
-        newValue: Translator?
-      ) {
-        oldValue.close()
-      }
-    }
-
-  fun identifyLanguage(text: String): Task<String> {
-    return languageIdentification.identifyLanguage(text)
-  }
-
-  fun translate(text: String, source: String, target: String): Task<ResultOrError> {
-    val sourceLangCode = TranslateLanguage.fromLanguageTag(source)
-    val targetLangCode = TranslateLanguage.fromLanguageTag(target)
-
-    if (sourceLangCode == null || targetLangCode == null) {
-      return Tasks.forCanceled()
-    }
-
-    val options = TranslatorOptions.Builder()
-      .setSourceLanguage(sourceLangCode)
-      .setTargetLanguage(targetLangCode)
-      .build()
-
-    val translator = translators[options]
-
-    return translator.downloadModelIfNeeded().onSuccessTask {
-      val tasks = mutableListOf<Task<String>>()
-
-      val dict = lnDictionary(text) + urlDictionary(text)
-
-      for (paragraph in encodeDictionary(text, dict).split("\n")) {
-        tasks.add(translator.translate(paragraph))
-      }
-
-      Tasks.whenAll(tasks).continueWith {
-        val results: MutableList<String> = ArrayList()
-        for (task in tasks) {
-          var fixedText = task.result.replace("# [","#[") // fixes tags that always return with a space
-          results.add(decodeDictionary(fixedText, dict))
+            override fun entryRemoved(
+                evicted: Boolean,
+                key: TranslatorOptions,
+                oldValue: Translator,
+                newValue: Translator?
+            ) {
+                oldValue.close()
+            }
         }
-        ResultOrError(results.joinToString("\n"), source, target, null)
-      }
+
+    fun identifyLanguage(text: String): Task<String> {
+        return languageIdentification.identifyLanguage(text)
     }
-  }
 
-  private fun encodeDictionary(text: String, dict: Map<String, String>): String {
-    var newText = text
-    for (pair in dict) {
-      newText = newText.replace(pair.value, pair.key, true)
+    fun translate(text: String, source: String, target: String): Task<ResultOrError> {
+        val sourceLangCode = TranslateLanguage.fromLanguageTag(source)
+        val targetLangCode = TranslateLanguage.fromLanguageTag(target)
+
+        if (sourceLangCode == null || targetLangCode == null) {
+            return Tasks.forCanceled()
+        }
+
+        val options = TranslatorOptions.Builder()
+            .setSourceLanguage(sourceLangCode)
+            .setTargetLanguage(targetLangCode)
+            .build()
+
+        val translator = translators[options]
+
+        return translator.downloadModelIfNeeded().onSuccessTask {
+            val tasks = mutableListOf<Task<String>>()
+
+            val dict = lnDictionary(text) + urlDictionary(text)
+
+            for (paragraph in encodeDictionary(text, dict).split("\n")) {
+                tasks.add(translator.translate(paragraph))
+            }
+
+            Tasks.whenAll(tasks).continueWith {
+                val results: MutableList<String> = ArrayList()
+                for (task in tasks) {
+                    var fixedText = task.result.replace("# [", "#[") // fixes tags that always return with a space
+                    results.add(decodeDictionary(fixedText, dict))
+                }
+                ResultOrError(results.joinToString("\n"), source, target, null)
+            }
+        }
     }
-    return newText
-  }
 
-  private fun decodeDictionary(text: String, dict: Map<String, String>): String {
-    var newText = text
-    for (pair in dict) {
-      newText = newText.replace(pair.key, pair.value, true)
+    private fun encodeDictionary(text: String, dict: Map<String, String>): String {
+        var newText = text
+        for (pair in dict) {
+            newText = newText.replace(pair.value, pair.key, true)
+        }
+        return newText
     }
-    return newText
-  }
 
-  private fun lnDictionary(text: String): Map<String, String> {
-    val matcher = lnRegex.matcher(text)
-    val returningList = mutableMapOf<String, String>()
-    val counter = 0
-    while (matcher.find()) {
-      try {
-        val lnInvoice = matcher.group()
-        val short = "Amethystlnindexer${counter}"
-        returningList.put(short, lnInvoice)
-      } catch (e: Exception) {
-
-      }
+    private fun decodeDictionary(text: String, dict: Map<String, String>): String {
+        var newText = text
+        for (pair in dict) {
+            newText = newText.replace(pair.key, pair.value, true)
+        }
+        return newText
     }
-    return returningList
-  }
 
-  private fun urlDictionary(text: String): Map<String, String> {
-    val parser = UrlDetector(text, UrlDetectorOptions.Default)
-    val urlsInText = parser.detect()
-
-    val counter = 0
-
-    return urlsInText.filter { !it.originalUrl.contains("，") || !it.originalUrl.contains("。")  }.associate {
-      "Amethysturlindexer${counter}" to it.originalUrl
+    private fun lnDictionary(text: String): Map<String, String> {
+        val matcher = lnRegex.matcher(text)
+        val returningList = mutableMapOf<String, String>()
+        val counter = 0
+        while (matcher.find()) {
+            try {
+                val lnInvoice = matcher.group()
+                val short = "Amethystlnindexer$counter"
+                returningList.put(short, lnInvoice)
+            } catch (e: Exception) {
+            }
+        }
+        return returningList
     }
-  }
 
-  fun autoTranslate(text: String, dontTranslateFrom: Set<String>, translateTo: String): Task<ResultOrError> {
-    return identifyLanguage(text).onSuccessTask {
-      if (it == translateTo) {
-        Tasks.forCanceled()
-      } else if (it != "und" && !dontTranslateFrom.contains(it)) {
-        translate(text, it, translateTo)
-      } else {
-        Tasks.forCanceled()
-      }
+    private fun urlDictionary(text: String): Map<String, String> {
+        val parser = UrlDetector(text, UrlDetectorOptions.Default)
+        val urlsInText = parser.detect()
+
+        val counter = 0
+
+        return urlsInText.filter { !it.originalUrl.contains("，") || !it.originalUrl.contains("。") }.associate {
+            "Amethysturlindexer$counter" to it.originalUrl
+        }
     }
-  }
-}
+
+    fun autoTranslate(text: String, dontTranslateFrom: Set<String>, translateTo: String): Task<ResultOrError> {
+        return identifyLanguage(text).onSuccessTask {
+            if (it == translateTo) {
+                Tasks.forCanceled()
+            } else if (it != "und" && !dontTranslateFrom.contains(it)) {
+                translate(text, it, translateTo)
+            } else {
+                Tasks.forCanceled()
+            }
+        }
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.vitorpamplona.amethyst.service.lnurl
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import java.net.URLEncoder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -13,151 +12,166 @@ import okhttp3.Callback
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
+import java.net.URLEncoder
 
 class LightningAddressResolver {
-  val client = OkHttpClient.Builder().build()
+    val client = OkHttpClient.Builder().build()
 
-  fun assembleUrl(lnaddress: String): String? {
-    val parts = lnaddress.split("@")
+    fun assembleUrl(lnaddress: String): String? {
+        val parts = lnaddress.split("@")
 
-    if (parts.size == 2) {
-      return "https://${parts[1]}/.well-known/lnurlp/${parts[0]}"
-    }
-
-    if (lnaddress.toLowerCase().startsWith("lnurl")) {
-      return try {
-        String(Bech32.decodeBytes(lnaddress, false).second)
-      } catch (e: Exception) {
-        null
-      }
-    }
-
-    return null
-  }
-
-  fun fetchLightningAddressJson(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-    val scope = CoroutineScope(Job() + Dispatchers.IO)
-    scope.launch {
-      fetchLightningAddressJsonSuspend(lnaddress, onSuccess, onError)
-    }
-  }
-
-  private suspend fun fetchLightningAddressJsonSuspend(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-    val url = assembleUrl(lnaddress)
-
-    if (url == null) {
-      onError("Could not assemble LNUrl from Lightning Address \"${lnaddress}\". Check the user's setup")
-      return
-    }
-
-    withContext(Dispatchers.IO) {
-      val request: Request = Request.Builder().url(url).build()
-
-      client.newCall(request).enqueue(object : Callback {
-        override fun onResponse(call: Call, response: Response) {
-          response.use {
-            if (it.isSuccessful)
-              onSuccess(it.body.string())
-            else
-              onError("Could not resolve ${lnaddress}. Error: ${it.code}. Check if the server up and if the lightning address ${lnaddress} is correct")
-          }
+        if (parts.size == 2) {
+            return "https://${parts[1]}/.well-known/lnurlp/${parts[0]}"
         }
 
-        override fun onFailure(call: Call, e: java.io.IOException) {
-          onError("Could not resolve ${url}. Check if the server up and if the lightning address ${lnaddress} is correct")
-          e.printStackTrace()
-        }
-      })
-    }
-  }
-
-  fun fetchLightningInvoice(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-    val scope = CoroutineScope(Job() + Dispatchers.IO)
-    scope.launch {
-      fetchLightningInvoiceSuspend(lnCallback, milliSats, message, nostrRequest, onSuccess, onError)
-    }
-  }
-
-  private suspend fun fetchLightningInvoiceSuspend(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-    withContext(Dispatchers.IO) {
-      val encodedMessage = URLEncoder.encode(message, "utf-8")
-
-      val urlBinder = if (lnCallback.contains("?")) "&" else "?"
-      var url = "$lnCallback${urlBinder}amount=$milliSats&comment=$encodedMessage"
-
-      if (nostrRequest != null) {
-        val encodedNostrRequest = URLEncoder.encode(nostrRequest, "utf-8")
-        url += "&nostr=$encodedNostrRequest"
-      }
-
-      val request: Request = Request.Builder().url(url).build()
-
-      client.newCall(request).enqueue(object : Callback {
-        override fun onResponse(call: Call, response: Response) {
-          response.use {
-            if (it.isSuccessful)
-              onSuccess(response.body.string())
-            else
-              onError("Could not fetch invoice from $lnCallback")
-          }
-        }
-
-        override fun onFailure(call: Call, e: java.io.IOException) {
-          onError("Could not fetch an invoice from $lnCallback. Message ${e.message}")
-          e.printStackTrace()
-        }
-      })
-    }
-  }
-
-  fun lnAddressToLnUrl(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-    fetchLightningAddressJson(lnaddress,
-      onSuccess = {
-        onSuccess(Bech32.encodeBytes("lnurl",it.toByteArray(), Bech32.Encoding.Bech32))
-      },
-      onError = onError
-    )
-  }
-
-  fun lnAddressInvoice(lnaddress: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-    val mapper = jacksonObjectMapper()
-
-    fetchLightningAddressJson(lnaddress,
-      onSuccess = {
-        val lnurlp = try {
-          mapper.readTree(it)
-        } catch (t: Throwable) {
-          onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
-          null
-        }
-
-        val callback = lnurlp?.get("callback")?.asText()
-
-        if (callback == null) {
-          onError("Callback URL not found in the User's lightning address server configuration")
-        }
-
-        val allowsNostr = lnurlp?.get("allowsNostr")?.asBoolean() ?: false
-
-        callback?.let { callback ->
-          fetchLightningInvoice(callback, milliSats, message, if (allowsNostr) nostrRequest else null,
-            onSuccess = {
-              val lnInvoice = try {
-                mapper.readTree(it)
-              } catch (t: Throwable) {
-                onError("Error Parsing JSON from Lightning Address's invoice fetch. Check the user's lightning setup")
+        if (lnaddress.lowercase().startsWith("lnurl")) {
+            return try {
+                String(Bech32.decodeBytes(lnaddress, false).second)
+            } catch (e: Exception) {
                 null
-              }
+            }
+        }
 
-              lnInvoice?.get("pr")?.asText()?.let { pr ->
-                onSuccess(pr)
-              } ?: onError("Invoice Not Created (element pr not found in the resulting JSON)")
+        return null
+    }
+
+    fun fetchLightningAddressJson(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            fetchLightningAddressJsonSuspend(lnaddress, onSuccess, onError)
+        }
+    }
+
+    private suspend fun fetchLightningAddressJsonSuspend(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val url = assembleUrl(lnaddress)
+
+        if (url == null) {
+            onError("Could not assemble LNUrl from Lightning Address \"${lnaddress}\". Check the user's setup")
+            return
+        }
+
+        withContext(Dispatchers.IO) {
+            val request: Request = Request.Builder()
+                .header("User-Agent", "Amethyst")
+                .url(url)
+                .build()
+
+            client.newCall(request).enqueue(object : Callback {
+                override fun onResponse(call: Call, response: Response) {
+                    response.use {
+                        if (it.isSuccessful) {
+                            onSuccess(it.body.string())
+                        } else {
+                            onError("Could not resolve $lnaddress. Error: ${it.code}. Check if the server up and if the lightning address $lnaddress is correct")
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call, e: java.io.IOException) {
+                    onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
+                    e.printStackTrace()
+                }
+            })
+        }
+    }
+
+    fun fetchLightningInvoice(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            fetchLightningInvoiceSuspend(lnCallback, milliSats, message, nostrRequest, onSuccess, onError)
+        }
+    }
+
+    private suspend fun fetchLightningInvoiceSuspend(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        withContext(Dispatchers.IO) {
+            val encodedMessage = URLEncoder.encode(message, "utf-8")
+
+            val urlBinder = if (lnCallback.contains("?")) "&" else "?"
+            var url = "$lnCallback${urlBinder}amount=$milliSats&comment=$encodedMessage"
+
+            if (nostrRequest != null) {
+                val encodedNostrRequest = URLEncoder.encode(nostrRequest, "utf-8")
+                url += "&nostr=$encodedNostrRequest"
+            }
+
+            val request: Request = Request.Builder()
+                .header("User-Agent", "Amethyst")
+                .url(url)
+                .build()
+
+            client.newCall(request).enqueue(object : Callback {
+                override fun onResponse(call: Call, response: Response) {
+                    response.use {
+                        if (it.isSuccessful) {
+                            onSuccess(response.body.string())
+                        } else {
+                            onError("Could not fetch invoice from $lnCallback")
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call, e: java.io.IOException) {
+                    onError("Could not fetch an invoice from $lnCallback. Message ${e.message}")
+                    e.printStackTrace()
+                }
+            })
+        }
+    }
+
+    fun lnAddressToLnUrl(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        fetchLightningAddressJson(
+            lnaddress,
+            onSuccess = {
+                onSuccess(Bech32.encodeBytes("lnurl", it.toByteArray(), Bech32.Encoding.Bech32))
             },
             onError = onError
-          )
-        }
-      },
-      onError = onError
-    )
-  }
-}
+        )
+    }
+
+    fun lnAddressInvoice(lnaddress: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val mapper = jacksonObjectMapper()
+
+        fetchLightningAddressJson(
+            lnaddress,
+            onSuccess = { lnAddressJson ->
+                val lnurlp = try {
+                    mapper.readTree(lnAddressJson)
+                } catch (t: Throwable) {
+                    onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
+                    null
+                }
+
+                val callback = lnurlp?.get("callback")?.asText()
+
+                if (callback == null) {
+                    onError("Callback URL not found in the User's lightning address server configuration")
+                }
+
+                val allowsNostr = lnurlp?.get("allowsNostr")?.asBoolean() ?: false
+
+                callback?.let { cb ->
+                    fetchLightningInvoice(
+                        cb,
+                        milliSats,
+                        message,
+                        if (allowsNostr) nostrRequest else null,
+                        onSuccess = {
+                            val lnInvoice = try {
+                                mapper.readTree(it)
+                            } catch (t: Throwable) {
+                                onError("Error Parsing JSON from Lightning Address's invoice fetch. Check the user's lightning setup")
+                                null
+                            }
+
+                            lnInvoice?.get("pr")?.asText()?.let { pr ->
+                                onSuccess(pr)
+                            } ?: onError("Invoice Not Created (element pr not found in the resulting JSON)")
+                        },
+                        onError = onError
+                    )
+                }
+            },
+            onError = onError
+        )
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LnInvoiceUtil.kt

@@ -6,151 +6,168 @@ import java.util.regex.Pattern
 
 /** based on litecoinj */
 object LnInvoiceUtil {
-  private val invoicePattern = Pattern.compile("lnbc((?<amount>\\d+)(?<multiplier>[munp])?)?1[^1\\s]+", Pattern.CASE_INSENSITIVE)
+    private val invoicePattern = Pattern.compile("lnbc((?<amount>\\d+)(?<multiplier>[munp])?)?1[^1\\s]+", Pattern.CASE_INSENSITIVE)
 
-  /** The Bech32 character set for encoding.  */
-  private const val CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
+    /** The Bech32 character set for encoding.  */
+    private const val CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
 
-  /** The Bech32 character set for decoding.  */
-  private val CHARSET_REV = byteArrayOf(
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    15, -1, 10, 17, 21, 20, 26, 30, 7, 5, -1, -1, -1, -1, -1, -1,
-    -1, 29, -1, 24, 13, 25, 9, 8, 23, -1, 18, 22, 31, 27, 19, -1,
-    1, 0, 3, 16, 11, 28, 12, 14, 6, 4, 2, -1, -1, -1, -1, -1,
-    -1, 29, -1, 24, 13, 25, 9, 8, 23, -1, 18, 22, 31, 27, 19, -1,
-    1, 0, 3, 16, 11, 28, 12, 14, 6, 4, 2, -1, -1, -1, -1, -1
-  )
+    /** The Bech32 character set for decoding.  */
+    private val CHARSET_REV = byteArrayOf(
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        15, -1, 10, 17, 21, 20, 26, 30, 7, 5, -1, -1, -1, -1, -1, -1,
+        -1, 29, -1, 24, 13, 25, 9, 8, 23, -1, 18, 22, 31, 27, 19, -1,
+        1, 0, 3, 16, 11, 28, 12, 14, 6, 4, 2, -1, -1, -1, -1, -1,
+        -1, 29, -1, 24, 13, 25, 9, 8, 23, -1, 18, 22, 31, 27, 19, -1,
+        1, 0, 3, 16, 11, 28, 12, 14, 6, 4, 2, -1, -1, -1, -1, -1
+    )
 
-
-  /** Find the polynomial with value coefficients mod the generator as 30-bit.  */
-  private fun polymod(values: ByteArray): Int {
-    var c = 1
-    for (v_i in values) {
-      val c0 = c ushr 25 and 0xff
-      c = c and 0x1ffffff shl 5 xor (v_i.toInt() and 0xff)
-      if (c0 and 1 != 0) c = c xor 0x3b6a57b2
-      if (c0 and 2 != 0) c = c xor 0x26508e6d
-      if (c0 and 4 != 0) c = c xor 0x1ea119fa
-      if (c0 and 8 != 0) c = c xor 0x3d4233dd
-      if (c0 and 16 != 0) c = c xor 0x2a1462b3
-    }
-    return c
-  }
-
-  /** Expand a HRP for use in checksum computation.  */
-  private fun expandHrp(hrp: String): ByteArray {
-    val hrpLength = hrp.length
-    val ret = ByteArray(hrpLength * 2 + 1)
-    for (i in 0 until hrpLength) {
-      val c = hrp[i].code and 0x7f // Limit to standard 7-bit ASCII
-      ret[i] = (c ushr 5 and 0x07).toByte()
-      ret[i + hrpLength + 1] = (c and 0x1f).toByte()
-    }
-    ret[hrpLength] = 0
-    return ret
-  }
-
-  /** Verify a checksum.  */
-  private fun verifyChecksum(hrp: String, values: ByteArray): Boolean {
-    val hrpExpanded: ByteArray = expandHrp(hrp)
-    val combined = ByteArray(hrpExpanded.size + values.size)
-    System.arraycopy(hrpExpanded, 0, combined, 0, hrpExpanded.size)
-    System.arraycopy(values, 0, combined, hrpExpanded.size, values.size)
-    return polymod(combined) == 1
-  }
-
-  class AddressFormatException(message: String): Exception(message) {
-
-  }
-
-  fun decodeUnlimitedLength(invoice: String): Boolean {
-    var lower = false
-    var upper = false
-    for (i in 0 until invoice.length) {
-      val c = invoice[i]
-      if (c.code < 33 || c.code > 126) throw AddressFormatException("Invalid character: $c, pos: $i")
-      if (c in 'a'..'z') {
-        if (upper) throw AddressFormatException("Invalid character: $c, pos: $i")
-        lower = true
-      }
-      if (c in 'A'..'Z') {
-        if (lower) throw AddressFormatException("Invalid character: $c, pos: $i")
-        upper = true
-      }
-    }
-    val pos = invoice.lastIndexOf('1')
-    if (pos < 1) throw AddressFormatException("Missing human-readable part")
-    val dataPartLength = invoice.length - 1 - pos
-    if (dataPartLength < 6) throw AddressFormatException("Data part too short: $dataPartLength")
-    val values = ByteArray(dataPartLength)
-    for (i in 0 until dataPartLength) {
-      val c = invoice[i + pos + 1]
-      if (CHARSET_REV.get(c.code).toInt() == -1) throw AddressFormatException("Invalid character: " + c + ", pos: " + (i + pos + 1))
-      values[i] = CHARSET_REV.get(c.code)
-    }
-    val hrp = invoice.substring(0, pos).lowercase(Locale.ROOT)
-    if (!verifyChecksum(hrp, values)) throw AddressFormatException("Invalid Checksum")
-    return true
-  }
-
-  /**
-   * Parses invoice amount according to
-   * https://github.com/lightningnetwork/lightning-rfc/blob/master/11-payment-encoding.md#human-readable-part
-   * @return invoice amount in bitcoins, zero if the invoice has no amount
-   * @throws RuntimeException if invoice format is incorrect
-   */
-  fun getAmount(invoice: String): BigDecimal {
-    try {
-      decodeUnlimitedLength(invoice) // checksum must match
-    } catch (e: AddressFormatException) {
-      throw IllegalArgumentException("Cannot decode invoice", e)
+    /** Find the polynomial with value coefficients mod the generator as 30-bit.  */
+    private fun polymod(values: ByteArray): Int {
+        var c = 1
+        for (v_i in values) {
+            val c0 = c ushr 25 and 0xff
+            c = c and 0x1ffffff shl 5 xor (v_i.toInt() and 0xff)
+            if (c0 and 1 != 0) c = c xor 0x3b6a57b2
+            if (c0 and 2 != 0) c = c xor 0x26508e6d
+            if (c0 and 4 != 0) c = c xor 0x1ea119fa
+            if (c0 and 8 != 0) c = c xor 0x3d4233dd
+            if (c0 and 16 != 0) c = c xor 0x2a1462b3
+        }
+        return c
     }
 
-    val matcher = invoicePattern.matcher(invoice)
-    require(matcher.matches()) { "Failed to match HRP pattern" }
-    val amountGroup = matcher.group("amount")
-    val multiplierGroup = matcher.group("multiplier")
-    if (amountGroup == null) {
-      return BigDecimal.ZERO
+    /** Expand a HRP for use in checksum computation.  */
+    private fun expandHrp(hrp: String): ByteArray {
+        val hrpLength = hrp.length
+        val ret = ByteArray(hrpLength * 2 + 1)
+        for (i in 0 until hrpLength) {
+            val c = hrp[i].code and 0x7f // Limit to standard 7-bit ASCII
+            ret[i] = (c ushr 5 and 0x07).toByte()
+            ret[i + hrpLength + 1] = (c and 0x1f).toByte()
+        }
+        ret[hrpLength] = 0
+        return ret
     }
-    val amount = BigDecimal(amountGroup)
-    if (multiplierGroup == null) {
-      return amount
-    }
-    require(!(multiplierGroup == "p" && amountGroup[amountGroup.length - 1] != '0')) { "sub-millisatoshi amount" }
-    return amount.multiply(multiplier(multiplierGroup))
-  }
 
-  fun getAmountInSats(invoice: String): BigDecimal {
-    return getAmount(invoice).multiply(BigDecimal(100000000))
-  }
-
-  private fun multiplier(multiplier: String): BigDecimal {
-    return when (multiplier.toLowerCase()) {
-      "m" -> BigDecimal("0.001")
-      "u" -> BigDecimal("0.000001")
-      "n" -> BigDecimal("0.000000001")
-      "p" -> BigDecimal("0.000000000001")
-      else -> throw IllegalArgumentException("Invalid multiplier: $multiplier")
+    /** Verify a checksum.  */
+    private fun verifyChecksum(hrp: String, values: ByteArray): Boolean {
+        val hrpExpanded: ByteArray = expandHrp(hrp)
+        val combined = ByteArray(hrpExpanded.size + values.size)
+        System.arraycopy(hrpExpanded, 0, combined, 0, hrpExpanded.size)
+        System.arraycopy(values, 0, combined, hrpExpanded.size, values.size)
+        return polymod(combined) == 1
     }
-  }
 
-  /**
-   * Finds LN invoice in the provided input string and returns it.
-   * For example for input = "aaa bbb lnbc1xxx ccc" it will return "lnbc1xxx"
-   * It will only return the first invoice found in the input.
-   *
-   * @return the invoice if it was found. null for null input or if no invoice is found
-   */
-  fun findInvoice(input: String?): String? {
-    if (input == null) {
-      return null
+    class AddressFormatException(message: String) : Exception(message)
+
+    fun decodeUnlimitedLength(invoice: String): Boolean {
+        var lower = false
+        var upper = false
+        for (i in 0 until invoice.length) {
+            val c = invoice[i]
+            if (c.code < 33 || c.code > 126) throw AddressFormatException("Invalid character: $c, pos: $i")
+            if (c in 'a'..'z') {
+                if (upper) throw AddressFormatException("Invalid character: $c, pos: $i")
+                lower = true
+            }
+            if (c in 'A'..'Z') {
+                if (lower) throw AddressFormatException("Invalid character: $c, pos: $i")
+                upper = true
+            }
+        }
+        val pos = invoice.lastIndexOf('1')
+        if (pos < 1) throw AddressFormatException("Missing human-readable part")
+        val dataPartLength = invoice.length - 1 - pos
+        if (dataPartLength < 6) throw AddressFormatException("Data part too short: $dataPartLength")
+        val values = ByteArray(dataPartLength)
+        for (i in 0 until dataPartLength) {
+            val c = invoice[i + pos + 1]
+            if (CHARSET_REV.get(c.code).toInt() == -1) throw AddressFormatException("Invalid character: " + c + ", pos: " + (i + pos + 1))
+            values[i] = CHARSET_REV.get(c.code)
+        }
+        val hrp = invoice.substring(0, pos).lowercase(Locale.ROOT)
+        if (!verifyChecksum(hrp, values)) throw AddressFormatException("Invalid Checksum")
+        return true
     }
-    val matcher = invoicePattern.matcher(input)
-    return if (matcher.find()) {
-      matcher.group()
-    } else null
-  }
-}
+
+    /**
+     * Parses invoice amount according to
+     * https://github.com/lightningnetwork/lightning-rfc/blob/master/11-payment-encoding.md#human-readable-part
+     * @return invoice amount in bitcoins, zero if the invoice has no amount
+     * @throws RuntimeException if invoice format is incorrect
+     */
+    fun getAmount(invoice: String): BigDecimal {
+        try {
+            decodeUnlimitedLength(invoice) // checksum must match
+        } catch (e: AddressFormatException) {
+            throw IllegalArgumentException("Cannot decode invoice", e)
+        }
+
+        val matcher = invoicePattern.matcher(invoice)
+        require(matcher.matches()) { "Failed to match HRP pattern" }
+        val amountGroup = matcher.group("amount")
+        val multiplierGroup = matcher.group("multiplier")
+        if (amountGroup == null) {
+            return BigDecimal.ZERO
+        }
+        val amount = BigDecimal(amountGroup)
+        if (multiplierGroup == null) {
+            return amount
+        }
+        require(!(multiplierGroup == "p" && amountGroup[amountGroup.length - 1] != '0')) { "sub-millisatoshi amount" }
+        return amount.multiply(multiplier(multiplierGroup))
+    }
+
+    fun getAmountInSats(invoice: String): BigDecimal {
+        return getAmount(invoice).multiply(BigDecimal(100000000))
+    }
+
+    private fun multiplier(multiplier: String): BigDecimal {
+        return when (multiplier.lowercase()) {
+            "m" -> BigDecimal("0.001")
+            "u" -> BigDecimal("0.000001")
+            "n" -> BigDecimal("0.000000001")
+            "p" -> BigDecimal("0.000000000001")
+            else -> throw IllegalArgumentException("Invalid multiplier: $multiplier")
+        }
+    }
+
+    /**
+     * Finds LN invoice in the provided input string and returns it.
+     * For example for input = "aaa bbb lnbc1xxx ccc" it will return "lnbc1xxx"
+     * It will only return the first invoice found in the input.
+     *
+     * @return the invoice if it was found. null for null input or if no invoice is found
+     */
+    fun findInvoice(input: String?): String? {
+        if (input == null) {
+            return null
+        }
+        val matcher = invoicePattern.matcher(input)
+        return if (matcher.find()) {
+            matcher.group()
+        } else {
+            null
+        }
+    }
+
+    /**
+     * If the string contains an LN invoice, returns a Pair of the start and end
+     * positions of the invoice in the string. Otherwise, returns (0, 0). This is
+     * used to ensure we don't accidentally cut an invoice in the middle when taking
+     * only a portion of the available text.
+     */
+    fun locateInvoice(input: String?): Pair<Int, Int> {
+        if (input == null) {
+            return Pair(0, 0)
+        }
+        val matcher = invoicePattern.matcher(input)
+        return if (matcher.find()) {
+            Pair(matcher.start(), matcher.end())
+        } else {
+            Pair(0, 0)
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ATag.kt

@@ -3,45 +3,54 @@ package com.vitorpamplona.amethyst.service.model
 import android.util.Log
 import com.vitorpamplona.amethyst.model.toByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
-import com.vitorpamplona.amethyst.service.NIP19TLVTypes
-import com.vitorpamplona.amethyst.service.parseTLV
-import com.vitorpamplona.amethyst.service.toInt32
+import com.vitorpamplona.amethyst.service.nip19.Tlv
 import fr.acinq.secp256k1.Hex
 import nostr.postr.Bech32
 import nostr.postr.bechToBytes
 import nostr.postr.toByteArray
 
-data class ATag(val kind: Int, val pubKeyHex: String, val dTag: String) {
+data class ATag(val kind: Int, val pubKeyHex: String, val dTag: String, val relay: String?) {
     fun toTag() = "$kind:$pubKeyHex:$dTag"
 
     fun toNAddr(): String {
         val kind = kind.toByteArray()
-        val addr = pubKeyHex.toByteArray()
+        val author = pubKeyHex.toByteArray()
         val dTag = dTag.toByteArray(Charsets.UTF_8)
+        val relay = relay?.toByteArray(Charsets.UTF_8)
 
-        val fullArray =
-            byteArrayOf(NIP19TLVTypes.SPECIAL.id, dTag.size.toByte()) + dTag +
-              byteArrayOf(NIP19TLVTypes.AUTHOR.id, addr.size.toByte()) + addr +
-              byteArrayOf(NIP19TLVTypes.KIND.id, kind.size.toByte()) + kind
+        var fullArray = byteArrayOf(Tlv.Type.SPECIAL.id, dTag.size.toByte()) + dTag
+
+        if (relay != null) {
+            fullArray = fullArray + byteArrayOf(Tlv.Type.RELAY.id, relay.size.toByte()) + relay
+        }
+
+        fullArray = fullArray +
+            byteArrayOf(Tlv.Type.AUTHOR.id, author.size.toByte()) + author +
+            byteArrayOf(Tlv.Type.KIND.id, kind.size.toByte()) + kind
 
         return Bech32.encodeBytes(hrp = "naddr", fullArray, Bech32.Encoding.Bech32)
     }
 
     companion object {
-        fun parse(address: String): ATag? {
-            return if (address.startsWith("naddr") || address.startsWith("nostr:naddr"))
-                parseNAddr(address)
-            else
-                parseAtag(address)
+        fun isATag(key: String): Boolean {
+            return key.startsWith("naddr1") || key.contains(":")
         }
 
-        fun parseAtag(atag: String): ATag? {
+        fun parse(address: String, relay: String?): ATag? {
+            return if (address.startsWith("naddr") || address.startsWith("nostr:naddr")) {
+                parseNAddr(address)
+            } else {
+                parseAtag(address, relay)
+            }
+        }
+
+        fun parseAtag(atag: String, relay: String?): ATag? {
             return try {
                 val parts = atag.split(":")
-              Hex.decode(parts[1])
-              ATag(parts[0].toInt(), parts[1], parts[2])
+                Hex.decode(parts[1])
+                ATag(parts[0].toInt(), parts[1], parts[2], relay)
             } catch (t: Throwable) {
-              Log.w("Address", "Error parsing A Tag: ${atag}: ${t.message}")
+                Log.w("ATag", "Error parsing A Tag: $atag: ${t.message}")
                 null
             }
         }
@@ -51,22 +60,22 @@ data class ATag(val kind: Int, val pubKeyHex: String, val dTag: String) {
                 val key = naddr.removePrefix("nostr:")
 
                 if (key.startsWith("naddr")) {
-                    val tlv = parseTLV(key.bechToBytes())
-                    val d = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toString(Charsets.UTF_8) ?: ""
-                    val relay = tlv.get(NIP19TLVTypes.RELAY.id)?.get(0)?.toString(Charsets.UTF_8)
-                    val author = tlv.get(NIP19TLVTypes.AUTHOR.id)?.get(0)?.toHexKey()
-                    val kind = tlv.get(NIP19TLVTypes.KIND.id)?.get(0)?.let { toInt32(it) }
+                    val tlv = Tlv.parse(key.bechToBytes())
+                    val d = tlv.get(Tlv.Type.SPECIAL.id)?.get(0)?.toString(Charsets.UTF_8) ?: ""
+                    val relay = tlv.get(Tlv.Type.RELAY.id)?.get(0)?.toString(Charsets.UTF_8)
+                    val author = tlv.get(Tlv.Type.AUTHOR.id)?.get(0)?.toHexKey()
+                    val kind = tlv.get(Tlv.Type.KIND.id)?.get(0)?.let { Tlv.toInt32(it) }
 
-                    if (kind != null && author != null)
-                        return ATag(kind, author, d)
+                    if (kind != null && author != null) {
+                        return ATag(kind, author, d, relay)
+                    }
                 }
-
             } catch (e: Throwable) {
-                println("Issue trying to Decode NIP19 ${this}: ${e.message}")
-                //e.printStackTrace()
+                Log.w("ATag", "Issue trying to Decode NIP19 $this: ${e.message}")
+                // e.printStackTrace()
             }
 
             return null
         }
     }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/BadgeAwardEvent.kt

@@ -0,0 +1,24 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+
+class BadgeAwardEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun awardees() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun awardDefinition() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    }
+
+    companion object {
+        const val kind = 8
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/BadgeDefinitionEvent.kt

@@ -0,0 +1,24 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+
+class BadgeDefinitionEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun name() = tags.filter { it.firstOrNull() == "name" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+    fun thumb() = tags.filter { it.firstOrNull() == "thumb" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+    fun image() = tags.filter { it.firstOrNull() == "image" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+    fun description() = tags.filter { it.firstOrNull() == "description" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+
+    companion object {
+        const val kind = 30009
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/BadgeProfilesEvent.kt

@@ -0,0 +1,27 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+
+class BadgeProfilesEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun badgeAwardEvents() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    fun badgeAwardDefinitions() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    }
+
+    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    fun address() = ATag(kind, pubKey, dTag(), null)
+
+    companion object {
+        const val kind = 30008
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelCreateEvent.kt

@@ -1,47 +1,48 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
-import java.util.Date
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.events.MetadataEvent
+import java.util.Date
 
-class ChannelCreateEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
-  createdAt: Long,
-  tags: List<List<String>>,
-  content: String,
-  sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
-  fun channelInfo() = try {
-    MetadataEvent.gson.fromJson(content, ChannelData::class.java)
-  } catch (e: Exception) {
-    Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
-    ChannelData(null, null, null)
-  }
-
-  companion object {
-    const val kind = 40
-
-    fun create(channelInfo: ChannelData?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelCreateEvent {
-      val content = try {
-        if (channelInfo != null)
-          gson.toJson(channelInfo)
-        else
-          ""
-      } catch (t: Throwable) {
-        Log.e("ChannelCreateEvent", "Couldn't parse channel information", t)
-        ""
-      }
-
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags = emptyList<List<String>>()
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
+class ChannelCreateEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun channelInfo() = try {
+        MetadataEvent.gson.fromJson(content, ChannelData::class.java)
+    } catch (e: Exception) {
+        Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
+        ChannelData(null, null, null)
     }
-  }
 
-  data class ChannelData(var name: String?, var about: String?, var picture: String?)
-}
+    companion object {
+        const val kind = 40
+
+        fun create(channelInfo: ChannelData?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelCreateEvent {
+            val content = try {
+                if (channelInfo != null) {
+                    gson.toJson(channelInfo)
+                } else {
+                    ""
+                }
+            } catch (t: Throwable) {
+                Log.e("ChannelCreateEvent", "Couldn't parse channel information", t)
+                ""
+            }
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = emptyList<List<String>>()
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ChannelCreateEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+
+    data class ChannelData(var name: String?, var about: String?, var picture: String?)
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelHideMessageEvent.kt

@@ -1,33 +1,33 @@
 package com.vitorpamplona.amethyst.service.model
 
-import java.util.Date
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import nostr.postr.events.Event
+import java.util.Date
 
-class ChannelHideMessageEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
-  createdAt: Long,
-  tags: List<List<String>>,
-  content: String,
-  sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
-  fun eventsToHide() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+class ChannelHideMessageEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun eventsToHide() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
 
-  companion object {
-    const val kind = 43
+    companion object {
+        const val kind = 43
 
-    fun create(reason: String, messagesToHide: List<String>?, mentions: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelHideMessageEvent {
-      val content = reason
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags =
-        messagesToHide?.map {
-          listOf("e", it)
-        } ?: emptyList()
+        fun create(reason: String, messagesToHide: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelHideMessageEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags =
+                messagesToHide?.map {
+                    listOf("e", it)
+                } ?: emptyList()
 
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
+            val id = generateId(pubKey, createdAt, kind, tags, reason)
+            val sig = Utils.sign(id, privateKey)
+            return ChannelHideMessageEvent(id.toHexKey(), pubKey, createdAt, tags, reason, sig.toHexKey())
+        }
     }
-  }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelMessageEvent.kt

@@ -1,41 +1,42 @@
 package com.vitorpamplona.amethyst.service.model
 
-import java.util.Date
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import nostr.postr.events.Event
+import java.util.Date
 
-class ChannelMessageEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
-  createdAt: Long,
-  tags: List<List<String>>,
-  content: String,
-  sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+class ChannelMessageEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-  fun channel() = tags.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1) ?: tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
-  fun replyTos() = tags.filter { it.getOrNull(1) != channel() }.mapNotNull { it.getOrNull(1) }
-  fun mentions() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun channel() = tags.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1) ?: tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    fun replyTos() = tags.filter { it.getOrNull(1) != channel() }.mapNotNull { it.getOrNull(1) }
+    fun mentions() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
 
-  companion object {
-    const val kind = 42
+    companion object {
+        const val kind = 42
 
-    fun create(message: String, channel: String, replyTos: List<String>? = null, mentions: List<String>? = null, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMessageEvent {
-      val content = message
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags = mutableListOf(
-        listOf("e", channel, "", "root")
-      )
-      replyTos?.forEach {
-        tags.add(listOf("e", it))
-      }
-      mentions?.forEach {
-        tags.add(listOf("p", it))
-      }
+        fun create(message: String, channel: String, replyTos: List<String>? = null, mentions: List<String>? = null, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMessageEvent {
+            val content = message
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf(
+                listOf("e", channel, "", "root")
+            )
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
 
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ChannelMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
     }
-  }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelMetadataEvent.kt

@@ -1,43 +1,44 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
-import java.util.Date
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.events.MetadataEvent
+import java.util.Date
 
-class ChannelMetadataEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
-  createdAt: Long,
-  tags: List<List<String>>,
-  content: String,
-  sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
-  fun channel() = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
-  fun channelInfo() =
-    try {
-      MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)
-    } catch (e: Exception) {
-      Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
-      ChannelCreateEvent.ChannelData(null, null, null)
+class ChannelMetadataEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun channel() = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    fun channelInfo() =
+        try {
+            MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)
+        } catch (e: Exception) {
+            Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
+            ChannelCreateEvent.ChannelData(null, null, null)
+        }
+
+    companion object {
+        const val kind = 41
+
+        fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannelIdHex: String, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMetadataEvent {
+            val content =
+                if (newChannelInfo != null) {
+                    gson.toJson(newChannelInfo)
+                } else {
+                    ""
+                }
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf(listOf("e", originalChannelIdHex, "", "root"))
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ChannelMetadataEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
     }
-
-  companion object {
-    const val kind = 41
-
-    fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannelIdHex: String, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMetadataEvent {
-      val content =
-        if (newChannelInfo != null)
-          gson.toJson(newChannelInfo)
-        else
-          ""
-
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags = listOf( listOf("e", originalChannelIdHex, "", "root") )
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
-    }
-  }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelMuteUserEvent.kt

@@ -1,35 +1,35 @@
 package com.vitorpamplona.amethyst.service.model
 
-import java.util.Date
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import nostr.postr.events.Event
+import java.util.Date
 
-class ChannelMuteUserEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
-  createdAt: Long,
-  tags: List<List<String>>,
-  content: String,
-  sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+class ChannelMuteUserEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-  fun usersToMute() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun usersToMute() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
 
+    companion object {
+        const val kind = 44
 
-  companion object {
-    const val kind = 44
+        fun create(reason: String, usersToMute: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMuteUserEvent {
+            val content = reason
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags =
+                usersToMute?.map {
+                    listOf("p", it)
+                } ?: emptyList()
 
-    fun create(reason: String, usersToMute: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMuteUserEvent {
-      val content = reason
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags =
-        usersToMute?.map {
-          listOf("p", it)
-        } ?: emptyList()
-
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ChannelMuteUserEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
     }
-  }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ContactListEvent.kt

@@ -0,0 +1,62 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.google.gson.reflect.TypeToken
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+data class Contact(val pubKeyHex: String, val relayUri: String?)
+
+class ContactListEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun follows() = try {
+        tags.filter { it[0] == "p" }.map { Contact(it[1], it.getOrNull(2)) }
+    } catch (e: Exception) {
+        Log.e("ContactListEvent", "can't parse tags as follows: $tags", e)
+        null
+    }
+
+    fun relayUse() = try {
+        if (content.isNotEmpty()) {
+            gson.fromJson(content, object : TypeToken<Map<String, ReadWrite>>() {}.type)
+        } else {
+            null
+        }
+    } catch (e: Exception) {
+        Log.e("ContactListEvent", "can't parse content as relay lists: $tags", e)
+        null
+    }
+
+    companion object {
+        const val kind = 3
+
+        fun create(follows: List<Contact>, relayUse: Map<String, ReadWrite>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ContactListEvent {
+            val content = if (relayUse != null) {
+                gson.toJson(relayUse)
+            } else {
+                ""
+            }
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = follows.map {
+                if (it.relayUri != null) {
+                    listOf("p", it.pubKeyHex, it.relayUri)
+                } else {
+                    listOf("p", it.pubKeyHex)
+                }
+            }
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ContactListEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+
+    data class ReadWrite(val read: Boolean, val write: Boolean)
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/DeletionEvent.kt

@@ -0,0 +1,30 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+class DeletionEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun deleteEvents() = tags.map { it[1] }
+
+    companion object {
+        const val kind = 5
+
+        fun create(deleteEvents: List<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): DeletionEvent {
+            val content = ""
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = deleteEvents.map { listOf("e", it) }
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return DeletionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/Event.kt

@@ -0,0 +1,210 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.google.gson.*
+import com.google.gson.annotations.SerializedName
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import fr.acinq.secp256k1.Hex
+import fr.acinq.secp256k1.Secp256k1
+import nostr.postr.Utils
+import nostr.postr.toHex
+import java.lang.reflect.Type
+import java.security.MessageDigest
+import java.util.*
+
+open class Event(
+    val id: HexKey,
+    @SerializedName("pubkey") val pubKey: HexKey,
+    @SerializedName("created_at") val createdAt: Long,
+    val kind: Int,
+    val tags: List<List<String>>,
+    val content: String,
+    val sig: HexKey
+) : EventInterface {
+    override fun id(): HexKey = id
+
+    override fun pubKey(): HexKey = pubKey
+
+    override fun createdAt(): Long = createdAt
+
+    override fun kind(): Int = kind
+
+    override fun tags(): List<List<String>> = tags
+
+    override fun content(): String = content
+
+    override fun sig(): HexKey = sig
+
+    override fun toJson(): String = gson.toJson(this)
+
+    /**
+     * Checks if the ID is correct and then if the pubKey's secret key signed the event.
+     */
+    override fun checkSignature() {
+        if (!id.contentEquals(generateId())) {
+            throw Exception(
+                """|Unexpected ID.
+                   |  Event: ${toJson()}
+                   |  Actual ID: $id
+                   |  Generated: ${generateId()}
+                """.trimIndent()
+            )
+        }
+        if (!secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))) {
+            throw Exception("""Bad signature!""")
+        }
+    }
+
+    override fun hasValidSignature(): Boolean {
+        if (!id.contentEquals(generateId())) {
+            return false
+        }
+
+        return secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))
+    }
+
+    private fun generateId(): String {
+        val rawEvent = listOf(0, pubKey, createdAt, kind, tags, content)
+
+        // GSON decided to hardcode these replacements.
+        // They break Nostr's hash check.
+        // These lines revert their code.
+        // https://github.com/google/gson/issues/2295
+        val rawEventJson = gson.toJson(rawEvent)
+            .replace("\\u2028", "\u2028")
+            .replace("\\u2029", "\u2029")
+
+        return sha256.digest(rawEventJson.toByteArray()).toHexKey()
+    }
+
+    private class EventDeserializer : JsonDeserializer<Event> {
+        override fun deserialize(
+            json: JsonElement,
+            typeOfT: Type?,
+            context: JsonDeserializationContext?
+        ): Event {
+            val jsonObject = json.asJsonObject
+            return Event(
+                id = jsonObject.get("id").asString,
+                pubKey = jsonObject.get("pubkey").asString,
+                createdAt = jsonObject.get("created_at").asLong,
+                kind = jsonObject.get("kind").asInt,
+                tags = jsonObject.get("tags").asJsonArray.map {
+                    it.asJsonArray.mapNotNull { s -> if (s.isJsonNull) null else s.asString }
+                },
+                content = jsonObject.get("content").asString,
+                sig = jsonObject.get("sig").asString
+            )
+        }
+    }
+
+    private class EventSerializer : JsonSerializer<Event> {
+        override fun serialize(
+            src: Event,
+            typeOfSrc: Type?,
+            context: JsonSerializationContext?
+        ): JsonElement {
+            return JsonObject().apply {
+                addProperty("id", src.id)
+                addProperty("pubkey", src.pubKey)
+                addProperty("created_at", src.createdAt)
+                addProperty("kind", src.kind)
+                add(
+                    "tags",
+                    JsonArray().also { jsonTags ->
+                        src.tags.forEach { tag ->
+                            jsonTags.add(
+                                JsonArray().also { jsonTagElement ->
+                                    tag.forEach { tagElement ->
+                                        jsonTagElement.add(tagElement)
+                                    }
+                                }
+                            )
+                        }
+                    }
+                )
+                addProperty("content", src.content)
+                addProperty("sig", src.sig)
+            }
+        }
+    }
+
+    private class ByteArrayDeserializer : JsonDeserializer<ByteArray> {
+        override fun deserialize(
+            json: JsonElement,
+            typeOfT: Type?,
+            context: JsonDeserializationContext?
+        ): ByteArray = Hex.decode(json.asString)
+    }
+
+    private class ByteArraySerializer : JsonSerializer<ByteArray> {
+        override fun serialize(
+            src: ByteArray,
+            typeOfSrc: Type?,
+            context: JsonSerializationContext?
+        ) = JsonPrimitive(src.toHex())
+    }
+
+    companion object {
+        private val secp256k1 = Secp256k1.get()
+
+        val sha256: MessageDigest = MessageDigest.getInstance("SHA-256")
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(Event::class.java, EventSerializer())
+            .registerTypeAdapter(Event::class.java, EventDeserializer())
+            .registerTypeAdapter(ByteArray::class.java, ByteArraySerializer())
+            .registerTypeAdapter(ByteArray::class.java, ByteArrayDeserializer())
+            .create()
+
+        fun fromJson(json: String, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
+
+        fun fromJson(json: JsonElement, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
+
+        fun Event.getRefinedEvent(lenient: Boolean = false): Event = when (kind) {
+            BadgeAwardEvent.kind -> BadgeAwardEvent(id, pubKey, createdAt, tags, content, sig)
+            BadgeDefinitionEvent.kind -> BadgeDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
+            BadgeProfilesEvent.kind -> BadgeProfilesEvent(id, pubKey, createdAt, tags, content, sig)
+
+            ChannelCreateEvent.kind -> ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelHideMessageEvent.kind -> ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelMessageEvent.kind -> ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelMetadataEvent.kind -> ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelMuteUserEvent.kind -> ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
+            ContactListEvent.kind -> ContactListEvent(id, pubKey, createdAt, tags, content, sig)
+            DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)
+
+            LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapRequestEvent.kind -> LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
+            LongTextNoteEvent.kind -> LongTextNoteEvent(id, pubKey, createdAt, tags, content, sig)
+            MetadataEvent.kind -> MetadataEvent(id, pubKey, createdAt, tags, content, sig)
+            PrivateDmEvent.kind -> PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
+            ReactionEvent.kind -> ReactionEvent(id, pubKey, createdAt, tags, content, sig)
+            RecommendRelayEvent.kind -> RecommendRelayEvent(id, pubKey, createdAt, tags, content, sig, lenient)
+            ReportEvent.kind -> ReportEvent(id, pubKey, createdAt, tags, content, sig)
+            RepostEvent.kind -> RepostEvent(id, pubKey, createdAt, tags, content, sig)
+            TextNoteEvent.kind -> TextNoteEvent(id, pubKey, createdAt, tags, content, sig)
+            else -> this
+        }
+
+        fun generateId(pubKey: HexKey, createdAt: Long, kind: Int, tags: List<List<String>>, content: String): ByteArray {
+            val rawEvent = listOf(
+                0,
+                pubKey,
+                createdAt,
+                kind,
+                tags,
+                content
+            )
+            val rawEventJson = gson.toJson(rawEvent)
+            return sha256.digest(rawEventJson.toByteArray())
+        }
+
+        fun create(privateKey: ByteArray, kind: Int, tags: List<List<String>> = emptyList(), content: String = "", createdAt: Long = Date().time / 1000): Event {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = Companion.generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey).toHexKey()
+            return Event(id.toHexKey(), pubKey, createdAt, kind, tags, content, sig)
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/EventInterface.kt

@@ -0,0 +1,25 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+
+interface EventInterface {
+    fun id(): HexKey
+
+    fun pubKey(): HexKey
+
+    fun createdAt(): Long
+
+    fun kind(): Int
+
+    fun tags(): List<List<String>>
+
+    fun content(): String
+
+    fun sig(): HexKey
+
+    fun toJson(): String
+
+    fun checkSignature()
+
+    fun hasValidSignature(): Boolean
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt

@@ -1,41 +1,71 @@
 package com.vitorpamplona.amethyst.service.model
 
+import android.util.Log
+import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.relays.Client
 import java.math.BigDecimal
-import nostr.postr.events.Event
 
-class LnZapEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
-  createdAt: Long,
-  tags: List<List<String>>,
-  content: String,
-  sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+class LnZapEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : LnZapEventInterface, Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-  fun zappedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-  fun zappedAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    override fun zappedPost() = tags
+        .filter { it.firstOrNull() == "e" }
+        .mapNotNull { it.getOrNull(1) }
 
-  fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull { it.getOrNull(1) }.mapNotNull { ATag.parse(it) }
+    override fun zappedAuthor() = tags
+        .filter { it.firstOrNull() == "p" }
+        .mapNotNull { it.getOrNull(1) }
 
-  fun lnInvoice() = tags.filter { it.firstOrNull() == "bolt11" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
-  fun preimage() = tags.filter { it.firstOrNull() == "preimage" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+    override fun taggedAddresses(): List<ATag> = tags
+        .filter { it.firstOrNull() == "a" }
+        .mapNotNull {
+            val aTagValue = it.getOrNull(1)
+            val relay = it.getOrNull(2)
 
-  fun description() = tags.filter { it.firstOrNull() == "description" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+            if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+        }
 
-  // Keeps this as a field because it's a heavier function used everywhere.
-  val amount = lnInvoice()?.let { LnInvoiceUtil.getAmountInSats(it) }
-
-  fun containedPost() = try {
-    description()?.let {
-      fromJson(it, Client.lenient)
+    override fun amount(): BigDecimal? {
+        return amount
     }
-  } catch (e: Exception) {
-    null
-  }
 
-  companion object {
-    const val kind = 9735
-  }
-}
+    // Keeps this as a field because it's a heavier function used everywhere.
+    val amount by lazy {
+        try {
+            lnInvoice()?.let { LnInvoiceUtil.getAmountInSats(it) }
+        } catch (e: Exception) {
+            Log.e("LnZapEvent", "Failed to Parse LnInvoice ${description()}", e)
+            null
+        }
+    }
+
+    override fun containedPost(): Event? = try {
+        description()?.let {
+            fromJson(it, Client.lenient)
+        }
+    } catch (e: Exception) {
+        Log.e("LnZapEvent", "Failed to Parse Contained Post ${description()}", e)
+        null
+    }
+
+    private fun lnInvoice(): String? = tags
+        .filter { it.firstOrNull() == "bolt11" }
+        .mapNotNull { it.getOrNull(1) }
+        .firstOrNull()
+
+    private fun description(): String? = tags
+        .filter { it.firstOrNull() == "description" }
+        .mapNotNull { it.getOrNull(1) }
+        .firstOrNull()
+
+    companion object {
+        const val kind = 9735
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEventInterface.kt

@@ -0,0 +1,16 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.math.BigDecimal
+
+interface LnZapEventInterface : EventInterface {
+
+    fun zappedPost(): List<String>
+
+    fun zappedAuthor(): List<String>
+
+    fun taggedAddresses(): List<ATag>
+
+    fun amount(): BigDecimal?
+
+    fun containedPost(): Event?
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt

@@ -1,54 +1,59 @@
 package com.vitorpamplona.amethyst.service.model
 
-import java.util.Date
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.toHex
+import java.util.Date
 
-class LnZapRequestEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
-  createdAt: Long,
-  tags: List<List<String>>,
-  content: String,
-  sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
-  fun zappedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-  fun zappedAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-  fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull { it.getOrNull(1) }.mapNotNull { ATag.parse(it) }
+class LnZapRequestEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun zappedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    fun zappedAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
 
-  companion object {
-    const val kind = 9734
-
-    fun create(originalNote: Event, relays: Set<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent {
-      val content = ""
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      var tags = listOf(
-        listOf("e", originalNote.id.toHex()),
-        listOf("p", originalNote.pubKey.toHex()),
-        listOf("relays") + relays
-      )
-      if (originalNote is LongTextNoteEvent) {
-        tags = tags + listOf( listOf("a", originalNote.address().toTag()) )
-      }
-
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
     }
 
-    fun create(userHex: String, relays: Set<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent {
-      val content = ""
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags = listOf(
-        listOf("p", userHex),
-        listOf("relays") + relays
-      )
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
+    companion object {
+        const val kind = 9734
+
+        fun create(originalNote: EventInterface, relays: Set<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent {
+            val content = ""
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var tags = listOf(
+                listOf("e", originalNote.id()),
+                listOf("p", originalNote.pubKey()),
+                listOf("relays") + relays
+            )
+            if (originalNote is LongTextNoteEvent) {
+                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+
+        fun create(userHex: String, relays: Set<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent {
+            val content = ""
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf(
+                listOf("p", userHex),
+                listOf("relays") + relays
+            )
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
     }
-  }
 }
 
 /*
@@ -83,4 +88,4 @@ class LnZapRequestEvent (
   ]
   ]
 }
-*/
+*/

app/src/main/java/com/vitorpamplona/amethyst/service/model/LongTextNoteEvent.kt

@@ -1,23 +1,29 @@
 package com.vitorpamplona.amethyst.service.model
 
+import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.toHexKey
-import java.util.Date
 import nostr.postr.Utils
-import nostr.postr.events.Event
+import java.util.Date
 
 class LongTextNoteEvent(
-    id: ByteArray,
-    pubKey: ByteArray,
+    id: HexKey,
+    pubKey: HexKey,
     createdAt: Long,
     tags: List<List<String>>,
     content: String,
-    sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
     fun replyTos() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
     fun mentions() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    }
 
     fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
-    fun address() = ATag(kind, pubKey.toHexKey(), dTag())
+    fun address() = ATag(kind, pubKey, dTag(), null)
 
     fun topics() = tags.filter { it.firstOrNull() == "t" }.mapNotNull { it.getOrNull(1) }
     fun title() = tags.filter { it.firstOrNull() == "title" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
@@ -34,7 +40,7 @@ class LongTextNoteEvent(
         const val kind = 30023
 
         fun create(msg: String, replyTos: List<String>?, mentions: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LongTextNoteEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey)
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
             replyTos?.forEach {
                 tags.add(listOf("e", it))
@@ -44,7 +50,7 @@ class LongTextNoteEvent(
             }
             val id = generateId(pubKey, createdAt, kind, tags, msg)
             val sig = Utils.sign(id, privateKey)
-            return LongTextNoteEvent(id, pubKey, createdAt, tags, msg, sig)
+            return LongTextNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
         }
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/model/MetadataEvent.kt

@@ -0,0 +1,182 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.google.gson.Gson
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+data class ContactMetaData(
+    val name: String,
+    val picture: String,
+    val about: String,
+    val nip05: String?
+)
+
+abstract class IdentityClaim(
+    var identity: String,
+    var proof: String
+) {
+    abstract fun toProofUrl(): String
+    abstract fun toIcon(): Int
+    abstract fun toDescriptor(): Int
+    abstract fun platform(): String
+
+    fun platformIdentity() = "${platform()}:$identity"
+
+    companion object {
+        fun create(platformIdentity: String, proof: String): IdentityClaim? {
+            val (platform, identity) = platformIdentity.split(':')
+
+            return when (platform.lowercase()) {
+                GitHubIdentity.platform -> GitHubIdentity(identity, proof)
+                TwitterIdentity.platform -> TwitterIdentity(identity, proof)
+                TelegramIdentity.platform -> TelegramIdentity(identity, proof)
+                MastodonIdentity.platform -> MastodonIdentity(identity, proof)
+                else -> throw IllegalArgumentException("Platform $platform not supported")
+            }
+        }
+    }
+}
+
+class GitHubIdentity(
+    identity: String,
+    proof: String
+) : IdentityClaim(identity, proof) {
+    override fun toProofUrl() = "https://gist.github.com/$identity/$proof"
+
+    override fun platform() = platform
+    override fun toIcon() = R.drawable.github
+    override fun toDescriptor() = R.string.github
+
+    companion object {
+        val platform = "github"
+
+        fun parseProofUrl(proofUrl: String): GitHubIdentity? {
+            return try {
+                if (proofUrl.isBlank()) return null
+                val path = proofUrl.removePrefix("https://gist.github.com/").split("?")[0].split("/")
+
+                GitHubIdentity(path[0], path[1])
+            } catch (e: Exception) {
+                null
+            }
+        }
+    }
+}
+
+class TwitterIdentity(
+    identity: String,
+    proof: String
+) : IdentityClaim(identity, proof) {
+    override fun toProofUrl() = "https://twitter.com/$identity/status/$proof"
+
+    override fun platform() = platform
+    override fun toIcon() = R.drawable.twitter
+    override fun toDescriptor() = R.string.twitter
+
+    companion object {
+        val platform = "twitter"
+
+        fun parseProofUrl(proofUrl: String): TwitterIdentity? {
+            return try {
+                if (proofUrl.isBlank()) return null
+                val path = proofUrl.removePrefix("https://twitter.com/").split("?")[0].split("/")
+
+                TwitterIdentity(path[0], path[2])
+            } catch (e: Exception) {
+                null
+            }
+        }
+    }
+}
+
+class TelegramIdentity(
+    identity: String,
+    proof: String
+) : IdentityClaim(identity, proof) {
+    override fun toProofUrl() = "https://t.me/$proof"
+
+    override fun platform() = platform
+    override fun toIcon() = R.drawable.telegram
+    override fun toDescriptor() = R.string.telegram
+
+    companion object {
+        val platform = "telegram"
+    }
+}
+
+class MastodonIdentity(
+    identity: String,
+    proof: String
+) : IdentityClaim(identity, proof) {
+    override fun toProofUrl() = "https://$identity/$proof"
+
+    override fun platform() = platform
+    override fun toIcon() = R.drawable.mastodon
+    override fun toDescriptor() = R.string.mastodon
+
+    companion object {
+        val platform = "mastodon"
+
+        fun parseProofUrl(proofUrl: String): MastodonIdentity? {
+            return try {
+                if (proofUrl.isBlank()) return null
+                val path = proofUrl.removePrefix("https://").split("?")[0].split("/")
+
+                return MastodonIdentity("${path[0]}/${path[1]}", path[2])
+            } catch (e: Exception) {
+                null
+            }
+        }
+    }
+}
+
+class MetadataEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun contactMetaData() = try {
+        gson.fromJson(content, ContactMetaData::class.java)
+    } catch (e: Exception) {
+        Log.e("MetadataEvent", "Can't parse $content", e)
+        null
+    }
+
+    fun identityClaims() = tags.filter { it.firstOrNull() == "i" }.mapNotNull {
+        try {
+            IdentityClaim.create(it.get(1), it.get(2))
+        } catch (e: Exception) {
+            Log.e("MetadataEvent", "Can't parse identity [${it.joinToString { "," }}]", e)
+            null
+        }
+    }
+
+    companion object {
+        const val kind = 0
+        val gson = Gson()
+
+        fun create(contactMetaData: ContactMetaData, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): MetadataEvent {
+            return create(gson.toJson(contactMetaData), identities, privateKey, createdAt = createdAt)
+        }
+
+        fun create(contactMetaData: String, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): MetadataEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf<List<String>>()
+
+            identities.forEach {
+                tags.add(listOf("i", it.platformIdentity(), it.proof))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, contactMetaData)
+            val sig = Utils.sign(id, privateKey)
+            return MetadataEvent(id.toHexKey(), pubKey, createdAt, tags, contactMetaData, sig.toHexKey())
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/PrivateDmEvent.kt

@@ -0,0 +1,87 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import fr.acinq.secp256k1.Hex
+import nostr.postr.Utils
+import nostr.postr.toHex
+import java.util.Date
+
+class PrivateDmEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    /**
+     * This may or may not be the actual recipient's pub key. The event is intended to look like a
+     * nip-04 EncryptedDmEvent but may omit the recipient, too. This value can be queried and used
+     * for initial messages.
+     */
+    fun recipientPubKey() = tags.firstOrNull { it.firstOrNull() == "p" }?.run { Hex.decode(this[1]).toHexKey() } // makes sure its a valid one
+
+    /**
+     * To be fully compatible with nip-04, we read e-tags that are in violation to nip-18.
+     *
+     * Nip-18 messages should refer to other events by inline references in the content like
+     * `[](e/c06f795e1234a9a1aecc731d768d4f3ca73e80031734767067c82d67ce82e506).
+     */
+    fun replyTo() = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+
+    fun plainContent(privKey: ByteArray, pubKey: ByteArray): String? {
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey)
+
+            val retVal = Utils.decrypt(content, sharedSecret)
+
+            if (retVal.startsWith(nip18Advertisement)) {
+                retVal.substring(16)
+            } else {
+                retVal
+            }
+        } catch (e: Exception) {
+            Log.w("PrivateDM", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    companion object {
+        const val kind = 4
+
+        const val nip18Advertisement = "[//]: # (nip18)\n"
+
+        fun create(
+            recipientPubKey: ByteArray,
+            msg: String,
+            replyTos: List<String>? = null,
+            mentions: List<String>? = null,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000,
+            publishedRecipientPubKey: ByteArray? = null,
+            advertiseNip18: Boolean = true
+        ): PrivateDmEvent {
+            val content = Utils.encrypt(
+                if (advertiseNip18) { nip18Advertisement } else { "" } + msg,
+                privateKey,
+                recipientPubKey
+            )
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf<List<String>>()
+            publishedRecipientPubKey?.let {
+                tags.add(listOf("p", publishedRecipientPubKey.toHex()))
+            }
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return PrivateDmEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ReactionEvent.kt

@@ -1,45 +1,50 @@
 package com.vitorpamplona.amethyst.service.model
 
-import java.util.Date
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.toHex
+import java.util.Date
 
-class ReactionEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
-  createdAt: Long,
-  tags: List<List<String>>,
-  content: String,
-  sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+class ReactionEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-  fun originalPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-  fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-  fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull { it.getOrNull(1) }.mapNotNull { ATag.parse(it) }
+    fun originalPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
 
-  companion object {
-    const val kind = 7
-
-    fun createWarning(originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
-      return create("\u26A0\uFE0F", originalNote, privateKey, createdAt)
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
     }
 
-    fun createLike(originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
-      return create("+", originalNote, privateKey, createdAt)
+    companion object {
+        const val kind = 7
+
+        fun createWarning(originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
+            return create("\u26A0\uFE0F", originalNote, privateKey, createdAt)
+        }
+
+        fun createLike(originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
+            return create("+", originalNote, privateKey, createdAt)
+        }
+
+        fun create(content: String, originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+
+            var tags = listOf(listOf("e", originalNote.id()), listOf("p", originalNote.pubKey()))
+            if (originalNote is LongTextNoteEvent) {
+                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ReactionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
     }
-
-    fun create(content: String, originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
-      val pubKey = Utils.pubkeyCreate(privateKey)
-
-      var tags = listOf( listOf("e", originalNote.id.toHex()), listOf("p", originalNote.pubKey.toHex()))
-      if (originalNote is LongTextNoteEvent) {
-        tags = tags + listOf( listOf("a", originalNote.address().toTag()) )
-      }
-
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return ReactionEvent(id, pubKey, createdAt, tags, content, sig)
-    }
-  }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/RecommendRelayEvent.kt

@@ -0,0 +1,37 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.net.URI
+import java.util.Date
+
+class RecommendRelayEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey,
+    val lenient: Boolean = false
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun relay() = if (lenient) {
+        URI.create(content.trim())
+    } else {
+        URI.create(content)
+    }
+
+    companion object {
+        const val kind = 2
+
+        fun create(relay: URI, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RecommendRelayEvent {
+            val content = relay.toString()
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf<List<String>>()
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return RecommendRelayEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ReportEvent.kt

@@ -1,94 +1,99 @@
 package com.vitorpamplona.amethyst.service.model
 
-import java.util.Date
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.toHex
+import java.util.Date
 
 data class ReportedKey(val key: String, val reportType: ReportEvent.ReportType)
 
 // NIP 56 event.
-class ReportEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
-  createdAt: Long,
-  tags: List<List<String>>,
-  content: String,
-  sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+class ReportEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-  private fun defaultReportType(): ReportType {
-    // Works with old and new structures for report.
-    var reportType = tags.filter { it.firstOrNull() == "report" }.mapNotNull { it.getOrNull(1) }.map { ReportType.valueOf(it.toUpperCase()) }.firstOrNull()
-    if (reportType == null) {
-      reportType = tags.mapNotNull { it.getOrNull(2) }.map { ReportType.valueOf(it.toUpperCase()) }.firstOrNull()
-    }
-    if (reportType == null) {
-      reportType = ReportType.SPAM
-    }
-    return reportType
-  }
-
-  fun reportedPost() = tags
-    .filter { it.firstOrNull() == "e" && it.getOrNull(1) != null }
-    .map {
-      ReportedKey(
-        it[1],
-        it.getOrNull(2)?.toUpperCase()?.let { it1 -> ReportType.valueOf(it1) }?: defaultReportType()
-      )
+    private fun defaultReportType(): ReportType {
+        // Works with old and new structures for report.
+        var reportType = tags.filter { it.firstOrNull() == "report" }.mapNotNull { it.getOrNull(1) }.map { ReportType.valueOf(it.uppercase()) }.firstOrNull()
+        if (reportType == null) {
+            reportType = tags.mapNotNull { it.getOrNull(2) }.map { ReportType.valueOf(it.uppercase()) }.firstOrNull()
+        }
+        if (reportType == null) {
+            reportType = ReportType.SPAM
+        }
+        return reportType
     }
 
-  fun reportedAuthor() = tags
-    .filter { it.firstOrNull() == "p" && it.getOrNull(1) != null }
-    .map {
-      ReportedKey(
-        it[1],
-        it.getOrNull(2)?.toUpperCase()?.let { it1 -> ReportType.valueOf(it1) }?: defaultReportType()
-      )
+    fun reportedPost() = tags
+        .filter { it.firstOrNull() == "e" && it.getOrNull(1) != null }
+        .map {
+            ReportedKey(
+                it[1],
+                it.getOrNull(2)?.uppercase()?.let { it1 -> ReportType.valueOf(it1) } ?: defaultReportType()
+            )
+        }
+
+    fun reportedAuthor() = tags
+        .filter { it.firstOrNull() == "p" && it.getOrNull(1) != null }
+        .map {
+            ReportedKey(
+                it[1],
+                it.getOrNull(2)?.uppercase()?.let { it1 -> ReportType.valueOf(it1) } ?: defaultReportType()
+            )
+        }
+
+    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
     }
 
-  fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull { it.getOrNull(1) }.mapNotNull { ATag.parse(it) }
+    companion object {
+        const val kind = 1984
 
-  companion object {
-    const val kind = 1984
+        fun create(reportedPost: EventInterface, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
+            val content = ""
 
-    fun create(reportedPost: Event, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
-      val content = ""
+            val reportPostTag = listOf("e", reportedPost.id(), type.name.lowercase())
+            val reportAuthorTag = listOf("p", reportedPost.pubKey(), type.name.lowercase())
 
-      val reportPostTag = listOf("e", reportedPost.id.toHex(), type.name.toLowerCase())
-      val reportAuthorTag = listOf("p", reportedPost.pubKey.toHex(), type.name.toLowerCase())
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var tags: List<List<String>> = listOf(reportPostTag, reportAuthorTag)
 
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      var tags:List<List<String>> = listOf(reportPostTag, reportAuthorTag)
+            if (reportedPost is LongTextNoteEvent) {
+                tags = tags + listOf(listOf("a", reportedPost.address().toTag()))
+            }
 
-      if (reportedPost is LongTextNoteEvent) {
-        tags = tags + listOf( listOf("a", reportedPost.address().toTag()) )
-      }
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
 
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return ReportEvent(id, pubKey, createdAt, tags, content, sig)
+        fun create(reportedUser: String, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
+            val content = ""
+
+            val reportAuthorTag = listOf("p", reportedUser, type.name.lowercase())
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags: List<List<String>> = listOf(reportAuthorTag)
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
     }
 
-    fun create(reportedUser: String, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
-      val content = ""
-
-      val reportAuthorTag = listOf("p", reportedUser, type.name.toLowerCase())
-
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags:List<List<String>> = listOf(reportAuthorTag)
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return ReportEvent(id, pubKey, createdAt, tags, content, sig)
+    enum class ReportType() {
+        EXPLICIT, // Not used anymore.
+        ILLEGAL,
+        SPAM,
+        IMPERSONATION,
+        NUDITY,
+        PROFANITY
     }
-  }
-
-  enum class ReportType() {
-    EXPLICIT, // Not used anymore.
-    ILLEGAL,
-    SPAM,
-    IMPERSONATION,
-    NUDITY,
-    PROFANITY,
-  }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/RepostEvent.kt

@@ -1,50 +1,54 @@
 package com.vitorpamplona.amethyst.service.model
 
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.relays.Client
-import java.util.Date
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.toHex
+import java.util.Date
 
-class RepostEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
-  createdAt: Long,
-  tags: List<List<String>>,
-  content: String,
-  sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+class RepostEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
+    fun boostedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
 
-  fun boostedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-  fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-  fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull { it.getOrNull(1) }.mapNotNull { ATag.parse(it) }
-
-  fun containedPost() = try {
-    fromJson(content, Client.lenient)
-  } catch (e: Exception) {
-    null
-  }
-
-  companion object {
-    const val kind = 6
-
-    fun create(boostedPost: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RepostEvent {
-      val content = boostedPost.toJson()
-
-      val replyToPost = listOf("e", boostedPost.id.toHex())
-      val replyToAuthor = listOf("p", boostedPost.pubKey.toHex())
-
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      var tags:List<List<String>> = boostedPost.tags.plus(listOf(replyToPost, replyToAuthor))
-
-      if (boostedPost is LongTextNoteEvent) {
-        tags = tags + listOf( listOf("a", boostedPost.address().toTag()) )
-      }
-
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return RepostEvent(id, pubKey, createdAt, tags, content, sig)
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
     }
-  }
-}
+
+    fun containedPost() = try {
+        fromJson(content, Client.lenient)
+    } catch (e: Exception) {
+        null
+    }
+
+    companion object {
+        const val kind = 6
+
+        fun create(boostedPost: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RepostEvent {
+            val content = boostedPost.toJson()
+
+            val replyToPost = listOf("e", boostedPost.id())
+            val replyToAuthor = listOf("p", boostedPost.pubKey())
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var tags: List<List<String>> = boostedPost.tags().plus(listOf(replyToPost, replyToAuthor))
+
+            if (boostedPost is LongTextNoteEvent) {
+                tags = tags + listOf(listOf("a", boostedPost.address().toTag()))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return RepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/TextNoteEvent.kt

@@ -1,26 +1,33 @@
 package com.vitorpamplona.amethyst.service.model
 
-import java.util.Date
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import nostr.postr.events.Event
+import java.util.Date
 
 class TextNoteEvent(
-    id: ByteArray,
-    pubKey: ByteArray,
+    id: HexKey,
+    pubKey: HexKey,
     createdAt: Long,
     tags: List<List<String>>,
     content: String,
-    sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
     fun mentions() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull { it.getOrNull(1) }.mapNotNull { ATag.parse(it) }
+    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    }
+
     fun replyTos() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
 
     companion object {
         const val kind = 1
 
         fun create(msg: String, replyTos: List<String>?, mentions: List<String>?, addresses: List<ATag>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): TextNoteEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey)
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
             replyTos?.forEach {
                 tags.add(listOf("e", it))
@@ -33,7 +40,7 @@ class TextNoteEvent(
             }
             val id = generateId(pubKey, createdAt, kind, tags, msg)
             val sig = Utils.sign(id, privateKey)
-            return TextNoteEvent(id, pubKey, createdAt, tags, msg, sig)
+            return TextNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
         }
     }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/zaps/UserZaps.kt

@@ -0,0 +1,18 @@
+package com.vitorpamplona.amethyst.service.model.zaps
+
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.LnZapEventInterface
+
+object UserZaps {
+    fun forProfileFeed(zaps: Map<Note, Note?>?): List<Pair<Note, Note>> {
+        if (zaps == null) return emptyList()
+
+        return (
+            zaps
+                .filter { it.value != null }
+                .toList()
+                .sortedBy { (it.second?.event as? LnZapEventInterface)?.amount() }
+                .reversed()
+            ) as List<Pair<Note, Note>>
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/nip19/Nip19.kt

@@ -0,0 +1,104 @@
+package com.vitorpamplona.amethyst.service.nip19
+
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.bechToBytes
+
+object Nip19 {
+    enum class Type {
+        USER, NOTE, RELAY, ADDRESS
+    }
+
+    data class Return(val type: Type, val hex: String, val relay: String? = null)
+
+    fun uriToRoute(uri: String?): Return? {
+        try {
+            val key = uri?.removePrefix("nostr:") ?: return null
+
+            val bytes = key.bechToBytes()
+            if (key.startsWith("npub")) {
+                return npub(bytes)
+            } else if (key.startsWith("note")) {
+                return note(bytes)
+            } else if (key.startsWith("nprofile")) {
+                return nprofile(bytes)
+            } else if (key.startsWith("nevent")) {
+                return nevent(bytes)
+            } else if (key.startsWith("nrelay")) {
+                return nrelay(bytes)
+            } else if (key.startsWith("naddr")) {
+                return naddr(bytes)
+            }
+        } catch (e: Throwable) {
+            println("Issue trying to Decode NIP19 $uri: ${e.message}")
+        }
+
+        return null
+    }
+
+    private fun npub(bytes: ByteArray): Return {
+        return Return(Type.USER, bytes.toHexKey())
+    }
+
+    private fun note(bytes: ByteArray): Return {
+        return Return(Type.NOTE, bytes.toHexKey())
+    }
+
+    private fun nprofile(bytes: ByteArray): Return? {
+        val tlv = Tlv.parse(bytes)
+
+        val hex = tlv.get(Tlv.Type.SPECIAL.id)
+            ?.get(0)
+            ?.toHexKey() ?: return null
+
+        val relay = tlv.get(Tlv.Type.RELAY.id)
+            ?.get(0)
+            ?.toString(Charsets.UTF_8)
+
+        return Return(Type.USER, hex, relay)
+    }
+
+    private fun nevent(bytes: ByteArray): Return? {
+        val tlv = Tlv.parse(bytes)
+
+        val hex = tlv.get(Tlv.Type.SPECIAL.id)
+            ?.get(0)
+            ?.toHexKey() ?: return null
+
+        val relay = tlv.get(Tlv.Type.RELAY.id)
+            ?.get(0)
+            ?.toString(Charsets.UTF_8)
+
+        return Return(Type.USER, hex, relay)
+    }
+
+    private fun nrelay(bytes: ByteArray): Return? {
+        val relayUrl = Tlv.parse(bytes)
+            .get(Tlv.Type.SPECIAL.id)
+            ?.get(0)
+            ?.toString(Charsets.UTF_8) ?: return null
+
+        return Return(Type.RELAY, relayUrl)
+    }
+
+    private fun naddr(bytes: ByteArray): Return? {
+        val tlv = Tlv.parse(bytes)
+
+        val d = tlv.get(Tlv.Type.SPECIAL.id)
+            ?.get(0)
+            ?.toString(Charsets.UTF_8) ?: return null
+
+        val relay = tlv.get(Tlv.Type.RELAY.id)
+            ?.get(0)
+            ?.toString(Charsets.UTF_8)
+
+        val author = tlv.get(Tlv.Type.AUTHOR.id)
+            ?.get(0)
+            ?.toHexKey()
+
+        val kind = tlv.get(Tlv.Type.KIND.id)
+            ?.get(0)
+            ?.let { Tlv.toInt32(it) }
+
+        return Return(Type.ADDRESS, "$kind:$author:$d", relay)
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/nip19/Tlv.kt

@@ -0,0 +1,36 @@
+package com.vitorpamplona.amethyst.service.nip19
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+object Tlv {
+    enum class Type(val id: Byte) {
+        SPECIAL(0),
+        RELAY(1),
+        AUTHOR(2),
+        KIND(3);
+    }
+
+    fun toInt32(bytes: ByteArray): Int {
+        require(bytes.size == 4) { "length must be 4, got: ${bytes.size}" }
+        return ByteBuffer.wrap(bytes, 0, 4).order(ByteOrder.BIG_ENDIAN).int
+    }
+
+    fun parse(data: ByteArray): Map<Byte, List<ByteArray>> {
+        val result = mutableMapOf<Byte, MutableList<ByteArray>>()
+        var rest = data
+        while (rest.isNotEmpty()) {
+            val t = rest[0]
+            val l = rest[1]
+            val v = rest.sliceArray(IntRange(2, (2 + l) - 1))
+            rest = rest.sliceArray(IntRange(2 + l, rest.size - 1))
+            if (v.size < l) continue
+
+            if (!result.containsKey(t)) {
+                result[t] = mutableListOf()
+            }
+            result[t]?.add(v)
+        }
+        return result
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Client.kt

@@ -1,17 +1,19 @@
 package com.vitorpamplona.amethyst.service.relays
 
-import java.util.UUID
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.EventInterface
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import nostr.postr.events.Event
+import java.util.UUID
 
 /**
  * The Nostr Client manages multiple personae the user may switch between. Events are received and
  * published through multiple relays.
  * Events are stored with their respective persona.
  */
-object Client: RelayPool.Listener {
+object Client : RelayPool.Listener {
     /**
      * Lenient mode:
      *
@@ -38,9 +40,7 @@ object Client: RelayPool.Listener {
         if (relays.size != newRelayConfig.size) return false
 
         relays.forEach { oldRelayInfo ->
-            val newRelayInfo = newRelayConfig.find { it.url == oldRelayInfo.url }
-
-            if (newRelayInfo == null) return false
+            val newRelayInfo = newRelayConfig.find { it.url == oldRelayInfo.url } ?: return false
 
             if (!oldRelayInfo.isSameRelayConfig(newRelayInfo)) return false
         }
@@ -64,7 +64,7 @@ object Client: RelayPool.Listener {
         RelayPool.sendFilterOnlyIfDisconnected()
     }
 
-    fun send(signedEvent: Event) {
+    fun send(signedEvent: EventInterface) {
         RelayPool.send(signedEvent)
     }
 
@@ -79,6 +79,7 @@ object Client: RelayPool.Listener {
         RelayPool.unloadRelays()
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
         // Releases the Web thread for the new payload.
         // May need to add a processing queue if processing new events become too costly.
@@ -87,6 +88,7 @@ object Client: RelayPool.Listener {
         }
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onError(error: Error, subscriptionId: String, relay: Relay) {
         // Releases the Web thread for the new payload.
         // May need to add a processing queue if processing new events become too costly.
@@ -95,6 +97,7 @@ object Client: RelayPool.Listener {
         }
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) {
         // Releases the Web thread for the new payload.
         // May need to add a processing queue if processing new events become too costly.
@@ -103,6 +106,7 @@ object Client: RelayPool.Listener {
         }
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
         // Releases the Web thread for the new payload.
         // May need to add a processing queue if processing new events become too costly.
@@ -148,4 +152,4 @@ object Client: RelayPool.Listener {
          */
         open fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) = Unit
     }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Constants.kt

@@ -3,46 +3,52 @@ package com.vitorpamplona.amethyst.service.relays
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 
 object Constants {
-  val activeTypes = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS)
-  val activeTypesGlobalChats = setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)
+    val activeTypes = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS)
+    val activeTypesGlobalChats = setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)
+    val activeTypesSearch = setOf(FeedType.SEARCH)
 
-  fun convertDefaultRelays(): Array<Relay> {
-    return defaultRelays.map {
-      Relay(it.url, it.read, it.write, it.feedTypes)
-    }.toTypedArray()
-  }
+    fun convertDefaultRelays(): Array<Relay> {
+        return defaultRelays.map {
+            Relay(it.url, it.read, it.write, it.feedTypes)
+        }.toTypedArray()
+    }
 
-  val defaultRelays = arrayOf(
-    // Free relays
-    RelaySetupInfo("wss://nostr.bitcoiner.social", read = true, write = true, feedTypes = activeTypes),
-    RelaySetupInfo("wss://relay.nostr.bg", read = true, write = true, feedTypes = activeTypes),
-    RelaySetupInfo("wss://relay.snort.social", read = true, write = true, feedTypes = activeTypes),
-    RelaySetupInfo("wss://relay.damus.io", read = true, write = true, feedTypes = activeTypes),
-    RelaySetupInfo("wss://nostr.oxtr.dev", read = true, write = true, feedTypes = activeTypes),
-    RelaySetupInfo("wss://nostr-pub.wellorder.net", read = true, write = true, feedTypes = activeTypes),
-    RelaySetupInfo("wss://nostr.mom", read = true, write = true, feedTypes = activeTypes),
-    RelaySetupInfo("wss://no.str.cr", read = true, write = true, feedTypes = activeTypes),
-    RelaySetupInfo("wss://nos.lol", read = true, write = true, feedTypes = activeTypes),
+    val defaultRelays = arrayOf(
+        // Free relays
+        RelaySetupInfo("wss://nostr.bitcoiner.social", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://relay.nostr.bg", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://relay.snort.social", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://relay.damus.io", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://nostr.oxtr.dev", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://nostr-pub.wellorder.net", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://nostr.mom", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://no.str.cr", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://nos.lol", read = true, write = true, feedTypes = activeTypes),
 
-    // Less Reliable
-    //NewRelayListViewModel.Relay("wss://nostr.orangepill.dev", read = true, write = true, feedTypes = activeTypes),
-    //NewRelayListViewModel.Relay("wss://nostr.onsats.org", read = true, write = true, feedTypes = activeTypes),
-    //NewRelayListViewModel.Relay("wss://nostr.sandwich.farm", read = true, write = true, feedTypes = activeTypes),
-    //NewRelayListViewModel.Relay("wss://relay.nostr.ch", read = true, write = true, feedTypes = activeTypes),
-    //NewRelayListViewModel.Relay("wss://nostr.zebedee.cloud", read = true, write = true, feedTypes = activeTypes),
-    //NewRelayListViewModel.Relay("wss://nostr.rocks", read = true, write = true, feedTypes = activeTypes),
-    //NewRelayListViewModel.Relay("wss://nostr.fmt.wiz.biz", read = true, write = true, feedTypes = activeTypes),
-    //NewRelayListViewModel.Relay("wss://brb.io", read = true, write = true, feedTypes = activeTypes),
+        // Less Reliable
+        // NewRelayListViewModel.Relay("wss://nostr.orangepill.dev", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://nostr.onsats.org", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://nostr.sandwich.farm", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://relay.nostr.ch", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://nostr.zebedee.cloud", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://nostr.rocks", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://nostr.fmt.wiz.biz", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://brb.io", read = true, write = true, feedTypes = activeTypes),
 
-    // Paid relays
-    RelaySetupInfo("wss://relay.nostr.com.au", read = true, write = false, feedTypes = activeTypesGlobalChats),
-    RelaySetupInfo("wss://eden.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
-    RelaySetupInfo("wss://nostr.milou.lol", read = true, write = false, feedTypes = activeTypesGlobalChats),
-    RelaySetupInfo("wss://puravida.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
-    RelaySetupInfo("wss://nostr.wine", read = true, write = false, feedTypes = activeTypesGlobalChats),
-    RelaySetupInfo("wss://nostr.inosta.cc", read = true, write = false, feedTypes = activeTypesGlobalChats),
-    RelaySetupInfo("wss://atlas.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
-    RelaySetupInfo("wss://relay.orangepill.dev", read = true, write = false, feedTypes = activeTypesGlobalChats),
-    RelaySetupInfo("wss://relay.nostrati.com", read = true, write = false, feedTypes = activeTypesGlobalChats),
-  )
-}
+        // Paid relays
+        RelaySetupInfo("wss://relay.nostr.com.au", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://eden.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://nostr.milou.lol", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://puravida.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://nostr.wine", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://nostr.inosta.cc", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://atlas.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://relay.orangepill.dev", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://relay.nostrati.com", read = true, write = false, feedTypes = activeTypesGlobalChats),
+
+        // Supporting NIP-50
+        RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch)
+    )
+
+    val forcedRelayForSearch = RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch)
+}

app/src/main/java/com/vitorpamplona/amethyst/service/relays/EventVerifier.kt

@@ -1,16 +0,0 @@
-package com.vitorpamplona.amethyst.service.relays
-
-import fr.acinq.secp256k1.Secp256k1
-import nostr.postr.events.Event
-import nostr.postr.events.generateId
-
-fun Event.hasValidSignature(): Boolean {
-  if (!id.contentEquals(generateId())) {
-    return false
-  }
-  if (!Secp256k1.get().verifySchnorr(sig, id, pubKey)) {
-    return false
-  }
-
-  return true
-}

app/src/main/java/com/vitorpamplona/amethyst/service/relays/JsonFilter.kt

@@ -0,0 +1,143 @@
+package com.vitorpamplona.amethyst.service.relays
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import com.vitorpamplona.amethyst.service.model.Event
+import java.io.Serializable
+import java.util.*
+
+interface Filter {
+    fun match(event: Event): Boolean
+    fun toShortString(): String
+}
+
+class JsonFilter(
+    val ids: List<String>? = null,
+    val authors: List<String>? = null,
+    val kinds: List<Int>? = null,
+    val tags: Map<String, List<String>>? = null,
+    val since: Long? = null,
+    val until: Long? = null,
+    val limit: Int? = null,
+    val search: String? = null
+) : Filter, Serializable {
+    fun toJson(): String {
+        val jsonObject = JsonObject()
+        ids?.run {
+            jsonObject.add("ids", JsonArray().apply { ids.forEach { add(it) } })
+        }
+        authors?.run {
+            jsonObject.add("authors", JsonArray().apply { authors.forEach { add(it) } })
+        }
+        kinds?.run {
+            jsonObject.add("kinds", JsonArray().apply { kinds.forEach { add(it) } })
+        }
+        tags?.run {
+            entries.forEach { kv ->
+                jsonObject.add("#${kv.key}", JsonArray().apply { kv.value.forEach { add(it) } })
+            }
+        }
+        since?.run {
+            jsonObject.addProperty("since", since)
+        }
+        until?.run {
+            jsonObject.addProperty("until", until)
+        }
+        limit?.run {
+            jsonObject.addProperty("limit", limit)
+        }
+        search?.run {
+            jsonObject.addProperty("search", search)
+        }
+        return gson.toJson(jsonObject)
+    }
+
+    override fun match(event: Event): Boolean {
+        if (ids?.any { event.id == it } == false) return false
+        if (kinds?.any { event.kind == it } == false) return false
+        if (authors?.any { event.pubKey == it } == false) return false
+        tags?.forEach { tag ->
+            if (!event.tags.any { it.first() == tag.key && it[1] in tag.value }) return false
+        }
+        if (event.createdAt !in (since ?: Long.MIN_VALUE)..(until ?: Long.MAX_VALUE)) {
+            return false
+        }
+        return true
+    }
+
+    override fun toString(): String = "JsonFilter${toJson()}"
+
+    override fun toShortString(): String {
+        val list = ArrayList<String>()
+        ids?.run {
+            list.add("ids")
+        }
+        authors?.run {
+            list.add("authors")
+        }
+        kinds?.run {
+            list.add("kinds[${kinds.joinToString()}]")
+        }
+        tags?.run {
+            list.add("tags")
+        }
+        since?.run {
+            list.add("since")
+        }
+        until?.run {
+            list.add("until")
+        }
+        limit?.run {
+            list.add("limit")
+        }
+        search?.run {
+            list.add("search")
+        }
+        return list.joinToString()
+    }
+
+    companion object {
+        val gson: Gson = GsonBuilder().create()
+
+        fun fromJson(json: String): JsonFilter {
+            val jsonFilter = gson.fromJson(json, JsonObject::class.java)
+            return fromJson(jsonFilter)
+        }
+
+        val declaredFields = JsonFilter::class.java.declaredFields.map { it.name }
+        fun fromJson(json: JsonObject): JsonFilter {
+            // sanity check
+            if (json.keySet().any { !(it.startsWith("#") || it in declaredFields) }) {
+                println("Filter $json contains unknown parameters.")
+            }
+            return JsonFilter(
+                ids = if (json.has("ids")) json.getAsJsonArray("ids").map { it.asString } else null,
+                authors = if (json.has("authors")) {
+                    json.getAsJsonArray("authors")
+                        .map { it.asString }
+                } else {
+                    null
+                },
+                kinds = if (json.has("kinds")) {
+                    json.getAsJsonArray("kinds")
+                        .map { it.asInt }
+                } else {
+                    null
+                },
+                tags = json
+                    .entrySet()
+                    .filter { it.key.startsWith("#") }
+                    .associate {
+                        it.key.substring(1) to it.value.asJsonArray.map { it.asString }
+                    }
+                    .ifEmpty { null },
+                since = if (json.has("since")) json.get("since").asLong else null,
+                until = if (json.has("until")) json.get("until").asLong else null,
+                limit = if (json.has("limit")) json.get("limit").asInt else null,
+                search = if (json.has("search")) json.get("search").asString else null
+            )
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt

@@ -2,28 +2,29 @@ package com.vitorpamplona.amethyst.service.relays
 
 import android.util.Log
 import com.google.gson.JsonElement
-import java.util.Date
-import nostr.postr.events.Event
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.EventInterface
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
+import java.util.Date
 
 enum class FeedType {
-    FOLLOWS, PUBLIC_CHATS, PRIVATE_DMS, GLOBAL
+    FOLLOWS, PUBLIC_CHATS, PRIVATE_DMS, GLOBAL, SEARCH
 }
 
 class Relay(
     var url: String,
     var read: Boolean = true,
     var write: Boolean = true,
-    var activeTypes: Set<FeedType> = FeedType.values().toSet(),
+    var activeTypes: Set<FeedType> = FeedType.values().toSet()
 ) {
     private val httpClient = OkHttpClient.Builder()
         .followRedirects(true)
         .followSslRedirects(true)
-        .build();
+        .build()
 
     private var listeners = setOf<Listener>()
     private var socket: WebSocket? = null
@@ -54,7 +55,10 @@ class Relay(
         if (socket != null) return
 
         try {
-            val request = Request.Builder().header("Origin", "amethyst.social").url(url.trim()).build()
+            val request = Request.Builder()
+                .header("User-Agent", "Amethyst")
+                .url(url.trim())
+                .build()
             val listener = object : WebSocketListener() {
 
                 override fun onOpen(webSocket: WebSocket, response: Response) {
@@ -76,26 +80,26 @@ class Relay(
                         val channel = msg[1].asString
                         when (type) {
                             "EVENT" -> {
-                                //Log.w("Relay", "Relay onEVENT $url, $channel")
+                                // Log.w("Relay", "Relay onEVENT $url, $channel")
                                 eventDownloadCounter++
                                 val event = Event.fromJson(msg[2], Client.lenient)
                                 listeners.forEach { it.onEvent(this@Relay, channel, event) }
                             }
                             "EOSE" -> listeners.forEach {
-                                //Log.w("Relay", "Relay onEOSE $url, $channel")
+                                // Log.w("Relay", "Relay onEOSE $url, $channel")
                                 it.onRelayStateChange(this@Relay, Type.EOSE, channel)
                             }
                             "NOTICE" -> listeners.forEach {
-                                //Log.w("Relay", "Relay onNotice $url, $channel")
+                                // Log.w("Relay", "Relay onNotice $url, $channel")
                                 // "channel" being the second string in the string array ...
                                 it.onError(this@Relay, channel, Error("Relay sent notice: " + channel))
                             }
                             "OK" -> listeners.forEach {
-                                //Log.w("Relay", "Relay onOK $url, $channel")
+                                // Log.w("Relay", "Relay onOK $url, $channel")
                                 it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
                             }
                             else -> listeners.forEach {
-                                //Log.w("Relay", "Relay something else $url, $channel")
+                                // Log.w("Relay", "Relay something else $url, $channel")
                                 it.onError(
                                     this@Relay,
                                     channel,
@@ -112,11 +116,13 @@ class Relay(
                 }
 
                 override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
-                    listeners.forEach { it.onRelayStateChange(
-                        this@Relay,
-                        Type.DISCONNECTING,
-                        null
-                    ) }
+                    listeners.forEach {
+                        it.onRelayStateChange(
+                            this@Relay,
+                            Type.DISCONNECTING,
+                            null
+                        )
+                    }
                 }
 
                 override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
@@ -135,10 +141,10 @@ class Relay(
                     isReady = false
                     closingTime = Date().time / 1000
 
-                    Log.w("Relay", "Relay onFailure $url, ${response?.message} ${response}")
+                    Log.w("Relay", "Relay onFailure $url, ${response?.message} $response")
                     t.printStackTrace()
                     listeners.forEach {
-                        it.onError(this@Relay, "", Error("WebSocket Failure. Response: ${response}. Exception: ${t.message}", t))
+                        it.onError(this@Relay, "", Error("WebSocket Failure. Response: $response. Exception: ${t.message}", t))
                     }
                 }
             }
@@ -154,7 +160,7 @@ class Relay(
     }
 
     fun disconnect() {
-        //httpClient.dispatcher.executorService.shutdown()
+        // httpClient.dispatcher.executorService.shutdown()
         closingTime = Date().time / 1000
         socket?.close(1000, "Normal close")
         socket = null
@@ -169,7 +175,7 @@ class Relay(
                     if (filters.isNotEmpty()) {
                         val request =
                             """["REQ","$requestId",${filters.take(10).joinToString(",") { it.filter.toJson() }}]"""
-                        //println("FILTERSSENT ${url} ${request}")
+                        // println("FILTERSSENT ${url} ${request}")
                         socket?.send(request)
                     }
                 }
@@ -187,37 +193,40 @@ class Relay(
         if (socket == null) {
             // waits 60 seconds to reconnect after disconnected.
             if (Date().time / 1000 > closingTime + 60) {
-                //println("sendfilter Only if Disconnected ${url} ")
+                // println("sendfilter Only if Disconnected ${url} ")
                 requestAndWatch()
             }
         }
     }
 
-    fun send(signedEvent: Event) {
+    fun send(signedEvent: EventInterface) {
         if (write) {
             socket?.send("""["EVENT",${signedEvent.toJson()}]""")
             eventUploadCounter++
         }
     }
 
-    fun close(subscriptionId: String){
+    fun close(subscriptionId: String) {
         socket?.send("""["CLOSE","$subscriptionId"]""")
     }
 
     fun isSameRelayConfig(other: Relay): Boolean {
-        return url == other.url
-            && write == other.write
-            && read == other.read
-            && activeTypes == other.activeTypes
+        return url == other.url &&
+            write == other.write &&
+            read == other.read &&
+            activeTypes == other.activeTypes
     }
 
     enum class Type {
         // Websocket connected
         CONNECT,
+
         // Websocket disconnecting
         DISCONNECTING,
+
         // Websocket disconnected
         DISCONNECT,
+
         // End Of Stored Events
         EOSE
     }
@@ -231,6 +240,7 @@ class Relay(
         fun onError(relay: Relay, subscriptionId: String, error: Error)
 
         fun onSendResponse(relay: Relay, eventId: String, success: Boolean, message: String)
+
         /**
          * Connected to or disconnected from a relay
          *

app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt

@@ -1,16 +1,17 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.EventInterface
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import nostr.postr.events.Event
 
 /**
  * RelayPool manages the connection to multiple Relays and lets consumers deal with simple events.
  */
-object RelayPool: Relay.Listener {
+object RelayPool : Relay.Listener {
 
     val scope = CoroutineScope(Job() + Dispatchers.IO)
 
@@ -29,8 +30,8 @@ object RelayPool: Relay.Listener {
         return relays.firstOrNull() { it.url == url }
     }
 
-    fun loadRelays(relayList: List<Relay>){
-        if (!relayList.isNullOrEmpty()){
+    fun loadRelays(relayList: List<Relay>) {
+        if (!relayList.isNullOrEmpty()) {
             relayList.forEach { addRelay(it) }
         } else {
             Constants.convertDefaultRelays().forEach { addRelay(it) }
@@ -54,11 +55,11 @@ object RelayPool: Relay.Listener {
         relays.forEach { it.sendFilterOnlyIfDisconnected() }
     }
 
-    fun send(signedEvent: Event) {
+    fun send(signedEvent: EventInterface) {
         relays.forEach { it.send(signedEvent) }
     }
 
-    fun close(subscriptionId: String){
+    fun close(subscriptionId: String) {
         relays.forEach { it.close(subscriptionId) }
     }
 
@@ -122,10 +123,10 @@ object RelayPool: Relay.Listener {
     }
 }
 
-class RelayPoolLiveData(val relays: RelayPool): LiveData<RelayPoolState>(RelayPoolState(relays)) {
+class RelayPoolLiveData(val relays: RelayPool) : LiveData<RelayPoolState>(RelayPoolState(relays)) {
     fun refresh() {
         postValue(RelayPoolState(relays))
     }
 }
 
-class RelayPoolState(val relays: RelayPool)
+class RelayPoolState(val relays: RelayPool)

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Subscription.kt

@@ -5,26 +5,26 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import java.util.UUID
 
-data class Subscription (
-  val id: String = UUID.randomUUID().toString().substring(0,4),
-  val onEOSE: ((Long) -> Unit)? = null
+data class Subscription(
+    val id: String = UUID.randomUUID().toString().substring(0, 4),
+    val onEOSE: ((Long) -> Unit)? = null
 ) {
-  var typedFilters: List<TypedFilter>? = null // Inactive when null
+    var typedFilters: List<TypedFilter>? = null // Inactive when null
 
-  fun updateEOSE(l: Long) {
-    onEOSE?.let { it(l) }
-  }
-
-  fun toJson(): String {
-    return GsonBuilder().create().toJson(toJsonObject())
-  }
-
-  fun toJsonObject(): JsonObject {
-    val jsonObject = JsonObject()
-    jsonObject.addProperty("id", id)
-    typedFilters?.run {
-      jsonObject.add("typedFilters", JsonArray().apply { typedFilters?.forEach { add(it.toJsonObject()) } })
+    fun updateEOSE(l: Long) {
+        onEOSE?.let { it(l) }
     }
-    return jsonObject
-  }
-}
+
+    fun toJson(): String {
+        return GsonBuilder().create().toJson(toJsonObject())
+    }
+
+    fun toJsonObject(): JsonObject {
+        val jsonObject = JsonObject()
+        jsonObject.addProperty("id", id)
+        typedFilters?.run {
+            jsonObject.add("typedFilters", JsonArray().apply { typedFilters?.forEach { add(it.toJsonObject()) } })
+        }
+        return jsonObject
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/relays/TypedFilter.kt

@@ -3,53 +3,52 @@ package com.vitorpamplona.amethyst.service.relays
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
-import nostr.postr.JsonFilter
 
 class TypedFilter(
-  val types: Set<FeedType>,
-  val filter: JsonFilter
+    val types: Set<FeedType>,
+    val filter: JsonFilter
 ) {
 
-  fun toJson(): String {
-    return GsonBuilder().create().toJson(toJsonObject())
-  }
+    fun toJson(): String {
+        return GsonBuilder().create().toJson(toJsonObject())
+    }
 
-  fun toJsonObject(): JsonObject {
-    val jsonObject = JsonObject()
-    jsonObject.add("types", typesToJson(types))
-    jsonObject.add("filter", filterToJson(filter))
-    return jsonObject
-  }
+    fun toJsonObject(): JsonObject {
+        val jsonObject = JsonObject()
+        jsonObject.add("types", typesToJson(types))
+        jsonObject.add("filter", filterToJson(filter))
+        return jsonObject
+    }
 
-  fun typesToJson(types: Set<FeedType>): JsonArray {
-    return JsonArray().apply { types.forEach { add(it.name.toLowerCase()) } }
-  }
+    fun typesToJson(types: Set<FeedType>): JsonArray {
+        return JsonArray().apply { types.forEach { add(it.name.lowercase()) } }
+    }
 
-  fun filterToJson(filter: JsonFilter): JsonObject {
-    val jsonObject = JsonObject()
-    filter.ids?.run {
-      jsonObject.add("ids", JsonArray().apply { filter.ids?.forEach { add(it) } })
+    fun filterToJson(filter: JsonFilter): JsonObject {
+        val jsonObject = JsonObject()
+        filter.ids?.run {
+            jsonObject.add("ids", JsonArray().apply { filter.ids.forEach { add(it) } })
+        }
+        filter.authors?.run {
+            jsonObject.add("authors", JsonArray().apply { filter.authors.forEach { add(it) } })
+        }
+        filter.kinds?.run {
+            jsonObject.add("kinds", JsonArray().apply { filter.kinds.forEach { add(it) } })
+        }
+        filter.tags?.run {
+            entries.forEach { kv ->
+                jsonObject.add("#${kv.key}", JsonArray().apply { kv.value.forEach { add(it) } })
+            }
+        }
+        filter.since?.run {
+            jsonObject.addProperty("since", filter.since)
+        }
+        filter.until?.run {
+            jsonObject.addProperty("until", filter.until)
+        }
+        filter.limit?.run {
+            jsonObject.addProperty("limit", filter.limit)
+        }
+        return jsonObject
     }
-    filter.authors?.run {
-      jsonObject.add("authors", JsonArray().apply { filter.authors?.forEach { add(it) } })
-    }
-    filter.kinds?.run {
-      jsonObject.add("kinds", JsonArray().apply { filter.kinds?.forEach { add(it) } })
-    }
-    filter.tags?.run {
-      entries.forEach { kv ->
-        jsonObject.add("#${kv.key}", JsonArray().apply { kv.value.forEach { add(it) } })
-      }
-    }
-    filter.since?.run {
-      jsonObject.addProperty("since", filter.since)
-    }
-    filter.until?.run {
-      jsonObject.addProperty("until", filter.until)
-    }
-    filter.limit?.run {
-      jsonObject.addProperty("limit", filter.limit)
-    }
-    return jsonObject
-  }
-}
+}

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

@@ -2,12 +2,12 @@ package com.vitorpamplona.amethyst.ui
 
 import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.ui.Modifier
+import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.Coil
 import coil.ImageLoader
@@ -16,73 +16,81 @@ import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
-import com.vitorpamplona.amethyst.service.Nip19
+import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 
-class MainActivity : ComponentActivity() {
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
+class MainActivity : FragmentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
 
-    val nip19 = Nip19().uriToRoute(intent?.data?.toString())
-    val startingPage = when (nip19?.type) {
-      Nip19.Type.USER -> "User/${nip19.hex}"
-      Nip19.Type.NOTE -> "Note/${nip19.hex}"
-      else -> null
-    }
-
-    Coil.setImageLoader {
-      ImageLoader.Builder(this).components {
-        if (SDK_INT >= 28) {
-          add(ImageDecoderDecoder.Factory())
-        } else {
-          add(GifDecoder.Factory())
+        val nip19 = Nip19.uriToRoute(intent?.data?.toString())
+        val startingPage = when (nip19?.type) {
+            Nip19.Type.USER -> "User/${nip19.hex}"
+            Nip19.Type.NOTE -> "Note/${nip19.hex}"
+            else -> null
         }
-        add(SvgDecoder.Factory())
-      } //.logger(DebugLogger())
-        .respectCacheHeaders(false)
-        .build()
-    }
 
-    setContent {
-      AmethystTheme {
-        // A surface container using the 'background' color from the theme
-        Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-
-          val accountStateViewModel: AccountStateViewModel = viewModel {
-            AccountStateViewModel(LocalPreferences(applicationContext))
-          }
-
-          AccountScreen(accountStateViewModel, startingPage)
+        Coil.setImageLoader {
+            ImageLoader.Builder(this).components {
+                if (SDK_INT >= 28) {
+                    add(ImageDecoderDecoder.Factory())
+                } else {
+                    add(GifDecoder.Factory())
+                }
+                add(SvgDecoder.Factory())
+            } // .logger(DebugLogger())
+                .respectCacheHeaders(false)
+                .build()
         }
-      }
+
+        LocalPreferences.migrateSingleUserPrefs()
+
+        setContent {
+            AmethystTheme {
+                // A surface container using the 'background' color from the theme
+                Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
+                    val accountStateViewModel: AccountStateViewModel = viewModel {
+                        AccountStateViewModel()
+                    }
+
+                    AccountScreen(accountStateViewModel, startingPage)
+                }
+            }
+        }
+
+        Client.lenient = true
     }
 
-    Client.lenient = true
-  }
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onResume() {
+        super.onResume()
 
-  override fun onResume() {
-    super.onResume()
-    
-    // Only starts after login
-    ServiceManager.start()
-  }
+        // Only starts after login
+        GlobalScope.launch(Dispatchers.IO) {
+            ServiceManager.start()
+        }
+    }
 
-  override fun onPause() {
-    ServiceManager.pause()
+    override fun onPause() {
+        ServiceManager.pause()
 
-    super.onPause()
-  }
+        super.onPause()
+    }
 
-  /**
-   * Release memory when the UI becomes hidden or when system resources become low.
-   * @param level the memory-related event that was raised.
-   */
-  override fun onTrimMemory(level: Int) {
-    super.onTrimMemory(level)
-    println("Trim Memory $level")
-    ServiceManager.cleanUp()
-  }
+    /**
+     * Release memory when the UI becomes hidden or when system resources become low.
+     * @param level the memory-related event that was raised.
+     */
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        println("Trim Memory $level")
+        ServiceManager.cleanUp()
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt

@@ -3,19 +3,17 @@ package com.vitorpamplona.amethyst.ui.actions
 import android.content.ContentResolver
 import android.content.ContentValues
 import android.content.Context
-import android.content.Intent
+import android.media.MediaScannerConnection
 import android.os.Build
 import android.os.Environment
 import android.provider.MediaStore
 import androidx.annotation.RequiresApi
-import androidx.core.net.toUri
 import okhttp3.*
 import okio.BufferedSource
 import okio.IOException
 import okio.sink
 import java.io.File
 
-
 object ImageSaver {
     /**
      * Saves the image to the gallery.
@@ -27,11 +25,12 @@ object ImageSaver {
         url: String,
         context: Context,
         onSuccess: () -> Any?,
-        onError: (Throwable) -> Any?,
+        onError: (Throwable) -> Any?
     ) {
         val client = OkHttpClient.Builder().build()
 
         val request = Request.Builder()
+            .header("User-Agent", "Amethyst")
             .get()
             .url(url)
             .build()
@@ -56,13 +55,13 @@ object ImageSaver {
                             displayName = File(url).nameWithoutExtension,
                             contentType = contentType,
                             contentSource = response.body.source(),
-                            contentResolver = context.contentResolver,
+                            contentResolver = context.contentResolver
                         )
                     } else {
                         saveContentDefault(
                             fileName = File(url).name,
                             contentSource = response.body.source(),
-                            context = context,
+                            context = context
                         )
                     }
                     onSuccess()
@@ -79,7 +78,7 @@ object ImageSaver {
         displayName: String,
         contentType: String,
         contentSource: BufferedSource,
-        contentResolver: ContentResolver,
+        contentResolver: ContentResolver
     ) {
         val contentValues = ContentValues().apply {
             put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
@@ -114,7 +113,7 @@ object ImageSaver {
     private fun saveContentDefault(
         fileName: String,
         contentSource: BufferedSource,
-        context: Context,
+        context: Context
     ) {
         val subdirectory = File(
             Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES),
@@ -135,13 +134,8 @@ object ImageSaver {
 
         // Call the media scanner manually, so the image
         // appears in the gallery faster.
-        context.sendBroadcast(
-            Intent(
-                Intent.ACTION_MEDIA_SCANNER_SCAN_FILE,
-                outputFile.toUri()
-            )
-        )
+        MediaScannerConnection.scanFile(context, arrayOf(outputFile.toString()), null, null)
     }
 
     private const val PICTURES_SUBDIRECTORY = "Amethyst"
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt

@@ -11,66 +11,67 @@ import java.io.IOException
 import java.util.*
 
 object ImageUploader {
-  fun uploadImage(
-    uri: Uri,
-    contentResolver: ContentResolver,
-    onSuccess: (String) -> Unit,
-    onError: (Throwable) -> Unit,
-) {
-    val contentType = contentResolver.getType(uri)
+    fun uploadImage(
+        uri: Uri,
+        contentResolver: ContentResolver,
+        onSuccess: (String) -> Unit,
+        onError: (Throwable) -> Unit
+    ) {
+        val contentType = contentResolver.getType(uri)
 
-    val client = OkHttpClient.Builder().build()
+        val client = OkHttpClient.Builder().build()
 
-    val requestBody: RequestBody = MultipartBody.Builder()
-      .setType(MultipartBody.FORM)
-      .addFormDataPart(
-        "image",
-        "${UUID.randomUUID()}",
-        object : RequestBody() {
-          override fun contentType(): MediaType? =
-            contentType?.toMediaType()
+        val requestBody: RequestBody = MultipartBody.Builder()
+            .setType(MultipartBody.FORM)
+            .addFormDataPart(
+                "image",
+                "${UUID.randomUUID()}",
+                object : RequestBody() {
+                    override fun contentType(): MediaType? =
+                        contentType?.toMediaType()
 
-          override fun writeTo(sink: BufferedSink) {
-            val imageInputStream = contentResolver.openInputStream(uri)
-            checkNotNull(imageInputStream) {
-              "Can't open the image input stream"
+                    override fun writeTo(sink: BufferedSink) {
+                        val imageInputStream = contentResolver.openInputStream(uri)
+                        checkNotNull(imageInputStream) {
+                            "Can't open the image input stream"
+                        }
+
+                        imageInputStream.source().use(sink::writeAll)
+                    }
+                }
+            )
+            .build()
+
+        val request: Request = Request.Builder()
+            .header("Authorization", "Client-ID e6aea87296f3f96")
+            .header("User-Agent", "Amethyst")
+            .url("https://api.imgur.com/3/image")
+            .post(requestBody)
+            .build()
+
+        client.newCall(request).enqueue(object : Callback {
+            override fun onResponse(call: Call, response: Response) {
+                try {
+                    check(response.isSuccessful)
+                    response.body.use { body ->
+                        val tree = jacksonObjectMapper().readTree(body.string())
+                        val url = tree?.get("data")?.get("link")?.asText()
+                        checkNotNull(url) {
+                            "There must be an uploaded image URL in the response"
+                        }
+
+                        onSuccess(url)
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                    onError(e)
+                }
             }
 
-            imageInputStream.source().use(sink::writeAll)
-          }
-        }
-      )
-      .build()
-
-    val request: Request = Request.Builder()
-      .url("https://api.imgur.com/3/image")
-      .header("Authorization", "Client-ID e6aea87296f3f96")
-      .post(requestBody)
-      .build()
-
-    client.newCall(request).enqueue(object : Callback {
-      override fun onResponse(call: Call, response: Response) {
-        try {
-          check(response.isSuccessful)
-          response.body.use { body ->
-            val tree = jacksonObjectMapper().readTree(body.string())
-            val url = tree?.get("data")?.get("link")?.asText()
-            checkNotNull(url) {
-              "There must be an uploaded image URL in the response"
+            override fun onFailure(call: Call, e: IOException) {
+                e.printStackTrace()
+                onError(e)
             }
-
-            onSuccess(url)
-          }
-        } catch (e: Exception) {
-          e.printStackTrace()
-          onError(e)
-        }
-      }
-
-      override fun onFailure(call: Call, e: IOException) {
-        e.printStackTrace()
-        onError(e)
-      }
-    })
-  }
-}
+        })
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelView.kt

@@ -16,9 +16,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
@@ -32,8 +30,6 @@ import com.vitorpamplona.amethyst.model.Channel
 @Composable
 fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = null) {
     val postViewModel: NewChannelViewModel = viewModel()
-    val context = LocalContext.current.applicationContext
-
     postViewModel.load(account, channel)
 
     Dialog(
@@ -42,8 +38,7 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
             dismissOnClickOutside = false
         )
     ) {
-        Surface(
-        ) {
+        Surface() {
             Column(
                 modifier = Modifier.padding(10.dp)
             ) {
@@ -60,7 +55,7 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
 
                     PostButton(
                         onPost = {
-                            postViewModel.create(context)
+                            postViewModel.create()
                             onClose()
                         },
                         postViewModel.channelName.value.text.isNotBlank()
@@ -124,7 +119,4 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
             }
         }
     }
-
-
-
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelViewModel.kt

@@ -1,13 +1,12 @@
 package com.vitorpamplona.amethyst.ui.actions
 
-import android.content.Context
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
 
-class NewChannelViewModel: ViewModel() {
+class NewChannelViewModel : ViewModel() {
     private var account: Account? = null
     private var originalChannel: Channel? = null
 
@@ -15,7 +14,6 @@ class NewChannelViewModel: ViewModel() {
     val channelPicture = mutableStateOf(TextFieldValue())
     val channelDescription = mutableStateOf(TextFieldValue())
 
-
     fun load(account: Account, channel: Channel?) {
         this.account = account
         if (channel != null) {
@@ -26,7 +24,7 @@ class NewChannelViewModel: ViewModel() {
         }
     }
 
-    fun create(context: Context) {
+    fun create() {
         this.account?.let { account ->
             if (originalChannel == null) {
                 account.sendCreateNewChannel(
@@ -34,13 +32,14 @@ class NewChannelViewModel: ViewModel() {
                     channelDescription.value.text,
                     channelPicture.value.text
                 )
-            } else
+            } else {
                 account.sendChangeChannel(
                     channelName.value.text,
                     channelDescription.value.text,
                     channelPicture.value.text,
                     originalChannel!!
                 )
+            }
         }
 
         clear()
@@ -51,4 +50,4 @@ class NewChannelViewModel: ViewModel() {
         channelPicture.value = TextFieldValue()
         channelDescription.value = TextFieldValue()
     }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt

@@ -36,13 +36,11 @@ import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.ui.components.*
-import com.vitorpamplona.amethyst.ui.navigation.UploadFromGallery
 import com.vitorpamplona.amethyst.ui.note.ReplyInformation
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
 import kotlinx.coroutines.delay
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
-
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -75,9 +73,22 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
             decorFitsSystemWindows = false
         )
     ) {
-        Surface(modifier = Modifier.fillMaxWidth().fillMaxHeight()) {
-            Column(modifier = Modifier.fillMaxWidth().fillMaxHeight()) {
-                Column(modifier = Modifier.padding(10.dp).imePadding().weight(1f)) {
+        Surface(
+            modifier = Modifier
+                .fillMaxWidth()
+                .fillMaxHeight()
+        ) {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .fillMaxHeight()
+            ) {
+                Column(
+                    modifier = Modifier
+                        .padding(start = 10.dp, end = 10.dp, top = 10.dp)
+                        .imePadding()
+                        .weight(1f)
+                ) {
                     Row(
                         modifier = Modifier.fillMaxWidth(),
                         horizontalArrangement = Arrangement.SpaceBetween,
@@ -88,26 +99,26 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                             onClose()
                         })
 
-                        UploadFromGallery(
-                            isUploading = postViewModel.isUploadingImage,
-                        ) {
-                            postViewModel.upload(it, context)
-                        }
-
                         PostButton(
                             onPost = {
                                 postViewModel.sendPost()
                                 onClose()
                             },
-                            isActive = postViewModel.message.text.isNotBlank()
-                              && !postViewModel.isUploadingImage
+                            isActive = postViewModel.message.text.isNotBlank() &&
+                                !postViewModel.isUploadingImage
                         )
                     }
 
                     Row(
-                        modifier = Modifier.fillMaxWidth().weight(1f)
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .weight(1f)
                     ) {
-                        Column(modifier = Modifier.fillMaxWidth().verticalScroll(scroolState)) {
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .verticalScroll(scroolState)
+                        ) {
                             if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
                                 ReplyInformation(postViewModel.replyTos, postViewModel.mentions, account, "✖ ") {
                                     postViewModel.removeFromReplyList(it)
@@ -155,7 +166,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                 Row(modifier = Modifier.padding(top = 5.dp)) {
                                     if (isValidURL(myUrlPreview)) {
                                         val removedParamsFromUrl =
-                                            myUrlPreview.split("?")[0].toLowerCase()
+                                            myUrlPreview.split("?")[0].lowercase()
                                         if (imageExtension.matcher(removedParamsFromUrl).matches()) {
                                             AsyncImage(
                                                 model = myUrlPreview,
@@ -172,7 +183,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                                     )
                                             )
                                         } else if (videoExtension.matcher(removedParamsFromUrl)
-                                                .matches()
+                                            .matches()
                                         ) {
                                             VideoView(myUrlPreview)
                                         } else {
@@ -184,7 +195,6 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                 }
                             }
                         }
-
                     }
 
                     val userSuggestions = postViewModel.userSuggestions
@@ -197,13 +207,24 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                         ) {
                             itemsIndexed(
                                 userSuggestions,
-                                key = { _, item -> item.pubkeyHex }) { index, item ->
+                                key = { _, item -> item.pubkeyHex }
+                            ) { _, item ->
                                 UserLine(item, account) {
                                     postViewModel.autocompleteWithUser(item)
                                 }
                             }
                         }
                     }
+
+                    Row(modifier = Modifier.fillMaxWidth()) {
+                        UploadFromGallery(
+                            isUploading = postViewModel.isUploadingImage,
+                            tint = MaterialTheme.colors.primary,
+                            modifier = Modifier.padding(bottom = 10.dp)
+                        ) {
+                            postViewModel.upload(it, context)
+                        }
+                    }
                 }
             }
         }
@@ -222,7 +243,12 @@ fun CloseButton(onCancel: () -> Unit) {
                 backgroundColor = Color.Gray
             )
     ) {
-        Text(text = stringResource(R.string.cancel), color = Color.White)
+        Icon(
+            painter = painterResource(id = R.drawable.ic_close),
+            contentDescription = stringResource(id = R.string.cancel),
+            modifier = Modifier.size(20.dp),
+            tint = Color.White
+        )
     }
 }
 

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

@@ -10,12 +10,13 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.*
+import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 
-class NewPostViewModel: ViewModel() {
+class NewPostViewModel : ViewModel() {
     private var account: Account? = null
     private var originalNote: Note? = null
 
@@ -76,10 +77,15 @@ class NewPostViewModel: ViewModel() {
             paragraph.split(' ').forEach { word: String ->
                 val results = parseDirtyWordForKey(word)
 
-                if (results?.type == "npub") {
-                    addUserToMentions(LocalCache.getOrCreateUser(results.keyHex))
-                } else if (results?.type == "note") {
-                    addNoteToReplyTos(LocalCache.getOrCreateNote(results.keyHex))
+                if (results?.key?.type == Nip19.Type.USER) {
+                    addUserToMentions(LocalCache.getOrCreateUser(results.key.hex))
+                } else if (results?.key?.type == Nip19.Type.NOTE) {
+                    addNoteToReplyTos(LocalCache.getOrCreateNote(results.key.hex))
+                } else if (results?.key?.type == Nip19.Type.ADDRESS) {
+                    val note = LocalCache.checkGetOrCreateAddressableNote(results.key.hex)
+                    if (note != null) {
+                        addNoteToReplyTos(note)
+                    }
                 }
             }
         }
@@ -88,14 +94,21 @@ class NewPostViewModel: ViewModel() {
         val newMessage = message.text.split('\n').map { paragraph: String ->
             paragraph.split(' ').map { word: String ->
                 val results = parseDirtyWordForKey(word)
-                if (results?.type == "npub") {
-                    val user = LocalCache.getOrCreateUser(results.keyHex)
+                if (results?.key?.type == Nip19.Type.USER) {
+                    val user = LocalCache.getOrCreateUser(results.key.hex)
 
                     "#[${tagIndex(user)}]${results.restOfWord}"
-                } else if (results?.type == "note") {
-                    val note = LocalCache.getOrCreateNote(results.keyHex)
+                } else if (results?.key?.type == Nip19.Type.NOTE) {
+                    val note = LocalCache.getOrCreateNote(results.key.hex)
 
                     "#[${tagIndex(note)}]${results.restOfWord}"
+                } else if (results?.key?.type == Nip19.Type.ADDRESS) {
+                    val note = LocalCache.checkGetOrCreateAddressableNote(results.key.hex)
+                    if (note != null) {
+                        "#[${tagIndex(note)}]${results.restOfWord}"
+                    } else {
+                        word
+                    }
                 } else {
                     word
                 }
@@ -182,4 +195,4 @@ class NewPostViewModel: ViewModel() {
             userSuggestions = emptyList()
         }
     }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt

@@ -27,6 +27,7 @@ import androidx.compose.material.icons.filled.DeleteSweep
 import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.filled.Groups
 import androidx.compose.material.icons.filled.Public
+import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.SyncProblem
 import androidx.compose.material.icons.filled.Upload
 import androidx.compose.runtime.Composable
@@ -39,7 +40,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
@@ -54,16 +54,13 @@ import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import java.lang.Math.round
 
-
 @Composable
 fun NewRelayListView(onClose: () -> Unit, account: Account, relayToAdd: String = "") {
     val postViewModel: NewRelayListViewModel = viewModel()
-    val ctx = LocalContext.current.applicationContext
-
     val feedState by postViewModel.relays.collectAsState()
 
     LaunchedEffect(Unit) {
-        postViewModel.load(account, ctx)
+        postViewModel.load(account)
     }
 
     Dialog(
@@ -73,8 +70,7 @@ fun NewRelayListView(onClose: () -> Unit, account: Account, relayToAdd: String =
             dismissOnClickOutside = false
         )
     ) {
-        Surface(
-        ) {
+        Surface() {
             Column(
                 modifier = Modifier.padding(10.dp)
             ) {
@@ -84,13 +80,13 @@ fun NewRelayListView(onClose: () -> Unit, account: Account, relayToAdd: String =
                     verticalAlignment = Alignment.CenterVertically
                 ) {
                     CloseButton(onCancel = {
-                        postViewModel.clear(ctx)
+                        postViewModel.clear()
                         onClose()
                     })
 
                     PostButton(
                         onPost = {
-                            postViewModel.create(ctx)
+                            postViewModel.create()
                             onClose()
                         },
                         true
@@ -104,25 +100,27 @@ fun NewRelayListView(onClose: () -> Unit, account: Account, relayToAdd: String =
                         contentPadding = PaddingValues(
                             top = 10.dp,
                             bottom = 10.dp
-                        ),
+                        )
                     ) {
                         itemsIndexed(feedState, key = { _, item -> item.url }) { index, item ->
-                            if (index == 0)
+                            if (index == 0) {
                                 ServerConfigHeader()
-                            ServerConfig(item,
+                            }
+                            ServerConfig(
+                                item,
                                 onToggleDownload = { postViewModel.toggleDownload(it) },
-                                onToggleUpload = { postViewModel.toggleUpload(it)  },
+                                onToggleUpload = { postViewModel.toggleUpload(it) },
 
                                 onToggleFollows = { postViewModel.toggleFollows(it) },
-                                onTogglePrivateDMs = { postViewModel.toggleMessages(it)  },
+                                onTogglePrivateDMs = { postViewModel.toggleMessages(it) },
                                 onTogglePublicChats = { postViewModel.togglePublicChats(it) },
-                                onToggleGlobal = { postViewModel.toggleGlobal(it)  },
+                                onToggleGlobal = { postViewModel.toggleGlobal(it) },
+                                onToggleSearch = { postViewModel.toggleSearch(it) },
 
                                 onDelete = { postViewModel.deleteRelay(it) }
                             )
                         }
                     }
-
                 }
 
                 Spacer(modifier = Modifier.height(10.dp))
@@ -159,7 +157,7 @@ fun ServerConfigHeader() {
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1f),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                     )
 
                     Spacer(modifier = Modifier.size(10.dp))
@@ -169,7 +167,7 @@ fun ServerConfigHeader() {
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1f),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                     )
 
                     Spacer(modifier = Modifier.size(10.dp))
@@ -179,17 +177,17 @@ fun ServerConfigHeader() {
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1f),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                     )
 
                     Spacer(modifier = Modifier.size(5.dp))
 
                     Text(
-                        text = "Spam",
+                        text = stringResource(R.string.spam),
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1f),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                     )
 
                     Spacer(modifier = Modifier.size(2.dp))
@@ -213,8 +211,10 @@ fun ServerConfig(
     onTogglePrivateDMs: (RelaySetupInfo) -> Unit,
     onTogglePublicChats: (RelaySetupInfo) -> Unit,
     onToggleGlobal: (RelaySetupInfo) -> Unit,
+    onToggleSearch: (RelaySetupInfo) -> Unit,
 
-    onDelete: (RelaySetupInfo) -> Unit) {
+    onDelete: (RelaySetupInfo) -> Unit
+) {
     Column(Modifier.fillMaxWidth()) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
@@ -259,9 +259,13 @@ fun ServerConfig(
                                     modifier = Modifier
                                         .padding(end = 5.dp)
                                         .size(15.dp),
-                                    tint = if (item.feedTypes.contains(FeedType.FOLLOWS)) Color.Green else MaterialTheme.colors.onSurface.copy(
-                                        alpha = 0.32f
-                                    )
+                                    tint = if (item.feedTypes.contains(FeedType.FOLLOWS)) {
+                                        Color.Green
+                                    } else {
+                                        MaterialTheme.colors.onSurface.copy(
+                                            alpha = 0.32f
+                                        )
+                                    }
                                 )
                             }
                             IconButton(
@@ -274,9 +278,13 @@ fun ServerConfig(
                                     modifier = Modifier
                                         .padding(horizontal = 5.dp)
                                         .size(15.dp),
-                                    tint = if (item.feedTypes.contains(FeedType.PRIVATE_DMS)) Color.Green else MaterialTheme.colors.onSurface.copy(
-                                        alpha = 0.32f
-                                    )
+                                    tint = if (item.feedTypes.contains(FeedType.PRIVATE_DMS)) {
+                                        Color.Green
+                                    } else {
+                                        MaterialTheme.colors.onSurface.copy(
+                                            alpha = 0.32f
+                                        )
+                                    }
                                 )
                             }
                             IconButton(
@@ -289,9 +297,13 @@ fun ServerConfig(
                                     modifier = Modifier
                                         .padding(horizontal = 5.dp)
                                         .size(15.dp),
-                                    tint = if (item.feedTypes.contains(FeedType.PUBLIC_CHATS)) Color.Green else MaterialTheme.colors.onSurface.copy(
-                                        alpha = 0.32f
-                                    )
+                                    tint = if (item.feedTypes.contains(FeedType.PUBLIC_CHATS)) {
+                                        Color.Green
+                                    } else {
+                                        MaterialTheme.colors.onSurface.copy(
+                                            alpha = 0.32f
+                                        )
+                                    }
                                 )
                             }
                             IconButton(
@@ -304,9 +316,33 @@ fun ServerConfig(
                                     modifier = Modifier
                                         .padding(horizontal = 5.dp)
                                         .size(15.dp),
-                                    tint = if (item.feedTypes.contains(FeedType.GLOBAL)) Color.Green else MaterialTheme.colors.onSurface.copy(
-                                        alpha = 0.32f
-                                    )
+                                    tint = if (item.feedTypes.contains(FeedType.GLOBAL)) {
+                                        Color.Green
+                                    } else {
+                                        MaterialTheme.colors.onSurface.copy(
+                                            alpha = 0.32f
+                                        )
+                                    }
+                                )
+                            }
+
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onToggleSearch(item) }
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Default.Search,
+                                    stringResource(R.string.search_feed),
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
+                                    tint = if (item.feedTypes.contains(FeedType.SEARCH)) {
+                                        Color.Green
+                                    } else {
+                                        MaterialTheme.colors.onSurface.copy(
+                                            alpha = 0.32f
+                                        )
+                                    }
                                 )
                             }
                         }
@@ -324,9 +360,13 @@ fun ServerConfig(
                                     modifier = Modifier
                                         .padding(horizontal = 5.dp)
                                         .size(15.dp),
-                                    tint = if (item.read) Color.Green else MaterialTheme.colors.onSurface.copy(
-                                        alpha = 0.32f
-                                    )
+                                    tint = if (item.read) {
+                                        Color.Green
+                                    } else {
+                                        MaterialTheme.colors.onSurface.copy(
+                                            alpha = 0.32f
+                                        )
+                                    }
                                 )
                             }
 
@@ -335,7 +375,7 @@ fun ServerConfig(
                                 maxLines = 1,
                                 fontSize = 14.sp,
                                 modifier = Modifier.weight(1f),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
 
                             IconButton(
@@ -348,9 +388,13 @@ fun ServerConfig(
                                     modifier = Modifier
                                         .padding(horizontal = 5.dp)
                                         .size(15.dp),
-                                    tint = if (item.write) Color.Green else MaterialTheme.colors.onSurface.copy(
-                                        alpha = 0.32f
-                                    )
+                                    tint = if (item.write) {
+                                        Color.Green
+                                    } else {
+                                        MaterialTheme.colors.onSurface.copy(
+                                            alpha = 0.32f
+                                        )
+                                    }
                                 )
                             }
 
@@ -359,7 +403,7 @@ fun ServerConfig(
                                 maxLines = 1,
                                 fontSize = 14.sp,
                                 modifier = Modifier.weight(1f),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
 
                             Icon(
@@ -376,7 +420,7 @@ fun ServerConfig(
                                 maxLines = 1,
                                 fontSize = 14.sp,
                                 modifier = Modifier.weight(1f),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
 
                             Icon(
@@ -391,7 +435,7 @@ fun ServerConfig(
                                 maxLines = 1,
                                 fontSize = 14.sp,
                                 modifier = Modifier.weight(1f),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
                         }
                     }
@@ -414,7 +458,7 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni
     Row(verticalAlignment = Alignment.CenterVertically) {
         OutlinedTextField(
             label = { Text(text = stringResource(R.string.add_a_relay)) },
-            modifier =  Modifier.weight(1f),
+            modifier = Modifier.weight(1f),
             value = url,
             onValueChange = { url = it },
             placeholder = {
@@ -468,14 +512,12 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni
         ) {
             Text(text = stringResource(id = R.string.add), color = Color.White)
         }
-
     }
 }
 
-
 fun countToHumanReadable(counter: Int) = when {
-    counter >= 1000000000 -> "${round(counter/1000000000f)}G"
-    counter >= 1000000 -> "${round(counter/1000000f)}M"
-    counter >= 1000 -> "${round(counter/1000f)}k"
+    counter >= 1000000000 -> "${round(counter / 1000000000f)}G"
+    counter >= 1000000 -> "${round(counter / 1000000f)}M"
+    counter >= 1000 -> "${round(counter / 1000f)}k"
     else -> "$counter"
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListViewModel.kt

@@ -1,39 +1,49 @@
 package com.vitorpamplona.amethyst.ui.actions
 
-import android.content.Context
 import androidx.lifecycle.ViewModel
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.RelayPool
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 
-class NewRelayListViewModel: ViewModel() {
+class NewRelayListViewModel : ViewModel() {
     private lateinit var account: Account
 
     private val _relays = MutableStateFlow<List<RelaySetupInfo>>(emptyList())
     val relays = _relays.asStateFlow()
 
-    fun load(account: Account, ctx: Context) {
+    fun load(account: Account) {
         this.account = account
-        clear(ctx)
+        clear()
     }
 
-    fun create(ctx: Context) {
+    fun create() {
         relays.let {
             account.saveRelayList(it.value)
         }
 
-        clear(ctx)
+        clear()
     }
 
-    fun clear(ctx: Context) {
+    fun clear() {
         _relays.update {
-            val relayFile = account.userProfile().relays
+            var relayFile = account.userProfile().relays
 
-            if (relayFile != null)
+            // Ugly, but forces nostr.band as the only search-supporting relay today.
+            // TODO: Remove when search becomes more available.
+            if (relayFile?.none { it.key == Constants.forcedRelayForSearch.url } == true) {
+                relayFile = relayFile + Pair(
+                    Constants.forcedRelayForSearch.url,
+                    ContactListEvent.ReadWrite(Constants.forcedRelayForSearch.read, Constants.forcedRelayForSearch.write)
+                )
+            }
+
+            if (relayFile != null) {
                 relayFile.map {
                     val liveRelay = RelayPool.getRelay(it.key)
                     val localInfoFeedTypes = account.localRelays.filter { localRelay -> localRelay.url == it.key }.firstOrNull()?.feedTypes ?: FeedType.values().toSet()
@@ -45,7 +55,7 @@ class NewRelayListViewModel: ViewModel() {
 
                     RelaySetupInfo(it.key, it.value.read, it.value.write, errorCounter, eventDownloadCounter, eventUploadCounter, spamCounter, localInfoFeedTypes)
                 }.sortedBy { it.downloadCount }.reversed()
-            else
+            } else {
                 account.localRelays.map {
                     val liveRelay = RelayPool.getRelay(it.url)
 
@@ -56,6 +66,7 @@ class NewRelayListViewModel: ViewModel() {
 
                     RelaySetupInfo(it.url, it.read, it.write, errorCounter, eventDownloadCounter, eventUploadCounter, spamCounter, it.feedTypes)
                 }.sortedBy { it.downloadCount }.reversed()
+            }
         }
     }
 
@@ -109,7 +120,14 @@ class NewRelayListViewModel: ViewModel() {
     fun toggleGlobal(relay: RelaySetupInfo) {
         val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.GLOBAL)
         _relays.update {
-            it.updated(relay, relay.copy( feedTypes = newTypes ))
+            it.updated(relay, relay.copy(feedTypes = newTypes))
+        }
+    }
+
+    fun toggleSearch(relay: RelaySetupInfo) {
+        val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.SEARCH)
+        _relays.update {
+            it.updated(relay, relay.copy(feedTypes = newTypes))
         }
     }
 }
@@ -118,4 +136,4 @@ fun <T> Iterable<T>.updated(old: T, new: T): List<T> = map { if (it == old) new
 
 fun <T> togglePresenceInSet(set: Set<T>, item: T): Set<T> {
     return if (set.contains(item)) set.minus(item) else set.plus(item)
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt

@@ -7,7 +7,9 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
@@ -15,7 +17,6 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
@@ -26,7 +27,6 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
     val postViewModel: NewUserMetadataViewModel = viewModel()
@@ -42,8 +42,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
             dismissOnClickOutside = false
         )
     ) {
-        Surface(
-        ) {
+        Surface() {
             Column(
                 modifier = Modifier.padding(10.dp)
             ) {
@@ -67,159 +66,207 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                     )
                 }
 
-                Spacer(modifier = Modifier.height(10.dp))
+                Column(
+                    modifier = Modifier.padding(10.dp).verticalScroll(rememberScrollState())
+                ) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(1f),
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        OutlinedTextField(
+                            label = { Text(text = stringResource(R.string.display_name)) },
+                            modifier = Modifier.weight(1f),
+                            value = postViewModel.displayName.value,
+                            onValueChange = { postViewModel.displayName.value = it },
+                            placeholder = {
+                                Text(
+                                    text = stringResource(R.string.my_display_name),
+                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                )
+                            },
+                            keyboardOptions = KeyboardOptions.Default.copy(
+                                capitalization = KeyboardCapitalization.Sentences
+                            ),
+                            singleLine = true
+                        )
+
+                        Text("@", Modifier.padding(5.dp))
+
+                        OutlinedTextField(
+                            label = { Text(text = stringResource(R.string.username)) },
+                            modifier = Modifier.weight(1f),
+                            value = postViewModel.userName.value,
+                            onValueChange = { postViewModel.userName.value = it },
+                            placeholder = {
+                                Text(
+                                    text = stringResource(R.string.my_username),
+                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                )
+                            },
+                            singleLine = true
+                        )
+                    }
+
+                    Spacer(modifier = Modifier.height(10.dp))
 
-                Row(modifier = Modifier.fillMaxWidth(1f), verticalAlignment = Alignment.CenterVertically) {
                     OutlinedTextField(
-                        label = { Text(text = stringResource(R.string.display_name)) },
-                        modifier =  Modifier.weight(1f),
-                        value = postViewModel.displayName.value,
-                        onValueChange = { postViewModel.displayName.value = it },
+                        label = { Text(text = stringResource(R.string.about_me)) },
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(100.dp),
+                        value = postViewModel.about.value,
+                        onValueChange = { postViewModel.about.value = it },
                         placeholder = {
                             Text(
-                                text = stringResource(R.string.my_display_name),
+                                text = stringResource(id = R.string.about_me),
                                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
                         },
                         keyboardOptions = KeyboardOptions.Default.copy(
                             capitalization = KeyboardCapitalization.Sentences
                         ),
-                        singleLine = true
+                        maxLines = 10
                     )
 
-                    Text("@", Modifier.padding(5.dp))
+                    Spacer(modifier = Modifier.height(10.dp))
 
                     OutlinedTextField(
-                        label = { Text(text = stringResource(R.string.username)) },
-                        modifier = Modifier.weight(1f),
-                        value = postViewModel.userName.value,
-                        onValueChange = { postViewModel.userName.value = it },
+                        label = { Text(text = stringResource(R.string.avatar_url)) },
+                        modifier = Modifier.fillMaxWidth(),
+                        value = postViewModel.picture.value,
+                        onValueChange = { postViewModel.picture.value = it },
                         placeholder = {
                             Text(
-                                text = stringResource(R.string.my_username),
+                                text = "https://mywebsite.com/me.jpg",
                                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
                         },
                         singleLine = true
                     )
+
+                    Spacer(modifier = Modifier.height(10.dp))
+
+                    OutlinedTextField(
+                        label = { Text(text = stringResource(R.string.banner_url)) },
+                        modifier = Modifier.fillMaxWidth(),
+                        value = postViewModel.banner.value,
+                        onValueChange = { postViewModel.banner.value = it },
+                        placeholder = {
+                            Text(
+                                text = "https://mywebsite.com/mybanner.jpg",
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        },
+                        singleLine = true
+                    )
+
+                    Spacer(modifier = Modifier.height(10.dp))
+
+                    OutlinedTextField(
+                        label = { Text(text = stringResource(R.string.website_url)) },
+                        modifier = Modifier.fillMaxWidth(),
+                        value = postViewModel.website.value,
+                        onValueChange = { postViewModel.website.value = it },
+                        placeholder = {
+                            Text(
+                                text = "https://mywebsite.com",
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        },
+                        singleLine = true
+                    )
+
+                    Spacer(modifier = Modifier.height(10.dp))
+
+                    OutlinedTextField(
+                        label = { Text(text = stringResource(R.string.nip_05)) },
+                        modifier = Modifier.fillMaxWidth(),
+                        value = postViewModel.nip05.value,
+                        onValueChange = { postViewModel.nip05.value = it },
+                        placeholder = {
+                            Text(
+                                text = "_@mywebsite.com",
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        },
+                        singleLine = true
+                    )
+
+                    Spacer(modifier = Modifier.height(10.dp))
+                    OutlinedTextField(
+                        label = { Text(text = stringResource(R.string.ln_address)) },
+                        modifier = Modifier.fillMaxWidth(),
+                        value = postViewModel.lnAddress.value,
+                        onValueChange = { postViewModel.lnAddress.value = it },
+                        placeholder = {
+                            Text(
+                                text = "me@mylightiningnode.com",
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        },
+                        singleLine = true
+                    )
+
+                    Spacer(modifier = Modifier.height(10.dp))
+
+                    OutlinedTextField(
+                        label = { Text(text = stringResource(R.string.ln_url_outdated)) },
+                        modifier = Modifier.fillMaxWidth(),
+                        value = postViewModel.lnURL.value,
+                        onValueChange = { postViewModel.lnURL.value = it },
+                        placeholder = {
+                            Text(
+                                text = stringResource(R.string.lnurl),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        }
+                    )
+
+                    Spacer(modifier = Modifier.height(10.dp))
+
+                    OutlinedTextField(
+                        label = { Text(text = stringResource(R.string.twitter)) },
+                        modifier = Modifier.fillMaxWidth(),
+                        value = postViewModel.twitter.value,
+                        onValueChange = { postViewModel.twitter.value = it },
+                        placeholder = {
+                            Text(
+                                text = stringResource(R.string.twitter_proof_url_template),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        }
+                    )
+
+                    Spacer(modifier = Modifier.height(10.dp))
+
+                    OutlinedTextField(
+                        label = { Text(text = stringResource(R.string.mastodon)) },
+                        modifier = Modifier.fillMaxWidth(),
+                        value = postViewModel.mastodon.value,
+                        onValueChange = { postViewModel.mastodon.value = it },
+                        placeholder = {
+                            Text(
+                                text = stringResource(R.string.mastodon_proof_url_template),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        }
+                    )
+
+                    Spacer(modifier = Modifier.height(10.dp))
+
+                    OutlinedTextField(
+                        label = { Text(text = stringResource(R.string.github)) },
+                        modifier = Modifier.fillMaxWidth(),
+                        value = postViewModel.github.value,
+                        onValueChange = { postViewModel.github.value = it },
+                        placeholder = {
+                            Text(
+                                text = stringResource(R.string.github_proof_url_template),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        }
+                    )
                 }
-
-                Spacer(modifier = Modifier.height(10.dp))
-
-                OutlinedTextField(
-                    label = { Text(text = stringResource(R.string.about_me)) },
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(100.dp),
-                    value = postViewModel.about.value,
-                    onValueChange = { postViewModel.about.value = it },
-                    placeholder = {
-                        Text(
-                            text = stringResource(id = R.string.about_me),
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                        )
-                    },
-                    keyboardOptions = KeyboardOptions.Default.copy(
-                        capitalization = KeyboardCapitalization.Sentences
-                    ),
-                    maxLines = 10
-                )
-
-                Spacer(modifier = Modifier.height(10.dp))
-
-                OutlinedTextField(
-                    label = { Text(text = stringResource(R.string.avatar_url)) },
-                    modifier = Modifier.fillMaxWidth(),
-                    value = postViewModel.picture.value,
-                    onValueChange = { postViewModel.picture.value = it },
-                    placeholder = {
-                        Text(
-                            text = "https://mywebsite.com/me.jpg",
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                        )
-                    },
-                    singleLine = true
-                )
-
-                Spacer(modifier = Modifier.height(10.dp))
-
-                OutlinedTextField(
-                    label = { Text(text = stringResource(R.string.banner_url)) },
-                    modifier = Modifier.fillMaxWidth(),
-                    value = postViewModel.banner.value,
-                    onValueChange = { postViewModel.banner.value = it },
-                    placeholder = {
-                        Text(
-                            text = "https://mywebsite.com/mybanner.jpg",
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                        )
-                    },
-                    singleLine = true
-                )
-
-                Spacer(modifier = Modifier.height(10.dp))
-
-                OutlinedTextField(
-                    label = { Text(text = stringResource(R.string.website_url)) },
-                    modifier = Modifier.fillMaxWidth(),
-                    value = postViewModel.website.value,
-                    onValueChange = { postViewModel.website.value = it },
-                    placeholder = {
-                        Text(
-                            text = "https://mywebsite.com",
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                        )
-                    },
-                    singleLine = true
-                )
-
-                Spacer(modifier = Modifier.height(10.dp))
-
-                OutlinedTextField(
-                    label = { Text(text = stringResource(R.string.nip_05)) },
-                    modifier = Modifier.fillMaxWidth(),
-                    value = postViewModel.nip05.value,
-                    onValueChange = { postViewModel.nip05.value = it },
-                    placeholder = {
-                        Text(
-                            text = "_@mywebsite.com",
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                        )
-                    },
-                    singleLine = true
-                )
-
-                Spacer(modifier = Modifier.height(10.dp))
-                OutlinedTextField(
-                    label = { Text(text = stringResource(R.string.ln_address)) },
-                    modifier = Modifier.fillMaxWidth(),
-                    value = postViewModel.lnAddress.value,
-                    onValueChange = { postViewModel.lnAddress.value = it },
-                    placeholder = {
-                        Text(
-                            text = "me@mylightiningnode.com",
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                        )
-                    },
-                    singleLine = true
-                )
-
-                Spacer(modifier = Modifier.height(10.dp))
-
-                OutlinedTextField(
-                    label = { Text(text = stringResource(R.string.ln_url_outdated)) },
-                    modifier = Modifier.fillMaxWidth(),
-                    value = postViewModel.lnURL.value,
-                    onValueChange = { postViewModel.lnURL.value = it },
-                    placeholder = {
-                        Text(
-                            text = stringResource(R.string.lnurl),
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                        )
-                    },
-                    singleLine = true
-                )
-
             }
         }
     }

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

@@ -5,10 +5,13 @@ import androidx.lifecycle.ViewModel
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.node.ObjectNode
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.model.GitHubIdentity
+import com.vitorpamplona.amethyst.service.model.MastodonIdentity
+import com.vitorpamplona.amethyst.service.model.TwitterIdentity
 import java.io.ByteArrayInputStream
 import java.io.StringWriter
 
-class NewUserMetadataViewModel: ViewModel() {
+class NewUserMetadataViewModel : ViewModel() {
     private lateinit var account: Account
 
     val userName = mutableStateOf("")
@@ -23,6 +26,10 @@ class NewUserMetadataViewModel: ViewModel() {
     val lnAddress = mutableStateOf("")
     val lnURL = mutableStateOf("")
 
+    val twitter = mutableStateOf("")
+    val github = mutableStateOf("")
+    val mastodon = mutableStateOf("")
+
     fun load(account: Account) {
         this.account = account
 
@@ -36,6 +43,19 @@ class NewUserMetadataViewModel: ViewModel() {
             nip05.value = it.info?.nip05 ?: ""
             lnAddress.value = it.info?.lud16 ?: ""
             lnURL.value = it.info?.lud06 ?: ""
+
+            twitter.value = ""
+            github.value = ""
+            mastodon.value = ""
+
+            // TODO: Validate Telegram input, somehow.
+            it.info?.latestMetadata?.identityClaims()?.forEach {
+                when (it) {
+                    is TwitterIdentity -> twitter.value = it.toProofUrl()
+                    is GitHubIdentity -> github.value = it.toProofUrl()
+                    is MastodonIdentity -> mastodon.value = it.toProofUrl()
+                }
+            }
         }
     }
 
@@ -61,10 +81,34 @@ class NewUserMetadataViewModel: ViewModel() {
         currentJson.put("lud16", lnAddress.value.trim())
         currentJson.put("lud06", lnURL.value.trim())
 
+        var claims = latest?.identityClaims() ?: emptyList()
+
+        if (twitter.value.isBlank()) {
+            // delete twitter
+            claims = claims.filter { it !is TwitterIdentity }
+        }
+
+        if (github.value.isBlank()) {
+            // delete github
+            claims = claims.filter { it !is GitHubIdentity }
+        }
+
+        if (mastodon.value.isBlank()) {
+            // delete mastodon
+            claims = claims.filter { it !is MastodonIdentity }
+        }
+
+        // Updates while keeping other identities intact
+        val newClaims = listOfNotNull(
+            TwitterIdentity.parseProofUrl(twitter.value),
+            GitHubIdentity.parseProofUrl(github.value),
+            MastodonIdentity.parseProofUrl(mastodon.value)
+        ) + claims.filter { it !is TwitterIdentity && it !is GitHubIdentity && it !is MastodonIdentity }
+
         val writer = StringWriter()
         ObjectMapper().writeValue(writer, currentJson)
 
-        account.sendNewUserMetadata(writer.buffer.toString())
+        account.sendNewUserMetadata(writer.buffer.toString(), newClaims)
 
         clear()
     }
@@ -79,5 +123,8 @@ class NewUserMetadataViewModel: ViewModel() {
         nip05.value = ""
         lnAddress.value = ""
         lnURL.value = ""
+        twitter.value = ""
+        github.value = ""
+        mastodon.value = ""
     }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/SaveToGallery.kt

@@ -31,7 +31,6 @@ fun SaveToGallery(url: String) {
     val localContext = LocalContext.current
     val scope = rememberCoroutineScope()
 
-
     fun saveImage() {
         ImageSaver.saveImage(
             context = localContext,
@@ -83,4 +82,4 @@ fun SaveToGallery(url: String) {
     ) {
         Text(text = stringResource(id = R.string.save), color = Color.White)
     }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/UploadFromGallery.kt

@@ -1,29 +1,42 @@
-package com.vitorpamplona.amethyst.ui.navigation
+package com.vitorpamplona.amethyst.ui.actions
 
 import android.net.Uri
 import android.os.Build
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
-import androidx.compose.material.Text
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AddPhotoAlternate
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.vitorpamplona.amethyst.R
+import java.util.concurrent.atomic.AtomicBoolean
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
 fun UploadFromGallery(
     isUploading: Boolean,
-    onImageChosen: (Uri) -> Unit,
+    tint: Color,
+    modifier: Modifier,
+    onImageChosen: (Uri) -> Unit
 ) {
     val cameraPermissionState =
         rememberPermissionState(
@@ -40,63 +53,118 @@ fun UploadFromGallery(
             GallerySelect(
                 onImageUri = { uri ->
                     showGallerySelect = false
-                    if (uri != null)
+                    if (uri != null) {
                         onImageChosen(uri)
+                    }
                 }
             )
-        } else {
-            Box() {
-                Button(
-                    modifier = Modifier
-                        .align(Alignment.TopCenter)
-                        .padding(4.dp),
-                    enabled = !isUploading,
-                    onClick = {
-                        showGallerySelect = true
-                    }
-                ) {
-                    if (!isUploading) {
-                        Text(stringResource(R.string.upload_image))
-                    } else {
-                        Text(stringResource(R.string.uploading))
-                    }
-                }
-            }
+        }
+
+        UploadBoxButton(isUploading, tint, modifier) {
+            showGallerySelect = true
         }
     } else {
-        Column {
-            Button(
-                onClick = { cameraPermissionState.launchPermissionRequest() },
-                enabled = !isUploading,
-            ) {
-                if (!isUploading) {
-                    Text(stringResource(R.string.upload_image))
-                } else {
-                    Text(stringResource(R.string.uploading))
-                }
+        UploadBoxButton(isUploading, tint, modifier) {
+            cameraPermissionState.launchPermissionRequest()
+        }
+    }
+}
+
+@Composable
+private fun UploadBoxButton(
+    isUploading: Boolean,
+    tint: Color,
+    modifier: Modifier,
+    onClick: () -> Unit
+) {
+    Box() {
+        IconButton(
+            modifier = modifier.align(Alignment.Center),
+            enabled = !isUploading,
+            onClick = {
+                onClick()
+            }
+        ) {
+            if (!isUploading) {
+                Icon(
+                    imageVector = Icons.Default.AddPhotoAlternate,
+                    contentDescription = stringResource(id = R.string.upload_image),
+                    modifier = Modifier.height(25.dp),
+                    tint = tint
+                )
+            } else {
+                LoadingAnimation()
             }
         }
     }
 }
 
+@Composable
+fun LoadingAnimation(
+    indicatorSize: Dp = 20.dp,
+    circleColors: List<Color> = listOf(
+        Color(0xFF5851D8),
+        Color(0xFF833AB4),
+        Color(0xFFC13584),
+        Color(0xFFE1306C),
+        Color(0xFFFD1D1D),
+        Color(0xFFF56040),
+        Color(0xFFF77737),
+        Color(0xFFFCAF45),
+        Color(0xFFFFDC80),
+        Color(0xFF5851D8)
+    ),
+    animationDuration: Int = 1000
+) {
+    val infiniteTransition = rememberInfiniteTransition()
+
+    val rotateAnimation by infiniteTransition.animateFloat(
+        initialValue = 0f,
+        targetValue = 360f,
+        animationSpec = infiniteRepeatable(
+            animation = tween(
+                durationMillis = animationDuration,
+                easing = LinearEasing
+            )
+        )
+    )
+
+    CircularProgressIndicator(
+        modifier = Modifier
+            .size(size = indicatorSize)
+            .rotate(degrees = rotateAnimation)
+            .border(
+                width = 4.dp,
+                brush = Brush.sweepGradient(circleColors),
+                shape = CircleShape
+            ),
+        progress = 1f,
+        strokeWidth = 1.dp,
+        color = MaterialTheme.colors.background // Set background color
+    )
+}
 
 @Composable
 fun GallerySelect(
     onImageUri: (Uri?) -> Unit = { }
 ) {
+    var hasLaunched by remember { mutableStateOf(AtomicBoolean(false)) }
     val launcher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.GetContent(),
         onResult = { uri: Uri? ->
             onImageUri(uri)
+            hasLaunched.set(false)
         }
     )
 
     @Composable
     fun LaunchGallery() {
         SideEffect {
-            launcher.launch("image/*")
+            if (!hasLaunched.getAndSet(true)) {
+                launcher.launch("image/*")
+            }
         }
     }
 
     LaunchGallery()
-}
+}

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

@@ -18,127 +18,128 @@ import kotlin.math.roundToInt
 data class RangesChanges(val original: TextRange, val modified: TextRange)
 
 class UrlUserTagTransformation(val color: Color) : VisualTransformation {
-  override fun filter(text: AnnotatedString): TransformedText {
-    return buildAnnotatedStringWithUrlHighlighting(text, color)
-  }
+    override fun filter(text: AnnotatedString): TransformedText {
+        return buildAnnotatedStringWithUrlHighlighting(text, color)
+    }
 }
 
 fun buildAnnotatedStringWithUrlHighlighting(text: AnnotatedString, color: Color): TransformedText {
     val substitutions = mutableListOf<RangesChanges>()
 
     val newText = buildAnnotatedString {
-      val builderBefore = StringBuilder() // important to correctly measure Tag start and end
-      val builderAfter = StringBuilder() // important to correctly measure Tag start and end
-      append(
-        text.split('\n').map { paragraph: String ->
-          paragraph.split(' ').map { word: String ->
-            try {
-              if (word.startsWith("@npub") && word.length >= 64) {
-                val keyB32 = word.substring(0, 64)
-                val restOfWord = word.substring(64)
+        val builderBefore = StringBuilder() // important to correctly measure Tag start and end
+        val builderAfter = StringBuilder() // important to correctly measure Tag start and end
+        append(
+            text.split('\n').map { paragraph: String ->
+                paragraph.split(' ').map { word: String ->
+                    try {
+                        if (word.startsWith("@npub") && word.length >= 64) {
+                            val keyB32 = word.substring(0, 64)
+                            val restOfWord = word.substring(64)
 
-                val startIndex = builderBefore.toString().length
+                            val startIndex = builderBefore.toString().length
 
-                builderBefore.append("$keyB32$restOfWord ") // accounts for the \n at the end of each paragraph
+                            builderBefore.append("$keyB32$restOfWord ") // accounts for the \n at the end of each paragraph
 
-                val endIndex = startIndex + keyB32.length
+                            val endIndex = startIndex + keyB32.length
 
-                val key = decodePublicKey(keyB32.removePrefix("@"))
-                val user = LocalCache.getOrCreateUser(key.toHexKey())
+                            val key = decodePublicKey(keyB32.removePrefix("@"))
+                            val user = LocalCache.getOrCreateUser(key.toHexKey())
 
-                val newWord = "@${user.toBestDisplayName()}"
-                val startNew = builderAfter.toString().length
+                            val newWord = "@${user.toBestDisplayName()}"
+                            val startNew = builderAfter.toString().length
 
-                builderAfter.append("$newWord$restOfWord ") // accounts for the \n at the end of each paragraph
+                            builderAfter.append("$newWord$restOfWord ") // accounts for the \n at the end of each paragraph
 
-                substitutions.add(
-                  RangesChanges(
-                    TextRange(startIndex, endIndex),
-                    TextRange(startNew, startNew + newWord.length)
-                  )
-                )
-                newWord + restOfWord
-              } else {
-                builderBefore.append(word + " ")
-                builderAfter.append(word + " ")
-                word
-              }
-            } catch (e: Exception) {
-              // if it can't parse the key, don't try to change.
-              builderBefore.append(word + " ")
-              builderAfter.append(word + " ")
-              word
-            }
-          }.joinToString(" ")
-        }.joinToString("\n")
-      )
-
-      val newText = toAnnotatedString()
-
-      newText.split("\\s+".toRegex()).filter { word ->
-        Patterns.WEB_URL.matcher(word).matches()
-      }.forEach {
-        val startIndex = text.indexOf(it)
-        val endIndex = startIndex + it.length
-        addStyle(
-          style = SpanStyle(
-            color = color,
-            textDecoration = TextDecoration.None
-          ),
-          start = startIndex, end = endIndex
+                            substitutions.add(
+                                RangesChanges(
+                                    TextRange(startIndex, endIndex),
+                                    TextRange(startNew, startNew + newWord.length)
+                                )
+                            )
+                            newWord + restOfWord
+                        } else {
+                            builderBefore.append(word + " ")
+                            builderAfter.append(word + " ")
+                            word
+                        }
+                    } catch (e: Exception) {
+                        // if it can't parse the key, don't try to change.
+                        builderBefore.append(word + " ")
+                        builderAfter.append(word + " ")
+                        word
+                    }
+                }.joinToString(" ")
+            }.joinToString("\n")
         )
-      }
 
-      substitutions.forEach {
-        addStyle(
-          style = SpanStyle(
-            color = color,
-            textDecoration = TextDecoration.None
-          ),
-          start = it.modified.start, end = it.modified.end
-        )
-      }
+        val newText = toAnnotatedString()
+
+        newText.split("\\s+".toRegex()).filter { word ->
+            Patterns.WEB_URL.matcher(word).matches()
+        }.forEach {
+            val startIndex = text.indexOf(it)
+            val endIndex = startIndex + it.length
+            addStyle(
+                style = SpanStyle(
+                    color = color,
+                    textDecoration = TextDecoration.None
+                ),
+                start = startIndex,
+                end = endIndex
+            )
+        }
+
+        substitutions.forEach {
+            addStyle(
+                style = SpanStyle(
+                    color = color,
+                    textDecoration = TextDecoration.None
+                ),
+                start = it.modified.start,
+                end = it.modified.end
+            )
+        }
     }
 
     val numberOffsetTranslator = object : OffsetMapping {
         override fun originalToTransformed(offset: Int): Int {
-          val inInsideRange = substitutions.filter { offset > it.original.start && offset < it.original.end }.firstOrNull()
+            val inInsideRange = substitutions.filter { offset > it.original.start && offset < it.original.end }.firstOrNull()
 
-          if (inInsideRange != null) {
-            val percentInRange = (offset - inInsideRange.original.start) / (inInsideRange.original.length.toFloat())
-            return (inInsideRange.modified.start + inInsideRange.modified.length * percentInRange).roundToInt()
-          }
+            if (inInsideRange != null) {
+                val percentInRange = (offset - inInsideRange.original.start) / (inInsideRange.original.length.toFloat())
+                return (inInsideRange.modified.start + inInsideRange.modified.length * percentInRange).roundToInt()
+            }
 
-          val lastRangeThrough = substitutions.lastOrNull { offset >= it.original.end }
+            val lastRangeThrough = substitutions.lastOrNull { offset >= it.original.end }
 
-          if (lastRangeThrough != null) {
-            return lastRangeThrough.modified.end + (offset - lastRangeThrough.original.end)
-          } else {
-            return offset
-          }
+            if (lastRangeThrough != null) {
+                return lastRangeThrough.modified.end + (offset - lastRangeThrough.original.end)
+            } else {
+                return offset
+            }
         }
 
         override fun transformedToOriginal(offset: Int): Int {
-          val inInsideRange = substitutions.filter { offset > it.modified.start && offset < it.modified.end }.firstOrNull()
+            val inInsideRange = substitutions.filter { offset > it.modified.start && offset < it.modified.end }.firstOrNull()
 
-          if (inInsideRange != null) {
-            val percentInRange = (offset - inInsideRange.modified.start) / (inInsideRange.modified.length.toFloat())
-            return (inInsideRange.original.start + inInsideRange.original.length * percentInRange).roundToInt()
-          }
+            if (inInsideRange != null) {
+                val percentInRange = (offset - inInsideRange.modified.start) / (inInsideRange.modified.length.toFloat())
+                return (inInsideRange.original.start + inInsideRange.original.length * percentInRange).roundToInt()
+            }
 
-          val lastRangeThrough = substitutions.lastOrNull { offset >= it.modified.end }
+            val lastRangeThrough = substitutions.lastOrNull { offset >= it.modified.end }
 
-          if (lastRangeThrough != null) {
-            return lastRangeThrough.original.end + (offset - lastRangeThrough.modified.end)
-          } else {
-            return offset
-          }
+            if (lastRangeThrough != null) {
+                return lastRangeThrough.original.end + (offset - lastRangeThrough.modified.end)
+            } else {
+                return offset
+            }
         }
     }
 
     return TransformedText(
-      newText,
-      numberOffsetTranslator
+        newText,
+        numberOffsetTranslator
     )
-
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewChannelButton.kt

@@ -28,15 +28,16 @@ fun NewChannelButton(account: Account) {
         mutableStateOf(false)
     }
 
-    if (wantsToPost)
+    if (wantsToPost) {
         NewChannelView({ wantsToPost = false }, account = account)
+    }
 
     OutlinedButton(
         onClick = { wantsToPost = true },
         modifier = Modifier.size(55.dp),
         shape = CircleShape,
         colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.primary),
-        contentPadding = PaddingValues(0.dp),
+        contentPadding = PaddingValues(0.dp)
     ) {
         Icon(
             imageVector = Icons.Outlined.Add,
@@ -45,4 +46,4 @@ fun NewChannelButton(account: Account) {
             tint = Color.White
         )
     }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewNoteButton.kt

@@ -26,15 +26,16 @@ fun NewNoteButton(account: Account) {
         mutableStateOf(false)
     }
 
-    if (wantsToPost)
+    if (wantsToPost) {
         NewPostView({ wantsToPost = false }, account = account)
+    }
 
     OutlinedButton(
         onClick = { wantsToPost = true },
         modifier = Modifier.size(55.dp),
         shape = CircleShape,
         colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.primary),
-        contentPadding = PaddingValues(0.dp),
+        contentPadding = PaddingValues(0.dp)
     ) {
         Icon(
             painter = painterResource(R.drawable.ic_compose),
@@ -43,4 +44,4 @@ fun NewNoteButton(account: Account) {
             tint = Color.White
         )
     }
-}
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/components/AsyncImageProxy.kt

@@ -9,76 +9,73 @@ import androidx.compose.ui.graphics.FilterQuality
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import coil.compose.AsyncImage
 import coil.compose.AsyncImagePainter
-import coil.compose.LocalImageLoader
 import java.util.Base64
 
 data class ResizeImage(val url: String?, val size: Dp) {
-  fun proxyUrl(): String? {
-    if (url == null) return null
+    fun proxyUrl(): String? {
+        if (url == null) return null
 
-    // Fixes Image size to reduce pings to servers for each size used in the app
-    val imgPx = 200 // with(LocalDensity.current) { model.size.toPx().toInt() }
-    val base64 = Base64.getUrlEncoder().encodeToString(url.toByteArray())
+        // Fixes Image size to reduce pings to servers for each size used in the app
+        val imgPx = 200 // with(LocalDensity.current) { model.size.toPx().toInt() }
+        val base64 = Base64.getUrlEncoder().encodeToString(url.toByteArray())
 
-    return "https://d12fidohs5rlxk.cloudfront.net/preset:sharp/rs:fit:$imgPx:$imgPx:0/gravity:sm/$base64"
-  }
+        return "https://d12fidohs5rlxk.cloudfront.net/preset:sharp/rs:fit:$imgPx:$imgPx:0/gravity:sm/$base64"
+    }
 }
 
-
 @Composable
 fun AsyncImageProxy(
-  model: ResizeImage,
-  contentDescription: String?,
-  modifier: Modifier = Modifier,
-  placeholder: Painter? = null,
-  error: Painter? = null,
-  fallback: Painter? = error,
-  onLoading: ((AsyncImagePainter.State.Loading) -> Unit)? = null,
-  onSuccess: ((AsyncImagePainter.State.Success) -> Unit)? = null,
-  onError: ((AsyncImagePainter.State.Error) -> Unit)? = null,
-  alignment: Alignment = Alignment.Center,
-  contentScale: ContentScale = ContentScale.Fit,
-  alpha: Float = DefaultAlpha,
-  colorFilter: ColorFilter? = null,
-  filterQuality: FilterQuality = DrawScope.DefaultFilterQuality,
+    model: ResizeImage,
+    contentDescription: String?,
+    modifier: Modifier = Modifier,
+    placeholder: Painter? = null,
+    error: Painter? = null,
+    fallback: Painter? = error,
+    onLoading: ((AsyncImagePainter.State.Loading) -> Unit)? = null,
+    onSuccess: ((AsyncImagePainter.State.Success) -> Unit)? = null,
+    onError: ((AsyncImagePainter.State.Error) -> Unit)? = null,
+    alignment: Alignment = Alignment.Center,
+    contentScale: ContentScale = ContentScale.Fit,
+    alpha: Float = DefaultAlpha,
+    colorFilter: ColorFilter? = null,
+    filterQuality: FilterQuality = DrawScope.DefaultFilterQuality
 ) {
-  if (model.url == null) {
-    AsyncImage(
-      model = model.url,
-      contentDescription = contentDescription,
-      modifier = modifier,
-      placeholder = placeholder,
-      error = error,
-      fallback = fallback,
-      onLoading = onLoading,
-      onSuccess = onSuccess,
-      onError = onError,
-      alignment = alignment,
-      contentScale = contentScale,
-      alpha = alpha,
-      colorFilter = colorFilter,
-      filterQuality = filterQuality
-    )
-  } else {
-    AsyncImage(
-      model = model.proxyUrl(),
-      contentDescription = contentDescription,
-      modifier = modifier,
-      placeholder = placeholder,
-      error = error,
-      fallback = fallback,
-      onLoading = onLoading,
-      onSuccess = onSuccess,
-      onError = onError,
-      alignment = alignment,
-      contentScale = contentScale,
-      alpha = alpha,
-      colorFilter = colorFilter,
-      filterQuality = filterQuality
-    )
-  }
-}
+    if (model.url == null) {
+        AsyncImage(
+            model = model.url,
+            contentDescription = contentDescription,
+            modifier = modifier,
+            placeholder = placeholder,
+            error = error,
+            fallback = fallback,
+            onLoading = onLoading,
+            onSuccess = onSuccess,
+            onError = onError,
+            alignment = alignment,
+            contentScale = contentScale,
+            alpha = alpha,
+            colorFilter = colorFilter,
+            filterQuality = filterQuality
+        )
+    } else {
+        AsyncImage(
+            model = model.proxyUrl(),
+            contentDescription = contentDescription,
+            modifier = modifier,
+            placeholder = placeholder,
+            error = error,
+            fallback = fallback,
+            onLoading = onLoading,
+            onSuccess = onSuccess,
+            onError = onError,
+            alignment = alignment,
+            contentScale = contentScale,
+            alpha = alpha,
+            colorFilter = colorFilter,
+            filterQuality = filterQuality
+        )
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableEmail.kt

@@ -12,26 +12,27 @@ import androidx.compose.ui.text.AnnotatedString
 
 @Composable
 fun ClickableEmail(email: String) {
-  val context = LocalContext.current
+    val context = LocalContext.current
 
-  ClickableText(
-    text = AnnotatedString("$email "),
-    onClick = { runCatching { context.sendMail(email) } },
-    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
-  )
+    ClickableText(
+        text = AnnotatedString("$email "),
+        onClick = { runCatching { context.sendMail(email) } },
+        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+    )
 }
 
 fun Context.sendMail(to: String, subject: String? = null) {
-  try {
-    val intent = Intent(Intent.ACTION_SEND)
-    intent.type = "vnd.android.cursor.item/email" // or "message/rfc822"
-    intent.putExtra(Intent.EXTRA_EMAIL, arrayOf(to))
-    if (subject != null)
-      intent.putExtra(Intent.EXTRA_SUBJECT, subject)
-    startActivity(intent)
-  } catch (e: ActivityNotFoundException) {
-    // TODO: Handle case where no email app is available
-  } catch (t: Throwable) {
-    // TODO: Handle potential other type of exceptions
-  }
-}
+    try {
+        val intent = Intent(Intent.ACTION_SEND)
+        intent.type = "vnd.android.cursor.item/email" // or "message/rfc822"
+        intent.putExtra(Intent.EXTRA_EMAIL, arrayOf(to))
+        if (subject != null) {
+            intent.putExtra(Intent.EXTRA_SUBJECT, subject)
+        }
+        startActivity(intent)
+    } catch (e: ActivityNotFoundException) {
+        // TODO: Handle case where no email app is available
+    } catch (t: Throwable) {
+        // TODO: Handle potential other type of exceptions
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableNoteTag.kt

@@ -11,12 +11,12 @@ import com.vitorpamplona.amethyst.ui.note.toShortenHex
 
 @Composable
 fun ClickableNoteTag(
-  baesNote: Note,
-  navController: NavController
+    baesNote: Note,
+    navController: NavController
 ) {
-  ClickableText(
-    text = AnnotatedString("@${baesNote.idNote().toShortenHex()} "),
-    onClick = { navController.navigate("Note/${baesNote.idHex}") },
-    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
-  )
-}
+    ClickableText(
+        text = AnnotatedString("@${baesNote.idNote().toShortenHex()} "),
+        onClick = { navController.navigate("Note/${baesNote.idHex}") },
+        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+    )
+}