0.22.0

Use KeyboardType.Password for login text field

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Video and Screenshots**
+If applicable, add a video and/or screenshots to help explain your problem.
+
+**Device (please complete the following information):**
+ - Phone Brand/Model [e.g. Pixel 7 Pro]: 
+ - Android Version [e.g. 33]: 
+ - App Version [e.g. v0.20.3]: 
+
+**Bounty (in Bitcoin sats) offered for a solution**
+Incentivize developers to work on your issue. Describe clear milestones to claim payment.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE]"
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Bounty (in Bitcoin sats) offered for the implementation**
+Incentivize developers to work on your feature. Describe clear milestones to claim payment. 
+
+**Additional context**
+Add any other context, video, or screenshots about the feature request here.

.idea/.name

@@ -0,0 +1 @@
+Amethyst

.idea/inspectionProfiles/Project_Default.xml

@@ -5,6 +5,9 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />

.idea/kotlinc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.10" />
+  </component>
+</project>

.idea/misc.xml

@@ -1,7 +1,7 @@
 <?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="1.8" project-jdk-type="JavaSDK">
+  <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">

PRIVACY.md

@@ -0,0 +1,13 @@
+# Amethyst Privacy Policy & Terms of Use
+
+Effective as of Jan 20, 2023.
+
+The Amethyst app for Android does not collect or process any personal information from its users. The app is used to connect to third-party Nostr servers (also called Relays) that may or may not collect personal information and are not covered by this privacy policy. Each third-party relay server comes equipped with its own privacy policy and terms of use that can be viewed through the app or through that server's website. The developers of this open source project or maintainers of the distribution channels (app stores) do not have access to the data located in the user's phone. Accounts are fully maintained by the user. We do not have control over them. 
+
+Data from connected accounts is only stored locally on the device when it is required for functionality and performance of Amethyst. This data is strictly confidental and cannot be accessed by other apps (on non-rooted devices). Phone data can be deleted by clearing Amethyst's local storage or uninstalling the app.
+
+You cannot use Amethyst to submit Objectionable Content to relays. Objectionable Content includes, but is not limited to: (i) sexually explicit materials; (ii) obscene, defamatory, libelous, slanderous, violent and/or unlawful content or profanity; (iii) content that infringes upon the rights of any third party, including copyright, trademark, privacy, publicity or other personal or proprietary right, or that is deceptive or fraudulent; (iv) content that promotes the use or sale of illegal or regulated substances, tobacco products, ammunition and/or firearms; and (v) illegal content related to gambling.
+
+We reserve the right to modify this Privacy Policy at any time. Any modifications to this Privacy Policy will be effective upon our posting the new terms and/or upon implementation of the new changes on the Service (or as otherwise indicated at the time of posting). In all cases, your continued use of the app after the posting of any modified Privacy Policy indicates your acceptance of the terms of the modified Privacy Policy.
+
+If you have any questions about Amethyst or this privacy policy, you can send a message to amethyst@vitorpamplona.com

README.md

@@ -6,27 +6,48 @@ Amethyst brings the best social network to your Android phone. Just insert your
 
 # Current Features
 
-- [x] Account Management
+- [x] Event Builders / WebSocket Subscriptions (NIP-01, NIP-15)
 - [x] Home Feed
 - [x] Notifications Feed
 - [x] Global Feed
-- [x] Reactions (like, boost, reply)
-- [x] Image Preview (gifs, svgs)
-- [x] Url Preview
+- [x] Reactions (likes NIP-25, boost, reply)
+- [x] Image/Video/Url/LnInvoice Previews
 - [x] View Threads
 - [x] Private Messages (NIP-04)
-- [x] User Profiles (follow/unfollow)
+- [x] User Profiles (edit/follow/unfollow - NIP-02)
 - [x] Public Chats (NIP-28)
-- [ ] Notification Bubbles
-- [ ] Infinity Scroll 
-- [ ] Dropdown to Link Users/Posts when writting
-- [ ] Identity Verification (NIP-05)
-- [ ] Event Delegation (NIP-09)
-- [ ] Filter messages from Unknown People
-- [ ] Profile Edit
-- [ ] Relay Edit
-- [ ] Account Creation / Backup Guidance
-- [ ] Message Sent feedback
+- [x] Bech Encoding support (NIP-19)
+- [x] Notification Dots
+- [x] Reporting and Hide User capability (NIP-56)
+- [x] Automatic Translations
+- [x] Relay Sets (home, dms, public chats, global)
+- [x] User/Note Tagging (NIP-08, NIP-10)
+- [x] Lightning Tips
+- [x] Zaps (NIP-57)
+- [x] URI Support (NIP-21)
+- [x] Event Deletion (NIP-09: like, boost, text notes and reports)
+- [x] Identity Verification (NIP-05)
+- [ ] Local Database 
+- [ ] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
+- [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
+- [ ] Sensitive Content (NIP-36) 
+- [ ] Relay Pages (NIP-11)
+- [ ] Relay Authentication (NIP-42)
+- [ ] Generic Tags (NIP-12)
+- [ ] Proof of Work in the Phone (NIP-13, NIP-20)
+- [ ] Events with a Subject (NIP-14)
+- [ ] Long-form Content (NIP-23) 
+- [ ] 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)
+- [ ] Account Creation / Backup Guidance (NIP-06)
+- [ ] Message Sent feedback (NIP-20)
 
 # Development Overview
 
@@ -123,4 +144,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 8
-        versionName "0.8"
+        versionCode 83
+        versionName "0.22.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -22,8 +22,14 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            //minifyEnabled true
+            //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            resValue "string", "app_name", "@string/app_name_release"
+        }
+        debug {
+            applicationIdSuffix '.debug'
+            versionNameSuffix '-DEBUG'
+            resValue "string", "app_name", "@string/app_name_debug"
         }
     }
     compileOptions {
@@ -37,7 +43,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.3.2'
+        kotlinCompilerExtensionVersion "1.4.3"
     }
     packagingOptions {
         resources {
@@ -48,29 +54,30 @@ android {
 
 dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.activity:activity-compose:1.6.1'
+    implementation 'androidx.activity:activity-compose:1.7.0-beta01'
     implementation "androidx.compose.ui:ui:$compose_ui_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
-    implementation 'androidx.compose.material:material:1.3.1'
 
     // Navigation
     implementation("androidx.navigation:navigation-compose:$nav_version")
-    implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha04'
-    implementation 'androidx.compose.runtime:runtime-livedata:1.4.0-alpha04'
-    implementation "androidx.compose.material:material-icons-extended:1.3.1"
 
-    // Input
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
+    // Observe Live data as State
+    implementation 'androidx.compose.runtime:runtime-livedata:1.4.0-beta01'
+
+    implementation 'androidx.compose.material:material:1.4.0-beta02'
+    implementation "androidx.compose.material:material-icons-extended:1.4.0-beta02"
+
+    // Lifecycle
+    implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
 
     // Swipe Refresh
-    implementation 'com.google.accompanist:accompanist-swiperefresh:0.24.13-rc'
-
-    // Load images from the web.
-    implementation "io.coil-kt:coil-compose:2.2.2"
+    implementation 'com.google.accompanist:accompanist-swiperefresh:0.29.1-alpha'
 
     // Bitcoin secp256k1 bindings to Android
-    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.7.0'
+    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.7.1'
 
     // Nostr Base Protocol
     implementation('com.github.vitorpamplona.NostrPostr:nostrpostrlib:master-SNAPSHOT') {
@@ -79,35 +86,72 @@ dependencies {
         exclude module: 'guava-testlib'
     }
 
-    implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     // Websockets API
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
 
     // Json Serialization
-    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.1'
+    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2'
 
-    // Rendering clickable text
-    implementation "com.google.accompanist:accompanist-flowlayout:0.28.0"
+    // Robohash for Avatars
+    implementation group: 'com.github.vitorpamplona', name: 'android-robohash', version: 'master-SNAPSHOT', ext: 'aar'
 
     // link preview
     implementation 'tw.com.oneup.www:Baha-UrlPreview:1.0.1'
-    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha04'
 
-    // upload pictures:
-    implementation "com.google.accompanist:accompanist-permissions:0.28.0"
+    // Encrypted Key Storage
+    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha05'
 
     // view videos
-    implementation 'com.google.android.exoplayer:exoplayer:2.18.2'
+    implementation 'com.google.android.exoplayer:exoplayer:2.18.3'
 
+    // Load images from the web.
+    implementation "io.coil-kt:coil-compose:2.2.2"
     // view gifs
     implementation "io.coil-kt:coil-gif:2.2.2"
     // view svgs
     implementation("io.coil-kt:coil-svg:2.2.2")
 
+    // Rendering clickable text
+    implementation "com.google.accompanist:accompanist-flowlayout:$accompanist_version"
+    // Permission to upload pictures:
+    implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
+
     // tabs for user profiles
     implementation "com.google.accompanist:accompanist-pager:$accompanist_version" // Pager
     implementation "com.google.accompanist:accompanist-pager-indicators:$accompanist_version"
 
+    // Parses URLs from Text:
+    implementation "io.github.url-detector:url-detector:0.1.23"
+
+    // 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'
+
+    // 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'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

app/proguard-rules.pro

@@ -18,4 +18,20 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+# For the Secp256k1 library
+-keepattributes InnerClasses
+
+-keep class fr.acinq.secp256k1.jni.** { *; }
+# For the NostrPostr library
+-keep class nostr.postr.** { *; }
+-keep class nostr.postr.events.** { *; }
+# Json parsing
+-keep class com.google.gson.reflect.** { *; }
+-keep class * extends com.google.gson.reflect.TypeToken
+-keep public class * implements java.lang.reflect.Type
+
+-keep class com.vitorpamplona.amethyst.lnurl.** { *; }
+-keep class com.vitorpamplona.amethyst.model.** { *; }
+-keep class com.vitorpamplona.amethyst.service.** { *; }
+-keep class com.vitorpamplona.amethyst.ui.** { *; }

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

@@ -0,0 +1,78 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.android.gms.tasks.Tasks
+import com.vitorpamplona.amethyst.service.lang.LanguageTranslatorService
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+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 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))
+  }
+
+  @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 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 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 testTranslationLnInvoice() {
+    assertTranslateContains(
+      "lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn",
+      "Have you seen this: lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn I think I have to pay", "pt"
+    )
+
+    assertTranslateContains(
+      "lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
+      "Test lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v", "pt"
+    )
+  }
+}

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

@@ -5,7 +5,9 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.vitorpamplona.amethyst.model.LocalCache
+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.Test
@@ -22,13 +24,14 @@ class EUrlUserTagTransformationTest {
   fun useAppContext() {
     // Context of the app under test.
     val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-    assertEquals("com.vitorpamplona.amethyst", appContext.packageName)
+    assertEquals("com.vitorpamplona.amethyst", appContext.packageName.removeSuffix(".debug"))
   }
 
   @Test
   fun transformationText() {
-    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"))
-    user.info.displayName = "Vitor Pamplona"
+    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
+    user.info = UserMetadata()
+    user.info?.displayName = "Vitor Pamplona"
 
     var transformedText = buildAnnotatedStringWithUrlHighlighting(
       AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
@@ -61,8 +64,9 @@ class EUrlUserTagTransformationTest {
 
   @Test
   fun transformationTextTwoKeys() {
-    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"))
-    user.info.displayName = "Vitor Pamplona"
+    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
+    user.info = UserMetadata()
+    user.info?.displayName = "Vitor Pamplona"
 
     var transformedText = buildAnnotatedStringWithUrlHighlighting(
       AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z and @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),

app/src/androidTest/res/values/strings.xml

@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name_release">Amethyst</string>
+    <string name="app_name_debug">Amethyst Debug</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -4,9 +4,15 @@
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.CAMERA" />
+
+    <!-- Used for SDK < 29 -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
 
     <application
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@drawable/amethyst"
@@ -14,17 +20,27 @@
         android:enableOnBackInvokedCallback="true"
         android:supportsRtl="true"
         android:theme="@style/Theme.Amethyst"
-        tools:targetApi="31">
+        android:largeHeap="true"
+        android:usesCleartextTraffic="true"
+        tools:targetApi="33">
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.Amethyst">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
+            <intent-filter android:label="Amethyst">
+                <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
+            <intent-filter android:label="Amethyst">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="nostr" />
+            </intent-filter>
+
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />

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

@@ -4,9 +4,9 @@ import android.content.Context
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKeys
 
-class KeyStorage {
+class EncryptedStorage {
 
-  fun encryptedPreferences(context: Context): EncryptedSharedPreferences {
+  fun preferences(context: Context): EncryptedSharedPreferences {
     val secretKey: String = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC);
     val preferencesName = "secret_keeper"
 

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

@@ -0,0 +1,117 @@
+package com.vitorpamplona.amethyst
+
+import android.content.Context
+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 nostr.postr.Persona
+import nostr.postr.events.ContactListEvent
+import nostr.postr.events.Event
+import nostr.postr.events.Event.Companion.getRefinedEvent
+import nostr.postr.toHex
+
+class LocalPreferences(context: Context) {
+  val encryptedPreferences = EncryptedStorage().preferences(context)
+  val gson = GsonBuilder().create()
+
+  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()
+  }
+
+  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()
+  }
+
+  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>()
+
+      val dontTranslateFrom = getStringSet("dontTranslateFrom", null) ?: setOf()
+      val translateTo = getString("translateTo", null) ?: Locale.getDefault().language
+
+      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
+        }
+      } 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>()
+      }
+
+      if (pubKey != null) {
+        return Account(
+          Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()),
+          followingChannels,
+          hiddenUsers,
+          localRelays,
+          dontTranslateFrom,
+          languagePreferences,
+          translateTo,
+          zapAmountChoices,
+          latestContactList
+        )
+      } else {
+        return null
+      }
+    }
+  }
+
+  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

@@ -0,0 +1,69 @@
+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
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+object NotificationCache {
+  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)
+
+      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)
+        }
+      }
+    }
+  }
+
+  fun refresh() {
+    postValue(NotificationState(cache))
+  }
+}
+
+class NotificationState(val cache: NotificationCache)

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

@@ -0,0 +1,169 @@
+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

@@ -0,0 +1,79 @@
+package com.vitorpamplona.amethyst
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.NostrAccountDataSource
+import com.vitorpamplona.amethyst.service.NostrChannelDataSource
+import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
+import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
+import com.vitorpamplona.amethyst.service.NostrHomeDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.NostrThreadDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.service.relays.Constants
+
+object ServiceManager {
+  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 pause() {
+    NostrAccountDataSource.stop()
+    NostrHomeDataSource.stop()
+    NostrChannelDataSource.stop()
+    NostrChatroomListDataSource.stop()
+    NostrUserProfileDataSource.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

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

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

@@ -1,42 +1,149 @@
 package com.vitorpamplona.amethyst.model
 
+import android.content.res.Resources
+import androidx.core.os.ConfigurationCompat
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.service.Constants
+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.LnZapRequestEvent
 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.Client
+import com.vitorpamplona.amethyst.service.relays.Constants
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.service.relays.RelayPool
+import java.util.Date
+import java.util.Locale
+import java.util.concurrent.atomic.AtomicBoolean
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import nostr.postr.Contact
 import nostr.postr.Persona
 import nostr.postr.Utils
 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.TextNoteEvent
 import nostr.postr.toHex
 
 val DefaultChannels = setOf(
-  "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb" // -> Anigma's Nostr
+  "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb", // -> Anigma's Nostr
+  "42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5"  // -> Amethyst's Group
 )
 
-class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> = DefaultChannels.toMutableSet()) {
-  var seeReplies: Boolean = true
+fun getLanguagesSpokenByUser(): Set<String> {
+  val languageList = ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration())
+  val codedList = mutableSetOf<String>()
+  for (i in 0 until languageList.size()) {
+    languageList.get(i)?.let { codedList.add(it.language) }
+  }
+  return codedList
+}
+
+class Account(
+  val loggedIn: Persona,
+  var followingChannels: Set<String> = DefaultChannels,
+  var hiddenUsers: Set<String> = setOf(),
+  var localRelays: Set<RelaySetupInfo> = Constants.defaultRelays.toSet(),
+  var dontTranslateFrom: Set<String> = getLanguagesSpokenByUser(),
+  var languagePreferences: Map<String, String> = mapOf(),
+  var translateTo: String = Locale.getDefault().language,
+  var zapAmountChoices: List<Long> = listOf(500L, 1000L, 5000L),
+  var backupContactList: ContactListEvent? = null
+) {
+  var transientHiddenUsers: Set<String> = setOf()
+
+  // Observers line up here.
+  val live: AccountLiveData = AccountLiveData(this)
+  val liveLanguages: AccountLiveData = AccountLiveData(this)
+  val saveable: AccountLiveData = AccountLiveData(this)
 
   fun userProfile(): User {
-    return LocalCache.getOrCreateUser(loggedIn.pubKey)
+    return LocalCache.getOrCreateUser(loggedIn.pubKey.toHexKey())
   }
 
   fun followingChannels(): List<Channel> {
     return followingChannels.map { LocalCache.getOrCreateChannel(it) }
   }
 
+  fun hiddenUsers(): List<User> {
+    return (hiddenUsers + transientHiddenUsers).map { LocalCache.getOrCreateUser(it) }
+  }
+
   fun isWriteable(): Boolean {
     return loggedIn.privKey != null
   }
 
+  fun sendNewRelayList(relays: Map<String, ContactListEvent.ReadWrite>) {
+    if (!isWriteable()) return
+
+    val contactList = userProfile().latestContactList
+
+    if (contactList != null && contactList.follows.size > 0) {
+      val event = ContactListEvent.create(
+        contactList.follows,
+        relays,
+        loggedIn.privKey!!)
+
+      Client.send(event)
+      LocalCache.consume(event)
+    } else {
+      val event = ContactListEvent.create(listOf(), relays, loggedIn.privKey!!)
+
+      // Keep this local to avoid erasing a good contact list.
+      // Client.send(event)
+      LocalCache.consume(event)
+    }
+  }
+
+  fun sendNewUserMetadata(toString: String) {
+    if (!isWriteable()) return
+
+    loggedIn.privKey?.let {
+      val createdAt = Date().time / 1000
+      val content = toString
+      val pubKey = Utils.pubkeyCreate(it)
+      val tags = listOf<List<String>>()
+      val id = Event.generateId(pubKey, createdAt, MetadataEvent.kind, tags, content)
+      val sig = Utils.sign(id, it)
+      val event = MetadataEvent(id, pubKey, createdAt, tags, content, sig)
+
+      Client.send(event)
+      LocalCache.consume(event)
+    }
+  }
+
+  fun reactionTo(note: Note): List<Note> {
+    return note.reactedBy(userProfile(), "+")
+  }
+
+  fun hasBoosted(note: Note): Boolean {
+    return boostsTo(note).isNotEmpty()
+  }
+
+  fun boostsTo(note: Note): List<Note> {
+    return note.boostedBy(userProfile())
+  }
+
+  fun hasReacted(note: Note): Boolean {
+    return note.hasReacted(userProfile(), "+")
+  }
+
   fun reactTo(note: Note) {
     if (!isWriteable()) return
 
-    if (note.reactions.firstOrNull { it.author == userProfile() } != null) {
+    if (hasReacted(note)) {
       // has already liked this note
       return
     }
@@ -48,9 +155,84 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
     }
   }
 
+  fun createZapRequestFor(note: Note): LnZapRequestEvent? {
+    if (!isWriteable()) return null
+
+    note.event?.let {
+      return LnZapRequestEvent.create(it, userProfile().relays?.keys?.ifEmpty { null } ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!)
+    }
+
+    return null
+  }
+
+  fun createZapRequestFor(user: User): LnZapRequestEvent? {
+    return createZapRequestFor(user.pubkeyHex)
+  }
+
+  fun createZapRequestFor(userPubKeyHex: String): LnZapRequestEvent? {
+    if (!isWriteable()) return null
+
+    return LnZapRequestEvent.create(userPubKeyHex, userProfile().relays?.keys?.ifEmpty { null } ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!)
+  }
+
+  fun report(note: Note, type: ReportEvent.ReportType) {
+    if (!isWriteable()) return
+
+    if (note.hasReacted(userProfile(), "⚠️")) {
+      // has already liked this note
+      return
+    }
+
+    note.event?.let {
+      val event = ReactionEvent.createWarning(it, loggedIn.privKey!!)
+      Client.send(event)
+      LocalCache.consume(event)
+    }
+
+    note.event?.let {
+      val event = ReportEvent.create(it, type, loggedIn.privKey!!)
+      Client.send(event)
+      LocalCache.consume(event, null)
+    }
+  }
+
+  fun report(user: User, type: ReportEvent.ReportType) {
+    if (!isWriteable()) return
+
+    if (user.hasReport(userProfile(), type)) {
+      // has already reported this note
+      return
+    }
+
+    val event = ReportEvent.create(user.pubkeyHex, type, loggedIn.privKey!!)
+    Client.send(event)
+    LocalCache.consume(event, null)
+  }
+
+  fun delete(note: Note) {
+    delete(listOf(note))
+  }
+
+  fun delete(notes: List<Note>) {
+    if (!isWriteable()) return
+
+    val myNotes = notes.filter { it.author == userProfile() }.map { it.idHex }
+
+    if (myNotes.isNotEmpty()) {
+      val event = DeletionEvent.create(myNotes, loggedIn.privKey!!)
+      Client.send(event)
+      LocalCache.consume(event)
+    }
+  }
+
   fun boost(note: Note) {
     if (!isWriteable()) return
 
+    if (note.hasBoostedInTheLast5Minutes(userProfile())) {
+      // has already bosted in the past 5mins 
+      return
+    }
+
     note.event?.let {
       val event = RepostEvent.create(it, loggedIn.privKey!!)
       Client.send(event)
@@ -67,12 +249,20 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
   fun follow(user: User) {
     if (!isWriteable()) return
 
-    val lastestContactList = userProfile().lastestContactList
-    val event = if (lastestContactList != null) {
-      ContactListEvent.create(lastestContactList.follows.plus(Contact(user.pubkeyHex, null)), lastestContactList.relayUse, loggedIn.privKey!!)
+    val contactList = userProfile().latestContactList
+
+    val event = if (contactList != null && contactList.follows.size > 0) {
+      ContactListEvent.create(
+        contactList.follows.plus(Contact(user.pubkeyHex, null)),
+        userProfile().relays,
+        loggedIn.privKey!!)
     } else {
       val relays = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) }
-      ContactListEvent.create(listOf(Contact(user.pubkeyHex, null)), relays, loggedIn.privKey!!)
+      ContactListEvent.create(
+        listOf(Contact(user.pubkeyHex, null)),
+        relays,
+        loggedIn.privKey!!
+      )
     }
 
     Client.send(event)
@@ -82,71 +272,171 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
   fun unfollow(user: User) {
     if (!isWriteable()) return
 
-    val lastestContactList = userProfile().lastestContactList
-    if (lastestContactList != null) {
-      val event = ContactListEvent.create(lastestContactList.follows.filter { it.pubKeyHex != user.pubkeyHex }, lastestContactList.relayUse, loggedIn.privKey!!)
+    val contactList = userProfile().latestContactList
+
+    if (contactList != null && contactList.follows.size > 0) {
+      val event = ContactListEvent.create(
+        contactList.follows.filter { it.pubKeyHex != user.pubkeyHex },
+        userProfile().relays,
+        loggedIn.privKey!!)
+
       Client.send(event)
       LocalCache.consume(event)
     }
   }
 
-  fun sendPost(message: String, originalNote: Note?, modifiedMentions: List<User>?) {
+  fun sendPost(message: String, replyTo: List<Note>?, mentions: List<User>?) {
     if (!isWriteable()) return
 
-    val replyToEvent = originalNote?.event
-    if (replyToEvent is TextNoteEvent) {
-      val modifiedMentionsHex = modifiedMentions?.map { it.pubkeyHex }?.toSet() ?: emptySet()
+    val repliesToHex = replyTo?.map { it.idHex }
+    val mentionsHex = mentions?.map { it.pubkeyHex }
 
-      val repliesTo = replyToEvent.replyTos.plus(replyToEvent.id.toHex())
-      val mentions = replyToEvent.mentions.plus(replyToEvent.pubKey.toHex()).plus(modifiedMentionsHex).filter {
-        it in modifiedMentionsHex
-      }
-
-      val signedEvent = TextNoteEvent.create(
-        msg = message,
-        replyTos = repliesTo,
-        mentions = mentions,
-        privateKey = loggedIn.privKey!!
-      )
-      Client.send(signedEvent)
-      LocalCache.consume(signedEvent)
-    } else {
-      val signedEvent = TextNoteEvent.create(
-        msg = message,
-        replyTos = null,
-        mentions = modifiedMentions?.map { it.pubkeyHex } ?: emptyList(),
-        privateKey = loggedIn.privKey!!
-      )
-      Client.send(signedEvent)
-      LocalCache.consume(signedEvent)
-    }
-  }
-
-  fun sendChannelMeesage(message: String, toChannel: String, replyingTo: Note? = null) {
-    if (!isWriteable()) return
-
-    val signedEvent = ChannelMessageEvent.create(
-      message = message,
-      channel = toChannel,
+    val signedEvent = TextNoteEvent.create(
+      msg = message,
+      replyTos = repliesToHex,
+      mentions = mentionsHex,
       privateKey = loggedIn.privKey!!
     )
     Client.send(signedEvent)
     LocalCache.consume(signedEvent)
   }
 
+  fun sendChannelMeesage(message: String, toChannel: String, replyingTo: Note? = null, mentions: List<User>?) {
+    if (!isWriteable()) return
+
+    val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
+    val mentionsHex = mentions?.map { it.pubkeyHex }
+
+    val signedEvent = ChannelMessageEvent.create(
+      message = message,
+      channel = toChannel,
+      replyTos = repliesToHex,
+      mentions = mentionsHex,
+      privateKey = loggedIn.privKey!!
+    )
+    Client.send(signedEvent)
+    LocalCache.consume(signedEvent, null)
+  }
+
+  fun createPrivateMessageWithReply(
+    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) {
+        PrivateDmEvent.nip18Advertisement
+      } else { "" } + msg,
+      privateKey,
+      recipientPubKey)
+    val pubKey = Utils.pubkeyCreate(privateKey)
+    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 = Event.generateId(pubKey, createdAt, PrivateDmEvent.kind, tags, content)
+    val sig = Utils.sign(id, privateKey)
+    return PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
+  }
+
   fun sendPrivateMeesage(message: String, toUser: String, replyingTo: Note? = null) {
     if (!isWriteable()) return
     val user = LocalCache.users[toUser] ?: return
 
-    val signedEvent = PrivateDmEvent.create(
-      recipientPubKey = user.pubkey,
-      publishedRecipientPubKey = user.pubkey,
+    val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
+    val mentionsHex = emptyList<String>()
+
+    val signedEvent = createPrivateMessageWithReply(
+      recipientPubKey = user.pubkey(),
+      publishedRecipientPubKey = user.pubkey(),
       msg = message,
+      replyTos = repliesToHex,
+      mentions = mentionsHex,
       privateKey = loggedIn.privKey!!,
       advertiseNip18 = false
     )
     Client.send(signedEvent)
-    LocalCache.consume(signedEvent)
+    LocalCache.consume(signedEvent, null)
+  }
+
+  fun sendCreateNewChannel(name: String, about: String, picture: String) {
+    if (!isWriteable()) return
+
+    val metadata = ChannelCreateEvent.ChannelData(
+      name, about, picture
+    )
+
+    val event = ChannelCreateEvent.create(
+      channelInfo = metadata,
+      privateKey = loggedIn.privKey!!
+    )
+
+    Client.send(event)
+    LocalCache.consume(event)
+
+    joinChannel(event.id.toHex())
+  }
+
+  fun joinChannel(idHex: String) {
+    followingChannels = followingChannels + idHex
+    live.invalidateData()
+
+    saveable.invalidateData()
+  }
+
+  fun leaveChannel(idHex: String) {
+    followingChannels = followingChannels - idHex
+    live.invalidateData()
+
+    saveable.invalidateData()
+  }
+
+  fun hideUser(pubkeyHex: String) {
+    hiddenUsers = hiddenUsers + pubkeyHex
+    live.invalidateData()
+    saveable.invalidateData()
+  }
+
+  fun showUser(pubkeyHex: String) {
+    hiddenUsers = hiddenUsers - pubkeyHex
+    transientHiddenUsers = transientHiddenUsers - pubkeyHex
+    live.invalidateData()
+    saveable.invalidateData()
+  }
+
+  fun changeZapAmounts(newAmounts: List<Long>) {
+    zapAmountChoices = newAmounts
+    live.invalidateData()
+    saveable.invalidateData()
+  }
+
+  fun sendChangeChannel(name: String, about: String, picture: String, channel: Channel) {
+    if (!isWriteable()) return
+
+    val metadata = ChannelCreateEvent.ChannelData(
+      name, about, picture
+    )
+
+    val event = ChannelMetadataEvent.create(
+      newChannelInfo = metadata,
+      originalChannelIdHex = channel.idHex,
+      privateKey = loggedIn.privKey!!
+    )
+
+    Client.send(event)
+    LocalCache.consume(event)
+
+    joinChannel(event.id.toHex())
   }
 
   fun decryptContent(note: Note): String? {
@@ -179,26 +469,161 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
     }
   }
 
-  // Observers line up here.
-  val live: AccountLiveData = AccountLiveData(this)
+  fun addDontTranslateFrom(languageCode: String) {
+    dontTranslateFrom = dontTranslateFrom.plus(languageCode)
+    liveLanguages.invalidateData()
 
-  private fun refreshObservers() {
-    live.refresh()
+    saveable.invalidateData()
+  }
+
+  fun updateTranslateTo(languageCode: String) {
+    translateTo = languageCode
+    liveLanguages.invalidateData()
+
+    saveable.invalidateData()
+  }
+
+  fun prefer(source: String, target: String, preference: String) {
+    languagePreferences = languagePreferences + Pair("$source,$target", preference)
+    saveable.invalidateData()
+  }
+
+  fun preferenceBetween(source: String, target: String): String? {
+    return languagePreferences.get("$source,$target")
+  }
+
+  private fun updateContactListTo(newContactList: ContactListEvent?) {
+    if (newContactList?.follows.isNullOrEmpty()) return
+
+    // Events might be different objects, we have to compare their ids.
+    if (backupContactList?.id?.toHex() != newContactList?.id?.toHex()) {
+      backupContactList = newContactList
+      saveable.invalidateData()
+    }
+  }
+
+  fun activeRelays(): Array<Relay>? {
+    return userProfile().relays?.map {
+      val localFeedTypes = localRelays.firstOrNull() { localRelay -> localRelay.url == it.key }?.feedTypes ?: FeedType.values().toSet()
+      Relay(it.key, it.value.read, it.value.write, localFeedTypes)
+    }?.toTypedArray()
+  }
+
+  fun convertLocalRelays(): Array<Relay> {
+    return localRelays.map {
+      Relay(it.url, it.read, it.write, it.feedTypes)
+    }.toTypedArray()
+  }
+
+  fun reconnectIfRelaysHaveChanged() {
+    val newRelaySet = activeRelays() ?: convertLocalRelays()
+    if (!Client.isSameRelaySetConfig(newRelaySet)) {
+      Client.disconnect()
+      Client.connect(newRelaySet)
+      RelayPool.requestAndWatch()
+    }
+  }
+
+  fun isHidden(user: User) = user.pubkeyHex in hiddenUsers || user.pubkeyHex in transientHiddenUsers
+
+  fun isAcceptable(user: User): Boolean {
+    return !isHidden(user)  // if user hasn't hided this author
+        && user.reportsBy( userProfile() ).isEmpty() // if user has not reported this post
+        && user.reportAuthorsBy( userProfile().follows ).size < 5
+  }
+
+  fun isAcceptableDirect(note: Note): Boolean {
+    return note.reportsBy( userProfile() ).isEmpty()  // if user has not reported this post
+        && note.reportAuthorsBy( userProfile().follows ).size < 5 // if it has 5 reports by reliable users
+  }
+
+  fun isAcceptable(note: Note): Boolean {
+    return note.author?.let { isAcceptable(it) } ?: true // if user hasn't hided this author
+        && isAcceptableDirect(note)
+        && (note.event !is RepostEvent
+          || (note.event is RepostEvent && note.replyTo?.firstOrNull { isAcceptableDirect(it) } != null)
+        ) // is not a reaction about a blocked post
+  }
+
+  fun getRelevantReports(note: Note): Set<Note> {
+    val followsPlusMe = userProfile().follows + userProfile()
+
+    val innerReports = if (note.event is RepostEvent) {
+      note.replyTo?.map { getRelevantReports(it) }?.flatten() ?: emptyList()
+    } else {
+      emptyList()
+    }
+
+    return (note.reportsBy(followsPlusMe) +
+          (note.author?.reportsBy(followsPlusMe) ?: emptyList()) +
+          innerReports).toSet()
+  }
+
+  fun saveRelayList(value: List<RelaySetupInfo>) {
+    localRelays = value.toSet()
+    sendNewRelayList(value.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) } )
+
+    saveable.invalidateData()
+  }
+
+  init {
+    backupContactList?.let {
+      println("Loading saved contacts ${it.toJson()}")
+      if (userProfile().latestContactList == null) {
+        LocalCache.consume(it)
+      }
+    }
+
+    // Observes relays to restart connections
+    userProfile().live().relays.observeForever {
+      GlobalScope.launch(Dispatchers.IO) {
+        reconnectIfRelaysHaveChanged()
+      }
+    }
+
+    // saves contact list for the next time.
+    userProfile().live().follows.observeForever {
+      updateContactListTo(userProfile().latestContactList)
+    }
+
+    // imports transient blocks due to spam.
+    LocalCache.antiSpam.liveSpam.observeForever {
+      GlobalScope.launch(Dispatchers.IO) {
+        it.cache.spamMessages.snapshot().values.forEach {
+          if (it.pubkeyHex !in transientHiddenUsers && it.duplicatedMessages.size >= 5) {
+            val userToBlock = LocalCache.getOrCreateUser(it.pubkeyHex)
+            if (userToBlock != userProfile() && userToBlock !in userProfile().follows) {
+              transientHiddenUsers = transientHiddenUsers + it.pubkeyHex
+            }
+          }
+        }
+      }
+    }
   }
 }
 
 class AccountLiveData(private val account: Account): LiveData<AccountState>(AccountState(account)) {
+  var handlerWaiting = AtomicBoolean()
+
+  fun invalidateData() {
+    if (handlerWaiting.getAndSet(true)) return
+
+    val scope = CoroutineScope(Job() + Dispatchers.Default)
+    scope.launch {
+      try {
+        delay(100)
+        refresh()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
+    }
+  }
+
   fun refresh() {
     postValue(AccountState(account))
   }
-
-  override fun onActive() {
-    super.onActive()
-  }
-
-  override fun onInactive() {
-    super.onInactive()
-  }
 }
 
 class AccountState(val account: Account)

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

@@ -0,0 +1,94 @@
+package com.vitorpamplona.amethyst.model
+
+import android.util.Log
+import android.util.LruCache
+import androidx.lifecycle.LiveData
+import java.util.concurrent.atomic.AtomicBoolean
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+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
+
+data class Spammer(val pubkeyHex: HexKey, var duplicatedMessages: Set<HexKey>)
+
+class AntiSpamFilter {
+  val recentMessages = LruCache<Int, String>(1000)
+  val spamMessages = LruCache<Int, Spammer>(1000)
+
+  @Synchronized
+  fun isSpam(event: Event): Boolean {
+    val idHex = event.id.toHexKey()
+
+    // if already processed, ok
+    if (LocalCache.notes[idHex] != null) 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.
+
+    // 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.toHex()} ${recentMessages[hash]} ${spamMessages[hash] != null} ${event.content.replace("\n", " | ")}")
+
+      // 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()
+      }
+
+      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)
+        }
+      }
+    }
+  }
+
+  private fun refresh() {
+    postValue(AntiSpamState(cache))
+  }
+}
+
+class AntiSpamState(val cache: AntiSpamFilter) {
+
+}

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

@@ -1,50 +1,68 @@
 package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import java.util.Collections
+import fr.acinq.secp256k1.Hex
 import java.util.concurrent.ConcurrentHashMap
-import nostr.postr.events.ContactListEvent
-
-class Channel(val id: ByteArray) {
-    val idHex = id.toHexKey()
-    val idDisplayHex = id.toShortenHex()
 
+class Channel(val idHex: String) {
+    var creator: User? = null
     var info = ChannelCreateEvent.ChannelData(null, null, null)
 
     var updatedMetadataAt: Long = 0;
 
     val notes = ConcurrentHashMap<HexKey, Note>()
 
-    @Synchronized
-    fun getOrCreateNote(idHex: String): Note {
-        return notes[idHex] ?: run {
-            val answer = Note(idHex)
-            notes.put(idHex, answer)
-            answer
-        }
+    fun id() = Hex.decode(idHex)
+    fun idNote() = id().toNote()
+    fun idDisplayNote() = idNote().toShortenHex()
+
+    fun toBestDisplayName(): String {
+        return info.name ?: idDisplayNote()
     }
 
-    fun updateChannelInfo(channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
-        info = channelInfo
-        updatedMetadataAt = updatedAt
+    fun addNote(note: Note) {
+        notes[note.idHex] = note
+    }
+
+    fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
+        this.creator = creator
+        this.info = channelInfo
+        this.updatedMetadataAt = updatedAt
 
         live.refresh()
     }
 
-    fun profilePicture(): String {
+    fun profilePicture(): String? {
         if (info.picture.isNullOrBlank()) info.picture = null
-        return info.picture ?: "https://robohash.org/${idHex}.png"
+        return info.picture
+    }
+
+    fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(info.name, info.about)
+            .filter { it.startsWith(prefix, true) }.isNotEmpty()
     }
 
     // Observers line up here.
     val live: ChannelLiveData = ChannelLiveData(this)
 
-    private fun refreshObservers() {
-        live.refresh()
+    fun pruneOldAndHiddenMessages(account: Account): Set<Note> {
+        val important = notes.values
+            .filter { it.author?.let { it1 -> account.isHidden(it1) } == false }
+            .sortedBy { it.event?.createdAt }
+            .reversed()
+            .take(1000)
+            .toSet()
+
+        val toBeRemoved = notes.values.filter { it !in important }.toSet()
+
+        toBeRemoved.forEach {
+            notes.remove(it.idHex)
+        }
+
+        return toBeRemoved
     }
 }
 
@@ -53,6 +71,16 @@ class ChannelLiveData(val channel: Channel): LiveData<ChannelState>(ChannelState
     fun refresh() {
         postValue(ChannelState(channel))
     }
+
+    override fun onActive() {
+        super.onActive()
+        NostrSingleChannelDataSource.add(channel.idHex)
+    }
+
+    override fun onInactive() {
+        super.onInactive()
+        NostrSingleChannelDataSource.remove(channel.idHex)
+    }
 }
 
 class ChannelState(val channel: Channel)

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

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.model
 
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
-import java.util.regex.Pattern
 import nostr.postr.Bech32
 import nostr.postr.Persona
 import nostr.postr.bechToBytes
@@ -11,6 +10,17 @@ import nostr.postr.toHex
 /** Makes the distinction between String and Hex **/
 typealias HexKey = String
 
+typealias NPubKey = String
+typealias NoteId = String
+
+fun NPubKey.toDisplayKey(): String {
+  return this.toShortenHex()
+}
+
+fun NoteId.toDisplayId(): String {
+  return this.toShortenHex()
+}
+
 fun ByteArray.toNote() = Bech32.encodeBytes(hrp = "note", this, Bech32.Encoding.Bech32)
 
 fun ByteArray.toHexKey(): HexKey {
@@ -26,14 +36,47 @@ fun HexKey.toDisplayHexKey(): String {
 }
 
 fun decodePublicKey(key: String): ByteArray {
-  val pattern = Pattern.compile(".+@.+\\.[a-z]+")
-
   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)
+
+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)
+    }
+
+  } catch (e: Exception) {
+    e.printStackTrace()
+  }
+
+  return null
 }

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

@@ -4,26 +4,42 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.google.gson.reflect.TypeToken
 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.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
+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.relays.Relay
+import fr.acinq.secp256k1.Hex
 import java.io.ByteArrayInputStream
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.util.Collections
 import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicBoolean
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+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 nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
+import nostr.postr.toNpub
 
 
 object LocalCache {
@@ -31,20 +47,41 @@ object LocalCache {
     .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
     .readerFor(UserMetadata::class.java)
 
+  val antiSpam = AntiSpamFilter()
+
   val users = ConcurrentHashMap<HexKey, User>()
   val notes = ConcurrentHashMap<HexKey, Note>()
   val channels = ConcurrentHashMap<HexKey, Channel>()
 
+  fun checkGetOrCreateUser(key: String): User? {
+    return try {
+      val checkHex = Hex.decode(key).toNpub() // Checks if this is a valid Hex
+      getOrCreateUser(key)
+    } catch (e: IllegalArgumentException) {
+      Log.e("LocalCache", "Invalid Key to create user: $key", e)
+      null
+    }
+  }
+
   @Synchronized
-  fun getOrCreateUser(pubkey: ByteArray): User {
-    val key = pubkey.toHexKey()
+  fun getOrCreateUser(key: HexKey): User {
     return users[key] ?: run {
-      val answer = User(pubkey)
+      val answer = User(key)
       users.put(key, answer)
       answer
     }
   }
 
+  fun checkGetOrCreateNote(key: String): Note? {
+    return try {
+      val checkHex = Hex.decode(key).toNote() // Checks if this is a valid Hex
+      getOrCreateNote(key)
+    } catch (e: IllegalArgumentException) {
+      Log.e("LocalCache", "Invalid Key to create note: $key", e)
+      null
+    }
+  }
+
   @Synchronized
   fun getOrCreateNote(idHex: String): Note {
     return notes[idHex] ?: run {
@@ -54,10 +91,21 @@ object LocalCache {
     }
   }
 
+  fun checkGetOrCreateChannel(key: String): Channel? {
+    return try {
+      val checkHex = Hex.decode(key).toNote() // Checks if this is a valid Hex
+      getOrCreateChannel(key)
+    } catch (e: IllegalArgumentException) {
+      Log.e("LocalCache", "Invalid Key to create channel: $key", e)
+      null
+    }
+  }
+
+
   @Synchronized
   fun getOrCreateChannel(key: String): Channel {
     return channels[key] ?: run {
-      val answer = Channel(key.toByteArray())
+      val answer = Channel(key)
       channels.put(key, answer)
       answer
     }
@@ -65,20 +113,22 @@ object LocalCache {
 
 
   fun consume(event: MetadataEvent) {
-    //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
-
     // new event
-    val oldUser = getOrCreateUser(event.pubKey)
-    if (event.createdAt > oldUser.updatedMetadataAt) {
+    val oldUser = getOrCreateUser(event.pubKey.toHexKey())
+    if (oldUser.info == null || event.createdAt > oldUser.info!!.updatedMetadataAt) {
       val newUser = try {
-        metadataParser.readValue<UserMetadata>(ByteArrayInputStream(event.content.toByteArray(Charsets.UTF_8)), UserMetadata::class.java)
+        metadataParser.readValue(
+          ByteArrayInputStream(event.content.toByteArray(Charsets.UTF_8)),
+          UserMetadata::class.java
+        )
       } catch (e: Exception) {
         e.printStackTrace()
         Log.w("MT", "Content Parse Error ${e.localizedMessage} ${event.content}")
         return
       }
 
-      oldUser.updateUserInfo(newUser, event.createdAt)
+      oldUser.updateUserInfo(newUser, event)
+      //Log.d("MT", "New User Metadata ${oldUser.pubkeyDisplayHex} ${oldUser.toBestDisplayName()}")
     } else {
       //Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
     }
@@ -89,29 +139,42 @@ object LocalCache {
       .format(DateTimeFormatter.ofPattern("uuuu MMM d hh:mm a"))
   }
 
-  fun consume(event: TextNoteEvent) {
+
+  fun consume(event: TextNoteEvent, relay: Relay? = null) {
+    if (antiSpam.isSpam(event)) {
+      relay?.let {
+        it.spamCounter++
+      }
+      return
+    }
+
     val note = getOrCreateNote(event.id.toHex())
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+
+    if (relay != null) {
+      author.addRelayBeingUsed(relay, event.createdAt)
+      note.addRelay(relay)
+    }
 
     // Already processed this event.
     if (note.event != null) return
 
-    val author = getOrCreateUser(event.pubKey)
-    val mentions = Collections.synchronizedList(event.mentions.map { getOrCreateUser(decodePublicKey(it)) })
-    val replyTo = Collections.synchronizedList(event.replyTos.map { getOrCreateNote(it) }.toMutableList())
+    val mentions = event.mentions.mapNotNull { checkGetOrCreateUser(it) }
+    val replyTo = replyToWithoutCitations(event).mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, replyTo)
 
-    //Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content} ${formattedDateTime(event.createdAt)}")
+    //Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content?.take(100)} ${formattedDateTime(event.createdAt)}")
 
     // Prepares user's profile view.
-    author.notes.add(note)
+    author.addNote(note)
 
     // Adds notifications to users.
     mentions.forEach {
-      it.taggedPosts.add(note)
+      it.addTaggedPost(note)
     }
     replyTo.forEach {
-      it.author?.taggedPosts?.add(note)
+      it.author?.addTaggedPost(note)
     }
 
     // Counts the replies
@@ -119,54 +182,150 @@ object LocalCache {
       it.addReply(note)
     }
 
-    UrlCachedPreviewer.preloadPreviewsFor(note)
+    refreshObservers()
+  }
+
+  fun consume(event: LongTextNoteEvent, relay: Relay?) {
+    if (antiSpam.isSpam(event)) {
+      relay?.let {
+        it.spamCounter++
+      }
+      return
+    }
+
+    val note = getOrCreateNote(event.id.toHex())
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+
+    if (relay != null) {
+      author.addRelayBeingUsed(relay, event.createdAt)
+      note.addRelay(relay)
+    }
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val mentions = event.mentions.mapNotNull { checkGetOrCreateUser(it) }
+    val replyTo = replyToWithoutCitations(event).mapNotNull { checkGetOrCreateNote(it) }
+
+    note.loadEvent(event, author, mentions, replyTo)
+
+    //Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content?.take(100)} ${formattedDateTime(event.createdAt)}")
+
+    // Prepares user's profile view.
+    author.addNote(note)
+
+    // Adds notifications to users.
+    mentions.forEach {
+      it.addTaggedPost(note)
+    }
+    replyTo.forEach {
+      it.author?.addTaggedPost(note)
+    }
+
+    // Counts the replies
+    replyTo.forEach {
+      it.addReply(note)
+    }
 
     refreshObservers()
   }
 
+  private fun findCitations(event: Event): Set<String> {
+    var citations = mutableSetOf<String>()
+    // Removes citations from replies:
+    val matcher = tagSearch.matcher(event.content)
+    while (matcher.find()) {
+      try {
+        val tag = matcher.group(1)?.let { event.tags[it.toInt()] }
+        if (tag != null && tag[0] == "e") {
+          citations.add(tag[1])
+        }
+      } catch (e: Exception) {
+
+      }
+    }
+    return citations
+  }
+
+  private fun replyToWithoutCitations(event: TextNoteEvent): List<String> {
+    val citations = findCitations(event)
+
+    return event.replyTos.filter { it !in citations }
+  }
+
+  private fun replyToWithoutCitations(event: LongTextNoteEvent): List<String> {
+    val citations = findCitations(event)
+
+    return event.replyTos.filter { it !in citations }
+  }
+
   fun consume(event: RecommendRelayEvent) {
     //Log.d("RR", event.toJson())
   }
 
   fun consume(event: ContactListEvent) {
-    val user = getOrCreateUser(event.pubKey)
+    val user = getOrCreateUser(event.pubKey.toHexKey())
+
+    if (event.createdAt > user.updatedFollowsAt && event.follows.isNotEmpty()) {
+      // Saves relay list only if it's a user that is currently been seen
+      user.latestContactList = event
 
-    if (event.createdAt > user.updatedFollowsAt) {
-      //Log.d("CL", "AAA ${user.toBestDisplayName()} ${event.follows.size}")
       user.updateFollows(
         event.follows.map {
           try {
             val pubKey = decodePublicKey(it.pubKeyHex)
-            getOrCreateUser(pubKey)
+            getOrCreateUser(pubKey.toHexKey())
           } catch (e: Exception) {
             println("Could not parse Hex key: ${it.pubKeyHex}")
-            println(event.toJson())
+            println("UpdateFollows: " + event.toJson())
             e.printStackTrace()
             null
           }
-        }.filterNotNull(),
+        }.filterNotNull().toSet(),
         event.createdAt
       )
 
-      user.lastestContactList = event
-    }
+      // Saves relay list only if it's a user that is currently been seen
+      try {
+        if (event.content.isNotEmpty()) {
+          val relays: Map<String, ContactListEvent.ReadWrite> =
+            Event.gson.fromJson(
+              event.content,
+              object : TypeToken<Map<String, ContactListEvent.ReadWrite>>() {}.type
+            )
 
-    refreshObservers()
+          user.updateRelays(relays)
+        }
+      } catch (e: Exception) {
+        println("relay import issue")
+        e.printStackTrace()
+      }
+
+      Log.d(
+        "CL",
+        "AAA ${user.toBestDisplayName()} ${event.follows.size}"
+      )
+    }
   }
 
-  fun consume(event: PrivateDmEvent) {
+  fun consume(event: PrivateDmEvent, relay: Relay?) {
     val note = getOrCreateNote(event.id.toHex())
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+
+    if (relay != null) {
+      author.addRelayBeingUsed(relay, event.createdAt)
+      note.addRelay(relay)
+    }
 
     // Already processed this event.
     if (note.event != null) return
 
-    val author = getOrCreateUser(event.pubKey)
-    val recipient = event.recipientPubKey?.let { getOrCreateUser(it) }
+    val recipient = event.recipientPubKey?.let { getOrCreateUser(it.toHexKey()) }
 
     //Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
 
-    val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }.map { getOrCreateNote(it) }.toMutableList()
-    val mentions = event.tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }.map { getOrCreateUser(decodePublicKey(it)) }
+    val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }.mapNotNull { checkGetOrCreateNote(it) }
+    val mentions = event.tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }.mapNotNull { checkGetOrCreateUser(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -179,7 +338,41 @@ object LocalCache {
   }
 
   fun consume(event: DeletionEvent) {
-    //Log.d("DEL", event.toJson())
+    var deletedAtLeastOne = false
+
+    event.deleteEvents.mapNotNull { notes[it] }.forEach { deleteNote ->
+      // must be the same author
+      if (deleteNote.author?.pubkeyHex == event.pubKey.toHexKey()) {
+        deleteNote.author?.removeNote(deleteNote)
+
+        // reverts the add
+        deleteNote.mentions?.forEach { user ->
+          user.removeTaggedPost(deleteNote)
+          user.removeReport(deleteNote)
+        }
+
+        deleteNote.replyTo?.forEach { replyingNote ->
+          replyingNote.author?.removeTaggedPost(deleteNote)
+        }
+
+        // Counts the replies
+        deleteNote.replyTo?.forEach { masterNote ->
+          masterNote.removeReply(deleteNote)
+          masterNote.removeBoost(deleteNote)
+          masterNote.removeReaction(deleteNote)
+          masterNote.removeZap(deleteNote)
+          masterNote.removeReport(deleteNote)
+        }
+
+        notes.remove(deleteNote.idHex)
+
+        deletedAtLeastOne = true
+      }
+    }
+
+    if (deletedAtLeastOne) {
+      live.invalidateData()
+    }
   }
 
   fun consume(event: RepostEvent) {
@@ -188,23 +381,23 @@ object LocalCache {
     // Already processed this event.
     if (note.event != null) return
 
-    //Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+    //Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
 
-    val author = getOrCreateUser(event.pubKey)
-    val mentions = event.originalAuthor.map { getOrCreateUser(decodePublicKey(it)) }.toList()
-    val repliesTo = event.boostedPost.map { getOrCreateNote(it) }.toMutableList()
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val mentions = event.originalAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.boostedPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
     // Prepares user's profile view.
-    author.notes.add(note)
+    author.addNote(note)
 
     // Adds notifications to users.
     mentions.forEach {
-      it.taggedPosts.add(note)
+      it.addTaggedPost(note)
     }
     repliesTo.forEach {
-      it.author?.taggedPosts?.add(note)
+      it.author?.addTaggedPost(note)
     }
 
     // Counts the replies
@@ -216,14 +409,14 @@ object LocalCache {
   }
 
   fun consume(event: ReactionEvent) {
-    val note = getOrCreateNote(event.id.toHex())
+    val note = getOrCreateNote(event.id.toHexKey())
 
     // Already processed this event.
     if (note.event != null) return
 
-    val author = getOrCreateUser(event.pubKey)
-    val mentions = event.originalAuthor.map { getOrCreateUser(decodePublicKey(it)) }
-    val repliesTo = event.originalPost.map { getOrCreateNote(it) }.toMutableList()
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val mentions = event.originalAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.originalPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -231,25 +424,80 @@ object LocalCache {
 
     // Adds notifications to users.
     mentions.forEach {
-      it.taggedPosts.add(note)
+      it.addTaggedPost(note)
     }
     repliesTo.forEach {
-      it.author?.taggedPosts?.add(note)
+      it.author?.addTaggedPost(note)
     }
 
-    if (event.content == "" || event.content == "+" || event.content == "\uD83E\uDD19") {
+    if (
+      event.content == "" ||
+      event.content == "+" ||
+      event.content == "\u2764\uFE0F" || // red heart
+      event.content == "\uD83E\uDD19" || // call me hand
+      event.content == "\uD83D\uDC4D" // thumbs up
+    ) {
       // Counts the replies
       repliesTo.forEach {
         it.addReaction(note)
       }
     }
+
+    if (event.content == "!" // nostr_console hide.
+      || event.content == "\u26A0\uFE0F"  // Warning sign
+    ) {
+      // Counts the replies
+      repliesTo.forEach {
+        it.addReport(note)
+      }
+    }
+  }
+
+  fun consume(event: ReportEvent, relay: Relay?) {
+    val note = getOrCreateNote(event.id.toHex())
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+
+    if (relay != null) {
+      author.addRelayBeingUsed(relay, event.createdAt)
+      note.addRelay(relay)
+    }
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val mentions = event.reportedAuthor.mapNotNull { checkGetOrCreateUser(it.key) }
+    val repliesTo = event.reportedPost.mapNotNull { checkGetOrCreateNote(it.key) }
+
+    note.loadEvent(event, author, mentions, repliesTo)
+
+    //Log.d("RP", "New Report ${event.content} by ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+    // Adds notifications to users.
+    if (repliesTo.isEmpty()) {
+      mentions.forEach {
+        it.addReport(note)
+      }
+    }
+    repliesTo.forEach {
+      it.addReport(note)
+    }
   }
 
   fun consume(event: ChannelCreateEvent) {
+    //Log.d("MT", "New Event ${event.content} ${event.id.toHex()}")
     // new event
     val oldChannel = getOrCreateChannel(event.id.toHex())
+    val author = getOrCreateUser(event.pubKey.toHexKey())
     if (event.createdAt > oldChannel.updatedMetadataAt) {
-      oldChannel.updateChannelInfo(event.channelInfo, event.createdAt)
+      if (oldChannel.creator == null || oldChannel.creator == author) {
+        oldChannel.updateChannelInfo(author, event.channelInfo, event.createdAt)
+
+        val note = getOrCreateNote(event.id.toHex())
+        oldChannel.addNote(note)
+        note.channel = oldChannel
+        note.loadEvent(event, author, emptyList(), emptyList())
+
+        refreshObservers()
+      }
     } else {
       // older data, does nothing
     }
@@ -259,27 +507,52 @@ object LocalCache {
     if (event.channel.isNullOrBlank()) return
 
     // new event
-    val oldChannel = getOrCreateChannel(event.channel)
+    val oldChannel = checkGetOrCreateChannel(event.channel) ?: return
+    val author = getOrCreateUser(event.pubKey.toHexKey())
     if (event.createdAt > oldChannel.updatedMetadataAt) {
-      oldChannel.updateChannelInfo(event.channelInfo, event.createdAt)
+      if (oldChannel.creator == null || oldChannel.creator == author) {
+        oldChannel.updateChannelInfo(author, event.channelInfo, event.createdAt)
+
+        val note = getOrCreateNote(event.id.toHex())
+        oldChannel.addNote(note)
+        note.channel = oldChannel
+        note.loadEvent(event, author, emptyList(), emptyList())
+
+        refreshObservers()
+      }
     } else {
       //Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
     }
   }
 
-  fun consume(event: ChannelMessageEvent) {
+  fun consume(event: ChannelMessageEvent, relay: Relay?) {
     if (event.channel.isNullOrBlank()) return
+    if (antiSpam.isSpam(event)) {
+      relay?.let {
+        it.spamCounter++
+      }
+      return
+    }
 
-    val channel = getOrCreateChannel(event.channel)
+    val channel = checkGetOrCreateChannel(event.channel) ?: return
 
-    val note = channel.getOrCreateNote(event.id.toHex())
+    val note = getOrCreateNote(event.id.toHex())
+    channel.addNote(note)
+
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+
+    if (relay != null) {
+      author.addRelayBeingUsed(relay, event.createdAt)
+      note.addRelay(relay)
+    }
 
     // Already processed this event.
     if (note.event != null) return
 
-    val author = getOrCreateUser(event.pubKey)
-    val mentions = Collections.synchronizedList(event.mentions.map { getOrCreateUser(decodePublicKey(it)) })
-    val replyTo = Collections.synchronizedList(event.replyTos.map { getOrCreateNote(it) }.toMutableList())
+    val mentions = event.mentions.mapNotNull { checkGetOrCreateUser(it) }
+    val replyTo = event.replyTos
+      .mapNotNull { checkGetOrCreateNote(it) }
+      .filter { it.event !is ChannelCreateEvent }
 
     note.channel = channel
     note.loadEvent(event, author, mentions, replyTo)
@@ -288,10 +561,10 @@ object LocalCache {
 
     // Adds notifications to users.
     mentions.forEach {
-      it.taggedPosts.add(note)
+      it.addTaggedPost(note)
     }
     replyTo.forEach {
-      it.author?.taggedPosts?.add(note)
+      it.author?.addTaggedPost(note)
     }
 
     // Counts the replies
@@ -299,8 +572,6 @@ object LocalCache {
       it.addReply(note)
     }
 
-    UrlCachedPreviewer.preloadPreviewsFor(note)
-
     refreshObservers()
   }
 
@@ -312,20 +583,233 @@ object LocalCache {
 
   }
 
+  fun consume(event: LnZapEvent) {
+    val note = getOrCreateNote(event.id.toHexKey())
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val mentions = event.zappedAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.zappedPost.mapNotNull { checkGetOrCreateNote(it) }
+
+    note.loadEvent(event, author, mentions, repliesTo)
+
+    val zapRequest = event.containedPost?.id?.toHexKey()?.let { getOrCreateNote(it) }
+    if (zapRequest == null) {
+      Log.e("ZP","Zap Request not found. Unable to process Zap {${event.toJson()}}")
+      return
+    }
+
+    //Log.d("ZP", "New ZapEvent ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+    // Adds notifications to users.
+    mentions.forEach {
+      it.addTaggedPost(note)
+    }
+    repliesTo.forEach {
+      it.author?.addTaggedPost(note)
+    }
+
+    repliesTo.forEach {
+      it.addZap(zapRequest, note)
+    }
+    mentions.forEach {
+      it.addZap(zapRequest, note)
+    }
+  }
+
+  fun consume(event: LnZapRequestEvent) {
+    val note = getOrCreateNote(event.id.toHexKey())
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val mentions = event.zappedAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.zappedPost.mapNotNull { checkGetOrCreateNote(it) }
+
+    note.loadEvent(event, author, mentions, repliesTo)
+
+    //Log.d("ZP", "New Zap Request ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+    // Adds notifications to users.
+    mentions.forEach {
+      it.addTaggedPost(note)
+    }
+    repliesTo.forEach {
+      it.author?.addTaggedPost(note)
+    }
+
+    repliesTo.forEach {
+      it.addZap(note, null)
+    }
+    mentions.forEach {
+      it.addZap(note, null)
+    }
+  }
+
   fun findUsersStartingWith(username: String): List<User> {
-    return users.values.filter { it.info.anyNameStartsWith(username) }
+    return users.values.filter {
+          (it.anyNameStartsWith(username))
+        || it.pubkeyHex.startsWith(username, true)
+        || it.pubkeyNpub().startsWith(username, true)
+    }
+  }
+
+  fun findNotesStartingWith(text: String): List<Note> {
+    return notes.values.filter {
+      (it.event is TextNoteEvent && it.event?.content?.contains(text, true) ?: false)
+        || (it.event is ChannelMessageEvent && it.event?.content?.contains(text, true) ?: false)
+        || it.idHex.startsWith(text, true)
+        || it.idNote().startsWith(text, true)
+    }
+  }
+
+  fun findChannelsStartingWith(text: String): List<Channel> {
+    return channels.values.filter {
+        it.anyNameStartsWith(text)
+        || it.idHex.startsWith(text, true)
+        || it.idNote().startsWith(text, true)
+    }
+  }
+
+  fun cleanObservers() {
+    notes.forEach {
+      it.value.clearLive()
+    }
+
+    users.forEach {
+      it.value.clearLive()
+    }
+  }
+
+  fun pruneOldAndHiddenMessages(account: Account) {
+    channels.forEach {
+      val toBeRemoved = it.value.pruneOldAndHiddenMessages(account)
+
+      toBeRemoved.forEach {
+        notes.remove(it.idHex)
+        // Doesn't need to clean up the replies and mentions.. Too small to matter.
+
+        // reverts the add
+        it.mentions?.forEach { user ->
+          user.removeTaggedPost(it)
+        }
+        it.replyTo?.forEach { replyingNote ->
+          replyingNote.author?.removeTaggedPost(it)
+        }
+
+        // Counts the replies
+        it.replyTo?.forEach { replyingNote ->
+          it.removeReply(it)
+        }
+      }
+
+      println("PRUNE: ${toBeRemoved.size} messages removed from ${it.value.info.name}")
+    }
+  }
+
+  fun pruneNonFollows(account: Account) {
+    val follows = account.userProfile().follows
+    val knownPMs = account.userProfile().privateChatrooms.filter {
+      account.userProfile().hasSentMessagesTo(it.key) && account.isAcceptable(it.key)
+    }
+
+    val followsFollow = follows.map {
+      it.follows
+    }.flatten()
+
+    val followSet = follows.plus(knownPMs).plus(account.userProfile()).plus(followsFollow)
+
+    val toBeRemoved = notes
+      .filter {
+        (it.value.author == null || it.value.author!! !in followSet) && it.value.event?.kind == TextNoteEvent.kind && it.value.liveSet?.isInUse() != true
+      }
+
+    toBeRemoved.forEach {
+      notes.remove(it.key)
+    }
+
+    val toBeRemovedUsers = users
+      .filter {
+        (it.value !in followSet) && it.value.liveSet?.isInUse() != true
+      }
+
+    toBeRemovedUsers.forEach {
+      users.remove(it.key)
+    }
+
+    println("PRUNE: ${toBeRemoved.size} messages removed because they came from NonFollows")
+    println("PRUNE: ${toBeRemovedUsers.size} users removed because are NonFollows")
+  }
+
+  fun pruneHiddenMessages(account: Account) {
+    val toBeRemoved = account.hiddenUsers.map {
+      users[it]?.notes ?: emptySet()
+    }.flatten()
+
+    account.hiddenUsers.forEach {
+      users[it]?.clearNotes()
+    }
+
+    toBeRemoved.forEach {
+      it.author?.removeNote(it)
+
+      // reverts the add
+      it.mentions?.forEach { user ->
+        user.removeTaggedPost(it)
+      }
+      it.replyTo?.forEach { replyingNote ->
+        replyingNote.author?.removeTaggedPost(it)
+      }
+
+      // Counts the replies
+      it.replyTo?.forEach { masterNote ->
+        masterNote.removeReply(it)
+        masterNote.removeBoost(it)
+        masterNote.removeReaction(it)
+        masterNote.removeZap(it)
+        masterNote.removeReport(it)
+      }
+
+      notes.remove(it.idHex)
+    }
+
+    println("PRUNE: ${toBeRemoved.size} messages removed because they were Hidden")
   }
 
   // Observers line up here.
   val live: LocalCacheLiveData = LocalCacheLiveData(this)
 
   private fun refreshObservers() {
-    live.refresh()
+    live.invalidateData()
   }
 }
 
 class LocalCacheLiveData(val cache: LocalCache): LiveData<LocalCacheState>(LocalCacheState(cache)) {
-  fun refresh() {
+
+  // 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(500)
+        refresh()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
+    }
+  }
+
+  private fun refresh() {
     postValue(LocalCacheState(cache))
   }
 }

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

@@ -2,45 +2,68 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
+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.Collections
+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
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import nostr.postr.events.Event
 
-class Note(val idHex: String) {
-    // These fields are always available.
-    // They are immutable
-    val id = Hex.decode(idHex)
-    val idDisplayHex = id.toShortenHex()
+val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
 
+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 author: User? = null
     var mentions: List<User>? = null
-    var replyTo: MutableList<Note>? = null
+    var replyTo: List<Note>? = null
 
     // These fields are updated every time an event related to this note is received.
-    val replies = Collections.synchronizedSet(mutableSetOf<Note>())
-    val reactions = Collections.synchronizedSet(mutableSetOf<Note>())
-    val boosts = Collections.synchronizedSet(mutableSetOf<Note>())
+    var replies = setOf<Note>()
+        private set
+    var reactions = setOf<Note>()
+        private set
+    var boosts = setOf<Note>()
+        private set
+    var reports = mapOf<User, Set<Note>>()
+        private set
+    var zaps = mapOf<Note, Note?>()
+        private set
+
+    var relays = setOf<String>()
+        private set
 
     var channel: Channel? = null
 
-    fun loadEvent(event: Event, author: User, mentions: List<User>, replyTo: MutableList<Note>) {
+    var lastReactionsDownloadTime: Long? = null
+
+    fun id() = Hex.decode(idHex)
+    fun idNote() = id().toNote()
+    fun idDisplayNote() = idNote().toShortenHex()
+
+    fun loadEvent(event: Event, author: User, mentions: List<User>, replyTo: List<Note>) {
         this.event = event
         this.author = author
         this.mentions = mentions
         this.replyTo = replyTo
 
-        refreshObservers()
+        liveSet?.metadata?.invalidateData()
     }
 
     fun formattedDateTime(timestamp: Long): String {
@@ -48,41 +71,122 @@ class Note(val idHex: String) {
             .format(DateTimeFormatter.ofPattern("uuuu-MM-dd-HH:mm:ss"))
     }
 
-    fun replyLevelSignature(): String {
+    /**
+     * This method caches signatures during each execution to avoid recalculation in longer threads
+     */
+    fun replyLevelSignature(cachedSignatures: MutableMap<Note, String> = mutableMapOf()): String {
         val replyTo = replyTo
         if (replyTo == null || replyTo.isEmpty()) {
             return "/" + formattedDateTime(event?.createdAt ?: 0) + ";"
         }
 
         return replyTo
-            .map { it.replyLevelSignature() }
+            .map {
+                cachedSignatures[it] ?: it.replyLevelSignature(cachedSignatures).apply { cachedSignatures.put(it, this) }
+            }
             .maxBy { it.length }.removeSuffix(";") + "/" + formattedDateTime(event?.createdAt ?: 0) + ";"
     }
 
-    fun replyLevel(): Int {
+    fun replyLevel(cachedLevels: MutableMap<Note, Int> = mutableMapOf()): Int {
         val replyTo = replyTo
         if (replyTo == null || replyTo.isEmpty()) {
             return 0
         }
 
         return replyTo.maxOf {
-            it.replyLevel()
+            cachedLevels[it] ?: it.replyLevel(cachedLevels).apply { cachedLevels.put(it, this) }
         } + 1
     }
 
     fun addReply(note: Note) {
-        if (replies.add(note))
-            refreshObservers()
+        if (note !in replies) {
+            replies = replies + note
+            liveSet?.replies?.invalidateData()
+        }
     }
 
+    fun removeReply(note: Note) {
+        replies = replies - note
+        liveSet?.replies?.invalidateData()
+    }
+    fun removeBoost(note: Note) {
+        boosts = boosts - note
+        liveSet?.boosts?.invalidateData()
+    }
+    fun removeReaction(note: Note) {
+        reactions = reactions - note
+        liveSet?.reactions?.invalidateData()
+    }
+
+    fun removeReport(deleteNote: Note) {
+        val author = deleteNote.author ?: return
+
+        if (author in reports.keys && reports[author]?.contains(deleteNote) == true ) {
+            reports[author]?.let {
+                reports = reports + Pair(author, it.minus(deleteNote))
+                liveSet?.reports?.invalidateData()
+            }
+        }
+    }
+
+    fun removeZap(note: Note) {
+        if (zaps[note] != null) {
+            zaps = zaps.minus(note)
+            liveSet?.zaps?.invalidateData()
+        } else if (zaps.containsValue(note)) {
+            val toRemove = zaps.filterValues { it == note }
+            zaps = zaps.minus(toRemove.keys)
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
+
     fun addBoost(note: Note) {
-        if (boosts.add(note))
-            refreshObservers()
+        if (note !in boosts) {
+            boosts = boosts + note
+            liveSet?.boosts?.invalidateData()
+        }
+    }
+
+    fun addZap(zapRequest: Note, zap: Note?) {
+        if (zapRequest !in zaps.keys) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveSet?.zaps?.invalidateData()
+        }
     }
 
     fun addReaction(note: Note) {
-        if (reactions.add(note))
-            refreshObservers()
+        if (note !in reactions) {
+            reactions = reactions + note
+            liveSet?.reactions?.invalidateData()
+        }
+    }
+
+    fun addReport(note: Note) {
+        val author = note.author ?: return
+
+        if (author !in reports.keys) {
+            reports = reports + Pair(author, setOf(note))
+            liveSet?.reports?.invalidateData()
+        } else if (reports[author]?.contains(note) == false) {
+            reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
+            liveSet?.reports?.invalidateData()
+        }
+    }
+
+    fun addRelay(relay: Relay) {
+        if (relay.url !in relays) {
+            relays = relays + relay.url
+            liveSet?.relays?.invalidateData()
+        }
+    }
+
+    fun isZappedBy(user: User): Boolean {
+        // Zaps who the requester was the user
+        return zaps.any { it.key.author == user }
     }
 
     fun isReactedBy(user: User): Boolean {
@@ -93,16 +197,145 @@ class Note(val idHex: String) {
         return boosts.any { it.author == user }
     }
 
-    // Observers line up here.
-    val live: NoteLiveData = NoteLiveData(this)
+    fun reportsBy(user: User): Set<Note> {
+        return reports[user] ?: emptySet()
+    }
 
-    private fun refreshObservers() {
-        live.refresh()
+    fun reportAuthorsBy(users: Set<User>): List<User> {
+        return reports.keys.filter { it in users }
+    }
+
+    fun reportsBy(users: Set<User>): List<Note> {
+        return reportAuthorsBy(users).mapNotNull {
+            reports[it]
+        }.flatten()
+    }
+
+    fun zappedAmount(): BigDecimal {
+        return zaps.mapNotNull { it.value?.event }
+            .filterIsInstance<LnZapEvent>()
+            .mapNotNull {
+                it.amount
+            }.sumOf { it }
+    }
+
+    fun hasAnyReports(): Boolean {
+        val dayAgo = Date().time / 1000 - 24*60*60
+        return reports.isNotEmpty() ||
+          (author?.reports?.values?.filter {
+              it.firstOrNull { ( it.event?.createdAt ?: 0 ) > dayAgo } != null
+          }?.isNotEmpty() ?: false)
+    }
+
+    fun directlyCiteUsers(): Set<User> {
+        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()) }
+                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)
+    }
+
+    fun isNewThread(): Boolean {
+        return event is RepostEvent || replyTo == null || replyTo?.size == 0
+    }
+
+    fun hasZapped(loggedIn: User): Boolean {
+        return zaps.any { it.key.author == loggedIn }
+    }
+
+    fun hasReacted(loggedIn: User, content: String): Boolean {
+        return reactedBy(loggedIn, content).isNotEmpty()
+    }
+
+    fun reactedBy(loggedIn: User, content: String): List<Note> {
+        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.event?.createdAt ?: 0) > currentTime - (60 * 5)} != null // 5 minute protection
+    }
+
+    fun boostedBy(loggedIn: User): List<Note> {
+        return boosts.filter { it.author == loggedIn }
+    }
+
+    var liveSet: NoteLiveSet? = null
+
+    fun live(): NoteLiveSet {
+        if (liveSet == null) {
+            liveSet = NoteLiveSet(this)
+        }
+        return liveSet!!
+    }
+
+    fun clearLive() {
+        if (liveSet != null && liveSet?.isInUse() == false) {
+            liveSet = null
+        }
+    }
+}
+
+
+class NoteLiveSet(u: Note) {
+    // Observers line up here.
+    val metadata: NoteLiveData = NoteLiveData(u)
+
+    val reactions: NoteLiveData = NoteLiveData(u)
+    val boosts: NoteLiveData = NoteLiveData(u)
+    val replies: NoteLiveData = NoteLiveData(u)
+    val reports: NoteLiveData = NoteLiveData(u)
+    val relays: NoteLiveData = NoteLiveData(u)
+    val zaps: NoteLiveData = NoteLiveData(u)
+
+    fun isInUse(): Boolean {
+        return metadata.hasObservers()
+          || reactions.hasObservers()
+          || boosts.hasObservers()
+          || replies.hasObservers()
+          || reports.hasObservers()
+          || relays.hasObservers()
+          || zaps.hasObservers()
     }
 }
 
 class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
-    val scope = CoroutineScope(Job() + Dispatchers.Main)
+    // 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(NoteState(note))
@@ -110,16 +343,12 @@ class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
 
     override fun onActive() {
         super.onActive()
-        scope.launch {
-            NostrSingleEventDataSource.add(note.idHex)
-        }
+        NostrSingleEventDataSource.add(note.idHex)
     }
 
     override fun onInactive() {
         super.onInactive()
-        scope.launch {
-            NostrSingleEventDataSource.remove(note.idHex)
-        }
+        NostrSingleEventDataSource.remove(note.idHex)
     }
 }
 

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

@@ -0,0 +1,14 @@
+package com.vitorpamplona.amethyst.model
+
+import com.vitorpamplona.amethyst.service.relays.FeedType
+
+data class RelaySetupInfo(
+    val url: String,
+    val read: Boolean,
+    val write: Boolean,
+    val errorCount: Int = 0,
+    val downloadCount: Int = 0,
+    val uploadCount: Int = 0,
+    val spamCount: Int = 0,
+    val feedTypes: Set<FeedType>
+)

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

@@ -0,0 +1,66 @@
+package com.vitorpamplona.amethyst.model
+
+import kotlin.time.ExperimentalTime
+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
+
+    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 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()
+
+    if (roots != null && roots.isNotEmpty()) {
+      return roots[0]
+    }
+
+    return null
+  }
+
+  @OptIn(ExperimentalTime::class)
+  fun findThreadFor(noteId: String): Set<Note> {
+    val (result, elapsed) = measureTimedValue {
+      val note = LocalCache.getOrCreateNote(noteId)
+
+      if (note.event != null) {
+        val thread = mutableSetOf<Note>()
+
+        val threadRoot = searchRoot(note, thread) ?: note
+
+        loadDown(threadRoot, thread)
+
+        thread.toSet()
+      } else {
+        setOf(note)
+      }
+    }
+
+    println("Model Refresh: Thread loaded in ${elapsed}")
+
+    return result
+  }
+
+  fun loadDown(note: Note, thread: MutableSet<Note>) {
+    if (note !in thread) {
+      thread.add(note)
+
+      note.replies.forEach {
+        loadDown(it, thread)
+      }
+    }
+  }
+}

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

@@ -7,10 +7,16 @@ import com.vitorpamplona.amethyst.ui.components.imageExtension
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.videoExtension
-import java.util.concurrent.ConcurrentHashMap
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 
 object UrlCachedPreviewer {
-  val cache = ConcurrentHashMap<String, UrlInfoItem>()
+  var cache = mapOf<String, UrlInfoItem>()
+    private set
+  var failures = mapOf<String, Throwable>()
+    private set
 
   fun previewInfo(url: String, callback: IUrlPreviewCallback? = null) {
     cache[url]?.let {
@@ -18,16 +24,25 @@ object UrlCachedPreviewer {
       return
     }
 
-    BahaUrlPreview(url, object : IUrlPreviewCallback {
-      override fun onComplete(urlInfo: UrlInfoItem) {
-        cache.put(url, urlInfo)
-        callback?.onComplete(urlInfo)
-      }
+    failures[url]?.let {
+      callback?.onFailed(it)
+      return
+    }
 
-      override fun onFailed(throwable: Throwable) {
-        callback?.onFailed(throwable)
-      }
-    }).fetchUrlPreview()
+    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)
+        }
+
+        override fun onFailed(throwable: Throwable) {
+          failures = failures + Pair(url, throwable)
+          callback?.onFailed(throwable)
+        }
+      }).fetchUrlPreview()
+    }
   }
 
   fun findUrlsInMessage(message: String): List<String> {
@@ -46,8 +61,10 @@ object UrlCachedPreviewer {
           // Preload Images? Isn't this too heavy?
         } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
           // Do nothing for now.
-        } else {
+        } else if (isValidURL(removedParamsFromUrl)) {
           previewInfo(it)
+        } else {
+          previewInfo("https://${it}")
         }
       }
     }

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

@@ -2,110 +2,346 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.ReportEvent
+import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import java.util.Collections
-import java.util.concurrent.ConcurrentHashMap
+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
+import kotlinx.coroutines.NonCancellable
+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
 
-class User(val pubkey: ByteArray) {
-    val pubkeyHex = pubkey.toHexKey()
-    val pubkeyDisplayHex = pubkey.toShortenHex()
+val lnurlpPattern = Pattern.compile("(?i:http|https):\\/\\/((.+)\\/)*\\.well-known\\/lnurlp\\/(.*)")
 
-    var info = UserMetadata()
+class User(val pubkeyHex: String) {
+    var info: UserMetadata? = null
 
-    var updatedMetadataAt: Long = 0;
     var updatedFollowsAt: Long = 0;
+    var latestContactList: ContactListEvent? = null
 
-    var lastestContactList: ContactListEvent? = null
+    var follows = setOf<User>()
+        private set
+    var followers = setOf<User>()
+        private set
 
-    val notes = Collections.synchronizedSet(mutableSetOf<Note>())
-    val follows = Collections.synchronizedSet(mutableSetOf<User>())
-    val taggedPosts = Collections.synchronizedSet(mutableSetOf<Note>())
+    var notes = setOf<Note>()
+        private set
+    var taggedPosts = setOf<Note>()
+        private set
 
-    val followers = Collections.synchronizedSet(mutableSetOf<User>())
+    var reports = mapOf<User, Set<Note>>()
+        private set
+    var latestReportTime: Long = 0
 
-    val messages = ConcurrentHashMap<User, MutableSet<Note>>()
+    var zaps = mapOf<Note, Note?>()
+        private set
+
+    var relays: Map<String, ContactListEvent.ReadWrite>? = null
+        private set
+
+    var relaysBeingUsed = mapOf<String, RelayInfo>()
+        private set
+
+    var privateChatrooms = mapOf<User, Chatroom>()
+        private set
+
+    fun pubkey() = Hex.decode(pubkeyHex)
+    fun pubkeyNpub() = pubkey().toNpub()
+    fun pubkeyDisplayHex() = pubkeyNpub().toShortenHex()
 
     fun toBestDisplayName(): String {
-        return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex
+        return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex()
     }
 
     fun bestUsername(): String? {
-        return info.name?.ifBlank { null } ?: info.username?.ifBlank { null }
+        return info?.name?.ifBlank { null } ?: info?.username?.ifBlank { null }
     }
 
     fun bestDisplayName(): String? {
-        return info.displayName?.ifBlank { null } ?: info.display_name?.ifBlank { null }
+        return info?.displayName?.ifBlank { null } ?: info?.display_name?.ifBlank { null }
     }
 
-    fun profilePicture(): String {
-        if (info.picture.isNullOrBlank()) info.picture = null
-        return info.picture ?: "https://robohash.org/${pubkeyHex}.png"
+    fun nip05(): String? {
+        return info?.nip05?.ifBlank { null }
     }
 
-    fun follow(user: User) {
-        follows.add(user)
-        user.followers.add(this)
+    fun profilePicture(): String? {
+        if (info?.picture.isNullOrBlank()) info?.picture = null
+        return info?.picture
     }
+
+    fun follow(user: User, followedAt: Long) {
+        follows = follows + user
+        user.followers = user.followers + this
+
+        liveSet?.follows?.invalidateData()
+        user.liveSet?.follows?.invalidateData()
+    }
+
     fun unfollow(user: User) {
-        follows.remove(user)
-        user.followers.remove(this)
+        follows = follows - user
+        user.followers = user.followers - this
+
+        liveSet?.follows?.invalidateData()
+        user.liveSet?.follows?.invalidateData()
+    }
+
+    fun follow(users: Set<User>, followedAt: Long) {
+        follows = follows + users
+        users.forEach {
+            if (this !in it.followers && it.liveSet?.isInUse() == true) {
+                it.followers = it.followers + this
+                it.liveSet?.follows?.invalidateData()
+            }
+        }
+
+        liveSet?.follows?.invalidateData()
+    }
+
+    fun unfollow(users: Set<User>) {
+        follows = follows - users
+        users.forEach {
+            if (this in it.followers && it.liveSet?.isInUse() == true) {
+                it.followers = it.followers - this
+                it.liveSet?.follows?.invalidateData()
+            }
+        }
+        liveSet?.follows?.invalidateData()
+    }
+
+    fun addTaggedPost(note: Note) {
+        if (note !in taggedPosts) {
+            taggedPosts = taggedPosts + note
+            // No need for Listener yet
+        }
+    }
+
+    fun removeTaggedPost(note: Note) {
+        taggedPosts = taggedPosts - note
+    }
+
+    fun addNote(note: Note) {
+        if (note !in notes) {
+            notes = notes + note
+            // No need for Listener yet
+        }
+    }
+
+    fun removeNote(note: Note) {
+        notes = notes - note
+    }
+
+    fun clearNotes() {
+        notes = setOf<Note>()
+    }
+
+    fun addReport(note: Note) {
+        val author = note.author ?: return
+
+        if (author !in reports.keys) {
+            reports = reports + Pair(author, setOf(note))
+            liveSet?.reports?.invalidateData()
+        } else if (reports[author]?.contains(note) == false) {
+            reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
+            liveSet?.reports?.invalidateData()
+        }
+
+        val reportTime = note.event?.createdAt ?: 0
+        if (reportTime > latestReportTime) {
+            latestReportTime = reportTime
+        }
+    }
+
+    fun removeReport(deleteNote: Note) {
+        val author = deleteNote.author ?: return
+
+        if (author in reports.keys && reports[author]?.contains(deleteNote) == true ) {
+            reports[author]?.let {
+                reports = reports + Pair(author, it.minus(deleteNote))
+                liveSet?.reports?.invalidateData()
+            }
+        }
+    }
+
+    fun addZap(zapRequest: Note, zap: Note?) {
+        if (zapRequest !in zaps.keys) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
+    fun zappedAmount(): BigDecimal {
+        return zaps.mapNotNull { it.value?.event }
+            .filterIsInstance<LnZapEvent>()
+            .mapNotNull {
+                it.amount
+            }.sumOf { it }
+    }
+
+    fun reportsBy(user: User): Set<Note> {
+        return reports[user] ?: emptySet()
+    }
+
+    fun reportAuthorsBy(users: Set<User>): List<User> {
+        return reports.keys.filter { it in users }
+    }
+
+    fun reportsBy(users: Set<User>): List<Note> {
+        return reportAuthorsBy(users).mapNotNull {
+            reports[it]
+        }.flatten()
     }
 
     @Synchronized
-    fun getOrCreateChannel(user: User): MutableSet<Note> {
-        return messages[user] ?: run {
-            val channel = mutableSetOf<Note>()
-            messages[user] = channel
-            channel
+    fun getOrCreatePrivateChatroom(user: User): Chatroom {
+        return privateChatrooms[user] ?: run {
+            val privateChatroom = Chatroom(setOf<Note>())
+            privateChatrooms = privateChatrooms + Pair(user, privateChatroom)
+            privateChatroom
         }
     }
 
     fun addMessage(user: User, msg: Note) {
-        getOrCreateChannel(user).add(msg)
-        live.refresh()
+        val privateChatroom = getOrCreatePrivateChatroom(user)
+        if (msg !in privateChatroom.roomMessages) {
+            privateChatroom.roomMessages = privateChatroom.roomMessages + msg
+            liveSet?.messages?.invalidateData()
+        }
     }
 
-    fun updateFollows(newFollows: List<User>, updateAt: Long) {
-        val toBeAdded = synchronized(follows) {
-            newFollows - follows
-        }
-        val toBeRemoved = synchronized(follows) {
-            follows - newFollows
-        }
-        toBeAdded.forEach {
-            follow(it)
-        }
-        toBeRemoved.forEach {
-            unfollow(it)
+    fun addRelayBeingUsed(relay: Relay, eventTime: Long) {
+        val here = relaysBeingUsed[relay.url]
+        if (here == null) {
+            relaysBeingUsed = relaysBeingUsed + Pair(relay.url, RelayInfo(relay.url, eventTime, 1))
+        } else {
+            if (eventTime > here.lastEvent) {
+                here.lastEvent = eventTime
+            }
+            here.counter++
         }
 
+        liveSet?.relayInfo?.invalidateData()
+    }
+    
+    fun updateFollows(newFollows: Set<User>, updateAt: Long) {
+        val toBeAdded = newFollows - follows
+        val toBeRemoved = follows - newFollows
+
+        follow(toBeAdded, updateAt)
+        unfollow(toBeRemoved)
+
         updatedFollowsAt = updateAt
-
-        live.refresh()
     }
 
-    fun updateUserInfo(newUserInfo: UserMetadata, updateAt: Long) {
-        info = newUserInfo
-        updatedMetadataAt = updateAt
+    fun updateRelays(relayUse: Map<String, ContactListEvent.ReadWrite>) {
+        // no need to test if relays are different. The Account will check for us.
+        relays = relayUse
+        liveSet?.relays?.invalidateData()
+    }
 
-        live.refresh()
+    fun updateUserInfo(newUserInfo: UserMetadata, latestMetadata: MetadataEvent) {
+        info = newUserInfo
+        info?.latestMetadata = latestMetadata
+        info?.updatedMetadataAt = latestMetadata.createdAt
+
+        if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.toLowerCase()?.startsWith("lnurl") == true) {
+            try {
+                val url = String(Bech32.decodeBytes(newUserInfo.lud06!!, false).second)
+
+                val matcher = lnurlpPattern.matcher(url)
+                while (matcher.find()) {
+                    val domain = matcher.group(2)
+                    val username = matcher.group(3)
+
+                    info?.lud16 = "$username@$domain"
+                }
+            } catch (t: Throwable) {
+                // Doesn't create errors.
+            }
+        }
+
+        liveSet?.metadata?.invalidateData()
     }
 
     fun isFollowing(user: User): Boolean {
-        return synchronized(follows) {
-            follows.contains(user)
+        return follows.contains(user)
+    }
+
+    fun hasSentMessagesTo(user: User?): Boolean {
+        val messagesToUser = privateChatrooms[user] ?: return false
+
+        return messagesToUser.roomMessages.any { this == it.author }
+    }
+
+    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 }
+        } != null
+    }
+
+    fun anyNameStartsWith(username: String): Boolean {
+        return info?.anyNameStartsWith(username) ?: false
+    }
+
+    var liveSet: UserLiveSet? = null
+
+    fun live(): UserLiveSet {
+        if (liveSet == null) {
+            liveSet = UserLiveSet(this)
+        }
+        return liveSet!!
+    }
+
+    fun clearLive() {
+        if (liveSet != null && liveSet?.isInUse() == false) {
+            liveSet = null
         }
     }
+}
 
-    // Observers line up here.
-    val live: UserLiveData = UserLiveData(this)
+class UserLiveSet(u: User) {
+    // UI Observers line up here.
+    val follows: UserLiveData = UserLiveData(u)
+    val reports: UserLiveData = UserLiveData(u)
+    val messages: UserLiveData = UserLiveData(u)
+    val relays: UserLiveData = UserLiveData(u)
+    val relayInfo: UserLiveData = UserLiveData(u)
+    val metadata: UserLiveData = UserLiveData(u)
+    val zaps: UserLiveData = UserLiveData(u)
 
-    private fun refreshObservers() {
-        live.refresh()
+    fun isInUse(): Boolean {
+        return follows.hasObservers()
+          || reports.hasObservers()
+          || messages.hasObservers()
+          || relays.hasObservers()
+          || relayInfo.hasObservers()
+          || metadata.hasObservers()
+          || zaps.hasObservers()
     }
 }
 
+data class RelayInfo (
+    val url: String,
+    var lastEvent: Long,
+    var counter: Long
+)
+
+data class Chatroom(var roomMessages: Set<Note>)
+
 class UserMetadata {
     var name: String? = null
     var username: String? = null
@@ -115,7 +351,11 @@ class UserMetadata {
     var banner: String? = null
     var website: String? = null
     var about: String? = null
+
     var nip05: String? = null
+    var nip05Verified: Boolean = false
+    var nip05LastVerificationTime: Long? = 0
+
     var domain: String? = null
     var lud06: String? = null
     var lud16: String? = null
@@ -125,26 +365,50 @@ class UserMetadata {
     var main_relay: String? = null
     var twitter: String? = null
 
+    var updatedMetadataAt: Long = 0;
+    var latestMetadata: MetadataEvent? = null
+
     fun anyNameStartsWith(prefix: String): Boolean {
         return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
-              .filter { it.startsWith(prefix, true) }.isNotEmpty()
+              .any { it.startsWith(prefix, true) }
     }
 }
 
 class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {
-    fun refresh() {
+
+    // Refreshes observers in batches.
+    var handlerWaiting = AtomicBoolean()
+
+    fun invalidateData() {
+        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(UserState(user))
     }
 
     override fun onActive() {
         super.onActive()
-        NostrSingleUserDataSource.add(user.pubkeyHex)
+        NostrSingleUserDataSource.add(user)
     }
 
     override fun onInactive() {
         super.onInactive()
-        NostrSingleUserDataSource.remove(user.pubkeyHex)
+        NostrSingleUserDataSource.remove(user)
     }
 }
 
 class UserState(val user: User)
+

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

@@ -1,10 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import java.util.UUID
-import nostr.postr.JsonFilter
-
-data class Channel (
-  val id: String = UUID.randomUUID().toString().substring(0,4)
-) {
-  var filter: JsonFilter? = null // Inactive when null
-}

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

@@ -1,25 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.service.relays.Relay
-
-object Constants {
-    val defaultRelays = arrayOf(
-      Relay("wss://nostr.bitcoiner.social", read = true, write = true),
-      Relay("wss://relay.nostr.bg", read = true, write = true),
-      Relay("wss://brb.io", read = true, write = true),
-      Relay("wss://nostr.v0l.io", read = true, write = true),
-      Relay("wss://nostr.rocks", read = true, write = true),
-      Relay("wss://relay.damus.io", read = true, write = true),
-      Relay("wss://nostr.fmt.wiz.biz", read = true, write = true),
-      Relay("wss://nostr.oxtr.dev", read = true, write = true),
-      Relay("wss://nostr-relay.wlvs.space", read = true, write = true),
-      //Relay("wss://nostr-2.zebedee.cloud", read = true, write = true),
-      Relay("wss://nostr-pub.wellorder.net", read = true, write = true),
-      Relay("wss://nostr.mom", read = true, write = true),
-      Relay("wss://nostr.orangepill.dev", read = true, write = true),
-      Relay("wss://nostr-pub.semisol.dev", read = true, write = true),
-      Relay("wss://nostr.onsats.org", read = true, write = true),
-      Relay("wss://nostr.sandwich.farm", read = true, write = true),
-      Relay("wss://relay.nostr.ch", read = true, write = true)
-    )
-}

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

@@ -0,0 +1,93 @@
+package com.vitorpamplona.amethyst.service
+
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+
+class Nip05Verifier {
+  val client = OkHttpClient.Builder().build()
+
+  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]}"
+    }
+
+    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
+    }
+
+    withContext(Dispatchers.IO) {
+      try {
+        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 ${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}")
+      }
+    }
+  }
+
+  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
+        }
+
+        val user = nip05.split("@")[0]
+
+        val hexKey = nip05url?.get("names")?.get(user)?.asText()
+
+        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

@@ -0,0 +1,63 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.bechToBytes
+
+class Nip19 {
+
+  enum class Type {
+    USER, NOTE
+  }
+  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(0)?.get(0)?.toHexKey()
+          if (hex != null)
+            return Return(Type.USER, hex)
+        }
+        if (key.startsWith("nevent")) {
+          val tlv = parseTLV(bytes)
+          val hex = tlv.get(0)?.get(0)?.toHexKey()
+          if (hex != null)
+            return Return(Type.USER, hex)
+        }
+      }
+    } catch (e: Throwable) {
+      println("Trying to Decode NIP19: ${uri}")
+      e.printStackTrace()
+    }
+
+    return null
+  }
+
+  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,81 +1,73 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.UserState
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+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 nostr.postr.events.TextNoteEvent
 
-object NostrAccountDataSource: NostrDataSource<Note>("AccountData") {
+object NostrAccountDataSource: NostrDataSource("AccountData") {
   lateinit var account: Account
 
-  private val cacheListener: (UserState) -> Unit = {
-    resetFilters()
-  }
-
-  override fun start() {
-    if (this::account.isInitialized)
-      account.userProfile().live.observeForever(cacheListener)
-    super.start()
-  }
-
-  override fun stop() {
-    super.stop()
-    if (this::account.isInitialized)
-      account.userProfile().live.removeObserver(cacheListener)
-  }
-
-  fun createAccountFilter(): JsonFilter {
-    return JsonFilter(
-      kinds = listOf(MetadataEvent.kind, ContactListEvent.kind),
-      authors = listOf(account.userProfile().pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 4 days
+  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 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()
 
-  fun <T> equalsIgnoreOrder(list1:List<T>?, list2:List<T>?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return list1.size == list2.size && list1.toSet() == list2.toSet()
-  }
-
-  fun equalAuthors(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalsIgnoreOrder(list1.authors, list2.authors)
-  }
-
-  override fun feed(): List<Note> {
-    val user = account.userProfile()
-
-    val follows = user.follows
-    val followKeys = synchronized(follows) {
-      follows.map { it.pubkeyHex }
-    }
-    val allowSet = followKeys.plus(user.pubkeyHex).toSet()
-
-    return LocalCache.notes.values
-      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in allowSet }
-      .sortedBy { it.event!!.createdAt }
-      .reversed()
-  }
-
   override fun updateChannelFilters() {
     // gets everthing about the user logged in
-    val newAccountFilter = createAccountFilter()
-
-    if (!equalAuthors(newAccountFilter, accountChannel.filter)) {
-      accountChannel.filter = newAccountFilter
-    }
+    accountChannel.typedFilters = listOf(
+      createAccountMetadataFilter(),
+      createAccountContactListFilter(),
+      createNotificationFilter(),
+      createAccountReportsFilter()
+    ).ifEmpty { null }
   }
 }

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

@@ -1,31 +1,37 @@
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 
-object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {
-  var channel: com.vitorpamplona.amethyst.model.Channel? = null
+object NostrChannelDataSource: NostrDataSource("ChatroomFeed") {
+  var channel: Channel? = null
 
   fun loadMessagesBetween(channelId: String) {
-    channel = LocalCache.channels[channelId]
+    channel = LocalCache.getOrCreateChannel(channelId)
+    resetFilters()
   }
 
-  fun createMessagesToChannelFilter() = JsonFilter(
-    kinds = listOf(ChannelMessageEvent.kind),
-    tags = mapOf("e" to listOf(channel?.idHex).filterNotNull()),
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
-  )
+  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
+  }
 
   val messagesChannel = requestNewChannel()
 
-  // returns the last Note of each user.
-  override fun feed(): List<Note> {
-    return channel?.notes?.values?.sortedBy { it.event!!.createdAt } ?: emptyList()
-  }
-
   override fun updateChannelFilters() {
-    messagesChannel.filter = createMessagesToChannelFilter()
+    messagesChannel.typedFilters = listOfNotNull(createMessagesToChannelFilter()).ifEmpty { null }
   }
 }

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

@@ -1,45 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.User
-import nostr.postr.JsonFilter
-import nostr.postr.events.PrivateDmEvent
-
-object NostrChatRoomDataSource: NostrDataSource<Note>("ChatroomFeed") {
-  lateinit var account: Account
-  var withUser: User? = null
-
-  fun loadMessagesBetween(accountIn: Account, userId: String) {
-    account = accountIn
-    withUser = LocalCache.users[userId]
-  }
-
-  fun createMessagesToMeFilter() = JsonFilter(
-    kinds = listOf(PrivateDmEvent.kind),
-    authors = withUser?.let { listOf(it.pubkeyHex) },
-    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
-  )
-
-  fun createMessagesFromMeFilter() = JsonFilter(
-    kinds = listOf(PrivateDmEvent.kind),
-    authors = listOf(account.userProfile().pubkeyHex),
-    tags = withUser?.let { mapOf("p" to listOf(it.pubkeyHex)) }
-  )
-
-  val incomingChannel = requestNewChannel()
-  val outgoingChannel = requestNewChannel()
-
-  // returns the last Note of each user.
-  override fun feed(): List<Note> {
-    val messages = account.userProfile().messages[withUser]
-
-    return messages?.sortedBy { it.event!!.createdAt } ?: emptyList()
-  }
-
-  override fun updateChannelFilters() {
-    incomingChannel.filter = createMessagesToMeFilter()
-    outgoingChannel.filter = createMessagesFromMeFilter()
-  }
-}

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

@@ -0,0 +1,60 @@
+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.relays.FeedType
+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
+
+  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 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
+    }
+  }
+
+  val inandoutChannel = requestNewChannel()
+
+  override fun updateChannelFilters() {
+    inandoutChannel.typedFilters = listOfNotNull(createMessagesToMeFilter(), createMessagesFromMeFilter()).ifEmpty { null }
+  }
+}

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

@@ -1,70 +1,88 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.Note
 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.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.events.PrivateDmEvent
 
-object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
+object NostrChatroomListDataSource: NostrDataSource("MailBoxFeed") {
   lateinit var account: Account
 
-  fun createMessagesToMeFilter() = JsonFilter(
-    kinds = listOf(PrivateDmEvent.kind),
-    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+  fun createMessagesToMeFilter() = TypedFilter(
+    types = setOf(FeedType.PRIVATE_DMS),
+      filter = JsonFilter(
+      kinds = listOf(PrivateDmEvent.kind),
+      tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+    )
   )
 
-  fun createMessagesFromMeFilter() = JsonFilter(
-    kinds = listOf(PrivateDmEvent.kind),
-    authors = listOf(account.userProfile().pubkeyHex)
+  fun createMessagesFromMeFilter() = TypedFilter(
+    types = setOf(FeedType.PRIVATE_DMS),
+      filter = JsonFilter(
+      kinds = listOf(PrivateDmEvent.kind),
+      authors = listOf(account.userProfile().pubkeyHex)
+    )
   )
 
-  fun createMyChannelsFilter() = JsonFilter(
-    kinds = listOf(ChannelCreateEvent.kind),
-    ids = account.followingChannels.toList()
+  fun createChannelsCreatedbyMeFilter() = TypedFilter(
+    types = setOf(FeedType.PUBLIC_CHATS),
+      filter = JsonFilter(
+      kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind),
+      authors = listOf(account.userProfile().pubkeyHex)
+    )
   )
 
-  fun createMyChannelsInfoFilter() = JsonFilter(
-    kinds = listOf(ChannelMetadataEvent.kind),
-    tags = mapOf("e" to account.followingChannels.toList())
+  fun createMyChannelsFilter() = TypedFilter(
+    types = FeedType.values().toSet(), // Metadata comes from any relay
+      filter = JsonFilter(
+      kinds = listOf(ChannelCreateEvent.kind),
+      ids = account.followingChannels.toList()
+    )
   )
 
-  fun createMessagesToMyChannelsFilter() = JsonFilter(
-    kinds = listOf(ChannelMessageEvent.kind),
-    tags = mapOf("e" to account.followingChannels.toList()),
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
-  )
-
-  val incomingChannel = requestNewChannel()
-  val outgoingChannel = requestNewChannel()
-
-  val myChannelsChannel = requestNewChannel()
-  val myChannelsInfoChannel = requestNewChannel()
-  val myChannelsMessagesChannel = requestNewChannel()
-
-  // returns the last Note of each user.
-  override fun feed(): List<Note> {
-    val messages = account.userProfile().messages
-    val messagingWith = messages.keys().toList()
-
-    val privateMessages = messagingWith.mapNotNull {
-      messages[it]?.sortedBy { it.event?.createdAt }?.lastOrNull { it.event != null }
+  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
+        )
+      )
     }
-
-    val publicChannels = account.followingChannels().map {
-      it.notes.values.sortedBy { it.event?.createdAt }.lastOrNull { it.event != null }
-    }
-
-    return (privateMessages + publicChannels).filterNotNull().sortedBy { it.event?.createdAt }.reversed()
   }
 
+  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() {
-    incomingChannel.filter = createMessagesToMeFilter()
-    outgoingChannel.filter = createMessagesFromMeFilter()
-    myChannelsChannel.filter = createMyChannelsFilter()
-    myChannelsInfoChannel.filter = createMyChannelsInfoFilter()
-    myChannelsMessagesChannel.filter = createMessagesToMyChannelsFilter()
+    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

@@ -6,11 +6,26 @@ 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.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
+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.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Relay
-import java.util.Collections
+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
+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
@@ -19,32 +34,69 @@ import nostr.postr.events.PrivateDmEvent
 import nostr.postr.events.RecommendRelayEvent
 import nostr.postr.events.TextNoteEvent
 
-abstract class NostrDataSource<T>(val debugName: String) {
-  private val channels = Collections.synchronizedSet(mutableSetOf<Channel>())
-  private val channelIds =  Collections.synchronizedSet(mutableSetOf<String>())
+abstract class NostrDataSource(val debugName: String) {
+  private var subscriptions = mapOf<String, Subscription>()
+  data class Counter(var counter:Int)
+
+  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 channelIds) {
-        when (event) {
-          is MetadataEvent -> LocalCache.consume(event)
-          is TextNoteEvent -> LocalCache.consume(event)
-          is RecommendRelayEvent -> LocalCache.consume(event)
-          is ContactListEvent -> LocalCache.consume(event)
-          is PrivateDmEvent -> LocalCache.consume(event)
-          is DeletionEvent -> LocalCache.consume(event)
-          is RepostEvent -> LocalCache.consume(event)
-          is ReactionEvent -> LocalCache.consume(event)
-          else -> when (event.kind) {
-            RepostEvent.kind -> LocalCache.consume(RepostEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-            ReactionEvent.kind -> LocalCache.consume(ReactionEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+      if (subscriptionId in subscriptions.keys) {
+        if (!event.hasValidSignature()) return
 
-            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))
-            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))
+        val key = "${debugName} ${subscriptionId} ${event.kind}"
+        val keyValue = eventCounter.get(key)
+        if (keyValue != null) {
+          keyValue.counter++
+        } else {
+          eventCounter = eventCounter + Pair(key, Counter(1))
+        }
+
+        try {
+          when (event) {
+            is MetadataEvent -> LocalCache.consume(event)
+            is TextNoteEvent -> LocalCache.consume(event, relay)
+            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) {
+              RepostEvent.kind -> {
+                val repostEvent = RepostEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig)
+
+                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)
+
+              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)
+            }
           }
+        } catch (e: Exception) {
+          e.printStackTrace()
         }
       }
     }
@@ -53,7 +105,7 @@ abstract class NostrDataSource<T>(val debugName: String) {
       //Log.e("ERROR", "Relay ${relay.url}: ${error.message}")
     }
 
-    override fun onRelayStateChange(type: Relay.Type, relay: Relay) {
+    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."
@@ -61,11 +113,10 @@ abstract class NostrDataSource<T>(val debugName: String) {
       //  Relay.Type.EOSE -> "sent all events it had stored."
       //}}")
 
-      /*
-      if (type == Relay.Type.EOSE) {
-        // One everything is loaded, if new users are found, update filters
-        resetFilters()
-      }*/
+      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) {
@@ -78,66 +129,90 @@ abstract class NostrDataSource<T>(val debugName: String) {
   }
 
   open fun start() {
+    println("DataSource: ${this.javaClass.simpleName} Start")
     resetFilters()
   }
 
   open fun stop() {
-    channels.forEach { channel ->
-      if (channel.filter != null) // if it is active, close
-        Client.close(channel.id)
+    println("DataSource: ${this.javaClass.simpleName} Stop")
+    subscriptions.values.forEach { channel ->
+      Client.close(channel.id)
+      channel.typedFilters = null
     }
   }
 
-  fun loadTop(): List<T> {
-    return feed().take(100)
+  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 requestNewChannel(): Channel {
-    val newChannel = Channel()
-    channels.add(newChannel)
-    channelIds.add(newChannel.id)
-    return newChannel
+  fun dismissChannel(subscription: Subscription) {
+    Client.close(subscription.id)
+    subscriptions = subscriptions.minus(subscription.id)
   }
 
-  fun dismissChannel(channel: Channel) {
-    Client.close(channel.id)
-    channels.remove(channel)
-    channelIds.remove(channel.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 activeChannels = channels.filter { it.filter != null }
+    val activeSubscriptions = subscriptions.values.filter { it.typedFilters != null }
     // saves the current content to only update if it changes
-    val currentFilter = activeChannels.associate { it.id to it.filter!!.toJson() }
+    val currentFilters = activeSubscriptions.associate { it.id to it.toJson()  }
 
     updateChannelFilters()
 
     // Makes sure to only send an updated filter when it actually changes.
-    channels.forEach { channel ->
-      val channelsNewFilter = channel.filter
+    subscriptions.values.forEach { updatedSubscription ->
+      val updatedSubscriotionNewFilters = updatedSubscription.typedFilters
 
-      if (channel in activeChannels) {
-        if (channelsNewFilter == null) {
+      if (updatedSubscription.id in currentFilters.keys) {
+        if (updatedSubscriotionNewFilters == null) {
           // was active and is not active anymore, just close.
-          Client.close(channel.id)
+          Client.close(updatedSubscription.id)
         } else {
           // was active and is still active, check if it has changed.
-          if (channelsNewFilter.toJson() != currentFilter[channel.id]) {
-            Client.close(channel.id)
-            Client.sendFilter(channel.id, mutableListOf(channelsNewFilter))
+          if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
+            Client.close(updatedSubscription.id)
+            Client.sendFilter(updatedSubscription.id, updatedSubscriotionNewFilters)
           } else {
             // hasn't changed, does nothing.
-            Client.sendFilterOnlyIfDisconnected(channel.id, mutableListOf(channelsNewFilter))
+            Client.sendFilterOnlyIfDisconnected(updatedSubscription.id, updatedSubscriotionNewFilters)
           }
         }
       } else {
-        if (channelsNewFilter == null) {
+        if (updatedSubscriotionNewFilters == null) {
           // was not active and is still not active, does nothing
         } else {
           // was not active and becomes active, sends the filter.
-          if (channelsNewFilter.toJson() != currentFilter[channel.id]) {
-            Client.sendFilter(channel.id, mutableListOf(channelsNewFilter))
+          if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
+            Client.sendFilter(updatedSubscription.id, updatedSubscriotionNewFilters)
           }
         }
       }
@@ -145,5 +220,4 @@ abstract class NostrDataSource<T>(val debugName: String) {
   }
 
   abstract fun updateChannelFilters()
-  abstract fun feed(): List<T>
 }

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

@@ -1,48 +1,23 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 
-object NostrGlobalDataSource: NostrDataSource<Note>("GlobalFeed") {
-  val fifteenMinutes = (60*15) // 15 mins
-
-  fun createGlobalFilter() = JsonFilter(
-      kinds = listOf(TextNoteEvent.kind),
-      since = System.currentTimeMillis() / 1000 - fifteenMinutes
+object NostrGlobalDataSource: NostrDataSource("GlobalFeed") {
+  fun createGlobalFilter() = TypedFilter(
+    types = setOf(FeedType.GLOBAL),
+    filter = JsonFilter(
+      kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind),
+      limit = 200
     )
+  )
 
   val globalFeedChannel = requestNewChannel()
 
-  fun equalTime(list1:Long?, list2:Long?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return Math.abs(list1 - list2) < (4*fifteenMinutes)
-  }
-
-  fun equalFilters(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalTime(list1.since, list2.since)
-  }
-
-  override fun feed() = LocalCache.notes.values
-    .filter {
-      it.event is TextNoteEvent && (it.event as TextNoteEvent).replyTos.isEmpty()
-    }
-    .sortedBy { it.event!!.createdAt }
-    .reversed()
-
   override fun updateChannelFilters() {
-    val newFilter = createGlobalFilter()
-
-    if (!equalFilters(newFilter, globalFeedChannel.filter)) {
-      globalFeedChannel.filter = newFilter
-    }
+    globalFeedChannel.typedFilters = listOf(createGlobalFilter()).ifEmpty { null }
   }
 }

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

@@ -1,92 +1,63 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.UserState
-import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
-import nostr.postr.toHex
 
-object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
+object NostrHomeDataSource: NostrDataSource("HomeFeed") {
   lateinit var account: Account
 
   private val cacheListener: (UserState) -> Unit = {
-    resetFilters()
+    invalidateFilters()
   }
 
   override fun start() {
-    if (this::account.isInitialized)
-      account.userProfile().live.observeForever(cacheListener)
+    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)
-      account.userProfile().live.removeObserver(cacheListener)
+    if (this::account.isInitialized) {
+      GlobalScope.launch(Dispatchers.Main) {
+        account.userProfile().live().follows.removeObserver(cacheListener)
+      }
+    }
   }
 
-  fun createFollowAccountsFilter(): JsonFilter? {
-    val follows = account.userProfile().follows ?: emptySet()
+  fun createFollowAccountsFilter(): TypedFilter {
+    val follows = account.userProfile().follows
 
-    val followKeys = synchronized(follows) {
-      follows.map {
-        it.pubkey.toHex().substring(0, 6)
-      }
+    val followKeys = follows.map {
+      it.pubkeyHex.substring(0, 6)
     }
 
     val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
 
-    if (followSet.isEmpty()) return null
-
-    return JsonFilter(
-      kinds = listOf(TextNoteEvent.kind, RepostEvent.kind),
-      authors = followSet,
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
+    return TypedFilter(
+      types = setOf(FeedType.FOLLOWS),
+      filter = JsonFilter(
+        kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
+        authors = followSet,
+        limit = 400
+      )
     )
   }
 
   val followAccountChannel = requestNewChannel()
 
-  fun <T> equalsIgnoreOrder(list1:List<T>?, list2:List<T>?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return list1.size == list2.size && list1.toSet() == list2.toSet()
-  }
-
-  fun equalAuthors(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalsIgnoreOrder(list1.authors, list2.authors)
-  }
-
-  override fun feed(): List<Note> {
-    val user = account.userProfile()
-
-    val follows = user.follows
-    val followKeys = synchronized(follows) {
-      follows.map { it.pubkeyHex }
-    }
-
-    val allowSet = followKeys.plus(user.pubkeyHex).toSet()
-
-    return LocalCache.notes.values
-      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in allowSet }
-      .sortedBy { it.event!!.createdAt }
-      .reversed()
-  }
-
   override fun updateChannelFilters() {
-    val newFollowAccountsFilter = createFollowAccountsFilter()
-
-    if (!equalAuthors(newFollowAccountsFilter, followAccountChannel.filter)) {
-      followAccountChannel.filter = newFollowAccountsFilter
-    }
+    followAccountChannel.typedFilters = listOf(createFollowAccountsFilter()).ifEmpty { null }
   }
 }

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

@@ -1,50 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.Note
-import nostr.postr.JsonFilter
-
-object NostrNotificationDataSource: NostrDataSource<Note>("GlobalFeed") {
-  lateinit var account: Account
-
-  fun createGlobalFilter() = JsonFilter(
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 7 days
-    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex).filterNotNull())
-  )
-
-  val notificationChannel = requestNewChannel()
-
-  fun <T> equalsIgnoreOrder(list1:List<T>?, list2:List<T>?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return list1.size == list2.size && list1.toSet() == list2.toSet()
-  }
-
-  fun equalFilters(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalsIgnoreOrder(list1.tags?.get("p"), list2.tags?.get("p"))
-        && equalsIgnoreOrder(list1.tags?.get("e"), list2.tags?.get("e"))
-  }
-
-  override fun feed(): List<Note> {
-    val set = account.userProfile().taggedPosts
-    val filtered = synchronized(set) {
-      set.filter { it.event != null }
-    }
-
-    return filtered.sortedBy { it.event!!.createdAt }.reversed()
-  }
-
-  override fun updateChannelFilters() {
-    val newFilter = createGlobalFilter()
-
-    if (!equalFilters(newFilter, notificationChannel.filter)) {
-      notificationChannel.filter = newFilter
-    }
-  }
-}

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

@@ -0,0 +1,62 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.decodePublicKey
+import com.vitorpamplona.amethyst.service.relays.FeedType
+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
+
+  private fun createAnythingWithIDFilter(): List<TypedFilter>? {
+    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)
+        )
+      )
+    )
+  }
+
+  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.
+    }
+  }
+
+  fun clear() {
+    hexToWatch = null
+  }
+}

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

@@ -0,0 +1,69 @@
+package com.vitorpamplona.amethyst.service
+
+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.TypedFilter
+import nostr.postr.JsonFilter
+
+object NostrSingleChannelDataSource: NostrDataSource("SingleChannelFeed") {
+  private var channelsToWatch = setOf<String>()
+
+  private fun createRepliesAndReactionsFilter(): TypedFilter? {
+    val reactionsToWatch = channelsToWatch.map { it }
+
+    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)
+      )
+    )
+  }
+
+  fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
+    val directEventsToLoad = channelsToWatch
+      .map { LocalCache.getOrCreateChannel(it) }
+      .filter { it.notes.isEmpty() }
+
+    val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
+
+    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()
+      )
+    )
+  }
+
+  val singleChannelChannel = requestNewChannel()
+
+  override fun updateChannelFilters() {
+    val reactions = createRepliesAndReactionsFilter()
+    val missing = createLoadEventsIfNotLoadedFilter()
+
+    singleChannelChannel.typedFilters = listOfNotNull(reactions, missing).ifEmpty { null }
+  }
+
+  fun add(eventId: String) {
+    channelsToWatch = channelsToWatch.plus(eventId)
+    invalidateFilters()
+  }
+
+  fun remove(eventId: String) {
+    channelsToWatch = channelsToWatch.minus(eventId)
+    invalidateFilters()
+  }
+}

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

@@ -1,76 +1,106 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
+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.LnZapRequestEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
-import java.util.Collections
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import java.util.Date
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 
-object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
-  private var eventsToWatch = listOf<String>()
+object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
+  private var eventsToWatch = setOf<String>()
 
-  private fun createRepliesAndReactionsFilter(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it.substring(0, 8) }
+  private fun createRepliesAndReactionsFilter(): List<TypedFilter>? {
+    val reactionsToWatch = eventsToWatch.map { LocalCache.getOrCreateNote(it) }
 
     if (reactionsToWatch.isEmpty()) {
       return null
     }
 
-    // downloads all the reactions to a given event.
-    return JsonFilter(
-      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
-      tags = mapOf("e" to reactionsToWatch)
-    )
+    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, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind
+          ),
+          tags = mapOf("e" to listOf(it.idHex)),
+          since = it.lastReactionsDownloadTime
+        )
+      )
+    }
   }
 
-  fun createLoadEventsIfNotLoadedFilter(): JsonFilter? {
+  fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter>? {
     val directEventsToLoad = eventsToWatch
-      .mapNotNull { LocalCache.notes[it] }
+      .map { LocalCache.getOrCreateNote(it) }
       .filter { it.event == null }
 
     val threadingEventsToLoad = eventsToWatch
-      .mapNotNull { LocalCache.notes[it] }
+      .map { LocalCache.getOrCreateNote(it) }
       .mapNotNull { it.replyTo }
       .flatten()
       .filter { it.event == null }
 
     val interestedEvents =
       (directEventsToLoad + threadingEventsToLoad)
-      .map { it.idHex.substring(0, 8) }
+      .map { it.idHex }.toSet()
 
     if (interestedEvents.isEmpty()) {
       return null
     }
 
     // downloads linked events to this event.
-    return JsonFilter(
-      ids = interestedEvents
+    return listOf(
+      TypedFilter(
+        types = FeedType.values().toSet(),
+        filter = JsonFilter(
+          kinds = listOf(
+            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind,
+            ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind
+          ),
+          ids = interestedEvents.toList()
+        )
+      )
     )
   }
 
-  val repliesAndReactionsChannel = requestNewChannel()
-  val loadEventsChannel = requestNewChannel()
-
-  override fun feed(): List<Note> {
-    return eventsToWatch.map {
-      LocalCache.notes[it]
-    }.filterNotNull()
+  val singleEventChannel = requestNewChannel { time ->
+    eventsToWatch.forEach {
+      LocalCache.getOrCreateNote(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()
   }
 
   override fun updateChannelFilters() {
-    repliesAndReactionsChannel.filter = createRepliesAndReactionsFilter()
-    loadEventsChannel.filter = createLoadEventsIfNotLoadedFilter()
+    val reactions = createRepliesAndReactionsFilter()
+    val missing = createLoadEventsIfNotLoadedFilter()
+
+    singleEventChannel.typedFilters = listOfNotNull(reactions, missing).flatten().ifEmpty { null }
   }
 
   fun add(eventId: String) {
     eventsToWatch = eventsToWatch.plus(eventId)
-    resetFilters()
+    invalidateFilters()
   }
 
   fun remove(eventId: String) {
     eventsToWatch = eventsToWatch.minus(eventId)
-    resetFilters()
+    invalidateFilters()
   }
 }

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

@@ -1,42 +1,65 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import java.util.Collections
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.ReportEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.events.MetadataEvent
 
-object NostrSingleUserDataSource: NostrDataSource<Note>("SingleUserFeed") {
-  var usersToWatch = listOf<String>()
+object NostrSingleUserDataSource: NostrDataSource("SingleUserFeed") {
+  var usersToWatch = setOf<User>()
 
-  fun createUserFilter(): JsonFilter? {
+  fun createUserFilter(): List<TypedFilter>? {
     if (usersToWatch.isEmpty()) return null
 
-    return JsonFilter(
-      kinds = listOf(MetadataEvent.kind),
-      authors = usersToWatch.map { it.substring(0, 8) }
-    )
+    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
+        )
+      )
+    }
   }
 
-  val userChannel = requestNewChannel()
+  fun createUserReportFilter(): List<TypedFilter>? {
+    if (usersToWatch.isEmpty()) return null
 
-  override fun feed(): List<Note> {
     return usersToWatch.map {
-      LocalCache.notes[it]
-    }.filterNotNull()
+      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 userChannelOnce = requestNewChannel()
+
   override fun updateChannelFilters() {
-    userChannel.filter = createUserFilter()
+    userChannel.typedFilters = listOfNotNull(createUserFilter()).flatten().ifEmpty { null }
+    userChannelOnce.typedFilters = listOfNotNull(createUserReportFilter()).flatten().ifEmpty { null }
   }
 
-  fun add(userId: String) {
-    usersToWatch = usersToWatch.plus(userId)
-    resetFilters()
+  fun add(user: User) {
+    usersToWatch = usersToWatch.plus(user)
+    invalidateFilters()
   }
 
-  fun remove(userId: String) {
-    usersToWatch = usersToWatch.minus(userId)
-    resetFilters()
+  fun remove(user: User) {
+    usersToWatch = usersToWatch.minus(user)
+    invalidateFilters()
   }
 }

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

@@ -1,82 +1,43 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import java.util.Collections
+import com.vitorpamplona.amethyst.model.ThreadAssembler
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 
-object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
-  val eventsToWatch = Collections.synchronizedList(mutableListOf<String>())
+object NostrThreadDataSource: NostrDataSource("SingleThreadFeed") {
+  private var eventToWatch: String? = null
 
-  fun createRepliesAndReactionsFilter(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it.substring(0, 8) }
+  fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
+    val threadToLoad = eventToWatch ?: return null
 
-    if (reactionsToWatch.isEmpty()) {
-      return null
-    }
-
-    return JsonFilter(
-      tags = mapOf("e" to reactionsToWatch)
-    )
-  }
-
-  fun createLoadEventsIfNotLoadedFilter(): JsonFilter? {
-    val eventsToLoad = eventsToWatch
-      .map { LocalCache.notes[it] }
-      .filterNotNull()
+    val eventsToLoad = ThreadAssembler().findThreadFor(threadToLoad)
       .filter { it.event == null }
-      .map { it.idHex.substring(0, 8) }
+      .map { it.idHex }
+      .toSet()
+      .ifEmpty { null } ?: return null
 
-    if (eventsToLoad.isEmpty()) {
-      return null
-    }
-
-    return JsonFilter(
-      ids = eventsToLoad
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        ids = eventsToLoad.map { it.substring(0, 8) }
+      )
     )
   }
 
-  val repliesAndReactionsChannel = requestNewChannel()
-  val loadEventsChannel = requestNewChannel()
-
-  override fun feed(): List<Note> {
-    return eventsToWatch.map {
-      LocalCache.notes[it]
-    }.filterNotNull()
+  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() {
-    repliesAndReactionsChannel.filter = createRepliesAndReactionsFilter()
-    loadEventsChannel.filter = createLoadEventsIfNotLoadedFilter()
+    loadEventsChannel.typedFilters = listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
   }
 
-  fun loadThread(noteId: String) {
-    val note = LocalCache.notes[noteId] ?: return
+  fun loadThread(noteId: String?) {
+    eventToWatch = noteId
 
-    val thread = mutableListOf<Note>()
-    val threadSet = mutableSetOf<Note>()
-
-    val threadRoot = note.replyTo?.firstOrNull() ?: note
-
-    loadDown(threadRoot, thread, threadSet)
-
-    // Currently orders by date of each event, descending, at each level of the reply stack
-    val order = compareByDescending<Note> { it.replyLevelSignature() }
-
-    eventsToWatch.clear()
-    eventsToWatch.addAll(thread.sortedWith(order).map { it.idHex })
-
-    resetFilters()
-  }
-
-  fun loadDown(note: Note, thread: MutableList<Note>, threadSet: MutableSet<Note>) {
-    if (note !in threadSet) {
-      thread.add(note)
-      threadSet.add(note)
-
-      note.replies.forEach {
-        loadDown(it, thread, threadSet)
-      }
-    }
+    invalidateFilters()
   }
 }

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

@@ -1,49 +1,90 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+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 nostr.postr.events.TextNoteEvent
 
-object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
+object NostrUserProfileDataSource: NostrDataSource("UserProfileFeed") {
   var user: User? = null
 
-  fun loadUserProfile(userId: String) {
-    user = LocalCache.users[userId]
+  fun loadUserProfile(userId: String?) {
+    if (userId != null) {
+      user = LocalCache.getOrCreateUser(userId)
+    } else {
+      user = null
+    }
+
     resetFilters()
   }
 
-  fun createUserInfoFilter(): JsonFilter {
-    return JsonFilter(
-      kinds = listOf(MetadataEvent.kind),
-      authors = listOf(user!!.pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7)
+  fun createUserInfoFilter() = user?.let {
+    TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(MetadataEvent.kind),
+        authors = listOf(it.pubkeyHex),
+        limit = 1
+      )
     )
   }
 
-  fun createUserPostsFilter(): JsonFilter {
-    return JsonFilter(
-      kinds = listOf(TextNoteEvent.kind),
-      authors = listOf(user!!.pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 4)
+  fun createUserPostsFilter() = user?.let {
+    TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(TextNoteEvent.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 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))
+      )
     )
   }
 
   val userInfoChannel = requestNewChannel()
-  val notesChannel = requestNewChannel()
-
-  override fun feed(): List<Note> {
-    val notes = user?.notes ?: return emptyList()
-    val sortedNotes = synchronized(notes) {
-      notes.sortedBy { it.event?.createdAt }
-    }
-    return sortedNotes.reversed()
-  }
 
   override fun updateChannelFilters() {
-    userInfoChannel.filter = createUserInfoFilter()
-    notesChannel.filter = createUserPostsFilter()
+    userInfoChannel.typedFilters = listOfNotNull(
+      createUserInfoFilter(),
+      createUserPostsFilter(),
+      createFollowFilter(),
+      createFollowersFilter(),
+      createUserReceivedZapsFilter()
+    ).ifEmpty { null }
   }
 }

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

@@ -1,35 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.User
-import nostr.postr.JsonFilter
-import nostr.postr.events.ContactListEvent
-
-object NostrUserProfileFollowersDataSource: NostrDataSource<User>("UserProfileFollowerFeed") {
-  var user: User? = null
-
-  fun loadUserProfile(userId: String) {
-    user = LocalCache.users[userId]
-    resetFilters()
-  }
-
-  fun createFollowersFilter() = JsonFilter(
-    kinds = listOf(ContactListEvent.kind),
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 7 days
-    tags = mapOf("p" to listOf(user!!.pubkeyHex).filterNotNull())
-  )
-
-  val followerChannel = requestNewChannel()
-
-  override fun feed(): List<User> {
-    val followers = user?.followers ?: emptyList()
-
-    return synchronized(followers) {
-      followers.toList()
-    }
-  }
-
-  override fun updateChannelFilters() {
-    followerChannel.filter = createFollowersFilter()
-  }
-}

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

@@ -1,33 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.User
-import nostr.postr.JsonFilter
-import nostr.postr.events.ContactListEvent
-
-object NostrUserProfileFollowsDataSource: NostrDataSource<User>("UserProfileFollowsFeed") {
-  var user: User? = null
-
-  fun loadUserProfile(userId: String) {
-    user = LocalCache.users[userId]
-    resetFilters()
-  }
-
-  fun createFollowFilter(): JsonFilter {
-    return JsonFilter(
-      kinds = listOf(ContactListEvent.kind),
-      authors = listOf(user!!.pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 4 days
-    )
-  }
-
-  val followChannel = requestNewChannel()
-
-  override fun feed(): List<User> {
-    return user?.follows?.toList() ?: emptyList()
-  }
-
-  override fun updateChannelFilters() {
-    followChannel.filter = createFollowFilter()
-  }
-}

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

@@ -0,0 +1,135 @@
+package com.vitorpamplona.amethyst.service.lang
+
+import android.util.LruCache
+import com.google.android.gms.tasks.Task
+import com.google.android.gms.tasks.Tasks
+import com.google.mlkit.nl.languageid.LanguageIdentification
+import com.google.mlkit.nl.translate.TranslateLanguage
+import com.google.mlkit.nl.translate.Translation
+import com.google.mlkit.nl.translate.Translator
+import com.google.mlkit.nl.translate.TranslatorOptions
+import com.linkedin.urls.detection.UrlDetector
+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?
+)
+
+object LanguageTranslatorService {
+  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)
+      }
+
+      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))
+        }
+        ResultOrError(results.joinToString("\n"), source, target, null)
+      }
+    }
+  }
+
+  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
+  }
+
+  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
+  }
+
+  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
+  }
+
+  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

@@ -0,0 +1,163 @@
+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
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import nostr.postr.Bech32
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+
+class LightningAddressResolver {
+  val client = OkHttpClient.Builder().build()
+
+  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")
+          }
+        }
+
+        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")
+                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

@@ -1,4 +1,4 @@
-package com.vitorpamplona.amethyst.lnurl
+package com.vitorpamplona.amethyst.service.lnurl
 
 import java.math.BigDecimal
 import java.util.Locale
@@ -128,7 +128,7 @@ object LnInvoiceUtil {
   }
 
   private fun multiplier(multiplier: String): BigDecimal {
-    return when (multiplier) {
+    return when (multiplier.toLowerCase()) {
       "m" -> BigDecimal("0.001")
       "u" -> BigDecimal("0.000001")
       "n" -> BigDecimal("0.000000001")

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.service.model
 
+import android.util.Log
 import java.util.Date
 import nostr.postr.Utils
 import nostr.postr.events.Event
@@ -16,10 +17,11 @@ class ChannelCreateEvent (
   @Transient val channelInfo: ChannelData
 
   init {
-    try {
-      channelInfo = MetadataEvent.gson.fromJson(content, ChannelData::class.java)
+    channelInfo = try {
+      MetadataEvent.gson.fromJson(content, ChannelData::class.java)
     } catch (e: Exception) {
-      throw Error("can't parse $content", e)
+      Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
+      ChannelData(null, null, null)
     }
   }
 
@@ -27,10 +29,15 @@ class ChannelCreateEvent (
     const val kind = 40
 
     fun create(channelInfo: ChannelData?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelCreateEvent {
-      val content = if (channelInfo != null)
-        gson.toJson(channelInfo)
-      else
+      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>>()

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

@@ -3,7 +3,6 @@ package com.vitorpamplona.amethyst.service.model
 import java.util.Date
 import nostr.postr.Utils
 import nostr.postr.events.Event
-import nostr.postr.toHex
 
 class ChannelHideMessageEvent (
   id: ByteArray,

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

@@ -3,7 +3,6 @@ package com.vitorpamplona.amethyst.service.model
 import java.util.Date
 import nostr.postr.Utils
 import nostr.postr.events.Event
-import nostr.postr.toHex
 
 class ChannelMessageEvent (
   id: ByteArray,
@@ -19,7 +18,7 @@ class ChannelMessageEvent (
 
   init {
     channel = tags.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1) ?: tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
-    replyTos = tags.filter { it.firstOrNull() == "e" && (it.size < 3 || (it.size > 3 && it[3] != "root")) }.mapNotNull { it.getOrNull(1) }
+    replyTos = tags.filter { it.getOrNull(1) != channel }.mapNotNull { it.getOrNull(1) }
     mentions = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
   }
 

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

@@ -1,11 +1,10 @@
 package com.vitorpamplona.amethyst.service.model
 
+import android.util.Log
 import java.util.Date
-import nostr.postr.ContactMetaData
 import nostr.postr.Utils
 import nostr.postr.events.Event
 import nostr.postr.events.MetadataEvent
-import nostr.postr.toHex
 
 class ChannelMetadataEvent (
   id: ByteArray,
@@ -20,24 +19,27 @@ class ChannelMetadataEvent (
 
   init {
     channel = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
-    try {
-      channelInfo = MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)
-    } catch (e: Exception) {
-      throw Error("can't parse $content", e)
-    }
+    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?, originalChannel: ChannelCreateEvent, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMetadataEvent {
-      val content = if (newChannelInfo != null)
-        gson.toJson(newChannelInfo)
-      else
-        ""
+    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", originalChannel.id.toHex(), "", "root") )
+      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

@@ -3,8 +3,6 @@ package com.vitorpamplona.amethyst.service.model
 import java.util.Date
 import nostr.postr.Utils
 import nostr.postr.events.Event
-import nostr.postr.events.MetadataEvent
-import nostr.postr.toHex
 
 class ChannelMuteUserEvent (
   id: ByteArray,

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

@@ -0,0 +1,47 @@
+package com.vitorpamplona.amethyst.service.model
+
+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) {
+
+  @Transient val zappedPost: List<String>
+  @Transient val zappedAuthor: List<String>
+  @Transient val containedPost: Event?
+  @Transient val lnInvoice: String?
+  @Transient val preimage: String?
+  @Transient val amount: BigDecimal?
+
+  init {
+    zappedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    zappedAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+    lnInvoice = tags.filter { it.firstOrNull() == "bolt11" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+    amount = lnInvoice?.let { LnInvoiceUtil.getAmountInSats(lnInvoice) }
+    preimage = tags.filter { it.firstOrNull() == "preimage" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+
+    val description = tags.filter { it.firstOrNull() == "description" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+
+    containedPost = try {
+      if (description == null)
+        null
+      else
+        fromJson(description, Client.lenient)
+    } catch (e: Exception) {
+      null
+    }
+  }
+
+  companion object {
+    const val kind = 9735
+  }
+}

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

@@ -0,0 +1,87 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+class LnZapRequestEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+  @Transient val zappedPost: List<String>
+  @Transient val zappedAuthor: List<String>
+
+  init {
+    zappedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    zappedAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  }
+
+  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)
+      val tags = listOf(
+        listOf("e", originalNote.id.toHex()),
+        listOf("p", originalNote.pubKey.toHex()),
+        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)
+    }
+
+    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)
+    }
+  }
+}
+
+/*
+{
+  "pubkey": "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245",
+  "content": "",
+  "id": "d9cc14d50fcb8c27539aacf776882942c1a11ea4472f8cdec1dea82fab66279d",
+  "created_at": 1674164539,
+  "sig": "77127f636577e9029276be060332ea565deaf89ff215a494ccff16ae3f757065e2bc59b2e8c113dd407917a010b3abd36c8d7ad84c0e3ab7dab3a0b0caa9835d",
+  "kind": 9734,
+  "tags": [
+  [
+    "e",
+    "3624762a1274dd9636e0c552b53086d70bc88c165bc4dc0f9e836a1eaf86c3b8"
+  ],
+  [
+    "p",
+    "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"
+  ],
+  [
+    "relays",
+    "wss://relay.damus.io",
+    "wss://nostr-relay.wlvs.space",
+    "wss://nostr.fmt.wiz.biz",
+    "wss://relay.nostr.bg",
+    "wss://nostr.oxtr.dev",
+    "wss://nostr.v0l.io",
+    "wss://brb.io",
+    "wss://nostr.bitcoiner.social",
+    "ws://monad.jb55.com:8080",
+    "wss://relay.snort.social"
+  ]
+  ]
+}
+*/

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

@@ -0,0 +1,56 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+
+class LongTextNoteEvent(
+    id: ByteArray,
+    pubKey: ByteArray,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    @Transient val replyTos: List<String>
+    @Transient val mentions: List<String>
+
+    @Transient val title: String?
+    @Transient val image: String?
+    @Transient val summary: String?
+    @Transient val publishedAt: Long?
+    @Transient val topics: List<String>
+
+    init {
+        replyTos = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+        mentions = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+        topics = tags.filter { it.firstOrNull() == "t" }.mapNotNull { it.getOrNull(1) }
+        title = tags.filter { it.firstOrNull() == "title" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+        image = tags.filter { it.firstOrNull() == "image" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+        summary = tags.filter { it.firstOrNull() == "summary" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+        publishedAt = try {
+            tags.filter { it.firstOrNull() == "published_at" }.mapNotNull { it.getOrNull(1) }.firstOrNull()?.toLong()
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    companion object {
+        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 tags = mutableListOf<List<String>>()
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
+            val id = generateId(pubKey, createdAt, kind, tags, msg)
+            val sig = Utils.sign(id, privateKey)
+            return LongTextNoteEvent(id, pubKey, createdAt, tags, msg, sig)
+        }
+    }
+}

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

@@ -25,6 +25,10 @@ class ReactionEvent (
   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)
+    }
+
     fun createLike(originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
       return create("+", originalNote, privateKey, createdAt)
     }

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

@@ -0,0 +1,90 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+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) {
+
+  @Transient val reportedPost: List<ReportedKey>
+  @Transient val reportedAuthor: List<ReportedKey>
+
+  init {
+    // 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
+    }
+
+    reportedPost = tags
+      .filter { it.firstOrNull() == "e" && it.getOrNull(1) != null }
+      .map {
+        ReportedKey(
+          it[1],
+          it.getOrNull(2)?.toUpperCase()?.let { it1 -> ReportType.valueOf(it1) }?: reportType
+        )
+      }
+
+    reportedAuthor = tags
+      .filter { it.firstOrNull() == "p" && it.getOrNull(1) != null }
+      .map {
+        ReportedKey(
+          it[1],
+        it.getOrNull(2)?.toUpperCase()?.let { it1 -> ReportType.valueOf(it1) }?: reportType
+        )
+      }
+  }
+
+  companion object {
+    const val kind = 1984
+
+    fun create(reportedPost: Event, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
+      val content = ""
+
+      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)
+      val tags:List<List<String>> = listOf(reportPostTag, reportAuthorTag)
+      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.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,
+  }
+}

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.service.model
 
+import com.vitorpamplona.amethyst.service.relays.Client
 import java.util.Date
 import nostr.postr.Utils
 import nostr.postr.events.Event
@@ -16,17 +17,24 @@ class RepostEvent (
 
   @Transient val boostedPost: List<String>
   @Transient val originalAuthor: List<String>
+  @Transient val containedPost: Event?
 
   init {
     boostedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
     originalAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+    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 = ""
+      val content = boostedPost.toJson()
 
       val replyToPost = listOf("e", boostedPost.id.toHex())
       val replyToAuthor = listOf("p", boostedPost.pubKey.toHex())

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

@@ -1,10 +1,9 @@
 package com.vitorpamplona.amethyst.service.relays
 
-import com.vitorpamplona.amethyst.service.Constants
-import java.util.Collections
 import java.util.UUID
-import java.util.concurrent.ConcurrentHashMap
-import nostr.postr.JsonFilter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import nostr.postr.events.Event
 
 /**
@@ -24,30 +23,44 @@ object Client: RelayPool.Listener {
      **/
     var lenient: Boolean = false
     private var listeners = setOf<Listener>()
-    private var relays = Constants.defaultRelays
-    private val subscriptions = mutableMapOf<String, List<JsonFilter>>()
+    private var relays = Constants.convertDefaultRelays()
+    private var subscriptions = mapOf<String, List<TypedFilter>>()
 
-    fun connect(
-        relays: Array<Relay> = Constants.defaultRelays
-    ) {
+    @Synchronized
+    fun connect(relays: Array<Relay>) {
         RelayPool.register(this)
+        RelayPool.unloadRelays()
         RelayPool.loadRelays(relays.toList())
         this.relays = relays
     }
 
+    fun isSameRelaySetConfig(newRelayConfig: Array<Relay>): Boolean {
+        if (relays.size != newRelayConfig.size) return false
+
+        relays.forEach { oldRelayInfo ->
+            val newRelayInfo = newRelayConfig.find { it.url == oldRelayInfo.url }
+
+            if (newRelayInfo == null) return false
+
+            if (!oldRelayInfo.isSameRelayConfig(newRelayInfo)) return false
+        }
+
+        return true
+    }
+
     fun sendFilter(
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
-        filters: List<JsonFilter> = listOf(JsonFilter())
+        filters: List<TypedFilter> = listOf()
     ) {
-        subscriptions[subscriptionId] = filters
+        subscriptions = subscriptions + Pair(subscriptionId, filters)
         RelayPool.sendFilter(subscriptionId)
     }
 
     fun sendFilterOnlyIfDisconnected(
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
-        filters: List<JsonFilter> = listOf(JsonFilter())
+        filters: List<TypedFilter> = listOf()
     ) {
-        subscriptions[subscriptionId] = filters
+        subscriptions = subscriptions + Pair(subscriptionId, filters)
         RelayPool.sendFilterOnlyIfDisconnected()
     }
 
@@ -55,8 +68,9 @@ object Client: RelayPool.Listener {
         RelayPool.send(signedEvent)
     }
 
-    fun close(subscriptionId: String){
+    fun close(subscriptionId: String) {
         RelayPool.close(subscriptionId)
+        subscriptions = subscriptions.minus(subscriptionId)
     }
 
     fun disconnect() {
@@ -66,19 +80,35 @@ object Client: RelayPool.Listener {
     }
 
     override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
-        listeners.forEach { it.onEvent(event, subscriptionId, relay) }
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onEvent(event, subscriptionId, relay) }
+        }
     }
 
     override fun onError(error: Error, subscriptionId: String, relay: Relay) {
-        listeners.forEach { it.onError(error, subscriptionId, relay) }
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onError(error, subscriptionId, relay) }
+        }
     }
 
-    override fun onRelayStateChange(type: Relay.Type, relay: Relay) {
-        listeners.forEach { it.onRelayStateChange(type, relay) }
+    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.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onRelayStateChange(type, relay, channel) }
+        }
     }
 
     override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
-        listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+        }
     }
 
     fun subscribe(listener: Listener) {
@@ -90,12 +120,10 @@ object Client: RelayPool.Listener {
     }
 
     fun allSubscriptions(): List<String> {
-        return synchronized(subscriptions) {
-            subscriptions.keys.toList()
-        }
+        return subscriptions.keys.toList()
     }
 
-    fun getSubscriptionFilters(subId: String): List<JsonFilter> {
+    fun getSubscriptionFilters(subId: String): List<TypedFilter> {
         return subscriptions[subId] ?: emptyList()
     }
 
@@ -113,7 +141,7 @@ object Client: RelayPool.Listener {
         /**
          * Connected to or disconnected from a relay
          */
-        open fun onRelayStateChange(type: Relay.Type, relay: Relay) = Unit
+        open fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) = Unit
 
         /**
          * When an relay saves or rejects a new event.

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

@@ -0,0 +1,48 @@
+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)
+
+  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),
+
+    // 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),
+  )
+}

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

@@ -0,0 +1,16 @@
+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/Relay.kt

@@ -1,7 +1,8 @@
 package com.vitorpamplona.amethyst.service.relays
 
+import android.util.Log
 import com.google.gson.JsonElement
-import java.util.Collections
+import java.util.Date
 import nostr.postr.events.Event
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -9,14 +10,32 @@ import okhttp3.Response
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
 
+enum class FeedType {
+    FOLLOWS, PUBLIC_CHATS, PRIVATE_DMS, GLOBAL
+}
+
 class Relay(
-    val url: String,
+    var url: String,
     var read: Boolean = true,
-    var write: Boolean = true
+    var write: Boolean = true,
+    var activeTypes: Set<FeedType> = FeedType.values().toSet(),
 ) {
-    private val httpClient = OkHttpClient()
+    private val httpClient = OkHttpClient.Builder()
+        .followRedirects(true)
+        .followSslRedirects(true)
+        .build();
+
     private var listeners = setOf<Listener>()
     private var socket: WebSocket? = null
+    private var isReady: Boolean = false
+
+    var eventDownloadCounter = 0
+    var spamCounter = 0
+    var eventUploadCounter = 0
+    var errorCounter = 0
+    var ping: Long? = null
+
+    var closingTime = 0L
 
     fun register(listener: Listener) {
         listeners = listeners.plus(listener)
@@ -30,106 +49,168 @@ class Relay(
         return socket != null
     }
 
+    @Synchronized
     fun requestAndWatch() {
-        val request = Request.Builder().url(url).build()
-        val listener = object : WebSocketListener() {
+        if (socket != null) return
 
-            override fun onOpen(webSocket: WebSocket, response: Response) {
-                // Sends everything.
-                Client.allSubscriptions().forEach {
-                    sendFilter(requestId = it)
+        try {
+            val request = Request.Builder().header("Origin", "amethyst.social").url(url.trim()).build()
+            val listener = object : WebSocketListener() {
+
+                override fun onOpen(webSocket: WebSocket, response: Response) {
+                    isReady = true
+                    ping = response.receivedResponseAtMillis - response.sentRequestAtMillis
+
+                    // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
+                    // Sends everything.
+                    Client.allSubscriptions().forEach {
+                        sendFilter(requestId = it)
+                    }
+                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT, null) }
                 }
-                listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT) }
-            }
 
-            override fun onMessage(webSocket: WebSocket, text: String) {
-                try {
-                    val msg = Event.gson.fromJson(text, JsonElement::class.java).asJsonArray
-                    val type = msg[0].asString
-                    val channel = msg[1].asString
-                    when (type) {
-                        "EVENT" -> {
-                            val event = Event.fromJson(msg[2], Client.lenient)
-                            listeners.forEach { it.onEvent(this@Relay, channel, event) }
+                override fun onMessage(webSocket: WebSocket, text: String) {
+                    try {
+                        val msg = Event.gson.fromJson(text, JsonElement::class.java).asJsonArray
+                        val type = msg[0].asString
+                        val channel = msg[1].asString
+                        when (type) {
+                            "EVENT" -> {
+                                //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")
+                                it.onRelayStateChange(this@Relay, Type.EOSE, channel)
+                            }
+                            "NOTICE" -> listeners.forEach {
+                                //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")
+                                it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
+                            }
+                            else -> listeners.forEach {
+                                //Log.w("Relay", "Relay something else $url, $channel")
+                                it.onError(
+                                    this@Relay,
+                                    channel,
+                                    Error("Unknown type $type on channel $channel. Msg was $text")
+                                )
+                            }
                         }
-                        "EOSE" -> listeners.forEach {
-                            it.onRelayStateChange(this@Relay, Type.EOSE)
-                        }
-                        "NOTICE" -> listeners.forEach {
-                            // "channel" being the second string in the string array ...
-                            it.onError(this@Relay, channel, Error("Relay sent notice: $channel"))
-                        }
-                        "OK" -> listeners.forEach {
-                            it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
-                        }
-                        else -> listeners.forEach {
-                            it.onError(
-                                this@Relay,
-                                channel,
-                                Error("Unknown type $type on channel $channel. Msg was $text")
-                            )
+                    } catch (t: Throwable) {
+                        t.printStackTrace()
+                        text.chunked(2000) { chunked ->
+                            listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
                         }
                     }
-                } catch (t: Throwable) {
+                }
+
+                override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+                    listeners.forEach { it.onRelayStateChange(
+                        this@Relay,
+                        Type.DISCONNECTING,
+                        null
+                    ) }
+                }
+
+                override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+                    socket = null
+                    isReady = false
+                    closingTime = Date().time / 1000
+                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT, null) }
+                }
+
+                override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                    errorCounter++
+
+                    socket?.close(1000, "Normal close")
+                    // Failures disconnect the relay.
+                    socket = null
+                    isReady = false
+                    closingTime = Date().time / 1000
+
+                    Log.w("Relay", "Relay onFailure $url, ${response?.message} ${response}")
                     t.printStackTrace()
-                    text.chunked(2000) { chunked ->
-                        listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
+                    listeners.forEach {
+                        it.onError(this@Relay, "", Error("WebSocket Failure. Response: ${response}. Exception: ${t.message}", t))
                     }
                 }
             }
 
-            override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
-                listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECTING) }
-            }
-
-            override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
-                socket = null
-                listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT) }
-            }
-
-            override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
-                t.printStackTrace()
-                listeners.forEach {
-                    it.onError(this@Relay, "", Error("WebSocket Failure. Response: ${response}. Exception: ${t.message}", t))
-                }
-            }
+            socket = httpClient.newWebSocket(request, listener)
+        } catch (e: Exception) {
+            errorCounter++
+            isReady = false
+            closingTime = Date().time / 1000
+            Log.e("Relay", "Relay Invalid $url")
+            e.printStackTrace()
         }
-        socket = httpClient.newWebSocket(request, listener)
     }
 
     fun disconnect() {
         //httpClient.dispatcher.executorService.shutdown()
+        closingTime = Date().time / 1000
         socket?.close(1000, "Normal close")
+        socket = null
+        isReady = false
     }
 
     fun sendFilter(requestId: String) {
-        if (socket == null) {
-            requestAndWatch()
-        } else {
-            val filters = Client.getSubscriptionFilters(requestId)
-            if (filters.isNotEmpty()) {
-                val request = """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]"""
-                //println("FILTERSSENT " + """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]""")
-                socket!!.send(request)
+        if (read) {
+            if (isConnected()) {
+                if (isReady) {
+                    val filters = Client.getSubscriptionFilters(requestId).filter { activeTypes.intersect(it.types).isNotEmpty() }
+                    if (filters.isNotEmpty()) {
+                        val request =
+                            """["REQ","$requestId",${filters.take(10).joinToString(",") { it.filter.toJson() }}]"""
+                        //println("FILTERSSENT ${url} ${request}")
+                        socket?.send(request)
+                    }
+                }
+            } else {
+                // waits 60 seconds to reconnect after disconnected.
+                if (Date().time / 1000 > closingTime + 60) {
+                    // sends all filters after connection is successful.
+                    requestAndWatch()
+                }
             }
         }
     }
 
     fun sendFilterOnlyIfDisconnected() {
         if (socket == null) {
-            requestAndWatch()
+            // waits 60 seconds to reconnect after disconnected.
+            if (Date().time / 1000 > closingTime + 60) {
+                //println("sendfilter Only if Disconnected ${url} ")
+                requestAndWatch()
+            }
         }
     }
 
     fun send(signedEvent: Event) {
-        if (write)
+        if (write) {
             socket?.send("""["EVENT",${signedEvent.toJson()}]""")
+            eventUploadCounter++
+        }
     }
 
     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
+    }
+
     enum class Type {
         // Websocket connected
         CONNECT,
@@ -155,6 +236,6 @@ class Relay(
          *
          * @param type is 0 for disconnect and 1 for connect
          */
-        fun onRelayStateChange(relay: Relay, type: Type)
+        fun onRelayStateChange(relay: Relay, type: Type, channel: String?)
     }
 }

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

@@ -1,14 +1,19 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.service.Constants
-import java.util.Collections
+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 {
+
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+
     private var relays = listOf<Relay>()
     private var listeners = setOf<Listener>()
 
@@ -20,11 +25,15 @@ object RelayPool: Relay.Listener {
         return relays.filter { it.isConnected() }.size
     }
 
-    fun loadRelays(relayList: List<Relay>? = null){
+    fun getRelay(url: String): Relay? {
+        return relays.firstOrNull() { it.url == url }
+    }
+
+    fun loadRelays(relayList: List<Relay>){
         if (!relayList.isNullOrEmpty()){
             relayList.forEach { addRelay(it) }
         } else {
-            Constants.defaultRelays.forEach { addRelay(it) }
+            Constants.convertDefaultRelays().forEach { addRelay(it) }
         }
     }
 
@@ -80,12 +89,11 @@ object RelayPool: Relay.Listener {
 
         fun onError(error: Error, subscriptionId: String, relay: Relay)
 
-        fun onRelayStateChange(type: Relay.Type, relay: Relay)
+        fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?)
 
         fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay)
     }
 
-    @Synchronized
     override fun onEvent(relay: Relay, subscriptionId: String, event: Event) {
         listeners.forEach { it.onEvent(event, subscriptionId, relay) }
     }
@@ -95,8 +103,8 @@ object RelayPool: Relay.Listener {
         refreshObservers()
     }
 
-    override fun onRelayStateChange(relay: Relay, type: Relay.Type) {
-        listeners.forEach { it.onRelayStateChange(type, relay) }
+    override fun onRelayStateChange(relay: Relay, type: Relay.Type, channel: String?) {
+        listeners.forEach { it.onRelayStateChange(type, relay, channel) }
         refreshObservers()
     }
 
@@ -108,7 +116,9 @@ object RelayPool: Relay.Listener {
     val live: RelayPoolLiveData = RelayPoolLiveData(this)
 
     private fun refreshObservers() {
-        live.refresh()
+        scope.launch {
+            live.refresh()
+        }
     }
 }
 

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

@@ -0,0 +1,30 @@
+package com.vitorpamplona.amethyst.service.relays
+
+import com.google.gson.GsonBuilder
+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
+) {
+  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()) } })
+    }
+    return jsonObject
+  }
+}

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

@@ -0,0 +1,55 @@
+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
+) {
+
+  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 typesToJson(types: Set<FeedType>): JsonArray {
+    return JsonArray().apply { types.forEach { add(it.name.toLowerCase()) } }
+  }
+
+  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
+  }
+}

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

@@ -14,27 +14,26 @@ import coil.ImageLoader
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
-import com.vitorpamplona.amethyst.KeyStorage
-import com.vitorpamplona.amethyst.service.NostrAccountDataSource
-import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
-import com.vitorpamplona.amethyst.service.NostrHomeDataSource
-import com.vitorpamplona.amethyst.service.NostrNotificationDataSource
-import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
-import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
-import com.vitorpamplona.amethyst.service.NostrThreadDataSource
-import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
-import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
-import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
+import com.vitorpamplona.amethyst.LocalPreferences
+import com.vitorpamplona.amethyst.ServiceManager
+import com.vitorpamplona.amethyst.service.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 java.util.Locale
 
 class MainActivity : ComponentActivity() {
   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) {
@@ -43,7 +42,9 @@ class MainActivity : ComponentActivity() {
           add(GifDecoder.Factory())
         }
         add(SvgDecoder.Factory())
-      }.build()
+      } //.logger(DebugLogger())
+        .respectCacheHeaders(false)
+        .build()
     }
 
     setContent {
@@ -51,11 +52,11 @@ class MainActivity : ComponentActivity() {
         // A surface container using the 'background' color from the theme
         Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
 
-          val accountViewModel: AccountStateViewModel = viewModel {
-            AccountStateViewModel(KeyStorage().encryptedPreferences(applicationContext))
+          val accountStateViewModel: AccountStateViewModel = viewModel {
+            AccountStateViewModel(LocalPreferences(applicationContext))
           }
 
-          AccountScreen(accountViewModel)
+          AccountScreen(accountStateViewModel, startingPage)
         }
       }
     }
@@ -65,23 +66,24 @@ class MainActivity : ComponentActivity() {
 
   override fun onResume() {
     super.onResume()
-    Client.connect()
+    
+    // Only starts after login
+    ServiceManager.start()
   }
 
   override fun onPause() {
-    NostrAccountDataSource.stop()
-    NostrHomeDataSource.stop()
-    NostrChatroomListDataSource.stop()
-    NostrUserProfileDataSource.stop()
-    NostrUserProfileFollowersDataSource.stop()
-    NostrUserProfileFollowsDataSource.stop()
+    ServiceManager.pause()
 
-    NostrGlobalDataSource.stop()
-    NostrNotificationDataSource.stop()
-    NostrSingleEventDataSource.stop()
-    NostrSingleUserDataSource.stop()
-    NostrThreadDataSource.stop()
-    Client.disconnect()
     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()
+  }
+}

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

@@ -0,0 +1,150 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.content.ContentResolver
+import android.content.ContentValues
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.Environment
+import android.provider.MediaStore
+import androidx.annotation.RequiresApi
+import androidx.core.net.toUri
+import java.io.File
+import com.vitorpamplona.amethyst.R
+import okhttp3.*
+import okio.BufferedSource
+import okio.IOException
+import okio.sink
+
+
+object ImageSaver {
+    /**
+     * Saves the image to the gallery.
+     * May require a storage permission.
+     *
+     * @see PICTURES_SUBDIRECTORY
+     */
+    fun saveImage(
+        url: String,
+        context: Context,
+        onSuccess: () -> Any?,
+        onError: (Throwable) -> Any?,
+    ) {
+        val client = OkHttpClient.Builder().build()
+
+        val request = Request.Builder()
+            .get()
+            .url(url)
+            .build()
+
+        client.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                e.printStackTrace()
+                onError(e)
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                try {
+                    check(response.isSuccessful)
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                        val contentType = response.header("Content-Type")
+                        checkNotNull(contentType) {
+                            context.getString(R.string.can_t_find_out_the_content_type)
+                        }
+
+                        saveContentQ(
+                            displayName = File(url).nameWithoutExtension,
+                            contentType = contentType,
+                            contentSource = response.body.source(),
+                            contentResolver = context.contentResolver,
+                            context = context
+                        )
+                    } else {
+                        saveContentDefault(
+                            fileName = File(url).name,
+                            contentSource = response.body.source(),
+                            context = context,
+                        )
+                    }
+                    onSuccess()
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                    onError(e)
+                }
+            }
+        })
+    }
+
+    @RequiresApi(Build.VERSION_CODES.Q)
+    private fun saveContentQ(
+        displayName: String,
+        contentType: String,
+        contentSource: BufferedSource,
+        contentResolver: ContentResolver,
+        context: Context
+    ) {
+        val contentValues = ContentValues().apply {
+            put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
+            put(MediaStore.MediaColumns.MIME_TYPE, contentType)
+            put(
+                MediaStore.MediaColumns.RELATIVE_PATH,
+                Environment.DIRECTORY_PICTURES + File.separatorChar + PICTURES_SUBDIRECTORY
+            )
+        }
+
+        val uri =
+            contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
+        checkNotNull(uri) {
+            context.getString(R.string.can_t_insert_the_new_content)
+        }
+
+        try {
+            val outputStream = contentResolver.openOutputStream(uri)
+            checkNotNull(outputStream) {
+                context.getString(R.string.can_t_open_the_content_output_stream)
+            }
+
+            outputStream.use {
+                contentSource.readAll(it.sink())
+            }
+        } catch (e: Exception) {
+            contentResolver.delete(uri, null, null)
+            throw e
+        }
+    }
+
+    private fun saveContentDefault(
+        fileName: String,
+        contentSource: BufferedSource,
+        context: Context,
+    ) {
+        val subdirectory = File(
+            Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES),
+            PICTURES_SUBDIRECTORY
+        )
+
+        if (!subdirectory.exists()) {
+            subdirectory.mkdirs()
+        }
+
+        val outputFile = File(subdirectory, fileName)
+
+        outputFile
+            .outputStream()
+            .use {
+                contentSource.readAll(it.sink())
+            }
+
+        // Call the media scanner manually, so the image
+        // appears in the gallery faster.
+        context.sendBroadcast(
+            Intent(
+                Intent.ACTION_MEDIA_SCANNER_SCAN_FILE,
+                outputFile.toUri()
+            )
+        )
+    }
+
+    private const val PICTURES_SUBDIRECTORY = "Amethyst"
+}

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

@@ -1,56 +1,85 @@
 package com.vitorpamplona.amethyst.ui.actions
 
-import android.graphics.Bitmap
+import android.content.ContentResolver
+import android.content.Context
+import android.net.Uri
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.util.UUID
 import okhttp3.Call
 import okhttp3.Callback
+import okhttp3.MediaType
+import com.vitorpamplona.amethyst.R
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.MultipartBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
+import okio.BufferedSink
+import okio.source
 
 object ImageUploader {
-  private fun encodeImage(bitmap: Bitmap): ByteArray {
-    val byteArrayOutPutStream = ByteArrayOutputStream()
-    bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutPutStream)
-    return byteArrayOutPutStream.toByteArray()
-  }
+  fun uploadImage(
+    uri: Uri,
+    contentResolver: ContentResolver,
+    onSuccess: (String) -> Unit,
+    onError: (Throwable) -> Unit,
+    context : Context
+) {
+    val contentType = contentResolver.getType(uri)
 
-  fun uploadImage(bitmap: Bitmap, onSuccess: (String) -> Unit) {
     val client = OkHttpClient.Builder().build()
 
-    val body: RequestBody = MultipartBody.Builder()
+    val requestBody: RequestBody = MultipartBody.Builder()
       .setType(MultipartBody.FORM)
       .addFormDataPart(
         "image",
-        "${UUID.randomUUID()}.png",
-        encodeImage(bitmap).toRequestBody("image/png".toMediaType())
+        "${UUID.randomUUID()}",
+        object : RequestBody() {
+          override fun contentType(): MediaType? =
+            contentType?.toMediaType()
+
+          override fun writeTo(sink: BufferedSink) {
+            val imageInputStream = contentResolver.openInputStream(uri)
+            checkNotNull(imageInputStream) {
+              context.getString(R.string.can_t_open_the_image_input_stream)
+            }
+
+            imageInputStream.source().use(sink::writeAll)
+          }
+        }
       )
       .build()
 
     val request: Request = Request.Builder()
       .url("https://api.imgur.com/3/image")
       .header("Authorization", "Client-ID e6aea87296f3f96")
-      .post(body)
+      .post(requestBody)
       .build()
 
     client.newCall(request).enqueue(object : Callback {
       override fun onResponse(call: Call, response: Response) {
-        response.use {
-          val tree = jacksonObjectMapper().readTree(response.body!!.string())
-          val url = tree.get("data").get("link").asText()
-          onSuccess(url)
+        try {
+          check(response.isSuccessful)
+          response.body.use { body ->
+            val tree = jacksonObjectMapper().readTree(body.string())
+            val url = tree?.get("data")?.get("link")?.asText()
+            checkNotNull(url) {
+              context.getString(R.string.there_must_be_an_uploaded_image_url_in_the_response)
+            }
+
+            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

@@ -0,0 +1,130 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+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.text.KeyboardOptions
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Surface
+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
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
+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(
+        onDismissRequest = { onClose() },
+        properties = DialogProperties(
+            dismissOnClickOutside = false
+        )
+    ) {
+        Surface(
+        ) {
+            Column(
+                modifier = Modifier.padding(10.dp)
+            ) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    CloseButton(onCancel = {
+                        postViewModel.clear()
+                        onClose()
+                    })
+
+                    PostButton(
+                        onPost = {
+                            postViewModel.create(context)
+                            onClose()
+                        },
+                        postViewModel.channelName.value.text.isNotBlank()
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringResource(R.string.channel_name)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.channelName.value,
+                    onValueChange = { postViewModel.channelName.value = it },
+                    placeholder = {
+                        Text(
+                            text = stringResource(R.string.my_awesome_group),
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.Sentences
+                    ),
+                    textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+                )
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringResource(R.string.picture_url)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.channelPicture.value,
+                    onValueChange = { postViewModel.channelPicture.value = it },
+                    placeholder = {
+                        Text(
+                            text = "http://mygroup.com/logo.jpg",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    }
+                )
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringResource(R.string.description)) },
+                    modifier = Modifier.fillMaxWidth().height(100.dp),
+                    value = postViewModel.channelDescription.value,
+                    onValueChange = { postViewModel.channelDescription.value = it },
+                    placeholder = {
+                        Text(
+                            text = stringResource(R.string.about_us),
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.Sentences
+                    ),
+                    textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
+                    maxLines = 10
+
+                )
+            }
+        }
+    }
+
+
+
+}

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

@@ -0,0 +1,54 @@
+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() {
+    private var account: Account? = null
+    private var originalChannel: Channel? = null
+
+    val channelName = mutableStateOf(TextFieldValue())
+    val channelPicture = mutableStateOf(TextFieldValue())
+    val channelDescription = mutableStateOf(TextFieldValue())
+
+
+    fun load(account: Account, channel: Channel?) {
+        this.account = account
+        if (channel != null) {
+            originalChannel = channel
+            channelName.value = TextFieldValue(channel.info.name ?: "")
+            channelPicture.value = TextFieldValue(channel.info.picture ?: "")
+            channelDescription.value = TextFieldValue(channel.info.about ?: "")
+        }
+    }
+
+    fun create(context: Context) {
+        this.account?.let { account ->
+            if (originalChannel == null) {
+                account.sendCreateNewChannel(
+                    channelName.value.text,
+                    channelDescription.value.text,
+                    channelPicture.value.text
+                )
+            } else
+                account.sendChangeChannel(
+                    channelName.value.text,
+                    channelDescription.value.text,
+                    channelPicture.value.text,
+                    originalChannel!!
+                )
+        }
+
+        clear()
+    }
+
+    fun clear() {
+        channelName.value = TextFieldValue()
+        channelPicture.value = TextFieldValue()
+        channelDescription.value = TextFieldValue()
+    }
+}

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

@@ -1,31 +1,18 @@
 package com.vitorpamplona.amethyst.ui.actions
 
+import android.widget.Toast
 import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.Button
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Divider
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -37,205 +24,184 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.input.TransformedText
-import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 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.ui.components.UrlPreview
-import com.vitorpamplona.amethyst.ui.components.VideoView
-import com.vitorpamplona.amethyst.ui.components.imageExtension
-import com.vitorpamplona.amethyst.ui.components.isValidURL
-import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
-import com.vitorpamplona.amethyst.ui.components.videoExtension
+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.note.UserDisplay
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
 import kotlinx.coroutines.delay
 import nostr.postr.events.TextNoteEvent
 
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
-fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account) {
+fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = null, account: Account) {
     val postViewModel: NewPostViewModel = viewModel()
 
-    postViewModel.load(account, baseReplyTo)
-
     val context = LocalContext.current
 
     // initialize focus reference to be able to request focus programmatically
-    val focusRequester = FocusRequester()
+    val focusRequester = remember { FocusRequester() }
     val keyboardController = LocalSoftwareKeyboardController.current
 
+    val scroolState = rememberScrollState()
+
     LaunchedEffect(Unit) {
+        postViewModel.load(account, baseReplyTo, quote)
         delay(100)
         focusRequester.requestFocus()
+
+        postViewModel.imageUploadingError.collect { error ->
+            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+        }
     }
 
     Dialog(
         onDismissRequest = { onClose() },
         properties = DialogProperties(
             usePlatformDefaultWidth = false,
-            dismissOnClickOutside = false
+            dismissOnClickOutside = false,
+            decorFitsSystemWindows = false
         )
     ) {
-        Surface(
-            modifier = Modifier
-                .fillMaxWidth()
-                .fillMaxHeight()
-        ) {
-            Column(
-                modifier = Modifier.padding(10.dp)
-            ) {
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    CloseButton(onCancel = {
-                        postViewModel.cancel()
-                        onClose()
-                    })
-
-                    UploadFromGallery {
-                        postViewModel.upload(it, context)
-                    }
-
-                    PostButton(
-                        onPost = {
-                            postViewModel.sendPost()
-                            onClose()
-                        },
-                        postViewModel.message.text.isNotBlank()
-                    )
-                }
-
-                if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
-                    ReplyInformation(postViewModel.replyTos, postViewModel.mentions, "✖ ") {
-                        postViewModel.removeFromReplyList(it)
-                    }
-                }
-
-                OutlinedTextField(
-                    value = postViewModel.message,
-                    onValueChange = {
-                        postViewModel.updateMessage(it)
-                    },
-                    keyboardOptions = KeyboardOptions.Default.copy(
-                        capitalization = KeyboardCapitalization.Sentences
-                    ),
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .border(
-                            width = 1.dp,
-                            color = MaterialTheme.colors.surface,
-                            shape = RoundedCornerShape(8.dp)
-                        )
-                        .focusRequester(focusRequester)
-                        .onFocusChanged {
-                            if (it.isFocused) {
-                                keyboardController?.show()
-                            }
-                        },
-                    placeholder = {
-                        Text(
-                            text = "What's on your mind?",
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                        )
-                    },
-                    colors = TextFieldDefaults
-                        .outlinedTextFieldColors(
-                            unfocusedBorderColor = Color.Transparent,
-                            focusedBorderColor = Color.Transparent
-                        ),
-                    visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary)
-                )
-
-                val userSuggestions = postViewModel.userSuggestions
-                if (userSuggestions.isNotEmpty()) {
-                    LazyColumn(
-                        contentPadding = PaddingValues(
-                            top = 10.dp,
-                            bottom = 10.dp
-                        )
+        Surface(modifier = Modifier.fillMaxWidth().fillMaxHeight()) {
+            Column(modifier = Modifier.fillMaxWidth().fillMaxHeight()) {
+                Column(modifier = Modifier.padding(10.dp).imePadding().weight(1f)) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically
                     ) {
-                        itemsIndexed(userSuggestions, key = { _, item -> item.pubkeyHex }) { index, item ->
-                            Column(modifier = Modifier.fillMaxWidth().clickable(onClick = {
-                                postViewModel.autocompleteWithUser(item)
-                            })) {
-                                Row(
-                                    modifier = Modifier
-                                        .padding(
-                                            start = 12.dp,
-                                            end = 12.dp,
-                                            top = 10.dp)
-                                ) {
+                        CloseButton(onCancel = {
+                            postViewModel.cancel()
+                            onClose()
+                        })
 
-                                    AsyncImage(
-                                        model = item.profilePicture(),
-                                        contentDescription = "Profile Image",
-                                        modifier = Modifier
-                                            .width(55.dp).height(55.dp)
-                                            .clip(shape = CircleShape)
+                        UploadFromGallery(
+                            isUploading = postViewModel.isUploadingImage,
+                        ) {
+                            postViewModel.upload(it, context)
+                        }
+
+                        PostButton(
+                            onPost = {
+                                postViewModel.sendPost()
+                                onClose()
+                            },
+                            isActive = postViewModel.message.text.isNotBlank()
+                              && !postViewModel.isUploadingImage
+                        )
+                    }
+
+                    Row(
+                        modifier = Modifier.fillMaxWidth().weight(1f)
+                    ) {
+                        Column(modifier = Modifier.fillMaxWidth().verticalScroll(scroolState)) {
+                            if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
+                                ReplyInformation(postViewModel.replyTos, postViewModel.mentions, account, "✖ ") {
+                                    postViewModel.removeFromReplyList(it)
+                                }
+                            }
+
+                            OutlinedTextField(
+                                value = postViewModel.message,
+                                onValueChange = {
+                                    postViewModel.updateMessage(it)
+                                },
+                                keyboardOptions = KeyboardOptions.Default.copy(
+                                    capitalization = KeyboardCapitalization.Sentences
+                                ),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .border(
+                                        width = 1.dp,
+                                        color = MaterialTheme.colors.surface,
+                                        shape = RoundedCornerShape(8.dp)
                                     )
-
-                                    Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
-                                        Row(verticalAlignment = Alignment.CenterVertically) {
-                                            UserDisplay(item)
+                                    .focusRequester(focusRequester)
+                                    .onFocusChanged {
+                                        if (it.isFocused) {
+                                            keyboardController?.show()
                                         }
+                                    },
+                                placeholder = {
+                                    Text(
+                                        text = stringResource(R.string.what_s_on_your_mind),
+                                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                    )
+                                },
+                                colors = TextFieldDefaults
+                                    .outlinedTextFieldColors(
+                                        unfocusedBorderColor = Color.Transparent,
+                                        focusedBorderColor = Color.Transparent
+                                    ),
+                                visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary),
+                                textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+                            )
 
-                                        Text(
-                                            item.info.about?.take(100) ?: "",
-                                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                                        )
+                            val myUrlPreview = postViewModel.urlPreview
+                            if (myUrlPreview != null) {
+                                Row(modifier = Modifier.padding(top = 5.dp)) {
+                                    if (isValidURL(myUrlPreview)) {
+                                        val removedParamsFromUrl =
+                                            myUrlPreview.split("?")[0].toLowerCase()
+                                        if (imageExtension.matcher(removedParamsFromUrl).matches()) {
+                                            AsyncImage(
+                                                model = myUrlPreview,
+                                                contentDescription = myUrlPreview,
+                                                contentScale = ContentScale.FillWidth,
+                                                modifier = Modifier
+                                                    .padding(top = 4.dp)
+                                                    .fillMaxWidth()
+                                                    .clip(shape = RoundedCornerShape(15.dp))
+                                                    .border(
+                                                        1.dp,
+                                                        MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                                                        RoundedCornerShape(15.dp)
+                                                    )
+                                            )
+                                        } else if (videoExtension.matcher(removedParamsFromUrl)
+                                                .matches()
+                                        ) {
+                                            VideoView(myUrlPreview)
+                                        } else {
+                                            UrlPreview(myUrlPreview, myUrlPreview)
+                                        }
+                                    } else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
+                                        UrlPreview("https://$myUrlPreview", myUrlPreview)
                                     }
                                 }
-
-                                Divider(
-                                    modifier = Modifier.padding(top = 10.dp),
-                                    thickness = 0.25.dp
-                                )
                             }
                         }
-                    }
-                }
 
-                val myUrlPreview = postViewModel.urlPreview
-                if (myUrlPreview != null) {
-                    Column(modifier = Modifier.padding(top = 5.dp)) {
-                        if (isValidURL(myUrlPreview)) {
-                            val removedParamsFromUrl = myUrlPreview.split("?")[0].toLowerCase()
-                            if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-                                AsyncImage(
-                                    model = myUrlPreview,
-                                    contentDescription = myUrlPreview,
-                                    contentScale = ContentScale.FillWidth,
-                                    modifier = Modifier
-                                        .padding(top = 4.dp)
-                                        .fillMaxWidth()
-                                        .clip(shape = RoundedCornerShape(15.dp))
-                                        .border(
-                                            1.dp,
-                                            MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-                                            RoundedCornerShape(15.dp)
-                                        )
-                                )
-                            } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
-                                VideoView(myUrlPreview)
-                            } else {
-                                UrlPreview(myUrlPreview, myUrlPreview)
+                    }
+
+                    val userSuggestions = postViewModel.userSuggestions
+                    if (userSuggestions.isNotEmpty()) {
+                        LazyColumn(
+                            contentPadding = PaddingValues(
+                                top = 10.dp
+                            ),
+                            modifier = Modifier.heightIn(0.dp, 300.dp)
+                        ) {
+                            itemsIndexed(
+                                userSuggestions,
+                                key = { _, item -> item.pubkeyHex }) { index, item ->
+                                UserLine(item, account) {
+                                    postViewModel.autocompleteWithUser(item)
+                                }
                             }
-                        } else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
-                            UrlPreview("https://$myUrlPreview", myUrlPreview)
                         }
                     }
                 }
@@ -256,7 +222,7 @@ fun CloseButton(onCancel: () -> Unit) {
                 backgroundColor = Color.Gray
             )
     ) {
-        Text(text = "Cancel", color = Color.White)
+        Text(text = stringResource(R.string.cancel), color = Color.White)
     }
 }
 
@@ -275,6 +241,68 @@ fun PostButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier =
                 backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
             )
     ) {
-        Text(text = "Post", color = Color.White)
+        Text(text = stringResource(R.string.post), color = Color.White)
+    }
+}
+
+@Composable
+fun SaveButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            if (isActive) {
+                onPost()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
+            )
+    ) {
+        Text(text = stringResource(R.string.save), color = Color.White)
+    }
+}
+
+@Composable
+fun CreateButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            if (isActive) {
+                onPost()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
+            )
+    ) {
+        Text(text = stringResource(R.string.create), color = Color.White)
+    }
+}
+
+@Composable
+fun SearchButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            if (isActive) {
+                onPost()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
+            )
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_search),
+            null,
+            modifier = Modifier.size(26.dp),
+            tint = Color.White
+        )
     }
 }

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

@@ -1,117 +1,151 @@
 package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.Context
-import android.graphics.ImageDecoder
 import android.net.Uri
-import android.os.Build
-import android.provider.MediaStore
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.model.decodePublicKey
+import com.vitorpamplona.amethyst.model.parseDirtyWordForKey
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
-import nostr.postr.toNpub
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.launch
 
 class NewPostViewModel: ViewModel() {
     private var account: Account? = null
     private var originalNote: Note? = null
 
     var mentions by mutableStateOf<List<User>?>(null)
-    var replyTos by mutableStateOf<MutableList<Note>?>(null)
+    var replyTos by mutableStateOf<List<Note>?>(null)
 
     var message by mutableStateOf(TextFieldValue(""))
     var urlPreview by mutableStateOf<String?>(null)
+    var isUploadingImage by mutableStateOf(false)
+    val imageUploadingError = MutableSharedFlow<String?>()
 
     var userSuggestions by mutableStateOf<List<User>>(emptyList())
     var userSuggestionAnchor: TextRange? = null
 
-    fun load(account: Account, replyingTo: Note?) {
+    fun load(account: Account, replyingTo: Note?, quote: Note?) {
         originalNote = replyingTo
         replyingTo?.let { replyNote ->
-            this.replyTos = (replyNote.replyTo ?: mutableListOf()).plus(replyNote).toMutableList()
+            this.replyTos = (replyNote.replyTo ?: emptyList()).plus(replyNote)
             replyNote.author?.let { replyUser ->
-                this.mentions = (replyNote.mentions ?: emptyList()).plus(replyUser)
+                val currentMentions = replyNote.mentions ?: emptyList()
+                if (currentMentions.contains(replyUser)) {
+                    this.mentions = currentMentions
+                } else {
+                    this.mentions = currentMentions.plus(replyUser)
+                }
+
             }
         }
+
+        quote?.let {
+            message = TextFieldValue(message.text + "\n\n@${it.idNote()}")
+        }
+
         this.account = account
     }
 
-    fun addUserToMentionsIfNotInAndReturnIndex(user: User): Int {
-        val replyToSize = replyTos?.size ?: 0
+    fun addUserToMentions(user: User) {
+        mentions = if (mentions?.contains(user) == true) mentions else mentions?.plus(user) ?: listOf(user)
+    }
 
-        var myMentions = mentions
-        if (myMentions == null) {
-            mentions = listOf(user)
-            return replyToSize + 0 // position of the user
-        }
+    fun addNoteToReplyTos(note: Note) {
+        note.author?.let { addUserToMentions(it) }
+        replyTos = if (replyTos?.contains(note) == true) replyTos else replyTos?.plus(note) ?: listOf(note)
+    }
 
-        val index = myMentions.indexOf(user)
+    fun tagIndex(user: User): Int {
+        // Postr Events assembles replies before mentions in the tag order
+        return (if (originalNote?.channel != null) 1 else 0) + (replyTos?.size ?: 0) + (mentions?.indexOf(user) ?: 0)
+    }
 
-        if (index >= 0) return replyToSize + index
-
-        myMentions = myMentions.plus(user)
-        mentions = myMentions
-        return replyToSize + myMentions.indexOf(user)
+    fun tagIndex(note: Note): Int {
+        // Postr Events assembles replies before mentions in the tag order
+        return (if (originalNote?.channel != null) 1 else 0) + (replyTos?.indexOf(note) ?: 0)
     }
 
     fun sendPost() {
-        // Moves @npub to mentions
+        // adds all references to mentions and reply tos
+        message.text.split('\n').forEach { paragraph: String ->
+            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))
+                }
+            }
+        }
+
+        // Tags the text in the correct order.
         val newMessage = message.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 results = parseDirtyWordForKey(word)
+                if (results?.type == "npub") {
+                    val user = LocalCache.getOrCreateUser(results.keyHex)
 
-                        val key = decodePublicKey(keyB32.removePrefix("@"))
-                        val user = LocalCache.getOrCreateUser(key)
+                    "#[${tagIndex(user)}]${results.restOfWord}"
+                } else if (results?.type == "note") {
+                    val note = LocalCache.getOrCreateNote(results.keyHex)
 
-                        val index = addUserToMentionsIfNotInAndReturnIndex(user)
-
-                        val newWord = "#[${index}]"
-
-                        newWord + restOfWord
-                    } else {
-                        word
-                    }
-                } catch (e: Exception) {
-                    // if it can't parse the key, don't try to change.
+                    "#[${tagIndex(note)}]${results.restOfWord}"
+                } else {
                     word
                 }
             }.joinToString(" ")
         }.joinToString("\n")
 
-        account?.sendPost(newMessage, originalNote, mentions)
+        if (originalNote?.channel != null) {
+            account?.sendChannelMeesage(newMessage, originalNote!!.channel!!.idHex, originalNote!!, mentions)
+        } else {
+            account?.sendPost(newMessage, replyTos, mentions)
+        }
+
         message = TextFieldValue("")
         urlPreview = null
+        isUploadingImage = false
+        mentions = null
     }
 
     fun upload(it: Uri, context: Context) {
-        val img = if (Build.VERSION.SDK_INT < 28) {
-            MediaStore.Images.Media.getBitmap(context.contentResolver, it)
-        } else {
-            ImageDecoder.decodeBitmap(ImageDecoder.createSource(context.contentResolver, it))
-        }
+        isUploadingImage = true
 
-        img?.let {
-            ImageUploader.uploadImage(img) {
-                message = TextFieldValue(message.text + "\n\n" + it)
+        ImageUploader.uploadImage(
+            uri = it,
+            contentResolver = context.contentResolver,
+            onSuccess = { imageUrl ->
+                isUploadingImage = false
+                message = TextFieldValue(message.text + "\n\n" + imageUrl)
                 urlPreview = findUrlInMessage()
-            }
-        }
+            },
+            onError = {
+                isUploadingImage = false
+                viewModelScope.launch {
+                    imageUploadingError.emit(context.getString(R.string.failed_to_upload_the_image))
+                }
+            },
+            context = context
+        )
     }
 
     fun cancel() {
         message = TextFieldValue("")
         urlPreview = null
+        isUploadingImage = false
+        mentions = null
     }
 
     fun findUrlInMessage(): String? {
@@ -145,7 +179,7 @@ class NewPostViewModel: ViewModel() {
         userSuggestionAnchor?.let {
             val lastWord = message.text.substring(0, it.end).substringAfterLast("\n").substringAfterLast(" ")
             val lastWordStart = it.end - lastWord.length
-            val wordToInsert = "@${item.pubkey.toNpub()} "
+            val wordToInsert = "@${item.pubkeyNpub()} "
 
             message = TextFieldValue(
                 message.text.replaceRange(lastWordStart, it.end, wordToInsert),

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

@@ -0,0 +1,481 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+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.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Cancel
+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.SyncProblem
+import androidx.compose.material.icons.filled.Upload
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+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
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
+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)
+    }
+
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnClickOutside = false
+        )
+    ) {
+        Surface(
+        ) {
+            Column(
+                modifier = Modifier.padding(10.dp)
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    CloseButton(onCancel = {
+                        postViewModel.clear(ctx)
+                        onClose()
+                    })
+
+                    PostButton(
+                        onPost = {
+                            postViewModel.create(ctx)
+                            onClose()
+                        },
+                        true
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                Row(modifier = Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically) {
+                    LazyColumn(
+                        contentPadding = PaddingValues(
+                            top = 10.dp,
+                            bottom = 10.dp
+                        ),
+                    ) {
+                        itemsIndexed(feedState, key = { _, item -> item.url }) { index, item ->
+                            if (index == 0)
+                                ServerConfigHeader()
+                            ServerConfig(item,
+                                onToggleDownload = { postViewModel.toggleDownload(it) },
+                                onToggleUpload = { postViewModel.toggleUpload(it)  },
+
+                                onToggleFollows = { postViewModel.toggleFollows(it) },
+                                onTogglePrivateDMs = { postViewModel.toggleMessages(it)  },
+                                onTogglePublicChats = { postViewModel.togglePublicChats(it) },
+                                onToggleGlobal = { postViewModel.toggleGlobal(it)  },
+
+                                onDelete = { postViewModel.deleteRelay(it) }
+                            )
+                        }
+                    }
+
+                }
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                EditableServerConfig(relayToAdd) {
+                    postViewModel.addRelay(it)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun ServerConfigHeader() {
+    Column(Modifier.fillMaxWidth()) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Column(Modifier.weight(1f)) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Text(
+                        text = stringResource(R.string.relay_address),
+                        modifier = Modifier.weight(1f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
+                    )
+                }
+            }
+
+            Column(Modifier.weight(1.4f)) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Spacer(modifier = Modifier.size(25.dp))
+
+                    Text(
+                        text = stringResource(R.string.posts),
+                        maxLines = 1,
+                        fontSize = 14.sp,
+                        modifier = Modifier.weight(1f),
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                    )
+
+                    Spacer(modifier = Modifier.size(10.dp))
+
+                    Text(
+                        text = stringResource(id = R.string.posts),
+                        maxLines = 1,
+                        fontSize = 14.sp,
+                        modifier = Modifier.weight(1f),
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                    )
+
+                    Spacer(modifier = Modifier.size(10.dp))
+
+                    Text(
+                        text = stringResource(R.string.errors),
+                        maxLines = 1,
+                        fontSize = 14.sp,
+                        modifier = Modifier.weight(1f),
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                    )
+
+                    Spacer(modifier = Modifier.size(5.dp))
+
+                    Text(
+                        text = "Spam",
+                        maxLines = 1,
+                        fontSize = 14.sp,
+                        modifier = Modifier.weight(1f),
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                    )
+
+                    Spacer(modifier = Modifier.size(2.dp))
+                }
+            }
+        }
+
+        Divider(
+            thickness = 0.25.dp
+        )
+    }
+}
+
+@Composable
+fun ServerConfig(
+    item: RelaySetupInfo,
+    onToggleDownload: (RelaySetupInfo) -> Unit,
+    onToggleUpload: (RelaySetupInfo) -> Unit,
+
+    onToggleFollows: (RelaySetupInfo) -> Unit,
+    onTogglePrivateDMs: (RelaySetupInfo) -> Unit,
+    onTogglePublicChats: (RelaySetupInfo) -> Unit,
+    onToggleGlobal: (RelaySetupInfo) -> Unit,
+
+    onDelete: (RelaySetupInfo) -> Unit) {
+    Column(Modifier.fillMaxWidth()) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.padding(vertical = 5.dp)
+        ) {
+            Column() {
+                IconButton(
+                    modifier = Modifier.size(30.dp),
+                    onClick = { onDelete(item) }
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Cancel,
+                        null,
+                        modifier = Modifier
+                            .padding(end = 5.dp)
+                            .size(15.dp),
+                        tint = Color.Red
+                    )
+                }
+            }
+
+            Column(Modifier.weight(1f)) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Text(
+                        text = item.url.removePrefix("wss://"),
+                        modifier = Modifier.weight(1f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
+                    )
+                }
+
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Column(Modifier.weight(1f)) {
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onToggleFollows(item) }
+                            ) {
+                                Icon(
+                                    painterResource(R.drawable.ic_home),
+                                    stringResource(R.string.home_feed),
+                                    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
+                                    )
+                                )
+                            }
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onTogglePrivateDMs(item) }
+                            ) {
+                                Icon(
+                                    painterResource(R.drawable.ic_dm),
+                                    stringResource(R.string.private_message_feed),
+                                    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
+                                    )
+                                )
+                            }
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onTogglePublicChats(item) }
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Default.Groups,
+                                    stringResource(R.string.public_chat_feed),
+                                    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
+                                    )
+                                )
+                            }
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onToggleGlobal(item) }
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Default.Public,
+                                    stringResource(R.string.global_feed),
+                                    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
+                                    )
+                                )
+                            }
+                        }
+                    }
+
+                    Column(Modifier.weight(1.4f)) {
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onToggleDownload(item) }
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Default.Download,
+                                    null,
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
+                                    tint = if (item.read) Color.Green else MaterialTheme.colors.onSurface.copy(
+                                        alpha = 0.32f
+                                    )
+                                )
+                            }
+
+                            Text(
+                                text = "${countToHumanReadable(item.downloadCount)}",
+                                maxLines = 1,
+                                fontSize = 14.sp,
+                                modifier = Modifier.weight(1f),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                            )
+
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onToggleUpload(item) }
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Default.Upload,
+                                    null,
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
+                                    tint = if (item.write) Color.Green else MaterialTheme.colors.onSurface.copy(
+                                        alpha = 0.32f
+                                    )
+                                )
+                            }
+
+                            Text(
+                                text = "${countToHumanReadable(item.uploadCount)}",
+                                maxLines = 1,
+                                fontSize = 14.sp,
+                                modifier = Modifier.weight(1f),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                            )
+
+                            Icon(
+                                imageVector = Icons.Default.SyncProblem,
+                                null,
+                                modifier = Modifier
+                                    .padding(horizontal = 5.dp)
+                                    .size(15.dp),
+                                tint = if (item.errorCount > 0) Color.Yellow else Color.Green
+                            )
+
+                            Text(
+                                text = "${countToHumanReadable(item.errorCount)}",
+                                maxLines = 1,
+                                fontSize = 14.sp,
+                                modifier = Modifier.weight(1f),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                            )
+
+                            Icon(
+                                imageVector = Icons.Default.DeleteSweep,
+                                null,
+                                modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                tint = if (item.spamCount > 0) Color.Yellow else Color.Green
+                            )
+
+                            Text(
+                                text = "${countToHumanReadable(item.spamCount)}",
+                                maxLines = 1,
+                                fontSize = 14.sp,
+                                modifier = Modifier.weight(1f),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+        Divider(
+            thickness = 0.25.dp
+        )
+    }
+}
+
+@Composable
+fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Unit) {
+    var url by remember { mutableStateOf<String>(relayToAdd) }
+    var read by remember { mutableStateOf(true) }
+    var write by remember { mutableStateOf(true) }
+
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        OutlinedTextField(
+            label = { Text(text = stringResource(R.string.add_a_relay)) },
+            modifier =  Modifier.weight(1f),
+            value = url,
+            onValueChange = { url = it },
+            placeholder = {
+                Text(
+                    text = "server.com",
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                    maxLines = 1
+                )
+            },
+            singleLine = true
+        )
+
+        IconButton(onClick = { read = !read }) {
+            Icon(
+                imageVector = Icons.Default.Download,
+                null,
+                modifier = Modifier
+                    .size(35.dp)
+                    .padding(horizontal = 5.dp),
+                tint = if (read) Color.Green else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            )
+        }
+
+        IconButton(onClick = { write = !write }) {
+            Icon(
+                imageVector = Icons.Default.Upload,
+                null,
+                modifier = Modifier
+                    .size(35.dp)
+                    .padding(horizontal = 5.dp),
+                tint = if (write) Color.Green else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            )
+        }
+
+        Button(
+            onClick = {
+                if (url.isNotBlank() && url != "/") {
+                    var addedWSS = if (!url.startsWith("wss://") && !url.startsWith("ws://")) "wss://$url" else url
+                    if (url.endsWith("/")) addedWSS = addedWSS.dropLast(1)
+                    onNewRelay(RelaySetupInfo(addedWSS, read, write, feedTypes = FeedType.values().toSet()))
+                    url = ""
+                    write = true
+                    read = true
+                }
+            },
+            shape = RoundedCornerShape(20.dp),
+            colors = ButtonDefaults
+                .buttonColors(
+                    backgroundColor = if (url.isNotBlank()) MaterialTheme.colors.primary else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+        ) {
+            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"
+    else -> "$counter"
+}

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

@@ -0,0 +1,121 @@
+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.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() {
+    private lateinit var account: Account
+
+    private val _relays = MutableStateFlow<List<RelaySetupInfo>>(emptyList())
+    val relays = _relays.asStateFlow()
+
+    fun load(account: Account, ctx: Context) {
+        this.account = account
+        clear(ctx)
+    }
+
+    fun create(ctx: Context) {
+        relays.let {
+            account.saveRelayList(it.value)
+        }
+
+        clear(ctx)
+    }
+
+    fun clear(ctx: Context) {
+        _relays.update {
+            val relayFile = account.userProfile().relays
+
+            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()
+
+                    val errorCounter = liveRelay?.errorCounter ?: 0
+                    val eventDownloadCounter = liveRelay?.eventDownloadCounter ?: 0
+                    val eventUploadCounter = liveRelay?.eventUploadCounter ?: 0
+                    val spamCounter = liveRelay?.spamCounter ?: 0
+
+                    RelaySetupInfo(it.key, it.value.read, it.value.write, errorCounter, eventDownloadCounter, eventUploadCounter, spamCounter, localInfoFeedTypes)
+                }.sortedBy { it.downloadCount }.reversed()
+            else
+                account.localRelays.map {
+                    val liveRelay = RelayPool.getRelay(it.url)
+
+                    val errorCounter = liveRelay?.errorCounter ?: 0
+                    val eventDownloadCounter = liveRelay?.eventDownloadCounter ?: 0
+                    val eventUploadCounter = liveRelay?.eventUploadCounter ?: 0
+                    val spamCounter = liveRelay?.spamCounter ?: 0
+
+                    RelaySetupInfo(it.url, it.read, it.write, errorCounter, eventDownloadCounter, eventUploadCounter, spamCounter, it.feedTypes)
+                }.sortedBy { it.downloadCount }.reversed()
+        }
+    }
+
+    fun addRelay(relay: RelaySetupInfo) {
+        if (relays.value.any { it.url == relay.url }) return
+
+        _relays.update {
+            it.plus(relay)
+        }
+    }
+
+    fun deleteRelay(relay: RelaySetupInfo) {
+        _relays.update {
+            it.minus(relay)
+        }
+    }
+
+    fun toggleDownload(relay: RelaySetupInfo) {
+        _relays.update {
+            it.updated(relay, relay.copy(read = !relay.read))
+        }
+    }
+
+    fun toggleUpload(relay: RelaySetupInfo) {
+        _relays.update {
+            it.updated(relay, relay.copy(write = !relay.write))
+        }
+    }
+
+    fun toggleFollows(relay: RelaySetupInfo) {
+        val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.FOLLOWS)
+        _relays.update {
+            it.updated(relay, relay.copy(feedTypes = newTypes))
+        }
+    }
+
+    fun toggleMessages(relay: RelaySetupInfo) {
+        val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.PRIVATE_DMS)
+        _relays.update {
+            it.updated(relay, relay.copy(feedTypes = newTypes))
+        }
+    }
+
+    fun togglePublicChats(relay: RelaySetupInfo) {
+        val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.PUBLIC_CHATS)
+        _relays.update {
+            it.updated(relay, relay.copy(feedTypes = newTypes))
+        }
+    }
+
+    fun toggleGlobal(relay: RelaySetupInfo) {
+        val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.GLOBAL)
+        _relays.update {
+            it.updated(relay, relay.copy( feedTypes = newTypes ))
+        }
+    }
+}
+
+fun <T> Iterable<T>.updated(old: T, new: T): List<T> = map { if (it == old) new else it }
+
+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

@@ -0,0 +1,226 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+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.text.KeyboardOptions
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Surface
+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
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+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()
+
+    LaunchedEffect(Unit) {
+        postViewModel.load(account)
+    }
+
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnClickOutside = false
+        )
+    ) {
+        Surface(
+        ) {
+            Column(
+                modifier = Modifier.padding(10.dp)
+            ) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    CloseButton(onCancel = {
+                        postViewModel.clear()
+                        onClose()
+                    })
+
+                    PostButton(
+                        onPost = {
+                            postViewModel.create()
+                            onClose()
+                        },
+                        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 },
+                        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))
+
+                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

@@ -0,0 +1,83 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.node.ObjectNode
+import com.vitorpamplona.amethyst.model.Account
+import java.io.ByteArrayInputStream
+import java.io.StringWriter
+
+class NewUserMetadataViewModel: ViewModel() {
+    private lateinit var account: Account
+
+    val userName = mutableStateOf("")
+    val displayName = mutableStateOf("")
+    val about = mutableStateOf("")
+
+    val picture = mutableStateOf("")
+    val banner = mutableStateOf("")
+
+    val website = mutableStateOf("")
+    val nip05 = mutableStateOf("")
+    val lnAddress = mutableStateOf("")
+    val lnURL = mutableStateOf("")
+
+    fun load(account: Account) {
+        this.account = account
+
+        account.userProfile().let {
+            userName.value = it.bestUsername() ?: ""
+            displayName.value = it.bestDisplayName() ?: ""
+            about.value = it.info?.about ?: ""
+            picture.value = it.info?.picture ?: ""
+            banner.value = it.info?.banner ?: ""
+            website.value = it.info?.website ?: ""
+            nip05.value = it.info?.nip05 ?: ""
+            lnAddress.value = it.info?.lud16 ?: ""
+            lnURL.value = it.info?.lud06 ?: ""
+        }
+    }
+
+    fun create() {
+        // Tries to not delete any existing attribute that we do not work with.
+        val latest = account.userProfile().info?.latestMetadata
+        val currentJson = if (latest != null) {
+            ObjectMapper().readTree(
+                ByteArrayInputStream(latest.content.toByteArray(Charsets.UTF_8))
+            ) as ObjectNode
+        } else {
+            ObjectMapper().createObjectNode()
+        }
+        currentJson.put("name", userName.value.trim())
+        currentJson.put("username", userName.value.trim())
+        currentJson.put("display_name", displayName.value.trim())
+        currentJson.put("displayName", displayName.value.trim())
+        currentJson.put("picture", picture.value.trim())
+        currentJson.put("banner", banner.value.trim())
+        currentJson.put("website", website.value.trim())
+        currentJson.put("about", about.value.trim())
+        currentJson.put("nip05", nip05.value.trim())
+        currentJson.put("lud16", lnAddress.value.trim())
+        currentJson.put("lud06", lnURL.value.trim())
+
+        val writer = StringWriter()
+        ObjectMapper().writeValue(writer, currentJson)
+
+        account.sendNewUserMetadata(writer.buffer.toString())
+
+        clear()
+    }
+
+    fun clear() {
+        userName.value = ""
+        displayName.value = ""
+        about.value = ""
+        picture.value = ""
+        banner.value = ""
+        website.value = ""
+        nip05.value = ""
+        lnAddress.value = ""
+        lnURL.value = ""
+    }
+}

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

@@ -0,0 +1,86 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.Manifest
+import android.os.Build
+import android.widget.Toast
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+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 kotlinx.coroutines.launch
+
+/**
+ * A button to save the remote image to the gallery.
+ * May require a storage permission.
+ *
+ * @param url URL of the image
+ */
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun SaveToGallery(url: String) {
+    val localContext = LocalContext.current
+    val scope = rememberCoroutineScope()
+
+
+    fun saveImage() {
+        ImageSaver.saveImage(
+            context = localContext,
+            url = url,
+            onSuccess = {
+                scope.launch {
+                    Toast.makeText(
+                        localContext,
+                        localContext.getString(R.string.image_saved_to_the_gallery),
+                        Toast.LENGTH_SHORT
+                    )
+                        .show()
+                }
+            },
+            onError = {
+                scope.launch {
+                    Toast.makeText(
+                        localContext,
+                        localContext.getString(R.string.failed_to_save_the_image),
+                        Toast.LENGTH_SHORT
+                    )
+                        .show()
+                }
+            }
+        )
+    }
+
+    val writeStoragePermissionState = rememberPermissionState(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE
+    ) { isGranted ->
+        if (isGranted) {
+            saveImage()
+        }
+    }
+
+    Button(
+        onClick = {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q || writeStoragePermissionState.status.isGranted) {
+                saveImage()
+            } else {
+                writeStoragePermissionState.launchPermissionRequest()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = Color.Gray
+            )
+    ) {
+        Text(text = stringResource(id = R.string.save), color = Color.White)
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
 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
@@ -8,25 +9,30 @@ 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.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 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
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
-fun UploadFromGallery(onImageChosen: (Uri) -> Unit) {
-    val cameraPermissionState = rememberPermissionState(
-        android.Manifest.permission.READ_MEDIA_IMAGES
-    )
+fun UploadFromGallery(
+    isUploading: Boolean,
+    onImageChosen: (Uri) -> Unit,
+) {
+    val cameraPermissionState =
+        rememberPermissionState(
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                android.Manifest.permission.READ_MEDIA_IMAGES
+            } else {
+                android.Manifest.permission.READ_EXTERNAL_STORAGE
+            }
+        )
 
     if (cameraPermissionState.status.isGranted) {
         var showGallerySelect by remember { mutableStateOf(false) }
@@ -44,18 +50,30 @@ fun UploadFromGallery(onImageChosen: (Uri) -> Unit) {
                     modifier = Modifier
                         .align(Alignment.TopCenter)
                         .padding(4.dp),
+                    enabled = !isUploading,
                     onClick = {
                         showGallerySelect = true
                     }
                 ) {
-                    Text("Add Image from Gallery")
+                    if (!isUploading) {
+                        Text(stringResource(R.string.upload_image))
+                    } else {
+                        Text(stringResource(R.string.uploading))
+                    }
                 }
             }
         }
     } else {
         Column {
-            Button(onClick = { cameraPermissionState.launchPermissionRequest() }) {
-                Text("Add Image from Gallery")
+            Button(
+                onClick = { cameraPermissionState.launchPermissionRequest() },
+                enabled = !isUploading,
+            ) {
+                if (!isUploading) {
+                    Text(stringResource(R.string.upload_image))
+                } else {
+                    Text(stringResource(R.string.uploading))
+                }
             }
         }
     }

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

@@ -12,6 +12,7 @@ import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextDecoration
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.decodePublicKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import kotlin.math.roundToInt
 
 data class RangesChanges(val original: TextRange, val modified: TextRange)
@@ -43,7 +44,7 @@ fun buildAnnotatedStringWithUrlHighlighting(text: AnnotatedString, color: Color)
                 val endIndex = startIndex + keyB32.length
 
                 val key = decodePublicKey(keyB32.removePrefix("@"))
-                val user = LocalCache.getOrCreateUser(key)
+                val user = LocalCache.getOrCreateUser(key.toHexKey())
 
                 val newWord = "@${user.toBestDisplayName()}"
                 val startNew = builderAfter.toString().length

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

@@ -0,0 +1,48 @@
+package com.vitorpamplona.amethyst.buttons
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedButton
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.ui.actions.NewChannelView
+
+@Composable
+fun NewChannelButton(account: Account) {
+    var wantsToPost by remember {
+        mutableStateOf(false)
+    }
+
+    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),
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Add,
+            contentDescription = stringResource(R.string.new_channel),
+            modifier = Modifier.size(26.dp),
+            tint = Color.White
+        )
+    }
+}

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

@@ -0,0 +1,84 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.DefaultAlpha
+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
+
+    // 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"
+  }
+}
+
+
+@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,
+) {
+  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

@@ -0,0 +1,37 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.AnnotatedString
+
+@Composable
+fun ClickableEmail(email: String) {
+  val context = LocalContext.current
+
+  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
+  }
+}

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

@@ -4,23 +4,19 @@ import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.text.AnnotatedString
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 
 @Composable
 fun ClickableNoteTag(
-  note: Note,
+  baesNote: Note,
   navController: NavController
 ) {
-  val innerNoteState by note.live.observeAsState()
   ClickableText(
-    text = AnnotatedString("@${innerNoteState?.note?.id?.toNote()?.toShortenHex()} "),
-    onClick = { navController.navigate("Note/${innerNoteState?.note?.idHex}") },
+    text = AnnotatedString("@${baesNote.idNote().toShortenHex()} "),
+    onClick = { navController.navigate("Note/${baesNote.idHex}") },
     style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
   )
 }

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

@@ -0,0 +1,31 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.AnnotatedString
+
+@Composable
+fun ClickablePhone(phone: String) {
+  val context = LocalContext.current
+
+  ClickableText(
+    text = AnnotatedString("$phone "),
+    onClick = { runCatching { context.dial(phone) } },
+    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
+  )
+}
+
+fun Context.dial(phone: String) {
+  try {
+    val intent = Intent(Intent.ACTION_DIAL, Uri.fromParts("tel", phone, null))
+    startActivity(intent)
+  } catch (t: Throwable) {
+    // TODO: Handle potential exceptions
+  }
+}

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

@@ -0,0 +1,59 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.text.AnnotatedString
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.Nip19
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+
+@Composable
+fun ClickableRoute(
+  nip19: Nip19.Return,
+  navController: NavController
+) {
+  if (nip19.type == Nip19.Type.USER) {
+    val userBase = LocalCache.getOrCreateUser(nip19.hex)
+
+    val userState by userBase.live().metadata.observeAsState()
+    val user = userState?.user ?: return
+
+    val route = "User/${nip19.hex}"
+    val text = user.toBestDisplayName()
+
+    ClickableText(
+      text = AnnotatedString("@${text} "),
+      onClick = { navController.navigate(route) },
+      style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+    )
+  } else {
+    val noteBase = LocalCache.getOrCreateNote(nip19.hex)
+    val noteState by noteBase.live().metadata.observeAsState()
+    val note = noteState?.note ?: return
+
+    if (note.event is ChannelCreateEvent) {
+      ClickableText(
+        text = AnnotatedString("@${note.idDisplayNote()} "),
+        onClick = { navController.navigate("Channel/${nip19.hex}") },
+        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+      )
+    } else if (note.channel != null) {
+      ClickableText(
+        text = AnnotatedString("@${note.channel?.toBestDisplayName()} "),
+        onClick = { navController.navigate("Channel/${note.channel?.idHex}") },
+        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+      )
+    } else {
+      ClickableText(
+        text = AnnotatedString("@${note.idDisplayNote()} "),
+        onClick = { navController.navigate("Note/${nip19.hex}") },
+        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+      )
+    }
+  }
+}

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

@@ -15,7 +15,7 @@ fun ClickableUserTag(
   user: User,
   navController: NavController
 ) {
-  val innerUserState by user.live.observeAsState()
+  val innerUserState by user.live().metadata.observeAsState()
   ClickableText(
     text = AnnotatedString("@${innerUserState?.user?.toBestDisplayName()} "),
     onClick = { navController.navigate("User/${innerUserState?.user?.pubkeyHex}") },

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

@@ -0,0 +1,77 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.R
+import androidx.compose.ui.res.stringResource
+
+@Composable
+fun ExpandableRichTextViewer(
+  content: String,
+  canPreview: Boolean,
+  modifier: Modifier = Modifier,
+  tags: List<List<String>>?,
+  backgroundColor: Color,
+  accountViewModel: AccountViewModel,
+  navController: NavController
+) {
+  var showFullText by remember { mutableStateOf(false) }
+
+  val text = if (showFullText) content else content.take(350)
+
+  Box(contentAlignment = Alignment.BottomCenter) {
+    RichTextViewer(text, canPreview, modifier, tags, backgroundColor, accountViewModel, navController)
+
+    if (content.length > 350 && !showFullText) {
+      Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center,
+        modifier = Modifier
+          .fillMaxWidth()
+          .background(
+            brush = Brush.verticalGradient(
+              colors = listOf(
+                backgroundColor.copy(alpha = 0f),
+                backgroundColor
+              )
+            )
+          )
+      ) {
+        Button(
+          modifier = Modifier.padding(top = 10.dp),
+          onClick = { showFullText = !showFullText },
+          shape = RoundedCornerShape(20.dp),
+          colors = ButtonDefaults.buttonColors(
+            backgroundColor = MaterialTheme.colors.primary.copy(alpha = 0.32f).compositeOver(MaterialTheme.colors.background)
+          ),
+          contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
+        ) {
+          Text(text = stringResource(R.string.show_more), color = Color.White)
+        }
+      }
+    }
+  }
+}

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

@@ -22,12 +22,14 @@ import androidx.compose.ui.draw.clip
 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.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
+import java.text.NumberFormat
 
 @Composable
 fun InvoicePreview(lnInvoice: String) {
@@ -67,7 +69,7 @@ fun InvoicePreview(lnInvoice: String) {
         )
 
         Text(
-          text = "Lightning Invoice",
+          text = stringResource(R.string.lightning_invoice),
           fontSize = 20.sp,
           fontWeight = FontWeight.W500,
           modifier = Modifier.padding(start = 10.dp)
@@ -78,20 +80,25 @@ fun InvoicePreview(lnInvoice: String) {
 
       amount?.let {
         Text(
-          text = "${amount.toInt()} sats",
+          text = "${
+            NumberFormat.getInstance().format(amount)
+          } ${stringResource(id = R.string.sats)}",
           fontSize = 25.sp,
           fontWeight = FontWeight.W500,
           modifier = Modifier
             .fillMaxWidth()
             .padding(vertical = 10.dp),
         )
-      } 
+      }
+
 
       Button(
-        modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(vertical = 10.dp),
         onClick = {
           runCatching {
-            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning://$lnInvoice"))
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$lnInvoice"))
             startActivity(context, intent, null)
           }
         },
@@ -100,7 +107,7 @@ fun InvoicePreview(lnInvoice: String) {
           backgroundColor = MaterialTheme.colors.primary
         )
       ) {
-        Text(text = "Pay", color = Color.White, fontSize = 20.sp)
+        Text(text = stringResource(R.string.pay), color = Color.White, fontSize = 20.sp)
       }
     }
   }

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

@@ -0,0 +1,160 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.Intent
+import android.net.Uri
+import android.widget.Toast
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+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.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.core.content.ContextCompat.startActivity
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.model.Account
+import kotlinx.coroutines.launch
+
+@Composable
+fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onClose: () -> Unit ) {
+  val context = LocalContext.current
+  val scope = rememberCoroutineScope()
+
+  Column(modifier = Modifier
+    .fillMaxWidth()
+    .padding(start = 30.dp, end = 30.dp)
+    .clip(shape = RoundedCornerShape(10.dp))
+    .border(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp))
+  ) {
+
+    Column(
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(30.dp)
+    ) {
+
+      Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(bottom = 10.dp)
+      ) {
+        Icon(
+          painter = painterResource(R.drawable.lightning),
+          null,
+          modifier = Modifier.size(20.dp),
+          tint = Color.Unspecified
+        )
+
+        Text(
+          text = stringResource(R.string.lightning_tips),
+          fontSize = 20.sp,
+          fontWeight = FontWeight.W500,
+          modifier = Modifier.padding(start = 10.dp)
+        )
+      }
+
+      Divider()
+
+      var message by remember { mutableStateOf("") }
+      var amount by remember { mutableStateOf(1000L) }
+
+      OutlinedTextField(
+        label = { Text(text = stringResource(R.string.note_to_receiver)) },
+        modifier = Modifier.fillMaxWidth(),
+        value = message,
+        onValueChange = { message = it },
+        placeholder = {
+          Text(
+            text = stringResource(R.string.thank_you_so_much),
+            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+          )
+        },
+        keyboardOptions = KeyboardOptions.Default.copy(
+          capitalization = KeyboardCapitalization.Sentences
+        ),
+        singleLine = true
+      )
+
+      OutlinedTextField(
+        label = { Text(text = stringResource(R.string.amount_in_sats)) },
+        modifier = Modifier.fillMaxWidth(),
+        value = amount.toString(),
+        onValueChange = {
+          runCatching {
+            if (it.isEmpty())
+              amount = 0
+            else
+              amount = it.toLong()
+          }
+        },
+        placeholder = {
+          Text(
+            text = "1000",
+            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+          )
+        },
+        keyboardOptions = KeyboardOptions.Default.copy(
+          keyboardType = KeyboardType.Number
+        ),
+        singleLine = true
+      )
+
+      Button(
+        modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
+        onClick = {
+          val zapRequest = account.createZapRequestFor(toUserPubKeyHex)
+
+          LightningAddressResolver().lnAddressInvoice(lud16, amount * 1000, message, zapRequest?.toJson(),
+            onSuccess = {
+              runCatching {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$it"))
+                startActivity(context, intent, null)
+              }
+              onClose()
+            },
+            onError = {
+              scope.launch {
+                Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                onClose()
+              }
+            }
+          )
+        },
+        shape = RoundedCornerShape(15.dp),
+        colors = ButtonDefaults.buttonColors(
+          backgroundColor = MaterialTheme.colors.primary
+        )
+      ) {
+        Text(text = stringResource(R.string.send_sats), color = Color.White, fontSize = 20.sp)
+      }
+    }
+  }
+}

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

@@ -1,18 +1,49 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import android.util.Patterns
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.LocalContentColor
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
+import androidx.compose.material.contentColorFor
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.text.Paragraph
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
-import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import com.halilibo.richtext.markdown.Markdown
+import com.halilibo.richtext.markdown.MarkdownParseOptions
+import com.halilibo.richtext.ui.RichText
+import com.halilibo.richtext.ui.RichTextStyle
+import com.halilibo.richtext.ui.currentRichTextStyle
+import com.halilibo.richtext.ui.material.MaterialRichText
+import com.halilibo.richtext.ui.resolveDefaults
+import com.halilibo.richtext.ui.string.RichTextString
+import com.halilibo.richtext.ui.string.RichTextStringStyle
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.ui.note.toShortenHex
+import com.vitorpamplona.amethyst.service.Nip19
+import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import java.net.MalformedURLException
 import java.net.URISyntaxException
@@ -40,42 +71,138 @@ fun isValidURL(url: String?): Boolean {
 }
 
 @Composable
-fun RichTextViewer(content: String, tags: List<List<String>>?, note: Note, accountViewModel: AccountViewModel, navController: NavController) {
-  Column(modifier = Modifier.padding(top = 5.dp)) {
-    // FlowRow doesn't work well with paragraphs. So we need to split them
-    content.split('\n').forEach { paragraph ->
+fun RichTextViewer(
+  content: String,
+  canPreview: Boolean,
+  modifier: Modifier = Modifier,
+  tags: List<List<String>>?,
+  backgroundColor: Color,
+  accountViewModel: AccountViewModel,
+  navController: NavController,
+) {
 
-      FlowRow() {
-        paragraph.split(' ').forEach { word: String ->
-          // Explicit URL
-          val lnInvoice = LnInvoiceUtil.findInvoice(word)
-          if (lnInvoice != null) {
-            InvoicePreview(lnInvoice)
-          } else if (isValidURL(word)) {
-            val removedParamsFromUrl = word.split("?")[0].toLowerCase()
-            if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-              ZoomableImageView(word)
-            } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
-              VideoView(word)
+  Column(modifier = modifier.animateContentSize()) {
+
+    if (content.startsWith("# ") || content.contains("##") || content.contains("```")) {
+      var richTextStyle by remember { mutableStateOf(RichTextStyle().resolveDefaults()) }
+
+      MaterialRichText(
+        style = RichTextStyle().resolveDefaults().copy(
+          stringStyle = richTextStyle.stringStyle?.copy(
+            linkStyle = SpanStyle(
+              textDecoration = TextDecoration.Underline,
+              color = MaterialTheme.colors.primary
+            )
+          )
+        ),
+      ) {
+        Markdown(
+          content = content,
+          markdownParseOptions = MarkdownParseOptions.Default,
+        )
+      }
+    } else {
+      // FlowRow doesn't work well with paragraphs. So we need to split them
+      content.split('\n').forEach { paragraph ->
+        FlowRow() {
+          paragraph.split(' ').forEach { word: String ->
+
+            if (canPreview) {
+              // Explicit URL
+              val lnInvoice = LnInvoiceUtil.findInvoice(word)
+              if (lnInvoice != null) {
+                InvoicePreview(lnInvoice)
+              } else if (isValidURL(word)) {
+                val removedParamsFromUrl = word.split("?")[0].toLowerCase()
+                if (imageExtension.matcher(removedParamsFromUrl).matches()) {
+                  ZoomableImageView(word)
+                } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
+                  VideoView(word)
+                } else {
+                  UrlPreview(word, word)
+                }
+              } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
+                ClickableEmail(word)
+              } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
+                ClickablePhone(word)
+              } else if (noProtocolUrlValidator.matcher(word).matches()) {
+                UrlPreview("https://$word", word)
+              } else if (tagIndex.matcher(word).matches() && tags != null) {
+                TagLink(word, tags, canPreview, backgroundColor, accountViewModel, navController)
+              } else if (isBechLink(word)) {
+                BechLink(word, navController)
+              } else {
+                Text(
+                  text = "$word ",
+                  style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
+                )
+              }
             } else {
-              UrlPreview(word, word)
+              if (isValidURL(word)) {
+                ClickableUrl("$word ", word)
+              } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
+                ClickableEmail(word)
+              } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
+                ClickablePhone(word)
+              } else if (noProtocolUrlValidator.matcher(word).matches()) {
+                ClickableUrl(word, "https://$word")
+              } else if (tagIndex.matcher(word).matches() && tags != null) {
+                TagLink(word, tags, canPreview, backgroundColor, accountViewModel, navController)
+              } else if (isBechLink(word)) {
+                BechLink(word, navController)
+              } else {
+                Text(
+                  text = "$word ",
+                  style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
+                )
+              }
             }
-          } else if (noProtocolUrlValidator.matcher(word).matches()) {
-            UrlPreview("https://$word", word)
-          } else if (tagIndex.matcher(word).matches() && tags != null) {
-            TagLink(word, tags, navController)
-          } else {
-            Text(text = "$word ")
           }
         }
       }
-
     }
   }
 }
 
+
+fun isBechLink(word: String): Boolean {
+  return word.startsWith("nostr:", true)
+    || word.startsWith("npub1", true)
+    || word.startsWith("note1", true)
+    || word.startsWith("nprofile1", true)
+    || word.startsWith("nevent1", true)
+    || word.startsWith("@npub1", true)
+    || word.startsWith("@note1", true)
+    || word.startsWith("@nprofile1", true)
+    || word.startsWith("@nevent1", true)
+}
+
 @Composable
-fun TagLink(word: String, tags: List<List<String>>, navController: NavController) {
+fun BechLink(word: String, navController: NavController) {
+  val uri = if (word.startsWith("nostr", true)) {
+    word
+  } else if (word.startsWith("@")) {
+    word.replaceFirst("@", "nostr:")
+  } else {
+    "nostr:${word}"
+  }
+
+  val nip19Route = try {
+    Nip19().uriToRoute(uri)
+  } catch (e: Exception) {
+    null
+  }
+
+  if (nip19Route == null) {
+    Text(text = "$word ")
+  } else {
+    ClickableRoute(nip19Route, navController)
+  }
+}
+
+
+@Composable
+fun TagLink(word: String, tags: List<List<String>>, canPreview: Boolean, backgroundColor: Color, accountViewModel: AccountViewModel, navController: NavController) {
   val matcher = tagIndex.matcher(word)
 
   val index = try {
@@ -92,21 +219,48 @@ fun TagLink(word: String, tags: List<List<String>>, navController: NavController
 
   if (index >= 0 && index < tags.size) {
     if (tags[index][0] == "p") {
-      val user = LocalCache.users[tags[index][1]]
-      if (user != null) {
-        ClickableUserTag(user, navController)
+      val baseUser = LocalCache.checkGetOrCreateUser(tags[index][1])
+      if (baseUser != null) {
+        val userState = baseUser.live().metadata.observeAsState()
+        val user = userState.value?.user
+        if (user != null) {
+          ClickableUserTag(user, navController)
+        } else {
+          Text(text = "$word ")
+        }
       } else {
-        Text(text = "${tags[index][1].toShortenHex()} ")
+        // if here the tag is not a valid Nostr Hex
+        Text(text = "$word ")
       }
     } else if (tags[index][0] == "e") {
-      val note = LocalCache.notes[tags[index][1]]
+      val note = LocalCache.checkGetOrCreateNote(tags[index][1])
       if (note != null) {
-        ClickableNoteTag(note, navController)
+        if (canPreview) {
+          NoteCompose(
+            baseNote = note,
+            accountViewModel = accountViewModel,
+            modifier = Modifier
+              .padding(0.dp)
+              .fillMaxWidth()
+              .clip(shape = RoundedCornerShape(15.dp))
+              .border(
+                1.dp,
+                MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                RoundedCornerShape(15.dp)
+              ),
+            parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f)
+              .compositeOver(backgroundColor),
+            isQuotedNote = true,
+            navController = navController
+          )
+        } else {
+          ClickableNoteTag(note, navController)
+        }
       } else {
-        Text(text = "${tags[index][1].toShortenHex()} ")
+        // if here the tag is not a valid Nostr Hex
+        Text(text = "$word ")
       }
     } else
       Text(text = "$word ")
   }
 }
-

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

@@ -0,0 +1,242 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.res.Resources
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.Divider
+import androidx.compose.material.DropdownMenu
+import androidx.compose.material.DropdownMenuItem
+import androidx.compose.material.Icon
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.dp
+import androidx.core.os.ConfigurationCompat
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.lang.LanguageTranslatorService
+import com.vitorpamplona.amethyst.service.lang.ResultOrError
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import java.util.Locale
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+@Composable
+fun TranslateableRichTextViewer(
+  content: String,
+  canPreview: Boolean,
+  modifier: Modifier = Modifier,
+  tags: List<List<String>>?,
+  backgroundColor: Color,
+  accountViewModel: AccountViewModel,
+  navController: NavController
+) {
+  val translatedTextState = remember {
+    mutableStateOf(ResultOrError(content, null, null, null))
+  }
+
+  var showOriginal by remember { mutableStateOf(false) }
+  var langSettingsPopupExpanded by remember { mutableStateOf(false) }
+
+  val context = LocalContext.current
+
+  val accountState by accountViewModel.accountLanguagesLiveData.observeAsState()
+  val account = accountState?.account ?: return
+
+  LaunchedEffect(accountState) {
+    withContext(Dispatchers.IO) {
+      LanguageTranslatorService.autoTranslate(
+        content,
+        account.dontTranslateFrom,
+        account.translateTo
+      ).addOnCompleteListener { task ->
+        if (task.isSuccessful && content != task.result.result) {
+          if (task.result.sourceLang != null && task.result.targetLang != null) {
+            val preference = account.preferenceBetween(task.result.sourceLang!!, task.result.targetLang!!)
+            showOriginal = preference == task.result.sourceLang
+          }
+          translatedTextState.value = task.result
+        } else {
+          translatedTextState.value = ResultOrError(content, null, null, null)
+        }
+      }
+    }
+  }
+
+  val toBeViewed = if (showOriginal) content else translatedTextState.value.result ?: content
+
+  Column(modifier = Modifier.padding(top = 5.dp)) {
+    ExpandableRichTextViewer(
+      toBeViewed,
+      canPreview,
+      modifier,
+      tags,
+      backgroundColor,
+      accountViewModel,
+      navController,
+    )
+
+    val target = translatedTextState.value.targetLang
+    val source = translatedTextState.value.sourceLang
+
+    if (source != null && target != null) {
+      if (source != target) {
+        Row(modifier = Modifier
+          .fillMaxWidth()
+          .padding(top = 5.dp)) {
+          val clickableTextStyle =
+            SpanStyle(color = MaterialTheme.colors.primary.copy(alpha = 0.52f))
+
+          val annotatedTranslationString = buildAnnotatedString {
+            withStyle(clickableTextStyle) {
+              pushStringAnnotation("langSettings", true.toString())
+              append(stringResource(R.string.auto))
+            }
+
+            append("-${stringResource(R.string.translated_from)} ")
+
+            withStyle(clickableTextStyle) {
+              pushStringAnnotation("showOriginal", true.toString())
+              append(Locale(source).displayName)
+            }
+
+            append(" ${stringResource(R.string.to)} ")
+
+            withStyle(clickableTextStyle) {
+              pushStringAnnotation("showOriginal", false.toString())
+              append(Locale(target).displayName)
+            }
+          }
+
+          ClickableText(
+            text = annotatedTranslationString,
+            style = LocalTextStyle.current.copy(color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)),
+            overflow = TextOverflow.Visible,
+            maxLines = 3
+          ) { spanOffset ->
+            annotatedTranslationString.getStringAnnotations(spanOffset, spanOffset)
+              .firstOrNull()
+              ?.also { span ->
+                if (span.tag == "showOriginal")
+                  showOriginal = span.item.toBoolean()
+                else
+                  langSettingsPopupExpanded = !langSettingsPopupExpanded
+              }
+          }
+
+          DropdownMenu(
+            expanded = langSettingsPopupExpanded,
+            onDismissRequest = { langSettingsPopupExpanded = false }
+          ) {
+            DropdownMenuItem(onClick = {
+              accountViewModel.dontTranslateFrom(source, context)
+              langSettingsPopupExpanded = false
+            }) {
+              if (source in account.dontTranslateFrom)
+                Icon(
+                  imageVector = Icons.Default.Check,
+                  contentDescription = null,
+                  modifier = Modifier.size(24.dp)
+                )
+              else
+                Spacer(modifier = Modifier.size(24.dp))
+
+              Spacer(modifier = Modifier.size(10.dp))
+
+              Text(stringResource(R.string.never_translate_from) + "${Locale(source).displayName}")
+            }
+            Divider()
+            DropdownMenuItem(onClick = {
+              accountViewModel.prefer(source, target, source)
+              langSettingsPopupExpanded = false
+            }) {
+              if (account.preferenceBetween(source, target) == source)
+                Icon(
+                  imageVector = Icons.Default.Check,
+                  contentDescription = null,
+                  modifier = Modifier.size(24.dp)
+                )
+              else
+                Spacer(modifier = Modifier.size(24.dp))
+
+              Spacer(modifier = Modifier.size(10.dp))
+
+              // TODO : Rashed translate this
+              Text(
+                "${stringResource(R.string.show_in)} ${Locale(source).displayName} ${
+                  stringResource(
+                    R.string.first
+                  )
+                }"
+              )
+            }
+            DropdownMenuItem(onClick = {
+              accountViewModel.prefer(source, target, target)
+              langSettingsPopupExpanded = false
+            }) {
+              if (account.preferenceBetween(source, target) == target)
+                Icon(
+                  imageVector = Icons.Default.Check,
+                  contentDescription = null,
+                  modifier = Modifier.size(24.dp)
+                )
+              else
+                Spacer(modifier = Modifier.size(24.dp))
+
+              Spacer(modifier = Modifier.size(10.dp))
+
+              Text("${stringResource(id = R.string.show_in)} ${Locale(target).displayName} ${R.string.first}")
+            }
+            Divider()
+
+            val languageList =
+              ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration())
+            for (i in 0 until languageList.size()) {
+              languageList.get(i)?.let { lang ->
+                DropdownMenuItem(onClick = {
+                  accountViewModel.translateTo(lang, context)
+                  langSettingsPopupExpanded = false
+                }) {
+                  if (lang.language in account.translateTo)
+                    Icon(
+                      imageVector = Icons.Default.Check,
+                      contentDescription = null,
+                      modifier = Modifier.size(24.dp)
+                    )
+                  else
+                    Spacer(modifier = Modifier.size(24.dp))
+
+                  Spacer(modifier = Modifier.size(10.dp))
+                  
+                  Text("${stringResource(R.string.always_translate_to)}${lang.displayName}")
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -1,46 +1,62 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import androidx.compose.animation.Crossfade
+import androidx.compose.animation.core.tween
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
 import com.baha.url.preview.IUrlPreviewCallback
 import com.baha.url.preview.UrlInfoItem
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 
 @Composable
-fun UrlPreview(url: String, urlText: String, showUrlIfError: Boolean = true) {
-  var urlPreviewState by remember { mutableStateOf<UrlPreviewState>(UrlPreviewState.Loading) }
+fun UrlPreview(url: String, urlText: String) {
+  val default = UrlCachedPreviewer.cache[url]?.let { UrlPreviewState.Loaded(it) } ?: UrlPreviewState.Loading
+  var context = LocalContext.current
+
+  var urlPreviewState by remember { mutableStateOf(default) }
 
   // Doesn't use a viewModel because of viewModel reusing issues (too many UrlPreview are created).
   LaunchedEffect(url) {
-    UrlCachedPreviewer.previewInfo(url, object : IUrlPreviewCallback {
-      override fun onComplete(urlInfo: UrlInfoItem) {
-        if (urlInfo.allFetchComplete() && urlInfo.url == url)
-          urlPreviewState = UrlPreviewState.Loaded(urlInfo)
-        else
-          urlPreviewState = UrlPreviewState.Empty
-      }
+    if (urlPreviewState == UrlPreviewState.Loading) {
+      withContext(Dispatchers.IO) {
+        UrlCachedPreviewer.previewInfo(url, object : IUrlPreviewCallback {
+          override fun onComplete(urlInfo: UrlInfoItem) {
+            if (urlInfo.allFetchComplete() && urlInfo.url == url)
+              urlPreviewState = UrlPreviewState.Loaded(urlInfo)
+            else
+              urlPreviewState = UrlPreviewState.Empty
+          }
 
-      override fun onFailed(throwable: Throwable) {
-        urlPreviewState = UrlPreviewState.Error("Error parsing preview for ${url}: ${throwable.message}")
+          override fun onFailed(throwable: Throwable) {
+            urlPreviewState = UrlPreviewState.Error(
+              context.getString(
+                R.string.error_parsing_preview_for,
+                url,
+                throwable.message
+              )
+            )
+          }
+        })
       }
-    })
+    }
   }
 
-  Crossfade(targetState = urlPreviewState) { state ->
+  Crossfade(targetState = urlPreviewState, animationSpec = tween(durationMillis = 100)) { state ->
     when (state) {
       is UrlPreviewState.Loaded -> {
         UrlPreviewCard(url, state.previewInfo)
       }
       else -> {
-        if (showUrlIfError) {
-          ClickableUrl(urlText, url)
-        }
+        ClickableUrl(urlText, url)
       }
     }
   }

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

@@ -15,10 +15,12 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.baha.url.preview.UrlInfoItem
+import com.vitorpamplona.amethyst.R
 
 @Composable
 fun UrlPreviewCard(
@@ -36,7 +38,7 @@ fun UrlPreviewCard(
     Column {
       AsyncImage(
         model = previewInfo.image,
-        contentDescription = "Profile Image",
+        contentDescription = stringResource(R.string.preview_card_image_for, url),
         contentScale = ContentScale.FillWidth,
         modifier = Modifier.fillMaxWidth()
       )