v0.60.2

- Redesign scroll to the top implementation to avoid using arguments in the navigator.

.github/workflows/create-release.yml

@@ -47,7 +47,7 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
 
       - name: Build APK
-        run: ./gradlew assembleRelease --stacktrace --no-daemon
+        run: ./gradlew assembleRelease --stacktrace
 
       - name: Sign APK (Google Play)
         uses: r0adkll/sign-android-release@v1

PRIVACY.md

@@ -1,13 +1,48 @@
-# Amethyst Privacy Policy & Terms of Use
+# Amethyst Privacy Policy and Terms of Use
 
-Effective as of Jan 20, 2023 for the distributed applications in the Play Store and the F-Droid Catalogue 
+## Privacy Policy
 
-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. 
+Effective as of Jun 12, 2023
 
-The app may collect a per-device token, your public key and a preferred Relay to connect to and provide push notification services through Google's Firebase Cloud Messaging. Other than that, the 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.
+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. 
 
-You cannot use the Amethyst app for Android 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.
+The app may collect a per-device token, your public key, and a preferred Relay to connect to and provide push notification services through Google's Firebase Cloud Messaging. Other than that, the data from connected accounts are only stored locally on the device when it's required for the functionality and performance of Amethyst. This data is strictly confidential 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.
 
-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.
+Amethyst offers a few options to upload pictures and videos in order to post them online. You can choose the server at your discretion. Similar to relays, such services are independent of the app and have their own privacy policy and terms of use. 
+
+### Privacy with Relays services
+
+Your internet protocol (IP) address is exposed to the relays you connect to. If you want to improve your privacy, consider utilizing a service that masks your IP address (e.g. a VPN) from trackers online.
+
+The relay can also see which public keys you are using and what information you are requesting from the network. Your public key is tied to your IP address and your relay filters.
+
+Relays have all your data in raw text. They know your IP, your name, your location (guessed from IP), your pub key, all your contacts, and other relays, and can read every action you do (post, like, boost, quote, report, etc) with the exception of the content inside Private Zaps and Private DMs.
+
+While the content of direct messages (DMs) is only visible to you, and your DM Nostr counterparty, everyone can see when you and your counterparty are DM-ing each other. Image uploads in the DM screen use one of the chosen image servers and simply paste the image link on the DM text. Your uploaded pictures are available to anyone with that direct link. 
+
+### Visibility & Permanence of Your Content on Nostr Relays
+
+#### Information Visibility
+
+Content that you share can be shared with other relays by any user of the network. 
+Information that you share is publicly visible to anyone reading from relays that have your information. Your information may also be visible to Nostr users who do not share relays with you.
+
+#### Information Permanence
+
+Information shared on Nostr should be assumed permanent for privacy purposes. There is no way to guarantee deleting or editing any content once posted.
+
+## Terms of Use
+
+### For versions downloaded from Google's Play Store
+
+You cannot use the Amethyst app for Android 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 rights, 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.
+
+### For versions downloaded from F-Droid
+
+We do not control the distribution of the application in F-Droid. Legal matters should be resolved between the user and F-Droid. 
+
+## Other Notes
+
+We reserve the right to modify this Privacy Policy and Terms of Use at any time. Any modifications to this document will be effective upon our posting of 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 and Terms of Use indicates your acceptance of the terms of the modified Privacy Policy and/or Terms of Use.
 
 If you have any questions about Amethyst or this privacy policy, you can send a message to amethyst@vitorpamplona.com

README.md

@@ -61,14 +61,15 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] Push Notifications (Zaps and Messages)
 - [x] Generic Tags (NIP-12)
 - [x] Sensitive Content (NIP-36)
+- [x] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
+- [x] Recommended Application Handlers (NIP-89)
+- [x] Events with a Subject (NIP-14)
 - [ ] Marketplace (NIP-15)
 - [ ] Image/Video Capture in the app
-- [ ] Local Database 
-- [ ] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
+- [ ] Local Database
 - [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
 - [ ] Relay Pages (NIP-11)
 - [ ] Proof of Work in the Phone (NIP-13, NIP-20)
-- [ ] Events with a Subject (NIP-14)
 - [ ] Workspaces
 - [ ] Expiration Support (NIP-40)
 - [ ] Infinity Scroll

app/build.gradle

@@ -13,13 +13,14 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 188
-        versionName "0.53.4"
+        versionCode 215
+        versionName "0.60.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true
         }
+        resConfigs("ar", "cs", "eo", "es", "fa", "fr", "hu", "night", "nl", "pt-rBR", "ru", "sv-rSE", "ta", "tr", "uk", "zh", "sh-rHK", "zh-rTW" )
     }
 
     buildTypes {
@@ -128,7 +129,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
 
     // Json Serialization TODO: We might need to converge between gson and Jackson (we are usin both)
-    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.1'
+    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
     // link preview
@@ -153,8 +154,6 @@ dependencies {
     // create blurhash
     implementation group: 'io.trbl', name: 'blurhash', version: '1.0.0'
 
-    // Rendering clickable text
-    implementation "com.google.accompanist:accompanist-flowlayout:$accompanist_version"
     // Permission to upload pictures:
     implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
 
@@ -166,9 +165,14 @@ dependencies {
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 
     // Markdown
-    implementation "com.halilibo.compose-richtext:richtext-ui:0.16.0"
-    implementation "com.halilibo.compose-richtext:richtext-ui-material:0.16.0"
-    implementation "com.halilibo.compose-richtext:richtext-commonmark:0.16.0"
+    //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"
+
+    // Markdown (With fix for full-image bleeds)
+    implementation('com.github.vitorpamplona.compose-richtext:richtext-ui:main-SNAPSHOT')
+    implementation('com.github.vitorpamplona.compose-richtext:richtext-ui-material:main-SNAPSHOT')
+    implementation('com.github.vitorpamplona.compose-richtext:richtext-commonmark:main-SNAPSHOT')
 
     // Local model for language identification
     playImplementation 'com.google.mlkit:language-id:17.0.4'
@@ -177,7 +181,7 @@ dependencies {
     playImplementation 'com.google.mlkit:translate:17.0.1'
 
     // PushNotifications
-    playImplementation platform('com.google.firebase:firebase-bom:32.0.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.1.0')
     playImplementation 'com.google.firebase:firebase-messaging-ktx'
 
     // Charts
@@ -189,6 +193,11 @@ dependencies {
     // immutable collections to avoid recomposition
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
 
+    // Video compression lib
+    implementation 'com.github.AbedElazizShe:LightCompressor:1.2.3'
+    // Image compression lib
+    implementation 'id.zelory:compressor:3.0.1'
+
     // Automatic memory leak detection
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.11'
 

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

@@ -1,8 +1,10 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
@@ -10,8 +12,8 @@ fun TranslatableRichTextViewer(
     content: String,
     canPreview: Boolean,
     modifier: Modifier = Modifier,
-    tags: List<List<String>>?,
-    backgroundColor: Color,
+    tags: ImmutableListOfLists<String>,
+    backgroundColor: MutableState<Color>,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) = ExpandableRichTextViewer(

app/src/main/AndroidManifest.xml

@@ -4,17 +4,33 @@
     <queries>
         <package android:name="org.torproject.android"/>
     </queries>
+
+    <!-- Doesn't require a camera -->
     <uses-feature android:name="android.hardware.camera" android:required="false" />
 
+    <!-- To connect with relays -->
     <uses-permission android:name="android.permission.INTERNET"/>
+
+    <!-- To Upload media (newer devices) -->
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
+
+    <!-- To Upload media (old devices) -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+    <!-- To read QRs that contain nostr:<NIP19> -->
     <uses-permission android:name="android.permission.CAMERA" />
+
+    <!-- To read NFCs that contain nostr:<NIP19> -->
     <uses-permission android:name="android.permission.NFC" />
 
-    <!-- Used for SDK < 29 -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+    <!-- To know receive notifications when the app connects/disconnects from the web -->
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+
+    <!-- Old permission to access media -->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
         tools:ignore="ScopedStorage" />
 
     <application
@@ -30,6 +46,7 @@
         android:largeHeap="true"
         android:usesCleartextTraffic="true"
         android:hardwareAccelerated="true"
+        android:localeConfig="@xml/locales_config"
         tools:targetApi="33">
         <activity
             android:name=".ui.MainActivity"

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
+import androidx.compose.runtime.Immutable
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.Account
@@ -30,6 +31,7 @@ import java.util.Locale
 private const val DEBUG_PLAINTEXT_PREFERENCES = false
 private const val DEBUG_PREFERENCES_NAME = "debug_prefs"
 
+@Immutable
 data class AccountInfo(
     val npub: String,
     val hasPrivKey: Boolean = false
@@ -47,6 +49,7 @@ private object PrefKeys {
     const val LANGUAGE_PREFS = "languagePreferences"
     const val TRANSLATE_TO = "translateTo"
     const val ZAP_AMOUNTS = "zapAmounts"
+    const val REACTION_CHOICES = "reactionChoices"
     const val DEFAULT_ZAPTYPE = "defaultZapType"
     const val DEFAULT_FILE_SERVER = "defaultFileServer"
     const val DEFAULT_HOME_FOLLOW_LIST = "defaultHomeFollowList"
@@ -59,6 +62,9 @@ private object PrefKeys {
     const val USE_PROXY = "use_proxy"
     const val PROXY_PORT = "proxy_port"
     const val SHOW_SENSITIVE_CONTENT = "show_sensitive_content"
+    const val WARN_ABOUT_REPORTS = "warn_about_reports"
+    const val FILTER_SPAM_FROM_STRANGERS = "filter_spam_from_strangers"
+    const val LAST_READ_PER_ROUTE = "last_read_route_per_route"
     val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
 }
 
@@ -204,6 +210,7 @@ object LocalPreferences {
             putString(PrefKeys.LANGUAGE_PREFS, gson.toJson(account.languagePreferences))
             putString(PrefKeys.TRANSLATE_TO, account.translateTo)
             putString(PrefKeys.ZAP_AMOUNTS, gson.toJson(account.zapAmountChoices))
+            putString(PrefKeys.REACTION_CHOICES, gson.toJson(account.reactionChoices))
             putString(PrefKeys.DEFAULT_ZAPTYPE, gson.toJson(account.defaultZapType))
             putString(PrefKeys.DEFAULT_FILE_SERVER, gson.toJson(account.defaultFileServer))
             putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, account.defaultHomeFollowList)
@@ -215,6 +222,9 @@ object LocalPreferences {
             putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, account.hideBlockAlertDialog)
             putBoolean(PrefKeys.USE_PROXY, account.proxy != null)
             putInt(PrefKeys.PROXY_PORT, account.proxyPort)
+            putBoolean(PrefKeys.WARN_ABOUT_REPORTS, account.warnAboutPostsWithReports)
+            putBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, account.filterSpamFromStrangers)
+            putString(PrefKeys.LAST_READ_PER_ROUTE, gson.toJson(account.lastReadPerRoute))
 
             if (account.showSensitiveContent == null) {
                 remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
@@ -252,6 +262,11 @@ object LocalPreferences {
                 object : TypeToken<List<Long>>() {}.type
             ) ?: listOf(500L, 1000L, 5000L)
 
+            val reactionChoices = gson.fromJson<List<String>>(
+                getString(PrefKeys.REACTION_CHOICES, "[]"),
+                object : TypeToken<List<String>>() {}.type
+            ).ifEmpty { listOf("+") } ?: listOf("+")
+
             val defaultZapType = gson.fromJson(
                 getString(PrefKeys.DEFAULT_ZAPTYPE, "PUBLIC"),
                 object : TypeToken<LnZapEvent.ZapType>() {}.type
@@ -304,46 +319,52 @@ object LocalPreferences {
             } else {
                 null
             }
+            val filterSpam = getBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, true)
+            val warnAboutReports = getBoolean(PrefKeys.WARN_ABOUT_REPORTS, true)
+
+            val lastReadPerRoute = try {
+                getString(PrefKeys.LAST_READ_PER_ROUTE, null)?.let {
+                    gson.fromJson(
+                        it,
+                        object : TypeToken<Map<String, Long>>() {}.type
+                    ) as Map<String, Long>
+                } ?: mapOf()
+            } catch (e: Throwable) {
+                e.printStackTrace()
+                mapOf()
+            }
 
             val a = Account(
-                Persona(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray()),
-                followingChannels,
-                hiddenUsers,
-                localRelays,
-                dontTranslateFrom,
-                languagePreferences,
-                translateTo,
-                zapAmountChoices,
-                defaultZapType,
-                defaultFileServer,
-                defaultHomeFollowList,
-                defaultStoriesFollowList,
-                defaultNotificationFollowList,
-                zapPaymentRequestServer,
-                hideDeleteRequestDialog,
-                hideBlockAlertDialog,
-                latestContactList,
-                proxy,
-                proxyPort,
-                showSensitiveContent
+                loggedIn = Persona(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray()),
+                followingChannels = followingChannels,
+                hiddenUsers = hiddenUsers,
+                localRelays = localRelays,
+                dontTranslateFrom = dontTranslateFrom,
+                languagePreferences = languagePreferences,
+                translateTo = translateTo,
+                zapAmountChoices = zapAmountChoices,
+                reactionChoices = reactionChoices,
+                defaultZapType = defaultZapType,
+                defaultFileServer = defaultFileServer,
+                defaultHomeFollowList = defaultHomeFollowList,
+                defaultStoriesFollowList = defaultStoriesFollowList,
+                defaultNotificationFollowList = defaultNotificationFollowList,
+                zapPaymentRequest = zapPaymentRequestServer,
+                hideDeleteRequestDialog = hideDeleteRequestDialog,
+                hideBlockAlertDialog = hideBlockAlertDialog,
+                backupContactList = latestContactList,
+                proxy = proxy,
+                proxyPort = proxyPort,
+                showSensitiveContent = showSensitiveContent,
+                warnAboutPostsWithReports = warnAboutReports,
+                filterSpamFromStrangers = filterSpam,
+                lastReadPerRoute = lastReadPerRoute
             )
 
             return a
         }
     }
 
-    fun saveLastRead(route: String, timestampInSecs: Long) {
-        encryptedPreferences(currentAccount()).edit().apply {
-            putLong(PrefKeys.LAST_READ(route), timestampInSecs)
-        }.apply()
-    }
-
-    fun loadLastRead(route: String): Long {
-        encryptedPreferences(currentAccount()).run {
-            return getLong(PrefKeys.LAST_READ(route), 0)
-        }
-    }
-
     fun migrateSingleUserPrefs() {
         if (currentAccount() != null) return
 

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

@@ -1,53 +0,0 @@
-package com.vitorpamplona.amethyst
-
-import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.ui.components.BundledUpdate
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-
-object NotificationCache {
-    // TODO: This must be account-based
-    val lastReadByRoute = mutableMapOf<String, Long>()
-
-    fun markAsRead(route: String, timestampInSecs: Long) {
-        val lastTime = lastReadByRoute[route]
-        if (lastTime == null || timestampInSecs > lastTime) {
-            lastReadByRoute.put(route, timestampInSecs)
-
-            val scope = CoroutineScope(Job() + Dispatchers.IO)
-            scope.launch {
-                LocalPreferences.saveLastRead(route, timestampInSecs)
-                live.invalidateData()
-            }
-        }
-    }
-
-    fun load(route: String): Long {
-        var lastTime = lastReadByRoute[route]
-        if (lastTime == null) {
-            lastTime = LocalPreferences.loadLastRead(route)
-            lastReadByRoute[route] = lastTime
-        }
-        return lastTime
-    }
-
-    // Observers line up here.
-    val live: NotificationLiveData = NotificationLiveData(this)
-}
-
-class NotificationLiveData(val cache: NotificationCache) : LiveData<NotificationState>(NotificationState(cache)) {
-    // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO) {
-        if (hasActiveObservers()) {
-            postValue(NotificationState(cache))
-        }
-    }
-
-    fun invalidateData() {
-        bundler.invalidate()
-    }
-}
-
-class NotificationState(val cache: NotificationCache)

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

@@ -0,0 +1,11 @@
+package com.vitorpamplona.amethyst
+
+object OptOutFromFilters {
+    var warnAboutPostsWithReports: Boolean = true
+    var filterSpamFromStrangers: Boolean = true
+
+    fun start(warnAboutReports: Boolean, filterSpam: Boolean) {
+        warnAboutPostsWithReports = warnAboutReports
+        filterSpamFromStrangers = filterSpam
+    }
+}

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst
 
 import android.content.Context
 import android.os.Build
+import android.util.Log
 import coil.Coil
 import coil.ImageLoader
 import coil.decode.GifDecoder
@@ -31,11 +32,15 @@ object ServiceManager {
         start(context)
     }
 
+    @Synchronized
     fun start(context: Context) {
+        Log.d("ServiceManager", "Starting Relay Services")
+
         val myAccount = account
 
         // Resets Proxy Use
         HttpClient.start(account)
+        OptOutFromFilters.start(account?.warnAboutPostsWithReports ?: true, account?.filterSpamFromStrangers ?: true)
         Coil.setImageLoader {
             ImageLoader.Builder(context).components {
                 if (Build.VERSION.SDK_INT >= 28) {
@@ -50,6 +55,9 @@ object ServiceManager {
                 .build()
         }
 
+        // Initializes video cache.
+        VideoCache.init(context.applicationContext)
+
         if (myAccount != null) {
             Client.connect(myAccount.activeRelays() ?: myAccount.convertLocalRelays())
 
@@ -72,6 +80,8 @@ object ServiceManager {
     }
 
     fun pause() {
+        Log.d("ServiceManager", "Pausing Relay Services")
+
         NostrAccountDataSource.stop()
         NostrHomeDataSource.stop()
         NostrChannelDataSource.stop()

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

@@ -19,6 +19,7 @@ object VideoCache {
 
     lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
+    @Synchronized
     fun init(context: Context) {
         if (!this::simpleCache.isInitialized) {
             exoDatabaseProvider = StandaloneDatabaseProvider(context)
@@ -29,6 +30,13 @@ object VideoCache {
                 exoDatabaseProvider
             )
 
+            cacheDataSourceFactory = CacheDataSource.Factory()
+                .setCache(simpleCache)
+                .setUpstreamDataSourceFactory(
+                    OkHttpDataSource.Factory(HttpClient.getHttpClient())
+                )
+                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+        } else {
             cacheDataSourceFactory = CacheDataSource.Factory()
                 .setCache(simpleCache)
                 .setUpstreamDataSourceFactory(

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

@@ -6,6 +6,7 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.core.os.ConfigurationCompat
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.OptOutFromFilters
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.NostrLnZapPaymentResponseDataSource
 import com.vitorpamplona.amethyst.service.model.*
@@ -55,6 +56,7 @@ class Account(
     var languagePreferences: Map<String, String> = mapOf(),
     var translateTo: String = Locale.getDefault().language,
     var zapAmountChoices: List<Long> = listOf(500L, 1000L, 5000L),
+    var reactionChoices: List<String> = listOf("+"),
     var defaultZapType: LnZapEvent.ZapType = LnZapEvent.ZapType.PRIVATE,
     var defaultFileServer: ServersAvailable = ServersAvailable.NOSTR_BUILD,
     var defaultHomeFollowList: String = KIND3_FOLLOWS,
@@ -66,17 +68,32 @@ class Account(
     var backupContactList: ContactListEvent? = null,
     var proxy: Proxy?,
     var proxyPort: Int,
-    var showSensitiveContent: Boolean? = null
+    var showSensitiveContent: Boolean? = null,
+    var warnAboutPostsWithReports: Boolean = true,
+    var filterSpamFromStrangers: Boolean = true,
+    var lastReadPerRoute: Map<String, Long> = mapOf<String, Long>()
 ) {
     var transientHiddenUsers: Set<String> = setOf()
 
     // Observers line up here.
     val live: AccountLiveData = AccountLiveData(this)
     val liveLanguages: AccountLiveData = AccountLiveData(this)
+    val liveLastRead: AccountLiveData = AccountLiveData(this)
     val saveable: AccountLiveData = AccountLiveData(this)
 
     var userProfileCache: User? = null
 
+    fun updateOptOutOptions(warnReports: Boolean, filterSpam: Boolean) {
+        warnAboutPostsWithReports = warnReports
+        filterSpamFromStrangers = filterSpam
+        OptOutFromFilters.start(warnAboutPostsWithReports, filterSpamFromStrangers)
+        if (!filterSpamFromStrangers) {
+            transientHiddenUsers = setOf()
+        }
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
     fun userProfile(): User {
         return userProfileCache ?: run {
             val myUser: User = LocalCache.getOrCreateUser(loggedIn.pubKey.toHexKey())
@@ -89,10 +106,6 @@ class Account(
         return followingChannels.map { LocalCache.getOrCreateChannel(it) }
     }
 
-    fun hiddenUsers(): List<User> {
-        return (hiddenUsers + transientHiddenUsers).map { LocalCache.getOrCreateUser(it) }
-    }
-
     fun isWriteable(): Boolean {
         return loggedIn.privKey != null
     }
@@ -133,8 +146,8 @@ class Account(
         }
     }
 
-    fun reactionTo(note: Note): List<Note> {
-        return note.reactedBy(userProfile(), "+")
+    fun reactionTo(note: Note, reaction: String): List<Note> {
+        return note.reactedBy(userProfile(), reaction)
     }
 
     fun hasBoosted(note: Note): Boolean {
@@ -145,20 +158,20 @@ class Account(
         return note.boostedBy(userProfile())
     }
 
-    fun hasReacted(note: Note): Boolean {
-        return note.hasReacted(userProfile(), "+")
+    fun hasReacted(note: Note, reaction: String): Boolean {
+        return note.hasReacted(userProfile(), reaction)
     }
 
-    fun reactTo(note: Note) {
+    fun reactTo(note: Note, reaction: String) {
         if (!isWriteable()) return
 
-        if (hasReacted(note)) {
+        if (hasReacted(note, reaction)) {
             // has already liked this note
             return
         }
 
         note.event?.let {
-            val event = ReactionEvent.createLike(it, loggedIn.privKey!!)
+            val event = ReactionEvent.create(reaction, it, loggedIn.privKey!!)
             Client.send(event)
             LocalCache.consume(event)
         }
@@ -318,9 +331,15 @@ class Account(
         }
 
         note.event?.let {
-            val event = RepostEvent.create(it, loggedIn.privKey!!)
-            Client.send(event)
-            LocalCache.consume(event)
+            if (it.kind() == 1) {
+                val event = RepostEvent.create(it, loggedIn.privKey!!)
+                Client.send(event)
+                LocalCache.consume(event)
+            } else {
+                val event = GenericRepostEvent.create(it, loggedIn.privKey!!)
+                Client.send(event)
+                LocalCache.consume(event)
+            }
         }
     }
 
@@ -487,7 +506,11 @@ class Account(
         mentions: List<User>?,
         tags: List<String>? = null,
         zapReceiver: String? = null,
-        wantsToMarkAsSensitive: Boolean
+        wantsToMarkAsSensitive: Boolean,
+        zapRaiserAmount: Long? = null,
+        replyingTo: String?,
+        root: String?,
+        directMentions: Set<HexKey>
     ) {
         if (!isWriteable()) return
 
@@ -503,6 +526,10 @@ class Account(
             extraTags = tags,
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount,
+            replyingTo = replyingTo,
+            root = root,
+            directMentions = directMentions,
             privateKey = loggedIn.privKey!!
         )
 
@@ -520,7 +547,8 @@ class Account(
         consensusThreshold: Int?,
         closedAt: Int?,
         zapReceiver: String? = null,
-        wantsToMarkAsSensitive: Boolean
+        wantsToMarkAsSensitive: Boolean,
+        zapRaiserAmount: Long? = null
     ) {
         if (!isWriteable()) return
 
@@ -540,14 +568,15 @@ class Account(
             consensusThreshold = consensusThreshold,
             closedAt = closedAt,
             zapReceiver = zapReceiver,
-            markAsSensitive = wantsToMarkAsSensitive
+            markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount
         )
         // println("Sending new PollNoteEvent: %s".format(signedEvent.toJson()))
         Client.send(signedEvent)
         LocalCache.consume(signedEvent)
     }
 
-    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean) {
+    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
         if (!isWriteable()) return
 
         // val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -561,27 +590,28 @@ class Account(
             mentions = mentionsHex,
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount,
             privateKey = loggedIn.privKey!!
         )
         Client.send(signedEvent)
         LocalCache.consume(signedEvent, null)
     }
 
-    fun sendPrivateMessage(message: String, toUser: String, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean) {
+    fun sendPrivateMessage(message: String, toUser: User, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
         if (!isWriteable()) return
-        val user = LocalCache.users[toUser] ?: return
 
         val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
         val mentionsHex = mentions?.map { it.pubkeyHex }
 
         val signedEvent = PrivateDmEvent.create(
-            recipientPubKey = user.pubkey(),
-            publishedRecipientPubKey = user.pubkey(),
+            recipientPubKey = toUser.pubkey(),
+            publishedRecipientPubKey = toUser.pubkey(),
             msg = message,
             replyTos = repliesToHex,
             mentions = mentionsHex,
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount,
             privateKey = loggedIn.privKey!!,
             advertiseNip18 = false
         )
@@ -848,6 +878,12 @@ class Account(
         saveable.invalidateData()
     }
 
+    fun changeReactionTypes(newTypes: List<String>) {
+        reactionChoices = newTypes
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
     fun changeZapPaymentRequest(newServer: Nip47URI?) {
         zapPaymentRequest = newServer
         live.invalidateData()
@@ -1004,10 +1040,10 @@ class Account(
     }
 
     private fun updateContactListTo(newContactList: ContactListEvent?) {
-        if (newContactList?.unverifiedFollowKeySet().isNullOrEmpty()) return
+        if (newContactList == null || newContactList.tags.isEmpty()) return
 
         // Events might be different objects, we have to compare their ids.
-        if (backupContactList?.id != newContactList?.id) {
+        if (backupContactList?.id != newContactList.id) {
             backupContactList = newContactList
             saveable.invalidateData()
         }
@@ -1062,12 +1098,19 @@ class Account(
     }
 
     fun isAcceptable(user: User): Boolean {
+        if (!warnAboutPostsWithReports) {
+            return !isHidden(user) && // if user hasn't hided this author
+                user.reportsBy(userProfile()).isEmpty() // if user has not reported this post
+        }
         return !isHidden(user) && // if user hasn't hided this author
             user.reportsBy(userProfile()).isEmpty() && // if user has not reported this post
             user.countReportAuthorsBy(followingKeySet()) < 5
     }
 
     fun isAcceptableDirect(note: Note): Boolean {
+        if (!warnAboutPostsWithReports) {
+            return note.reportsBy(userProfile()).isEmpty()
+        }
         return note.reportsBy(userProfile()).isEmpty() && // if user has not reported this post
             note.countReportAuthorsBy(followingKeySet()) < 5 // if it has 5 reports by reliable users
     }
@@ -1080,7 +1123,7 @@ class Account(
         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.event !is GenericRepostEvent) ||
                     (note.replyTo?.firstOrNull { isAcceptableDirect(it) } != null)
                 ) // is not a reaction about a blocked post
     }
@@ -1088,7 +1131,7 @@ class Account(
     fun getRelevantReports(note: Note): Set<Note> {
         val followsPlusMe = userProfile().latestContactList?.verifiedFollowKeySetAndMe ?: emptySet()
 
-        val innerReports = if (note.event is RepostEvent) {
+        val innerReports = if (note.event is RepostEvent || note.event is GenericRepostEvent) {
             note.replyTo?.map { getRelevantReports(it) }?.flatten() ?: emptyList()
         } else {
             emptyList()
@@ -1125,6 +1168,19 @@ class Account(
         live.invalidateData()
     }
 
+    fun markAsRead(route: String, timestampInSecs: Long) {
+        val lastTime = lastReadPerRoute[route]
+        if (lastTime == null || timestampInSecs > lastTime) {
+            lastReadPerRoute = lastReadPerRoute + Pair(route, timestampInSecs)
+            saveable.invalidateData()
+            liveLastRead.invalidateData()
+        }
+    }
+
+    fun loadLastRead(route: String): Long {
+        return lastReadPerRoute[route] ?: 0
+    }
+
     fun registerObservers() {
         // Observes relays to restart connections
         userProfile().live().relays.observeForever {
@@ -1135,7 +1191,9 @@ class Account(
 
         // saves contact list for the next time.
         userProfile().live().follows.observeForever {
-            updateContactListTo(userProfile().latestContactList)
+            GlobalScope.launch(Dispatchers.IO) {
+                updateContactListTo(userProfile().latestContactList)
+            }
         }
 
         // imports transient blocks due to spam.
@@ -1166,14 +1224,14 @@ class Account(
 
 class AccountLiveData(private val account: Account) : LiveData<AccountState>(AccountState(account)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.Default) {
-        if (hasActiveObservers()) {
-            refresh()
-        }
-    }
+    private val bundler = BundledUpdate(300, Dispatchers.Default)
 
     fun invalidateData() {
-        bundler.invalidate()
+        bundler.invalidate() {
+            if (hasActiveObservers()) {
+                refresh()
+            }
+        }
     }
 
     fun refresh() {

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

@@ -3,7 +3,10 @@ package com.vitorpamplona.amethyst.model
 import android.util.Log
 import android.util.LruCache
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.OptOutFromFilters
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import kotlinx.coroutines.Dispatchers
@@ -16,11 +19,20 @@ class AntiSpamFilter {
 
     @Synchronized
     fun isSpam(event: Event, relay: Relay?): Boolean {
+        checkNotInMainThread()
+
+        if (!OptOutFromFilters.filterSpamFromStrangers) return false
+
         val idHex = event.id
 
         // if short message, ok
+        // The idea here is to avoid considering repeated "GM" messages spam.
         if (event.content.length < 50) return false
 
+        // if the message is actually short but because it cites a user/event, the nostr: string is really long, make it ok.
+        // The idea here is to avoid considering repeated "@Bot, command" messages spam, while still blocking repeated "lnbc..." invoices or fishing urls
+        if (event.content.length < 180 && Nip19.nip19regex.matcher(event.content).find()) return false
+
         // double list strategy:
         // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
 
@@ -28,6 +40,7 @@ class AntiSpamFilter {
         val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
 
         if ((recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null) {
+            Log.w("Potential SPAM Message for sharing", "${Nip19.createNEvent(event.id, event.pubKey, event.kind, null)}")
             Log.w("Potential SPAM Message", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${relay?.url} ${event.content.replace("\n", " | ")}")
 
             // Log down offenders
@@ -55,14 +68,14 @@ class AntiSpamFilter {
 class AntiSpamLiveData(val cache: AntiSpamFilter) : LiveData<AntiSpamState>(AntiSpamState(cache)) {
 
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO) {
-        if (hasActiveObservers()) {
-            postValue(AntiSpamState(cache))
-        }
-    }
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
-        bundler.invalidate()
+        bundler.invalidate() {
+            if (hasActiveObservers()) {
+                postValue(AntiSpamState(cache))
+            }
+        }
     }
 }
 

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.model
 
+import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
@@ -9,6 +10,7 @@ import fr.acinq.secp256k1.Hex
 import kotlinx.coroutines.Dispatchers
 import java.util.concurrent.ConcurrentHashMap
 
+@Stable
 class Channel(val idHex: String) {
     var creator: User? = null
     var info = ChannelCreateEvent.ChannelData(null, null, null)
@@ -33,6 +35,10 @@ class Channel(val idHex: String) {
         notes.remove(note.idHex)
     }
 
+    fun removeNote(noteHex: String) {
+        notes.remove(noteHex)
+    }
+
     fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
         this.creator = creator
         this.info = channelInfo
@@ -74,14 +80,14 @@ class Channel(val idHex: String) {
 
 class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelState(channel)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO) {
-        if (hasActiveObservers()) {
-            postValue(ChannelState(channel))
-        }
-    }
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
-        bundler.invalidate()
+        bundler.invalidate() {
+            if (hasActiveObservers()) {
+                postValue(ChannelState(channel))
+            }
+        }
     }
 
     override fun onActive() {

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

@@ -11,11 +11,13 @@ fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
         "lightning", "lightningnetwork" -> HashtagIcon(R.drawable.ht_lightning, "Lightning", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
         "zap", "zaps", "zapper", "zappers", "zapping", "zapped", "zapathon", "zapraiser", "zaplife", "zapchain" -> HashtagIcon(R.drawable.zap, "Zap", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
         "amethyst" -> HashtagIcon(R.drawable.amethyst, "Amethyst", Color.Unspecified, Modifier.padding(3.dp, 2.dp, 0.dp, 0.dp))
+        "onyx" -> HashtagIcon(R.drawable.black_heart, "Onyx", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
         "plebs", "pleb", "plebchain" -> HashtagIcon(R.drawable.plebs, "Pleb", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 1.dp))
         "coffee", "coffeechain", "cafe" -> HashtagIcon(R.drawable.coffee, "Coffee", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
         "skullofsatoshi" -> HashtagIcon(R.drawable.skull, "SkullofSatoshi", Color.Unspecified, Modifier.padding(2.dp, 1.dp, 0.dp, 0.dp))
         "grownostr", "gardening", "garden" -> HashtagIcon(R.drawable.grownostr, "GrowNostr", Color.Unspecified, Modifier.padding(0.dp, 1.dp, 0.dp, 1.dp))
         "footstr" -> HashtagIcon(R.drawable.footstr, "Footstr", Color.Unspecified, Modifier.padding(1.dp, 1.dp, 0.dp, 0.dp))
+        "weed", "weedstr", "420", "cannabis", "marijuana" -> HashtagIcon(R.drawable.weed, "Weed", Color.Unspecified, Modifier.padding(0.dp, 0.dp, 0.dp, 0.dp))
         else -> null
     }
 }

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

@@ -1,9 +1,8 @@
 package com.vitorpamplona.amethyst.model
 
 import android.util.Log
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Relay
@@ -13,7 +12,6 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import nostr.postr.toNpub
-import java.io.ByteArrayInputStream
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -23,12 +21,6 @@ import java.time.format.DateTimeFormatter
 import java.util.concurrent.ConcurrentHashMap
 
 object LocalCache {
-    val metadataParser by lazy {
-        jacksonObjectMapper()
-            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-            .readerFor(UserMetadata::class.java)
-    }
-
     val antiSpam = AntiSpamFilter()
 
     val users = ConcurrentHashMap<HexKey, User>(5000)
@@ -40,6 +32,8 @@ object LocalCache {
         ConcurrentHashMap<HexKey, Pair<Note?, (LnZapPaymentResponseEvent) -> Unit>>(10)
 
     fun checkGetOrCreateUser(key: String): User? {
+        checkNotInMainThread()
+
         if (isValidHexNpub(key)) {
             return getOrCreateUser(key)
         }
@@ -48,6 +42,8 @@ object LocalCache {
 
     @Synchronized
     fun getOrCreateUser(key: HexKey): User {
+        // checkNotInMainThread()
+
         return users[key] ?: run {
             val answer = User(key)
             users.put(key, answer)
@@ -55,18 +51,41 @@ object LocalCache {
         }
     }
 
+    fun getUserIfExists(key: String): User? {
+        return users[key]
+    }
+
+    fun getNoteIfExists(key: String): Note? {
+        return addressables[key] ?: notes[key]
+    }
+
+    fun getChannelIfExists(key: String): Channel? {
+        return channels[key]
+    }
+
     fun checkGetOrCreateNote(key: String): Note? {
+        checkNotInMainThread()
+
         if (ATag.isATag(key)) {
             return checkGetOrCreateAddressableNote(key)
         }
         if (isValidHexNpub(key)) {
-            return getOrCreateNote(key)
+            val note = getOrCreateNote(key)
+            val noteEvent = note.event
+            if (noteEvent is AddressableEvent) {
+                // upgrade to the latest
+                return checkGetOrCreateAddressableNote(noteEvent.address().toTag())
+            } else {
+                return note
+            }
         }
         return null
     }
 
     @Synchronized
     fun getOrCreateNote(idHex: String): Note {
+        checkNotInMainThread()
+
         return notes[idHex] ?: run {
             val answer = Note(idHex)
             notes.put(idHex, answer)
@@ -75,6 +94,8 @@ object LocalCache {
     }
 
     fun checkGetOrCreateChannel(key: String): Channel? {
+        checkNotInMainThread()
+
         if (isValidHexNpub(key)) {
             return getOrCreateChannel(key)
         }
@@ -93,6 +114,8 @@ object LocalCache {
 
     @Synchronized
     fun getOrCreateChannel(key: String): Channel {
+        checkNotInMainThread()
+
         return channels[key] ?: run {
             val answer = Channel(key)
             channels.put(key, answer)
@@ -115,33 +138,35 @@ object LocalCache {
     }
 
     @Synchronized
-    fun getOrCreateAddressableNote(key: ATag): AddressableNote {
+    fun getOrCreateAddressableNoteInternal(key: ATag): AddressableNote {
+        checkNotInMainThread()
+
         // we can't use naddr here because naddr might include relay info and
         // the preferred relay should not be part of the index.
         return addressables[key.toTag()] ?: run {
             val answer = AddressableNote(key)
-            answer.author = checkGetOrCreateUser(key.pubKeyHex)
             addressables.put(key.toTag(), answer)
             answer
         }
     }
 
+    fun getOrCreateAddressableNote(key: ATag): AddressableNote {
+        val note = getOrCreateAddressableNoteInternal(key)
+        // Loads the user outside a Syncronized block to avoid blocking
+        if (note.author == null) {
+            note.author = checkGetOrCreateUser(key.pubKeyHex)
+        }
+        return note
+    }
+
     fun consume(event: MetadataEvent) {
         // new event
         val oldUser = getOrCreateUser(event.pubKey)
         if (oldUser.info == null || event.createdAt > oldUser.info!!.updatedMetadataAt) {
-            val newUser = try {
-                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
+            val newUserMetadata = event.contactMetaData()
+            if (newUserMetadata != null) {
+                oldUser.updateUserInfo(newUserMetadata, event)
             }
-
-            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)}")
@@ -161,9 +186,15 @@ object LocalCache {
     }
 
     fun consume(event: PeopleListEvent) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         // Already processed this event.
         if (note.event?.id() == event.id()) return
 
@@ -216,9 +247,15 @@ object LocalCache {
     }
 
     fun consume(event: LongTextNoteEvent, relay: Relay?) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         if (relay != null) {
             author.addRelayBeingUsed(relay, event.createdAt)
             note.addRelay(relay)
@@ -281,34 +318,93 @@ object LocalCache {
         refreshObservers(note)
     }
 
-    private fun consume(event: PinListEvent) {
+    private fun consume(event: LiveActivitiesEvent, relay: Relay?) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
-        // Already processed this event.
-        if (note.event != null) return
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
 
-        note.loadEvent(event, author, emptyList())
+        if (note.event?.id() == event.id()) return
 
-        refreshObservers(note)
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+    }
+
+    private fun consume(event: PinListEvent) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+    }
+
+    private fun consume(event: RelaySetEvent) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
     }
 
     private fun consume(event: AudioTrackEvent) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         // Already processed this event.
-        if (note.event != null) return
+        if (note.event?.id() == event.id()) return
 
-        note.loadEvent(event, author, emptyList())
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
 
-        refreshObservers(note)
+            refreshObservers(note)
+        }
     }
 
     fun consume(event: BadgeDefinitionEvent) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         // Already processed this event.
         if (note.event?.id() == event.id()) return
 
@@ -320,9 +416,15 @@ object LocalCache {
     }
 
     fun consume(event: BadgeProfilesEvent) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         // Already processed this event.
         if (note.event?.id() == event.id()) return
 
@@ -357,6 +459,46 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    fun consume(event: AppDefinitionEvent) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+    }
+
+    fun consume(event: AppRecommendationEvent) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        // Already processed this event.
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+    }
+
     @Suppress("UNUSED_PARAMETER")
     fun consume(event: RecommendRelayEvent) {
 //        // Log.d("RR", event.toJson())
@@ -429,8 +571,10 @@ object LocalCache {
                     masterNote.removeReport(deleteNote)
                 }
 
-                val channel = deleteNote.channel()
-                channel?.removeNote(deleteNote)
+                deleteNote.channelHex()?.let {
+                    val channel = checkGetOrCreateChannel(it)
+                    channel?.removeNote(deleteNote)
+                }
 
                 if (deleteNote.event is PrivateDmEvent) {
                     val author = deleteNote.author
@@ -478,6 +622,31 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    fun consume(event: GenericRepostEvent) {
+        val note = getOrCreateNote(event.id)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        // Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+        val author = getOrCreateUser(event.pubKey)
+        val repliesTo = event.boostedPost().mapNotNull { checkGetOrCreateNote(it) } +
+            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
+
+        note.loadEvent(event, author, repliesTo)
+
+        // Prepares user's profile view.
+        author.addNote(note)
+
+        // Counts the replies
+        repliesTo.forEach {
+            it.addBoost(note)
+        }
+
+        refreshObservers(note)
+    }
+
     fun consume(event: ReactionEvent) {
         val note = getOrCreateNote(event.id)
 
@@ -492,26 +661,8 @@ object LocalCache {
 
         // Log.d("RE", "New Reaction ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
 
-        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)
-            }
+        repliesTo.forEach {
+            it.addReaction(note)
         }
 
         refreshObservers(note)
@@ -541,9 +692,15 @@ object LocalCache {
             mentions.forEach {
                 it.addReport(note)
             }
-        }
-        repliesTo.forEach {
-            it.addReport(note)
+        } else {
+            repliesTo.forEach {
+                it.addReport(note)
+            }
+
+            mentions.forEach {
+                // doesn't add to reports, but triggers recounts
+                it.liveSet?.reports?.invalidateData()
+            }
         }
 
         refreshObservers(note)
@@ -839,6 +996,8 @@ object LocalCache {
     }
 
     fun findUsersStartingWith(username: String): List<User> {
+        checkNotInMainThread()
+
         val key = decodePublicKeyAsHexOrNull(username)
 
         if (key != null && users[key] != null) {
@@ -853,6 +1012,8 @@ object LocalCache {
     }
 
     fun findNotesStartingWith(text: String): List<Note> {
+        checkNotInMainThread()
+
         val key = try {
             Nip19.uriToRoute(text)?.hex ?: Hex.decode(text).toHexKey()
         } catch (e: Exception) {
@@ -878,6 +1039,8 @@ object LocalCache {
     }
 
     fun findChannelsStartingWith(text: String): List<Channel> {
+        checkNotInMainThread()
+
         val key = try {
             Nip19.uriToRoute(text)?.hex ?: Hex.decode(text).toHexKey()
         } catch (e: Exception) {
@@ -906,6 +1069,8 @@ object LocalCache {
     }
 
     fun pruneOldAndHiddenMessages(account: Account) {
+        checkNotInMainThread()
+
         channels.forEach { it ->
             val toBeRemoved = it.value.pruneOldAndHiddenMessages(account)
 
@@ -924,6 +1089,8 @@ object LocalCache {
     }
 
     fun pruneHiddenMessages(account: Account) {
+        checkNotInMainThread()
+
         val toBeRemoved = account.hiddenUsers.map {
             (users[it]?.notes ?: emptySet())
         }.flatten()
@@ -951,6 +1118,8 @@ object LocalCache {
     }
 
     fun pruneContactLists(userAccount: Account) {
+        checkNotInMainThread()
+
         var removingContactList = 0
         users.values.forEach {
             if (it != userAccount.userProfile() && (it.liveSet == null || it.liveSet?.isInUse() == false) && it.latestContactList != null) {
@@ -969,11 +1138,22 @@ object LocalCache {
         live.invalidateData(newNote)
     }
 
-    fun consume(event: Event, relay: Relay?) {
-        if (!event.hasValidSignature()) return
+    fun verifyAndConsume(event: Event, relay: Relay?) {
+        checkNotInMainThread()
+
+        if (!event.hasValidSignature()) {
+            try {
+                event.checkSignature()
+            } catch (e: Exception) {
+                Log.w("Event failed retest ${event.kind}", e.message ?: "")
+            }
+            return
+        }
 
         try {
             when (event) {
+                is AppDefinitionEvent -> consume(event)
+                is AppRecommendationEvent -> consume(event)
                 is AudioTrackEvent -> consume(event)
                 is BadgeAwardEvent -> consume(event)
                 is BadgeDefinitionEvent -> consume(event)
@@ -991,9 +1171,10 @@ object LocalCache {
                 is FileStorageEvent -> consume(event, relay)
                 is FileStorageHeaderEvent -> consume(event, relay)
                 is HighlightEvent -> consume(event, relay)
+                is LiveActivitiesEvent -> consume(event, relay)
                 is LnZapEvent -> {
                     event.zapRequest?.let {
-                        consume(it, relay)
+                        verifyAndConsume(it, relay)
                     }
                     consume(event)
                 }
@@ -1007,10 +1188,17 @@ object LocalCache {
                 is PeopleListEvent -> consume(event)
                 is ReactionEvent -> consume(event)
                 is RecommendRelayEvent -> consume(event)
+                is RelaySetEvent -> consume(event)
                 is ReportEvent -> consume(event, relay)
                 is RepostEvent -> {
                     event.containedPost()?.let {
-                        consume(it, relay)
+                        verifyAndConsume(it, relay)
+                    }
+                    consume(event)
+                }
+                is GenericRepostEvent -> {
+                    event.containedPost()?.let {
+                        verifyAndConsume(it, relay)
                     }
                     consume(event)
                 }

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

@@ -4,11 +4,13 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.ui.actions.updated
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
@@ -42,7 +44,7 @@ open class Note(val idHex: String) {
     // These fields are updated every time an event related to this note is received.
     var replies = setOf<Note>()
         private set
-    var reactions = setOf<Note>()
+    var reactions = mapOf<String, Set<Note>>()
         private set
     var boosts = setOf<Note>()
         private set
@@ -73,10 +75,6 @@ open class Note(val idHex: String) {
             ?: (event as? ChannelCreateEvent)?.id
     }
 
-    fun channel(): Channel? {
-        return channelHex()?.let { LocalCache.checkGetOrCreateChannel(it) }
-    }
-
     open fun address(): ATag? = null
 
     open fun createdAt() = event?.createdAt()
@@ -99,7 +97,7 @@ open class Note(val idHex: String) {
      */
     fun replyLevelSignature(cachedSignatures: MutableMap<Note, String> = mutableMapOf()): String {
         val replyTo = replyTo
-        if (replyTo == null || replyTo.isEmpty()) {
+        if (event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()) {
             return "/" + formattedDateTime(createdAt() ?: 0) + ";"
         }
 
@@ -112,7 +110,7 @@ open class Note(val idHex: String) {
 
     fun replyLevel(cachedLevels: MutableMap<Note, Int> = mutableMapOf()): Int {
         val replyTo = replyTo
-        if (replyTo == null || replyTo.isEmpty()) {
+        if (event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()) {
             return 0
         }
 
@@ -137,8 +135,20 @@ open class Note(val idHex: String) {
         liveSet?.boosts?.invalidateData()
     }
     fun removeReaction(note: Note) {
-        reactions = reactions - note
-        liveSet?.reactions?.invalidateData()
+        val reaction = note.event?.content() ?: "+"
+
+        if (reaction in reactions.keys && reactions[reaction]?.contains(note) == true) {
+            reactions[reaction]?.let {
+                val newList = it.minus(note)
+                if (newList.isEmpty()) {
+                    reactions = reactions.minus(reaction)
+                } else {
+                    reactions = reactions + Pair(reaction, newList)
+                }
+
+                liveSet?.reactions?.invalidateData()
+            }
+        }
     }
 
     fun removeReport(deleteNote: Note) {
@@ -183,6 +193,7 @@ open class Note(val idHex: String) {
 
     @Synchronized
     fun addZap(zapRequest: Note, zap: Note?) {
+        checkNotInMainThread()
         if (zapRequest !in zaps.keys) {
             zaps = zaps + Pair(zapRequest, zap)
             liveSet?.zaps?.invalidateData()
@@ -194,6 +205,7 @@ open class Note(val idHex: String) {
 
     @Synchronized
     fun addZapPayment(zapPaymentRequest: Note, zapPayment: Note?) {
+        checkNotInMainThread()
         if (zapPaymentRequest !in zapPayments.keys) {
             zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
             liveSet?.zaps?.invalidateData()
@@ -204,8 +216,13 @@ open class Note(val idHex: String) {
     }
 
     fun addReaction(note: Note) {
-        if (note !in reactions) {
-            reactions = reactions + note
+        val reaction = note.event?.content() ?: "+"
+
+        if (reaction !in reactions.keys) {
+            reactions = reactions + Pair(reaction, setOf(note))
+            liveSet?.reactions?.invalidateData()
+        } else if (reactions[reaction]?.contains(note) == false) {
+            reactions = reactions + Pair(reaction, (reactions[reaction] ?: emptySet()) + note)
             liveSet?.reactions?.invalidateData()
         }
     }
@@ -244,8 +261,10 @@ open class Note(val idHex: String) {
         }
     }
 
-    fun isReactedBy(user: User): Boolean {
-        return reactions.any { it.author?.pubkeyHex == user.pubkeyHex }
+    fun isReactedBy(user: User): String? {
+        return reactions.filter {
+            it.value.any { it.author?.pubkeyHex == user.pubkeyHex }
+        }.keys.firstOrNull()
     }
 
     fun isBoostedBy(user: User): Boolean {
@@ -270,6 +289,10 @@ open class Note(val idHex: String) {
         }.flatten()
     }
 
+    fun countReactions(): Int {
+        return reactions.values.sumOf { it.size }
+    }
+
     fun zappedAmount(privKey: ByteArray?, walletServicePubkey: ByteArray?): BigDecimal {
         // Regular Zap Receipts
         val completedZaps = zaps.asSequence()
@@ -350,7 +373,7 @@ open class Note(val idHex: String) {
     }
 
     fun isNewThread(): Boolean {
-        return event is RepostEvent || replyTo == null || replyTo?.size == 0
+        return event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo?.size == 0
     }
 
     fun hasZapped(loggedIn: User): Boolean {
@@ -362,7 +385,11 @@ open class Note(val idHex: String) {
     }
 
     fun reactedBy(loggedIn: User, content: String): List<Note> {
-        return reactions.filter { it.author == loggedIn && it.event?.content() == content }
+        return reactions[content]?.filter { it.author == loggedIn && it.event?.content() == content } ?: emptyList()
+    }
+
+    fun reactedBy(loggedIn: User): List<String> {
+        return reactions.filter { it.value.any { it.author == loggedIn } }.mapNotNull { it.key }
     }
 
     fun hasBoostedInTheLast5Minutes(loggedIn: User): Boolean {
@@ -374,6 +401,42 @@ open class Note(val idHex: String) {
         return boosts.filter { it.author == loggedIn }
     }
 
+    fun moveAllReferencesTo(note: AddressableNote) {
+        // migrates these comments to a new version
+        replies.forEach {
+            note.addReply(it)
+            it.replyTo = it.replyTo?.updated(this, note)
+        }
+        reactions.forEach {
+            it.value.forEach {
+                note.addReaction(it)
+                it.replyTo = it.replyTo?.updated(this, note)
+            }
+        }
+        boosts.forEach {
+            note.addBoost(it)
+            it.replyTo = it.replyTo?.updated(this, note)
+        }
+        reports.forEach {
+            it.value.forEach {
+                note.addReport(it)
+                it.replyTo = it.replyTo?.updated(this, note)
+            }
+        }
+        zaps.forEach {
+            note.addZap(it.key, it.value)
+            it.key.replyTo = it.key.replyTo?.updated(this, note)
+            it.value?.replyTo = it.value?.replyTo?.updated(this, note)
+        }
+
+        replyTo = null
+        replies = emptySet()
+        reactions = emptyMap()
+        boosts = emptySet()
+        reports = emptyMap()
+        zaps = emptyMap()
+    }
+
     var liveSet: NoteLiveSet? = null
 
     fun live(): NoteLiveSet {
@@ -414,14 +477,14 @@ class NoteLiveSet(u: Note) {
 
 class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO) {
-        // if (hasObservers()) {
-        postValue(NoteState(note))
-        // }
-    }
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
-        bundler.invalidate()
+        bundler.invalidate() {
+            // if (hasObservers()) {
+            postValue(NoteState(note))
+            // }
+        }
     }
 
     override fun onActive() {

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.model
 
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.service.relays.FeedType
 
+@Immutable
 data class RelaySetupInfo(
     val url: String,
     val read: Boolean,

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

@@ -1,6 +1,9 @@
 package com.vitorpamplona.amethyst.model
 
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.ATag
+import com.vitorpamplona.amethyst.service.model.GenericRepostEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
@@ -9,6 +12,8 @@ class ThreadAssembler {
     private fun searchRoot(note: Note, testedNotes: MutableSet<Note> = mutableSetOf()): Note? {
         if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
 
+        if (note.event is RepostEvent || note.event is GenericRepostEvent) return note
+
         testedNotes.add(note)
 
         val markedAsRoot = note.event?.tags()?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1)
@@ -35,6 +40,8 @@ class ThreadAssembler {
 
     @OptIn(ExperimentalTime::class)
     fun findThreadFor(noteId: String): Set<Note> {
+        checkNotInMainThread()
+
         val (result, elapsed) = measureTimedValue {
             val note = if (noteId.contains(":")) {
                 val aTag = ATag.parse(noteId, null)

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

@@ -1,46 +1,56 @@
 package com.vitorpamplona.amethyst.model
 
+import android.util.LruCache
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.previews.BahaUrlPreview
 import com.vitorpamplona.amethyst.service.previews.IUrlPreviewCallback
 import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import com.vitorpamplona.amethyst.ui.components.UrlPreviewState
 
 object UrlCachedPreviewer {
-    var cache = mapOf<String, UrlInfoItem>()
-        private set
-    var failures = mapOf<String, Throwable>()
+    var cache = LruCache<String, UrlPreviewState>(100)
         private set
 
-    fun previewInfo(url: String, callback: IUrlPreviewCallback? = null) {
+    fun previewInfo(url: String, onReady: (UrlPreviewState) -> Unit) {
+        checkNotInMainThread()
+
         cache[url]?.let {
-            callback?.onComplete(it)
+            onReady(it)
             return
         }
 
-        failures[url]?.let {
-            callback?.onFailed(it)
-            return
-        }
-
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            BahaUrlPreview(
-                url,
-                object : IUrlPreviewCallback {
-                    override fun onComplete(urlInfo: UrlInfoItem) {
-                        cache = cache + Pair(url, urlInfo)
-                        callback?.onComplete(urlInfo)
+        BahaUrlPreview(
+            url,
+            object : IUrlPreviewCallback {
+                override fun onComplete(urlInfo: UrlInfoItem) {
+                    cache[url]?.let {
+                        if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
+                            onReady(it)
+                            return
+                        }
                     }
 
-                    override fun onFailed(throwable: Throwable) {
-                        failures = failures + Pair(url, throwable)
-                        callback?.onFailed(throwable)
+                    val state = if (urlInfo.allFetchComplete() && urlInfo.url == url) {
+                        UrlPreviewState.Loaded(urlInfo)
+                    } else {
+                        UrlPreviewState.Empty
                     }
+
+                    cache.put(url, state)
+                    onReady(state)
                 }
-            ).fetchUrlPreview()
-        }
+
+                override fun onFailed(throwable: Throwable) {
+                    cache[url]?.let {
+                        onReady(it)
+                        return
+                    }
+
+                    val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")
+                    cache.put(url, state)
+                    onReady(state)
+                }
+            }
+        ).fetchUrlPreview()
     }
 }

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

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
 import com.vitorpamplona.amethyst.service.model.ContactListEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
@@ -95,10 +96,10 @@ class User(val pubkeyHex: String) {
         // Update Followers of the past user list
         // Update Followers of the new contact list
         (oldContactListEvent)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.users[it]?.liveSet?.follows?.invalidateData()
+            LocalCache.users[it]?.liveSet?.followers?.invalidateData()
         }
         (latestContactList)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.users[it]?.liveSet?.follows?.invalidateData()
+            LocalCache.users[it]?.liveSet?.followers?.invalidateData()
         }
 
         liveSet?.relays?.invalidateData()
@@ -185,6 +186,8 @@ class User(val pubkeyHex: String) {
 
     @Synchronized
     private fun getOrCreatePrivateChatroom(user: User): Chatroom {
+        checkNotInMainThread()
+
         return privateChatrooms[user] ?: run {
             val privateChatroom = Chatroom(setOf<Note>())
             privateChatrooms = privateChatrooms + Pair(user, privateChatroom)
@@ -194,6 +197,8 @@ class User(val pubkeyHex: String) {
 
     @Synchronized
     fun addMessage(user: User, msg: Note) {
+        checkNotInMainThread()
+
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg !in privateChatroom.roomMessages) {
             privateChatroom.roomMessages = privateChatroom.roomMessages + msg
@@ -203,6 +208,8 @@ class User(val pubkeyHex: String) {
 
     @Synchronized
     fun removeMessage(user: User, msg: Note) {
+        checkNotInMainThread()
+
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg in privateChatroom.roomMessages) {
             privateChatroom.roomMessages = privateChatroom.roomMessages - msg
@@ -249,15 +256,11 @@ class User(val pubkeyHex: String) {
     }
 
     fun isFollowing(user: User): Boolean {
-        return latestContactList?.unverifiedFollowKeySet()?.toSet()?.let {
-            return user.pubkeyHex in it
-        } ?: false
+        return latestContactList?.isTaggedUser(user.pubkeyHex) ?: false
     }
 
     fun isFollowingHashtag(tag: String): Boolean {
-        return latestContactList?.unverifiedFollowTagSet()?.toSet()?.let {
-            return tag in it
-        } ?: false
+        return latestContactList?.isTaggedHash(tag) ?: false
     }
 
     fun isFollowingHashtagCached(tag: String): Boolean {
@@ -272,11 +275,17 @@ class User(val pubkeyHex: String) {
         } ?: false
     }
 
+    fun isFollowingCached(userHex: String): Boolean {
+        return latestContactList?.verifiedFollowKeySet?.let {
+            return userHex in it
+        } ?: false
+    }
+
     fun transientFollowCount(): Int? {
         return latestContactList?.unverifiedFollowKeySet()?.size
     }
 
-    fun transientFollowerCount(): Int {
+    suspend fun transientFollowerCount(): Int {
         return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
     }
 
@@ -292,7 +301,7 @@ class User(val pubkeyHex: String) {
         return latestContactList?.verifiedFollowKeySet?.size
     }
 
-    fun cachedFollowerCount(): Int {
+    suspend fun cachedFollowerCount(): Int {
         return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
     }
 
@@ -331,6 +340,7 @@ class User(val pubkeyHex: String) {
 class UserLiveSet(u: User) {
     // UI Observers line up here.
     val follows: UserLiveData = UserLiveData(u)
+    val followers: UserLiveData = UserLiveData(u)
     val reports: UserLiveData = UserLiveData(u)
     val messages: UserLiveData = UserLiveData(u)
     val relays: UserLiveData = UserLiveData(u)
@@ -342,6 +352,7 @@ class UserLiveSet(u: User) {
 
     fun isInUse(): Boolean {
         return follows.hasObservers() ||
+            followers.hasObservers() ||
             reports.hasObservers() ||
             messages.hasObservers() ||
             relays.hasObservers() ||
@@ -353,6 +364,7 @@ class UserLiveSet(u: User) {
     }
 }
 
+@Immutable
 data class RelayInfo(
     val url: String,
     var lastEvent: Long,
@@ -388,9 +400,13 @@ class UserMetadata {
     var updatedMetadataAt: Long = 0
     var latestMetadata: MetadataEvent? = null
 
+    fun anyName(): String? {
+        return display_name ?: displayName ?: name ?: username
+    }
+
     fun anyNameStartsWith(prefix: String): Boolean {
         return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
-            .any { it.startsWith(prefix, true) }
+            .any { it.contains(prefix, true) }
     }
 
     fun lnAddress(): String? {
@@ -400,14 +416,14 @@ class UserMetadata {
 
 class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO) {
-        if (hasActiveObservers()) {
-            postValue(UserState(user))
-        }
-    }
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
-        bundler.invalidate()
+        bundler.invalidate() {
+            if (hasActiveObservers()) {
+                postValue(UserState(user))
+            }
+        }
     }
 
     override fun onActive() {

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

@@ -20,6 +20,8 @@ class BlurHashFetcher(
 ) : Fetcher {
 
     override suspend fun fetch(): FetchResult {
+        checkNotInMainThread()
+
         val encodedHash = data.toString().removePrefix("bluehash:")
         val hash = URLDecoder.decode(encodedHash, "utf-8")
 

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

@@ -0,0 +1,12 @@
+package com.vitorpamplona.amethyst.service
+
+import android.os.Looper
+import com.vitorpamplona.amethyst.BuildConfig
+
+fun checkNotInMainThread() {
+    if (BuildConfig.DEBUG && isMainThread()) throw OnMainThreadException("It should not be in the MainThread")
+}
+
+fun isMainThread() = Looper.myLooper() == Looper.getMainLooper()
+
+class OnMainThreadException(str: String) : RuntimeException(str)

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

@@ -13,8 +13,6 @@ import okhttp3.Request
 import okhttp3.Response
 
 class Nip05Verifier() {
-    val client = HttpClient.getHttpClient()
-
     fun assembleUrl(nip05address: String): String? {
         val parts = nip05address.trim().split("@")
 
@@ -33,6 +31,8 @@ class Nip05Verifier() {
     }
 
     private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        // checkNotInMainThread()
+
         val url = assembleUrl(nip05)
 
         if (url == null) {
@@ -47,7 +47,7 @@ class Nip05Verifier() {
                     .url(url)
                     .build()
 
-                client.newCall(request).enqueue(object : Callback {
+                HttpClient.getHttpClient().newCall(request).enqueue(object : Callback {
                     override fun onResponse(call: Call, response: Response) {
                         response.use {
                             if (it.isSuccessful) {
@@ -70,6 +70,9 @@ class Nip05Verifier() {
     }
 
     fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        // check fails on tests
+        // checkNotInMainThread()
+
         val mapper = jacksonObjectMapper()
 
         fetchNip05Json(

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

@@ -88,6 +88,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                 PollNoteEvent.kind,
                 ReactionEvent.kind,
                 RepostEvent.kind,
+                GenericRepostEvent.kind,
                 ReportEvent.kind,
                 LnZapEvent.kind,
                 LnZapPaymentResponseEvent.kind,

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

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
@@ -12,9 +11,9 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
     var account: Account? = null
     var channel: Channel? = null
 
-    fun loadMessagesBetween(account: Account, channelId: String) {
+    fun loadMessagesBetween(account: Account, channel: Channel) {
         this.account = account
-        channel = LocalCache.getOrCreateChannel(channelId)
+        this.channel = channel
         resetFilters()
     }
 

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

@@ -1,7 +1,6 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
@@ -12,9 +11,9 @@ object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
     lateinit var account: Account
     var withUser: User? = null
 
-    fun loadMessagesBetween(accountIn: Account, userId: String) {
+    fun loadMessagesBetween(accountIn: Account, user: User) {
         account = accountIn
-        withUser = LocalCache.users[userId]
+        withUser = user
         resetFilters()
     }
 

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

@@ -39,7 +39,7 @@ abstract class NostrDataSource(val debugName: String) {
                     eventCounter = eventCounter + Pair(key, Counter(1))
                 }
 
-                LocalCache.consume(event, relay)
+                LocalCache.verifyAndConsume(event, relay)
             }
         }
 
@@ -103,16 +103,16 @@ abstract class NostrDataSource(val debugName: String) {
     }
 
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO) {
-        // println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
-
-        // adds the time to perform the refresh into this delay
-        // holding off new updates in case of heavy refresh routines.
-        resetFiltersSuspend()
-    }
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateFilters() {
-        bundler.invalidate()
+        bundler.invalidate() {
+            // println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
+
+            // adds the time to perform the refresh into this delay
+            // holding off new updates in case of heavy refresh routines.
+            resetFiltersSuspend()
+        }
     }
 
     fun resetFilters() {
@@ -123,6 +123,8 @@ abstract class NostrDataSource(val debugName: String) {
     }
 
     fun resetFiltersSuspend() {
+        checkNotInMainThread()
+
         // saves the channels that are currently active
         val activeSubscriptions = subscriptions.values.filter { it.typedFilters != null }
         // saves the current content to only update if it changes

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

@@ -3,10 +3,12 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.UserState
 import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
+import com.vitorpamplona.amethyst.service.model.GenericRepostEvent
 import com.vitorpamplona.amethyst.service.model.HighlightEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PinListEvent
 import com.vitorpamplona.amethyst.service.model.PollNoteEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
@@ -58,7 +60,16 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
+                kinds = listOf(
+                    TextNoteEvent.kind,
+                    RepostEvent.kind,
+                    GenericRepostEvent.kind,
+                    LongTextNoteEvent.kind,
+                    PollNoteEvent.kind,
+                    HighlightEvent.kind,
+                    AudioTrackEvent.kind,
+                    PinListEvent.kind
+                ),
                 authors = followSet,
                 limit = 400,
                 since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList

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

@@ -48,14 +48,14 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
                 filter = JsonFilter(
                     kinds = listOf(MetadataEvent.kind),
                     search = mySearchString,
-                    limit = 20
+                    limit = 100
                 )
             ),
             TypedFilter(
                 types = setOf(FeedType.SEARCH),
                 filter = JsonFilter(
                     search = mySearchString,
-                    limit = 20
+                    limit = 100
                 )
             )
         )

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

@@ -26,10 +26,11 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                     filter = JsonFilter(
                         kinds = listOf(
                             TextNoteEvent.kind, LongTextNoteEvent.kind,
-                            ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind,
+                            ReactionEvent.kind, RepostEvent.kind, GenericRepostEvent.kind, ReportEvent.kind,
                             LnZapEvent.kind, LnZapRequestEvent.kind,
                             BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind,
-                            PollNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind
+                            PollNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind,
+                            PeopleListEvent.kind, BookmarkListEvent.kind
                         ),
                         tags = mapOf("a" to listOf(aTag.toTag())),
                         since = it.lastReactionsDownloadTime
@@ -76,6 +77,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         LongTextNoteEvent.kind,
                         ReactionEvent.kind,
                         RepostEvent.kind,
+                        GenericRepostEvent.kind,
                         ReportEvent.kind,
                         LnZapEvent.kind,
                         LnZapRequestEvent.kind,
@@ -113,16 +115,6 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
-                    kinds = listOf(
-                        TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind,
-                        ReactionEvent.kind, RepostEvent.kind,
-                        LnZapEvent.kind, LnZapRequestEvent.kind,
-                        ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind,
-                        BadgeDefinitionEvent.kind, BadgeAwardEvent.kind, BadgeProfilesEvent.kind,
-                        PrivateDmEvent.kind,
-                        FileHeaderEvent.kind, FileStorageEvent.kind, FileStorageHeaderEvent.kind,
-                        HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind
-                    ),
                     ids = interestedEvents.toList()
                 )
             )

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

@@ -28,7 +28,16 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, RepostEvent.kind, LongTextNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind, PollNoteEvent.kind, HighlightEvent.kind),
+                kinds = listOf(
+                    TextNoteEvent.kind,
+                    GenericRepostEvent.kind,
+                    RepostEvent.kind,
+                    LongTextNoteEvent.kind,
+                    AudioTrackEvent.kind,
+                    PinListEvent.kind,
+                    PollNoteEvent.kind,
+                    HighlightEvent.kind
+                ),
                 authors = listOf(it.pubkeyHex),
                 limit = 200
             )
@@ -81,9 +90,9 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(BookmarkListEvent.kind, PeopleListEvent.kind),
+                kinds = listOf(BookmarkListEvent.kind, PeopleListEvent.kind, AppRecommendationEvent.kind),
                 authors = listOf(it.pubkeyHex),
-                limit = 1
+                limit = 100
             )
         )
     }

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.service.lnurl
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -45,6 +46,8 @@ class LightningAddressResolver() {
     }
 
     private suspend fun fetchLightningAddressJsonSuspend(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        checkNotInMainThread()
+
         val url = assembleUrl(lnaddress)
 
         if (url == null) {

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.service.lnurl
 
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import java.math.BigDecimal
 import java.util.Locale
 import java.util.regex.Pattern
@@ -98,7 +99,7 @@ object LnInvoiceUtil {
      * @return invoice amount in bitcoins, zero if the invoice has no amount
      * @throws RuntimeException if invoice format is incorrect
      */
-    fun getAmount(invoice: String): BigDecimal {
+    private fun getAmount(invoice: String): BigDecimal {
         try {
             decodeUnlimitedLength(invoice) // checksum must match
         } catch (e: AddressFormatException) {
@@ -121,6 +122,8 @@ object LnInvoiceUtil {
     }
 
     fun getAmountInSats(invoice: String): BigDecimal {
+        checkNotInMainThread()
+
         return getAmount(invoice).multiply(BigDecimal(100000000))
     }
 

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

@@ -0,0 +1,41 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.UserMetadata
+import java.io.ByteArrayInputStream
+
+@Immutable
+class AppDefinitionEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun appMetaData() = try {
+        MetadataEvent.metadataParser.readValue(
+            ByteArrayInputStream(content.toByteArray(Charsets.UTF_8)),
+            UserMetadata::class.java
+        )
+    } catch (e: Exception) {
+        e.printStackTrace()
+        Log.w("MT", "Content Parse Error ${e.localizedMessage} $content")
+        null
+    }
+
+    fun supportedKinds() = tags.filter { it.size > 1 && it[0] == "k" }.mapNotNull {
+        runCatching { it[1].toInt() }.getOrNull()
+    }
+
+    fun publishedAt() = tags.firstOrNull { it.size > 1 && it[0] == "published_at" }?.get(1)
+
+    companion object {
+        const val kind = 31990
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+
+@Immutable
+class AppRecommendationEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    fun recommendations() = tags.filter { it.size > 1 && it[0] == "a" }.mapNotNull {
+        ATag.parse(it[1], it.getOrNull(2))
+    }
+
+    fun forKind() = runCatching { dTag().toInt() }.getOrNull()
+
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    companion object {
+        const val kind = 31989
+    }
+}

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

@@ -16,7 +16,12 @@ class ChannelMessageEvent(
     sig: HexKey
 ) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
 
-    fun channel() = tags.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1) ?: tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    fun channel() = tags.firstOrNull {
+        it.size > 3 && it[0] == "e" && it[3] == "root"
+    }?.get(1) ?: tags.firstOrNull {
+        it.size > 1 && it[0] == "e"
+    }?.get(1)
+
     override fun replyTos() = tags.filter { it.firstOrNull() == "e" && it.getOrNull(1) != channel() }.mapNotNull { it.getOrNull(1) }
 
     companion object {
@@ -30,7 +35,8 @@ class ChannelMessageEvent(
             zapReceiver: String?,
             privateKey: ByteArray,
             createdAt: Long = Date().time / 1000,
-            markAsSensitive: Boolean
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?
         ): ChannelMessageEvent {
             val content = message
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
@@ -49,6 +55,9 @@ class ChannelMessageEvent(
             if (markAsSensitive) {
                 tags.add(listOf("content-warning", ""))
             }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = Utils.sign(id, privateKey)

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

@@ -16,7 +16,7 @@ class ChannelMetadataEvent(
     content: String,
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun channel() = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    fun channel() = tags.firstOrNull { it.size > 1 && it[0] == "e" }?.get(1)
     fun channelInfo() =
         try {
             MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)

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

@@ -23,14 +23,12 @@ class ContactListEvent(
     // This function is only used by the user logged in
     // But it is used all the time.
     val verifiedFollowKeySet: Set<HexKey> by lazy {
-        tags.filter { it[0] == "p" }.mapNotNull {
-            it.getOrNull(1)?.let { unverifiedHex: String ->
-                try {
-                    decodePublicKey(unverifiedHex).toHexKey()
-                } catch (e: Exception) {
-                    Log.w("ContactListEvent", "Can't parse tags as a follows: ${it[1]}", e)
-                    null
-                }
+        tags.filter { it.size > 1 && it[0] == "p" }.mapNotNull {
+            try {
+                decodePublicKey(it[1]).toHexKey()
+            } catch (e: Exception) {
+                Log.w("ContactListEvent", "Can't parse tags as a follows: ${it[1]}", e)
+                null
             }
         }.toSet()
     }

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

@@ -54,6 +54,10 @@ open class Event(
             (it.size > 1 && it[0] == "t" && it[1].equals("nude", true))
     }
 
+    override fun zapraiserAmount() = tags.firstOrNull() {
+        (it.size > 1 && it[0].equals("zapraiser", true))
+    }?.get(1)?.toLongOrNull()
+
     override fun zapAddress() = tags.firstOrNull { it.size > 1 && it[0] == "zap" }?.get(1)
 
     fun taggedAddresses() = tags.filter { it.size > 1 && it[0] == "a" }.mapNotNull {
@@ -138,7 +142,7 @@ open class Event(
             .replace("\\u2028", "\u2028")
             .replace("\\u2029", "\u2029")
 
-        return sha256.digest(rawEventJson.toByteArray()).toHexKey()
+        return MessageDigest.getInstance("SHA-256").digest(rawEventJson.toByteArray()).toHexKey()
     }
 
     private class EventDeserializer : JsonDeserializer<Event> {
@@ -212,7 +216,6 @@ open class Event(
     companion object {
         private val secp256k1 = Secp256k1.get()
 
-        val sha256: MessageDigest = MessageDigest.getInstance("SHA-256")
         val gson: Gson = GsonBuilder()
             .disableHtmlEscaping()
             .registerTypeAdapter(Event::class.java, EventSerializer())
@@ -228,6 +231,8 @@ open class Event(
         fun fromJson(json: JsonElement, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
 
         fun Event.getRefinedEvent(lenient: Boolean = false): Event = when (kind) {
+            AppDefinitionEvent.kind -> AppDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
+            AppRecommendationEvent.kind -> AppRecommendationEvent(id, pubKey, createdAt, tags, content, sig)
             AudioTrackEvent.kind -> AudioTrackEvent(id, pubKey, createdAt, tags, content, sig)
             BadgeAwardEvent.kind -> BadgeAwardEvent(id, pubKey, createdAt, tags, content, sig)
             BadgeDefinitionEvent.kind -> BadgeDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
@@ -244,7 +249,9 @@ open class Event(
             FileHeaderEvent.kind -> FileHeaderEvent(id, pubKey, createdAt, tags, content, sig)
             FileStorageEvent.kind -> FileStorageEvent(id, pubKey, createdAt, tags, content, sig)
             FileStorageHeaderEvent.kind -> FileStorageHeaderEvent(id, pubKey, createdAt, tags, content, sig)
+            GenericRepostEvent.kind -> GenericRepostEvent(id, pubKey, createdAt, tags, content, sig)
             HighlightEvent.kind -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
+            LiveActivitiesEvent.kind -> LiveActivitiesEvent(id, pubKey, createdAt, tags, content, sig)
             LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
             LnZapPaymentRequestEvent.kind -> LnZapPaymentRequestEvent(id, pubKey, createdAt, tags, content, sig)
             LnZapPaymentResponseEvent.kind -> LnZapPaymentResponseEvent(id, pubKey, createdAt, tags, content, sig)
@@ -257,6 +264,7 @@ open class Event(
             PrivateDmEvent.kind -> PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
             ReactionEvent.kind -> ReactionEvent(id, pubKey, createdAt, tags, content, sig)
             RecommendRelayEvent.kind -> RecommendRelayEvent(id, pubKey, createdAt, tags, content, sig, lenient)
+            RelaySetEvent.kind -> RelaySetEvent(id, pubKey, createdAt, tags, content, sig)
             ReportEvent.kind -> ReportEvent(id, pubKey, createdAt, tags, content, sig)
             RepostEvent.kind -> RepostEvent(id, pubKey, createdAt, tags, content, sig)
             TextNoteEvent.kind -> TextNoteEvent(id, pubKey, createdAt, tags, content, sig)
@@ -281,7 +289,7 @@ open class Event(
                 .replace("\\u2028", "\u2028")
                 .replace("\\u2029", "\u2029")
 
-            return sha256.digest(rawEventJson.toByteArray())
+            return MessageDigest.getInstance("SHA-256").digest(rawEventJson.toByteArray())
         }
 
         fun create(privateKey: ByteArray, kind: Int, tags: List<List<String>> = emptyList(), content: String = "", createdAt: Long = Date().time / 1000): Event {

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

@@ -38,4 +38,5 @@ interface EventInterface {
 
     fun zapAddress(): String?
     fun isSensitive(): Boolean
+    fun zapraiserAmount(): Long?
 }

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

@@ -0,0 +1,52 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.relays.Client
+import nostr.postr.Utils
+import java.util.Date
+
+@Immutable
+class GenericRepostEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun boostedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+    fun containedPost() = try {
+        fromJson(content, Client.lenient)
+    } catch (e: Exception) {
+        null
+    }
+
+    companion object {
+        const val kind = 16
+
+        fun create(boostedPost: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): GenericRepostEvent {
+            val content = boostedPost.toJson()
+
+            val replyToPost = listOf("e", boostedPost.id())
+            val replyToAuthor = listOf("p", boostedPost.pubKey())
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var tags: List<List<String>> = listOf(replyToPost, replyToAuthor)
+
+            if (boostedPost is AddressableEvent) {
+                tags = tags + listOf(listOf("a", boostedPost.address().toTag()))
+            }
+
+            tags = tags + listOf(listOf("k", "${boostedPost.kind()}"))
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return GenericRepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+@Immutable
+class LiveActivitiesEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun title() = tags.firstOrNull { it.size > 1 && it[0] == "title" }?.get(1)
+    fun summary() = tags.firstOrNull { it.size > 1 && it[0] == "summary" }?.get(1)
+    fun image() = tags.firstOrNull { it.size > 1 && it[0] == "image" }?.get(1)
+    fun streaming() = tags.firstOrNull { it.size > 1 && it[0] == "streaming" }?.get(1)
+    fun starts() = tags.firstOrNull { it.size > 1 && it[0] == "starts" }?.get(1)
+    fun ends() = tags.firstOrNull { it.size > 1 && it[0] == "ends" }?.get(1)
+    fun status() = tags.firstOrNull { it.size > 1 && it[0] == "status" }?.get(1)
+    fun currentParticipants() = tags.firstOrNull { it.size > 1 && it[0] == "current_participants" }?.get(1)
+    fun totalParticipants() = tags.firstOrNull { it.size > 1 && it[0] == "total_participants" }?.get(1)
+
+    fun participants() = tags.filter { it.size > 1 && it[0] == "p" }.map { Participant(it[1], it.getOrNull(2)) }
+
+    companion object {
+        const val kind = 30311
+
+        fun create(
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): LiveActivitiesEvent {
+            val tags = mutableListOf<List<String>>()
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, "")
+            val sig = Utils.sign(id, privateKey)
+            return LiveActivitiesEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}

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

@@ -5,6 +5,7 @@ import com.vitorpamplona.amethyst.model.*
 import nostr.postr.Bech32
 import nostr.postr.Utils
 import java.nio.charset.Charset
+import java.security.MessageDigest
 import java.security.SecureRandom
 import java.util.*
 import javax.crypto.BadPaddingException
@@ -133,7 +134,7 @@ class LnZapRequestEvent(
         fun createEncryptionPrivateKey(privkey: String, id: String, createdAt: Long): ByteArray {
             var str = privkey + id + createdAt.toString()
             var strbyte = str.toByteArray(Charset.forName("utf-8"))
-            return sha256.digest(strbyte)
+            return MessageDigest.getInstance("SHA-256").digest(strbyte)
         }
 
         private fun encryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {

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

@@ -1,22 +1,17 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
-import androidx.compose.runtime.Immutable
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.google.gson.Gson
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.UserMetadata
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
+import java.io.ByteArrayInputStream
 import java.util.Date
 
-@Immutable
-data class ContactMetaData(
-    val name: String,
-    val picture: String,
-    val about: String,
-    val nip05: String?
-)
-
 abstract class IdentityClaim(
     var identity: String,
     var proof: String
@@ -145,9 +140,13 @@ class MetadataEvent(
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
     fun contactMetaData() = try {
-        gson.fromJson(content, ContactMetaData::class.java)
+        metadataParser.readValue(
+            ByteArrayInputStream(content.toByteArray(Charsets.UTF_8)),
+            UserMetadata::class.java
+        )
     } catch (e: Exception) {
-        Log.e("MetadataEvent", "Can't parse $content", e)
+        e.printStackTrace()
+        Log.w("MT", "Content Parse Error ${e.localizedMessage} $content")
         null
     }
 
@@ -164,8 +163,10 @@ class MetadataEvent(
         const val kind = 0
         val gson = Gson()
 
-        fun create(contactMetaData: ContactMetaData, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): MetadataEvent {
-            return create(gson.toJson(contactMetaData), identities, privateKey, createdAt = createdAt)
+        val metadataParser by lazy {
+            jacksonObjectMapper()
+                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+                .readerFor(UserMetadata::class.java)
         }
 
         fun create(contactMetaData: String, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): MetadataEvent {

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

@@ -52,7 +52,8 @@ class PollNoteEvent(
             consensusThreshold: Int?,
             closedAt: Int?,
             zapReceiver: String?,
-            markAsSensitive: Boolean
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?
         ): PollNoteEvent {
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
@@ -79,6 +80,9 @@ class PollNoteEvent(
             if (markAsSensitive) {
                 tags.add(listOf("content-warning", ""))
             }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
             val sig = Utils.sign(id, privateKey)

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

@@ -78,7 +78,8 @@ class PrivateDmEvent(
             createdAt: Long = Date().time / 1000,
             publishedRecipientPubKey: ByteArray? = null,
             advertiseNip18: Boolean = true,
-            markAsSensitive: Boolean
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?
         ): PrivateDmEvent {
             val content = Utils.encrypt(
                 if (advertiseNip18) { nip18Advertisement } else { "" } + msg,
@@ -102,6 +103,9 @@ class PrivateDmEvent(
             if (markAsSensitive) {
                 tags.add(listOf("content-warning", ""))
             }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
             val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = Utils.sign(id, privateKey)
             return PrivateDmEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())

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

@@ -0,0 +1,44 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+@Immutable
+class RelaySetEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun relays() = tags.filter { it.size > 1 && it[0] == "r" }.map { it[1] }
+    fun description() = tags.firstOrNull() { it.size > 1 && it[0] == "description" }?.get(1)
+
+    companion object {
+        const val kind = 30022
+
+        fun create(
+            relays: List<String>,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): RelaySetEvent {
+            val tags = mutableListOf<List<String>>()
+            relays.forEach {
+                tags.add(listOf("r", it))
+            }
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, "")
+            val sig = Utils.sign(id, privateKey)
+            return RelaySetEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}

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

@@ -36,7 +36,7 @@ class RepostEvent(
             val replyToAuthor = listOf("p", boostedPost.pubKey())
 
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            var tags: List<List<String>> = boostedPost.tags().plus(listOf(replyToPost, replyToAuthor))
+            var tags: List<List<String>> = listOf(replyToPost, replyToAuthor)
 
             if (boostedPost is AddressableEvent) {
                 tags = tags + listOf(listOf("a", boostedPost.address().toTag()))

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

@@ -19,6 +19,10 @@ class TextNoteEvent(
     sig: HexKey
 ) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
 
+    fun subject() = tags.firstOrNull() { it.size > 1 && it[0] == "subject" }?.get(1)
+
+    fun root() = tags.firstOrNull() { it.size > 3 && it[3] == "root" }?.get(1)
+
     companion object {
         const val kind = 1
 
@@ -30,19 +34,45 @@ class TextNoteEvent(
             extraTags: List<String>?,
             zapReceiver: String?,
             markAsSensitive: Boolean,
+            zapRaiserAmount: Long?,
+            replyingTo: String?,
+            root: String?,
+            directMentions: Set<HexKey>,
+
             privateKey: ByteArray,
             createdAt: Long = Date().time / 1000
         ): TextNoteEvent {
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
             replyTos?.forEach {
-                tags.add(listOf("e", it))
+                if (it == replyingTo) {
+                    tags.add(listOf("e", it, "", "reply"))
+                } else if (it == root) {
+                    tags.add(listOf("e", it, "", "root"))
+                } else if (it in directMentions) {
+                    tags.add(listOf("e", it, "", "mention"))
+                } else {
+                    tags.add(listOf("e", it))
+                }
             }
             mentions?.forEach {
-                tags.add(listOf("p", it))
+                if (it in directMentions) {
+                    tags.add(listOf("p", it, "", "mention"))
+                } else {
+                    tags.add(listOf("p", it))
+                }
             }
             addresses?.forEach {
-                tags.add(listOf("a", it.toTag()))
+                val aTag = it.toTag()
+                if (aTag == replyingTo) {
+                    tags.add(listOf("a", aTag, "", "reply"))
+                } else if (aTag == root) {
+                    tags.add(listOf("a", aTag, "", "root"))
+                } else if (aTag in directMentions) {
+                    tags.add(listOf("a", aTag, "", "mention"))
+                } else {
+                    tags.add(listOf("a", aTag))
+                }
             }
             findHashtags(msg).forEach {
                 tags.add(listOf("t", it))
@@ -60,6 +90,9 @@ class TextNoteEvent(
             if (markAsSensitive) {
                 tags.add(listOf("content-warning", ""))
             }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
             val sig = Utils.sign(id, privateKey)

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

@@ -2,17 +2,21 @@ package com.vitorpamplona.amethyst.service.model.zaps
 
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.LnZapEventInterface
+import com.vitorpamplona.amethyst.ui.screen.ZapReqResponse
 
 object UserZaps {
-    fun forProfileFeed(zaps: Map<Note, Note?>?): List<Pair<Note, Note>> {
+    fun forProfileFeed(zaps: Map<Note, Note?>?): List<ZapReqResponse> {
         if (zaps == null) return emptyList()
 
         return (
             zaps
-                .filter { it.value != null }
-                .toList()
-                .sortedBy { (it.second?.event as? LnZapEventInterface)?.amount() }
+                .mapNotNull { entry ->
+                    entry.value?.let {
+                        ZapReqResponse(entry.key, it)
+                    }
+                }
+                .sortedBy { (it.zapEvent.event as? LnZapEventInterface)?.amount() }
                 .reversed()
-            ) as List<Pair<Note, Note>>
+            )
     }
 }

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

@@ -13,15 +13,24 @@ import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendDMNotification
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendZapNotification
 import com.vitorpamplona.amethyst.ui.note.showAmount
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 
 class EventNotificationConsumer(private val applicationContext: Context) {
     fun consume(event: Event) {
-        // adds to database
-        LocalCache.consume(event, null)
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            if (LocalCache.notes[event.id] == null) {
+                // adds to database
+                LocalCache.verifyAndConsume(event, null)
 
-        when (event) {
-            is PrivateDmEvent -> notify(event)
-            is LnZapEvent -> notify(event)
+                when (event) {
+                    is PrivateDmEvent -> notify(event)
+                    is LnZapEvent -> notify(event)
+                }
+            }
         }
     }
 
@@ -54,6 +63,7 @@ class EventNotificationConsumer(private val applicationContext: Context) {
 
     private fun notify(event: LnZapEvent) {
         val noteZapEvent = LocalCache.notes[event.id] ?: return
+
         val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) }
         val noteZapped = event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) }
 

app/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt

@@ -7,6 +7,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
+import android.service.notification.StatusBarNotification
 import androidx.core.app.NotificationCompat
 import coil.ImageLoader
 import coil.executeBlocking
@@ -133,13 +134,23 @@ object NotificationUtils {
         channelId: String,
         applicationContext: Context
     ) {
+        val notId = id.hashCode()
+
+        // dont notify twice
+        val notifications: Array<StatusBarNotification> = getActiveNotifications()
+        for (notification in notifications) {
+            if (notification.id == notId) {
+                return
+            }
+        }
+
         val contentIntent = Intent(applicationContext, MainActivity::class.java).apply {
             data = Uri.parse(uri)
         }
 
         val contentPendingIntent = PendingIntent.getActivity(
             applicationContext,
-            id.hashCode(),
+            notId,
             contentIntent,
             PendingIntent.FLAG_MUTABLE
         )
@@ -173,7 +184,7 @@ object NotificationUtils {
             .setPriority(NotificationCompat.PRIORITY_HIGH)
             .setAutoCancel(true)
 
-        notify(id.hashCode(), builder.build())
+        notify(notId, builder.build())
     }
 
     /**

app/src/main/java/com/vitorpamplona/amethyst/service/previews/BahaUrlPreview.kt

@@ -1,11 +1,12 @@
 package com.vitorpamplona.amethyst.service.previews
 
 import android.net.Uri
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.*
 import java.util.*
 
 class BahaUrlPreview(val url: String, var callback: IUrlPreviewCallback?) {
-    val scope = CoroutineScope(Job() + Dispatchers.Main)
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
     private val imageExtensionArray = arrayOf(".gif", ".png", ".jpg", ".jpeg", ".bmp", ".webp")
 
     fun fetchUrlPreview(timeOut: Int = 30000) {
@@ -18,13 +19,13 @@ class BahaUrlPreview(val url: String, var callback: IUrlPreviewCallback?) {
     }
 
     private suspend fun fetch(timeOut: Int = 30000) {
+        checkNotInMainThread()
         lateinit var urlInfoItem: UrlInfoItem
         if (checkIsImageUrl()) {
             urlInfoItem = UrlInfoItem(url = url, image = url)
         } else {
             val document = getDocument(url, timeOut)
-            urlInfoItem = parseHtml(document)
-            urlInfoItem.url = url
+            urlInfoItem = parseHtml(url, document)
         }
         callback?.onComplete(urlInfoItem)
     }

app/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlInfoItem.kt

@@ -1,11 +1,23 @@
 package com.vitorpamplona.amethyst.service.previews
 
+import androidx.compose.runtime.Immutable
+import java.net.URL
+
+@Immutable
 data class UrlInfoItem(
-    var url: String = "",
-    var title: String = "",
-    var description: String = "",
-    var image: String = ""
+    val url: String = "",
+    val title: String = "",
+    val description: String = "",
+    val image: String = ""
 ) {
+    val verifiedUrl = kotlin.runCatching { URL(url) }.getOrNull()
+    val imageUrlFullPath =
+        if (image.startsWith("/")) {
+            URL(verifiedUrl, image).toString()
+        } else {
+            image
+        }
+
     fun allFetchComplete(): Boolean {
         return title.isNotEmpty() && description.isNotEmpty() && image.isNotEmpty()
     }

app/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreviewUtils.kt

@@ -67,50 +67,47 @@ suspend fun getDocument(url: String, timeOut: Int = 30000): Document =
             .get()
     }
 
-suspend fun parseHtml(document: Document): UrlInfoItem =
+suspend fun parseHtml(url: String, document: Document): UrlInfoItem =
     withContext(Dispatchers.IO) {
         val metaTags = document.getElementsByTag(ELEMENT_TAG_META)
-        val urlInfo = UrlInfoItem()
+
+        var title: String = ""
+        var description: String = ""
+        var image: String = ""
+
         metaTags.forEach {
             val propertyTag = it.attr(ATTRIBUTE_VALUE_PROPERTY)
             when (propertyTag) {
-                in META_OG_TITLE -> if (urlInfo.title.isEmpty()) urlInfo.title = it.attr(CONTENT)
-                in META_OG_DESCRIPTION -> if (urlInfo.description.isEmpty()) {
-                    urlInfo.description =
-                        it.attr(CONTENT)
+                in META_OG_TITLE -> if (title.isEmpty()) title = it.attr(CONTENT)
+                in META_OG_DESCRIPTION -> if (description.isEmpty()) {
+                    description = it.attr(CONTENT)
                 }
-                in META_OG_IMAGE -> if (urlInfo.image.isEmpty()) urlInfo.image = it.attr(CONTENT)
+                in META_OG_IMAGE -> if (image.isEmpty()) image = it.attr(CONTENT)
             }
 
             when (it.attr(ATTRIBUTE_VALUE_NAME)) {
-                in META_NAME_TITLE -> if (urlInfo.title.isEmpty()) urlInfo.title = it.attr(CONTENT)
-                in META_NAME_DESCRIPTION -> if (urlInfo.description.isEmpty()) {
-                    urlInfo.description =
-                        it.attr(CONTENT)
+                in META_NAME_TITLE -> if (title.isEmpty()) title = it.attr(CONTENT)
+                in META_NAME_DESCRIPTION -> if (description.isEmpty()) {
+                    description = it.attr(CONTENT)
                 }
-                in META_OG_IMAGE -> if (urlInfo.image.isEmpty()) urlInfo.image = it.attr(CONTENT)
+                in META_OG_IMAGE -> if (image.isEmpty()) image = it.attr(CONTENT)
             }
 
             when (it.attr(ATTRIBUTE_VALUE_ITEMPROP)) {
-                in META_ITEMPROP_TITLE -> if (urlInfo.title.isEmpty()) {
-                    urlInfo.title =
-                        it.attr(CONTENT)
+                in META_ITEMPROP_TITLE -> if (title.isEmpty()) {
+                    title = it.attr(CONTENT)
                 }
-                in META_ITEMPROP_DESCRIPTION -> if (urlInfo.description.isEmpty()) {
-                    urlInfo.description =
-                        it.attr(
-                            CONTENT
-                        )
+                in META_ITEMPROP_DESCRIPTION -> if (description.isEmpty()) {
+                    description = it.attr(CONTENT)
                 }
-                in META_ITEMPROP_IMAGE -> if (urlInfo.image.isEmpty()) {
-                    urlInfo.image = it.attr(
-                        CONTENT
-                    )
+                in META_ITEMPROP_IMAGE -> if (image.isEmpty()) {
+                    image = it.attr(CONTENT)
                 }
             }
-            if (urlInfo.allFetchComplete()) {
-                return@withContext urlInfo
+
+            if (title.isNotEmpty() && description.isNotEmpty() && image.isNotEmpty()) {
+                return@withContext UrlInfoItem(url, title, description, image)
             }
         }
-        return@withContext urlInfo
+        return@withContext UrlInfoItem(url, title, description, image)
     }

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.EventInterface
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -32,6 +33,8 @@ object Client : RelayPool.Listener {
 
     @Synchronized
     fun connect(relays: Array<Relay>) {
+        checkNotInMainThread()
+
         RelayPool.register(this)
         RelayPool.unloadRelays()
         RelayPool.loadRelays(relays.toList())
@@ -54,6 +57,8 @@ object Client : RelayPool.Listener {
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
         filters: List<TypedFilter> = listOf()
     ) {
+        checkNotInMainThread()
+
         subscriptions = subscriptions + Pair(subscriptionId, filters)
         RelayPool.sendFilter(subscriptionId)
     }
@@ -62,11 +67,15 @@ object Client : RelayPool.Listener {
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
         filters: List<TypedFilter> = listOf()
     ) {
+        checkNotInMainThread()
+
         subscriptions = subscriptions + Pair(subscriptionId, filters)
         RelayPool.sendFilterOnlyIfDisconnected()
     }
 
     fun send(signedEvent: EventInterface, relay: String? = null, feedTypes: Set<FeedType>? = null, onDone: (() -> Unit)? = null) {
+        checkNotInMainThread()
+
         if (relay == null) {
             RelayPool.send(signedEvent)
         } else {
@@ -91,7 +100,7 @@ object Client : RelayPool.Listener {
     }
 
     @OptIn(DelicateCoroutinesApi::class)
-    fun newSporadicRelay(url: String, feedTypes: Set<FeedType>?, onConnected: (Relay) -> Unit, onDone: (() -> Unit)?) {
+    private fun newSporadicRelay(url: String, feedTypes: Set<FeedType>?, onConnected: (Relay) -> Unit, onDone: (() -> Unit)?) {
         val relay = Relay(url, true, true, feedTypes ?: emptySet(), HttpClient.getProxy())
         RelayPool.addRelay(relay)
 

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.service.relays
 import android.util.Log
 import com.google.gson.JsonElement
 import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.EventInterface
 import com.vitorpamplona.amethyst.service.model.RelayAuthEvent
@@ -69,7 +70,10 @@ class Relay(
 
     @Synchronized
     fun requestAndWatch() {
+        checkNotInMainThread()
         requestAndWatch {
+            checkNotInMainThread()
+
             // Sends everything.
             Client.allSubscriptions().forEach {
                 sendFilter(requestId = it)
@@ -79,6 +83,7 @@ class Relay(
 
     @Synchronized
     fun requestAndWatch(onConnected: (Relay) -> Unit) {
+        checkNotInMainThread()
         if (socket != null) return
 
         try {
@@ -89,6 +94,8 @@ class Relay(
             val listener = object : WebSocketListener() {
 
                 override fun onOpen(webSocket: WebSocket, response: Response) {
+                    checkNotInMainThread()
+
                     afterEOSE = false
                     isReady = true
                     ping = response.receivedResponseAtMillis - response.sentRequestAtMillis
@@ -99,6 +106,8 @@ class Relay(
                 }
 
                 override fun onMessage(webSocket: WebSocket, text: String) {
+                    checkNotInMainThread()
+
                     eventDownloadCounterInBytes += text.bytesUsedInMemory()
 
                     try {
@@ -153,6 +162,8 @@ class Relay(
                 }
 
                 override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+                    checkNotInMainThread()
+
                     listeners.forEach {
                         it.onRelayStateChange(
                             this@Relay,
@@ -163,6 +174,8 @@ class Relay(
                 }
 
                 override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+                    checkNotInMainThread()
+
                     socket = null
                     isReady = false
                     afterEOSE = false
@@ -171,6 +184,8 @@ class Relay(
                 }
 
                 override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                    checkNotInMainThread()
+
                     errorCounter++
 
                     socket?.close(1000, "Normal close")
@@ -209,6 +224,8 @@ class Relay(
     }
 
     fun sendFilter(requestId: String) {
+        checkNotInMainThread()
+
         if (read) {
             if (isConnected()) {
                 if (isReady) {
@@ -233,6 +250,8 @@ class Relay(
     }
 
     fun sendFilterOnlyIfDisconnected() {
+        checkNotInMainThread()
+
         if (socket == null) {
             // waits 60 seconds to reconnect after disconnected.
             if (Date().time / 1000 > closingTime + 60) {
@@ -243,6 +262,8 @@ class Relay(
     }
 
     fun send(signedEvent: EventInterface) {
+        checkNotInMainThread()
+
         if (signedEvent is RelayAuthEvent) {
             val event = """["AUTH",${signedEvent.toJson()}]"""
             socket?.send(event)

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.EventInterface
 import kotlinx.coroutines.CoroutineScope
@@ -48,6 +49,8 @@ object RelayPool : Relay.Listener {
     }
 
     fun requestAndWatch() {
+        checkNotInMainThread()
+
         relays.forEach { it.requestAndWatch() }
     }
 

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

@@ -55,6 +55,9 @@ class TypedFilter(
         filter.limit?.run {
             jsonObject.addProperty("limit", filter.limit)
         }
+        filter.search?.run {
+            jsonObject.addProperty("search", filter.search)
+        }
         return jsonObject
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechEngine.kt

@@ -0,0 +1,162 @@
+/*
+ * Created by Ayaan on 02/02/23, 10:30 pm
+ * Copyright (c) 2023 . All rights reserved.
+ * Last modified 02/02/23, 9:56 pm
+ */
+
+package com.vitorpamplona.amethyst.service.tts
+
+import android.content.Context
+import android.speech.tts.TextToSpeech
+import android.speech.tts.UtteranceProgressListener
+import java.util.Locale
+
+const val DEF_SPEECH_AND_PITCH = 0.8f
+
+fun getErrorText(errorCode: Int): String = when (errorCode) {
+    TextToSpeech.ERROR -> "ERROR"
+    TextToSpeech.ERROR_INVALID_REQUEST -> "ERROR_INVALID_REQUEST"
+    TextToSpeech.ERROR_NETWORK -> "ERROR_NETWORK"
+    TextToSpeech.ERROR_NETWORK_TIMEOUT -> "ERROR_NETWORK_TIMEOUT"
+    TextToSpeech.ERROR_SERVICE -> "ERROR_SERVICE"
+    TextToSpeech.ERROR_SYNTHESIS -> "ERROR_SYNTHESIS"
+    TextToSpeech.ERROR_NOT_INSTALLED_YET -> "ERROR_NOT_INSTALLED_YET"
+    else -> "UNKNOWN"
+}
+
+class TextToSpeechEngine private constructor() {
+    private var tts: TextToSpeech? = null
+
+    private var defaultPitch = 0.8f
+    private var defaultSpeed = 0.8f
+    private var defLanguage = Locale.getDefault()
+    private var onStartListener: (() -> Unit)? = null
+    private var onDoneListener: (() -> Unit)? = null
+    private var onErrorListener: ((String) -> Unit)? = null
+    private var onHighlightListener: ((Int, Int) -> Unit)? = null
+    private var message: String? = null
+
+    companion object {
+        private var instance: TextToSpeechEngine? = null
+        fun getInstance(): TextToSpeechEngine {
+            if (instance == null) {
+                instance = TextToSpeechEngine()
+            }
+            return instance!!
+        }
+    }
+
+    fun initTTS(context: Context, message: String) {
+        tts = TextToSpeech(context) {
+            if (it == TextToSpeech.SUCCESS) {
+                tts!!.language = defLanguage
+                tts!!.setPitch(defaultPitch)
+                tts!!.setSpeechRate(defaultSpeed)
+                tts!!.setListener(
+                    onStart = {
+                        onStartListener?.invoke()
+                    },
+                    onError = { e ->
+                        e?.let { error ->
+                            onErrorListener?.invoke(error)
+                        }
+                    },
+                    onRange = { start, end ->
+                        if (this@TextToSpeechEngine.message != null) {
+                            onHighlightListener?.invoke(start, end)
+                        }
+                    },
+                    onDone = {
+                        onStartListener?.invoke()
+                    }
+                )
+                speak(message)
+            } else {
+                onErrorListener?.invoke(getErrorText(it))
+            }
+        }
+    }
+
+    private fun speak(message: String): TextToSpeechEngine {
+        tts!!.speak(
+            message,
+            TextToSpeech.QUEUE_FLUSH,
+            null,
+            TextToSpeech.ACTION_TTS_QUEUE_PROCESSING_COMPLETED
+        )
+        return this
+    }
+
+    fun setPitchAndSpeed(pitch: Float, speed: Float) {
+        defaultPitch = pitch
+        defaultSpeed = speed
+    }
+
+    fun resetPitchAndSpeed() {
+        defaultPitch = DEF_SPEECH_AND_PITCH
+        defaultSpeed = DEF_SPEECH_AND_PITCH
+    }
+
+    fun setLanguage(local: Locale): TextToSpeechEngine {
+        this.defLanguage = local
+        return this
+    }
+
+    fun setHighlightedMessage(message: String) {
+        this.message = message
+    }
+
+    fun setOnStartListener(onStartListener: (() -> Unit)): TextToSpeechEngine {
+        this.onStartListener = onStartListener
+        return this
+    }
+
+    fun setOnCompletionListener(onDoneListener: () -> Unit): TextToSpeechEngine {
+        this.onDoneListener = onDoneListener
+        return this
+    }
+
+    fun setOnErrorListener(onErrorListener: (String) -> Unit): TextToSpeechEngine {
+        this.onErrorListener = onErrorListener
+        return this
+    }
+
+    fun setOnHighlightListener(onHighlightListener: (Int, Int) -> Unit): TextToSpeechEngine {
+        this.onHighlightListener = onHighlightListener
+        return this
+    }
+
+    fun destroy() {
+        tts?.stop()
+        tts?.shutdown()
+        tts = null
+        instance = null
+    }
+}
+
+inline fun TextToSpeech.setListener(
+    crossinline onStart: (String?) -> Unit = {},
+    crossinline onError: (String?) -> Unit = {},
+    crossinline onRange: (Int, Int) -> Unit = { _, _ -> },
+    crossinline onDone: (String?) -> Unit
+) = this.apply {
+    setOnUtteranceProgressListener(object : UtteranceProgressListener() {
+        override fun onStart(p0: String?) {
+            onStart.invoke(p0)
+        }
+
+        override fun onDone(p0: String?) {
+            onDone.invoke(p0)
+        }
+
+        @Deprecated("Deprecated in Java", ReplaceWith("onError.invoke(p0)"))
+        override fun onError(p0: String?) {
+            onError.invoke(p0)
+        }
+
+        override fun onRangeStart(utteranceId: String?, start: Int, end: Int, frame: Int) {
+            super.onRangeStart(utteranceId, start, end, frame)
+            onRange.invoke(start, end)
+        }
+    })
+}

app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechHelper.kt

@@ -0,0 +1,158 @@
+/*
+ * Created by Ayaan on 02/02/23, 10:30 pm
+ * Copyright (c) 2023 . All rights reserved.
+ * Last modified 02/02/23, 10:19 pm
+ */
+
+package com.vitorpamplona.amethyst.service.tts
+
+import android.content.Context
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import java.lang.ref.WeakReference
+import java.util.Locale
+
+class TextToSpeechHelper private constructor(private val context: WeakReference<Context>) :
+    LifecycleEventObserver {
+    private val appContext
+        get() = context.get()!!.applicationContext
+
+    private var message: String? = null
+
+    private var tts: TextToSpeechEngine? = null
+
+    private var onStart: (() -> Unit)? = null
+
+    private var onDoneListener: (() -> Unit)? = null
+
+    private var onErrorListener: ((String) -> Unit)? = null
+
+    private var onHighlightListener: ((Pair<Int, Int>) -> Unit)? = null
+
+    private var customActionForDestroy: (() -> Unit)? = null
+
+    init {
+        initTTS()
+    }
+
+    fun registerLifecycle(owner: LifecycleOwner): TextToSpeechHelper {
+        owner.lifecycle.addObserver(this)
+        return this
+    }
+
+    private fun initTTS() = context.get()?.run {
+        tts = TextToSpeechEngine.getInstance()
+            .setOnCompletionListener { onDoneListener?.invoke() }
+            .setOnErrorListener { onErrorListener?.invoke(it) }
+            .setOnStartListener { onStart?.invoke() }
+    }
+
+    fun speak(message: String): TextToSpeechHelper {
+        if (tts == null) {
+            initTTS()
+        }
+        this.message = message
+
+        tts?.initTTS(
+            appContext,
+            message
+        )
+        return this
+    }
+
+    /**
+     * This method will highlight the text in the textView
+     *
+     * @exception Exception("Message can't be null for highlighting !! Call speak() first")
+     */
+    fun highlight(): TextToSpeechHelper {
+        if (message == null) throw Exception("Message can't be null for highlighting !! Call speak() first")
+        tts?.setHighlightedMessage(message!!)
+        tts?.setOnHighlightListener { i, i2 ->
+            onHighlightListener?.invoke(Pair(i, i2))
+        }
+        return this
+    }
+
+    fun removeHighlight(): TextToSpeechHelper {
+        message = null
+        onHighlightListener = null
+        return this
+    }
+
+    fun destroy(
+        action: (() -> Unit) = {}
+    ) {
+        tts?.destroy()
+        tts = null
+        action.invoke()
+        INSTANCE = null
+    }
+
+    fun onStart(onStartListener: () -> Unit): TextToSpeechHelper {
+        this.onStart = onStartListener
+        return this
+    }
+
+    fun onDone(onCompleteListener: () -> Unit): TextToSpeechHelper {
+        this.onDoneListener = onCompleteListener
+        return this
+    }
+
+    fun onError(onErrorListener: (String) -> Unit): TextToSpeechHelper {
+        this.onErrorListener = onErrorListener
+        return this
+    }
+
+    fun onHighlight(onHighlightListener: (Pair<Int, Int>) -> Unit): TextToSpeechHelper {
+        this.onHighlightListener = onHighlightListener
+        return this
+    }
+
+    fun setCustomActionForDestroy(action: () -> Unit): TextToSpeechHelper {
+        customActionForDestroy = action
+        return this
+    }
+
+    fun setLanguage(locale: Locale): TextToSpeechHelper {
+        tts?.setLanguage(locale)
+        return this
+    }
+
+    fun setPitchAndSpeed(
+        pitch: Float = DEF_SPEECH_AND_PITCH,
+        speed: Float = DEF_SPEECH_AND_PITCH
+    ): TextToSpeechHelper {
+        tts?.setPitchAndSpeed(pitch, speed)
+        return this
+    }
+
+    fun resetPitchAndSpeed(): TextToSpeechHelper {
+        tts?.resetPitchAndSpeed()
+        return this
+    }
+
+    companion object {
+        private var INSTANCE: TextToSpeechHelper? = null
+        fun getInstance(context: Context): TextToSpeechHelper {
+            synchronized(TextToSpeechHelper::class.java) {
+                if (INSTANCE == null) {
+                    INSTANCE = TextToSpeechHelper(WeakReference(context))
+                }
+                return INSTANCE!!
+            }
+        }
+    }
+
+    override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+        if (event == Lifecycle.Event.ON_DESTROY ||
+            event == Lifecycle.Event.ON_STOP ||
+            event == Lifecycle.Event.ON_PAUSE
+        ) {
+            destroy {
+                customActionForDestroy?.invoke()
+            }
+        }
+    }
+}

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

@@ -2,7 +2,12 @@ package com.vitorpamplona.amethyst.ui
 
 import android.content.Context
 import android.content.Intent
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.fillMaxSize
@@ -13,7 +18,6 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
-import com.vitorpamplona.amethyst.VideoCache
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
@@ -42,9 +46,6 @@ class MainActivity : FragmentActivity() {
 
         val startingPage = uriToRoute(uri)
 
-        // Initializes video cache.
-        VideoCache.init(this.applicationContext)
-
         LocalPreferences.migrateSingleUserPrefs()
 
         setContent {
@@ -60,6 +61,15 @@ class MainActivity : FragmentActivity() {
             }
         }
 
+        val networkRequest = NetworkRequest.Builder()
+            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+            .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
+            .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
+            .build()
+
+        val connectivityManager = getSystemService(ConnectivityManager::class.java) as ConnectivityManager
+        connectivityManager.requestNetwork(networkRequest, networkCallback)
+
         Client.lenient = true
     }
 
@@ -90,7 +100,40 @@ class MainActivity : FragmentActivity() {
     override fun onTrimMemory(level: Int) {
         super.onTrimMemory(level)
         println("Trim Memory $level")
-        ServiceManager.cleanUp()
+        GlobalScope.launch(Dispatchers.Default) {
+            ServiceManager.cleanUp()
+        }
+    }
+
+    private val networkCallback = object : ConnectivityManager.NetworkCallback() {
+        // network is available for use
+        override fun onAvailable(network: Network) {
+            super.onAvailable(network)
+            Log.d("NETWORKCALLBACK", "onAvailable: Disconnecting and connecting again")
+            // Only starts after login
+            GlobalScope.launch(Dispatchers.IO) {
+                ServiceManager.pause()
+                ServiceManager.start(this@MainActivity)
+            }
+        }
+
+        // Network capabilities have changed for the network
+        override fun onCapabilitiesChanged(
+            network: Network,
+            networkCapabilities: NetworkCapabilities
+        ) {
+            super.onCapabilitiesChanged(network, networkCapabilities)
+        }
+
+        // lost network connection
+        override fun onLost(network: Network) {
+            super.onLost(network)
+            Log.d("NETWORKCALLBACK", "onLost: Disconnecting and pausing relay's connection")
+            // Only starts after login
+            GlobalScope.launch(Dispatchers.IO) {
+                ServiceManager.pause()
+            }
+        }
     }
 }
 

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

@@ -4,6 +4,7 @@ import android.content.ContentResolver
 import android.net.Uri
 import android.provider.OpenableColumns
 import android.webkit.MimeTypeMap
+import androidx.core.net.toFile
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.HttpClient
@@ -22,19 +23,24 @@ object ImageUploader {
 
     fun uploadImage(
         uri: Uri,
+        contentType: String?,
+        size: Long?,
         server: ServersAvailable,
         contentResolver: ContentResolver,
         onSuccess: (String, String?) -> Unit,
         onError: (Throwable) -> Unit
     ) {
-        val contentType = contentResolver.getType(uri)
+        val myContentType = contentType ?: contentResolver.getType(uri)
         val imageInputStream = contentResolver.openInputStream(uri)
 
-        val length = contentResolver.query(uri, null, null, null, null)?.use {
-            it.moveToFirst()
-            val sizeIndex = it.getColumnIndex(OpenableColumns.SIZE)
-            it.getLong(sizeIndex)
-        } ?: 0
+        val length = size
+            ?: contentResolver.query(uri, null, null, null, null)?.use {
+                it.moveToFirst()
+                val sizeIndex = it.getColumnIndex(OpenableColumns.SIZE)
+                it.getLong(sizeIndex)
+            } ?: kotlin.runCatching {
+            uri.toFile().length()
+        }.getOrNull() ?: 0
 
         checkNotNull(imageInputStream) {
             "Can't open the image input stream"
@@ -57,7 +63,7 @@ object ImageUploader {
             }
         }
 
-        uploadImage(imageInputStream, length, contentType, myServer, onSuccess, onError)
+        uploadImage(imageInputStream, length, myContentType, myServer, onSuccess, onError)
     }
 
     fun uploadImage(

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

@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.Divider
@@ -28,6 +29,8 @@ import androidx.compose.material.icons.filled.Clear
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.remember
@@ -52,14 +55,16 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.note.ChannelName
 import com.vitorpamplona.amethyst.ui.note.UserPicture
 import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SearchBarViewModel
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.delay
@@ -72,14 +77,28 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 @Composable
-fun JoinUserOrChannelView(onClose: () -> Unit, account: Account, nav: (String) -> Unit) {
-    val searchBarViewModel: SearchBarViewModel = viewModel()
-    searchBarViewModel.account = account
+fun JoinUserOrChannelView(onClose: () -> Unit, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    val searchBarViewModel: SearchBarViewModel = viewModel(
+        key = accountViewModel.account.userProfile().pubkeyHex + "SearchBarViewModel",
+        factory = SearchBarViewModel.Factory(
+            accountViewModel.account
+        )
+    )
 
+    JoinUserOrChannelView(
+        searchBarViewModel = searchBarViewModel,
+        onClose = onClose,
+        accountViewModel = accountViewModel,
+        nav = nav
+    )
+}
+
+@Composable
+fun JoinUserOrChannelView(searchBarViewModel: SearchBarViewModel, onClose: () -> Unit, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     Dialog(
         onDismissRequest = {
             NostrSearchEventOrUserDataSource.clear()
-            searchBarViewModel.clean()
+            searchBarViewModel.clear()
             onClose()
         },
         properties = DialogProperties(
@@ -88,7 +107,9 @@ fun JoinUserOrChannelView(onClose: () -> Unit, account: Account, nav: (String) -
     ) {
         Surface() {
             Column(
-                modifier = Modifier.padding(10.dp).heightIn(min = 500.dp)
+                modifier = Modifier
+                    .padding(10.dp)
+                    .heightIn(min = 500.dp)
             ) {
                 Row(
                     modifier = Modifier.fillMaxWidth(),
@@ -96,7 +117,7 @@ fun JoinUserOrChannelView(onClose: () -> Unit, account: Account, nav: (String) -
                     verticalAlignment = Alignment.CenterVertically
                 ) {
                     CloseButton(onCancel = {
-                        searchBarViewModel.clean()
+                        searchBarViewModel.clear()
                         NostrSearchEventOrUserDataSource.clear()
                         onClose()
                     })
@@ -108,35 +129,27 @@ fun JoinUserOrChannelView(onClose: () -> Unit, account: Account, nav: (String) -
 
                     Text(
                         text = "",
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                        color = MaterialTheme.colors.placeholderText,
                         fontWeight = FontWeight.Bold
                     )
                 }
 
                 Spacer(modifier = Modifier.height(15.dp))
 
-                RenderSeach(searchBarViewModel, account, nav)
+                RenderSearch(searchBarViewModel, accountViewModel, nav)
             }
         }
     }
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
-private fun RenderSeach(
+private fun RenderSearch(
     searchBarViewModel: SearchBarViewModel,
-    account: Account,
+    accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val scope = rememberCoroutineScope()
     val listState = rememberLazyListState()
 
-    // initialize focus reference to be able to request focus programmatically
-    val focusRequester = remember { FocusRequester() }
-    val keyboardController = LocalSoftwareKeyboardController.current
-
-    val onlineSearch = NostrSearchEventOrUserDataSource
-
     val lifeCycleOwner = LocalLifecycleOwner.current
 
     // Create a channel for processing search queries.
@@ -145,9 +158,10 @@ private fun RenderSeach(
     }
 
     LaunchedEffect(Unit) {
-        scope.launch(Dispatchers.IO) {
+        launch(Dispatchers.IO) {
             LocalCache.live.newEventBundles.collect {
-                if (searchBarViewModel.isSearching()) {
+                checkNotInMainThread()
+                if (searchBarViewModel.isSearchingFun()) {
                     searchBarViewModel.invalidateData()
                 }
             }
@@ -155,9 +169,6 @@ private fun RenderSeach(
     }
 
     LaunchedEffect(Unit) {
-        delay(100)
-        focusRequester.requestFocus()
-
         // Wait for text changes to stop for 300 ms before firing off search.
         withContext(Dispatchers.IO) {
             searchTextChanges.receiveAsFlow()
@@ -166,13 +177,13 @@ private fun RenderSeach(
                 .debounce(300)
                 .collectLatest {
                     if (it.length >= 2) {
-                        onlineSearch.search(it.trim())
+                        NostrSearchEventOrUserDataSource.search(it.trim())
                     }
 
                     searchBarViewModel.invalidateData()
 
                     // makes sure to show the top of the search
-                    scope.launch(Dispatchers.Main) {
+                    launch(Dispatchers.Main) {
                         listState.animateScrollToItem(0)
                     }
                 }
@@ -200,8 +211,34 @@ private fun RenderSeach(
     }
 
     // LAST ROW
+    SearchEditTextForJoin(searchBarViewModel, searchTextChanges)
+
+    RenderSearchResults(searchBarViewModel, listState, accountViewModel, nav)
+}
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+private fun SearchEditTextForJoin(
+    searchBarViewModel: SearchBarViewModel,
+    searchTextChanges: Channel<String>
+) {
+    val scope = rememberCoroutineScope()
+
+    // initialize focus reference to be able to request focus programmatically
+    val focusRequester = remember { FocusRequester() }
+    val keyboardController = LocalSoftwareKeyboardController.current
+
+    LaunchedEffect(Unit) {
+        launch {
+            delay(100)
+            focusRequester.requestFocus()
+        }
+    }
+
     Row(
-        modifier = Modifier.padding(horizontal = 10.dp).fillMaxWidth(),
+        modifier = Modifier
+            .padding(horizontal = 10.dp)
+            .fillMaxWidth(),
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically
     ) {
@@ -234,15 +271,15 @@ private fun RenderSeach(
             placeholder = {
                 Text(
                     text = stringResource(R.string.channel_list_user_or_group_id_demo),
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    color = MaterialTheme.colors.placeholderText
                 )
             },
             trailingIcon = {
-                if (searchBarViewModel.isTrailingIconVisible) {
+                if (searchBarViewModel.isSearching) {
                     IconButton(
                         onClick = {
-                            searchBarViewModel.clean()
-                            onlineSearch.clear()
+                            searchBarViewModel.clear()
+                            NostrSearchEventOrUserDataSource.clear()
                         }
                     ) {
                         Icon(
@@ -254,10 +291,24 @@ private fun RenderSeach(
             }
         )
     }
+}
+
+@Composable
+private fun RenderSearchResults(
+    searchBarViewModel: SearchBarViewModel,
+    listState: LazyListState,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    if (searchBarViewModel.isSearching) {
+        val users by searchBarViewModel.searchResultsUsers.collectAsState()
+        val channels by searchBarViewModel.searchResultsChannels.collectAsState()
 
-    if (searchBarViewModel.searchValue.isNotBlank()) {
         Row(
-            modifier = Modifier.fillMaxWidth().fillMaxHeight().padding(vertical = 10.dp)
+            modifier = Modifier
+                .fillMaxWidth()
+                .fillMaxHeight()
+                .padding(vertical = 10.dp)
         ) {
             LazyColumn(
                 modifier = Modifier.fillMaxHeight(),
@@ -268,50 +319,60 @@ private fun RenderSeach(
                 state = listState
             ) {
                 itemsIndexed(
-                    searchBarViewModel.searchResults.value,
+                    users,
                     key = { _, item -> "u" + item.pubkeyHex }
                 ) { _, item ->
-                    UserComposeForChat(
-                        item,
-                        account = account,
-                        nav = nav
-                    )
+                    UserComposeForChat(item, accountViewModel) {
+                        nav("Room/${item.pubkeyHex}")
+                        searchBarViewModel.clear()
+                    }
                 }
 
                 itemsIndexed(
-                    searchBarViewModel.searchResultsChannels.value,
+                    channels,
                     key = { _, item -> "c" + item.idHex }
                 ) { _, item ->
-                    ChannelName(
-                        channelIdHex = item.idHex,
-                        channelPicture = item.profilePicture(),
-                        channelTitle = {
-                            Text(
-                                "${item.info.name}",
-                                fontWeight = FontWeight.Bold
-                            )
-                        },
-                        channelLastTime = null,
-                        channelLastContent = item.info.about,
-                        false,
-                        onClick = { nav("Channel/${item.idHex}") }
-                    )
+                    RenderChannel(item) {
+                        nav("Channel/${item.idHex}")
+                        searchBarViewModel.clear()
+                    }
                 }
             }
         }
     }
 }
 
+@Composable
+private fun RenderChannel(
+    item: com.vitorpamplona.amethyst.model.Channel,
+    onClick: () -> Unit
+) {
+    ChannelName(
+        channelIdHex = item.idHex,
+        channelPicture = item.profilePicture(),
+        channelTitle = {
+            Text(
+                "${item.info.name}",
+                fontWeight = FontWeight.Bold
+            )
+        },
+        channelLastTime = null,
+        channelLastContent = item.info.about,
+        false,
+        onClick = onClick
+    )
+}
+
 @Composable
 fun UserComposeForChat(
     baseUser: User,
-    account: Account,
-    nav: (String) -> Unit
+    accountViewModel: AccountViewModel,
+    onClick: () -> Unit
 ) {
     Column(
         modifier =
         Modifier.clickable(
-            onClick = { nav("Room/${baseUser.pubkeyHex}") }
+            onClick = onClick
         )
     ) {
         Row(
@@ -323,22 +384,18 @@ fun UserComposeForChat(
                 ),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            UserPicture(baseUser, nav, account.userProfile(), 55.dp)
+            UserPicture(baseUser, 55.dp, accountViewModel)
 
-            Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
+            Column(
+                modifier = Modifier
+                    .padding(start = 10.dp)
+                    .weight(1f)
+            ) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     UsernameDisplay(baseUser)
                 }
 
-                val baseUserState by baseUser.live().metadata.observeAsState()
-                val user = baseUserState?.user ?: return
-
-                Text(
-                    user.info?.about ?: "",
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis
-                )
+                DisplayUserAboutInfo(baseUser)
             }
         }
 
@@ -348,3 +405,20 @@ fun UserComposeForChat(
         )
     }
 }
+
+@Composable
+private fun DisplayUserAboutInfo(baseUser: User) {
+    val baseUserState by baseUser.live().metadata.observeAsState()
+    val about by remember(baseUserState) {
+        derivedStateOf {
+            baseUserState?.user?.info?.about ?: ""
+        }
+    }
+
+    Text(
+        text = about,
+        color = MaterialTheme.colors.placeholderText,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis
+    )
+}

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

@@ -14,6 +14,7 @@ import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -24,13 +25,16 @@ 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
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 @Composable
-fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = null) {
+fun NewChannelView(onClose: () -> Unit, accountViewModel: AccountViewModel, channel: Channel? = null) {
     val postViewModel: NewChannelViewModel = viewModel()
-    postViewModel.load(account, channel)
+    postViewModel.load(accountViewModel.account, channel)
 
     Dialog(
         onDismissRequest = { onClose() },
@@ -53,10 +57,14 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
                         onClose()
                     })
 
+                    val scope = rememberCoroutineScope()
+
                     PostButton(
                         onPost = {
-                            postViewModel.create()
-                            onClose()
+                            scope.launch(Dispatchers.IO) {
+                                postViewModel.create()
+                                onClose()
+                            }
                         },
                         postViewModel.channelName.value.text.isNotBlank()
                     )
@@ -72,7 +80,7 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
                     placeholder = {
                         Text(
                             text = stringResource(R.string.my_awesome_group),
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            color = MaterialTheme.colors.placeholderText
                         )
                     },
                     keyboardOptions = KeyboardOptions.Default.copy(
@@ -91,7 +99,7 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
                     placeholder = {
                         Text(
                             text = "http://mygroup.com/logo.jpg",
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            color = MaterialTheme.colors.placeholderText
                         )
                     }
                 )
@@ -100,13 +108,15 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
 
                 OutlinedTextField(
                     label = { Text(text = stringResource(R.string.description)) },
-                    modifier = Modifier.fillMaxWidth().height(100.dp),
+                    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)
+                            color = MaterialTheme.colors.placeholderText
                         )
                     },
                     keyboardOptions = KeyboardOptions.Default.copy(

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.actions
 import android.content.Context
 import android.net.Uri
 import android.util.Log
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -10,10 +11,12 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.*
 import com.vitorpamplona.amethyst.service.FileHeader
+import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 
+@Stable
 open class NewMediaModel : ViewModel() {
     var account: Account? = null
 
@@ -54,33 +57,56 @@ open class NewMediaModel : ViewModel() {
         isUploadingImage = true
 
         val contentResolver = context.contentResolver
-        val uri = galleryUri ?: return
+        val myGalleryUri = galleryUri ?: return
         val serverToUse = selectedServer ?: return
 
-        if (selectedServer == ServersAvailable.NIP95) {
+        val contentType = contentResolver.getType(myGalleryUri)
+
+        viewModelScope.launch(Dispatchers.IO) {
             uploadingPercentage.value = 0.1f
-            uploadingDescription.value = "Loading"
-            val contentType = contentResolver.getType(uri)
-            contentResolver.openInputStream(uri)?.use {
-                createNIP95Record(it.readBytes(), contentType, description)
-            }
-                ?: run {
-                    viewModelScope.launch {
-                        imageUploadingError.emit("Failed to upload the image / video")
-                        isUploadingImage = false
-                        uploadingPercentage.value = 0.00f
-                        uploadingDescription.value = null
+            uploadingDescription.value = "Compress"
+            MediaCompressor().compress(
+                myGalleryUri,
+                contentType,
+                context.applicationContext,
+                onReady = { fileUri, contentType, size ->
+
+                    if (selectedServer == ServersAvailable.NIP95) {
+                        uploadingPercentage.value = 0.2f
+                        uploadingDescription.value = "Loading"
+                        contentResolver.openInputStream(fileUri)?.use {
+                            createNIP95Record(it.readBytes(), contentType, description)
+                        }
+                            ?: run {
+                                viewModelScope.launch {
+                                    imageUploadingError.emit("Failed to upload the image / video")
+                                    isUploadingImage = false
+                                    uploadingPercentage.value = 0.00f
+                                    uploadingDescription.value = null
+                                }
+                            }
+                    } else {
+                        uploadingPercentage.value = 0.2f
+                        uploadingDescription.value = "Uploading"
+                        ImageUploader.uploadImage(
+                            uri = fileUri,
+                            contentType = contentType,
+                            size = size,
+                            server = serverToUse,
+                            contentResolver = contentResolver,
+                            onSuccess = { imageUrl, mimeType ->
+                                createNIP94Record(imageUrl, mimeType, description)
+                            },
+                            onError = {
+                                isUploadingImage = false
+                                uploadingPercentage.value = 0.00f
+                                uploadingDescription.value = null
+                                viewModelScope.launch {
+                                    imageUploadingError.emit("Failed to upload the image / video")
+                                }
+                            }
+                        )
                     }
-                }
-        } else {
-            uploadingPercentage.value = 0.1f
-            uploadingDescription.value = "Uploading"
-            ImageUploader.uploadImage(
-                uri = uri,
-                server = serverToUse,
-                contentResolver = contentResolver,
-                onSuccess = { imageUrl, mimeType ->
-                    createNIP94Record(imageUrl, mimeType, description)
                 },
                 onError = {
                     isUploadingImage = false
@@ -162,7 +188,7 @@ open class NewMediaModel : ViewModel() {
     }
 
     fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String) {
-        uploadingPercentage.value = 0.20f
+        uploadingPercentage.value = 0.30f
         uploadingDescription.value = "Hashing"
 
         viewModelScope.launch(Dispatchers.IO) {
@@ -173,7 +199,7 @@ open class NewMediaModel : ViewModel() {
                 description,
                 onReady = {
                     uploadingDescription.value = "Signing"
-                    uploadingPercentage.value = 0.30f
+                    uploadingPercentage.value = 0.40f
                     val nip95 = account?.createNip95(bytes, headerInfo = it)
 
                     if (nip95 != null) {

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

@@ -16,7 +16,6 @@ import androidx.compose.runtime.LaunchedEffect
 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
@@ -34,8 +33,11 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.components.*
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @Composable
 fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
@@ -48,8 +50,13 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, ac
     LaunchedEffect(uri) {
         val mediaType = resolver.getType(uri) ?: ""
         postViewModel.load(account, uri, mediaType)
-        postViewModel.imageUploadingError.collect { error ->
-            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+
+        launch(Dispatchers.IO) {
+            postViewModel.imageUploadingError.collect { error ->
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 
@@ -117,8 +124,6 @@ fun isNIP94Server(selectedServer: ServersAvailable?): Boolean {
 
 @Composable
 fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) {
-    val scope = rememberCoroutineScope()
-
     val fileServers = listOf(
         // Triple(ServersAvailable.IMGUR_NIP_94, stringResource(id = R.string.upload_server_imgur_nip94), stringResource(id = R.string.upload_server_imgur_nip94_explainer)),
         Triple(ServersAvailable.NOSTRIMG_NIP_94, stringResource(id = R.string.upload_server_nostrimg_nip94), stringResource(id = R.string.upload_server_nostrimg_nip94_explainer)),
@@ -127,8 +132,8 @@ fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) {
         Triple(ServersAvailable.NIP95, stringResource(id = R.string.upload_server_relays_nip95), stringResource(id = R.string.upload_server_relays_nip95_explainer))
     )
 
-    val fileServerOptions = fileServers.map { it.second }
-    val fileServerExplainers = fileServers.map { it.third }
+    val fileServerOptions = remember { fileServers.map { it.second }.toImmutableList() }
+    val fileServerExplainers = remember { fileServers.map { it.third }.toImmutableList() }
     val resolver = LocalContext.current.contentResolver
 
     Row(
@@ -152,7 +157,7 @@ fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) {
             var bitmap by remember { mutableStateOf<Bitmap?>(null) }
 
             LaunchedEffect(key1 = postViewModel.galleryUri) {
-                scope.launch(Dispatchers.IO) {
+                launch(Dispatchers.IO) {
                     postViewModel.galleryUri?.let {
                         try {
                             bitmap = resolver.loadThumbnail(it, Size(1200, 1000), null)
@@ -175,7 +180,7 @@ fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) {
             }
         } else {
             postViewModel.galleryUri?.let {
-                VideoView(it)
+                VideoView(it.toString())
             }
         }
     }
@@ -217,7 +222,7 @@ fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) {
                 placeholder = {
                     Text(
                         text = stringResource(R.string.content_description_example),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        color = MaterialTheme.colors.placeholderText
                     )
                 },
                 keyboardOptions = KeyboardOptions.Default.copy(

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

@@ -1,31 +1,36 @@
 package com.vitorpamplona.amethyst.ui.actions
 
-import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.model.parseDirtyWordForKey
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 
-class NewMessageTagger(var channel: Channel?, var mentions: List<User>?, var replyTos: List<Note>?, var message: String) {
+class NewMessageTagger(var channelHex: String?, var mentions: List<User>?, var replyTos: List<Note>?, var message: String) {
+
+    val directMentions = mutableSetOf<HexKey>()
 
     fun addUserToMentions(user: User) {
+        directMentions.add(user.pubkeyHex)
         mentions = if (mentions?.contains(user) == true) mentions else mentions?.plus(user) ?: listOf(user)
     }
 
     fun addNoteToReplyTos(note: Note) {
+        directMentions.add(note.idHex)
+
         note.author?.let { addUserToMentions(it) }
         replyTos = if (replyTos?.contains(note) == true) replyTos else replyTos?.plus(note) ?: listOf(note)
     }
 
     fun tagIndex(user: User): Int {
         // Postr Events assembles replies before mentions in the tag order
-        return (if (channel != null) 1 else 0) + (replyTos?.size ?: 0) + (mentions?.indexOf(user) ?: 0)
+        return (if (channelHex != null) 1 else 0) + (replyTos?.size ?: 0) + (mentions?.indexOf(user) ?: 0)
     }
 
     fun tagIndex(note: Note): Int {
         // Postr Events assembles replies before mentions in the tag order
-        return (if (channel != null) 1 else 0) + (replyTos?.indexOf(note) ?: 0)
+        return (if (channelHex != null) 1 else 0) + (replyTos?.indexOf(note) ?: 0)
     }
 
     fun run() {

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

@@ -22,6 +22,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @Composable
 fun NewPollClosing(pollViewModel: NewPostViewModel) {
@@ -43,7 +44,7 @@ fun NewPollClosing(pollViewModel: NewPostViewModel) {
     )
     val colorValid = TextFieldDefaults.outlinedTextFieldColors(
         focusedBorderColor = MaterialTheme.colors.primary,
-        unfocusedBorderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+        unfocusedBorderColor = MaterialTheme.colors.placeholderText
     )
 
     Row(
@@ -59,13 +60,13 @@ fun NewPollClosing(pollViewModel: NewPostViewModel) {
             label = {
                 Text(
                     text = stringResource(R.string.poll_closing_time),
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    color = MaterialTheme.colors.placeholderText
                 )
             },
             placeholder = {
                 Text(
                     text = stringResource(R.string.poll_closing_time_days),
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    color = MaterialTheme.colors.placeholderText
                 )
             }
         )

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

@@ -22,6 +22,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @Composable
 fun NewPollConsensusThreshold(pollViewModel: NewPostViewModel) {
@@ -43,7 +44,7 @@ fun NewPollConsensusThreshold(pollViewModel: NewPostViewModel) {
     )
     val colorValid = TextFieldDefaults.outlinedTextFieldColors(
         focusedBorderColor = MaterialTheme.colors.primary,
-        unfocusedBorderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+        unfocusedBorderColor = MaterialTheme.colors.placeholderText
     )
 
     Row(
@@ -59,13 +60,13 @@ fun NewPollConsensusThreshold(pollViewModel: NewPostViewModel) {
             label = {
                 Text(
                     text = stringResource(R.string.poll_consensus_threshold),
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    color = MaterialTheme.colors.placeholderText
                 )
             },
             placeholder = {
                 Text(
                     text = stringResource(R.string.poll_consensus_threshold_percent),
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    color = MaterialTheme.colors.placeholderText
                 )
             }
         )

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

@@ -11,6 +11,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.tooling.preview.Preview
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @Composable
 fun NewPollOption(pollViewModel: NewPostViewModel, optionIndex: Int) {
@@ -35,13 +36,13 @@ fun NewPollOption(pollViewModel: NewPostViewModel, optionIndex: Int) {
             label = {
                 Text(
                     text = stringResource(R.string.poll_option_index).format(optionIndex + 1),
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    color = MaterialTheme.colors.placeholderText
                 )
             },
             placeholder = {
                 Text(
                     text = stringResource(R.string.poll_option_description),
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    color = MaterialTheme.colors.placeholderText
                 )
             },
             keyboardOptions = KeyboardOptions.Default.copy(

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

@@ -19,6 +19,7 @@ import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
 import com.vitorpamplona.amethyst.ui.actions.UrlUserTagTransformation
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -38,7 +39,7 @@ fun NewPollPrimaryDescription(pollViewModel: NewPostViewModel) {
     )
     val colorValid = TextFieldDefaults.outlinedTextFieldColors(
         focusedBorderColor = MaterialTheme.colors.primary,
-        unfocusedBorderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+        unfocusedBorderColor = MaterialTheme.colors.placeholderText
     )
 
     OutlinedTextField(
@@ -49,7 +50,7 @@ fun NewPollPrimaryDescription(pollViewModel: NewPostViewModel) {
         label = {
             Text(
                 text = stringResource(R.string.poll_primary_description),
-                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                color = MaterialTheme.colors.placeholderText
             )
         },
         keyboardOptions = KeyboardOptions.Default.copy(
@@ -67,7 +68,7 @@ fun NewPollPrimaryDescription(pollViewModel: NewPostViewModel) {
         placeholder = {
             Text(
                 text = stringResource(R.string.poll_primary_description),
-                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                color = MaterialTheme.colors.placeholderText
             )
         },
         colors = if (isInputValid) colorValid else colorInValid,

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

@@ -10,6 +10,7 @@ import androidx.compose.ui.res.stringResource
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @Composable
 fun NewPollRecipientsField(pollViewModel: NewPostViewModel, account: Account) {
@@ -29,13 +30,13 @@ fun NewPollRecipientsField(pollViewModel: NewPostViewModel, account: Account) {
         label = {
             Text(
                 text = stringResource(R.string.poll_zap_recipients),
-                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                color = MaterialTheme.colors.placeholderText
             )
         },
         placeholder = {
             Text(
                 text = stringResource(R.string.poll_zap_recipients),
-                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                color = MaterialTheme.colors.placeholderText
             )
         }
 

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

@@ -1,197 +0,0 @@
-package com.vitorpamplona.amethyst.ui.actions
-
-import android.widget.Toast
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-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.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.Note
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
-import com.vitorpamplona.amethyst.ui.components.*
-import com.vitorpamplona.amethyst.ui.note.ReplyInformation
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
-import kotlinx.coroutines.delay
-
-@Composable
-fun NewPollView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = null, account: Account) {
-    val pollViewModel: NewPostViewModel = viewModel()
-
-    val context = LocalContext.current
-
-    val scrollState = rememberScrollState()
-
-    LaunchedEffect(Unit) {
-        pollViewModel.load(account, baseReplyTo, quote)
-        delay(100)
-
-        pollViewModel.imageUploadingError.collect { error ->
-            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    Dialog(
-        onDismissRequest = { onClose() },
-        properties = DialogProperties(
-            usePlatformDefaultWidth = false,
-            dismissOnClickOutside = false,
-            decorFitsSystemWindows = false
-        )
-    ) {
-        Surface(
-            modifier = Modifier
-                .fillMaxWidth()
-                .fillMaxHeight()
-        ) {
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .fillMaxHeight()
-            ) {
-                Column(
-                    modifier = Modifier
-                        .padding(start = 10.dp, end = 10.dp, top = 10.dp)
-                        .imePadding()
-                        .weight(1f)
-                ) {
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.SpaceBetween,
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        CloseButton(onCancel = {
-                            pollViewModel.cancel()
-                            onClose()
-                        })
-
-                        PollButton(
-                            onPost = {
-                                pollViewModel.sendPost()
-                                onClose()
-                            },
-                            isActive = pollViewModel.message.text.isNotBlank() &&
-                                pollViewModel.pollOptions.values.all { it.isNotEmpty() } &&
-                                pollViewModel.isValidRecipients.value &&
-                                pollViewModel.isValidvalueMaximum.value &&
-                                pollViewModel.isValidvalueMinimum.value &&
-                                pollViewModel.isValidConsensusThreshold.value &&
-                                pollViewModel.isValidClosedAt.value
-                        )
-                    }
-
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .weight(1f)
-                    ) {
-                        Column(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .verticalScroll(scrollState)
-                        ) {
-                            if (pollViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
-                                ReplyInformation(pollViewModel.replyTos, pollViewModel.mentions, account, "✖ ") {
-                                    pollViewModel.removeFromReplyList(it)
-                                }
-                            }
-
-                            Text(stringResource(R.string.poll_heading_required))
-                            // NewPollRecipientsField(pollViewModel, account)
-                            NewPollPrimaryDescription(pollViewModel)
-                            pollViewModel.pollOptions.values.forEachIndexed { index, _ ->
-                                NewPollOption(pollViewModel, index)
-                            }
-                            Button(
-                                onClick = { pollViewModel.pollOptions[pollViewModel.pollOptions.size] = "" },
-                                border = BorderStroke(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.32f)),
-                                colors = ButtonDefaults.outlinedButtonColors(
-                                    contentColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                                )
-                            ) {
-                                Image(
-                                    painterResource(id = android.R.drawable.ic_input_add),
-                                    contentDescription = "Add poll option button",
-                                    modifier = Modifier.size(18.dp)
-                                )
-                            }
-                            Text(stringResource(R.string.poll_heading_optional))
-                            NewPollVoteValueRange(pollViewModel)
-                            NewPollConsensusThreshold(pollViewModel)
-                            NewPollClosing(pollViewModel)
-                        }
-                    }
-
-                    val userSuggestions = pollViewModel.userSuggestions
-                    if (userSuggestions.isNotEmpty()) {
-                        LazyColumn(
-                            contentPadding = PaddingValues(
-                                top = 10.dp
-                            ),
-                            modifier = Modifier.heightIn(0.dp, 300.dp)
-                        ) {
-                            itemsIndexed(
-                                userSuggestions,
-                                key = { _, item -> item.pubkeyHex }
-                            ) { _, item ->
-                                UserLine(item, account) {
-                                    pollViewModel.autocompleteWithUser(item)
-                                }
-                            }
-                        }
-                    }
-
-                    Row(modifier = Modifier.fillMaxWidth()) {
-                        /*UploadFromGallery(
-                            isUploading = pollViewModel.isUploadingImage
-                        ) {
-                            pollViewModel.upload(it, context)
-                        }*/
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun PollButton(modifier: Modifier = Modifier, onPost: () -> Unit = {}, isActive: Boolean) {
-    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.post_poll), color = Color.White)
-    }
-}
-
-/*@Preview
-@Composable
-fun NewPollViewPreview() {
-    NewPollView(onClose = {}, account = Account(loggedIn = Persona()))
-}*/

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

@@ -21,6 +21,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @Composable
 fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
@@ -71,7 +72,7 @@ fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
     )
     val colorValid = TextFieldDefaults.outlinedTextFieldColors(
         focusedBorderColor = MaterialTheme.colors.primary,
-        unfocusedBorderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+        unfocusedBorderColor = MaterialTheme.colors.placeholderText
     )
 
     Row(
@@ -87,13 +88,13 @@ fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
             label = {
                 Text(
                     text = stringResource(R.string.poll_zap_value_min),
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    color = MaterialTheme.colors.placeholderText
                 )
             },
             placeholder = {
                 Text(
                     text = stringResource(R.string.sats),
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    color = MaterialTheme.colors.placeholderText
                 )
             }
         )
@@ -106,13 +107,13 @@ fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
             label = {
                 Text(
                     text = stringResource(R.string.poll_zap_value_max),
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    color = MaterialTheme.colors.placeholderText
                 )
             },
             placeholder = {
                 Text(
                     text = stringResource(R.string.sats),
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    color = MaterialTheme.colors.placeholderText
                 )
             }
         )

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

@@ -22,15 +22,16 @@ import androidx.compose.material.icons.filled.ArrowForwardIos
 import androidx.compose.material.icons.filled.Bolt
 import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.CurrencyBitcoin
+import androidx.compose.material.icons.filled.ShowChart
 import androidx.compose.material.icons.filled.Visibility
 import androidx.compose.material.icons.filled.VisibilityOff
-import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material.icons.outlined.ArrowForwardIos
 import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.material.icons.rounded.Warning
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -71,9 +72,17 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
+import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import com.vitorpamplona.amethyst.ui.theme.subtleBorder
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -97,8 +106,12 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
         delay(100)
         focusRequester.requestFocus()
 
-        postViewModel.imageUploadingError.collect { error ->
-            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+        launch(Dispatchers.IO) {
+            postViewModel.imageUploadingError.collect { error ->
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 
@@ -144,8 +157,10 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
 
                         PostButton(
                             onPost = {
-                                postViewModel.sendPost()
-                                onClose()
+                                scope.launch(Dispatchers.IO) {
+                                    postViewModel.sendPost()
+                                    onClose()
+                                }
                             },
                             isActive = postViewModel.canPost()
                         )
@@ -161,7 +176,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                 .fillMaxWidth()
                                 .verticalScroll(scrollState)
                         ) {
-                            Notifying(postViewModel.mentions) {
+                            Notifying(postViewModel.mentions?.toImmutableList()) {
                                 postViewModel.removeFromReplyList(it)
                             }
 
@@ -189,7 +204,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                 placeholder = {
                                     Text(
                                         text = stringResource(R.string.what_s_on_your_mind),
-                                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                        color = MaterialTheme.colors.placeholderText
                                     )
                                 },
                                 colors = TextFieldDefaults
@@ -208,9 +223,9 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
 
                                 Button(
                                     onClick = { postViewModel.pollOptions[postViewModel.pollOptions.size] = "" },
-                                    border = BorderStroke(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.32f)),
+                                    border = BorderStroke(1.dp, MaterialTheme.colors.placeholderText),
                                     colors = ButtonDefaults.outlinedButtonColors(
-                                        contentColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                        contentColor = MaterialTheme.colors.placeholderText
                                     )
                                 ) {
                                     Image(
@@ -265,6 +280,15 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                 }
                             }
 
+                            if (lud16 != null && postViewModel.wantsZapraiser) {
+                                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = 5.dp)) {
+                                    ZapRaiserRequest(
+                                        stringResource(id = R.string.zapraiser),
+                                        postViewModel
+                                    )
+                                }
+                            }
+
                             val myUrlPreview = postViewModel.urlPreview
                             if (myUrlPreview != null) {
                                 Row(modifier = Modifier.padding(top = 5.dp)) {
@@ -279,11 +303,11 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                                 modifier = Modifier
                                                     .padding(top = 4.dp)
                                                     .fillMaxWidth()
-                                                    .clip(shape = RoundedCornerShape(15.dp))
+                                                    .clip(shape = QuoteBorder)
                                                     .border(
                                                         1.dp,
-                                                        MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-                                                        RoundedCornerShape(15.dp)
+                                                        MaterialTheme.colors.subtleBorder,
+                                                        QuoteBorder
                                                     )
                                             )
                                         } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
@@ -291,11 +315,16 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                         } else {
                                             UrlPreview(myUrlPreview, myUrlPreview)
                                         }
-                                    } else if (isBechLink(myUrlPreview)) {
+                                    } else if (startsWithNIP19Scheme(myUrlPreview)) {
+                                        val bgColor = MaterialTheme.colors.background
+                                        val backgroundColor = remember {
+                                            mutableStateOf(bgColor)
+                                        }
+
                                         BechLink(
                                             myUrlPreview,
                                             true,
-                                            MaterialTheme.colors.background,
+                                            backgroundColor,
                                             accountViewModel,
                                             nav
                                         )
@@ -319,7 +348,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                 userSuggestions,
                                 key = { _, item -> item.pubkeyHex }
                             ) { _, item ->
-                                UserLine(item, account) {
+                                UserLine(item, accountViewModel) {
                                     postViewModel.autocompleteWithUser(item)
                                 }
                             }
@@ -355,6 +384,12 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                             }
                         }
 
+                        if (postViewModel.canAddZapRaiser) {
+                            AddZapraiserButton(postViewModel.wantsZapraiser) {
+                                postViewModel.wantsZapraiser = !postViewModel.wantsZapraiser
+                            }
+                        }
+
                         MarkAsSensitive(postViewModel) {
                             postViewModel.wantsToMarkAsSensitive = !postViewModel.wantsToMarkAsSensitive
                         }
@@ -371,7 +406,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun Notifying(baseMentions: List<User>?, onClick: (User) -> Unit) {
+fun Notifying(baseMentions: ImmutableList<User>?, onClick: (User) -> Unit) {
     val mentions = baseMentions?.toSet()
 
     FlowRow(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(horizontal = 10.dp)) {
@@ -379,28 +414,30 @@ fun Notifying(baseMentions: List<User>?, onClick: (User) -> Unit) {
             Text(
                 stringResource(R.string.reply_notify),
                 fontWeight = FontWeight.Bold,
-                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                color = MaterialTheme.colors.placeholderText
             )
 
             mentions.forEachIndexed { idx, user ->
                 val innerUserState by user.live().metadata.observeAsState()
-                val innerUser = innerUserState?.user
-
-                innerUser?.let { myUser ->
+                innerUserState?.user?.let { myUser ->
                     Spacer(modifier = Modifier.width(5.dp))
 
+                    val tags = remember(innerUserState) {
+                        myUser.info?.latestMetadata?.tags?.toImmutableListOfLists()
+                    }
+
                     Button(
-                        shape = RoundedCornerShape(20.dp),
+                        shape = ButtonBorder,
                         colors = ButtonDefaults.buttonColors(
-                            backgroundColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
+                            backgroundColor = MaterialTheme.colors.mediumImportanceLink
                         ),
                         onClick = {
                             onClick(myUser)
                         }
                     ) {
                         CreateTextWithEmoji(
-                            text = "✖ ${myUser.toBestDisplayName()}",
-                            tags = myUser.info?.latestMetadata?.tags,
+                            text = remember(innerUserState) { "✖ ${myUser.toBestDisplayName()}" },
+                            tags = tags,
                             color = Color.White,
                             textAlign = TextAlign.Center
                         )
@@ -439,6 +476,56 @@ private fun AddPollButton(
     }
 }
 
+@Composable
+private fun AddZapraiserButton(
+    isLnInvoiceActive: Boolean,
+    onClick: () -> Unit
+) {
+    IconButton(
+        onClick = {
+            onClick()
+        }
+    ) {
+        Box(
+            Modifier
+                .height(20.dp)
+                .width(25.dp)
+        ) {
+            if (!isLnInvoiceActive) {
+                Icon(
+                    imageVector = Icons.Default.ShowChart,
+                    null,
+                    modifier = Modifier.size(20.dp).align(Alignment.TopStart),
+                    tint = MaterialTheme.colors.onBackground
+                )
+                Icon(
+                    imageVector = Icons.Default.Bolt,
+                    contentDescription = stringResource(R.string.zaps),
+                    modifier = Modifier
+                        .size(13.dp)
+                        .align(Alignment.BottomEnd),
+                    tint = MaterialTheme.colors.onBackground
+                )
+            } else {
+                Icon(
+                    imageVector = Icons.Default.ShowChart,
+                    null,
+                    modifier = Modifier.size(20.dp).align(Alignment.TopStart),
+                    tint = BitcoinOrange
+                )
+                Icon(
+                    imageVector = Icons.Default.Bolt,
+                    contentDescription = stringResource(R.string.zaps),
+                    modifier = Modifier
+                        .size(13.dp)
+                        .align(Alignment.BottomEnd),
+                    tint = BitcoinOrange
+                )
+            }
+        }
+    }
+}
+
 @Composable
 private fun AddLnInvoiceButton(
     isLnInvoiceActive: Boolean,
@@ -533,7 +620,7 @@ private fun ForwardZapTo(
             placeholder = {
                 Text(
                     text = stringResource(R.string.zap_forward_lnAddress),
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                    color = MaterialTheme.colors.placeholderText,
                     fontSize = 14.sp
                 )
             },
@@ -608,7 +695,7 @@ fun CloseButton(onCancel: () -> Unit) {
         onClick = {
             onCancel()
         },
-        shape = RoundedCornerShape(20.dp),
+        shape = ButtonBorder,
         colors = ButtonDefaults
             .buttonColors(
                 backgroundColor = Color.Gray
@@ -632,7 +719,7 @@ fun PostButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier =
                 onPost()
             }
         },
-        shape = RoundedCornerShape(20.dp),
+        shape = ButtonBorder,
         colors = ButtonDefaults
             .buttonColors(
                 backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
@@ -651,7 +738,7 @@ fun SaveButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier =
                 onPost()
             }
         },
-        shape = RoundedCornerShape(20.dp),
+        shape = ButtonBorder,
         colors = ButtonDefaults
             .buttonColors(
                 backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
@@ -670,7 +757,7 @@ fun CreateButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier
                 onPost()
             }
         },
-        shape = RoundedCornerShape(20.dp),
+        shape = ButtonBorder,
         colors = ButtonDefaults
             .buttonColors(
                 backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
@@ -689,7 +776,7 @@ fun SearchButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier
                 onPost()
             }
         },
-        shape = RoundedCornerShape(20.dp),
+        shape = ButtonBorder,
         colors = ButtonDefaults
             .buttonColors(
                 backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
@@ -727,7 +814,6 @@ fun ImageVideoDescription(
 ) {
     val resolver = LocalContext.current.contentResolver
     val mediaType = resolver.getType(uri) ?: ""
-    val scope = rememberCoroutineScope()
 
     val isImage = mediaType.startsWith("image")
     val isVideo = mediaType.startsWith("video")
@@ -744,8 +830,8 @@ fun ImageVideoDescription(
         Triple(ServersAvailable.NIP95, stringResource(id = R.string.upload_server_relays_nip95), stringResource(id = R.string.upload_server_relays_nip95_explainer))
     )
 
-    val fileServerOptions = fileServers.map { it.second }
-    val fileServerExplainers = fileServers.map { it.third }
+    val fileServerOptions = remember { fileServers.map { it.second }.toImmutableList() }
+    val fileServerExplainers = remember { fileServers.map { it.third }.toImmutableList() }
 
     var selectedServer by remember { mutableStateOf(defaultServer) }
     var message by remember { mutableStateOf("") }
@@ -754,11 +840,11 @@ fun ImageVideoDescription(
         modifier = Modifier
             .fillMaxWidth()
             .padding(start = 30.dp, end = 30.dp)
-            .clip(shape = RoundedCornerShape(10.dp))
+            .clip(shape = QuoteBorder)
             .border(
                 1.dp,
-                MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-                RoundedCornerShape(15.dp)
+                MaterialTheme.colors.subtleBorder,
+                QuoteBorder
             )
     ) {
         Column(
@@ -802,7 +888,7 @@ fun ImageVideoDescription(
                         modifier = Modifier
                             .padding(end = 5.dp)
                             .size(30.dp),
-                        tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        tint = MaterialTheme.colors.placeholderText
                     )
                 }
             }
@@ -830,7 +916,7 @@ fun ImageVideoDescription(
                     var bitmap by remember { mutableStateOf<Bitmap?>(null) }
 
                     LaunchedEffect(key1 = uri) {
-                        scope.launch(Dispatchers.IO) {
+                        launch(Dispatchers.IO) {
                             try {
                                 bitmap = resolver.loadThumbnail(uri, Size(1200, 1000), null)
                             } catch (e: Exception) {
@@ -851,7 +937,7 @@ fun ImageVideoDescription(
                         )
                     }
                 } else {
-                    VideoView(uri)
+                    VideoView(uri.toString())
                 }
             }
 
@@ -892,7 +978,7 @@ fun ImageVideoDescription(
                         placeholder = {
                             Text(
                                 text = stringResource(R.string.content_description_example),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
                         },
                         keyboardOptions = KeyboardOptions.Default.copy(
@@ -909,7 +995,7 @@ fun ImageVideoDescription(
                 onClick = {
                     onAdd(message, selectedServer)
                 },
-                shape = RoundedCornerShape(15.dp),
+                shape = QuoteBorder,
                 colors = ButtonDefaults.buttonColors(
                     backgroundColor = MaterialTheme.colors.primary
                 )
@@ -919,3 +1005,10 @@ fun ImageVideoDescription(
         }
     }
 }
+
+@Stable
+data class ImmutableListOfLists<T>(val lists: List<List<T>> = emptyList())
+
+fun List<List<String>>.toImmutableListOfLists(): ImmutableListOfLists<String> {
+    return ImmutableListOfLists(this)
+}

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.Context
 import android.net.Uri
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateMapOf
@@ -15,15 +16,18 @@ import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.*
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.service.model.BaseTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 
-open class NewPostViewModel : ViewModel() {
+@Stable
+open class NewPostViewModel() : ViewModel() {
     var account: Account? = null
     var originalNote: Note? = null
 
@@ -70,10 +74,20 @@ open class NewPostViewModel : ViewModel() {
     // NSFW, Sensitive
     var wantsToMarkAsSensitive by mutableStateOf(false)
 
+    // ZapRaiser
+    var canAddZapRaiser by mutableStateOf(false)
+    var wantsZapraiser by mutableStateOf(false)
+    var zapRaiserAmount by mutableStateOf<Long?>(null)
+
     open fun load(account: Account, replyingTo: Note?, quote: Note?) {
         originalNote = replyingTo
         replyingTo?.let { replyNote ->
-            this.replyTos = (replyNote.replyTo ?: emptyList()).plus(replyNote)
+            if (replyNote.event is BaseTextNoteEvent) {
+                this.replyTos = (replyNote.replyTo ?: emptyList()).plus(replyNote)
+            } else {
+                this.replyTos = listOf(replyNote)
+            }
+
             replyNote.author?.let { replyUser ->
                 val currentMentions = (replyNote.event as? TextNoteEvent)
                     ?.mentions()
@@ -96,11 +110,14 @@ open class NewPostViewModel : ViewModel() {
         }
 
         canAddInvoice = account.userProfile().info?.lnAddress() != null
-        canUsePoll = originalNote?.event !is PrivateDmEvent && originalNote?.channel() == null
+        canAddZapRaiser = account.userProfile().info?.lnAddress() != null
+        canUsePoll = originalNote?.event !is PrivateDmEvent && originalNote?.channelHex() == null
         contentToAddUrl = null
 
         wantsForwardZapTo = false
         wantsToMarkAsSensitive = false
+        wantsZapraiser = false
+        zapRaiserAmount = null
         forwardZapTo = null
         forwardZapToEditting = TextFieldValue("")
 
@@ -108,7 +125,7 @@ open class NewPostViewModel : ViewModel() {
     }
 
     fun sendPost() {
-        val tagger = NewMessageTagger(originalNote?.channel(), mentions, replyTos, message.text)
+        val tagger = NewMessageTagger(originalNote?.channelHex(), mentions, replyTos, message.text)
         tagger.run()
 
         val zapReceiver = if (wantsForwardZapTo) {
@@ -121,48 +138,85 @@ open class NewPostViewModel : ViewModel() {
             null
         }
 
+        val localZapRaiserAmount = if (wantsZapraiser) zapRaiserAmount else null
+
         if (wantsPoll) {
-            account?.sendPoll(tagger.message, tagger.replyTos, tagger.mentions, pollOptions, valueMaximum, valueMinimum, consensusThreshold, closedAt, zapReceiver, wantsToMarkAsSensitive)
-        } else if (originalNote?.channel() != null) {
-            account?.sendChannelMessage(tagger.message, tagger.channel!!.idHex, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive)
+            account?.sendPoll(tagger.message, tagger.replyTos, tagger.mentions, pollOptions, valueMaximum, valueMinimum, consensusThreshold, closedAt, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount)
+        } else if (originalNote?.channelHex() != null) {
+            account?.sendChannelMessage(tagger.message, tagger.channelHex!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount)
         } else if (originalNote?.event is PrivateDmEvent) {
-            account?.sendPrivateMessage(tagger.message, originalNote!!.author!!.pubkeyHex, originalNote!!, tagger.mentions, zapReceiver, wantsToMarkAsSensitive)
+            account?.sendPrivateMessage(tagger.message, originalNote!!.author!!, originalNote!!, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount)
         } else {
-            account?.sendPost(tagger.message, tagger.replyTos, tagger.mentions, null, zapReceiver, wantsToMarkAsSensitive)
+            // adds markers
+            val rootId =
+                (originalNote?.event as? TextNoteEvent)?.root() // if it has a marker as root
+                    ?: originalNote?.replyTo?.firstOrNull { it.event != null && it.replyTo?.isEmpty() == true }?.idHex // if it has loaded events with zero replies in the reply list
+                    ?: originalNote?.replyTo?.firstOrNull()?.idHex // old rules, first item is root.
+            val replyId = originalNote?.idHex
+
+            account?.sendPost(
+                message = tagger.message,
+                replyTo = tagger.replyTos,
+                mentions = tagger.mentions,
+                tags = null,
+                zapReceiver = zapReceiver,
+                wantsToMarkAsSensitive = wantsToMarkAsSensitive,
+                zapRaiserAmount = localZapRaiserAmount,
+                replyingTo = replyId,
+                root = rootId,
+                directMentions = tagger.directMentions
+            )
         }
 
         cancel()
     }
 
-    fun upload(it: Uri, description: String, server: ServersAvailable, context: Context) {
+    fun upload(galleryUri: Uri, description: String, server: ServersAvailable, context: Context) {
         isUploadingImage = true
         contentToAddUrl = null
 
         val contentResolver = context.contentResolver
+        val contentType = contentResolver.getType(galleryUri)
 
-        if (server == ServersAvailable.NIP95) {
-            val contentType = contentResolver.getType(it)
-            contentResolver.openInputStream(it)?.use {
-                createNIP95Record(it.readBytes(), contentType, description)
-            }
-        } else {
-            ImageUploader.uploadImage(
-                uri = it,
-                server = server,
-                contentResolver = contentResolver,
-                onSuccess = { imageUrl, mimeType ->
-                    if (isNIP94Server(server)) {
-                        createNIP94Record(imageUrl, mimeType, description)
+        viewModelScope.launch(Dispatchers.IO) {
+            MediaCompressor().compress(
+                galleryUri,
+                contentType,
+                context.applicationContext,
+                onReady = { fileUri, contentType, size ->
+                    if (server == ServersAvailable.NIP95) {
+                        contentResolver.openInputStream(fileUri)?.use {
+                            createNIP95Record(it.readBytes(), contentType, description)
+                        }
                     } else {
-                        isUploadingImage = false
-                        message = TextFieldValue(message.text + "\n\n" + imageUrl)
-                        urlPreview = findUrlInMessage()
+                        ImageUploader.uploadImage(
+                            uri = fileUri,
+                            contentType = contentType,
+                            size = size,
+                            server = server,
+                            contentResolver = contentResolver,
+                            onSuccess = { imageUrl, mimeType ->
+                                if (isNIP94Server(server)) {
+                                    createNIP94Record(imageUrl, mimeType, description)
+                                } else {
+                                    isUploadingImage = false
+                                    message = TextFieldValue(message.text + "\n\n" + imageUrl)
+                                    urlPreview = findUrlInMessage()
+                                }
+                            },
+                            onError = {
+                                isUploadingImage = false
+                                viewModelScope.launch {
+                                    imageUploadingError.emit("Failed to upload the image / video")
+                                }
+                            }
+                        )
                     }
                 },
                 onError = {
                     isUploadingImage = false
                     viewModelScope.launch {
-                        imageUploadingError.emit("Failed to upload the image / video")
+                        imageUploadingError.emit(it)
                     }
                 }
             )
@@ -185,6 +239,8 @@ open class NewPostViewModel : ViewModel() {
         closedAt = null
 
         wantsInvoice = false
+        wantsZapraiser = false
+        zapRaiserAmount = null
 
         wantsForwardZapTo = false
         wantsToMarkAsSensitive = false
@@ -220,7 +276,11 @@ open class NewPostViewModel : ViewModel() {
             userSuggestionsMainMessage = true
             if (lastWord.startsWith("@") && lastWord.length > 2) {
                 NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
-                userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@")).sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() })).reversed()
+                viewModelScope.launch(Dispatchers.IO) {
+                    userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@"))
+                        .sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() }))
+                        .reversed()
+                }
             } else {
                 NostrSearchEventOrUserDataSource.clear()
                 userSuggestions = emptyList()
@@ -236,7 +296,15 @@ open class NewPostViewModel : ViewModel() {
             userSuggestionsMainMessage = false
             if (lastWord.startsWith("@") && lastWord.length > 2) {
                 NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
-                userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@")).sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() })).reversed()
+                viewModelScope.launch(Dispatchers.IO) {
+                    userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@"))
+                        .sortedWith(
+                            compareBy(
+                                { account?.isFollowing(it) },
+                                { it.toBestDisplayName() }
+                            )
+                        ).reversed()
+                }
             } else {
                 NostrSearchEventOrUserDataSource.clear()
                 userSuggestions = emptyList()
@@ -278,8 +346,7 @@ open class NewPostViewModel : ViewModel() {
     }
 
     fun canPost(): Boolean {
-        return message.text.isNotBlank() && !isUploadingImage && !wantsInvoice &&
-            (!wantsPoll || pollOptions.values.all { it.isNotEmpty() }) && contentToAddUrl == null
+        return message.text.isNotBlank() && !isUploadingImage && !wantsInvoice && (!wantsZapraiser || zapRaiserAmount != null) && (!wantsPoll || pollOptions.values.all { it.isNotEmpty() }) && contentToAddUrl == null
     }
 
     fun includePollHashtagInMessage(include: Boolean, hashtag: String) {

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

@@ -11,7 +11,6 @@ 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
@@ -49,18 +48,21 @@ 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 com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.Size35dp
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import java.lang.Math.round
 
 @Composable
-fun NewRelayListView(onClose: () -> Unit, account: Account, relayToAdd: String = "") {
+fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, relayToAdd: String = "") {
     val postViewModel: NewRelayListViewModel = viewModel()
     val feedState by postViewModel.relays.collectAsState()
 
     LaunchedEffect(Unit) {
-        postViewModel.load(account)
+        postViewModel.load(accountViewModel.account)
     }
 
     Dialog(
@@ -157,7 +159,7 @@ fun ServerConfigHeader() {
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1.2f),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        color = MaterialTheme.colors.placeholderText
                     )
 
                     Spacer(modifier = Modifier.size(5.dp))
@@ -167,7 +169,7 @@ fun ServerConfigHeader() {
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1.2f),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        color = MaterialTheme.colors.placeholderText
                     )
 
                     Spacer(modifier = Modifier.size(5.dp))
@@ -177,7 +179,7 @@ fun ServerConfigHeader() {
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1f),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        color = MaterialTheme.colors.placeholderText
                     )
 
                     Spacer(modifier = Modifier.size(5.dp))
@@ -187,7 +189,7 @@ fun ServerConfigHeader() {
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1f),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        color = MaterialTheme.colors.placeholderText
                     )
 
                     Spacer(modifier = Modifier.size(2.dp))
@@ -375,7 +377,7 @@ fun ServerConfig(
                                 maxLines = 1,
                                 fontSize = 12.sp,
                                 modifier = Modifier.weight(1.2f),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
 
                             IconButton(
@@ -403,7 +405,7 @@ fun ServerConfig(
                                 maxLines = 1,
                                 fontSize = 12.sp,
                                 modifier = Modifier.weight(1.2f),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
 
                             Icon(
@@ -420,7 +422,7 @@ fun ServerConfig(
                                 maxLines = 1,
                                 fontSize = 12.sp,
                                 modifier = Modifier.weight(1f),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
 
                             Icon(
@@ -435,7 +437,7 @@ fun ServerConfig(
                                 maxLines = 1,
                                 fontSize = 12.sp,
                                 modifier = Modifier.weight(1f),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
                         }
                     }
@@ -464,7 +466,7 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni
             placeholder = {
                 Text(
                     text = "server.com",
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                    color = MaterialTheme.colors.placeholderText,
                     maxLines = 1
                 )
             },
@@ -476,9 +478,9 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni
                 imageVector = Icons.Default.Download,
                 null,
                 modifier = Modifier
-                    .size(35.dp)
+                    .size(Size35dp)
                     .padding(horizontal = 5.dp),
-                tint = if (read) Color.Green else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                tint = if (read) Color.Green else MaterialTheme.colors.placeholderText
             )
         }
 
@@ -487,9 +489,9 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni
                 imageVector = Icons.Default.Upload,
                 null,
                 modifier = Modifier
-                    .size(35.dp)
+                    .size(Size35dp)
                     .padding(horizontal = 5.dp),
-                tint = if (write) Color.Green else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                tint = if (write) Color.Green else MaterialTheme.colors.placeholderText
             )
         }
 
@@ -504,10 +506,10 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni
                     read = true
                 }
             },
-            shape = RoundedCornerShape(20.dp),
+            shape = ButtonBorder,
             colors = ButtonDefaults
                 .buttonColors(
-                    backgroundColor = if (url.isNotBlank()) MaterialTheme.colors.primary else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    backgroundColor = if (url.isNotBlank()) MaterialTheme.colors.primary else MaterialTheme.colors.placeholderText
                 )
         ) {
             Text(text = stringResource(id = R.string.add), color = Color.White)

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

@@ -1,15 +1,19 @@
 package com.vitorpamplona.amethyst.ui.actions
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.model.ContactListEvent
 import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.RelayPool
+import kotlinx.collections.immutable.toImmutableSet
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 
 class NewRelayListViewModel : ViewModel() {
     private lateinit var account: Account
@@ -24,7 +28,9 @@ class NewRelayListViewModel : ViewModel() {
 
     fun create() {
         relays.let {
-            account.saveRelayList(it.value)
+            viewModelScope.launch(Dispatchers.IO) {
+                account.saveRelayList(it.value)
+            }
         }
 
         clear()
@@ -46,7 +52,7 @@ class NewRelayListViewModel : ViewModel() {
             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 localInfoFeedTypes = account.localRelays.filter { localRelay -> localRelay.url == it.key }.firstOrNull()?.feedTypes ?: FeedType.values().toSet().toImmutableSet()
 
                     val errorCounter = liveRelay?.errorCounter ?: 0
                     val eventDownloadCounter = liveRelay?.eventDownloadCounterInBytes ?: 0

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

@@ -28,6 +28,10 @@ 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.ui.theme.placeholderText
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @Composable
 fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
@@ -37,8 +41,12 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
     LaunchedEffect(Unit) {
         postViewModel.load(account)
 
-        postViewModel.imageUploadingError.collect { error ->
-            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+        launch(Dispatchers.IO) {
+            postViewModel.imageUploadingError.collect { error ->
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 
@@ -88,7 +96,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                             placeholder = {
                                 Text(
                                     text = stringResource(R.string.my_display_name),
-                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                    color = MaterialTheme.colors.placeholderText
                                 )
                             },
                             keyboardOptions = KeyboardOptions.Default.copy(
@@ -107,7 +115,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                             placeholder = {
                                 Text(
                                     text = stringResource(R.string.my_username),
-                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                    color = MaterialTheme.colors.placeholderText
                                 )
                             },
                             singleLine = true
@@ -126,7 +134,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                         placeholder = {
                             Text(
                                 text = stringResource(id = R.string.about_me),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
                         },
                         keyboardOptions = KeyboardOptions.Default.copy(
@@ -145,13 +153,13 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                         placeholder = {
                             Text(
                                 text = "https://mywebsite.com/me.jpg",
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
                         },
                         leadingIcon = {
                             UploadFromGallery(
                                 isUploading = postViewModel.isUploadingImageForPicture,
-                                tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                tint = MaterialTheme.colors.placeholderText,
                                 modifier = Modifier.padding(start = 5.dp)
                             ) {
                                 postViewModel.uploadForPicture(it, context)
@@ -170,13 +178,13 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                         placeholder = {
                             Text(
                                 text = "https://mywebsite.com/mybanner.jpg",
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
                         },
                         leadingIcon = {
                             UploadFromGallery(
                                 isUploading = postViewModel.isUploadingImageForBanner,
-                                tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                tint = MaterialTheme.colors.placeholderText,
                                 modifier = Modifier.padding(start = 5.dp)
                             ) {
                                 postViewModel.uploadForBanner(it, context)
@@ -195,7 +203,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                         placeholder = {
                             Text(
                                 text = "https://mywebsite.com",
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
                         },
                         singleLine = true
@@ -211,7 +219,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                         placeholder = {
                             Text(
                                 text = "_@mywebsite.com",
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
                         },
                         singleLine = true
@@ -226,7 +234,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                         placeholder = {
                             Text(
                                 text = "me@mylightiningnode.com",
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
                         },
                         singleLine = true
@@ -242,7 +250,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                         placeholder = {
                             Text(
                                 text = stringResource(R.string.lnurl),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
                         }
                     )
@@ -257,7 +265,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                         placeholder = {
                             Text(
                                 text = stringResource(R.string.twitter_proof_url_template),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
                         }
                     )
@@ -272,7 +280,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                         placeholder = {
                             Text(
                                 text = stringResource(R.string.mastodon_proof_url_template),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
                         }
                     )
@@ -287,7 +295,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                         placeholder = {
                             Text(
                                 text = stringResource(R.string.github_proof_url_template),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.placeholderText
                             )
                         }
                     )

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

@@ -13,6 +13,9 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.model.GitHubIdentity
 import com.vitorpamplona.amethyst.service.model.MastodonIdentity
 import com.vitorpamplona.amethyst.service.model.TwitterIdentity
+import com.vitorpamplona.amethyst.ui.components.MediaCompressor
+import id.zelory.compressor.Compressor.compress
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 import java.io.ByteArrayInputStream
@@ -119,7 +122,9 @@ class NewUserMetadataViewModel : ViewModel() {
         val writer = StringWriter()
         ObjectMapper().writeValue(writer, currentJson)
 
-        account.sendNewUserMetadata(writer.buffer.toString(), newClaims)
+        viewModelScope.launch(Dispatchers.IO) {
+            account.sendNewUserMetadata(writer.buffer.toString(), newClaims)
+        }
 
         clear()
     }
@@ -140,46 +145,67 @@ class NewUserMetadataViewModel : ViewModel() {
     }
 
     fun uploadForPicture(uri: Uri, context: Context) {
-        upload(
-            uri,
-            context,
-            onUploading = {
-                isUploadingImageForPicture = it
-            },
-            onUploaded = {
-                picture.value = it
-            }
-        )
+        viewModelScope.launch(Dispatchers.IO) {
+            upload(
+                uri,
+                context,
+                onUploading = {
+                    isUploadingImageForPicture = it
+                },
+                onUploaded = {
+                    picture.value = it
+                }
+            )
+        }
     }
 
     fun uploadForBanner(uri: Uri, context: Context) {
-        upload(
-            uri,
-            context,
-            onUploading = {
-                isUploadingImageForBanner = it
-            },
-            onUploaded = {
-                banner.value = it
-            }
-        )
+        viewModelScope.launch(Dispatchers.IO) {
+            upload(
+                uri,
+                context,
+                onUploading = {
+                    isUploadingImageForBanner = it
+                },
+                onUploaded = {
+                    banner.value = it
+                }
+            )
+        }
     }
 
-    fun upload(it: Uri, context: Context, onUploading: (Boolean) -> Unit, onUploaded: (String) -> Unit) {
+    private suspend fun upload(galleryUri: Uri, context: Context, onUploading: (Boolean) -> Unit, onUploaded: (String) -> Unit) {
         onUploading(true)
 
-        ImageUploader.uploadImage(
-            uri = it,
-            server = account.defaultFileServer,
-            contentResolver = context.contentResolver,
-            onSuccess = { imageUrl, mimeType ->
-                onUploading(false)
-                onUploaded(imageUrl)
+        val contentResolver = context.contentResolver
+
+        MediaCompressor().compress(
+            galleryUri,
+            contentResolver.getType(galleryUri),
+            context.applicationContext,
+            onReady = { fileUri, contentType, size ->
+                ImageUploader.uploadImage(
+                    uri = fileUri,
+                    contentType = contentType,
+                    size = size,
+                    server = account.defaultFileServer,
+                    contentResolver = contentResolver,
+                    onSuccess = { imageUrl, mimeType ->
+                        onUploading(false)
+                        onUploaded(imageUrl)
+                    },
+                    onError = {
+                        onUploading(false)
+                        viewModelScope.launch {
+                            imageUploadingError.emit("Failed to upload the image / video")
+                        }
+                    }
+                )
             },
             onError = {
                 onUploading(false)
                 viewModelScope.launch {
-                    imageUploadingError.emit("Failed to upload the image / video")
+                    imageUploadingError.emit(it)
                 }
             }
         )

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

@@ -3,7 +3,6 @@ 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
@@ -12,11 +11,11 @@ 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 com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import kotlinx.coroutines.launch
 import java.io.File
 
@@ -75,7 +74,7 @@ fun SaveToGallery(url: String) {
                 writeStoragePermissionState.launchPermissionRequest()
             }
         },
-        shape = RoundedCornerShape(20.dp),
+        shape = ButtonBorder,
         colors = ButtonDefaults
             .buttonColors(
                 backgroundColor = Color.Gray
@@ -135,7 +134,7 @@ fun SaveToGallery(localFile: File, mimeType: String?) {
                 writeStoragePermissionState.launchPermissionRequest()
             }
         },
-        shape = RoundedCornerShape(20.dp),
+        shape = ButtonBorder,
         colors = ButtonDefaults
             .buttonColors(
                 backgroundColor = Color.Gray

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

@@ -28,6 +28,8 @@ import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.GetMediaActivityResultContract
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import java.util.concurrent.atomic.AtomicBoolean
 
 @OptIn(ExperimentalPermissionsApi::class)
@@ -99,21 +101,23 @@ private fun UploadBoxButton(
     }
 }
 
+val DefaultAnimationColors = listOf(
+    Color(0xFF5851D8),
+    Color(0xFF833AB4),
+    Color(0xFFC13584),
+    Color(0xFFE1306C),
+    Color(0xFFFD1D1D),
+    Color(0xFFF56040),
+    Color(0xFFF77737),
+    Color(0xFFFCAF45),
+    Color(0xFFFFDC80),
+    Color(0xFF5851D8)
+).toImmutableList()
+
 @Composable
 fun LoadingAnimation(
     indicatorSize: Dp = 20.dp,
-    circleColors: List<Color> = listOf(
-        Color(0xFF5851D8),
-        Color(0xFF833AB4),
-        Color(0xFFC13584),
-        Color(0xFFE1306C),
-        Color(0xFFFD1D1D),
-        Color(0xFFF56040),
-        Color(0xFFF77737),
-        Color(0xFFFCAF45),
-        Color(0xFFFFDC80),
-        Color(0xFF5851D8)
-    ),
+    circleColors: ImmutableList<Color> = DefaultAnimationColors,
     animationDuration: Int = 1000
 ) {
     val infiniteTransition = rememberInfiniteTransition()

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

@@ -16,12 +16,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.actions.JoinUserOrChannelView
 import com.vitorpamplona.amethyst.ui.actions.NewChannelView
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun ChannelFabColumn(account: Account, nav: (String) -> Unit) {
+fun ChannelFabColumn(accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     var isOpen by remember {
         mutableStateOf(false)
     }
@@ -35,11 +35,11 @@ fun ChannelFabColumn(account: Account, nav: (String) -> Unit) {
     }
 
     if (wantsToCreateChannel) {
-        NewChannelView({ wantsToCreateChannel = false }, account = account)
+        NewChannelView({ wantsToCreateChannel = false }, accountViewModel = accountViewModel)
     }
 
     if (wantsToJoinChannelOrUser) {
-        JoinUserOrChannelView({ wantsToJoinChannelOrUser = false }, account = account, nav = nav)
+        JoinUserOrChannelView({ wantsToJoinChannelOrUser = false }, accountViewModel = accountViewModel, nav = nav)
     }
 
     Column() {

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

@@ -19,17 +19,17 @@ 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
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun NewChannelButton(account: Account) {
+fun NewChannelButton(accountViewModel: AccountViewModel) {
     var wantsToPost by remember {
         mutableStateOf(false)
     }
 
     if (wantsToPost) {
-        NewChannelView({ wantsToPost = false }, account = account)
+        NewChannelView({ wantsToPost = false }, accountViewModel = accountViewModel)
     }
 
     OutlinedButton(

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

@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -14,15 +16,15 @@ import java.util.concurrent.atomic.AtomicBoolean
 /**
  * This class is designed to have a waiting time between two calls of invalidate
  */
+@Stable
 class BundledUpdate(
     val delay: Long,
-    val dispatcher: CoroutineDispatcher = Dispatchers.Default,
-    val onUpdate: () -> Unit
+    val dispatcher: CoroutineDispatcher = Dispatchers.Default
 ) {
     private var onlyOneInBlock = AtomicBoolean()
     private var invalidatesAgain = false
 
-    fun invalidate(ignoreIfDoing: Boolean = false) {
+    fun invalidate(ignoreIfDoing: Boolean = false, onUpdate: suspend () -> Unit) {
         if (onlyOneInBlock.getAndSet(true)) {
             if (!ignoreIfDoing) {
                 invalidatesAgain = true
@@ -51,6 +53,7 @@ class BundledUpdate(
 /**
  * This class is designed to have a waiting time between two calls of invalidate
  */
+@Stable
 class BundledInsert<T>(
     val delay: Long,
     val dispatcher: CoroutineDispatcher = Dispatchers.Default
@@ -59,6 +62,8 @@ class BundledInsert<T>(
     private var queue = LinkedBlockingQueue<T>()
 
     fun invalidateList(newObject: T, onUpdate: suspend (Set<T>) -> Unit) {
+        checkNotInMainThread()
+
         queue.put(newObject)
         if (onlyOneInBlock.getAndSet(true)) {
             return

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

@@ -13,7 +13,9 @@ import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -45,26 +47,61 @@ import com.vitorpamplona.amethyst.service.NIP30Parser
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.nip19.Nip19
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.note.LoadChannel
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.launch
 
 @Composable
 fun ClickableRoute(
     nip19: Nip19.Return,
     nav: (String) -> Unit
 ) {
-    if (nip19.type == Nip19.Type.USER) {
-        DisplayUser(nip19, nav)
-    } else if (nip19.type == Nip19.Type.ADDRESS) {
-        DisplayAddress(nip19, nav)
-    } else if (nip19.type == Nip19.Type.NOTE) {
-        DisplayNote(nip19, nav)
-    } else if (nip19.type == Nip19.Type.EVENT) {
-        DisplayEvent(nip19, nav)
-    } else {
-        Text(
-            "@${nip19.hex}${nip19.additionalChars} "
-        )
+    when (nip19.type) {
+        Nip19.Type.USER -> {
+            DisplayUser(nip19, nav)
+        }
+        Nip19.Type.ADDRESS -> {
+            DisplayAddress(nip19, nav)
+        }
+        Nip19.Type.NOTE -> {
+            DisplayNote(nip19, nav)
+        }
+        Nip19.Type.EVENT -> {
+            DisplayEvent(nip19, nav)
+        }
+        else -> {
+            Text(
+                remember {
+                    "@${nip19.hex}${nip19.additionalChars} "
+                }
+            )
+        }
+    }
+}
+
+@Composable
+private fun LoadNote(
+    hex: String,
+    content: @Composable (Note) -> Unit
+) {
+    var noteBase by remember(hex) { mutableStateOf(LocalCache.getNoteIfExists(hex)) }
+
+    LaunchedEffect(key1 = hex) {
+        if (noteBase == null) {
+            launch(Dispatchers.IO) {
+                noteBase = LocalCache.checkGetOrCreateNote(hex)
+            }
+        }
+    }
+
+    noteBase?.let {
+        content(it)
     }
 }
 
@@ -73,54 +110,8 @@ private fun DisplayEvent(
     nip19: Nip19.Return,
     nav: (String) -> Unit
 ) {
-    var noteBase by remember(nip19) { mutableStateOf<Note?>(null) }
-
-    LaunchedEffect(key1 = nip19.hex) {
-        withContext(Dispatchers.IO) {
-            noteBase = LocalCache.checkGetOrCreateNote(nip19.hex)
-        }
-    }
-
-    noteBase?.let {
-        val noteState by it.live().metadata.observeAsState()
-        val note = remember(noteState) { noteState?.note } ?: return
-        val channel = remember(noteState) { note.channel() }
-
-        if (note.event is ChannelCreateEvent) {
-            CreateClickableText(
-                clickablePart = "@${note.idDisplayNote()}",
-                suffix = "${nip19.additionalChars} ",
-                route = "Channel/${nip19.hex}",
-                nav = nav
-            )
-        } else if (note.event is PrivateDmEvent) {
-            CreateClickableText(
-                clickablePart = "@${note.idDisplayNote()}",
-                suffix = "${nip19.additionalChars} ",
-                route = "Room/${note.author?.pubkeyHex}",
-                nav = nav
-            )
-        } else if (channel != null) {
-            CreateClickableText(
-                clickablePart = channel.toBestDisplayName(),
-                suffix = "${nip19.additionalChars} ",
-                route = "Channel/${channel.idHex}",
-                nav = nav
-            )
-        } else {
-            CreateClickableText(
-                clickablePart = "@${note.idDisplayNote()}",
-                suffix = "${nip19.additionalChars} ",
-                route = "Event/${nip19.hex}",
-                nav = nav
-            )
-        }
-    }
-
-    if (noteBase == null) {
-        Text(
-            "@${nip19.hex}${nip19.additionalChars} "
-        )
+    LoadNote(nip19.hex) {
+        DisplayNoteLink(it, nip19, nav)
     }
 }
 
@@ -129,53 +120,61 @@ private fun DisplayNote(
     nip19: Nip19.Return,
     nav: (String) -> Unit
 ) {
-    var noteBase by remember(nip19) { mutableStateOf<Note?>(null) }
-
-    LaunchedEffect(key1 = nip19.hex) {
-        withContext(Dispatchers.IO) {
-            noteBase = LocalCache.checkGetOrCreateNote(nip19.hex)
-        }
+    LoadNote(nip19.hex) {
+        DisplayNoteLink(it, nip19, nav)
     }
+}
 
-    noteBase?.let {
-        val noteState by it.live().metadata.observeAsState()
-        val note = remember(noteState) { noteState?.note } ?: return
-        val channel = note.channel()
+@Composable
+private fun DisplayNoteLink(
+    it: Note,
+    nip19: Nip19.Return,
+    nav: (String) -> Unit
+) {
+    val noteState by it.live().metadata.observeAsState()
+
+    val note = remember(noteState) { noteState?.note } ?: return
+
+    val channelHex = remember(noteState) { note.channelHex() }
+    val noteIdDisplayNote = remember(noteState) { "@${note.idDisplayNote()}" }
+    val addedCharts = remember { "${nip19.additionalChars} " }
+
+    if (note.event is ChannelCreateEvent || nip19.kind == ChannelCreateEvent.kind) {
+        CreateClickableText(
+            clickablePart = noteIdDisplayNote,
+            suffix = addedCharts,
+            route = remember(noteState) { "Channel/${nip19.hex}" },
+            nav = nav
+        )
+    } else if (note.event is PrivateDmEvent || nip19.kind == PrivateDmEvent.kind) {
+        CreateClickableText(
+            clickablePart = noteIdDisplayNote,
+            suffix = addedCharts,
+            route = remember(noteState) { "Room/${note.author?.pubkeyHex}" },
+            nav = nav
+        )
+    } else if (channelHex != null) {
+        LoadChannel(baseChannelHex = channelHex) { baseChannel ->
+            val channelState by baseChannel.live.observeAsState()
+            val channelDisplayName by remember(channelState) {
+                derivedStateOf {
+                    channelState?.channel?.toBestDisplayName() ?: noteIdDisplayNote
+                }
+            }
 
-        if (note.event is ChannelCreateEvent) {
             CreateClickableText(
-                clickablePart = "@${note.idDisplayNote()}",
-                suffix = "${nip19.additionalChars} ",
-                route = "Channel/${nip19.hex}",
-                nav = nav
-            )
-        } else if (note.event is PrivateDmEvent) {
-            CreateClickableText(
-                clickablePart = "@${note.idDisplayNote()}",
-                suffix = "${nip19.additionalChars} ",
-                route = "Room/${note.author?.pubkeyHex}",
-                nav = nav
-            )
-        } else if (channel != null) {
-            CreateClickableText(
-                clickablePart = channel.toBestDisplayName(),
-                suffix = "${nip19.additionalChars} ",
-                route = "Channel/${note.channel()?.idHex}",
-                nav = nav
-            )
-        } else {
-            CreateClickableText(
-                clickablePart = "@${note.idDisplayNote()}",
-                suffix = "${nip19.additionalChars} ",
-                route = "Note/${nip19.hex}",
+                clickablePart = channelDisplayName,
+                suffix = addedCharts,
+                route = remember(noteState) { "Channel/${baseChannel.idHex}" },
                 nav = nav
             )
         }
-    }
-
-    if (noteBase == null) {
-        Text(
-            "@${nip19.hex}${nip19.additionalChars} "
+    } else {
+        CreateClickableText(
+            clickablePart = noteIdDisplayNote,
+            suffix = addedCharts,
+            route = remember(noteState) { "Event/${nip19.hex}" },
+            nav = nav
         )
     }
 }
@@ -185,29 +184,36 @@ private fun DisplayAddress(
     nip19: Nip19.Return,
     nav: (String) -> Unit
 ) {
-    var noteBase by remember(nip19) { mutableStateOf<Note?>(null) }
+    var noteBase by remember(nip19) { mutableStateOf(LocalCache.getNoteIfExists(nip19.hex)) }
 
     LaunchedEffect(key1 = nip19.hex) {
-        withContext(Dispatchers.IO) {
-            noteBase = LocalCache.checkGetOrCreateAddressableNote(nip19.hex)
+        if (noteBase == null) {
+            launch(Dispatchers.IO) {
+                noteBase = LocalCache.checkGetOrCreateAddressableNote(nip19.hex)
+            }
         }
     }
 
     noteBase?.let {
         val noteState by it.live().metadata.observeAsState()
-        val note = remember(noteState) { noteState?.note } ?: return
+
+        val route = remember(noteState) { "Note/${nip19.hex}" }
+        val displayName = remember(noteState) { "@${noteState?.note?.idDisplayNote()}" }
+        val addedCharts = remember { "${nip19.additionalChars} " }
 
         CreateClickableText(
-            clickablePart = "@${note.idDisplayNote()}",
-            suffix = "${nip19.additionalChars} ",
-            route = "Note/${nip19.hex}",
+            clickablePart = displayName,
+            suffix = addedCharts,
+            route = route,
             nav = nav
         )
     }
 
     if (noteBase == null) {
         Text(
-            "@${nip19.hex}${nip19.additionalChars} "
+            remember {
+                "@${nip19.hex}${nip19.additionalChars} "
+            }
         )
     }
 }
@@ -217,34 +223,61 @@ private fun DisplayUser(
     nip19: Nip19.Return,
     nav: (String) -> Unit
 ) {
-    var userBase by remember(nip19) { mutableStateOf<User?>(null) }
+    var userBase by remember(nip19) { mutableStateOf(LocalCache.getUserIfExists(nip19.hex)) }
 
     LaunchedEffect(key1 = nip19.hex) {
-        withContext(Dispatchers.IO) {
-            userBase = LocalCache.checkGetOrCreateUser(nip19.hex)
+        if (userBase == null) {
+            launch(Dispatchers.IO) {
+                userBase = LocalCache.checkGetOrCreateUser(nip19.hex)
+            }
         }
     }
 
     userBase?.let {
-        val userState by it.live().metadata.observeAsState()
-        val route = remember(userState) { "User/${it.pubkeyHex}" }
-        val userDisplayName = remember(userState) { userState?.user?.toBestDisplayName() }
-        val userTags = remember(userState) { userState?.user?.info?.latestMetadata?.tags }
-
-        if (userDisplayName != null) {
-            CreateClickableTextWithEmoji(
-                clickablePart = userDisplayName,
-                suffix = "${nip19.additionalChars} ",
-                tags = userTags,
-                route = route,
-                nav = nav
-            )
-        }
+        RenderUserAsClickableText(it, nip19, nav)
     }
 
     if (userBase == null) {
         Text(
-            "@${nip19.hex}${nip19.additionalChars} "
+            remember {
+                "@${nip19.hex}${nip19.additionalChars} "
+            }
+        )
+    }
+}
+
+@Composable
+private fun RenderUserAsClickableText(
+    baseUser: User,
+    nip19: Nip19.Return,
+    nav: (String) -> Unit
+) {
+    val userState by baseUser.live().metadata.observeAsState()
+    val route = remember { "User/${baseUser.pubkeyHex}" }
+
+    val userDisplayName by remember(userState) {
+        derivedStateOf {
+            userState?.user?.toBestDisplayName()
+        }
+    }
+
+    val userTags by remember(userState) {
+        derivedStateOf {
+            userState?.user?.info?.latestMetadata?.tags?.toImmutableListOfLists()
+        }
+    }
+
+    val addedCharts = remember(nip19) {
+        "${nip19.additionalChars} "
+    }
+
+    userDisplayName?.let {
+        CreateClickableTextWithEmoji(
+            clickablePart = it,
+            suffix = addedCharts,
+            tags = userTags,
+            route = route,
+            nav = nav
         )
     }
 }
@@ -278,7 +311,7 @@ fun CreateClickableText(
 @Composable
 fun CreateTextWithEmoji(
     text: String,
-    tags: List<List<String>>?,
+    tags: ImmutableListOfLists<String>?,
     color: Color = Color.Unspecified,
     textAlign: TextAlign? = null,
     fontWeight: FontWeight? = null,
@@ -287,32 +320,29 @@ fun CreateTextWithEmoji(
     overflow: TextOverflow = TextOverflow.Clip,
     modifier: Modifier = Modifier
 ) {
-    val emojis = remember {
-        tags?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+    var emojiList by remember(text) { mutableStateOf<ImmutableList<Renderable>>(persistentListOf()) }
+
+    LaunchedEffect(key1 = text) {
+        launch(Dispatchers.Default) {
+            val emojis =
+                tags?.lists?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+
+            if (emojis.isNotEmpty()) {
+                val newEmojiList = assembleAnnotatedList(text, emojis)
+                if (newEmojiList.isNotEmpty()) {
+                    emojiList = newEmojiList.toImmutableList()
+                }
+            }
+        }
     }
 
-    CreateTextWithEmoji(text, emojis, color, textAlign, fontWeight, fontSize, maxLines, overflow, modifier)
-}
-
-@Composable
-fun CreateTextWithEmoji(
-    text: String,
-    emojis: Map<String, String>,
-    color: Color = Color.Unspecified,
-    textAlign: TextAlign? = null,
-    fontWeight: FontWeight? = null,
-    fontSize: TextUnit = TextUnit.Unspecified,
-    maxLines: Int = Int.MAX_VALUE,
-    overflow: TextOverflow = TextOverflow.Clip,
-    modifier: Modifier = Modifier
-) {
     val textColor = color.takeOrElse {
         LocalTextStyle.current.color.takeOrElse {
             LocalContentColor.current.copy(alpha = LocalContentAlpha.current)
         }
     }
 
-    if (emojis.isEmpty()) {
+    if (emojiList.isEmpty()) {
         Text(
             text = text,
             color = textColor,
@@ -324,10 +354,6 @@ fun CreateTextWithEmoji(
             modifier = modifier
         )
     } else {
-        val myList = remember {
-            assembleAnnotatedList(text, emojis)
-        }
-
         val style = LocalTextStyle.current.merge(
             TextStyle(
                 color = textColor,
@@ -337,33 +363,97 @@ fun CreateTextWithEmoji(
             )
         ).toSpanStyle()
 
-        InLineIconRenderer(myList, style, maxLines, overflow, modifier)
+        InLineIconRenderer(emojiList, style, maxLines, overflow, modifier)
+    }
+}
+
+@Composable
+fun CreateTextWithEmoji(
+    text: String,
+    emojis: ImmutableMap<String, String>,
+    color: Color = Color.Unspecified,
+    textAlign: TextAlign? = null,
+    fontWeight: FontWeight? = null,
+    fontSize: TextUnit = TextUnit.Unspecified,
+    maxLines: Int = Int.MAX_VALUE,
+    overflow: TextOverflow = TextOverflow.Clip,
+    modifier: Modifier = Modifier
+) {
+    var emojiList by remember(text) { mutableStateOf<ImmutableList<Renderable>>(persistentListOf()) }
+
+    LaunchedEffect(key1 = text) {
+        if (emojis.isNotEmpty()) {
+            launch(Dispatchers.Default) {
+                val newEmojiList = assembleAnnotatedList(text, emojis)
+                if (newEmojiList.isNotEmpty()) {
+                    emojiList = newEmojiList.toImmutableList()
+                }
+            }
+        }
+    }
+
+    val textColor = color.takeOrElse {
+        LocalTextStyle.current.color.takeOrElse {
+            LocalContentColor.current.copy(alpha = LocalContentAlpha.current)
+        }
+    }
+
+    if (emojiList.isEmpty()) {
+        Text(
+            text = text,
+            color = textColor,
+            textAlign = textAlign,
+            fontWeight = fontWeight,
+            fontSize = fontSize,
+            maxLines = maxLines,
+            overflow = overflow,
+            modifier = modifier
+        )
+    } else {
+        val style = LocalTextStyle.current.merge(
+            TextStyle(
+                color = textColor,
+                textAlign = textAlign,
+                fontWeight = fontWeight,
+                fontSize = fontSize
+            )
+        ).toSpanStyle()
+
+        InLineIconRenderer(emojiList, style, maxLines, overflow, modifier)
     }
 }
 
 @Composable
 fun CreateClickableTextWithEmoji(
     clickablePart: String,
-    tags: List<List<String>>?,
+    tags: ImmutableListOfLists<String>?,
     style: TextStyle,
     onClick: (Int) -> Unit
 ) {
-    val emojis = remember(tags) {
-        tags?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+    var emojiList by remember(clickablePart) { mutableStateOf<ImmutableList<Renderable>>(persistentListOf()) }
+
+    LaunchedEffect(key1 = clickablePart) {
+        launch(Dispatchers.Default) {
+            val emojis =
+                tags?.lists?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+
+            if (emojis.isNotEmpty()) {
+                val newEmojiList = assembleAnnotatedList(clickablePart, emojis)
+                if (newEmojiList.isNotEmpty()) {
+                    emojiList = newEmojiList.toImmutableList()
+                }
+            }
+        }
     }
 
-    if (emojis.isEmpty()) {
+    if (emojiList.isEmpty()) {
         ClickableText(
             AnnotatedString(clickablePart),
             style = style,
             onClick = onClick
         )
     } else {
-        val myList = remember {
-            assembleAnnotatedList(clickablePart, emojis)
-        }
-
-        ClickableInLineIconRenderer(myList, style.toSpanStyle()) {
+        ClickableInLineIconRenderer(emojiList, style.toSpanStyle()) {
             onClick(it)
         }
     }
@@ -373,36 +463,44 @@ fun CreateClickableTextWithEmoji(
 fun CreateClickableTextWithEmoji(
     clickablePart: String,
     suffix: String,
-    tags: List<List<String>>?,
+    tags: ImmutableListOfLists<String>?,
     overrideColor: Color? = null,
     fontWeight: FontWeight = FontWeight.Normal,
     route: String,
     nav: (String) -> Unit
 ) {
-    val emojis = remember(tags) {
-        tags?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+    var emojiLists by remember(clickablePart) {
+        mutableStateOf<Pair<ImmutableList<Renderable>, ImmutableList<Renderable>>?>(null)
     }
 
-    if (emojis.isEmpty()) {
+    LaunchedEffect(key1 = clickablePart) {
+        launch(Dispatchers.Default) {
+            val emojis =
+                tags?.lists?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+
+            if (emojis.isNotEmpty()) {
+                val newEmojiList1 = assembleAnnotatedList(clickablePart, emojis)
+                val newEmojiList2 = assembleAnnotatedList(suffix, emojis)
+
+                if (newEmojiList1.isNotEmpty() || newEmojiList2.isNotEmpty()) {
+                    emojiLists = Pair(newEmojiList1.toImmutableList(), newEmojiList2.toImmutableList())
+                }
+            }
+        }
+    }
+
+    if (emojiLists == null) {
         CreateClickableText(clickablePart, suffix, overrideColor, fontWeight, route, nav)
     } else {
-        val myList = remember {
-            assembleAnnotatedList(clickablePart, emojis)
-        }
-
-        ClickableInLineIconRenderer(myList, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.primary, fontWeight = fontWeight).toSpanStyle()) {
+        ClickableInLineIconRenderer(emojiLists!!.first, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.primary, fontWeight = fontWeight).toSpanStyle()) {
             nav(route)
         }
 
-        val myList2 = remember {
-            assembleAnnotatedList(suffix, emojis)
-        }
-
-        InLineIconRenderer(myList2, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle())
+        InLineIconRenderer(emojiLists!!.second, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle())
     }
 }
 
-fun assembleAnnotatedList(text: String, emojis: Map<String, String>): List<Renderable> {
+suspend fun assembleAnnotatedList(text: String, emojis: Map<String, String>): ImmutableList<Renderable> {
     return NIP30Parser().buildArray(text).map {
         val url = emojis[it]
         if (url != null) {
@@ -410,15 +508,20 @@ fun assembleAnnotatedList(text: String, emojis: Map<String, String>): List<Rende
         } else {
             TextType(it)
         }
-    }
+    }.toImmutableList()
 }
 
+@Immutable
 open class Renderable()
+
+@Immutable
 class TextType(val text: String) : Renderable()
+
+@Immutable
 class ImageUrlType(val url: String) : Renderable()
 
 @Composable
-fun ClickableInLineIconRenderer(wordsInOrder: List<Renderable>, style: SpanStyle, onClick: (Int) -> Unit) {
+fun ClickableInLineIconRenderer(wordsInOrder: ImmutableList<Renderable>, style: SpanStyle, onClick: (Int) -> Unit) {
     val inlineContent = wordsInOrder.mapIndexedNotNull { idx, value ->
         if (value is ImageUrlType) {
             Pair(
@@ -433,7 +536,9 @@ fun ClickableInLineIconRenderer(wordsInOrder: List<Renderable>, style: SpanStyle
                     AsyncImage(
                         model = value.url,
                         contentDescription = null,
-                        modifier = Modifier.fillMaxSize().padding(1.dp)
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(1.dp)
                     )
                 }
             )
@@ -477,7 +582,7 @@ fun ClickableInLineIconRenderer(wordsInOrder: List<Renderable>, style: SpanStyle
 
 @Composable
 fun InLineIconRenderer(
-    wordsInOrder: List<Renderable>,
+    wordsInOrder: ImmutableList<Renderable>,
     style: SpanStyle,
     maxLines: Int = Int.MAX_VALUE,
     overflow: TextOverflow = TextOverflow.Clip,
@@ -489,15 +594,17 @@ fun InLineIconRenderer(
                 "inlineContent$idx",
                 InlineTextContent(
                     Placeholder(
-                        width = 17.sp,
-                        height = 17.sp,
+                        width = 20.sp,
+                        height = 20.sp,
                         placeholderVerticalAlign = PlaceholderVerticalAlign.Center
                     )
                 ) {
                     AsyncImage(
                         model = value.url,
                         contentDescription = null,
-                        modifier = Modifier.fillMaxSize().padding(1.dp)
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(horizontal = 1.dp)
                     )
                 }
             )

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

@@ -4,6 +4,7 @@ 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.remember
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
 
@@ -11,10 +12,16 @@ import androidx.compose.ui.text.AnnotatedString
 fun ClickableUrl(urlText: String, url: String) {
     val uri = LocalUriHandler.current
 
-    val doubleCheckedUrl = if (url.contains("://")) url else "https://$url"
+    val doubleCheckedUrl = remember(url) {
+        if (url.contains("://")) url else "https://$url"
+    }
+
+    val text = remember(urlText) {
+        AnnotatedString(urlText)
+    }
 
     ClickableText(
-        text = AnnotatedString(urlText),
+        text = text,
         onClick = { runCatching { uri.openUri(doubleCheckedUrl) } },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
     )

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

@@ -6,6 +6,7 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.remember
 import androidx.compose.ui.text.AnnotatedString
 import com.vitorpamplona.amethyst.model.User
 
@@ -14,10 +15,19 @@ fun ClickableUserTag(
     user: User,
     nav: (String) -> Unit
 ) {
+    val route = remember {
+        "User/${user.pubkeyHex}"
+    }
+
     val innerUserState by user.live().metadata.observeAsState()
+
+    val userName = remember(innerUserState) {
+        AnnotatedString("@${innerUserState?.user?.toBestDisplayName()}")
+    }
+
     ClickableText(
-        text = AnnotatedString("@${innerUserState?.user?.toBestDisplayName()}"),
-        onClick = { nav("User/${innerUserState?.user?.pubkeyHex}") },
+        text = userName,
+        onClick = { nav(route) },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
     )
 }

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

@@ -13,14 +13,14 @@ import androidx.compose.ui.text.style.TextDirection
 import androidx.core.content.ContextCompat
 import com.vitorpamplona.amethyst.service.lnurl.LnWithdrawalUtil
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.launch
 
 @Composable
 fun MayBeWithdrawal(lnurlWord: String) {
     var lnWithdrawal by remember { mutableStateOf<String?>(null) }
 
     LaunchedEffect(key1 = lnurlWord) {
-        withContext(Dispatchers.IO) {
+        launch(Dispatchers.IO) {
             lnWithdrawal = LnWithdrawalUtil.findWithdrawal(lnurlWord)
         }
     }
@@ -38,11 +38,19 @@ fun MayBeWithdrawal(lnurlWord: String) {
 fun ClickableWithdrawal(withdrawalString: String) {
     val context = LocalContext.current
 
+    val uri = remember(withdrawalString) {
+        Uri.parse("lightning:$withdrawalString")
+    }
+
+    val withdraw = remember(withdrawalString) {
+        AnnotatedString("$withdrawalString ")
+    }
+
     ClickableText(
-        text = AnnotatedString("$withdrawalString "),
+        text = withdraw,
         onClick = {
             runCatching {
-                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$withdrawalString"))
+                val intent = Intent(Intent.ACTION_VIEW, uri)
                 ContextCompat.startActivity(context, intent, null)
             }
         },

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

@@ -1,18 +1,17 @@
 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.MutableState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -20,13 +19,16 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.secondaryButtonBackground
 
 const val SHORT_TEXT_LENGTH = 350
 
@@ -34,9 +36,9 @@ const val SHORT_TEXT_LENGTH = 350
 fun ExpandableRichTextViewer(
     content: String,
     canPreview: Boolean,
-    modifier: Modifier = Modifier,
-    tags: List<List<String>>?,
-    backgroundColor: Color,
+    modifier: Modifier,
+    tags: ImmutableListOfLists<String>,
+    backgroundColor: MutableState<Color>,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
@@ -78,27 +80,36 @@ fun ExpandableRichTextViewer(
                 modifier = Modifier
                     .align(Alignment.BottomCenter)
                     .fillMaxWidth()
-                    .background(
-                        brush = Brush.verticalGradient(
-                            colors = listOf(
-                                backgroundColor.copy(alpha = 0f),
-                                backgroundColor
+                    .drawBehind {
+                        drawRect(
+                            Brush.verticalGradient(
+                                colors = listOf(
+                                    backgroundColor.value.copy(alpha = 0f),
+                                    backgroundColor.value
+                                )
                             )
                         )
-                    )
+                    }
             ) {
-                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)
+                ShowMoreButton() {
+                    showFullText = !showFullText
                 }
             }
         }
     }
 }
+
+@Composable
+fun ShowMoreButton(onClick: () -> Unit) {
+    Button(
+        modifier = Modifier.padding(top = 10.dp),
+        onClick = onClick,
+        shape = ButtonBorder,
+        colors = ButtonDefaults.buttonColors(
+            backgroundColor = MaterialTheme.colors.secondaryButtonBackground
+        ),
+        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

@@ -8,7 +8,6 @@ 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.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -25,21 +24,22 @@ import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
+import com.vitorpamplona.amethyst.ui.theme.subtleBorder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import java.math.BigDecimal
 import java.text.NumberFormat
 
 @Composable
 fun MayBeInvoicePreview(lnbcWord: String) {
-    var lnInvoice by remember { mutableStateOf<Pair<String, BigDecimal?>?>(null) }
+    var lnInvoice by remember { mutableStateOf<Pair<String, String?>?>(null) }
 
     LaunchedEffect(key1 = lnbcWord) {
         withContext(Dispatchers.IO) {
             val myInvoice = LnInvoiceUtil.findInvoice(lnbcWord)
             if (myInvoice != null) {
                 val myInvoiceAmount = try {
-                    LnInvoiceUtil.getAmountInSats(myInvoice)
+                    NumberFormat.getInstance().format(LnInvoiceUtil.getAmountInSats(myInvoice))
                 } catch (e: Exception) {
                     e.printStackTrace()
                     null
@@ -60,15 +60,15 @@ fun MayBeInvoicePreview(lnbcWord: String) {
 }
 
 @Composable
-fun InvoicePreview(lnInvoice: String, amount: BigDecimal?) {
+fun InvoicePreview(lnInvoice: String, amount: String?) {
     val context = LocalContext.current
 
     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))
+            .clip(shape = QuoteBorder)
+            .border(1.dp, MaterialTheme.colors.subtleBorder, QuoteBorder)
     ) {
         Column(
             modifier = Modifier
@@ -100,9 +100,7 @@ fun InvoicePreview(lnInvoice: String, amount: BigDecimal?) {
 
             amount?.let {
                 Text(
-                    text = "${
-                    NumberFormat.getInstance().format(amount)
-                    } ${stringResource(id = R.string.sats)}",
+                    text = "$it ${stringResource(id = R.string.sats)}",
                     fontSize = 25.sp,
                     fontWeight = FontWeight.W500,
                     modifier = Modifier
@@ -121,7 +119,7 @@ fun InvoicePreview(lnInvoice: String, amount: BigDecimal?) {
                         startActivity(context, intent, null)
                     }
                 },
-                shape = RoundedCornerShape(15.dp),
+                shape = QuoteBorder,
                 colors = ButtonDefaults.buttonColors(
                     backgroundColor = MaterialTheme.colors.primary
                 )

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

@@ -7,7 +7,6 @@ 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
@@ -37,6 +36,9 @@ import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import com.vitorpamplona.amethyst.ui.theme.subtleBorder
 import kotlinx.coroutines.launch
 
 @Composable
@@ -56,8 +58,8 @@ fun InvoiceRequest(
         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))
+            .clip(shape = QuoteBorder)
+            .border(1.dp, MaterialTheme.colors.subtleBorder, QuoteBorder)
     ) {
         Column(
             modifier = Modifier
@@ -98,7 +100,7 @@ fun InvoiceRequest(
                 placeholder = {
                     Text(
                         text = stringResource(R.string.thank_you_so_much),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        color = MaterialTheme.colors.placeholderText
                     )
                 },
                 keyboardOptions = KeyboardOptions.Default.copy(
@@ -123,7 +125,7 @@ fun InvoiceRequest(
                 placeholder = {
                     Text(
                         text = "1000",
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        color = MaterialTheme.colors.placeholderText
                     )
                 },
                 keyboardOptions = KeyboardOptions.Default.copy(
@@ -153,7 +155,7 @@ fun InvoiceRequest(
                         }
                     )
                 },
-                shape = RoundedCornerShape(15.dp),
+                shape = QuoteBorder,
                 colors = ButtonDefaults.buttonColors(
                     backgroundColor = MaterialTheme.colors.primary
                 )

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

@@ -0,0 +1,111 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.net.Uri
+import android.webkit.MimeTypeMap
+import androidx.core.net.toUri
+import com.abedelazizshe.lightcompressorlibrary.CompressionListener
+import com.abedelazizshe.lightcompressorlibrary.VideoCompressor
+import com.abedelazizshe.lightcompressorlibrary.VideoQuality
+import com.abedelazizshe.lightcompressorlibrary.config.AppSpecificStorageConfiguration
+import com.abedelazizshe.lightcompressorlibrary.config.Configuration
+import id.zelory.compressor.Compressor
+import id.zelory.compressor.constraint.default
+import java.io.File
+import java.io.FileOutputStream
+import java.util.UUID
+
+class MediaCompressor {
+    suspend fun compress(
+        uri: Uri,
+        contentType: String?,
+        applicationContext: Context,
+        onReady: (Uri, String?, Long?) -> Unit,
+        onError: (String) -> Unit
+    ) {
+        if (contentType?.startsWith("video", true) == true) {
+            VideoCompressor.start(
+                context = applicationContext, // => This is required
+                uris = listOf(uri), // => Source can be provided as content uris
+                isStreamable = false,
+                // THIS STORAGE
+                // sharedStorageConfiguration = SharedStorageConfiguration(
+                //    saveAt = SaveLocation.movies, // => default is movies
+                //    videoName = "compressed_video" // => required name
+                // ),
+                // OR AND NOT BOTH
+                appSpecificStorageConfiguration = AppSpecificStorageConfiguration(
+                    videoName = UUID.randomUUID().toString() // => required name
+                ),
+                configureWith = Configuration(
+                    quality = VideoQuality.LOW
+                ),
+                listener = object : CompressionListener {
+                    override fun onProgress(index: Int, percent: Float) {
+                    }
+
+                    override fun onStart(index: Int) {
+                        // Compression start
+                    }
+
+                    override fun onSuccess(index: Int, size: Long, path: String?) {
+                        if (path != null) {
+                            onReady(Uri.fromFile(File(path)), contentType, size)
+                        } else {
+                            onError("Compression Returned null")
+                        }
+                    }
+
+                    override fun onFailure(index: Int, failureMessage: String) {
+                        // keeps going with original video
+                        onReady(uri, contentType, null)
+                    }
+
+                    override fun onCancelled(index: Int) {
+                        onError("Compression Cancelled")
+                    }
+                }
+            )
+        } else if (contentType?.startsWith("image", true) == true && !contentType.contains("gif")) {
+            val compressedImageFile = Compressor.compress(applicationContext, from(uri, contentType, applicationContext)) {
+                default(width = 640, format = Bitmap.CompressFormat.JPEG)
+            }
+            onReady(compressedImageFile.toUri(), contentType, compressedImageFile.length())
+        } else {
+            onReady(uri, contentType, null)
+        }
+    }
+
+    fun from(uri: Uri?, contentType: String?, context: Context): File {
+        val extension = contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
+
+        val inputStream = context.contentResolver.openInputStream(uri!!)
+        val fileName: String = UUID.randomUUID().toString() + ".$extension"
+        val splitName: Array<String> = splitFileName(fileName)
+        val tempFile = File.createTempFile(splitName[0], splitName[1])
+        inputStream?.use { input ->
+            FileOutputStream(tempFile).use { output ->
+                val buffer = ByteArray(1024 * 50)
+                var read: Int = input.read(buffer)
+                while (read != -1) {
+                    output.write(buffer, 0, read)
+                    read = input.read(buffer)
+                }
+            }
+        }
+
+        return tempFile
+    }
+
+    private fun splitFileName(fileName: String): Array<String> {
+        var name = fileName
+        var extension = ""
+        val i = fileName.lastIndexOf(".")
+        if (i != -1) {
+            name = fileName.substring(0, i)
+            extension = fileName.substring(i)
+        }
+        return arrayOf(name, extension)
+    }
+}

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

@@ -12,6 +12,7 @@ import coil.fetch.SourceResult
 import coil.request.ImageRequest
 import coil.request.Options
 import coil.size.Size
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import okio.Buffer
 import java.security.MessageDigest
 
@@ -21,8 +22,6 @@ private fun toHex(color: Color): String {
     return String.format("#%06X", rgb)
 }
 
-private val sha256: MessageDigest = MessageDigest.getInstance("SHA-256")
-
 private fun byteMod10(byte: Byte): Int {
     val ub = byte.toUByte().toInt()
     return ub % 10
@@ -33,7 +32,7 @@ private fun bytesToRGB(b1: Byte, b2: Byte, b3: Byte): Color {
 }
 
 private fun svgString(msg: String): String {
-    val hash = sha256.digest(msg.toByteArray())
+    val hash = MessageDigest.getInstance("SHA-256").digest(msg.toByteArray())
     val hashHex = hash.joinToString(separator = "") { b -> "%02x".format(b) }
     val bgColor = bytesToRGB(hash[0], hash[1], hash[2])
     val fgColor = bytesToRGB(hash[3], hash[4], hash[5])
@@ -67,6 +66,7 @@ class HashImageFetcher(
 ) : Fetcher {
 
     override suspend fun fetch(): SourceResult {
+        checkNotInMainThread()
         val source = try {
             Buffer().apply { write(svgString(data.toString()).toByteArray()) }
         } finally {

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

@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Icon
@@ -35,6 +34,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 
 @Composable
 fun SensitivityWarning(
@@ -108,7 +108,7 @@ fun ContentWarningNote(onDismiss: () -> Unit) {
                     Button(
                         modifier = Modifier.padding(top = 10.dp),
                         onClick = onDismiss,
-                        shape = RoundedCornerShape(20.dp),
+                        shape = ButtonBorder,
                         colors = ButtonDefaults
                             .buttonColors(
                                 backgroundColor = MaterialTheme.colors.primary

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

@@ -25,6 +25,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -68,7 +69,7 @@ fun DotsIndicator(
     totalDots: Int,
     selectedIndex: Int,
     selectedColor: Color = MaterialTheme.colors.primary /* Color.Yellow */,
-    unSelectedColor: Color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f) /* Color.Gray */,
+    unSelectedColor: Color = MaterialTheme.colors.placeholderText /* Color.Gray */,
     dotSize: Dp
 ) {
     LazyRow(

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

@@ -31,13 +31,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
+import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun TextSpinner(
     label: String,
     placeholder: String,
-    options: List<String>,
-    explainers: List<String>? = null,
+    options: ImmutableList<String>,
+    explainers: ImmutableList<String>? = null,
     onSelect: (Int) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -83,7 +84,12 @@ fun TextSpinner(
 }
 
 @Composable
-fun SpinnerSelectionDialog(options: List<String>, explainers: List<String>?, onDismiss: () -> Unit, onSelect: (Int) -> Unit) {
+fun SpinnerSelectionDialog(
+    options: ImmutableList<String>,
+    explainers: ImmutableList<String>?,
+    onDismiss: () -> Unit,
+    onSelect: (Int) -> Unit
+) {
     Dialog(onDismissRequest = onDismiss) {
         Surface(
             border = BorderStroke(0.25.dp, Color.LightGray),