v0.70.3

fix KeepPlayingButton color in light theme

README.md

@@ -41,7 +41,7 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] URI Support (NIP-21)
 - [x] Created_at Limits (NIP-22)
 - [x] Event Deletion (NIP-09)
-- [x] Identity Verification (NIP-05)
+- [x] Nostr Address (NIP-05)
 - [x] Long-form Content (NIP-23)
 - [x] Parameterized Replaceable Events (NIP-33)
 - [x] Online Relay Search (NIP-50)
@@ -63,7 +63,7 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] Custom Emoji (NIP-30)
 - [x] Zap Forwarding (NIP-57)
 - [x] Text Note References (NIP-27)
-- [x] Audio Tracks (zapstr.live) (NIP-TBD)
+- [x] Audio Tracks (zapstr.live) (Kind:31337)
 - [x] Push Notifications (Zaps and Messages)
 - [x] Generic Tags (NIP-12)
 - [x] Sensitive Content (NIP-36)
@@ -76,6 +76,9 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] HTTP Auth (NIP-98)
 - [x] Zapraiser (NIP-TBD)
 - [x] Moderated Communities (NIP-172)
+- [x] Emoji Packs (Kind:30030)
+- [x] Personal Emoji Lists (Kind:10030)
+- [x] Classifieds (Kind:30403)
 - [ ] Marketplace (NIP-15)
 - [ ] Image/Video Capture in the app
 - [ ] Local Database

app/build.gradle

@@ -13,14 +13,14 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 240
-        versionName "0.66.2"
+        versionCode 260
+        versionName "0.70.3"
 
         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" )
+        resConfigs("ar", "cs", "de", "eo", "es", "fa", "fr", "hu", "night", "nl", "pt-rBR", "ru", "sv-rSE", "ta", "tr", "uk", "zh", "sh-rHK", "zh-rTW", "ja")
     }
 
     buildTypes {
@@ -110,7 +110,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
 
-    implementation 'net.engawapg.lib:zoomable:1.4.2'
+    implementation "net.engawapg.lib:zoomable:1.4.3"
 
     // Biometrics
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
@@ -134,15 +134,14 @@ dependencies {
 
     // link preview
     implementation 'org.jsoup:jsoup:1.16.1'
-    //implementation 'tw.com.oneup.www:Baha-UrlPreview:1.0.1'
 
     // Encrypted Key Storage
     implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha06'
 
     // view videos
-    implementation 'com.google.android.exoplayer:exoplayer:2.18.7'
+    implementation "androidx.media3:media3-exoplayer:${exoplayer_version}"
     // important for proxy / tor
-    implementation 'com.google.android.exoplayer:extension-okhttp:2.18.7'
+    implementation "androidx.media3:media3-datasource-okhttp:${exoplayer_version}"
 
     // Load images from the web.
     implementation "io.coil-kt:coil-compose:$coil_version"
@@ -170,9 +169,15 @@ dependencies {
     //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')
+    implementation('com.github.vitorpamplona.compose-richtext:richtext-ui:a0954aba63')
+    implementation('com.github.vitorpamplona.compose-richtext:richtext-ui-material:a0954aba63')
+    implementation('com.github.vitorpamplona.compose-richtext:richtext-commonmark:a0954aba63')
+
+    // Language picker and Theme chooser
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.1.0'
+    implementation 'androidx.media3:media3-ui:1.1.0'
+    implementation 'androidx.media3:media3-session:1.1.0'
 
     // Local model for language identification
     playImplementation 'com.google.mlkit:language-id:17.0.4'
@@ -194,7 +199,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
 
     // Video compression lib
-    implementation 'com.github.AbedElazizShe:LightCompressor:1.2.3'
+    implementation 'com.github.AbedElazizShe:LightCompressor:1.3.1'
     // Image compression lib
     implementation 'id.zelory:compressor:3.0.1'
 

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

@@ -4007,7 +4007,7 @@ class RichTextParserTest {
             "Bech(npub17m7f7q08k4x746s2v45eyvwppck32dcahw7uj2mu5txuswldgqkqw9zms7)"
         )
 
-        state.paragraphs.flatten().forEachIndexed { index, seg ->
+        state.paragraphs.map { it.words }.flatten().forEachIndexed { index, seg ->
             Assert.assertEquals(
                 expectedResult[index],
                 "${seg.javaClass.simpleName.replace("Segment", "")}(${seg.segmentText})"
@@ -4027,7 +4027,7 @@ class RichTextParserTest {
         Assert.assertTrue(state.imagesForPager.isEmpty())
         Assert.assertTrue(state.imageList.isEmpty())
         Assert.assertTrue(state.customEmoji.isEmpty())
-        Assert.assertEquals("Hi, how are you doing? ", state.paragraphs.firstOrNull()?.firstOrNull()?.segmentText)
+        Assert.assertEquals("Hi, how are you doing? ", state.paragraphs.firstOrNull()?.words?.firstOrNull()?.segmentText)
     }
 
     @Test
@@ -4039,7 +4039,7 @@ class RichTextParserTest {
         Assert.assertTrue(state.customEmoji.isEmpty())
         Assert.assertEquals(
             "\nHi, \nhow\n\n\n are you doing? \n",
-            state.paragraphs.joinToString("\n") { it.joinToString(" ") { it.segmentText } }
+            state.paragraphs.joinToString("\n") { it.words.joinToString(" ") { it.segmentText } }
         )
     }
 
@@ -4102,7 +4102,7 @@ https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db
             "Image(https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db214e8a.jpg)"
         )
 
-        state.paragraphs.flatten().forEachIndexed { index, seg ->
+        state.paragraphs.map { it.words }.flatten().forEachIndexed { index, seg ->
             Assert.assertEquals(
                 expectedResult[index],
                 "${seg.javaClass.simpleName.replace("Segment", "")}(${seg.segmentText})"
@@ -4112,7 +4112,7 @@ https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db
 
     private fun printStateForDebug(state: RichTextViewerState) {
         state.paragraphs.forEachIndexed { index, paragraph ->
-            paragraph.forEach { seg ->
+            paragraph.words.forEach { seg ->
                 println(
                     "\"${
                     seg.javaClass.simpleName.replace(

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

@@ -11,17 +11,17 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class TranslationsTest {
 
-    fun translatePT(text: String, translateTo: String): String? {
+    fun translateTo(text: String, translateTo: String): String? {
         val task = LanguageTranslatorService.autoTranslate(text, emptySet(), translateTo)
         return Tasks.await(task).result
     }
 
     fun assertTranslate(expected: String, input: String, translateTo: String) {
-        assertEquals(null, expected, translatePT(input, translateTo))
+        assertEquals(null, expected, translateTo(input, translateTo))
     }
 
     fun assertTranslateContains(expected: String, input: String, translateTo: String) {
-        val translated = translatePT(input, translateTo)!!
+        val translated = translateTo(input, translateTo)!!
         assertTrue("'$translated' does not contain '$expected'", translated.contains(expected))
     }
 
@@ -86,4 +86,17 @@ class TranslationsTest {
             "en"
         )
     }
+
+    @Test
+    fun testJapaneseTranslationsOfUrl() {
+        assertTranslateContains(
+            "https://youtu.be/wMYFmCDy_Eg",
+            "うちの会社の小さい先輩の話 第1話「うちの会社の先輩は小さくて可愛い」\n" +
+                "\n" +
+                "https://youtu.be/wMYFmCDy_Eg\n" +
+                "\n" +
+                "先輩がうざい後輩の話と似たような話かと思ったけど、もっとオタクの妄想あるある的なものを詰め込んだやつだ。ワードとかシチュエーションとか、ヒロインのサイズ感とか。知らんけど",
+            "en"
+        )
+    }
 }

app/src/main/AndroidManifest.xml

@@ -27,6 +27,13 @@
     <!-- To know receive notifications when the app connects/disconnects from the web -->
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
 
+    <!-- Audio/Video Playback -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+
+    <!-- Keeps screen on while playing videos -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
     <!-- Old permission to access media -->
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
@@ -51,6 +58,7 @@
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
+            android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize"
             android:configChanges="orientation|screenSize|screenLayout"
             android:theme="@style/Theme.Amethyst">
@@ -91,6 +99,17 @@
             android:screenOrientation="fullSensor"
             tools:replace="screenOrientation" />
 
+        <service
+            android:name=".PlaybackService"
+            android:foregroundServiceType="mediaPlayback"
+            android:stopWithTask="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="androidx.media3.session.MediaSessionService"/>
+                <action android:name="android.media.browse.MediaBrowserService"/>
+            </intent-filter>
+        </service>
+
     </application>
 
 </manifest>

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

@@ -10,6 +10,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import com.vitorpamplona.amethyst.model.Settings
 import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.model.ContactListEvent
@@ -67,6 +68,11 @@ private object PrefKeys {
     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"
+    const val AUTOMATICALLY_SHOW_IMAGES = "automatically_show_images"
+    const val AUTOMATICALLY_START_PLAYBACK = "automatically_start_playback"
+    const val THEME = "theme"
+    const val PREFERRED_LANGUAGE = "preferred_Language"
+    const val AUTOMATICALLY_LOAD_URL_PREVIEW = "automatically_load_url_preview"
     val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
 }
 
@@ -236,6 +242,47 @@ object LocalPreferences {
                 putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, account.showSensitiveContent!!)
             }
         }.apply()
+
+        val globalPrefs = encryptedPreferences()
+        globalPrefs.edit().apply {
+            if (account.settings.automaticallyShowImages == null) {
+                remove(PrefKeys.AUTOMATICALLY_SHOW_IMAGES)
+            } else {
+                putBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, account.settings.automaticallyShowImages!!)
+            }
+
+            if (account.settings.automaticallyStartPlayback == null) {
+                remove(PrefKeys.AUTOMATICALLY_START_PLAYBACK)
+            } else {
+                putBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, account.settings.automaticallyStartPlayback!!)
+            }
+            if (account.settings.automaticallyShowUrlPreview == null) {
+                remove(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW)
+            } else {
+                putBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, account.settings.automaticallyShowUrlPreview!!)
+            }
+            putString(PrefKeys.PREFERRED_LANGUAGE, account.settings.preferredLanguage ?: "")
+        }.apply()
+    }
+
+    fun updateTheme(theme: Int) {
+        encryptedPreferences().edit().apply {
+            putInt(PrefKeys.THEME, theme)
+        }.apply()
+    }
+
+    fun getTheme(): Int {
+        encryptedPreferences().apply {
+            return getInt(PrefKeys.THEME, 0)
+        }
+    }
+
+    fun getPreferredLanguage(): String {
+        var language = ""
+        encryptedPreferences().apply {
+            language = getString(PrefKeys.PREFERRED_LANGUAGE, "") ?: ""
+        }
+        return language
     }
 
     fun loadFromEncryptedStorage(): Account? {
@@ -340,6 +387,28 @@ object LocalPreferences {
                 mapOf()
             }
 
+            val settings = Settings()
+            encryptedPreferences().apply {
+                settings.automaticallyShowImages = if (contains(PrefKeys.AUTOMATICALLY_SHOW_IMAGES)) {
+                    getBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, false)
+                } else {
+                    null
+                }
+
+                settings.automaticallyStartPlayback = if (contains(PrefKeys.AUTOMATICALLY_START_PLAYBACK)) {
+                    getBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, false)
+                } else {
+                    null
+                }
+                settings.automaticallyShowUrlPreview = if (contains(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW)) {
+                    getBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, false)
+                } else {
+                    null
+                }
+
+                settings.preferredLanguage = getString(PrefKeys.PREFERRED_LANGUAGE, "")
+            }
+
             val a = Account(
                 loggedIn = Persona(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray()),
                 followingChannels = followingChannels,
@@ -366,7 +435,8 @@ object LocalPreferences {
                 showSensitiveContent = showSensitiveContent,
                 warnAboutPostsWithReports = warnAboutReports,
                 filterSpamFromStrangers = filterSpam,
-                lastReadPerRoute = lastReadPerRoute
+                lastReadPerRoute = lastReadPerRoute,
+                settings = settings
             )
 
             return a

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

@@ -0,0 +1,132 @@
+package com.vitorpamplona.amethyst
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.util.LruCache
+import androidx.core.net.toUri
+import androidx.media3.common.C
+import androidx.media3.common.Player
+import androidx.media3.common.Player.STATE_IDLE
+import androidx.media3.common.Player.STATE_READY
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.session.MediaSession
+import com.vitorpamplona.amethyst.ui.MainActivity
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlin.math.abs
+
+class MultiPlayerPlaybackManager(
+    private val dataSourceFactory: androidx.media3.exoplayer.source.MediaSource.Factory? = null,
+    private val cachedPositions: VideoViewedPositionCache
+) {
+    // protects from LruCache killing playing sessions
+    private val playingMap = mutableMapOf<String, MediaSession>()
+
+    private val cache =
+        object : LruCache<String, MediaSession>(10) { // up to 10 videos in the screen at the same time
+            override fun entryRemoved(
+                evicted: Boolean,
+                key: String?,
+                oldValue: MediaSession?,
+                newValue: MediaSession?
+            ) {
+                super.entryRemoved(evicted, key, oldValue, newValue)
+
+                if (!playingMap.contains(key)) {
+                    oldValue?.let {
+                        it.player.release()
+                        it.release()
+                    }
+                }
+            }
+        }
+
+    private fun getCallbackIntent(callbackUri: String, applicationContext: Context): PendingIntent {
+        return PendingIntent.getActivity(
+            applicationContext,
+            0,
+            Intent(Intent.ACTION_VIEW, callbackUri.toUri(), applicationContext, MainActivity::class.java),
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
+    }
+
+    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
+    fun getMediaSession(id: String, uri: String, callbackUri: String?, context: Context, applicationContext: Context): MediaSession {
+        val existingSession = playingMap.get(id) ?: cache.get(id)
+        if (existingSession != null) return existingSession
+
+        val player = ExoPlayer.Builder(context).run {
+            dataSourceFactory?.let { setMediaSourceFactory(it) }
+            build()
+        }
+
+        player.apply {
+            repeatMode = Player.REPEAT_MODE_ALL
+            videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT
+            volume = 0f
+            setWakeMode(C.WAKE_MODE_NETWORK)
+        }
+
+        val mediaSession = MediaSession.Builder(context, player).run {
+            callbackUri?.let {
+                setSessionActivity(getCallbackIntent(it, applicationContext))
+            }
+            setId(id)
+            build()
+        }
+
+        player.addListener(object : Player.Listener {
+            override fun onIsPlayingChanged(isPlaying: Boolean) {
+                if (isPlaying) {
+                    playingMap.put(id, mediaSession)
+                } else {
+                    cache.put(id, mediaSession)
+                    playingMap.remove(id, mediaSession)
+                }
+            }
+
+            override fun onPlaybackStateChanged(playbackState: Int) {
+                when (playbackState) {
+                    STATE_IDLE -> {
+                        if (player.currentPosition > 5 * 60) { // 5 seconds
+                            cachedPositions.add(uri, player.currentPosition)
+                        }
+                    }
+                    STATE_READY -> {
+                        cachedPositions.get(uri)?.let { lastPosition ->
+                            if (abs(player.currentPosition - lastPosition) > 5 * 60) {
+                                player.seekTo(lastPosition)
+                            }
+                        }
+                    }
+                    else -> {
+                        if (player.currentPosition > 5 * 60) { // 5 seconds
+                            cachedPositions.add(uri, player.currentPosition)
+                        }
+                    }
+                }
+            }
+        })
+
+        cache.put(id, mediaSession)
+
+        return mediaSession
+    }
+
+    fun releaseAppPlayers() {
+        GlobalScope.launch(Dispatchers.Main) {
+            cache.evictAll()
+            playingMap.forEach {
+                it.value.player.release()
+                it.value.release()
+            }
+            playingMap.clear()
+        }
+    }
+
+    fun playingContent(): Collection<MediaSession> {
+        return playingMap.values
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.vitorpamplona.amethyst
+
+import android.content.ComponentName
+import android.content.Context
+import android.os.Bundle
+import androidx.media3.session.MediaController
+import androidx.media3.session.SessionToken
+import com.google.common.util.concurrent.MoreExecutors
+
+object PlaybackClientController {
+    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
+    fun prepareController(
+        controllerID: String,
+        videoUri: String,
+        callbackUri: String?,
+        context: Context,
+        onReady: (MediaController) -> Unit
+    ) {
+        // creating a bundle object
+        // creating a bundle object
+        val bundle = Bundle()
+        bundle.putString("id", controllerID)
+        bundle.putString("uri", videoUri)
+        bundle.putString("callbackUri", callbackUri)
+
+        val sessionTokenLocal = SessionToken(context, ComponentName(context, PlaybackService::class.java))
+        val controllerFuture = MediaController
+            .Builder(context, sessionTokenLocal)
+            .setConnectionHints(bundle)
+            .buildAsync()
+
+        controllerFuture.addListener(
+            {
+                val controller = controllerFuture.get()
+                onReady(controller)
+            },
+            MoreExecutors.directExecutor()
+        )
+    }
+}

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

@@ -0,0 +1,124 @@
+package com.vitorpamplona.amethyst
+
+import androidx.annotation.OptIn
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.okhttp.OkHttpDataSource
+import androidx.media3.exoplayer.hls.HlsMediaSource
+import androidx.media3.exoplayer.source.MediaSource
+import androidx.media3.exoplayer.source.ProgressiveMediaSource
+import androidx.media3.session.DefaultMediaNotificationProvider
+import androidx.media3.session.MediaSession
+import androidx.media3.session.MediaSessionService
+import com.vitorpamplona.amethyst.service.HttpClient
+
+@UnstableApi // Extend MediaSessionService
+class PlaybackService : MediaSessionService() {
+    private var videoViewedPositionCache = VideoViewedPositionCache()
+
+    private var managerHls: MultiPlayerPlaybackManager? = null
+    private var managerProgressive: MultiPlayerPlaybackManager? = null
+    private var managerLocal: MultiPlayerPlaybackManager? = null
+
+    fun newHslDataSource(): MediaSource.Factory {
+        return HlsMediaSource.Factory(OkHttpDataSource.Factory(HttpClient.getHttpClient()))
+    }
+
+    fun newProgressiveDataSource(): MediaSource.Factory {
+        return ProgressiveMediaSource.Factory(VideoCache.get(applicationContext, HttpClient.getHttpClient()))
+    }
+
+    // Create your Player and MediaSession in the onCreate lifecycle event
+    @OptIn(UnstableApi::class)
+    override fun onCreate() {
+        super.onCreate()
+
+        managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+        managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+        managerLocal = MultiPlayerPlaybackManager(cachedPositions = videoViewedPositionCache)
+
+        // Stop all videos and recreates all managers when the proxy changes.
+        HttpClient.proxyChangeListeners.add {
+            val toDestroyHls = managerHls
+            val toDestroyProgressive = managerProgressive
+
+            managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+            managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+
+            toDestroyHls?.releaseAppPlayers()
+            toDestroyProgressive?.releaseAppPlayers()
+        }
+
+        setMediaNotificationProvider(
+            DefaultMediaNotificationProvider.Builder(applicationContext).build()
+        )
+    }
+
+    override fun onDestroy() {
+        managerHls?.releaseAppPlayers()
+        managerLocal?.releaseAppPlayers()
+        managerProgressive?.releaseAppPlayers()
+
+        super.onDestroy()
+    }
+
+    fun getAppropriateMediaSessionManager(fileName: String): MultiPlayerPlaybackManager? {
+        return if (fileName.startsWith("file")) {
+            managerLocal
+        } else if (fileName.endsWith("m3u8")) {
+            managerHls
+        } else {
+            managerProgressive
+        }
+    }
+
+    override fun onUpdateNotification(session: MediaSession, startInForegroundRequired: Boolean) {
+        // Updates any new player ready
+        super.onUpdateNotification(session, startInForegroundRequired)
+
+        // Overrides the notification with any player actually playing
+        managerHls?.playingContent()?.forEach {
+            if (it.player.isPlaying) {
+                super.onUpdateNotification(it, startInForegroundRequired)
+            }
+        }
+        managerLocal?.playingContent()?.forEach {
+            if (it.player.isPlaying) {
+                super.onUpdateNotification(session, startInForegroundRequired)
+            }
+        }
+        managerProgressive?.playingContent()?.forEach {
+            if (it.player.isPlaying) {
+                super.onUpdateNotification(session, startInForegroundRequired)
+            }
+        }
+
+        // Overrides again with playing with audio
+        managerHls?.playingContent()?.forEach {
+            if (it.player.isPlaying && it.player.volume > 0) {
+                super.onUpdateNotification(it, startInForegroundRequired)
+            }
+        }
+        managerLocal?.playingContent()?.forEach {
+            if (it.player.isPlaying && it.player.volume > 0) {
+                super.onUpdateNotification(session, startInForegroundRequired)
+            }
+        }
+        managerProgressive?.playingContent()?.forEach {
+            if (it.player.isPlaying && it.player.volume > 0) {
+                super.onUpdateNotification(session, startInForegroundRequired)
+            }
+        }
+    }
+
+    // Return a MediaSession to link with the MediaController that is making
+    // this request.
+    override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? {
+        val id = controllerInfo.connectionHints.getString("id") ?: return null
+        val uri = controllerInfo.connectionHints.getString("uri") ?: return null
+        val callbackUri = controllerInfo.connectionHints.getString("callbackUri")
+
+        val manager = getAppropriateMediaSessionManager(uri)
+
+        return manager?.getMediaSession(id, uri, callbackUri, context = this, applicationContext = applicationContext)
+    }
+}

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

@@ -60,9 +60,6 @@ object ServiceManager {
                 .build()
         }
 
-        // Initializes video cache.
-        VideoCache.init(context.applicationContext)
-
         if (myAccount != null) {
             Client.connect(myAccount.activeRelays() ?: myAccount.convertLocalRelays())
 
@@ -79,6 +76,7 @@ object ServiceManager {
             NostrAccountDataSource.start()
             NostrChatroomListDataSource.start()
             NostrDiscoveryDataSource.start()
+            NostrVideoDataSource.start()
 
             // More Info Data Sources
             NostrSingleEventDataSource.start()

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

@@ -1,14 +1,15 @@
 package com.vitorpamplona.amethyst
 
 import android.content.Context
-import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
-import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
-import com.google.android.exoplayer2.upstream.cache.CacheDataSource
-import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
-import com.google.android.exoplayer2.upstream.cache.SimpleCache
-import com.vitorpamplona.amethyst.service.HttpClient
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.database.StandaloneDatabaseProvider
+import androidx.media3.datasource.cache.CacheDataSource
+import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
+import androidx.media3.datasource.cache.SimpleCache
+import androidx.media3.datasource.okhttp.OkHttpDataSource
+import okhttp3.OkHttpClient
 
-object VideoCache {
+@UnstableApi object VideoCache {
 
     var exoPlayerCacheSize: Long = 90 * 1024 * 1024 // 90MB
 
@@ -20,33 +21,34 @@ object VideoCache {
     lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
     @Synchronized
-    fun init(context: Context) {
-        if (!this::simpleCache.isInitialized) {
-            exoDatabaseProvider = StandaloneDatabaseProvider(context)
+    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
+    private fun init(context: Context, client: OkHttpClient) {
+        exoDatabaseProvider = StandaloneDatabaseProvider(context)
 
-            simpleCache = SimpleCache(
-                context.cacheDir,
-                leastRecentlyUsedCacheEvictor,
-                exoDatabaseProvider
-            )
+        simpleCache = SimpleCache(
+            context.cacheDir,
+            leastRecentlyUsedCacheEvictor,
+            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(
-                    OkHttpDataSource.Factory(HttpClient.getHttpClient())
-                )
-                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-        }
+        renewCacheFactory(client)
     }
 
-    fun get(): CacheDataSource.Factory {
+    // This method should be called when proxy setting changes.
+    fun renewCacheFactory(client: OkHttpClient) {
+        cacheDataSourceFactory = CacheDataSource.Factory()
+            .setCache(simpleCache)
+            .setUpstreamDataSourceFactory(
+                OkHttpDataSource.Factory(client)
+            )
+            .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+    }
+
+    fun get(context: Context, client: OkHttpClient): CacheDataSource.Factory {
+        if (!this::simpleCache.isInitialized) {
+            init(context, client)
+        }
+
         return cacheDataSourceFactory
     }
 }

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

@@ -0,0 +1,15 @@
+package com.vitorpamplona.amethyst
+
+import android.util.LruCache
+
+class VideoViewedPositionCache {
+    val cachedPosition = LruCache<String, Long>(100)
+
+    fun add(uri: String, position: Long) {
+        cachedPosition.put(uri, position)
+    }
+
+    fun get(uri: String): Long? {
+        return cachedPosition.get(uri)
+    }
+}

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

@@ -6,6 +6,8 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.core.os.ConfigurationCompat
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.OptOutFromFilters
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.NostrLnZapPaymentResponseDataSource
@@ -18,6 +20,10 @@ import com.vitorpamplona.amethyst.service.relays.RelayPool
 import com.vitorpamplona.amethyst.ui.actions.ServersAvailable
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.Nip47URI
+import com.vitorpamplona.amethyst.ui.note.combineWith
+import kotlinx.collections.immutable.ImmutableSet
+import kotlinx.collections.immutable.persistentSetOf
+import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -49,9 +55,11 @@ val KIND3_FOLLOWS = " All Follows "
 @Stable
 class Account(
     val loggedIn: Persona,
-    var followingChannels: Set<String> = DefaultChannels,
-    var followingCommunities: Set<String> = setOf(),
-    var hiddenUsers: Set<String> = setOf(),
+
+    var followingChannels: Set<String> = DefaultChannels, // deprecated
+    var followingCommunities: Set<String> = setOf(), // deprecated
+    var hiddenUsers: Set<String> = setOf(), // deprecated
+
     var localRelays: Set<RelaySetupInfo> = Constants.defaultRelays.toSet(),
     var dontTranslateFrom: Set<String> = getLanguagesSpokenByUser(),
     var languagePreferences: Map<String, String> = mapOf(),
@@ -73,9 +81,10 @@ class Account(
     var showSensitiveContent: Boolean? = null,
     var warnAboutPostsWithReports: Boolean = true,
     var filterSpamFromStrangers: Boolean = true,
-    var lastReadPerRoute: Map<String, Long> = mapOf<String, Long>()
+    var lastReadPerRoute: Map<String, Long> = mapOf<String, Long>(),
+    var settings: Settings = Settings()
 ) {
-    var transientHiddenUsers: Set<String> = setOf()
+    var transientHiddenUsers: ImmutableSet<String> = persistentSetOf()
 
     // Observers line up here.
     val live: AccountLiveData = AccountLiveData(this)
@@ -83,14 +92,54 @@ class Account(
     val liveLastRead: AccountLiveData = AccountLiveData(this)
     val saveable: AccountLiveData = AccountLiveData(this)
 
+    @Immutable
+    data class LiveHiddenUsers(
+        val hiddenUsers: ImmutableSet<String>,
+        val spammers: ImmutableSet<String>,
+        val showSensitiveContent: Boolean?
+    )
+
+    val liveHiddenUsers: LiveData<LiveHiddenUsers> = live.combineWith(getBlockListNote().live().metadata) { localLive, liveMuteListEvent ->
+        val liveBlockedUsers = (liveMuteListEvent?.note?.event as? PeopleListEvent)?.publicAndPrivateUsers(loggedIn.privKey)
+        LiveHiddenUsers(
+            hiddenUsers = liveBlockedUsers ?: persistentSetOf(),
+            spammers = localLive?.account?.transientHiddenUsers ?: persistentSetOf(),
+            showSensitiveContent = showSensitiveContent
+        )
+    }.distinctUntilChanged()
+
     var userProfileCache: User? = null
 
+    fun updateAutomaticallyStartPlayback(
+        automaticallyStartPlayback: Boolean?
+    ) {
+        settings.automaticallyStartPlayback = automaticallyStartPlayback
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
+    fun updateAutomaticallyShowUrlPreview(
+        automaticallyShowUrlPreview: Boolean?
+    ) {
+        settings.automaticallyShowUrlPreview = automaticallyShowUrlPreview
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
+    fun updateAutomaticallyShowImages(
+        automaticallyShowImages: Boolean?
+    ) {
+        settings.automaticallyShowImages = automaticallyShowImages
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
     fun updateOptOutOptions(warnReports: Boolean, filterSpam: Boolean) {
         warnAboutPostsWithReports = warnReports
         filterSpamFromStrangers = filterSpam
         OptOutFromFilters.start(warnAboutPostsWithReports, filterSpamFromStrangers)
         if (!filterSpamFromStrangers) {
-            transientHiddenUsers = setOf()
+            transientHiddenUsers = persistentSetOf()
         }
         live.invalidateData()
         saveable.invalidateData()
@@ -104,14 +153,6 @@ class Account(
         }
     }
 
-    fun followingChannels(): List<Channel> {
-        return followingChannels.mapNotNull { LocalCache.checkGetOrCreateChannel(it) }
-    }
-
-    fun followingCommunities(): List<AddressableNote> {
-        return followingCommunities.mapNotNull { LocalCache.checkGetOrCreateAddressableNote(it) }
-    }
-
     fun isWriteable(): Boolean {
         return loggedIn.privKey != null
     }
@@ -120,21 +161,25 @@ class Account(
         if (!isWriteable()) return
 
         val contactList = userProfile().latestContactList
-        val follows = contactList?.follows() ?: emptyList()
-        val followsTags = contactList?.unverifiedFollowTagSet() ?: emptyList()
 
-        if (contactList != null && follows.isNotEmpty()) {
-            val event = ContactListEvent.create(
-                follows,
-                followsTags,
-                relays,
-                loggedIn.privKey!!
+        if (contactList != null && contactList.tags.isNotEmpty()) {
+            val event = ContactListEvent.updateRelayList(
+                earlierVersion = contactList,
+                relayUse = relays,
+                privateKey = loggedIn.privKey!!
             )
 
             Client.send(event)
             LocalCache.consume(event)
         } else {
-            val event = ContactListEvent.create(listOf(), listOf(), relays, loggedIn.privKey!!)
+            val event = ContactListEvent.createFromScratch(
+                followUsers = listOf(),
+                followTags = listOf(),
+                followCommunities = listOf(),
+                followEvents = DefaultChannels.toList(),
+                relayUse = relays,
+                privateKey = loggedIn.privKey!!
+            )
 
             // Keep this local to avoid erasing a good contact list.
             // Client.send(event)
@@ -176,6 +221,19 @@ class Account(
             return
         }
 
+        if (reaction.startsWith(":")) {
+            val emojiUrl = EmojiUrl.decode(reaction)
+            if (emojiUrl != null) {
+                note.event?.let {
+                    val event = ReactionEvent.create(emojiUrl, it, loggedIn.privKey!!)
+                    Client.send(event)
+                    LocalCache.consume(event)
+                }
+
+                return
+            }
+        }
+
         note.event?.let {
             val event = ReactionEvent.create(reaction, it, loggedIn.privKey!!)
             Client.send(event)
@@ -361,27 +419,90 @@ class Account(
         }
     }
 
+    private fun migrateCommunitiesAndChannelsIfNeeded(latestContactList: ContactListEvent?): ContactListEvent? {
+        if (latestContactList == null) return latestContactList
+
+        var returningContactList: ContactListEvent = latestContactList
+
+        if (followingCommunities.isNotEmpty()) {
+            followingCommunities.forEach {
+                ATag.parse(it, null)?.let {
+                    returningContactList = ContactListEvent.followAddressableEvent(returningContactList, it, loggedIn.privKey!!)
+                }
+            }
+            followingCommunities = emptySet()
+        }
+
+        if (followingChannels.isNotEmpty()) {
+            followingChannels.forEach {
+                returningContactList = ContactListEvent.followEvent(returningContactList, it, loggedIn.privKey!!)
+            }
+            followingChannels = emptySet()
+        }
+
+        return returningContactList
+    }
+
     fun follow(user: User) {
         if (!isWriteable()) return
 
-        val contactList = userProfile().latestContactList
-        val followingUsers = contactList?.follows() ?: emptyList()
-        val followingTags = contactList?.unverifiedFollowTagSet() ?: emptyList()
+        val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
 
         val event = if (contactList != null) {
-            ContactListEvent.create(
-                followingUsers.plus(Contact(user.pubkeyHex, null)),
-                followingTags,
-                contactList.relays(),
-                loggedIn.privKey!!
+            ContactListEvent.followUser(contactList, user.pubkeyHex, loggedIn.privKey!!)
+        } else {
+            ContactListEvent.createFromScratch(
+                followUsers = listOf(Contact(user.pubkeyHex, null)),
+                followTags = emptyList(),
+                followCommunities = emptyList(),
+                followEvents = DefaultChannels.toList(),
+                relayUse = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
+                privateKey = loggedIn.privKey!!
             )
+        }
+
+        Client.send(event)
+        LocalCache.consume(event)
+    }
+
+    fun follow(channel: Channel) {
+        if (!isWriteable()) return
+
+        val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
+
+        val event = if (contactList != null) {
+            ContactListEvent.followEvent(contactList, channel.idHex, loggedIn.privKey!!)
+        } else {
+            ContactListEvent.createFromScratch(
+                followUsers = emptyList(),
+                followTags = emptyList(),
+                followCommunities = emptyList(),
+                followEvents = DefaultChannels.toList().plus(channel.idHex),
+                relayUse = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
+                privateKey = loggedIn.privKey!!
+            )
+        }
+
+        Client.send(event)
+        LocalCache.consume(event)
+    }
+
+    fun follow(community: AddressableNote) {
+        if (!isWriteable()) return
+
+        val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
+
+        val event = if (contactList != null) {
+            ContactListEvent.followAddressableEvent(contactList, community.address, loggedIn.privKey!!)
         } else {
             val relays = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) }
-            ContactListEvent.create(
-                listOf(Contact(user.pubkeyHex, null)),
-                followingTags,
-                relays,
-                loggedIn.privKey!!
+            ContactListEvent.createFromScratch(
+                followUsers = emptyList(),
+                followTags = emptyList(),
+                followCommunities = listOf(community.address),
+                followEvents = DefaultChannels.toList(),
+                relayUse = relays,
+                privateKey = loggedIn.privKey!!
             )
         }
 
@@ -392,24 +513,22 @@ class Account(
     fun follow(tag: String) {
         if (!isWriteable()) return
 
-        val contactList = userProfile().latestContactList
-        val followingUsers = contactList?.follows() ?: emptyList()
-        val followingTags = contactList?.unverifiedFollowTagSet() ?: emptyList()
+        val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
 
         val event = if (contactList != null) {
-            ContactListEvent.create(
-                followingUsers,
-                followingTags.plus(tag),
-                contactList.relays(),
+            ContactListEvent.followHashtag(
+                contactList,
+                tag,
                 loggedIn.privKey!!
             )
         } else {
-            val relays = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) }
-            ContactListEvent.create(
-                followingUsers,
-                followingTags.plus(tag),
-                relays,
-                loggedIn.privKey!!
+            ContactListEvent.createFromScratch(
+                followUsers = emptyList(),
+                followTags = listOf(tag),
+                followCommunities = emptyList(),
+                followEvents = DefaultChannels.toList(),
+                relayUse = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
+                privateKey = loggedIn.privKey!!
             )
         }
 
@@ -420,15 +539,12 @@ class Account(
     fun unfollow(user: User) {
         if (!isWriteable()) return
 
-        val contactList = userProfile().latestContactList
-        val followingUsers = contactList?.follows() ?: emptyList()
-        val followingTags = contactList?.unverifiedFollowTagSet() ?: emptyList()
+        val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
 
-        if (contactList != null && (followingUsers.isNotEmpty() || followingTags.isNotEmpty())) {
-            val event = ContactListEvent.create(
-                followingUsers.filter { it.pubKeyHex != user.pubkeyHex },
-                followingTags,
-                contactList.relays(),
+        if (contactList != null && contactList.tags.isNotEmpty()) {
+            val event = ContactListEvent.unfollowUser(
+                contactList,
+                user.pubkeyHex,
                 loggedIn.privKey!!
             )
 
@@ -440,15 +556,46 @@ class Account(
     fun unfollow(tag: String) {
         if (!isWriteable()) return
 
-        val contactList = userProfile().latestContactList
-        val followingUsers = contactList?.follows() ?: emptyList()
-        val followingTags = contactList?.unverifiedFollowTagSet() ?: emptyList()
+        val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
 
-        if (contactList != null && (followingUsers.isNotEmpty() || followingTags.isNotEmpty())) {
-            val event = ContactListEvent.create(
-                followingUsers,
-                followingTags.filter { !it.equals(tag, ignoreCase = true) },
-                contactList.relays(),
+        if (contactList != null && contactList.tags.isNotEmpty()) {
+            val event = ContactListEvent.unfollowHashtag(
+                contactList,
+                tag,
+                loggedIn.privKey!!
+            )
+
+            Client.send(event)
+            LocalCache.consume(event)
+        }
+    }
+
+    fun unfollow(channel: Channel) {
+        if (!isWriteable()) return
+
+        val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
+
+        if (contactList != null && contactList.tags.isNotEmpty()) {
+            val event = ContactListEvent.unfollowEvent(
+                contactList,
+                channel.idHex,
+                loggedIn.privKey!!
+            )
+
+            Client.send(event)
+            LocalCache.consume(event)
+        }
+    }
+
+    fun unfollow(community: AddressableNote) {
+        if (!isWriteable()) return
+
+        val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
+
+        if (contactList != null && contactList.tags.isNotEmpty()) {
+            val event = ContactListEvent.unfollowAddressableEvent(
+                contactList,
+                community.address,
                 loggedIn.privKey!!
             )
 
@@ -474,25 +621,26 @@ class Account(
             dimensions = headerInfo.dim,
             blurhash = headerInfo.blurHash,
             description = headerInfo.description,
+            sensitiveContent = headerInfo.sensitiveContent,
             privateKey = loggedIn.privKey!!
         )
 
         return Pair(data, signedEvent)
     }
 
-    fun sendNip95(data: FileStorageEvent, signedEvent: FileStorageHeaderEvent): Note? {
+    fun sendNip95(data: FileStorageEvent, signedEvent: FileStorageHeaderEvent, relayList: List<Relay>? = null): Note? {
         if (!isWriteable()) return null
 
-        Client.send(data)
+        Client.send(data, relayList = relayList)
         LocalCache.consume(data, null)
 
-        Client.send(signedEvent)
+        Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent, null)
 
         return LocalCache.notes[signedEvent.id]
     }
 
-    fun sendHeader(headerInfo: FileHeader): Note? {
+    fun sendHeader(headerInfo: FileHeader, relayList: List<Relay>? = null): Note? {
         if (!isWriteable()) return null
 
         val signedEvent = FileHeaderEvent.create(
@@ -503,10 +651,11 @@ class Account(
             dimensions = headerInfo.dim,
             blurhash = headerInfo.blurHash,
             description = headerInfo.description,
+            sensitiveContent = headerInfo.sensitiveContent,
             privateKey = loggedIn.privKey!!
         )
 
-        Client.send(signedEvent)
+        Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent, null)
 
         return LocalCache.notes[signedEvent.id]
@@ -522,7 +671,8 @@ class Account(
         zapRaiserAmount: Long? = null,
         replyingTo: String?,
         root: String?,
-        directMentions: Set<HexKey>
+        directMentions: Set<HexKey>,
+        relayList: List<Relay>? = null
     ) {
         if (!isWriteable()) return
 
@@ -545,7 +695,7 @@ class Account(
             privateKey = loggedIn.privKey!!
         )
 
-        Client.send(signedEvent)
+        Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent)
     }
 
@@ -560,7 +710,8 @@ class Account(
         closedAt: Int?,
         zapReceiver: String? = null,
         wantsToMarkAsSensitive: Boolean,
-        zapRaiserAmount: Long? = null
+        zapRaiserAmount: Long? = null,
+        relayList: List<Relay>? = null
     ) {
         if (!isWriteable()) return
 
@@ -584,7 +735,7 @@ class Account(
             zapRaiserAmount = zapRaiserAmount
         )
         // println("Sending new PollNoteEvent: %s".format(signedEvent.toJson()))
-        Client.send(signedEvent)
+        Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent)
     }
 
@@ -669,7 +820,54 @@ class Account(
         Client.send(event)
         LocalCache.consume(event)
 
-        joinChannel(event.id)
+        LocalCache.getChannelIfExists(event.id)?.let {
+            follow(it)
+        }
+    }
+
+    fun removeEmojiPack(usersEmojiList: Note, emojiList: Note) {
+        if (!isWriteable()) return
+
+        val noteEvent = usersEmojiList.event
+        if (noteEvent !is EmojiPackSelectionEvent) return
+        val emojiListEvent = emojiList.event
+        if (emojiListEvent !is EmojiPackEvent) return
+
+        val event = EmojiPackSelectionEvent.create(
+            noteEvent.taggedAddresses().filter { it != emojiListEvent.address() },
+            loggedIn.privKey!!
+        )
+
+        Client.send(event)
+        LocalCache.consume(event)
+    }
+
+    fun addEmojiPack(usersEmojiList: Note, emojiList: Note) {
+        if (!isWriteable()) return
+        val emojiListEvent = emojiList.event
+        if (emojiListEvent !is EmojiPackEvent) return
+
+        val event = if (usersEmojiList.event == null) {
+            EmojiPackSelectionEvent.create(
+                listOf(emojiListEvent.address()),
+                loggedIn.privKey!!
+            )
+        } else {
+            val noteEvent = usersEmojiList.event
+            if (noteEvent !is EmojiPackSelectionEvent) return
+
+            if (noteEvent.taggedAddresses().any { it == emojiListEvent.address() }) {
+                return
+            }
+
+            EmojiPackSelectionEvent.create(
+                noteEvent.taggedAddresses().plus(emojiListEvent.address()),
+                loggedIn.privKey!!
+            )
+        }
+
+        Client.send(event)
+        LocalCache.consume(event)
     }
 
     fun addPrivateBookmark(note: Note) {
@@ -848,43 +1046,70 @@ class Account(
         }
     }
 
-    fun joinChannel(idHex: String) {
-        followingChannels = followingChannels + idHex
-        live.invalidateData()
-
-        saveable.invalidateData()
+    fun getBlockListNote(): AddressableNote {
+        val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, PeopleListEvent.blockList, null)
+        return LocalCache.getOrCreateAddressableNote(aTag)
     }
 
-    fun leaveChannel(idHex: String) {
-        followingChannels = followingChannels - idHex
-        live.invalidateData()
-
-        saveable.invalidateData()
+    fun getBlockList(): PeopleListEvent? {
+        return getBlockListNote().event as? PeopleListEvent
     }
 
-    fun joinCommunity(idHex: String) {
-        followingCommunities = followingCommunities + idHex
-        live.invalidateData()
+    private fun migrateHiddenUsersIfNeeded(latestList: PeopleListEvent?): PeopleListEvent? {
+        if (latestList == null) return latestList
 
-        saveable.invalidateData()
-    }
+        var returningList: PeopleListEvent = latestList
 
-    fun leaveCommunity(idHex: String) {
-        followingCommunities = followingCommunities - idHex
-        live.invalidateData()
+        if (hiddenUsers.isNotEmpty()) {
+            returningList = PeopleListEvent.addUsers(returningList, hiddenUsers.toList(), true, loggedIn.privKey!!)
+            hiddenUsers = emptySet()
+        }
 
-        saveable.invalidateData()
+        return returningList
     }
 
     fun hideUser(pubkeyHex: String) {
-        hiddenUsers = hiddenUsers + pubkeyHex
+        val blockList = migrateHiddenUsersIfNeeded(getBlockList())
+
+        val event = if (blockList != null) {
+            PeopleListEvent.addUser(
+                earlierVersion = blockList,
+                pubKeyHex = pubkeyHex,
+                isPrivate = true,
+                privateKey = loggedIn.privKey!!
+            )
+        } else {
+            PeopleListEvent.createListWithUser(
+                name = PeopleListEvent.blockList,
+                pubKeyHex = pubkeyHex,
+                isPrivate = true,
+                privateKey = loggedIn.privKey!!
+            )
+        }
+
+        Client.send(event)
+        LocalCache.consume(event)
+
         live.invalidateData()
         saveable.invalidateData()
     }
 
     fun showUser(pubkeyHex: String) {
-        hiddenUsers = hiddenUsers - pubkeyHex
-        transientHiddenUsers = transientHiddenUsers - pubkeyHex
+        val blockList = migrateHiddenUsersIfNeeded(getBlockList())
+
+        if (blockList != null) {
+            val event = PeopleListEvent.removeUser(
+                earlierVersion = blockList,
+                pubKeyHex = pubkeyHex,
+                isPrivate = true,
+                privateKey = loggedIn.privKey!!
+            )
+
+            Client.send(event)
+            LocalCache.consume(event)
+        }
+
+        transientHiddenUsers = (transientHiddenUsers - pubkeyHex).toImmutableSet()
         live.invalidateData()
         saveable.invalidateData()
     }
@@ -971,7 +1196,53 @@ class Account(
         if (listName == GLOBAL_FOLLOWS) return null
         if (listName == KIND3_FOLLOWS) return userProfile().cachedFollowingTagSet()
 
-        return emptySet()
+        val privKey = loggedIn.privKey
+
+        return if (listName != null) {
+            val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, listName, null).toTag()
+            val list = LocalCache.addressables[aTag]
+            if (list != null) {
+                val publicAddresses = list.event?.hashtags() ?: emptySet()
+                val privateAddresses = privKey?.let {
+                    (list.event as? GeneralListEvent)?.privateHashtags(it)
+                } ?: emptySet()
+
+                (publicAddresses + privateAddresses).toSet()
+            } else {
+                emptySet()
+            }
+        } else {
+            emptySet()
+        }
+    }
+
+    fun selectedCommunitiesFollowList(listName: String?): Set<String>? {
+        if (listName == GLOBAL_FOLLOWS) return null
+        if (listName == KIND3_FOLLOWS) return userProfile().cachedFollowingCommunitiesSet()
+
+        val privKey = loggedIn.privKey
+
+        return if (listName != null) {
+            val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, listName, null).toTag()
+            val list = LocalCache.addressables[aTag]
+            if (list != null) {
+                val publicAddresses = list.event?.taggedAddresses()?.map { it.toTag() } ?: emptySet()
+                val privateAddresses = privKey?.let {
+                    (list.event as? GeneralListEvent)?.privateTaggedAddresses(it)?.map { it.toTag() }
+                } ?: emptySet()
+
+                (publicAddresses + privateAddresses).toSet()
+            } else {
+                emptySet()
+            }
+        } else {
+            emptySet()
+        }
+    }
+
+    fun selectedChatsFollowList(): Set<String> {
+        val contactList = userProfile().latestContactList
+        return contactList?.taggedEvents()?.toSet() ?: DefaultChannels
     }
 
     fun sendChangeChannel(name: String, about: String, picture: String, channel: Channel) {
@@ -992,7 +1263,7 @@ class Account(
         Client.send(event)
         LocalCache.consume(event)
 
-        joinChannel(event.id)
+        follow(channel)
     }
 
     fun decryptContent(note: Note): String? {
@@ -1140,7 +1411,11 @@ class Account(
     }
 
     fun isHidden(user: User) = isHidden(user.pubkeyHex)
-    fun isHidden(userHex: String) = userHex in hiddenUsers || userHex in transientHiddenUsers
+    fun isHidden(userHex: String): Boolean {
+        val blockList = getBlockList()
+
+        return (blockList?.publicAndPrivateUsers(loggedIn.privKey)?.contains(userHex) ?: false) || userHex in transientHiddenUsers
+    }
 
     fun followingKeySet(): Set<HexKey> {
         return userProfile().cachedFollowingKeySet()
@@ -1259,7 +1534,7 @@ class Account(
                 it.cache.spamMessages.snapshot().values.forEach {
                     if (it.pubkeyHex !in transientHiddenUsers && it.duplicatedMessages.size >= 5) {
                         if (it.pubkeyHex != userProfile().pubkeyHex && it.pubkeyHex !in followingKeySet()) {
-                            transientHiddenUsers = transientHiddenUsers + it.pubkeyHex
+                            transientHiddenUsers = (transientHiddenUsers + it.pubkeyHex).toImmutableSet()
                             live.invalidateData()
                         }
                     }
@@ -1272,8 +1547,11 @@ class Account(
         Log.d("Init", "Account")
         backupContactList?.let {
             println("Loading saved contacts ${it.toJson()}")
+
             if (userProfile().latestContactList == null) {
-                LocalCache.consume(it)
+                GlobalScope.launch(Dispatchers.IO) {
+                    LocalCache.consume(it)
+                }
             }
         }
     }

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

@@ -76,7 +76,11 @@ class AntiSpamLiveData(val cache: AntiSpamFilter) : LiveData<AntiSpamState>(Anti
     private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
+        checkNotInMainThread()
+
         bundler.invalidate() {
+            checkNotInMainThread()
+
             if (hasActiveObservers()) {
                 postValue(AntiSpamState(cache))
             }

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

@@ -3,6 +3,7 @@ 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.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.ATag
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
@@ -94,6 +95,10 @@ abstract class Channel(val idHex: String) {
         return null
     }
 
+    open fun creatorName(): String? {
+        return creator?.toBestDisplayName()
+    }
+
     open fun profilePicture(): String? {
         return creator?.profilePicture()
     }
@@ -145,7 +150,10 @@ class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelStat
     private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
+        checkNotInMainThread()
+
         bundler.invalidate() {
+            checkNotInMainThread()
             if (hasActiveObservers()) {
                 postValue(ChannelState(channel))
             }

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

@@ -33,7 +33,7 @@ object LocalCache {
         ConcurrentHashMap<HexKey, Pair<Note?, (LnZapPaymentResponseEvent) -> Unit>>(10)
 
     fun checkGetOrCreateUser(key: String): User? {
-        checkNotInMainThread()
+        // checkNotInMainThread()
 
         if (isValidHex(key)) {
             return getOrCreateUser(key)
@@ -143,7 +143,7 @@ object LocalCache {
     }
 
     fun getOrCreateAddressableNoteInternal(key: ATag): AddressableNote {
-        checkNotInMainThread()
+        // checkNotInMainThread()
 
         // we can't use naddr here because naddr might include relay info and
         // the preferred relay should not be part of the index.
@@ -176,6 +176,16 @@ object LocalCache {
         }
     }
 
+    fun consume(event: ContactListEvent) {
+        val user = getOrCreateUser(event.pubKey)
+
+        // avoids processing empty contact lists.
+        if (event.createdAt > (user.latestContactList?.createdAt ?: 0) && !event.tags.isEmpty()) {
+            user.updateContactList(event)
+            // Log.d("CL", "AAA ${user.toBestDisplayName()} ${follows.size}")
+        }
+    }
+
     fun consume(event: BookmarkListEvent) {
         val user = getOrCreateUser(event.pubKey)
         if (user.latestBookmarkList == null || event.createdAt > user.latestBookmarkList!!.createdAt) {
@@ -238,9 +248,6 @@ object LocalCache {
 
         // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
 
-        // Prepares user's profile view.
-        author.addNote(note)
-
         // Counts the replies
         replyTo.forEach {
             it.addReply(note)
@@ -279,8 +286,6 @@ object LocalCache {
         if (event.createdAt > (note.createdAt() ?: 0)) {
             note.loadEvent(event, author, replyTo)
 
-            author.addNote(note)
-
             refreshObservers(note)
         }
     }
@@ -310,9 +315,6 @@ object LocalCache {
 
         // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
 
-        // Prepares user's profile view.
-        author.addNote(note)
-
         // Counts the replies
         replyTo.forEach {
             it.addReply(note)
@@ -364,6 +366,63 @@ object LocalCache {
         }
     }
 
+    fun consume(event: EmojiPackSelectionEvent) {
+        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: EmojiPackEvent) {
+        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: ClassifiedsEvent) {
+        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: PinListEvent) {
         val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
@@ -461,7 +520,7 @@ object LocalCache {
         if (event.createdAt > (note.createdAt() ?: 0)) {
             note.loadEvent(event, author, replyTo)
 
-            author.updateAcceptedBadges(note)
+            refreshObservers(note)
         }
     }
 
@@ -486,6 +545,26 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    private fun comsume(event: NNSEvent) {
+        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)
+        }
+    }
+
     fun consume(event: AppDefinitionEvent) {
         val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
@@ -497,7 +576,7 @@ object LocalCache {
         }
 
         // Already processed this event.
-        if (note.event != null) return
+        if (note.event?.id() == event.id()) return
 
         if (event.createdAt > (note.createdAt() ?: 0)) {
             note.loadEvent(event, author, emptyList())
@@ -531,16 +610,6 @@ object LocalCache {
 //        // Log.d("RR", event.toJson())
     }
 
-    fun consume(event: ContactListEvent) {
-        val user = getOrCreateUser(event.pubKey)
-
-        // avoids processing empty contact lists.
-        if (event.createdAt > (user.latestContactList?.createdAt ?: 0) && !event.tags.isEmpty()) {
-            user.updateContactList(event)
-            // Log.d("CL", "AAA ${user.toBestDisplayName()} ${follows.size}")
-        }
-    }
-
     fun consume(event: PrivateDmEvent, relay: Relay?): Note {
         val note = getOrCreateNote(event.id)
         val author = getOrCreateUser(event.pubKey)
@@ -577,8 +646,6 @@ object LocalCache {
         event.deleteEvents().mapNotNull { notes[it] }.forEach { deleteNote ->
             // must be the same author
             if (deleteNote.author?.pubkeyHex == event.pubKey) {
-                deleteNote.author?.removeNote(deleteNote)
-
                 // reverts the add
                 val mentions = deleteNote.event?.tags()?.filter { it.firstOrNull() == "p" }
                     ?.mapNotNull { it.getOrNull(1) }?.mapNotNull { checkGetOrCreateUser(it) }
@@ -640,9 +707,6 @@ object LocalCache {
 
         note.loadEvent(event, author, repliesTo)
 
-        // Prepares user's profile view.
-        author.addNote(note)
-
         // Counts the replies
         repliesTo.forEach {
             it.addBoost(note)
@@ -665,9 +729,6 @@ object LocalCache {
 
         note.loadEvent(event, author, repliesTo)
 
-        // Prepares user's profile view.
-        author.addNote(note)
-
         // Counts the replies
         repliesTo.forEach {
             it.addBoost(note)
@@ -693,9 +754,6 @@ object LocalCache {
 
         note.loadEvent(event, author, eventsApproved)
 
-        // Prepares user's profile view.
-        author.addNote(note)
-
         // Counts the replies
         repliesTo.forEach {
             it.addBoost(note)
@@ -1015,9 +1073,6 @@ object LocalCache {
 
         note.loadEvent(event, author, emptyList())
 
-        // Adds to user profile
-        author.addNote(note)
-
         refreshObservers(note)
     }
 
@@ -1137,8 +1192,7 @@ object LocalCache {
                 it.idNote().startsWith(text, true)
         } + addressables.values.filter {
             (it.event as? LongTextNoteEvent)?.content?.contains(text, true) ?: false ||
-                (it.event as? LongTextNoteEvent)?.title()?.contains(text, true) ?: false ||
-                (it.event as? LongTextNoteEvent)?.summary()?.contains(text, true) ?: false ||
+                it.event?.matchTag1With(text) ?: false ||
                 it.idHex.startsWith(text, true)
         }
     }
@@ -1189,24 +1243,26 @@ object LocalCache {
                 }
             }
 
-            println("PRUNE: ${toBeRemoved.size} messages removed from ${it.value.toBestDisplayName()}. ${it.value.notes.size} kept")
+            if (toBeRemoved.size > 100 || it.value.notes.size > 100) {
+                println("PRUNE: ${toBeRemoved.size} messages removed from ${it.value.toBestDisplayName()}. ${it.value.notes.size} kept")
+            }
         }
     }
 
     fun pruneHiddenMessages(account: Account) {
         checkNotInMainThread()
 
-        val toBeRemoved = account.hiddenUsers.map {
-            (users[it]?.notes ?: emptySet())
+        val toBeRemoved = account.hiddenUsers.map { userHex ->
+            (
+                notes.values.filter {
+                    it.event?.pubKey() == userHex
+                } + addressables.values.filter {
+                    it.event?.pubKey() == userHex
+                }
+                ).toSet()
         }.flatten()
 
-        account.hiddenUsers.forEach {
-            users[it]?.clearNotes()
-        }
-
         toBeRemoved.forEach {
-            it.author?.removeNote(it)
-
             // Counts the replies
             it.replyTo?.forEach { masterNote ->
                 masterNote.removeReply(it)
@@ -1269,6 +1325,7 @@ object LocalCache {
                 is ChannelMessageEvent -> consume(event, relay)
                 is ChannelMetadataEvent -> consume(event)
                 is ChannelMuteUserEvent -> consume(event)
+                is ClassifiedsEvent -> consume(event)
                 is CommunityDefinitionEvent -> consume(event, relay)
                 is CommunityPostApprovalEvent -> {
                     event.containedPost()?.let {
@@ -1278,6 +1335,8 @@ object LocalCache {
                 }
                 is ContactListEvent -> consume(event)
                 is DeletionEvent -> consume(event)
+                is EmojiPackEvent -> consume(event)
+                is EmojiPackSelectionEvent -> consume(event)
 
                 is FileHeaderEvent -> consume(event, relay)
                 is FileStorageEvent -> consume(event, relay)
@@ -1296,6 +1355,7 @@ object LocalCache {
                 is LnZapPaymentResponseEvent -> consume(event)
                 is LongTextNoteEvent -> consume(event, relay)
                 is MetadataEvent -> consume(event)
+                is NNSEvent -> comsume(event)
                 is PrivateDmEvent -> consume(event, relay)
                 is PinListEvent -> consume(event)
                 is PeopleListEvent -> consume(event)

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

@@ -5,11 +5,13 @@ 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.firstFullCharOrEmoji
 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.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.actions.updated
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
@@ -19,7 +21,6 @@ import java.math.BigDecimal
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.util.Date
 import java.util.regex.Pattern
 
 val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
@@ -74,6 +75,10 @@ open class Note(val idHex: String) {
         return Nip19.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull())
     }
 
+    fun toNostrUri(): String {
+        return "nostr:${toNEvent()}"
+    }
+
     open fun idDisplayNote() = idNote().toShortenHex()
 
     fun channelHex(): HexKey? {
@@ -153,7 +158,8 @@ open class Note(val idHex: String) {
         liveSet?.boosts?.invalidateData()
     }
     fun removeReaction(note: Note) {
-        val reaction = note.event?.content() ?: "+"
+        val tags = note.event?.tags() ?: emptyList()
+        val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
 
         if (reaction in reactions.keys && reactions[reaction]?.contains(note) == true) {
             reactions[reaction]?.let {
@@ -210,31 +216,64 @@ open class Note(val idHex: String) {
     }
 
     @Synchronized
+    private fun innerAddZap(zapRequest: Note, zap: Note?): Boolean {
+        if (zapRequest !in zaps.keys) {
+            zaps = zaps + Pair(zapRequest, zap)
+            return true
+        } else if (zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            return true
+        }
+
+        return false
+    }
+
     fun addZap(zapRequest: Note, zap: Note?) {
         checkNotInMainThread()
         if (zapRequest !in zaps.keys) {
-            zaps = zaps + Pair(zapRequest, zap)
-            liveSet?.zaps?.invalidateData()
-        } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
-            zaps = zaps + Pair(zapRequest, zap)
-            liveSet?.zaps?.invalidateData()
+            val inserted = innerAddZap(zapRequest, zap)
+            if (inserted) {
+                liveSet?.zaps?.invalidateData()
+            }
+        } else if (zaps[zapRequest] == null) {
+            val inserted = innerAddZap(zapRequest, zap)
+            if (inserted) {
+                liveSet?.zaps?.invalidateData()
+            }
         }
     }
 
     @Synchronized
+    private fun innerAddZapPayment(zapPaymentRequest: Note, zapPayment: Note?): Boolean {
+        if (zapPaymentRequest !in zapPayments.keys) {
+            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
+            return true
+        } else if (zapPayments[zapPaymentRequest] == null) {
+            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
+            return true
+        }
+
+        return false
+    }
+
     fun addZapPayment(zapPaymentRequest: Note, zapPayment: Note?) {
         checkNotInMainThread()
         if (zapPaymentRequest !in zapPayments.keys) {
-            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
-            liveSet?.zaps?.invalidateData()
-        } else if (zapPaymentRequest in zapPayments.keys && zapPayments[zapPaymentRequest] == null) {
-            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
-            liveSet?.zaps?.invalidateData()
+            val inserted = innerAddZapPayment(zapPaymentRequest, zapPayment)
+            if (inserted) {
+                liveSet?.zaps?.invalidateData()
+            }
+        } else if (zapPayments[zapPaymentRequest] == null) {
+            val inserted = innerAddZapPayment(zapPaymentRequest, zapPayment)
+            if (inserted) {
+                liveSet?.zaps?.invalidateData()
+            }
         }
     }
 
     fun addReaction(note: Note) {
-        val reaction = note.event?.content() ?: "+"
+        val tags = note.event?.tags() ?: emptyList()
+        val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
 
         if (reaction !in reactions.keys) {
             reactions = reactions + Pair(reaction, setOf(note))
@@ -328,10 +367,14 @@ open class Note(val idHex: String) {
         }.toSet()
     }
 
-    fun isReactedBy(user: User): String? {
-        return reactions.filter {
-            it.value.any { it.author?.pubkeyHex == user.pubkeyHex }
-        }.keys.firstOrNull()
+    fun getReactionBy(user: User): String? {
+        return reactions.firstNotNullOfOrNull {
+            if (it.value.any { it.author?.pubkeyHex == user.pubkeyHex }) {
+                it.key
+            } else {
+                null
+            }
+        }
     }
 
     fun isBoostedBy(user: User): Boolean {
@@ -430,7 +473,7 @@ open class Note(val idHex: String) {
     }
 
     fun hasAnyReports(): Boolean {
-        val dayAgo = Date().time / 1000 - 24 * 60 * 60
+        val dayAgo = TimeUtils.oneDayAgo()
         return reports.isNotEmpty() ||
             (
                 author?.reports?.values?.any {
@@ -459,7 +502,7 @@ open class Note(val idHex: String) {
     }
 
     fun reactedBy(loggedIn: User, content: String): List<Note> {
-        return reactions[content]?.filter { it.author == loggedIn && it.event?.content() == content } ?: emptyList()
+        return reactions[content]?.filter { it.author == loggedIn } ?: emptyList()
     }
 
     fun reactedBy(loggedIn: User): List<String> {
@@ -467,8 +510,7 @@ open class Note(val idHex: String) {
     }
 
     fun hasBoostedInTheLast5Minutes(loggedIn: User): Boolean {
-        val currentTime = Date().time / 1000
-        return boosts.firstOrNull { it.author == loggedIn && (it.createdAt() ?: 0) > currentTime - (60 * 5) } != null // 5 minute protection
+        return boosts.firstOrNull { it.author == loggedIn && (it.createdAt() ?: 0) > TimeUtils.fiveMinutesAgo() } != null // 5 minute protection
     }
 
     fun boostedBy(loggedIn: User): List<Note> {
@@ -525,6 +567,22 @@ open class Note(val idHex: String) {
             liveSet = null
         }
     }
+
+    fun isHiddenFor(accountChoices: Account.LiveHiddenUsers): Boolean {
+        if (event == null) return false
+
+        val isBoostedNoteHidden = if (event is GenericRepostEvent || event is RepostEvent || event is CommunityPostApprovalEvent) {
+            replyTo?.lastOrNull()?.isHiddenFor(accountChoices) ?: false
+        } else {
+            false
+        }
+
+        val isSensitive = event?.isSensitive() ?: false
+        return isBoostedNoteHidden ||
+            accountChoices.hiddenUsers.contains(author?.pubkeyHex) ||
+            accountChoices.spammers.contains(author?.pubkeyHex) ||
+            (isSensitive && accountChoices.showSensitiveContent == false)
+    }
 }
 
 class NoteLiveSet(u: Note) {
@@ -554,7 +612,11 @@ class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     private val bundler = BundledUpdate(500, Dispatchers.IO)
 
     fun invalidateData() {
+        checkNotInMainThread()
+
         bundler.invalidate() {
+            checkNotInMainThread()
+
             if (hasActiveObservers()) {
                 postValue(NoteState(note))
             }

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

@@ -0,0 +1,11 @@
+package com.vitorpamplona.amethyst.model
+
+import androidx.compose.runtime.Stable
+
+@Stable
+class Settings(
+    var automaticallyShowImages: Boolean? = null,
+    var automaticallyStartPlayback: Boolean? = null,
+    var preferredLanguage: String? = null,
+    var automaticallyShowUrlPreview: Boolean? = null
+)

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

@@ -0,0 +1,13 @@
+package com.vitorpamplona.amethyst.model
+
+object TimeUtils {
+    const val fiveMinutes = 60 * 5
+    const val oneHour = 60 * 60
+    const val oneDay = 24 * 60 * 60
+
+    fun now() = System.currentTimeMillis() / 1000
+    fun fiveMinutesAgo() = now() - fiveMinutes
+    fun oneHourAgo() = now() - oneHour
+    fun oneDayAgo() = now() - oneDay
+    fun eightHoursAgo() = now() - (oneHour * 8)
+}

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

@@ -32,9 +32,6 @@ class User(val pubkeyHex: String) {
     var latestContactList: ContactListEvent? = null
     var latestBookmarkList: BookmarkListEvent? = null
 
-    var notes = setOf<Note>()
-        private set
-
     var reports = mapOf<User, Set<Note>>()
         private set
 
@@ -49,13 +46,13 @@ class User(val pubkeyHex: String) {
     var privateChatrooms = mapOf<User, Chatroom>()
         private set
 
-    var acceptedBadges: AddressableNote? = null
-
     fun pubkey() = Hex.decode(pubkeyHex)
     fun pubkeyNpub() = pubkey().toNpub()
 
     fun pubkeyDisplayHex() = pubkeyNpub().toShortenHex()
 
+    fun toNostrUri() = "nostr:${pubkeyNpub()}"
+
     override fun toString(): String = pubkeyHex
 
     fun toBestDisplayName(): String {
@@ -107,21 +104,6 @@ class User(val pubkeyHex: String) {
         liveSet?.relays?.invalidateData()
     }
 
-    fun addNote(note: Note) {
-        if (note !in notes) {
-            notes = notes + note
-            // No need for Listener yet
-        }
-    }
-
-    fun removeNote(note: Note) {
-        notes = notes - note
-    }
-
-    fun clearNotes() {
-        notes = setOf<Note>()
-    }
-
     fun addReport(note: Note) {
         val author = note.author ?: return
 
@@ -145,13 +127,6 @@ class User(val pubkeyHex: String) {
         }
     }
 
-    fun updateAcceptedBadges(note: AddressableNote) {
-        if (acceptedBadges?.idHex != note.idHex) {
-            acceptedBadges = note
-            liveSet?.badges?.invalidateData()
-        }
-    }
-
     fun addZap(zapRequest: Note, zap: Note?) {
         if (zapRequest !in zaps.keys) {
             zaps = zaps + Pair(zapRequest, zap)
@@ -302,6 +277,10 @@ class User(val pubkeyHex: String) {
         return latestContactList?.verifiedFollowTagSet ?: emptySet()
     }
 
+    fun cachedFollowingCommunitiesSet(): Set<HexKey> {
+        return latestContactList?.verifiedFollowCommunitySet ?: emptySet()
+    }
+
     fun cachedFollowCount(): Int? {
         return latestContactList?.verifiedFollowKeySet?.size
     }
@@ -352,7 +331,6 @@ class UserLiveSet(u: User) {
     val relayInfo: UserLiveData = UserLiveData(u)
     val metadata: UserLiveData = UserLiveData(u)
     val zaps: UserLiveData = UserLiveData(u)
-    val badges: UserLiveData = UserLiveData(u)
     val bookmarks: UserLiveData = UserLiveData(u)
 
     fun isInUse(): Boolean {
@@ -364,7 +342,6 @@ class UserLiveSet(u: User) {
             relayInfo.hasObservers() ||
             metadata.hasObservers() ||
             zaps.hasObservers() ||
-            badges.hasObservers() ||
             bookmarks.hasObservers()
     }
 }
@@ -462,7 +439,11 @@ class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
     private val bundler = BundledUpdate(500, Dispatchers.IO)
 
     fun invalidateData() {
+        checkNotInMainThread()
+
         bundler.invalidate() {
+            checkNotInMainThread()
+
             if (hasActiveObservers()) {
                 postValue(UserState(user))
             }

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

@@ -30,9 +30,11 @@ data class RichTextViewerState(
     val imagesForPager: ImmutableMap<String, ZoomableUrlContent>,
     val imageList: ImmutableList<ZoomableUrlContent>,
     val customEmoji: ImmutableMap<String, String>,
-    val paragraphs: ImmutableList<ImmutableList<Segment>>
+    val paragraphs: ImmutableList<ParagraphState>
 )
 
+data class ParagraphState(val words: ImmutableList<Segment>, val isRTL: Boolean)
+
 object CachedRichTextParser {
     val richTextCache = LruCache<String, RichTextViewerState>(200)
 
@@ -108,13 +110,15 @@ class RichTextParser() {
         )
     }
 
-    private fun findTextSegments(content: String, images: Set<String>, urls: Set<String>, emojis: Map<String, String>, tags: ImmutableListOfLists<String>): ImmutableList<ImmutableList<Segment>> {
-        var paragraphSegments = persistentListOf<ImmutableList<Segment>>()
+    private fun findTextSegments(content: String, images: Set<String>, urls: Set<String>, emojis: Map<String, String>, tags: ImmutableListOfLists<String>): ImmutableList<ParagraphState> {
+        var paragraphSegments = persistentListOf<ParagraphState>()
 
         content.split('\n').forEach { paragraph ->
             var segments = persistentListOf<Segment>()
             var isDirty = false
 
+            val isRTL = isArabic(paragraph)
+
             val wordList = paragraph.split(' ')
             wordList.forEach { word ->
                 val wordSegment = wordIdentifier(word, images, urls, emojis, tags)
@@ -125,13 +129,9 @@ class RichTextParser() {
             }
 
             val newSegments = if (isDirty) {
-                if (isArabic(paragraph)) {
-                    segments.asReversed().toImmutableList()
-                } else {
-                    segments
-                }
+                ParagraphState(segments, isRTL)
             } else {
-                persistentListOf<Segment>(RegularTextSegment(paragraph))
+                ParagraphState(persistentListOf<Segment>(RegularTextSegment(paragraph)), isRTL)
             }
 
             paragraphSegments = paragraphSegments.add(newSegments)

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

@@ -16,15 +16,16 @@ class FileHeader(
     val size: Int,
     val dim: String?,
     val blurHash: String?,
-    val description: String? = null
+    val description: String? = null,
+    val sensitiveContent: Boolean = false
 ) {
     companion object {
-        suspend fun prepare(fileUrl: String, mimeType: String?, description: String?, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
+        suspend fun prepare(fileUrl: String, mimeType: String?, description: String?, sensitiveContent: Boolean, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
             try {
                 val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl)
 
                 if (imageData != null) {
-                    prepare(imageData, fileUrl, mimeType, description, onReady, onError)
+                    prepare(imageData, fileUrl, mimeType, description, sensitiveContent, onReady, onError)
                 } else {
                     onError()
                 }
@@ -39,6 +40,7 @@ class FileHeader(
             fileUrl: String,
             mimeType: String?,
             description: String?,
+            sensitiveContent: Boolean,
             onReady: (FileHeader) -> Unit,
             onError: () -> Unit
         ) {
@@ -79,7 +81,7 @@ class FileHeader(
                     Pair(null, null)
                 }
 
-                onReady(FileHeader(fileUrl, mimeType, hash, size, dim, blurHash, description))
+                onReady(FileHeader(fileUrl, mimeType, hash, size, dim, blurHash, description, sensitiveContent))
             } catch (e: Exception) {
                 Log.e("ImageDownload", "Couldn't convert image in to File Header: ${e.message}")
                 onError()

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

@@ -5,19 +5,29 @@ import okhttp3.OkHttpClient
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.time.Duration
+import kotlin.properties.Delegates
 
 object HttpClient {
-    private var proxy: Proxy? = null
+    var proxyChangeListeners = ArrayList<() -> Unit>()
+
+    // fires off every time value of the property changes
+    private var internalProxy: Proxy? by Delegates.observable(null) { _, oldValue, newValue ->
+        if (oldValue != newValue) {
+            proxyChangeListeners.forEach {
+                it()
+            }
+        }
+    }
 
     fun start(account: Account?) {
-        this.proxy = account?.proxy
+        this.internalProxy = account?.proxy
     }
 
     fun getHttpClient(): OkHttpClient {
-        val seconds = if (proxy != null) 20L else 10L
+        val seconds = if (internalProxy != null) 20L else 10L
         val duration = Duration.ofSeconds(seconds)
         return OkHttpClient.Builder()
-            .proxy(proxy)
+            .proxy(internalProxy)
             .readTimeout(duration)
             .connectTimeout(duration)
             .writeTimeout(duration)
@@ -25,7 +35,7 @@ object HttpClient {
     }
 
     fun getProxy(): Proxy? {
-        return proxy
+        return internalProxy
     }
 
     fun initProxy(useProxy: Boolean, hostname: String, port: Int): Proxy? {

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

@@ -51,9 +51,9 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         return TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(BadgeProfilesEvent.kind),
+                kinds = listOf(BadgeProfilesEvent.kind, EmojiPackSelectionEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
-                limit = 1
+                limit = 10
             )
         )
     }

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

@@ -44,17 +44,23 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         )
     )
 
-    fun createMyChannelsFilter() = TypedFilter(
-        types = COMMON_FEED_TYPES, // Metadata comes from any relay
-        filter = JsonFilter(
-            kinds = listOf(ChannelCreateEvent.kind),
-            ids = account.followingChannels.toList(),
-            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
-        )
-    )
+    fun createMyChannelsFilter(): TypedFilter {
+        val followingEvents = account.selectedChatsFollowList()
 
-    fun createLastChannelInfoFilter(): List<TypedFilter> {
-        return account.followingChannels.map {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES, // Metadata comes from any relay
+            filter = JsonFilter(
+                kinds = listOf(ChannelCreateEvent.kind),
+                ids = followingEvents.toList(),
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
+            )
+        )
+    }
+
+    fun createLastChannelInfoFilter(): List<TypedFilter>? {
+        val followingEvents = account.selectedChatsFollowList()
+
+        return followingEvents.map {
             TypedFilter(
                 types = COMMON_FEED_TYPES, // Metadata comes from any relay
                 filter = JsonFilter(
@@ -66,8 +72,10 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         }
     }
 
-    fun createLastMessageOfEachChannelFilter(): List<TypedFilter> {
-        return account.followingChannels.map {
+    fun createLastMessageOfEachChannelFilter(): List<TypedFilter>? {
+        val followingEvents = account.selectedChatsFollowList()
+
+        return followingEvents.map {
             TypedFilter(
                 types = setOf(FeedType.PUBLIC_CHATS),
                 filter = JsonFilter(

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.service
 
 import android.util.Log
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.relays.Client
@@ -12,7 +13,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import java.util.Date
 import java.util.UUID
 import kotlin.Error
 
@@ -57,7 +57,7 @@ abstract class NostrDataSource(val debugName: String) {
 
             if (type == Relay.Type.EOSE && channel != null) {
                 // updates a per subscripton since date
-                subscriptions[channel]?.updateEOSE(Date().time / 1000, relay.url)
+                subscriptions[channel]?.updateEOSE(TimeUtils.now(), relay.url)
             }
         }
 

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

@@ -17,13 +17,12 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
     lateinit var account: Account
 
     val latestEOSEs = EOSEAccount()
-    val dataSource = "Discovery"
 
     fun createLiveStreamFilter(): TypedFilter {
         val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
 
         val followKeys = follows?.map {
-            it.substring(0, 6)
+            it.substring(0, 8)
         }
 
         return TypedFilter(
@@ -32,7 +31,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                 authors = followKeys,
                 kinds = listOf(LiveActivitiesChatMessageEvent.kind, LiveActivitiesEvent.kind),
                 limit = 300,
-                since = latestEOSEs.users[account.userProfile()]?.followList?.get(dataSource)?.relayList
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
             )
         )
     }
@@ -41,7 +40,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
         val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
 
         val followKeys = follows?.map {
-            it.substring(0, 6)
+            it.substring(0, 8)
         }
 
         return TypedFilter(
@@ -50,7 +49,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                 authors = followKeys,
                 kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind, ChannelMessageEvent.kind),
                 limit = 300,
-                since = latestEOSEs.users[account.userProfile()]?.followList?.get(dataSource)?.relayList
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
             )
         )
     }
@@ -59,7 +58,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
         val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
 
         val followKeys = follows?.map {
-            it.substring(0, 6)
+            it.substring(0, 8)
         }
 
         return TypedFilter(
@@ -68,7 +67,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                 authors = followKeys,
                 kinds = listOf(CommunityDefinitionEvent.kind, CommunityPostApprovalEvent.kind),
                 limit = 300,
-                since = latestEOSEs.users[account.userProfile()]?.followList?.get(dataSource)?.relayList
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
             )
         )
     }
@@ -88,7 +87,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                     }.flatten()
                 ),
                 limit = 300,
-                since = latestEOSEs.users[account.userProfile()]?.followList?.get(dataSource)?.relayList
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
             )
         )
     }
@@ -108,7 +107,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                     }.flatten()
                 ),
                 limit = 300,
-                since = latestEOSEs.users[account.userProfile()]?.followList?.get(dataSource)?.relayList
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
             )
         )
     }
@@ -128,12 +127,14 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                     }.flatten()
                 ),
                 limit = 300,
-                since = latestEOSEs.users[account.userProfile()]?.followList?.get(dataSource)?.relayList
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
             )
         )
     }
 
-    val discoveryFeedChannel = requestNewChannel()
+    val discoveryFeedChannel = requestNewChannel() { time, relayUrl ->
+        latestEOSEs.addOrUpdate(account.userProfile(), account.defaultDiscoveryFollowList, relayUrl, time)
+    }
 
     override fun updateChannelFilters() {
         discoveryFeedChannel.typedFilters = listOfNotNull(

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

@@ -3,6 +3,8 @@ 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.ClassifiedsEvent
+import com.vitorpamplona.amethyst.service.model.CommunityPostApprovalEvent
 import com.vitorpamplona.amethyst.service.model.GenericRepostEvent
 import com.vitorpamplona.amethyst.service.model.HighlightEvent
 import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
@@ -66,6 +68,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                     TextNoteEvent.kind,
                     RepostEvent.kind,
                     GenericRepostEvent.kind,
+                    ClassifiedsEvent.kind,
                     LongTextNoteEvent.kind,
                     PollNoteEvent.kind,
                     HighlightEvent.kind,
@@ -89,7 +92,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
                 tags = mapOf(
                     "t" to hashToLoad.map {
                         listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
@@ -101,11 +104,37 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         )
     }
 
+    fun createFollowCommunitiesFilter(): TypedFilter? {
+        val communitiesToLoad = account.selectedCommunitiesFollowList(account.defaultHomeFollowList) ?: emptySet()
+
+        if (communitiesToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter = JsonFilter(
+                kinds = listOf(
+                    TextNoteEvent.kind,
+                    LongTextNoteEvent.kind,
+                    ClassifiedsEvent.kind,
+                    HighlightEvent.kind,
+                    AudioTrackEvent.kind,
+                    PinListEvent.kind,
+                    CommunityPostApprovalEvent.kind
+                ),
+                tags = mapOf(
+                    "a" to communitiesToLoad.toList()
+                ),
+                limit = 100,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList
+            )
+        )
+    }
+
     val followAccountChannel = requestNewChannel { time, relayUrl ->
         latestEOSEs.addOrUpdate(account.userProfile(), account.defaultHomeFollowList, relayUrl, time)
     }
 
     override fun updateChannelFilters() {
-        followAccountChannel.typedFilters = listOfNotNull(createFollowAccountsFilter(), createFollowTagsFilter()).ifEmpty { null }
+        followAccountChannel.typedFilters = listOfNotNull(createFollowAccountsFilter(), createFollowCommunitiesFilter(), createFollowTagsFilter()).ifEmpty { null }
     }
 }

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

@@ -71,7 +71,7 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
                     filter = JsonFilter(
                         kinds = listOf(aTag.kind),
                         tags = mapOf("d" to listOf(aTag.dTag)),
-                        authors = listOf(aTag.pubKeyHex.substring(0, 8))
+                        authors = listOf(aTag.pubKeyHex)
                     )
                 )
             }

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

@@ -33,7 +33,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                             PeopleListEvent.kind, BookmarkListEvent.kind
                         ),
                         tags = mapOf("a" to listOf(aTag.toTag())),
-                        since = it.lastReactionsDownloadTime
+                        since = it.lastReactionsDownloadTime,
+                        limit = 1000 // Max amount of "replies" to download on a specific event.
                     )
                 )
             }
@@ -49,14 +50,24 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
 
         return addressesToWatch.mapNotNull {
             it.address()?.let { aTag ->
-                TypedFilter(
-                    types = COMMON_FEED_TYPES,
-                    filter = JsonFilter(
-                        kinds = listOf(aTag.kind),
-                        tags = mapOf("d" to listOf(aTag.dTag)),
-                        authors = listOf(aTag.pubKeyHex.substring(0, 8))
+                if (aTag.kind < 25000 && aTag.dTag.isBlank()) {
+                    TypedFilter(
+                        types = COMMON_FEED_TYPES,
+                        filter = JsonFilter(
+                            kinds = listOf(aTag.kind),
+                            authors = listOf(aTag.pubKeyHex)
+                        )
                     )
-                )
+                } else {
+                    TypedFilter(
+                        types = COMMON_FEED_TYPES,
+                        filter = JsonFilter(
+                            kinds = listOf(aTag.kind),
+                            tags = mapOf("d" to listOf(aTag.dTag)),
+                            authors = listOf(aTag.pubKeyHex)
+                        )
+                    )
+                }
             }
         }
     }
@@ -87,7 +98,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         PinListEvent.kind
                     ),
                     tags = mapOf("e" to listOf(it.idHex)),
-                    since = it.lastReactionsDownloadTime
+                    since = it.lastReactionsDownloadTime,
+                    limit = 1000 // Max amount of "replies" to download on a specific event.
                 )
             )
         }

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.model.FileHeaderEvent
 import com.vitorpamplona.amethyst.service.model.FileStorageHeaderEvent
+import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -10,6 +11,8 @@ import com.vitorpamplona.amethyst.service.relays.TypedFilter
 object NostrVideoDataSource : NostrDataSource("VideoFeed") {
     lateinit var account: Account
 
+    val latestEOSEs = EOSEAccount()
+
     fun createContextualFilter(): TypedFilter? {
         val follows = account.selectedUsersFollowList(account.defaultStoriesFollowList)
 
@@ -22,7 +25,8 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
             filter = JsonFilter(
                 authors = followKeys,
                 kinds = listOf(FileHeaderEvent.kind, FileStorageHeaderEvent.kind),
-                limit = 200
+                limit = 200,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultStoriesFollowList)?.relayList
             )
         )
     }
@@ -41,12 +45,15 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
                         listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
                     }.flatten()
                 ),
-                limit = 100
+                limit = 100,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultStoriesFollowList)?.relayList
             )
         )
     }
 
-    val videoFeedChannel = requestNewChannel()
+    val videoFeedChannel = requestNewChannel() { time, relayUrl ->
+        latestEOSEs.addOrUpdate(account.userProfile(), account.defaultStoriesFollowList, relayUrl, time)
+    }
 
     override fun updateChannelFilters() {
         videoFeedChannel.typedFilters = listOfNotNull(createContextualFilter(), createFollowTagsFilter()).ifEmpty { null }

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

@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+
 fun String.isUTF16Char(pos: Int): Boolean {
     println("Test $pos ${Character.charCount(this.codePointAt(pos))}")
     return Character.charCount(this.codePointAt(pos)) == 2
@@ -25,6 +27,7 @@ fun String.firstFullCharOld(): String {
 
 fun String.firstFullChar(): String {
     var isInJoin = false
+    var hasHadSecondChance = false
     var start = 0
     var previousCharLength = 0
     var next: Int
@@ -46,8 +49,14 @@ fun String.firstFullChar(): String {
                 isInJoin = true
             } else {
                 // stops when two chars are not joined together
-                if ((previousCharLength > 0) && (!isInJoin) && Character.charCount(codePoint) == 1) {
-                    break
+                if (previousCharLength > 0 && !isInJoin) {
+                    if (Character.charCount(codePoint) == 1 || hasHadSecondChance) {
+                        break
+                    } else {
+                        hasHadSecondChance = true
+                    }
+                } else {
+                    hasHadSecondChance = false
                 }
 
                 isInJoin = false
@@ -77,3 +86,23 @@ fun String.firstFullChar(): String {
 
     return substring(start, start + previousCharLength)
 }
+
+fun String.firstFullCharOrEmoji(tags: ImmutableListOfLists<String>): String {
+    if (length <= 2) {
+        return firstFullChar()
+    }
+
+    if (this[0] == ':') {
+        // makes sure an emoji exists
+        val emojiParts = this.split(":", limit = 3)
+        if (emojiParts.size >= 2) {
+            val emojiName = emojiParts[1]
+            val emojiUrl = tags.lists.firstOrNull() { it.size > 1 && it[1] == emojiName }?.getOrNull(2)
+            if (emojiUrl != null) {
+                return ":$emojiName:$emojiUrl"
+            }
+        }
+    }
+
+    return firstFullChar()
+}

app/src/main/java/com/vitorpamplona/amethyst/service/connectivitystatus/ConnectivityStatus.kt

@@ -0,0 +1,22 @@
+package com.vitorpamplona.amethyst.service.connectivitystatus
+
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+
+object ConnectivityStatus {
+    private val onMobileData = mutableStateOf(false)
+    val isOnMobileData: MutableState<Boolean> = onMobileData
+
+    private val onWifi = mutableStateOf(false)
+    val isOnWifi: MutableState<Boolean> = onWifi
+
+    fun updateConnectivityStatus(isOnMobileData: Boolean, isOnWifi: Boolean) {
+        if (onMobileData.value != isOnMobileData) {
+            onMobileData.value = isOnMobileData
+        }
+
+        if (onWifi.value != isOnWifi) {
+            onWifi.value = isOnWifi
+        }
+    }
+}

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

@@ -176,7 +176,7 @@ class LightningAddressResolver() {
                                 null
                             }
 
-                            lnInvoice?.get("pr")?.asText()?.let { pr ->
+                            lnInvoice?.get("pr")?.asText()?.ifBlank { null }?.let { pr ->
                                 // Forces LN Invoice amount to be the requested amount.
                                 val invoiceAmount = LnInvoiceUtil.getAmountInSats(pr)
                                 if (invoiceAmount.multiply(BigDecimal(1000)).toLong() == BigDecimal(milliSats).toLong()) {

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

@@ -103,7 +103,7 @@ object LnInvoiceUtil {
         try {
             decodeUnlimitedLength(invoice) // checksum must match
         } catch (e: AddressFormatException) {
-            throw IllegalArgumentException("Cannot decode invoice", e)
+            throw IllegalArgumentException("Cannot decode invoice: $invoice", e)
         }
 
         val matcher = invoicePattern.matcher(invoice)

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class AudioTrackEvent(
@@ -42,7 +42,7 @@ class AudioTrackEvent(
             cover: String? = null,
             subject: String? = null,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): AudioTrackEvent {
             val tags = listOfNotNull(
                 listOf(MEDIA, media),

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

@@ -25,5 +25,6 @@ class BadgeProfilesEvent(
 
     companion object {
         const val kind = 30008
+        const val standardDTAg = "profile_badges"
     }
 }

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class BookmarkListEvent(
@@ -30,7 +30,7 @@ class BookmarkListEvent(
             privAddresses: List<ATag>? = null,
 
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): BookmarkListEvent {
             val pubKey = Utils.pubkeyCreate(privateKey)
             val content = createPrivateTags(privEvents, privUsers, privAddresses, privateKey, pubKey)

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

@@ -3,9 +3,9 @@ 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.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class ChannelCreateEvent(
@@ -26,7 +26,7 @@ class ChannelCreateEvent(
     companion object {
         const val kind = 40
 
-        fun create(channelInfo: ChannelData?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelCreateEvent {
+        fun create(channelInfo: ChannelData?, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ChannelCreateEvent {
             val content = try {
                 if (channelInfo != null) {
                     gson.toJson(channelInfo)

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class ChannelHideMessageEvent(
@@ -26,7 +26,7 @@ class ChannelHideMessageEvent(
     companion object {
         const val kind = 43
 
-        fun create(reason: String, messagesToHide: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelHideMessageEvent {
+        fun create(reason: String, messagesToHide: List<String>?, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ChannelHideMessageEvent {
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags =
                 messagesToHide?.map {

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class ChannelMessageEvent(
@@ -34,7 +34,7 @@ class ChannelMessageEvent(
             mentions: List<String>? = null,
             zapReceiver: String?,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000,
+            createdAt: Long = TimeUtils.now(),
             markAsSensitive: Boolean,
             zapRaiserAmount: Long?
         ): ChannelMessageEvent {

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

@@ -3,9 +3,9 @@ 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.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class ChannelMetadataEvent(
@@ -29,7 +29,7 @@ class ChannelMetadataEvent(
     companion object {
         const val kind = 41
 
-        fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannelIdHex: String, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMetadataEvent {
+        fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannelIdHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ChannelMetadataEvent {
             val content =
                 if (newChannelInfo != null) {
                     gson.toJson(newChannelInfo)

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class ChannelMuteUserEvent(
@@ -26,7 +26,7 @@ class ChannelMuteUserEvent(
     companion object {
         const val kind = 44
 
-        fun create(reason: String, usersToMute: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMuteUserEvent {
+        fun create(reason: String, usersToMute: List<String>?, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ChannelMuteUserEvent {
             val content = reason
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags =

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

@@ -0,0 +1,77 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+
+@Immutable
+class ClassifiedsEvent(
+    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 image() = tags.firstOrNull { it.size > 1 && it[0] == "image" }?.get(1)
+    fun summary() = tags.firstOrNull { it.size > 1 && it[0] == "summary" }?.get(1)
+    fun price() = tags.firstOrNull { it.size > 1 && it[0] == "price" }?.let {
+        Price(it[1], it.getOrNull(2), it.getOrNull(3))
+    }
+    fun location() = tags.firstOrNull { it.size > 1 && it[0] == "location" }?.get(1)
+
+    fun publishedAt() = try {
+        tags.firstOrNull { it.size > 1 && it[0] == "published_at" }?.get(1)?.toLongOrNull()
+    } catch (_: Exception) {
+        null
+    }
+
+    companion object {
+        const val kind = 30402
+
+        fun create(
+            dTag: String,
+            title: String?,
+            image: String?,
+            summary: String?,
+            price: Price?,
+            location: String?,
+            publishedAt: Long?,
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): ClassifiedsEvent {
+            val tags = mutableListOf<List<String>>()
+
+            tags.add(listOf("d", dTag))
+            title?.let { tags.add(listOf("title", it)) }
+            image?.let { tags.add(listOf("image", it)) }
+            summary?.let { tags.add(listOf("summary", it)) }
+            price?.let {
+                if (it.frequency != null && it.currency != null) {
+                    tags.add(listOf("price", it.amount, it.currency, it.frequency))
+                } else if (it.currency != null) {
+                    tags.add(listOf("price", it.amount, it.currency))
+                } else {
+                    tags.add(listOf("price", it.amount))
+                }
+            }
+            location?.let { tags.add(listOf("location", it)) }
+            publishedAt?.let { tags.add(listOf("publishedAt", it.toString())) }
+            title?.let { tags.add(listOf("title", it)) }
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, "")
+            val sig = Utils.sign(id, privateKey)
+            return ClassifiedsEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}
+
+data class Price(val amount: String, val currency: String?, val frequency: String?)

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class CommunityDefinitionEvent(
@@ -30,7 +30,7 @@ class CommunityDefinitionEvent(
 
         fun create(
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): CommunityDefinitionEvent {
             val tags = mutableListOf<List<String>>()
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()

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

@@ -3,10 +3,10 @@ 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.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.relays.Client
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class CommunityPostApprovalEvent(
@@ -22,7 +22,7 @@ class CommunityPostApprovalEvent(
             fromJson(it, Client.lenient)
         }
     } catch (e: Exception) {
-        Log.w("CommunityPostEvent", "Failed to Parse Contained Post $content", e)
+        Log.w("CommunityPostEvent", "Failed to Parse Community Approval Contained Post of $id with $content")
         null
     }
 
@@ -45,7 +45,7 @@ class CommunityPostApprovalEvent(
     companion object {
         const val kind = 4550
 
-        fun create(approvedPost: Event, community: CommunityDefinitionEvent, privateKey: ByteArray, createdAt: Long = Date().time / 1000): GenericRepostEvent {
+        fun create(approvedPost: Event, community: CommunityDefinitionEvent, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): GenericRepostEvent {
             val content = approvedPost.toJson()
 
             val communities = listOf("a", community.address().toTag())

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

@@ -5,10 +5,10 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 data class Contact(val pubKeyHex: String, val relayUri: String?)
@@ -39,6 +39,10 @@ class ContactListEvent(
         unverifiedFollowTagSet().map { it.lowercase() }.toSet()
     }
 
+    val verifiedFollowCommunitySet: Set<String> by lazy {
+        unverifiedFollowAddressSet().toSet()
+    }
+
     val verifiedFollowKeySetAndMe: Set<HexKey> by lazy {
         verifiedFollowKeySet + pubKey
     }
@@ -46,6 +50,8 @@ class ContactListEvent(
     fun unverifiedFollowKeySet() = tags.filter { it[0] == "p" }.mapNotNull { it.getOrNull(1) }
     fun unverifiedFollowTagSet() = tags.filter { it[0] == "t" }.mapNotNull { it.getOrNull(1) }
 
+    fun unverifiedFollowAddressSet() = tags.filter { it[0] == "a" }.mapNotNull { it.getOrNull(1) }
+
     fun follows() = tags.filter { it[0] == "p" }.mapNotNull {
         try {
             Contact(decodePublicKey(it[1]).toHexKey(), it.getOrNull(2))
@@ -73,14 +79,22 @@ class ContactListEvent(
     companion object {
         const val kind = 3
 
-        fun create(follows: List<Contact>, followTags: List<String>, relayUse: Map<String, ReadWrite>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ContactListEvent {
+        fun createFromScratch(
+            followUsers: List<Contact>,
+            followTags: List<String>,
+            followCommunities: List<ATag>,
+            followEvents: List<String>,
+            relayUse: Map<String, ReadWrite>?,
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): ContactListEvent {
             val content = if (relayUse != null) {
                 gson.toJson(relayUse)
             } else {
                 ""
             }
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            val tags = follows.map {
+
+            val tags = followUsers.map {
                 if (it.relayUri != null) {
                     listOf("p", it.pubKeyHex, it.relayUri)
                 } else {
@@ -88,8 +102,129 @@ class ContactListEvent(
                 }
             } + followTags.map {
                 listOf("t", it)
+            } + followEvents.map {
+                listOf("e", it)
+            } + followCommunities.map {
+                if (it.relay != null) {
+                    listOf("a", it.toTag(), it.relay)
+                } else {
+                    listOf("a", it.toTag())
+                }
             }
 
+            return create(
+                content = content,
+                tags = tags,
+                privateKey = privateKey,
+                createdAt = createdAt
+            )
+        }
+
+        fun followUser(earlierVersion: ContactListEvent, pubKeyHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            if (earlierVersion.isTaggedUser(pubKeyHex)) return earlierVersion
+
+            return create(
+                content = earlierVersion.content,
+                tags = earlierVersion.tags.plus(element = listOf("p", pubKeyHex)),
+                privateKey = privateKey,
+                createdAt = createdAt
+            )
+        }
+
+        fun unfollowUser(earlierVersion: ContactListEvent, pubKeyHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            if (!earlierVersion.isTaggedUser(pubKeyHex)) return earlierVersion
+
+            return create(
+                content = earlierVersion.content,
+                tags = earlierVersion.tags.filter { it.size > 1 && it[1] != pubKeyHex },
+                privateKey = privateKey,
+                createdAt = createdAt
+            )
+        }
+
+        fun followHashtag(earlierVersion: ContactListEvent, hashtag: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            if (earlierVersion.isTaggedHash(hashtag)) return earlierVersion
+
+            return create(
+                content = earlierVersion.content,
+                tags = earlierVersion.tags.plus(element = listOf("t", hashtag)),
+                privateKey = privateKey,
+                createdAt = createdAt
+            )
+        }
+
+        fun unfollowHashtag(earlierVersion: ContactListEvent, hashtag: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            if (!earlierVersion.isTaggedHash(hashtag)) return earlierVersion
+
+            return create(
+                content = earlierVersion.content,
+                tags = earlierVersion.tags.filter { it.size > 1 && it[1] != hashtag },
+                privateKey = privateKey,
+                createdAt = createdAt
+            )
+        }
+
+        fun followEvent(earlierVersion: ContactListEvent, idHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            if (earlierVersion.isTaggedEvent(idHex)) return earlierVersion
+
+            return create(
+                content = earlierVersion.content,
+                tags = earlierVersion.tags.plus(element = listOf("e", idHex)),
+                privateKey = privateKey,
+                createdAt = createdAt
+            )
+        }
+
+        fun unfollowEvent(earlierVersion: ContactListEvent, idHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            if (!earlierVersion.isTaggedEvent(idHex)) return earlierVersion
+
+            return create(
+                content = earlierVersion.content,
+                tags = earlierVersion.tags.filter { it.size > 1 && it[1] != idHex },
+                privateKey = privateKey,
+                createdAt = createdAt
+            )
+        }
+
+        fun followAddressableEvent(earlierVersion: ContactListEvent, aTag: ATag, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            if (earlierVersion.isTaggedAddressableNote(aTag.toTag())) return earlierVersion
+
+            return create(
+                content = earlierVersion.content,
+                tags = earlierVersion.tags.plus(element = listOfNotNull("a", aTag.toTag(), aTag.relay)),
+                privateKey = privateKey,
+                createdAt = createdAt
+            )
+        }
+
+        fun unfollowAddressableEvent(earlierVersion: ContactListEvent, aTag: ATag, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            if (!earlierVersion.isTaggedAddressableNote(aTag.toTag())) return earlierVersion
+
+            return create(
+                content = earlierVersion.content,
+                tags = earlierVersion.tags.filter { it.size > 1 && it[1] != aTag.toTag() },
+                privateKey = privateKey,
+                createdAt = createdAt
+            )
+        }
+
+        fun updateRelayList(earlierVersion: ContactListEvent, relayUse: Map<String, ReadWrite>?, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            val content = if (relayUse != null) {
+                gson.toJson(relayUse)
+            } else {
+                ""
+            }
+
+            return create(
+                content = content,
+                tags = earlierVersion.tags,
+                privateKey = privateKey,
+                createdAt = createdAt
+            )
+        }
+
+        fun create(content: String, tags: List<List<String>>, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = Utils.sign(id, privateKey)
             return ContactListEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class DeletionEvent(
@@ -20,7 +20,7 @@ class DeletionEvent(
     companion object {
         const val kind = 5
 
-        fun create(deleteEvents: List<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): DeletionEvent {
+        fun create(deleteEvents: List<String>, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): DeletionEvent {
             val content = ""
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = deleteEvents.map { listOf("e", it) }

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

@@ -0,0 +1,56 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+
+@Immutable
+class EmojiPackEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : GeneralListEvent(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    companion object {
+        const val kind = 30030
+
+        fun create(
+            name: String = "",
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): EmojiPackEvent {
+            val content = ""
+            val pubKey = Utils.pubkeyCreate(privateKey)
+
+            val tags = mutableListOf<List<String>>()
+            tags.add(listOf("d", name))
+
+            val id = generateId(pubKey.toHexKey(), createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return EmojiPackEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}
+
+@Immutable
+data class EmojiUrl(val code: String, val url: String) {
+    fun encode(): String {
+        return ":$code:$url"
+    }
+
+    companion object {
+        fun decode(encodedEmojiSetup: String): EmojiUrl? {
+            val emojiParts = encodedEmojiSetup.split(":", limit = 3)
+            return if (emojiParts.size > 2) {
+                EmojiUrl(emojiParts[1], emojiParts[2])
+            } else {
+                null
+            }
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+
+@Immutable
+class EmojiPackSelectionEvent(
+    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() = ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    companion object {
+        const val kind = 10030
+
+        fun create(
+            listOfEmojiPacks: List<ATag>?,
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): EmojiPackSelectionEvent {
+            val msg = ""
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf<List<String>>()
+
+            listOfEmojiPacks?.forEach {
+                tags.add(listOf("a", it.toTag()))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, msg)
+            val sig = Utils.sign(id, privateKey)
+            return EmojiPackSelectionEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+        }
+    }
+}

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

@@ -5,7 +5,9 @@ import androidx.compose.runtime.Immutable
 import com.google.gson.*
 import com.google.gson.annotations.SerializedName
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.nip19.Nip19
 import fr.acinq.secp256k1.Hex
 import fr.acinq.secp256k1.Secp256k1
 import nostr.postr.Utils
@@ -43,10 +45,12 @@ open class Event(
 
     fun hasAnyTaggedUser() = tags.any { it.size > 1 && it[0] == "p" }
 
-    fun taggedUsers() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
-    fun taggedEvents() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
+    override fun taggedUsers() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
+    override fun taggedEvents() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
 
-    fun taggedUrls() = tags.filter { it.size > 1 && it[0] == "r" }.map { it[1] }
+    override fun taggedUrls() = tags.filter { it.size > 1 && it[0] == "r" }.map { it[1] }
+
+    override fun taggedEmojis() = tags.filter { it.size > 2 && it[0] == "emoji" }.map { EmojiUrl(it[1], it[2]) }
 
     override fun isSensitive() = tags.any {
         (it.size > 0 && it[0].equals("content-warning", true)) ||
@@ -60,7 +64,7 @@ open class Event(
 
     override fun zapAddress() = tags.firstOrNull { it.size > 1 && it[0] == "zap" }?.get(1)
 
-    fun taggedAddresses() = tags.filter { it.size > 1 && it[0] == "a" }.mapNotNull {
+    override fun taggedAddresses() = tags.filter { it.size > 1 && it[0] == "a" }.mapNotNull {
         val aTagValue = it[1]
         val relay = it.getOrNull(2)
 
@@ -69,10 +73,16 @@ open class Event(
 
     override fun hashtags() = tags.filter { it.size > 1 && it[0] == "t" }.map { it[1] }
 
+    override fun matchTag1With(text: String) = tags.any { it.size > 1 && it[1].contains(text, true) }
+
     override fun isTaggedUser(idHex: String) = tags.any { it.size > 1 && it[0] == "p" && it[1] == idHex }
 
+    override fun isTaggedEvent(idHex: String) = tags.any { it.size > 1 && it[0] == "e" && it[1] == idHex }
+
     override fun isTaggedAddressableNote(idHex: String) = tags.any { it.size > 1 && it[0] == "a" && it[1] == idHex }
 
+    override fun isTaggedAddressableNotes(idHexes: Set<String>) = tags.any { it.size > 1 && it[0] == "a" && it[1] in idHexes }
+
     override fun isTaggedHash(hashtag: String) = tags.any { it.size > 1 && it[0] == "t" && it[1].equals(hashtag, true) }
     override fun isTaggedHashes(hashtags: Set<String>) = tags.any { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }
     override fun firstIsTaggedHashes(hashtags: Set<String>) = tags.firstOrNull { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }?.getOrNull(1)
@@ -123,6 +133,18 @@ open class Event(
         }
     }
 
+    open fun toNIP19(): String {
+        return if (this is AddressableEvent) {
+            ATag(kind, pubKey, dTag(), null).toNAddr()
+        } else {
+            Nip19.createNEvent(id, pubKey, kind, null)
+        }
+    }
+
+    fun toNostrUri(): String {
+        return "nostr:${toNIP19()}"
+    }
+
     /**
      * Checks if the ID is correct and then if the pubKey's secret key signed the event.
      */
@@ -262,10 +284,13 @@ open class Event(
             ChannelMessageEvent.kind -> ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
             ChannelMetadataEvent.kind -> ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
             ChannelMuteUserEvent.kind -> ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
+            ClassifiedsEvent.kind -> ClassifiedsEvent(id, pubKey, createdAt, tags, content, sig)
             CommunityDefinitionEvent.kind -> CommunityDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
             CommunityPostApprovalEvent.kind -> CommunityPostApprovalEvent(id, pubKey, createdAt, tags, content, sig)
             ContactListEvent.kind -> ContactListEvent(id, pubKey, createdAt, tags, content, sig)
             DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)
+            EmojiPackEvent.kind -> EmojiPackEvent(id, pubKey, createdAt, tags, content, sig)
+            EmojiPackSelectionEvent.kind -> EmojiPackSelectionEvent(id, pubKey, createdAt, tags, content, sig)
 
             FileHeaderEvent.kind -> FileHeaderEvent(id, pubKey, createdAt, tags, content, sig)
             FileStorageEvent.kind -> FileStorageEvent(id, pubKey, createdAt, tags, content, sig)
@@ -280,6 +305,7 @@ open class Event(
             LnZapRequestEvent.kind -> LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
             LongTextNoteEvent.kind -> LongTextNoteEvent(id, pubKey, createdAt, tags, content, sig)
             MetadataEvent.kind -> MetadataEvent(id, pubKey, createdAt, tags, content, sig)
+            NNSEvent.kind -> NNSEvent(id, pubKey, createdAt, tags, content, sig)
             PeopleListEvent.kind -> PeopleListEvent(id, pubKey, createdAt, tags, content, sig)
             PinListEvent.kind -> PinListEvent(id, pubKey, createdAt, tags, content, sig)
             PollNoteEvent.kind -> PollNoteEvent(id, pubKey, createdAt, tags, content, sig)
@@ -314,7 +340,7 @@ open class Event(
             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 {
+        fun create(privateKey: ByteArray, kind: Int, tags: List<List<String>> = emptyList(), content: String = "", createdAt: Long = TimeUtils.now()): Event {
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val id = Companion.generateId(pubKey, createdAt, kind, tags, content)
             val sig = Utils.sign(id, privateKey).toHexKey()

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

@@ -27,7 +27,11 @@ interface EventInterface {
     fun hasValidSignature(): Boolean
 
     fun isTaggedUser(idHex: String): Boolean
+
+    fun isTaggedEvent(idHex: String): Boolean
+
     fun isTaggedAddressableNote(idHex: String): Boolean
+    fun isTaggedAddressableNotes(idHexes: Set<String>): Boolean
 
     fun isTaggedHash(hashtag: String): Boolean
     fun isTaggedHashes(hashtags: Set<String>): Boolean
@@ -45,4 +49,12 @@ interface EventInterface {
     fun zapAddress(): String?
     fun isSensitive(): Boolean
     fun zapraiserAmount(): Long?
+
+    fun taggedAddresses(): List<ATag>
+    fun taggedUsers(): List<HexKey>
+    fun taggedEvents(): List<HexKey>
+    fun taggedUrls(): List<String>
+
+    fun taggedEmojis(): List<EmojiUrl>
+    fun matchTag1With(text: String): Boolean
 }

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class FileHeaderEvent(
@@ -50,8 +50,9 @@ class FileHeaderEvent(
             magnetURI: String? = null,
             torrentInfoHash: String? = null,
             encryptionKey: AESGCM? = null,
+            sensitiveContent: Boolean? = null,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): FileHeaderEvent {
             val tags = listOfNotNull(
                 listOf(URL, url),
@@ -62,7 +63,14 @@ class FileHeaderEvent(
                 blurhash?.let { listOf(BLUR_HASH, it) },
                 magnetURI?.let { listOf(MAGNET_URI, it) },
                 torrentInfoHash?.let { listOf(TORRENT_INFOHASH, it) },
-                encryptionKey?.let { listOf(ENCRYPTION_KEY, it.key, it.nonce) }
+                encryptionKey?.let { listOf(ENCRYPTION_KEY, it.key, it.nonce) },
+                sensitiveContent?.let {
+                    if (it) {
+                        listOf("content-warning", "")
+                    } else {
+                        null
+                    }
+                }
             )
 
             val content = description ?: ""

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

@@ -3,10 +3,10 @@ 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.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
 import java.util.Base64
-import java.util.Date
 
 @Immutable
 class FileStorageEvent(
@@ -44,7 +44,7 @@ class FileStorageEvent(
             mimeType: String,
             data: ByteArray,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): FileStorageEvent {
             val tags = listOfNotNull(
                 listOf(TYPE, mimeType)

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class FileStorageHeaderEvent(
@@ -50,8 +50,9 @@ class FileStorageHeaderEvent(
             magnetURI: String? = null,
             torrentInfoHash: String? = null,
             encryptionKey: AESGCM? = null,
+            sensitiveContent: Boolean? = null,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): FileStorageHeaderEvent {
             val tags = listOfNotNull(
                 listOf("e", storageEvent.id),
@@ -62,7 +63,14 @@ class FileStorageHeaderEvent(
                 blurhash?.let { listOf(BLUR_HASH, it) },
                 magnetURI?.let { listOf(MAGNET_URI, it) },
                 torrentInfoHash?.let { listOf(TORRENT_INFOHASH, it) },
-                encryptionKey?.let { listOf(ENCRYPTION_KEY, it.key, it.nonce) }
+                encryptionKey?.let { listOf(ENCRYPTION_KEY, it.key, it.nonce) },
+                sensitiveContent?.let {
+                    if (it) {
+                        listOf("content-warning", "")
+                    } else {
+                        null
+                    }
+                }
             )
 
             val content = description ?: ""

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

@@ -54,7 +54,13 @@ abstract class GeneralListEvent(
         return privateTagsCache
     }
 
+    fun privateTagsOrEmpty(privKey: ByteArray): List<List<String>> {
+        return privateTags(privKey) ?: emptyList()
+    }
+
     fun privateTaggedUsers(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "p" }?.map { it[1] }
+
+    fun privateHashtags(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "t" }?.map { it[1] }
     fun privateTaggedEvents(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "e" }?.map { it[1] }
     fun privateTaggedAddresses(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "a" }?.mapNotNull {
         val aTagValue = it.getOrNull(1)
@@ -90,5 +96,16 @@ abstract class GeneralListEvent(
                 pubKey
             )
         }
+
+        fun encryptTags(
+            privateTags: List<List<String>>? = null,
+            privateKey: ByteArray
+        ): String {
+            return Utils.encrypt(
+                msg = gson.toJson(privateTags),
+                privateKey = privateKey,
+                pubKey = Utils.pubkeyCreate(privateKey)
+            )
+        }
     }
 }

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

@@ -2,10 +2,10 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.relays.Client
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class GenericRepostEvent(
@@ -29,7 +29,7 @@ class GenericRepostEvent(
     companion object {
         const val kind = 16
 
-        fun create(boostedPost: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): GenericRepostEvent {
+        fun create(boostedPost: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): GenericRepostEvent {
             val content = boostedPost.toJson()
 
             val replyToPost = listOf("e", boostedPost.id())

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

@@ -2,10 +2,10 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
 import java.security.MessageDigest
-import java.util.Date
 
 @Immutable
 class HTTPAuthorizationEvent(
@@ -25,7 +25,7 @@ class HTTPAuthorizationEvent(
             method: String,
             body: String? = null,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): HTTPAuthorizationEvent {
             val sha256 = MessageDigest.getInstance("SHA-256")
 

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class HighlightEvent(
@@ -20,13 +20,15 @@ class HighlightEvent(
     fun author() = taggedUsers().firstOrNull()
     fun quote() = content
 
+    fun inPost() = taggedAddresses().firstOrNull()
+
     companion object {
         const val kind = 9802
 
         fun create(
             msg: String,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): PollNoteEvent {
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class LiveActivitiesChatMessageEvent(
@@ -49,7 +49,7 @@ class LiveActivitiesChatMessageEvent(
             mentions: List<String>? = null,
             zapReceiver: String?,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000,
+            createdAt: Long = TimeUtils.now(),
             markAsSensitive: Boolean,
             zapRaiserAmount: Long?
         ): LiveActivitiesChatMessageEvent {

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class LiveActivitiesEvent(
@@ -32,7 +32,7 @@ class LiveActivitiesEvent(
     fun participants() = tags.filter { it.size > 1 && it[0] == "p" }.map { Participant(it[1], it.getOrNull(3)) }
 
     fun checkStatus(eventStatus: String?): String? {
-        return if (eventStatus == STATUS_LIVE && createdAt < Date().time / 1000 - (60 * 60 * 8)) { // 2 hours {
+        return if (eventStatus == STATUS_LIVE && createdAt < TimeUtils.eightHoursAgo()) {
             STATUS_ENDED
         } else {
             eventStatus
@@ -48,7 +48,7 @@ class LiveActivitiesEvent(
 
         fun create(
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): LiveActivitiesEvent {
             val tags = mutableListOf<List<String>>()
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()

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

@@ -14,8 +14,6 @@ interface LnZapEventInterface : EventInterface {
 
     fun zappedRequestAuthor(): String?
 
-    fun taggedAddresses(): List<ATag>
-
     fun amount(): BigDecimal?
 
     fun containedPost(): Event?

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

@@ -7,11 +7,11 @@ import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.JsonParseException
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
 import java.lang.reflect.Type
-import java.util.Date
 
 @Immutable
 class LnZapPaymentRequestEvent(
@@ -57,7 +57,7 @@ class LnZapPaymentRequestEvent(
             lnInvoice: String,
             walletServicePubkey: String,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): LnZapPaymentRequestEvent {
             val pubKey = Utils.pubkeyCreate(privateKey)
             val serializedRequest = gson.toJson(PayInvoiceMethod.create(lnInvoice))

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

@@ -64,7 +64,7 @@ class LnZapRequestEvent(
             pollOption: Int?,
             message: String,
             zapType: LnZapEvent.ZapType,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): LnZapRequestEvent {
             var content = message
             var privkey = privateKey
@@ -104,7 +104,7 @@ class LnZapRequestEvent(
             privateKey: ByteArray,
             message: String,
             zapType: LnZapEvent.ZapType,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): LnZapRequestEvent {
             var content = message
             var privkey = privateKey

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class LongTextNoteEvent(
@@ -32,7 +32,7 @@ class LongTextNoteEvent(
     companion object {
         const val kind = 30023
 
-        fun create(msg: String, replyTos: List<String>?, mentions: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LongTextNoteEvent {
+        fun create(msg: String, replyTos: List<String>?, mentions: List<String>?, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): LongTextNoteEvent {
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
             replyTos?.forEach {

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

@@ -7,11 +7,11 @@ 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.TimeUtils
 import com.vitorpamplona.amethyst.model.UserMetadata
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
 import java.io.ByteArrayInputStream
-import java.util.Date
 
 @Stable
 abstract class IdentityClaim(
@@ -147,8 +147,8 @@ class MetadataEvent(
             UserMetadata::class.java
         )
     } catch (e: Exception) {
-        e.printStackTrace()
-        Log.w("MT", "Content Parse Error ${e.localizedMessage} $content")
+        // e.printStackTrace()
+        Log.w("MT", "Content Parse Error: ${e.localizedMessage} $content")
         null
     }
 
@@ -171,7 +171,7 @@ class MetadataEvent(
                 .readerFor(UserMetadata::class.java)
         }
 
-        fun create(contactMetaData: String, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): MetadataEvent {
+        fun create(contactMetaData: String, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): MetadataEvent {
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
 

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

@@ -4,10 +4,10 @@ import android.util.Log
 import androidx.compose.runtime.Immutable
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class MuteListEvent(
@@ -71,7 +71,7 @@ class MuteListEvent(
             privAddresses: List<ATag>? = null,
 
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): MuteListEvent {
             val pubKey = Utils.pubkeyCreate(privateKey)
 

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

@@ -0,0 +1,40 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+
+@Immutable
+class NNSEvent(
+    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 ip4() = tags.firstOrNull { it.size > 1 && it[0] == "ip4" }?.get(1)
+    fun ip6() = tags.firstOrNull { it.size > 1 && it[0] == "ip6" }?.get(1)
+    fun version() = tags.firstOrNull { it.size > 1 && it[0] == "version" }?.get(1)
+
+    companion object {
+        const val kind = 30053
+
+        fun create(
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): NNSEvent {
+            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 NNSEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}

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

@@ -2,9 +2,12 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
+import kotlinx.collections.immutable.ImmutableSet
+import kotlinx.collections.immutable.persistentSetOf
+import kotlinx.collections.immutable.toImmutableSet
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class PeopleListEvent(
@@ -15,42 +18,133 @@ class PeopleListEvent(
     content: String,
     sig: HexKey
 ) : GeneralListEvent(id, pubKey, createdAt, kind, tags, content, sig) {
+    var publicAndPrivateUserCache: ImmutableSet<HexKey>? = null
+
+    fun publicAndPrivateUsers(privateKey: ByteArray?): ImmutableSet<HexKey> {
+        publicAndPrivateUserCache?.let {
+            return it
+        }
+
+        val privateUserList = privateKey?.let {
+            privateTagsOrEmpty(privKey = it).filter { it.size > 1 && it[0] == "p" }.map { it[1] }.toSet()
+        } ?: emptySet()
+        val publicUserList = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }.toSet()
+
+        publicAndPrivateUserCache = (privateUserList + publicUserList).toImmutableSet()
+
+        return publicAndPrivateUserCache ?: persistentSetOf()
+    }
+
+    fun isTaggedUser(idHex: String, isPrivate: Boolean, privateKey: ByteArray): Boolean {
+        return if (isPrivate) {
+            privateTagsOrEmpty(privKey = privateKey).any { it.size > 1 && it[0] == "p" && it[1] == idHex }
+        } else {
+            isTaggedUser(idHex)
+        }
+    }
+
     companion object {
         const val kind = 30000
+        const val blockList = "mute"
 
-        fun create(
-            name: String = "",
-
-            events: List<String>? = null,
-            users: List<String>? = null,
-            addresses: List<ATag>? = null,
-
-            privEvents: List<String>? = null,
-            privUsers: List<String>? = null,
-            privAddresses: List<ATag>? = null,
-
-            privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
-        ): PeopleListEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey)
-            val content = createPrivateTags(privEvents, privUsers, privAddresses, privateKey, pubKey)
-
-            val tags = mutableListOf<List<String>>()
-            tags.add(listOf("d", name))
-
-            events?.forEach {
-                tags.add(listOf("e", it))
-            }
-            users?.forEach {
-                tags.add(listOf("p", it))
-            }
-            addresses?.forEach {
-                tags.add(listOf("a", it.toTag()))
+        fun createListWithUser(name: String, pubKeyHex: String, isPrivate: Boolean, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): PeopleListEvent {
+            return if (isPrivate) {
+                create(
+                    content = encryptTags(listOf(listOf("p", pubKeyHex)), privateKey),
+                    tags = listOf(listOf("d", name)),
+                    privateKey = privateKey,
+                    createdAt = createdAt
+                )
+            } else {
+                create(
+                    content = "",
+                    tags = listOf(listOf("d", name), listOf("p", pubKeyHex)),
+                    privateKey = privateKey,
+                    createdAt = createdAt
+                )
             }
+        }
 
-            val id = generateId(pubKey.toHexKey(), createdAt, kind, tags, content)
+        fun addUsers(earlierVersion: PeopleListEvent, listPubKeyHex: List<String>, isPrivate: Boolean, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): PeopleListEvent {
+            return if (isPrivate) {
+                create(
+                    content = encryptTags(
+                        privateTags = earlierVersion.privateTagsOrEmpty(privKey = privateKey).plus(
+                            listPubKeyHex.map {
+                                listOf("p", it)
+                            }
+                        ),
+                        privateKey = privateKey
+                    ),
+                    tags = earlierVersion.tags,
+                    privateKey = privateKey,
+                    createdAt = createdAt
+                )
+            } else {
+                create(
+                    content = earlierVersion.content,
+                    tags = earlierVersion.tags.plus(
+                        listPubKeyHex.map {
+                            listOf("p", it)
+                        }
+                    ),
+                    privateKey = privateKey,
+                    createdAt = createdAt
+                )
+            }
+        }
+
+        fun addUser(earlierVersion: PeopleListEvent, pubKeyHex: String, isPrivate: Boolean, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): PeopleListEvent {
+            if (earlierVersion.isTaggedUser(pubKeyHex, isPrivate, privateKey)) return earlierVersion
+
+            return if (isPrivate) {
+                create(
+                    content = encryptTags(
+                        privateTags = earlierVersion.privateTagsOrEmpty(privKey = privateKey).plus(element = listOf("p", pubKeyHex)),
+                        privateKey = privateKey
+                    ),
+                    tags = earlierVersion.tags,
+                    privateKey = privateKey,
+                    createdAt = createdAt
+                )
+            } else {
+                create(
+                    content = earlierVersion.content,
+                    tags = earlierVersion.tags.plus(element = listOf("p", pubKeyHex)),
+                    privateKey = privateKey,
+                    createdAt = createdAt
+                )
+            }
+        }
+
+        fun removeUser(earlierVersion: PeopleListEvent, pubKeyHex: String, isPrivate: Boolean, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): PeopleListEvent {
+            if (!earlierVersion.isTaggedUser(pubKeyHex, isPrivate, privateKey)) return earlierVersion
+
+            return if (isPrivate) {
+                create(
+                    content = encryptTags(
+                        privateTags = earlierVersion.privateTagsOrEmpty(privKey = privateKey).filter { it.size > 1 && it[1] != pubKeyHex },
+                        privateKey = privateKey
+                    ),
+                    tags = earlierVersion.tags.filter { it.size > 1 && it[1] != pubKeyHex },
+                    privateKey = privateKey,
+                    createdAt = createdAt
+                )
+            } else {
+                create(
+                    content = earlierVersion.content,
+                    tags = earlierVersion.tags.filter { it.size > 1 && it[1] != pubKeyHex },
+                    privateKey = privateKey,
+                    createdAt = createdAt
+                )
+            }
+        }
+
+        fun create(content: String, tags: List<List<String>>, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): PeopleListEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = Utils.sign(id, privateKey)
-            return PeopleListEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
+            return PeopleListEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
     }
 }

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class PinListEvent(
@@ -27,7 +27,7 @@ class PinListEvent(
         fun create(
             pins: List<String>,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): PinListEvent {
             val tags = mutableListOf<List<String>>()
             pins.forEach {

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 const val POLL_OPTION = "poll_option"
 const val VALUE_MAXIMUM = "value_maximum"
@@ -45,7 +45,7 @@ class PollNoteEvent(
             mentions: List<String>?,
             addresses: List<ATag>?,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000,
+            createdAt: Long = TimeUtils.now(),
             pollOptions: Map<Int, String>,
             valueMaximum: Int?,
             valueMinimum: Int?,

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

@@ -3,12 +3,12 @@ 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.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.HexValidator
 import fr.acinq.secp256k1.Hex
 import nostr.postr.Utils
 import nostr.postr.toHex
-import java.util.Date
 
 @Immutable
 class PrivateDmEvent(
@@ -83,7 +83,7 @@ class PrivateDmEvent(
             mentions: List<String>? = null,
             zapReceiver: String?,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000,
+            createdAt: Long = TimeUtils.now(),
             publishedRecipientPubKey: ByteArray? = null,
             advertiseNip18: Boolean = true,
             markAsSensitive: Boolean,

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class ReactionEvent(
@@ -22,15 +22,15 @@ class ReactionEvent(
     companion object {
         const val kind = 7
 
-        fun createWarning(originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
+        fun createWarning(originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ReactionEvent {
             return create("\u26A0\uFE0F", originalNote, privateKey, createdAt)
         }
 
-        fun createLike(originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
+        fun createLike(originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ReactionEvent {
             return create("+", originalNote, privateKey, createdAt)
         }
 
-        fun create(content: String, originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
+        fun create(content: String, originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ReactionEvent {
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
 
             var tags = listOf(listOf("e", originalNote.id()), listOf("p", originalNote.pubKey()))
@@ -42,5 +42,24 @@ class ReactionEvent(
             val sig = Utils.sign(id, privateKey)
             return ReactionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
+
+        fun create(emojiUrl: EmojiUrl, originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ReactionEvent {
+            val content = ":${emojiUrl.code}:"
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+
+            var tags = listOf(
+                listOf("e", originalNote.id()),
+                listOf("p", originalNote.pubKey()),
+                listOf("emoji", emojiUrl.code, emojiUrl.url)
+            )
+
+            if (originalNote is AddressableEvent) {
+                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ReactionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
     }
 }

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

@@ -2,10 +2,10 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
 import java.net.URI
-import java.util.Date
 
 @Immutable
 class RecommendRelayEvent(
@@ -27,7 +27,7 @@ class RecommendRelayEvent(
     companion object {
         const val kind = 2
 
-        fun create(relay: URI, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RecommendRelayEvent {
+        fun create(relay: URI, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): RecommendRelayEvent {
             val content = relay.toString()
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = listOf<List<String>>()

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class RelayAuthEvent(
@@ -21,7 +21,7 @@ class RelayAuthEvent(
     companion object {
         const val kind = 22242
 
-        fun create(relay: String, challenge: String, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RelayAuthEvent {
+        fun create(relay: String, challenge: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): RelayAuthEvent {
             val content = ""
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = listOf(

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class RelaySetEvent(
@@ -28,7 +28,7 @@ class RelaySetEvent(
         fun create(
             relays: List<String>,
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): RelaySetEvent {
             val tags = mutableListOf<List<String>>()
             relays.forEach {

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 data class ReportedKey(val key: String, val reportType: ReportEvent.ReportType)
@@ -58,7 +58,7 @@ class ReportEvent(
             type: ReportType,
             privateKey: ByteArray,
             content: String = "",
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): ReportEvent {
             val reportPostTag = listOf("e", reportedPost.id(), type.name.lowercase())
             val reportAuthorTag = listOf("p", reportedPost.pubKey(), type.name.lowercase())
@@ -75,7 +75,7 @@ class ReportEvent(
             return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
 
-        fun create(reportedUser: String, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
+        fun create(reportedUser: String, type: ReportType, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ReportEvent {
             val content = ""
 
             val reportAuthorTag = listOf("p", reportedUser, type.name.lowercase())

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

@@ -2,10 +2,10 @@ package com.vitorpamplona.amethyst.service.model
 
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.relays.Client
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class RepostEvent(
@@ -29,7 +29,7 @@ class RepostEvent(
     companion object {
         const val kind = 6
 
-        fun create(boostedPost: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RepostEvent {
+        fun create(boostedPost: EventInterface, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): RepostEvent {
             val content = boostedPost.toJson()
 
             val replyToPost = listOf("e", boostedPost.id())

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

@@ -4,10 +4,10 @@ import androidx.compose.runtime.Immutable
 import com.linkedin.urls.detection.UrlDetector
 import com.linkedin.urls.detection.UrlDetectorOptions
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.findHashtags
 import nostr.postr.Utils
-import java.util.Date
 
 @Immutable
 class TextNoteEvent(
@@ -40,7 +40,7 @@ class TextNoteEvent(
             directMentions: Set<HexKey>,
 
             privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
+            createdAt: Long = TimeUtils.now()
         ): TextNoteEvent {
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()

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

@@ -73,10 +73,18 @@ object Client : RelayPool.Listener {
         RelayPool.sendFilterOnlyIfDisconnected()
     }
 
-    fun send(signedEvent: EventInterface, relay: String? = null, feedTypes: Set<FeedType>? = null, onDone: (() -> Unit)? = null) {
+    fun send(
+        signedEvent: EventInterface,
+        relay: String? = null,
+        feedTypes: Set<FeedType>? = null,
+        relayList: List<Relay>? = null,
+        onDone: (() -> Unit)? = null
+    ) {
         checkNotInMainThread()
 
-        if (relay == null) {
+        if (relayList != null) {
+            RelayPool.sendToSelectedRelays(relayList, signedEvent)
+        } else if (relay == null) {
             RelayPool.send(signedEvent)
         } else {
             val useConnectedRelayIfPresent = RelayPool.getRelays(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.model.TimeUtils
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.EventInterface
@@ -14,7 +15,6 @@ import okhttp3.WebSocket
 import okhttp3.WebSocketListener
 import java.net.Proxy
 import java.time.Duration
-import java.util.Date
 
 enum class FeedType {
     FOLLOWS, PUBLIC_CHATS, PRIVATE_DMS, GLOBAL, SEARCH, WALLET_CONNECT
@@ -179,7 +179,7 @@ class Relay(
                     socket = null
                     isReady = false
                     afterEOSE = false
-                    closingTime = Date().time / 1000
+                    closingTime = TimeUtils.now()
                     listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT, null) }
                 }
 
@@ -193,7 +193,7 @@ class Relay(
                     socket = null
                     isReady = false
                     afterEOSE = false
-                    closingTime = Date().time / 1000
+                    closingTime = TimeUtils.now()
 
                     Log.w("Relay", "Relay onFailure $url, ${response?.message} $response")
                     t.printStackTrace()
@@ -208,7 +208,7 @@ class Relay(
             errorCounter++
             isReady = false
             afterEOSE = false
-            closingTime = Date().time / 1000
+            closingTime = TimeUtils.now()
             Log.e("Relay", "Relay Invalid $url")
             e.printStackTrace()
         }
@@ -216,7 +216,7 @@ class Relay(
 
     fun disconnect() {
         // httpClient.dispatcher.executorService.shutdown()
-        closingTime = Date().time / 1000
+        closingTime = TimeUtils.now()
         socket?.close(1000, "Normal close")
         socket = null
         isReady = false
@@ -241,7 +241,7 @@ class Relay(
                 }
             } else {
                 // waits 60 seconds to reconnect after disconnected.
-                if (Date().time / 1000 > closingTime + 60) {
+                if (TimeUtils.now() > closingTime + 60) {
                     // sends all filters after connection is successful.
                     requestAndWatch()
                 }
@@ -254,7 +254,7 @@ class Relay(
 
         if (socket == null) {
             // waits 60 seconds to reconnect after disconnected.
-            if (Date().time / 1000 > closingTime + 60) {
+            if (TimeUtils.now() > closingTime + 60) {
                 // println("sendfilter Only if Disconnected ${url} ")
                 requestAndWatch()
             }

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

@@ -62,6 +62,12 @@ object RelayPool : Relay.Listener {
         relays.forEach { it.sendFilterOnlyIfDisconnected() }
     }
 
+    fun sendToSelectedRelays(list: List<Relay>, signedEvent: EventInterface) {
+        list.forEach { relay ->
+            relays.filter { it.url == relay.url }.forEach { it.send(signedEvent) }
+        }
+    }
+
     fun send(signedEvent: EventInterface) {
         relays.forEach { it.send(signedEvent) }
     }

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

@@ -6,30 +6,50 @@ import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.fragment.app.FragmentActivity
+import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
+import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.CommunityDefinitionEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.notifications.PushNotificationUtils
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.ui.components.DefaultMutedSetting
+import com.vitorpamplona.amethyst.ui.components.keepPlayingMutex
 import com.vitorpamplona.amethyst.ui.navigation.Route
+import com.vitorpamplona.amethyst.ui.navigation.debugState
+import com.vitorpamplona.amethyst.ui.navigation.getRouteWithArguments
 import com.vitorpamplona.amethyst.ui.note.Nip47
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
+import com.vitorpamplona.amethyst.ui.screen.ThemeViewModel
 import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
@@ -38,28 +58,46 @@ import kotlinx.coroutines.launch
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
 
-class MainActivity : FragmentActivity() {
+class MainActivity : AppCompatActivity() {
+    lateinit var navController: NavHostController
 
+    @RequiresApi(Build.VERSION_CODES.R)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         val uri = intent?.data?.toString()
-
         val startingPage = uriToRoute(uri)
 
         LocalPreferences.migrateSingleUserPrefs()
+        val language = LocalPreferences.getPreferredLanguage()
+        if (language.isNotBlank()) {
+            val appLocale: LocaleListCompat = LocaleListCompat.forLanguageTags(language)
+            AppCompatDelegate.setApplicationLocales(appLocale)
+        }
 
         setContent {
-            AmethystTheme {
+            navController = rememberNavController()
+            val themeViewModel: ThemeViewModel = viewModel()
+
+            themeViewModel.onChange(LocalPreferences.getTheme())
+            AmethystTheme(themeViewModel) {
                 // A surface container using the 'background' color from the theme
                 Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
                     val accountStateViewModel: AccountStateViewModel = viewModel {
                         AccountStateViewModel(this@MainActivity)
                     }
 
-                    AccountScreen(accountStateViewModel, startingPage)
+                    AccountScreen(accountStateViewModel, themeViewModel, navController)
                 }
             }
+
+            var actionableNextPage by remember { mutableStateOf(startingPage) }
+            actionableNextPage?.let {
+                LaunchedEffect(it) {
+                    navController.navigate(it)
+                }
+                actionableNextPage = null
+            }
         }
 
         val networkRequest = NetworkRequest.Builder()
@@ -77,6 +115,7 @@ class MainActivity : FragmentActivity() {
     @OptIn(DelicateCoroutinesApi::class)
     override fun onResume() {
         super.onResume()
+
         // starts muted every time
         DefaultMutedSetting.value = true
 
@@ -91,9 +130,18 @@ class MainActivity : FragmentActivity() {
     override fun onPause() {
         ServiceManager.pause()
 
+        if (BuildConfig.DEBUG) {
+            debugState(this)
+        }
+
         super.onPause()
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        keepPlayingMutex?.stop()
+    }
+
     /**
      * Release memory when the UI becomes hidden or when system resources become low.
      * @param level the memory-related event that was raised.
@@ -106,6 +154,39 @@ class MainActivity : FragmentActivity() {
         }
     }
 
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+
+        val uri = intent?.data?.toString()
+        val startingPage = uriToRoute(uri)
+
+        startingPage?.let { route ->
+            val currentRoute = getRouteWithArguments(navController)
+            if (!isSameRoute(currentRoute, route)) {
+                navController.navigate(route) {
+                    popUpTo(Route.Home.route)
+                    launchSingleTop = true
+                }
+            }
+        }
+    }
+
+    private fun isSameRoute(currentRoute: String?, newRoute: String): Boolean {
+        if (currentRoute == null) return false
+
+        if (currentRoute == newRoute) {
+            return true
+        }
+
+        if (newRoute.startsWith("Event/") && currentRoute.contains("/")) {
+            if (newRoute.split("/")[1] == currentRoute.split("/")[1]) {
+                return true
+            }
+        }
+
+        return false
+    }
+
     private val networkCallback = object : ConnectivityManager.NetworkCallback() {
         // network is available for use
         override fun onAvailable(network: Network) {
@@ -124,6 +205,18 @@ class MainActivity : FragmentActivity() {
             networkCapabilities: NetworkCapabilities
         ) {
             super.onCapabilitiesChanged(network, networkCapabilities)
+
+            GlobalScope.launch(Dispatchers.IO) {
+                val hasMobileData =
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
+                val hasWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+                Log.d("NETWORKCALLBACK", "onCapabilitiesChanged: hasMobileData $hasMobileData")
+                Log.d("NETWORKCALLBACK", "onCapabilitiesChanged: hasWifi $hasWifi")
+                ConnectivityStatus.updateConnectivityStatus(
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR),
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+                )
+            }
         }
 
         // lost network connection
@@ -169,7 +262,14 @@ fun uriToRoute(uri: String?): String? {
                     }
                 }
 
-                Nip19.Type.ADDRESS -> "Note/${nip19.hex}"
+                Nip19.Type.ADDRESS ->
+                    if (nip19.kind == CommunityDefinitionEvent.kind) {
+                        "Community/${nip19.hex}"
+                    } else if (nip19.kind == LiveActivitiesEvent.kind) {
+                        "Channel/${nip19.hex}"
+                    } else {
+                        "Event/${nip19.hex}"
+                    }
                 else -> null
             }
         } ?: try {

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

@@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 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
@@ -45,7 +44,6 @@ import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -62,9 +60,11 @@ 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.ClickableUserPicture
+import com.vitorpamplona.amethyst.ui.note.SearchIcon
 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.Size20Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size55dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
@@ -254,12 +254,7 @@ private fun SearchEditTextForJoin(
                 }
             },
             leadingIcon = {
-                Icon(
-                    painter = painterResource(R.drawable.ic_search),
-                    contentDescription = null,
-                    modifier = Modifier.size(20.dp),
-                    tint = Color.Unspecified
-                )
+                SearchIcon(modifier = Size20Modifier, Color.Unspecified)
             },
             modifier = Modifier
                 .weight(1f, true)

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

@@ -11,6 +11,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.*
 import com.vitorpamplona.amethyst.service.FileHeader
+import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -26,6 +27,7 @@ open class NewMediaModel : ViewModel() {
 
     var selectedServer by mutableStateOf<ServersAvailable?>(null)
     var description by mutableStateOf("")
+    var sensitiveContent by mutableStateOf(false)
 
     // Images and Videos
     var galleryUri by mutableStateOf<Uri?>(null)
@@ -55,7 +57,7 @@ open class NewMediaModel : ViewModel() {
         }
     }
 
-    fun upload(context: Context) {
+    fun upload(context: Context, relayList: List<Relay>? = null) {
         isUploadingImage = true
 
         val contentResolver = context.contentResolver
@@ -77,7 +79,7 @@ open class NewMediaModel : ViewModel() {
                         uploadingPercentage.value = 0.2f
                         uploadingDescription.value = "Loading"
                         contentResolver.openInputStream(fileUri)?.use {
-                            createNIP95Record(it.readBytes(), contentType, description)
+                            createNIP95Record(it.readBytes(), contentType, description, sensitiveContent, relayList = relayList)
                         }
                             ?: run {
                                 viewModelScope.launch {
@@ -97,7 +99,7 @@ open class NewMediaModel : ViewModel() {
                             server = serverToUse,
                             contentResolver = contentResolver,
                             onSuccess = { imageUrl, mimeType ->
-                                createNIP94Record(imageUrl, mimeType, description)
+                                createNIP94Record(imageUrl, mimeType, description, sensitiveContent, relayList = relayList)
                             },
                             onError = {
                                 isUploadingImage = false
@@ -137,7 +139,7 @@ open class NewMediaModel : ViewModel() {
         return !isUploadingImage && galleryUri != null && selectedServer != null
     }
 
-    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String) {
+    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
         uploadingPercentage.value = 0.40f
         viewModelScope.launch(Dispatchers.IO) {
             uploadingDescription.value = "Server Processing"
@@ -157,10 +159,11 @@ open class NewMediaModel : ViewModel() {
                     imageUrl,
                     mimeType,
                     description,
+                    sensitiveContent,
                     onReady = {
                         uploadingPercentage.value = 0.90f
                         uploadingDescription.value = "Sending"
-                        account?.sendHeader(it)
+                        account?.sendHeader(it, relayList)
                         uploadingPercentage.value = 1.00f
                         isUploadingImage = false
                         onceUploaded()
@@ -189,7 +192,7 @@ open class NewMediaModel : ViewModel() {
         }
     }
 
-    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String) {
+    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
         uploadingPercentage.value = 0.30f
         uploadingDescription.value = "Hashing"
 
@@ -199,6 +202,7 @@ open class NewMediaModel : ViewModel() {
                 "",
                 mimeType,
                 description,
+                sensitiveContent,
                 onReady = {
                     uploadingDescription.value = "Signing"
                     uploadingPercentage.value = 0.40f
@@ -207,7 +211,7 @@ open class NewMediaModel : ViewModel() {
                     if (nip95 != null) {
                         uploadingDescription.value = "Sending"
                         uploadingPercentage.value = 0.60f
-                        account?.sendNip95(nip95.first, nip95.second)
+                        account?.sendNip95(nip95.first, nip95.second, relayList)
                     }
 
                     uploadingPercentage.value = 1.00f

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

@@ -6,11 +6,26 @@ import android.os.Build
 import android.util.Size
 import android.widget.Toast
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -22,6 +37,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
@@ -29,8 +45,7 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.ui.components.*
+import com.vitorpamplona.amethyst.ui.components.VideoView
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -60,6 +75,17 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, ac
         }
     }
 
+    var showRelaysDialog by remember {
+        mutableStateOf(false)
+    }
+    var relayList = account.activeRelays()?.filter {
+        it.write
+    }?.map {
+        it
+    } ?: account.convertLocalRelays().filter {
+        it.write
+    }
+
     Dialog(
         onDismissRequest = { onClose() },
         properties = DialogProperties(
@@ -72,6 +98,20 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, ac
             modifier = Modifier
                 .fillMaxWidth()
         ) {
+            if (showRelaysDialog) {
+                RelaySelectionDialog(
+                    list = relayList,
+                    onClose = {
+                        showRelaysDialog = false
+                    },
+                    onPost = {
+                        relayList = it
+                    },
+                    accountViewModel = accountViewModel,
+                    nav = nav
+                )
+            }
+
             Column(
                 modifier = Modifier.padding(start = 10.dp, end = 10.dp, top = 10.dp)
                     .fillMaxWidth()
@@ -87,10 +127,26 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, ac
                         onClose()
                     })
 
+                    Box {
+                        IconButton(
+                            modifier = Modifier.align(Alignment.Center),
+                            onClick = {
+                                showRelaysDialog = true
+                            }
+                        ) {
+                            Icon(
+                                painter = painterResource(R.drawable.relays),
+                                contentDescription = null,
+                                modifier = Modifier.height(25.dp),
+                                tint = MaterialTheme.colors.onBackground
+                            )
+                        }
+                    }
+
                     PostButton(
                         onPost = {
                             onClose()
-                            postViewModel.upload(context)
+                            postViewModel.upload(context, relayList)
                             postViewModel.selectedServer?.let { account.changeDefaultFileServer(it) }
                         },
                         isActive = postViewModel.canPost()
@@ -107,7 +163,7 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, ac
                             .fillMaxWidth()
                             .verticalScroll(scroolState)
                     ) {
-                        ImageVideoPost(postViewModel, account)
+                        ImageVideoPost(postViewModel, accountViewModel)
                     }
                 }
             }
@@ -119,16 +175,18 @@ fun isNIP94Server(selectedServer: ServersAvailable?): Boolean {
     return selectedServer == ServersAvailable.NOSTRIMG_NIP_94 ||
         // selectedServer == ServersAvailable.IMGUR_NIP_94 ||
         selectedServer == ServersAvailable.NOSTR_BUILD_NIP_94 ||
-        selectedServer == ServersAvailable.NOSTRFILES_DEV_NIP_94
+        selectedServer == ServersAvailable.NOSTRFILES_DEV_NIP_94 ||
+        selectedServer == ServersAvailable.NOSTRCHECK_ME_NIP_94
 }
 
 @Composable
-fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) {
+fun ImageVideoPost(postViewModel: NewMediaModel, accountViewModel: AccountViewModel) {
     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)),
         Triple(ServersAvailable.NOSTR_BUILD_NIP_94, stringResource(id = R.string.upload_server_nostrbuild_nip94), stringResource(id = R.string.upload_server_nostrbuild_nip94_explainer)),
         Triple(ServersAvailable.NOSTRFILES_DEV_NIP_94, stringResource(id = R.string.upload_server_nostrfilesdev_nip94), stringResource(id = R.string.upload_server_nostrfilesdev_nip94_explainer)),
+        Triple(ServersAvailable.NOSTRCHECK_ME_NIP_94, stringResource(id = R.string.upload_server_nostrcheckme_nip94), stringResource(id = R.string.upload_server_nostrcheckme_nip94_explainer)),
         Triple(ServersAvailable.NIP95, stringResource(id = R.string.upload_server_relays_nip95), stringResource(id = R.string.upload_server_relays_nip95_explainer))
     )
 
@@ -180,7 +238,10 @@ fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) {
             }
         } else {
             postViewModel.galleryUri?.let {
-                VideoView(it.toString())
+                VideoView(
+                    videoUri = it.toString(),
+                    accountViewModel = accountViewModel
+                )
             }
         }
     }
@@ -191,7 +252,7 @@ fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) {
     ) {
         TextSpinner(
             label = stringResource(id = R.string.file_server),
-            placeholder = fileServers.firstOrNull { it.first == acc.defaultFileServer }?.second ?: fileServers[0].second,
+            placeholder = fileServers.firstOrNull { it.first == accountViewModel.account.defaultFileServer }?.second ?: fileServers[0].second,
             options = fileServerOptions,
             explainers = fileServerExplainers,
             onSelect = {
@@ -206,6 +267,18 @@ fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) {
     if (isNIP94Server(postViewModel.selectedServer) ||
         postViewModel.selectedServer == ServersAvailable.NIP95
     ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            SettingSwitchItem(
+                checked = postViewModel.sensitiveContent,
+                onCheckedChange = { postViewModel.sensitiveContent = it },
+                title = R.string.add_sensitive_content_label,
+                description = R.string.add_sensitive_content_description
+            )
+        }
+
         Row(
             verticalAlignment = Alignment.CenterVertically,
             modifier = Modifier

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

@@ -13,6 +13,7 @@ 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.selection.toggleable
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
@@ -20,7 +21,6 @@ import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 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
@@ -41,6 +41,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -52,11 +53,13 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
@@ -69,7 +72,11 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.*
+import com.vitorpamplona.amethyst.ui.note.CancelIcon
+import com.vitorpamplona.amethyst.ui.note.CloseIcon
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
+import com.vitorpamplona.amethyst.ui.note.PollIcon
+import com.vitorpamplona.amethyst.ui.note.RegularPostIcon
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
@@ -103,6 +110,16 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
 
     val scrollState = rememberScrollState()
     val scope = rememberCoroutineScope()
+    var showRelaysDialog by remember {
+        mutableStateOf(false)
+    }
+    var relayList = account.activeRelays()?.filter {
+        it.write
+    }?.map {
+        it
+    } ?: account.convertLocalRelays().filter {
+        it.write
+    }
 
     LaunchedEffect(Unit) {
         postViewModel.load(account, baseReplyTo, quote)
@@ -137,6 +154,20 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                 .fillMaxWidth()
                 .fillMaxHeight()
         ) {
+            if (showRelaysDialog) {
+                RelaySelectionDialog(
+                    list = relayList,
+                    onClose = {
+                        showRelaysDialog = false
+                    },
+                    onPost = {
+                        relayList = it
+                    },
+                    accountViewModel = accountViewModel,
+                    nav = nav
+                )
+            }
+
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -158,10 +189,25 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                             onClose()
                         })
 
+                        Box {
+                            IconButton(
+                                modifier = Modifier.align(Alignment.Center),
+                                onClick = {
+                                    showRelaysDialog = true
+                                }
+                            ) {
+                                Icon(
+                                    painter = painterResource(R.drawable.relays),
+                                    contentDescription = null,
+                                    modifier = Modifier.height(25.dp),
+                                    tint = MaterialTheme.colors.onBackground
+                                )
+                            }
+                        }
                         PostButton(
                             onPost = {
                                 scope.launch(Dispatchers.IO) {
-                                    postViewModel.sendPost()
+                                    postViewModel.sendPost(relayList = relayList)
                                     onClose()
                                 }
                             },
@@ -257,8 +303,8 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                     ImageVideoDescription(
                                         url,
                                         account.defaultFileServer,
-                                        onAdd = { description, server ->
-                                            postViewModel.upload(url, description, server, context)
+                                        onAdd = { description, server, sensitiveContent ->
+                                            postViewModel.upload(url, description, sensitiveContent, server, context, relayList)
                                             account.changeDefaultFileServer(server)
                                         },
                                         onCancel = {
@@ -268,7 +314,8 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                             scope.launch {
                                                 postViewModel.imageUploadingError.emit(it)
                                             }
-                                        }
+                                        },
+                                        accountViewModel = accountViewModel
                                     )
                                 }
                             }
@@ -326,9 +373,9 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                                     )
                                             )
                                         } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-                                            VideoView(myUrlPreview)
+                                            VideoView(myUrlPreview, accountViewModel = accountViewModel)
                                         } else {
-                                            UrlPreview(myUrlPreview, myUrlPreview)
+                                            UrlPreview(myUrlPreview, myUrlPreview, accountViewModel)
                                         }
                                     } else if (startsWithNIP19Scheme(myUrlPreview)) {
                                         val bgColor = MaterialTheme.colors.background
@@ -344,7 +391,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                             nav
                                         )
                                     } else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
-                                        UrlPreview("https://$myUrlPreview", myUrlPreview)
+                                        UrlPreview("https://$myUrlPreview", myUrlPreview, accountViewModel)
                                     }
                                 }
                             }
@@ -474,19 +521,9 @@ private fun AddPollButton(
         }
     ) {
         if (!isPollActive) {
-            Icon(
-                painter = painterResource(R.drawable.ic_poll),
-                null,
-                modifier = Modifier.size(20.dp),
-                tint = MaterialTheme.colors.onBackground
-            )
+            PollIcon()
         } else {
-            Icon(
-                painter = painterResource(R.drawable.ic_lists),
-                null,
-                modifier = Modifier.size(20.dp),
-                tint = MaterialTheme.colors.onBackground
-            )
+            RegularPostIcon()
         }
     }
 }
@@ -720,12 +757,7 @@ fun CloseButton(onCancel: () -> Unit) {
                 backgroundColor = Color.Gray
             )
     ) {
-        Icon(
-            painter = painterResource(id = R.drawable.ic_close),
-            contentDescription = stringResource(id = R.string.cancel),
-            modifier = Modifier.size(20.dp),
-            tint = Color.White
-        )
+        CloseIcon()
     }
 }
 
@@ -787,30 +819,6 @@ fun CreateButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier
     }
 }
 
-@Composable
-fun SearchButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
-    Button(
-        modifier = modifier,
-        onClick = {
-            if (isActive) {
-                onPost()
-            }
-        },
-        shape = ButtonBorder,
-        colors = ButtonDefaults
-            .buttonColors(
-                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
-            )
-    ) {
-        Icon(
-            painter = painterResource(R.drawable.ic_search),
-            null,
-            modifier = Modifier.size(26.dp),
-            tint = Color.White
-        )
-    }
-}
-
 enum class ServersAvailable {
     // IMGUR,
     NOSTR_BUILD,
@@ -830,9 +838,10 @@ enum class ServersAvailable {
 fun ImageVideoDescription(
     uri: Uri,
     defaultServer: ServersAvailable,
-    onAdd: (String, ServersAvailable) -> Unit,
+    onAdd: (String, ServersAvailable, Boolean) -> Unit,
     onCancel: () -> Unit,
-    onError: (String) -> Unit
+    onError: (String) -> Unit,
+    accountViewModel: AccountViewModel
 ) {
     val resolver = LocalContext.current.contentResolver
     val mediaType = resolver.getType(uri) ?: ""
@@ -859,6 +868,7 @@ fun ImageVideoDescription(
 
     var selectedServer by remember { mutableStateOf(defaultServer) }
     var message by remember { mutableStateOf("") }
+    var sensitiveContent by remember { mutableStateOf(false) }
 
     Column(
         modifier = Modifier
@@ -903,17 +913,10 @@ fun ImageVideoDescription(
                 )
 
                 IconButton(
-                    modifier = Modifier.size(30.dp),
+                    modifier = Modifier.size(30.dp).padding(end = 5.dp),
                     onClick = onCancel
                 ) {
-                    Icon(
-                        imageVector = Icons.Default.Cancel,
-                        null,
-                        modifier = Modifier
-                            .padding(end = 5.dp)
-                            .size(30.dp),
-                        tint = MaterialTheme.colors.placeholderText
-                    )
+                    CancelIcon()
                 }
             }
 
@@ -961,7 +964,7 @@ fun ImageVideoDescription(
                         )
                     }
                 } else {
-                    VideoView(uri.toString())
+                    VideoView(uri.toString(), accountViewModel = accountViewModel)
                 }
             }
 
@@ -986,6 +989,18 @@ fun ImageVideoDescription(
             if (isNIP94Server(selectedServer) ||
                 selectedServer == ServersAvailable.NIP95
             ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    SettingSwitchItem(
+                        checked = sensitiveContent,
+                        onCheckedChange = { sensitiveContent = it },
+                        title = R.string.add_sensitive_content_label,
+                        description = R.string.add_sensitive_content_description
+                    )
+                }
+
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
                     modifier = Modifier
@@ -1017,7 +1032,7 @@ fun ImageVideoDescription(
                     .fillMaxWidth()
                     .padding(vertical = 10.dp),
                 onClick = {
-                    onAdd(message, selectedServer)
+                    onAdd(message, selectedServer, sensitiveContent)
                 },
                 shape = QuoteBorder,
                 colors = ButtonDefaults.buttonColors(
@@ -1036,3 +1051,54 @@ data class ImmutableListOfLists<T>(val lists: List<List<T>> = emptyList())
 fun List<List<String>>.toImmutableListOfLists(): ImmutableListOfLists<String> {
     return ImmutableListOfLists(this)
 }
+
+@Composable
+fun SettingSwitchItem(
+    modifier: Modifier = Modifier,
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+    title: Int,
+    description: Int,
+    enabled: Boolean = true
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp, vertical = 8.dp)
+            .toggleable(
+                value = checked,
+                enabled = enabled,
+                role = Role.Switch,
+                onValueChange = onCheckedChange
+            ),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Column(
+            modifier = Modifier.weight(1.0f),
+            verticalArrangement = Arrangement.spacedBy(3.dp)
+        ) {
+            val contentAlpha = if (enabled) ContentAlpha.high else ContentAlpha.disabled
+
+            Text(
+                text = stringResource(id = title),
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.alpha(contentAlpha)
+            )
+            Text(
+                text = stringResource(id = description),
+                style = MaterialTheme.typography.caption,
+                color = Color.Gray,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.alpha(contentAlpha)
+            )
+        }
+
+        Switch(
+            checked = checked,
+            onCheckedChange = null,
+            enabled = enabled
+        )
+    }
+}

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

@@ -22,6 +22,7 @@ import com.vitorpamplona.amethyst.service.model.CommunityDefinitionEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
+import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import kotlinx.coroutines.Dispatchers
@@ -128,7 +129,7 @@ open class NewPostViewModel() : ViewModel() {
         this.account = account
     }
 
-    fun sendPost() {
+    fun sendPost(relayList: List<Relay>? = null) {
         val tagger = NewMessageTagger(originalNote?.channelHex(), mentions, replyTos, message.text)
         tagger.run()
 
@@ -145,7 +146,20 @@ open class NewPostViewModel() : ViewModel() {
         val localZapRaiserAmount = if (wantsZapraiser) zapRaiserAmount else null
 
         if (wantsPoll) {
-            account?.sendPoll(tagger.message, tagger.replyTos, tagger.mentions, pollOptions, valueMaximum, valueMinimum, consensusThreshold, closedAt, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount)
+            account?.sendPoll(
+                tagger.message,
+                tagger.replyTos,
+                tagger.mentions,
+                pollOptions,
+                valueMaximum,
+                valueMinimum,
+                consensusThreshold,
+                closedAt,
+                zapReceiver,
+                wantsToMarkAsSensitive,
+                localZapRaiserAmount,
+                relayList
+            )
         } else if (originalNote?.channelHex() != null) {
             if (originalNote is AddressableEvent && originalNote?.address() != null) {
                 account?.sendLiveMessage(tagger.message, originalNote?.address()!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount)
@@ -172,14 +186,15 @@ open class NewPostViewModel() : ViewModel() {
                 zapRaiserAmount = localZapRaiserAmount,
                 replyingTo = replyId,
                 root = rootId,
-                directMentions = tagger.directMentions
+                directMentions = tagger.directMentions,
+                relayList = relayList
             )
         }
 
         cancel()
     }
 
-    fun upload(galleryUri: Uri, description: String, server: ServersAvailable, context: Context) {
+    fun upload(galleryUri: Uri, description: String, sensitiveContent: Boolean, server: ServersAvailable, context: Context, relayList: List<Relay>? = null) {
         isUploadingImage = true
         contentToAddUrl = null
 
@@ -194,7 +209,7 @@ open class NewPostViewModel() : ViewModel() {
                 onReady = { fileUri, contentType, size ->
                     if (server == ServersAvailable.NIP95) {
                         contentResolver.openInputStream(fileUri)?.use {
-                            createNIP95Record(it.readBytes(), contentType, description)
+                            createNIP95Record(it.readBytes(), contentType, description, sensitiveContent, relayList = relayList)
                         }
                     } else {
                         ImageUploader.uploadImage(
@@ -205,7 +220,7 @@ open class NewPostViewModel() : ViewModel() {
                             contentResolver = contentResolver,
                             onSuccess = { imageUrl, mimeType ->
                                 if (isNIP94Server(server)) {
-                                    createNIP94Record(imageUrl, mimeType, description)
+                                    createNIP94Record(imageUrl, mimeType, description, sensitiveContent)
                                 } else {
                                     isUploadingImage = false
                                     message = TextFieldValue(message.text + "\n\n" + imageUrl)
@@ -370,15 +385,16 @@ open class NewPostViewModel() : ViewModel() {
         }
     }
 
-    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String) {
+    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
         viewModelScope.launch(Dispatchers.IO) {
             // Images don't seem to be ready immediately after upload
             FileHeader.prepare(
                 imageUrl,
                 mimeType,
                 description,
+                sensitiveContent,
                 onReady = {
-                    val note = account?.sendHeader(it)
+                    val note = account?.sendHeader(it, relayList = relayList)
 
                     isUploadingImage = false
 
@@ -400,16 +416,17 @@ open class NewPostViewModel() : ViewModel() {
         }
     }
 
-    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String) {
+    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
         viewModelScope.launch(Dispatchers.IO) {
             FileHeader.prepare(
                 bytes,
                 "",
                 mimeType,
                 description,
+                sensitiveContent,
                 onReady = {
                     val nip95 = account?.createNip95(bytes, headerInfo = it)
-                    val note = nip95?.let { it1 -> account?.sendNip95(it1.first, it1.second) }
+                    val note = nip95?.let { it1 -> account?.sendNip95(it1.first, it1.second, relayList = relayList) }
 
                     isUploadingImage = false
 

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

@@ -0,0 +1,183 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.widget.Toast
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.material.Surface
+import androidx.compose.material.Switch
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import com.vitorpamplona.amethyst.model.RelayInformation
+import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.coroutines.launch
+
+data class RelayList(
+    val relay: Relay,
+    val isSelected: Boolean
+)
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun RelaySelectionDialog(
+    list: List<Relay>,
+    onClose: () -> Unit,
+    onPost: (list: List<Relay>) -> Unit,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    val scope = rememberCoroutineScope()
+    val context = LocalContext.current
+    val relayList = accountViewModel.account.activeRelays()?.filter {
+        it.write
+    }?.map {
+        it
+    } ?: accountViewModel.account.convertLocalRelays().filter {
+        it.write
+    }
+
+    var relays by remember {
+        mutableStateOf(
+            relayList.map {
+                RelayList(
+                    it,
+                    list.any { relay -> it.url == relay.url }
+                )
+            }
+        )
+    }
+    var relayInfo: RelayInformation? by remember { mutableStateOf(null) }
+
+    if (relayInfo != null) {
+        RelayInformationDialog(
+            onClose = {
+                relayInfo = null
+            },
+            relayInfo = relayInfo!!,
+            accountViewModel,
+            nav
+        )
+    }
+
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnClickOutside = false,
+            decorFitsSystemWindows = false
+        )
+    ) {
+        Surface(
+            modifier = Modifier
+                .fillMaxWidth()
+                .fillMaxHeight()
+        ) {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .fillMaxHeight()
+                    .padding(start = 10.dp, end = 10.dp, top = 10.dp)
+
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    CloseButton(
+                        onCancel = {
+                            onClose()
+                        }
+                    )
+
+                    PostButton(
+                        onPost = {
+                            val selectedRelays = relays.filter { it.isSelected }
+                            if (selectedRelays.isEmpty()) {
+                                scope.launch {
+                                    Toast.makeText(context, "Select a relay to continue", Toast.LENGTH_SHORT).show()
+                                }
+                                return@PostButton
+                            }
+                            onPost(selectedRelays.map { it.relay })
+                            onClose()
+                        },
+                        isActive = true
+                    )
+                }
+
+                LazyColumn(
+                    contentPadding = PaddingValues(
+                        top = 10.dp,
+                        bottom = 10.dp
+                    )
+                ) {
+                    itemsIndexed(
+                        relays,
+                        key = { _, item -> item.relay.url }
+                    ) { index, item ->
+                        Row(
+                            horizontalArrangement = Arrangement.SpaceBetween,
+                            verticalAlignment = Alignment.CenterVertically,
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .combinedClickable(
+                                    onClick = {
+                                        relays = relays.mapIndexed { j, item ->
+                                            if (index == j) {
+                                                item.copy(isSelected = !item.isSelected)
+                                            } else {
+                                                item
+                                            }
+                                        }
+                                    },
+                                    onLongClick = {
+                                        loadRelayInfo(item.relay.url, context, scope) {
+                                            relayInfo = it
+                                        }
+                                    }
+                                )
+                        ) {
+                            Text(
+                                item.relay.url
+                                    .removePrefix("ws://")
+                                    .removePrefix("wss://")
+                                    .removeSuffix("/")
+                            )
+                            Switch(
+                                checked = item.isSelected,
+                                onCheckedChange = {
+                                    relays = relays.mapIndexed { j, item ->
+                                        if (index == j) {
+                                            item.copy(isSelected = !item.isSelected)
+                                        } else { item }
+                                    }
+                                }
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,157 @@
+package com.vitorpamplona.amethyst.ui.buttons
+
+import android.Manifest
+import android.net.Uri
+import android.os.Build
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedButton
+import androidx.compose.material.ProgressIndicatorDefaults
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.viewmodel.compose.viewModel
+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.actions.GallerySelect
+import com.vitorpamplona.amethyst.ui.actions.NewMediaModel
+import com.vitorpamplona.amethyst.ui.actions.NewMediaView
+import com.vitorpamplona.amethyst.ui.navigation.Route
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun NewImageButton(accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    var wantsToPost by remember {
+        mutableStateOf(false)
+    }
+
+    var pickedURI by remember {
+        mutableStateOf<Uri?>(null)
+    }
+
+    val scope = rememberCoroutineScope()
+
+    val postViewModel: NewMediaModel = viewModel()
+    postViewModel.onceUploaded {
+        scope.launch(Dispatchers.Default) {
+            // awaits an refresh on the list
+            delay(250)
+            withContext(Dispatchers.Main) {
+                val route = Route.Video.route.replace("{scrollToTop}", "true")
+                nav(route)
+            }
+        }
+    }
+
+    if (wantsToPost) {
+        val cameraPermissionState =
+            rememberPermissionState(
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    Manifest.permission.READ_MEDIA_IMAGES
+                } else {
+                    Manifest.permission.READ_EXTERNAL_STORAGE
+                }
+            )
+
+        if (cameraPermissionState.status.isGranted) {
+            var showGallerySelect by remember { mutableStateOf(false) }
+            if (showGallerySelect) {
+                GallerySelect(
+                    onImageUri = { uri ->
+                        wantsToPost = false
+                        showGallerySelect = false
+                        pickedURI = uri
+                    }
+                )
+            }
+
+            showGallerySelect = true
+        } else {
+            LaunchedEffect(key1 = accountViewModel) {
+                cameraPermissionState.launchPermissionRequest()
+            }
+        }
+    }
+
+    pickedURI?.let {
+        NewMediaView(
+            uri = it,
+            onClose = { pickedURI = null },
+            postViewModel = postViewModel,
+            accountViewModel = accountViewModel,
+            nav = nav
+        )
+    }
+
+    if (postViewModel.isUploadingImage) {
+        ShowProgress(postViewModel)
+    } else {
+        OutlinedButton(
+            onClick = { wantsToPost = true },
+            modifier = Modifier.size(55.dp),
+            shape = CircleShape,
+            colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.primary),
+            contentPadding = PaddingValues(0.dp)
+        ) {
+            Icon(
+                painter = painterResource(R.drawable.ic_compose),
+                null,
+                modifier = Modifier.size(26.dp),
+                tint = Color.White
+            )
+        }
+    }
+}
+
+@Composable
+private fun ShowProgress(postViewModel: NewMediaModel) {
+    Box(Modifier.size(55.dp), contentAlignment = Alignment.Center) {
+        CircularProgressIndicator(
+            progress = animateFloatAsState(
+                targetValue = postViewModel.uploadingPercentage.value,
+                animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec
+            ).value,
+            modifier = Modifier
+                .size(55.dp)
+                .clip(CircleShape)
+                .background(MaterialTheme.colors.background),
+            strokeWidth = 5.dp
+        )
+        postViewModel.uploadingDescription.value?.let {
+            Text(
+                it,
+                color = MaterialTheme.colors.onSurface,
+                fontSize = 10.sp,
+                textAlign = TextAlign.Center
+            )
+        }
+    }
+}

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

@@ -399,7 +399,7 @@ fun CreateTextWithEmoji(
             )
         ).toSpanStyle()
 
-        InLineIconRenderer(emojiList, style, maxLines, overflow, modifier)
+        InLineIconRenderer(emojiList, style, fontSize, maxLines, overflow, modifier)
     }
 }
 
@@ -458,7 +458,7 @@ fun CreateTextWithEmoji(
             ).toSpanStyle()
         }
 
-        InLineIconRenderer(emojiList, style, maxLines, overflow, modifier)
+        InLineIconRenderer(emojiList, style, fontSize, maxLines, overflow, modifier)
     }
 }
 
@@ -551,7 +551,7 @@ fun CreateClickableTextWithEmoji(
         InLineIconRenderer(
             emojiLists!!.part2,
             LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle(),
-            maxLines
+            maxLines = maxLines
         )
     }
 }
@@ -583,14 +583,22 @@ fun ClickableInLineIconRenderer(
     style: SpanStyle,
     onClick: (Int) -> Unit
 ) {
+    val placeholderSize = remember(style) {
+        if (style.fontSize == TextUnit.Unspecified) {
+            22.sp
+        } else {
+            style.fontSize.times(1.1f)
+        }
+    }
+
     val inlineContent = wordsInOrder.mapIndexedNotNull { idx, value ->
         if (value is ImageUrlType) {
             Pair(
                 "inlineContent$idx",
                 InlineTextContent(
                     Placeholder(
-                        width = 17.sp,
-                        height = 17.sp,
+                        width = placeholderSize,
+                        height = placeholderSize,
                         placeholderVerticalAlign = PlaceholderVerticalAlign.Center
                     )
                 ) {
@@ -646,18 +654,27 @@ fun ClickableInLineIconRenderer(
 fun InLineIconRenderer(
     wordsInOrder: ImmutableList<Renderable>,
     style: SpanStyle,
+    fontSize: TextUnit = TextUnit.Unspecified,
     maxLines: Int = Int.MAX_VALUE,
     overflow: TextOverflow = TextOverflow.Clip,
     modifier: Modifier = Modifier
 ) {
+    val placeholderSize = remember(fontSize) {
+        if (fontSize == TextUnit.Unspecified) {
+            22.sp
+        } else {
+            fontSize.times(1.1f)
+        }
+    }
+
     val inlineContent = wordsInOrder.mapIndexedNotNull { idx, value ->
         if (value is ImageUrlType) {
             Pair(
                 "inlineContent$idx",
                 InlineTextContent(
                     Placeholder(
-                        width = 20.sp,
-                        height = 20.sp,
+                        width = placeholderSize,
+                        height = placeholderSize,
                         placeholderVerticalAlign = PlaceholderVerticalAlign.Center
                     )
                 ) {
@@ -692,6 +709,7 @@ fun InLineIconRenderer(
     Text(
         text = annotatedText,
         inlineContent = inlineContent,
+        fontSize = fontSize,
         maxLines = maxLines,
         overflow = overflow,
         modifier = modifier

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

@@ -38,11 +38,10 @@ class MediaCompressor {
                 //    videoName = "compressed_video" // => required name
                 // ),
                 // OR AND NOT BOTH
-                appSpecificStorageConfiguration = AppSpecificStorageConfiguration(
-                    videoName = UUID.randomUUID().toString() // => required name
-                ),
+                appSpecificStorageConfiguration = AppSpecificStorageConfiguration(),
                 configureWith = Configuration(
-                    quality = VideoQuality.LOW
+                    quality = VideoQuality.LOW,
+                    videoNames = listOf(UUID.randomUUID().toString()) // => required name
                 ),
                 listener = object : CompressionListener {
                     override fun onProgress(index: Int, percent: Float) {

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

@@ -17,16 +17,18 @@ import androidx.compose.material.ProvideTextStyle
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.takeOrElse
 import androidx.compose.ui.layout.SubcomposeLayout
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.*
-import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.em
 import androidx.lifecycle.distinctUntilChanged
 import androidx.lifecycle.map
@@ -62,6 +64,7 @@ import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.Font17SP
+import com.vitorpamplona.amethyst.ui.theme.HalfVertPadding
 import com.vitorpamplona.amethyst.ui.theme.MarkdownTextStyle
 import com.vitorpamplona.amethyst.ui.theme.innerPostModifier
 import com.vitorpamplona.amethyst.ui.theme.markdownStyle
@@ -136,7 +139,6 @@ private fun RenderRegular(
     val currentTextStyle = LocalTextStyle.current
 
     val textStyle = currentTextStyle.copy(
-        textDirection = TextDirection.Content,
         lineHeight = 1.4.em,
         color = currentTextStyle.color.takeOrElse {
             LocalContentColor.current.copy(alpha = LocalContentAlpha.current)
@@ -144,36 +146,58 @@ private fun RenderRegular(
     )
 
     MeasureSpaceWidth() { spaceWidth ->
-        Column {
+        Column() {
             if (canPreview) {
                 // FlowRow doesn't work well with paragraphs. So we need to split them
                 state.paragraphs.forEach { paragraph ->
-                    FlowRow(horizontalArrangement = Arrangement.spacedBy(spaceWidth)) {
-                        paragraph.forEach { word ->
-                            RenderWordWithPreview(
-                                word,
-                                state,
-                                backgroundColor,
-                                textStyle,
-                                accountViewModel,
-                                nav
-                            )
+                    val direction = if (paragraph.isRTL) {
+                        LayoutDirection.Rtl
+                    } else {
+                        LayoutDirection.Ltr
+                    }
+
+                    CompositionLocalProvider(LocalLayoutDirection provides direction) {
+                        FlowRow(
+                            modifier = Modifier.align(if (paragraph.isRTL) Alignment.End else Alignment.Start),
+                            horizontalArrangement = Arrangement.spacedBy(spaceWidth)
+                        ) {
+                            paragraph.words.forEach { word ->
+                                RenderWordWithPreview(
+                                    word,
+                                    state,
+                                    backgroundColor,
+                                    textStyle,
+                                    accountViewModel,
+                                    nav
+                                )
+                            }
                         }
                     }
                 }
             } else {
                 // FlowRow doesn't work well with paragraphs. So we need to split them
                 state.paragraphs.forEach { paragraph ->
-                    FlowRow(horizontalArrangement = Arrangement.spacedBy(spaceWidth)) {
-                        paragraph.forEach { word ->
-                            RenderWordWithoutPreview(
-                                word,
-                                state,
-                                backgroundColor,
-                                textStyle,
-                                accountViewModel,
-                                nav
-                            )
+                    val direction = if (paragraph.isRTL) {
+                        LayoutDirection.Rtl
+                    } else {
+                        LayoutDirection.Ltr
+                    }
+
+                    CompositionLocalProvider(LocalLayoutDirection provides direction) {
+                        FlowRow(
+                            horizontalArrangement = Arrangement.spacedBy(spaceWidth),
+                            modifier = Modifier.align(if (paragraph.isRTL) Alignment.End else Alignment.Start)
+                        ) {
+                            paragraph.words.forEach { word ->
+                                RenderWordWithoutPreview(
+                                    word,
+                                    state,
+                                    backgroundColor,
+                                    textStyle,
+                                    accountViewModel,
+                                    nav
+                                )
+                            }
                         }
                     }
                 }
@@ -238,8 +262,8 @@ private fun RenderWordWithPreview(
     nav: (String) -> Unit
 ) {
     when (word) {
-        is ImageSegment -> ZoomableContentView(word.segmentText, state)
-        is LinkSegment -> UrlPreview(word.segmentText, word.segmentText)
+        is ImageSegment -> ZoomableContentView(word.segmentText, state, accountViewModel)
+        is LinkSegment -> UrlPreview(word.segmentText, word.segmentText, accountViewModel)
         is EmojiSegment -> RenderCustomEmoji(word.segmentText, state)
         is InvoiceSegment -> MayBeInvoicePreview(word.segmentText)
         is WithdrawSegment -> MayBeWithdrawal(word.segmentText)
@@ -256,9 +280,15 @@ private fun RenderWordWithPreview(
 }
 
 @Composable
-private fun ZoomableContentView(word: String, state: RichTextViewerState) {
+private fun ZoomableContentView(
+    word: String,
+    state: RichTextViewerState,
+    accountViewModel: AccountViewModel
+) {
     state.imagesForPager[word]?.let {
-        ZoomableContentView(it, state.imageList)
+        Box(modifier = HalfVertPadding) {
+            ZoomableContentView(it, state.imageList, accountViewModel)
+        }
     }
 }
 

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

@@ -11,12 +11,8 @@ import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Card
 import androidx.compose.material.Divider
-import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -25,6 +21,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.note.ArrowBackIcon
+import com.vitorpamplona.amethyst.ui.theme.Size24dp
 
 @Composable
 fun SelectTextDialog(text: String, onDismiss: () -> Unit) {
@@ -41,7 +39,7 @@ fun SelectTextDialog(text: String, onDismiss: () -> Unit) {
     ) {
         Card {
             Column(
-                modifier = Modifier.heightIn(24.dp, maxHeight)
+                modifier = Modifier.heightIn(Size24dp, maxHeight)
             ) {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
@@ -50,11 +48,7 @@ fun SelectTextDialog(text: String, onDismiss: () -> Unit) {
                     IconButton(
                         onClick = onDismiss
                     ) {
-                        Icon(
-                            imageVector = Icons.Default.ArrowBack,
-                            contentDescription = null,
-                            tint = MaterialTheme.colors.primary
-                        )
+                        ArrowBackIcon(Size24dp)
                     }
                     Text(text = stringResource(R.string.select_text_dialog_top))
                 }

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -34,6 +35,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.EventInterface
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 
@@ -43,7 +45,18 @@ fun SensitivityWarning(
     accountViewModel: AccountViewModel,
     content: @Composable () -> Unit
 ) {
-    val hasSensitiveContent = remember(note) { note.event?.isSensitive() ?: false }
+    note.event?.let {
+        SensitivityWarning(it, accountViewModel, content)
+    }
+}
+
+@Composable
+fun SensitivityWarning(
+    event: EventInterface,
+    accountViewModel: AccountViewModel,
+    content: @Composable () -> Unit
+) {
+    val hasSensitiveContent = remember(event) { event.isSensitive() ?: false }
 
     if (hasSensitiveContent) {
         SensitivityWarning(accountViewModel, content)
@@ -63,12 +76,14 @@ fun SensitivityWarning(
         mutableStateOf(accountState?.account?.showSensitiveContent != true)
     }
 
-    if (showContentWarningNote) {
-        ContentWarningNote() {
-            showContentWarningNote = false
+    Crossfade(targetState = showContentWarningNote) {
+        if (it) {
+            ContentWarningNote() {
+                showContentWarningNote = false
+            }
+        } else {
+            content()
         }
-    } else {
-        content()
     }
 }
 

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

@@ -9,37 +9,56 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
+import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 @Composable
-fun UrlPreview(url: String, urlText: String) {
-    var urlPreviewState by remember(url) {
-        mutableStateOf(
-            UrlCachedPreviewer.cache.get(url)?.let { it } ?: UrlPreviewState.Loading
-        )
+fun UrlPreview(url: String, urlText: String, accountViewModel: AccountViewModel) {
+    val settings = accountViewModel.account.settings
+    val isMobile = ConnectivityStatus.isOnMobileData.value
+
+    val automaticallyShowUrlPreview = when (settings.automaticallyShowUrlPreview) {
+        true -> !isMobile
+        false -> false
+        else -> true
     }
 
-    // Doesn't use a viewModel because of viewModel reusing issues (too many UrlPreview are created).
-    if (urlPreviewState == UrlPreviewState.Loading) {
-        LaunchedEffect(url) {
-            launch(Dispatchers.IO) {
-                UrlCachedPreviewer.previewInfo(url) {
-                    launch(Dispatchers.Main) {
-                        urlPreviewState = it
+    if (!automaticallyShowUrlPreview) {
+        ClickableUrl(urlText, url)
+    } else {
+        var urlPreviewState by remember(url) {
+            mutableStateOf(
+                UrlCachedPreviewer.cache.get(url)?.let { it } ?: UrlPreviewState.Loading
+            )
+        }
+
+        // Doesn't use a viewModel because of viewModel reusing issues (too many UrlPreview are created).
+        if (urlPreviewState == UrlPreviewState.Loading) {
+            LaunchedEffect(url) {
+                launch(Dispatchers.IO) {
+                    UrlCachedPreviewer.previewInfo(url) {
+                        launch(Dispatchers.Main) {
+                            urlPreviewState = it
+                        }
                     }
                 }
             }
         }
-    }
 
-    Crossfade(targetState = urlPreviewState, animationSpec = tween(durationMillis = 100)) { state ->
-        when (state) {
-            is UrlPreviewState.Loaded -> {
-                UrlPreviewCard(url, state.previewInfo)
-            }
-            else -> {
-                ClickableUrl(urlText, url)
+        Crossfade(
+            targetState = urlPreviewState,
+            animationSpec = tween(durationMillis = 100)
+        ) { state ->
+            when (state) {
+                is UrlPreviewState.Loaded -> {
+                    UrlPreviewCard(url, state.previewInfo, accountViewModel)
+                }
+
+                else -> {
+                    ClickableUrl(urlText, url)
+                }
             }
         }
     }

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

@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.ui.components
 
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -10,7 +9,6 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalUriHandler
@@ -19,66 +17,77 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
 import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
-import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
-import com.vitorpamplona.amethyst.ui.theme.subtleBorder
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.innerPostModifier
 
 @Composable
 fun UrlPreviewCard(
     url: String,
-    previewInfo: UrlInfoItem
+    previewInfo: UrlInfoItem,
+    accountViewModel: AccountViewModel
 ) {
-    val uri = LocalUriHandler.current
+    val settings = accountViewModel.account.settings
+    val isMobile = ConnectivityStatus.isOnMobileData.value
 
-    Row(
-        modifier = Modifier
-            .clickable { runCatching { uri.openUri(url) } }
-            .clip(shape = QuoteBorder)
-            .border(
-                1.dp,
-                MaterialTheme.colors.subtleBorder,
-                QuoteBorder
-            )
-    ) {
-        Column {
-            AsyncImage(
-                model = previewInfo.imageUrlFullPath,
-                contentDescription = stringResource(R.string.preview_card_image_for, previewInfo.url),
-                contentScale = ContentScale.FillWidth,
-                modifier = Modifier.fillMaxWidth()
-            )
+    val automaticallyShowUrlPreview = when (settings.automaticallyShowUrlPreview) {
+        true -> !isMobile
+        false -> false
+        else -> true
+    }
 
-            Text(
-                text = previewInfo.verifiedUrl?.host ?: previewInfo.url,
-                style = MaterialTheme.typography.caption,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 10.dp, end = 10.dp, top = 10.dp),
-                color = Color.Gray,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
-            )
+    if (!automaticallyShowUrlPreview) {
+        ClickableUrl(url, url)
+    } else {
+        val uri = LocalUriHandler.current
 
-            Text(
-                text = previewInfo.title,
-                style = MaterialTheme.typography.body2,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 10.dp, end = 10.dp),
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
-            )
+        Row(
+            modifier = MaterialTheme.colors.innerPostModifier
+                .clickable {
+                    runCatching { uri.openUri(url) }
+                }
+        ) {
+            Column {
+                AsyncImage(
+                    model = previewInfo.imageUrlFullPath,
+                    contentDescription = stringResource(R.string.preview_card_image_for, previewInfo.url),
+                    contentScale = ContentScale.FillWidth,
+                    modifier = Modifier.fillMaxWidth()
+                )
 
-            Text(
-                text = previewInfo.description,
-                style = MaterialTheme.typography.caption,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(start = 10.dp, end = 10.dp, bottom = 10.dp),
-                color = Color.Gray,
-                maxLines = 3,
-                overflow = TextOverflow.Ellipsis
-            )
+                Text(
+                    text = previewInfo.verifiedUrl?.host ?: previewInfo.url,
+                    style = MaterialTheme.typography.caption,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(start = 10.dp, end = 10.dp, top = 10.dp),
+                    color = Color.Gray,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+
+                Text(
+                    text = previewInfo.title,
+                    style = MaterialTheme.typography.body2,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(start = 10.dp, end = 10.dp),
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+
+                Text(
+                    text = previewInfo.description,
+                    style = MaterialTheme.typography.caption,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(start = 10.dp, end = 10.dp, bottom = 10.dp),
+                    color = Color.Gray,
+                    maxLines = 3,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
         }
     }
 }

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

@@ -1,35 +1,34 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import android.graphics.Rect
 import android.graphics.drawable.Drawable
+import android.net.Uri
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.annotation.OptIn
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.VolumeOff
-import androidx.compose.material.icons.filled.VolumeUp
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -46,29 +45,44 @@ import androidx.compose.ui.unit.isFinite
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import androidx.media3.common.MediaItem
+import androidx.media3.common.MediaMetadata
+import androidx.media3.common.Player
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.session.MediaController
+import androidx.media3.ui.AspectRatioFrameLayout
+import androidx.media3.ui.PlayerView
 import coil.imageLoader
 import coil.request.ImageRequest
-import com.google.android.exoplayer2.C
-import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.MediaItem
-import com.google.android.exoplayer2.Player
-import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
-import com.google.android.exoplayer2.source.ProgressiveMediaSource
-import com.google.android.exoplayer2.source.hls.HlsMediaSource
-import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
-import com.google.android.exoplayer2.ui.StyledPlayerView
-import com.google.android.exoplayer2.upstream.DataSource
-import com.vitorpamplona.amethyst.VideoCache
-import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.PlaybackClientController
+import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
+import com.vitorpamplona.amethyst.ui.note.LyricsIcon
+import com.vitorpamplona.amethyst.ui.note.LyricsOffIcon
+import com.vitorpamplona.amethyst.ui.note.MuteIcon
+import com.vitorpamplona.amethyst.ui.note.MutedIcon
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.PinBottomIconSize
+import com.vitorpamplona.amethyst.ui.theme.Size22Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size50Modifier
+import com.vitorpamplona.amethyst.ui.theme.VolumeBottomIconSize
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlin.time.ExperimentalTime
-import kotlin.time.measureTimedValue
+import java.util.UUID
+import kotlin.math.abs
 
 public var DefaultMutedSetting = mutableStateOf(true)
 
 @Composable
-fun LoadThumbAndThenVideoView(videoUri: String, description: String? = null, thumbUri: String, onDialog: ((Boolean) -> Unit)? = null) {
+fun LoadThumbAndThenVideoView(
+    videoUri: String,
+    title: String? = null,
+    thumbUri: String,
+    authorName: String? = null,
+    nostrUriCallback: String? = null,
+    accountViewModel: AccountViewModel,
+    onDialog: ((Boolean) -> Unit)? = null
+) {
     var loadingFinished by remember { mutableStateOf<Pair<Boolean, Drawable?>>(Pair(false, null)) }
 
     val context = LocalContext.current
@@ -92,134 +106,363 @@ fun LoadThumbAndThenVideoView(videoUri: String, description: String? = null, thu
 
     if (loadingFinished.first) {
         if (loadingFinished.second != null) {
-            VideoView(videoUri, description, VideoThumb(loadingFinished.second), onDialog)
+            VideoView(
+                videoUri = videoUri,
+                title = title,
+                thumb = VideoThumb(loadingFinished.second),
+                artworkUri = thumbUri,
+                authorName = authorName,
+                nostrUriCallback = nostrUriCallback,
+                accountViewModel = accountViewModel,
+                onDialog = onDialog
+            )
         } else {
-            VideoView(videoUri, description, null, onDialog)
+            VideoView(
+                videoUri = videoUri,
+                title = title,
+                thumb = null,
+                artworkUri = thumbUri,
+                authorName = authorName,
+                nostrUriCallback = nostrUriCallback,
+                accountViewModel = accountViewModel,
+                onDialog = onDialog
+            )
         }
     }
 }
 
-@OptIn(ExperimentalTime::class)
 @Composable
 fun VideoView(
     videoUri: String,
-    description: String? = null,
+    title: String? = null,
     thumb: VideoThumb? = null,
-    onDialog: ((Boolean) -> Unit)? = null
+    artworkUri: String? = null,
+    authorName: String? = null,
+    nostrUriCallback: String? = null,
+    onDialog: ((Boolean) -> Unit)? = null,
+    accountViewModel: AccountViewModel,
+    alwaysShowVideo: Boolean = false
 ) {
-    val (value, elapsed) = measureTimedValue {
-        VideoView1(videoUri, description, thumb, onDialog)
-    }
-    Log.d("Rendering Metrics", "VideoView $elapsed $videoUri")
+    val defaultToStart by remember(videoUri) { mutableStateOf(DefaultMutedSetting.value) }
+
+    VideoViewInner(
+        videoUri,
+        defaultToStart,
+        title,
+        thumb,
+        artworkUri,
+        authorName,
+        nostrUriCallback,
+        alwaysShowVideo,
+        accountViewModel,
+        onDialog
+    )
 }
 
 @Composable
-fun VideoView1(
+@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
+fun VideoViewInner(
     videoUri: String,
-    description: String? = null,
+    defaultToStart: Boolean = false,
+    title: String? = null,
     thumb: VideoThumb? = null,
+    artworkUri: String? = null,
+    authorName: String? = null,
+    nostrUriCallback: String? = null,
+    alwaysShowVideo: Boolean = false,
+    accountViewModel: AccountViewModel,
     onDialog: ((Boolean) -> Unit)? = null
 ) {
-    var exoPlayerData by remember { mutableStateOf<VideoPlayer?>(null) }
-    val defaultToStart by remember { mutableStateOf(DefaultMutedSetting.value) }
+    val settings = accountViewModel.account.settings
+    val isMobile = ConnectivityStatus.isOnMobileData.value
+
+    val automaticallyStartPlayback = remember {
+        mutableStateOf(
+            if (alwaysShowVideo) { true } else {
+                when (settings.automaticallyStartPlayback) {
+                    true -> !isMobile
+                    false -> false
+                    else -> true
+                }
+            }
+        )
+    }
+
+    if (!automaticallyStartPlayback.value) {
+        ImageUrlWithDownloadButton(url = videoUri, showImage = automaticallyStartPlayback)
+    } else {
+        VideoPlayerMutex(videoUri) { activeOnScreen ->
+            val mediaItem = remember(videoUri) {
+                MediaItem.Builder()
+                    .setMediaId(videoUri)
+                    .setUri(videoUri)
+                    .setMediaMetadata(
+                        MediaMetadata.Builder()
+                            .setArtist(authorName?.ifBlank { null })
+                            .setTitle(title?.ifBlank { null } ?: videoUri)
+                            .setArtworkUri(
+                                try {
+                                    if (artworkUri != null) {
+                                        Uri.parse(artworkUri)
+                                    } else {
+                                        null
+                                    }
+                                } catch (e: Exception) {
+                                    null
+                                }
+                            )
+                            .build()
+                    )
+                    .build()
+            }
+
+            GetVideoController(
+                mediaItem = mediaItem,
+                videoUri = videoUri,
+                defaultToStart = defaultToStart,
+                nostrUriCallback = nostrUriCallback
+            ) { controller, keepPlaying ->
+                RenderVideoPlayer(controller, thumb, keepPlaying, automaticallyStartPlayback, activeOnScreen, onDialog)
+            }
+        }
+    }
+}
+
+@Composable
+@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
+fun GetVideoController(
+    mediaItem: MediaItem,
+    videoUri: String,
+    defaultToStart: Boolean = false,
+    nostrUriCallback: String? = null,
+    inner: @Composable (controller: MediaController, keepPlaying: MutableState<Boolean>) -> Unit
+) {
     val context = LocalContext.current
 
+    val controller = remember(videoUri) {
+        mutableStateOf<MediaController?>(
+            if (videoUri == keepPlayingMutex?.currentMediaItem?.mediaId) keepPlayingMutex else null
+        )
+    }
+
+    val keepPlaying = remember(videoUri) {
+        mutableStateOf<Boolean>(
+            keepPlayingMutex != null && controller.value == keepPlayingMutex
+        )
+    }
+
+    val uid = remember(videoUri) {
+        UUID.randomUUID().toString()
+    }
+
+    // Prepares a VideoPlayer from the foreground service.
     LaunchedEffect(key1 = videoUri) {
-        if (exoPlayerData == null) {
-            launch(Dispatchers.Default) {
-                exoPlayerData = VideoPlayer(ExoPlayer.Builder(context).build())
-            }
-        }
-    }
+        // If it is not null, the user might have come back from a playing video, like clicking on
+        // the notification of the video player.
+        if (controller.value == null) {
+            launch(Dispatchers.IO) {
+                PlaybackClientController.prepareController(
+                    uid,
+                    videoUri,
+                    nostrUriCallback,
+                    context
+                ) {
+                    // checks again because of race conditions.
+                    if (controller.value == null) { // still prone to race conditions.
+                        controller.value = it
 
-    exoPlayerData?.let {
-        VideoView(videoUri, description, it, defaultToStart, thumb, onDialog)
-    }
+                        if (!it.isPlaying) {
+                            if (keepPlayingMutex?.isPlaying == true) {
+                                // There is a video playing, start this one on mute.
+                                controller.value?.volume = 0f
+                            } else {
+                                // There is no other video playing. Use the default mute state to
+                                // decide if sound is on or not.
+                                controller.value?.volume = if (defaultToStart) 0f else 1f
+                            }
+                        }
 
-    DisposableEffect(Unit) {
-        onDispose {
-            exoPlayerData?.exoPlayer?.release()
-        }
-    }
-}
+                        controller.value?.setMediaItem(mediaItem)
+                        controller.value?.prepare()
+                    } else if (controller.value != it) {
+                        // discards the new controller because there is an existing one
+                        it.stop()
+                        it.release()
 
-@OptIn(ExperimentalTime::class)
-@Composable
-fun VideoView(
-    videoUri: String,
-    description: String? = null,
-    exoPlayerData: VideoPlayer,
-    defaultToStart: Boolean = false,
-    thumb: VideoThumb? = null,
-    onDialog: ((Boolean) -> Unit)? = null
-) {
-    val (value, elapsed) = measureTimedValue {
-        VideoView1(videoUri, description, exoPlayerData, defaultToStart, thumb, onDialog)
-    }
-    Log.d("Rendering Metrics", "VideoView $elapsed $videoUri")
-}
+                        controller.value?.let {
+                            if (it.playbackState == Player.STATE_IDLE || it.playbackState == Player.STATE_ENDED) {
+                                if (it.isPlaying) {
+                                    // There is a video playing, start this one on mute.
+                                    it.volume = 0f
+                                } else {
+                                    // There is no other video playing. Use the default mute state to
+                                    // decide if sound is on or not.
+                                    it.volume = if (defaultToStart) 0f else 1f
+                                }
 
-@Composable
-fun VideoView1(
-    videoUri: String,
-    description: String? = null,
-    exoPlayerData: VideoPlayer,
-    defaultToStart: Boolean = false,
-    thumb: VideoThumb? = null,
-    onDialog: ((Boolean) -> Unit)? = null
-) {
-    val lifecycleOwner = rememberUpdatedState(LocalLifecycleOwner.current)
-
-    val media = remember { MediaItem.Builder().setUri(videoUri).build() }
-
-    exoPlayerData.exoPlayer.apply {
-        repeatMode = Player.REPEAT_MODE_ALL
-        videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT
-        volume = if (defaultToStart) 0f else 1f
-        if (videoUri.startsWith("file")) {
-            setMediaItem(media)
-        } else if (videoUri.endsWith("m3u8")) {
-            // Should not use cache.
-            val dataSourceFactory: DataSource.Factory = OkHttpDataSource.Factory(HttpClient.getHttpClient())
-            setMediaSource(
-                HlsMediaSource.Factory(dataSourceFactory).createMediaSource(
-                    media
-                )
-            )
-        } else {
-            setMediaSource(
-                ProgressiveMediaSource.Factory(VideoCache.get()).createMediaSource(
-                    media
-                )
-            )
-        }
-        prepare()
-    }
-
-    RenderVideoPlayer(exoPlayerData, thumb, onDialog)
-
-    DisposableEffect(Unit) {
-        val observer = LifecycleEventObserver { _, event ->
-            when (event) {
-                Lifecycle.Event.ON_PAUSE -> {
-                    exoPlayerData.exoPlayer.pause()
+                                it.setMediaItem(mediaItem)
+                                it.prepare()
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            controller.value?.let {
+                if (it.playbackState == Player.STATE_IDLE || it.playbackState == Player.STATE_ENDED) {
+                    if (it.isPlaying) {
+                        // There is a video playing, start this one on mute.
+                        it.volume = 0f
+                    } else {
+                        // There is no other video playing. Use the default mute state to
+                        // decide if sound is on or not.
+                        it.volume = if (defaultToStart) 0f else 1f
+                    }
+
+                    it.setMediaItem(mediaItem)
+                    it.prepare()
                 }
-                else -> {}
             }
         }
-        val lifecycle = lifecycleOwner.value.lifecycle
+    }
 
-        lifecycle.addObserver(observer)
+    controller.value?.let {
+        inner(it, keepPlaying)
+    }
+
+    // User pauses and resumes the app. What to do with videos?
+    val scope = rememberCoroutineScope()
+    val lifeCycleOwner = LocalLifecycleOwner.current
+    DisposableEffect(key1 = videoUri) {
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
+                // if the controller is null, restarts the controller with a new one
+                // if the controller is not null, just continue playing what the controller was playing
+                if (controller.value == null) {
+                    scope.launch(Dispatchers.IO) {
+                        PlaybackClientController.prepareController(
+                            UUID.randomUUID().toString(),
+                            videoUri,
+                            nostrUriCallback,
+                            context
+                        ) {
+                            // checks again to make sure no other thread has created a controller.
+                            if (controller.value == null) {
+                                controller.value = it
+
+                                if (!it.isPlaying) {
+                                    if (keepPlayingMutex?.isPlaying == true) {
+                                        // There is a video playing, start this one on mute.
+                                        controller.value?.volume = 0f
+                                    } else {
+                                        // There is no other video playing. Use the default mute state to
+                                        // decide if sound is on or not.
+                                        controller.value?.volume = if (defaultToStart) 0f else 1f
+                                    }
+                                }
+
+                                controller.value?.setMediaItem(mediaItem)
+                                controller.value?.prepare()
+                            } else if (controller.value != it) {
+                                // discards the new controller because there is an existing one
+                                it.stop()
+                                it.release()
+                            }
+                        }
+                    }
+                }
+            }
+            if (event == Lifecycle.Event.ON_PAUSE) {
+                if (!keepPlaying.value) {
+                    // Stops and releases the media.
+                    controller.value?.stop()
+                    controller.value?.release()
+                    controller.value = null
+                }
+            }
+        }
+
+        lifeCycleOwner.lifecycle.addObserver(observer)
         onDispose {
-            lifecycle.removeObserver(observer)
+            lifeCycleOwner.lifecycle.removeObserver(observer)
+
+            if (!keepPlaying.value) {
+                // Stops and releases the media.
+                controller.value?.stop()
+                controller.value?.release()
+                controller.value = null
+            }
         }
     }
 }
 
+// background playing mutex.
+var keepPlayingMutex: MediaController? = null
+
+// This keeps the position of all visible videos in the current screen.
+val trackingVideos = mutableListOf<VisibilityData>()
+
 @Stable
-data class VideoPlayer(
-    val exoPlayer: ExoPlayer
-)
+class VisibilityData() {
+    var distanceToCenter: Float? = null
+}
+
+/**
+ * This function selects only one Video to be active. The video that is closest to the center of
+ * the screen wins the mutex.
+ */
+@Composable
+fun VideoPlayerMutex(videoUri: String, inner: @Composable (MutableState<Boolean>) -> Unit) {
+    val myCache = remember(videoUri) {
+        VisibilityData()
+    }
+
+    // Is the current video the closest to the center?
+    val active = remember(videoUri) {
+        mutableStateOf<Boolean>(false)
+    }
+
+    // Keep track of all available videos.
+    DisposableEffect(key1 = videoUri) {
+        trackingVideos.add(myCache)
+        onDispose {
+            trackingVideos.remove(myCache)
+        }
+    }
+
+    Box(
+        Modifier
+            .fillMaxWidth()
+            .defaultMinSize(minHeight = 70.dp)
+            .onVisiblePositionChanges { distanceToCenter ->
+                myCache.distanceToCenter = distanceToCenter
+
+                if (distanceToCenter != null) {
+                    // finds out of the current video is the closest to the center.
+                    var newActive = true
+                    for (video in trackingVideos) {
+                        val videoPos = video.distanceToCenter
+                        if (videoPos != null && videoPos < distanceToCenter) {
+                            newActive = false
+                            break
+                        }
+                    }
+
+                    // marks the current video active
+                    if (active.value != newActive) {
+                        active.value = newActive
+                    }
+                } else {
+                    // got out of screen, marks video as inactive
+                    if (active.value) {
+                        active.value = false
+                    }
+                }
+            }
+    ) {
+        inner(active)
+    }
+}
 
 @Stable
 data class VideoThumb(
@@ -227,29 +470,32 @@ data class VideoThumb(
 )
 
 @Composable
+@OptIn(UnstableApi::class)
 private fun RenderVideoPlayer(
-    playerData: VideoPlayer,
+    controller: MediaController,
     thumbData: VideoThumb?,
+    keepPlaying: MutableState<Boolean>,
+    automaticallyStartPlayback: MutableState<Boolean>,
+    activeOnScreen: MutableState<Boolean>,
     onDialog: ((Boolean) -> Unit)?
 ) {
     val context = LocalContext.current
 
+    ControlWhenPlayerIsActive(controller, keepPlaying, automaticallyStartPlayback, activeOnScreen)
+
+    val controllerVisible = remember(controller) {
+        mutableStateOf(false)
+    }
+
     BoxWithConstraints() {
         AndroidView(
             modifier = Modifier
                 .fillMaxWidth()
                 .defaultMinSize(minHeight = 70.dp)
-                .align(Alignment.Center)
-                .onVisibilityChanges { visible ->
-                    if (visible && !playerData.exoPlayer.isPlaying) {
-                        playerData.exoPlayer.play()
-                    } else if (!visible && playerData.exoPlayer.isPlaying) {
-                        playerData.exoPlayer.pause()
-                    }
-                },
+                .align(Alignment.Center),
             factory = {
-                StyledPlayerView(context).apply {
-                    player = playerData.exoPlayer
+                PlayerView(context).apply {
+                    player = controller
                     layoutParams = FrameLayout.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT,
                         ViewGroup.LayoutParams.WRAP_CONTENT
@@ -261,18 +507,102 @@ private fun RenderVideoPlayer(
                         if (maxHeight.isFinite) AspectRatioFrameLayout.RESIZE_MODE_FIT else AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
                     onDialog?.let { innerOnDialog ->
                         setFullscreenButtonClickListener {
-                            playerData.exoPlayer.pause()
+                            controller.pause()
                             innerOnDialog(it)
                         }
                     }
+                    setControllerVisibilityListener(
+                        PlayerView.ControllerVisibilityListener {
+                            controllerVisible.value = it == View.VISIBLE
+                        }
+                    )
                 }
             }
         )
 
-        MuteButton() { mute: Boolean ->
+        val startingMuteState = remember(controller) {
+            controller.volume < 0.001
+        }
+
+        MuteButton(controllerVisible, startingMuteState) { mute: Boolean ->
+            // makes the new setting the default for new creations.
             DefaultMutedSetting.value = mute
 
-            playerData.exoPlayer.volume = if (mute) 0f else 1f
+            // if the user unmutes a video and it's not the current playing, switches to that one.
+            if (!mute && keepPlayingMutex != null && keepPlayingMutex != controller) {
+                keepPlayingMutex?.stop()
+                keepPlayingMutex = null
+            }
+
+            controller.volume = if (mute) 0f else 1f
+        }
+
+        KeepPlayingButton(keepPlaying, controllerVisible, Modifier.align(Alignment.TopEnd)) { newKeepPlaying: Boolean ->
+            // If something else is playing and the user marks this video to keep playing, stops the other one.
+            if (newKeepPlaying) {
+                if (keepPlayingMutex != null && keepPlayingMutex != controller) {
+                    keepPlayingMutex?.stop()
+                }
+                keepPlayingMutex = controller
+            } else {
+                if (keepPlayingMutex == controller) {
+                    keepPlayingMutex = null
+                }
+            }
+
+            keepPlaying.value = newKeepPlaying
+        }
+    }
+}
+
+@Composable
+fun ControlWhenPlayerIsActive(
+    controller: Player,
+    keepPlaying: MutableState<Boolean>,
+    automaticallyStartPlayback: MutableState<Boolean>,
+    activeOnScreen: MutableState<Boolean>
+) {
+    // active means being fully visible
+    if (activeOnScreen.value) {
+        // should auto start video from settings?
+        if (!automaticallyStartPlayback.value) {
+            if (controller.isPlaying) {
+                // if it is visible, it's playing but it wasn't supposed to start automatically.
+                controller.pause()
+            }
+        } else if (!controller.isPlaying) {
+            // if it is visible, was supposed to start automatically, but it's not
+
+            // If something else is playing, play on mute.
+            if (keepPlayingMutex != null && keepPlayingMutex != controller) {
+                controller.volume = 0f
+            }
+            controller.play()
+        }
+    } else {
+        // Pauses the video when it becomes invisible.
+        // Destroys the video later when it Disposes the element
+        // meanwhile if the user comes back, the position in the track is saved.
+        if (!keepPlaying.value) {
+            controller.pause()
+        }
+    }
+
+    val view = LocalView.current
+
+    // Keeps the screen on while playing and viewing videos.
+    DisposableEffect(key1 = controller) {
+        val listener = object : Player.Listener {
+            override fun onIsPlayingChanged(isPlaying: Boolean) {
+                // doesn't consider the mutex because the screen can turn off if the video
+                // being played in the mutex is not visible.
+                view.keepScreenOn = isPlaying
+            }
+        }
+
+        controller.addListener(listener)
+        onDispose {
+            controller.removeListener(listener)
         }
     }
 }
@@ -293,12 +623,15 @@ fun Modifier.onVisibilityChanges(onVisibilityChanges: (Boolean) -> Unit): Modifi
 fun LayoutCoordinates.isCompletelyVisible(view: View): Boolean {
     if (!isAttached) return false
     // Window relative bounds of our compose root view that are visible on the screen
-    val globalRootRect = android.graphics.Rect()
+    val globalRootRect = Rect()
     if (!view.getGlobalVisibleRect(globalRootRect)) {
         // we aren't visible at all.
         return false
     }
     val bounds = boundsInWindow()
+
+    if (bounds.isEmpty) return false
+
     // Make sure we are completely in bounds.
     return bounds.top >= globalRootRect.top &&
         bounds.left >= globalRootRect.left &&
@@ -306,47 +639,127 @@ fun LayoutCoordinates.isCompletelyVisible(view: View): Boolean {
         bounds.bottom <= globalRootRect.bottom
 }
 
-@Composable
-private fun MuteButton(toggle: (Boolean) -> Unit) {
-    Box(
-        remember {
-            Modifier
-                .width(70.dp)
-                .height(70.dp)
-                .padding(10.dp)
-        }
+fun Modifier.onVisiblePositionChanges(onVisiblePosition: (Float?) -> Unit): Modifier = composed {
+    val view = LocalView.current
+
+    onGloballyPositioned { coordinates ->
+        onVisiblePosition(coordinates.getDistanceToVertCenterIfVisible(view))
+    }
+}
+
+fun LayoutCoordinates.getDistanceToVertCenterIfVisible(view: View): Float? {
+    if (!isAttached) return null
+    // Window relative bounds of our compose root view that are visible on the screen
+    val globalRootRect = Rect()
+    if (!view.getGlobalVisibleRect(globalRootRect)) {
+        // we aren't visible at all.
+        return null
+    }
+
+    val bounds = boundsInWindow()
+
+    if (bounds.isEmpty) return null
+
+    // Make sure we are completely in bounds.
+    if (bounds.top >= globalRootRect.top &&
+        bounds.left >= globalRootRect.left &&
+        bounds.right <= globalRootRect.right &&
+        bounds.bottom <= globalRootRect.bottom
     ) {
-        Box(
-            Modifier
-                .clip(CircleShape)
-                .fillMaxSize(0.6f)
-                .align(Alignment.Center)
-                .background(MaterialTheme.colors.background)
+        return abs(((bounds.top + bounds.bottom) / 2) - ((globalRootRect.top + globalRootRect.bottom) / 2))
+    }
+
+    return null
+}
+
+@Composable
+private fun MuteButton(
+    controllerVisible: MutableState<Boolean>,
+    startingMuteState: Boolean,
+    toggle: (Boolean) -> Unit
+) {
+    val holdOn = remember {
+        mutableStateOf<Boolean>(
+            true
         )
+    }
 
-        val mutedInstance = remember { mutableStateOf(DefaultMutedSetting.value) }
+    LaunchedEffect(key1 = controllerVisible) {
+        launch(Dispatchers.Default) {
+            delay(2000)
+            holdOn.value = false
+        }
+    }
 
-        IconButton(
-            onClick = {
-                mutedInstance.value = !mutedInstance.value
-                toggle(mutedInstance.value)
-            },
-            modifier = Modifier.size(50.dp)
-        ) {
-            if (mutedInstance.value) {
-                Icon(
-                    imageVector = Icons.Default.VolumeOff,
-                    "Hash Verified",
-                    tint = MaterialTheme.colors.onBackground,
-                    modifier = Modifier.size(30.dp)
-                )
-            } else {
-                Icon(
-                    imageVector = Icons.Default.VolumeUp,
-                    "Hash Verified",
-                    tint = MaterialTheme.colors.onBackground,
-                    modifier = Modifier.size(30.dp)
-                )
+    val mutedInstance = remember(startingMuteState) { mutableStateOf(startingMuteState) }
+
+    AnimatedVisibility(
+        visible = holdOn.value || controllerVisible.value,
+        enter = fadeIn(),
+        exit = fadeOut()
+    ) {
+        Box(modifier = VolumeBottomIconSize) {
+            Box(
+                Modifier
+                    .clip(CircleShape)
+                    .fillMaxSize(0.6f)
+                    .align(Alignment.Center)
+                    .background(MaterialTheme.colors.background)
+            )
+
+            IconButton(
+                onClick = {
+                    mutedInstance.value = !mutedInstance.value
+                    toggle(mutedInstance.value)
+                },
+                modifier = Size50Modifier
+            ) {
+                if (mutedInstance.value) {
+                    MutedIcon()
+                } else {
+                    MuteIcon()
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun KeepPlayingButton(
+    keepPlayingStart: MutableState<Boolean>,
+    controllerVisible: MutableState<Boolean>,
+    alignment: Modifier,
+    toggle: (Boolean) -> Unit
+) {
+    val keepPlaying = remember(keepPlayingStart.value) { mutableStateOf(keepPlayingStart.value) }
+
+    AnimatedVisibility(
+        visible = controllerVisible.value,
+        modifier = alignment,
+        enter = fadeIn(),
+        exit = fadeOut()
+    ) {
+        Box(modifier = PinBottomIconSize) {
+            Box(
+                Modifier
+                    .clip(CircleShape)
+                    .fillMaxSize(0.6f)
+                    .align(Alignment.Center)
+                    .background(MaterialTheme.colors.background)
+            )
+
+            IconButton(
+                onClick = {
+                    keepPlaying.value = !keepPlaying.value
+                    toggle(keepPlaying.value)
+                },
+                modifier = Size50Modifier
+            ) {
+                if (keepPlaying.value) {
+                    LyricsIcon(Size22Modifier, MaterialTheme.colors.onBackground)
+                } else {
+                    LyricsOffIcon(Size22Modifier, MaterialTheme.colors.onBackground)
+                }
             }
         }
     }

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

@@ -1,11 +1,13 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import android.app.Activity
 import android.content.Context
+import android.content.ContextWrapper
 import android.os.Build
 import android.util.Log
+import android.view.Window
 import android.widget.Toast
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
@@ -27,14 +29,11 @@ import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
-import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Report
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.Immutable
@@ -47,12 +46,10 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.Placeholder
 import androidx.compose.ui.text.PlaceholderVerticalAlign
@@ -62,6 +59,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.isFinite
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.DialogWindowProvider
 import androidx.core.net.toUri
 import coil.annotation.ExperimentalCoilApi
 import coil.compose.AsyncImage
@@ -70,11 +68,19 @@ import coil.imageLoader
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.BlurHashRequester
+import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.actions.LoadingAnimation
 import com.vitorpamplona.amethyst.ui.actions.SaveToGallery
 import com.vitorpamplona.amethyst.ui.note.BlankNote
+import com.vitorpamplona.amethyst.ui.note.DownloadForOfflineIcon
+import com.vitorpamplona.amethyst.ui.note.HashCheckFailedIcon
+import com.vitorpamplona.amethyst.ui.note.HashCheckIcon
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.Font17SP
+import com.vitorpamplona.amethyst.ui.theme.Size20dp
+import com.vitorpamplona.amethyst.ui.theme.Size24dp
+import com.vitorpamplona.amethyst.ui.theme.Size30dp
 import com.vitorpamplona.amethyst.ui.theme.imageModifier
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@@ -117,7 +123,9 @@ class ZoomableUrlVideo(
     description: String? = null,
     hash: String? = null,
     dim: String? = null,
-    uri: String? = null
+    uri: String? = null,
+    val artworkUri: String? = null,
+    val authorName: String? = null
 ) : ZoomableUrlContent(url, description, hash, dim, uri)
 
 @Immutable
@@ -148,7 +156,9 @@ class ZoomableLocalVideo(
     description: String? = null,
     dim: String? = null,
     isVerified: Boolean? = null,
-    uri: String
+    uri: String,
+    val artworkUri: String? = null,
+    val authorName: String? = null
 ) : ZoomablePreloadedContent(localFile, description, mimeType, isVerified, dim, uri)
 
 fun figureOutMimeType(fullUrl: String): ZoomableContent {
@@ -167,7 +177,11 @@ fun figureOutMimeType(fullUrl: String): ZoomableContent {
 
 @Composable
 @OptIn(ExperimentalFoundationApi::class)
-fun ZoomableContentView(content: ZoomableContent, images: ImmutableList<ZoomableContent> = listOf(content).toImmutableList()) {
+fun ZoomableContentView(
+    content: ZoomableContent,
+    images: ImmutableList<ZoomableContent> = listOf(content).toImmutableList(),
+    accountViewModel: AccountViewModel
+) {
     val clipboardManager = LocalClipboardManager.current
 
     // store the dialog open or close state
@@ -194,27 +208,61 @@ fun ZoomableContentView(content: ZoomableContent, images: ImmutableList<Zoomable
     }
 
     when (content) {
-        is ZoomableUrlImage -> UrlImageView(content, mainImageModifier)
-        is ZoomableUrlVideo -> VideoView(content.url, content.description) { dialogOpen = true }
-        is ZoomableLocalImage -> LocalImageView(content, mainImageModifier)
+        is ZoomableUrlImage -> UrlImageView(content, mainImageModifier, accountViewModel)
+        is ZoomableUrlVideo -> VideoView(
+            videoUri = content.url,
+            title = content.description,
+            artworkUri = content.artworkUri,
+            authorName = content.authorName,
+            nostrUriCallback = content.uri,
+            onDialog = { dialogOpen = true },
+            accountViewModel = accountViewModel
+        )
+
+        is ZoomableLocalImage -> LocalImageView(content, mainImageModifier, accountViewModel)
         is ZoomableLocalVideo ->
             content.localFile?.let {
-                VideoView(it.toUri().toString(), content.description) { dialogOpen = true }
+                VideoView(
+                    videoUri = it.toUri().toString(),
+                    title = content.description,
+                    artworkUri = content.artworkUri,
+                    authorName = content.authorName,
+                    nostrUriCallback = content.uri,
+                    onDialog = { dialogOpen = true },
+                    accountViewModel = accountViewModel
+                )
             }
     }
 
     if (dialogOpen) {
-        ZoomableImageDialog(content, images, onDismiss = { dialogOpen = false })
+        ZoomableImageDialog(content, images, onDismiss = { dialogOpen = false }, accountViewModel)
     }
 }
 
 @Composable
 private fun LocalImageView(
     content: ZoomableLocalImage,
-    mainImageModifier: Modifier
+    mainImageModifier: Modifier,
+    accountViewModel: AccountViewModel?,
+    alwayShowImage: Boolean = false
 ) {
     if (content.localFile != null && content.localFile.exists()) {
         BoxWithConstraints(contentAlignment = Alignment.Center) {
+            val settings = accountViewModel?.account?.settings
+            val isMobile = ConnectivityStatus.isOnMobileData.value
+
+            val showImage = remember {
+                mutableStateOf(
+                    if (alwayShowImage) { true } else {
+                        when (settings?.automaticallyShowImages) {
+                            true -> !isMobile
+                            false -> false
+                            else -> true
+                        }
+                    }
+                )
+            }
+
             val myModifier = remember {
                 mainImageModifier
                     .widthIn(max = maxWidth)
@@ -236,17 +284,26 @@ private fun LocalImageView(
                 mutableStateOf<AsyncImagePainter.State?>(null)
             }
 
-            AsyncImage(
-                model = content.localFile,
-                contentDescription = content.description,
-                contentScale = contentScale,
-                modifier = myModifier,
-                onState = {
-                    painterState.value = it
-                }
-            )
+            if (showImage.value) {
+                AsyncImage(
+                    model = content.localFile,
+                    contentDescription = content.description,
+                    contentScale = contentScale,
+                    modifier = myModifier,
+                    onState = {
+                        painterState.value = it
+                    }
+                )
+            }
 
-            AddedImageFeatures(painterState, content, contentScale, myModifier, verifierModifier)
+            AddedImageFeatures(
+                painterState,
+                content,
+                contentScale,
+                myModifier,
+                verifierModifier,
+                showImage
+            )
         }
     } else {
         BlankNote()
@@ -256,9 +313,26 @@ private fun LocalImageView(
 @Composable
 private fun UrlImageView(
     content: ZoomableUrlImage,
-    mainImageModifier: Modifier
+    mainImageModifier: Modifier,
+    accountViewModel: AccountViewModel?,
+    alwayShowImage: Boolean = false
 ) {
     BoxWithConstraints(contentAlignment = Alignment.Center) {
+        val settings = accountViewModel?.account?.settings
+        val isMobile = ConnectivityStatus.isOnMobileData.value
+
+        val showImage = remember {
+            mutableStateOf(
+                if (alwayShowImage) { true } else {
+                    when (settings?.automaticallyShowImages) {
+                        true -> !isMobile
+                        false -> false
+                        else -> true
+                    }
+                }
+            )
+        }
+
         val myModifier = remember {
             mainImageModifier
                 .widthIn(max = maxWidth)
@@ -280,17 +354,40 @@ private fun UrlImageView(
             mutableStateOf<AsyncImagePainter.State?>(null)
         }
 
-        AsyncImage(
-            model = content.url,
-            contentDescription = content.description,
-            contentScale = contentScale,
-            modifier = myModifier,
-            onState = {
-                painterState.value = it
-            }
-        )
+        if (showImage.value) {
+            AsyncImage(
+                model = content.url,
+                contentDescription = content.description,
+                contentScale = contentScale,
+                modifier = myModifier,
+                onState = {
+                    painterState.value = it
+                }
+            )
+        }
 
-        AddedImageFeatures(painterState, content, contentScale, myModifier, verifierModifier)
+        AddedImageFeatures(
+            painterState,
+            content,
+            contentScale,
+            myModifier,
+            verifierModifier,
+            showImage
+        )
+    }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun ImageUrlWithDownloadButton(url: String, showImage: MutableState<Boolean>) {
+    FlowRow() {
+        ClickableUrl(urlText = url, url = url)
+        IconButton(
+            modifier = Modifier.size(Size20dp),
+            onClick = { showImage.value = true }
+        ) {
+            DownloadForOfflineIcon(Size24dp)
+        }
     }
 }
 
@@ -301,30 +398,35 @@ private fun AddedImageFeatures(
     content: ZoomableLocalImage,
     contentScale: ContentScale,
     myModifier: Modifier,
-    verifiedModifier: Modifier
+    verifiedModifier: Modifier,
+    showImage: MutableState<Boolean>
 ) {
-    when (painter.value) {
-        null, is AsyncImagePainter.State.Loading -> {
-            if (content.blurhash != null) {
-                DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
-            } else {
-                FlowRow() {
-                    DisplayUrlWithLoadingSymbol(content)
+    if (!showImage.value) {
+        ImageUrlWithDownloadButton(content.uri, showImage)
+    } else {
+        when (painter.value) {
+            null, is AsyncImagePainter.State.Loading -> {
+                if (content.blurhash != null) {
+                    DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
+                } else {
+                    FlowRow() {
+                        DisplayUrlWithLoadingSymbol(content)
+                    }
                 }
             }
-        }
 
-        is AsyncImagePainter.State.Error -> {
-            BlankNote()
-        }
-
-        is AsyncImagePainter.State.Success -> {
-            if (content.isVerified != null) {
-                HashVerificationSymbol(content.isVerified, verifiedModifier)
+            is AsyncImagePainter.State.Error -> {
+                BlankNote()
             }
-        }
 
-        else -> {
+            is AsyncImagePainter.State.Success -> {
+                if (content.isVerified != null) {
+                    HashVerificationSymbol(content.isVerified, verifiedModifier)
+                }
+            }
+
+            else -> {
+            }
         }
     }
 }
@@ -336,46 +438,51 @@ private fun AddedImageFeatures(
     content: ZoomableUrlImage,
     contentScale: ContentScale,
     myModifier: Modifier,
-    verifiedModifier: Modifier
+    verifiedModifier: Modifier,
+    showImage: MutableState<Boolean>
 ) {
-    var verifiedHash by remember {
-        mutableStateOf<Boolean?>(null)
-    }
-
-    when (painter.value) {
-        null, is AsyncImagePainter.State.Loading -> {
-            if (content.blurhash != null) {
-                DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
-            } else {
-                FlowRow() {
-                    DisplayUrlWithLoadingSymbol(content)
-                }
-            }
+    if (!showImage.value) {
+        ImageUrlWithDownloadButton(content.url, showImage)
+    } else {
+        var verifiedHash by remember {
+            mutableStateOf<Boolean?>(null)
         }
 
-        is AsyncImagePainter.State.Error -> {
-            ClickableUrl(urlText = "${content.url} ", url = content.url)
-        }
-
-        is AsyncImagePainter.State.Success -> {
-            if (content.hash != null) {
-                val context = LocalContext.current
-                LaunchedEffect(key1 = content.url) {
-                    launch(Dispatchers.IO) {
-                        val newVerifiedHash = verifyHash(content, context)
-                        if (newVerifiedHash != verifiedHash) {
-                            verifiedHash = newVerifiedHash
-                        }
+        when (painter.value) {
+            null, is AsyncImagePainter.State.Loading -> {
+                if (content.blurhash != null) {
+                    DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
+                } else {
+                    FlowRow() {
+                        DisplayUrlWithLoadingSymbol(content)
                     }
                 }
             }
 
-            verifiedHash?.let {
-                HashVerificationSymbol(it, verifiedModifier)
+            is AsyncImagePainter.State.Error -> {
+                ClickableUrl(urlText = "${content.url} ", url = content.url)
             }
-        }
 
-        else -> {
+            is AsyncImagePainter.State.Success -> {
+                if (content.hash != null) {
+                    val context = LocalContext.current
+                    LaunchedEffect(key1 = content.url) {
+                        launch(Dispatchers.IO) {
+                            val newVerifiedHash = verifyHash(content, context)
+                            if (newVerifiedHash != verifiedHash) {
+                                verifiedHash = newVerifiedHash
+                            }
+                        }
+                    }
+                }
+
+                verifiedHash?.let {
+                    HashVerificationSymbol(it, verifiedModifier)
+                }
+            }
+
+            else -> {
+            }
         }
     }
 }
@@ -473,7 +580,12 @@ private fun DisplayBlurHash(
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: ImmutableList<ZoomableContent> = listOf(imageUrl).toImmutableList(), onDismiss: () -> Unit) {
+fun ZoomableImageDialog(
+    imageUrl: ZoomableContent,
+    allImages: ImmutableList<ZoomableContent> = listOf(imageUrl).toImmutableList(),
+    onDismiss: () -> Unit,
+    accountViewModel: AccountViewModel
+) {
     val view = LocalView.current
 
     DisposableEffect(key1 = Unit) {
@@ -515,11 +627,11 @@ fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: ImmutableList<Zoom
                         pagerState = pagerState,
                         itemsCount = allImages.size,
                         itemContent = { index ->
-                            RenderImageOrVideo(allImages[index])
+                            RenderImageOrVideo(allImages[index], accountViewModel)
                         }
                     )
                 } else {
-                    RenderImageOrVideo(imageUrl)
+                    RenderImageOrVideo(imageUrl, accountViewModel)
                 }
 
                 Row(
@@ -535,7 +647,10 @@ fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: ImmutableList<Zoom
                     if (myContent is ZoomableUrlContent) {
                         SaveToGallery(url = myContent.url)
                     } else if (myContent is ZoomableLocalImage && myContent.localFile != null) {
-                        SaveToGallery(localFile = myContent.localFile, mimeType = myContent.mimeType)
+                        SaveToGallery(
+                            localFile = myContent.localFile,
+                            mimeType = myContent.mimeType
+                        )
                     }
                 }
             }
@@ -544,23 +659,37 @@ fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: ImmutableList<Zoom
 }
 
 @Composable
-fun RenderImageOrVideo(content: ZoomableContent) {
+private fun RenderImageOrVideo(content: ZoomableContent, accountViewModel: AccountViewModel) {
     val mainModifier = Modifier
         .fillMaxSize()
         .zoomable(rememberZoomState())
 
     if (content is ZoomableUrlImage) {
-        UrlImageView(content = content, mainImageModifier = mainModifier)
+        UrlImageView(content = content, mainImageModifier = mainModifier, accountViewModel, alwayShowImage = true)
     } else if (content is ZoomableUrlVideo) {
         Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxSize(1f)) {
-            VideoView(content.url, content.description)
+            VideoView(
+                videoUri = content.url,
+                title = content.description,
+                artworkUri = content.artworkUri,
+                authorName = content.authorName,
+                accountViewModel = accountViewModel,
+                alwaysShowVideo = true
+            )
         }
     } else if (content is ZoomableLocalImage) {
-        LocalImageView(content = content, mainImageModifier = mainModifier)
+        LocalImageView(content = content, mainImageModifier = mainModifier, accountViewModel, alwayShowImage = true)
     } else if (content is ZoomableLocalVideo) {
         Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxSize(1f)) {
             content.localFile?.let {
-                VideoView(it.toUri().toString(), content.description)
+                VideoView(
+                    videoUri = it.toUri().toString(),
+                    title = content.description,
+                    artworkUri = content.artworkUri,
+                    authorName = content.authorName,
+                    accountViewModel = accountViewModel,
+                    alwaysShowVideo = true
+                )
             }
         }
     }
@@ -608,12 +737,7 @@ private fun HashVerificationSymbol(verifiedHash: Boolean, modifier: Modifier) {
                     }
                 }
             ) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_verified),
-                    "Hash Verified",
-                    tint = Color.Unspecified,
-                    modifier = Modifier.size(30.dp)
-                )
+                HashCheckIcon(Size30dp)
             }
         } else {
             IconButton(
@@ -627,13 +751,22 @@ private fun HashVerificationSymbol(verifiedHash: Boolean, modifier: Modifier) {
                     }
                 }
             ) {
-                Icon(
-                    tint = Color.Red,
-                    imageVector = Icons.Default.Report,
-                    contentDescription = "Invalid Hash",
-                    modifier = Modifier.size(30.dp)
-                )
+                HashCheckFailedIcon(Size30dp)
             }
         }
     }
 }
+
+// Window utils
+@Composable
+fun getDialogWindow(): Window? = (LocalView.current.parent as? DialogWindowProvider)?.window
+
+@Composable
+fun getActivityWindow(): Window? = LocalView.current.context.getActivityWindow()
+
+private tailrec fun Context.getActivityWindow(): Window? =
+    when (this) {
+        is Activity -> window
+        is ContextWrapper -> baseContext.getActivityWindow()
+        else -> null
+    }

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

@@ -32,7 +32,9 @@ class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Not
                 ?.lastOrNull { it.event != null }
         }
 
-        val publicChannels = account.followingChannels().map { it ->
+        val publicChannels = account.selectedChatsFollowList().mapNotNull {
+            LocalCache.getChannelIfExists(it)
+        }.mapNotNull { it ->
             it.notes.values
                 .filter { account.isAcceptable(it) && it.event != null }
                 .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
@@ -40,7 +42,6 @@ class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Not
         }
 
         return (privateMessages + publicChannels)
-            .filterNotNull()
             .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
     }
@@ -106,7 +107,7 @@ class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Not
     }
 
     private fun filterRelevantPublicMessages(newItems: Set<Note>, account: Account): MutableMap<String, Note> {
-        val followingChannels = account.followingChannels
+        val followingChannels = account.userProfile().latestContactList?.taggedEvents()?.toSet() ?: emptySet()
         val newRelevantPublicMessages = mutableMapOf<String, Note>()
         newItems.filter { it.event is ChannelMessageEvent }.forEach { newNote ->
             newNote.channelHex()?.let { channelHex ->