v0.70.4

fix KeepPlayingButton color in light theme

app/build.gradle

@@ -13,14 +13,14 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 257
-        versionName "0.70.0"
+        versionCode 261
+        versionName "0.70.4"
 
         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", "ja")
+        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 {

app/src/main/AndroidManifest.xml

@@ -32,7 +32,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 
     <!-- Keeps screen on while playing videos -->
-    <uses-permission android:name="android.Manifest.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <!-- Old permission to access media -->
     <uses-permission

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

@@ -12,11 +12,15 @@ 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 = LruCache<String, Long>(100)
-
+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>()
 
@@ -62,7 +66,6 @@ class MultiPlayerPlaybackManager(private val dataSourceFactory: androidx.media3.
             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 {
@@ -76,8 +79,10 @@ class MultiPlayerPlaybackManager(private val dataSourceFactory: androidx.media3.
         player.addListener(object : Player.Listener {
             override fun onIsPlayingChanged(isPlaying: Boolean) {
                 if (isPlaying) {
+                    player.setWakeMode(C.WAKE_MODE_NETWORK)
                     playingMap.put(id, mediaSession)
                 } else {
+                    player.setWakeMode(C.WAKE_MODE_NONE)
                     cache.put(id, mediaSession)
                     playingMap.remove(id, mediaSession)
                 }
@@ -87,7 +92,7 @@ class MultiPlayerPlaybackManager(private val dataSourceFactory: androidx.media3.
                 when (playbackState) {
                     STATE_IDLE -> {
                         if (player.currentPosition > 5 * 60) { // 5 seconds
-                            cachedPositions.put(uri, player.currentPosition)
+                            cachedPositions.add(uri, player.currentPosition)
                         }
                     }
                     STATE_READY -> {
@@ -99,7 +104,7 @@ class MultiPlayerPlaybackManager(private val dataSourceFactory: androidx.media3.
                     }
                     else -> {
                         if (player.currentPosition > 5 * 60) { // 5 seconds
-                            cachedPositions.put(uri, player.currentPosition)
+                            cachedPositions.add(uri, player.currentPosition)
                         }
                     }
                 }
@@ -112,7 +117,14 @@ class MultiPlayerPlaybackManager(private val dataSourceFactory: androidx.media3.
     }
 
     fun releaseAppPlayers() {
-        cache.evictAll()
+        GlobalScope.launch(Dispatchers.Main) {
+            cache.evictAll()
+            playingMap.forEach {
+                it.value.player.release()
+                it.value.release()
+            }
+            playingMap.clear()
+        }
     }
 
     fun playingContent(): Collection<MediaSession> {

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

@@ -4,6 +4,7 @@ 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
@@ -12,31 +13,55 @@ import com.vitorpamplona.amethyst.service.HttpClient
 
 @UnstableApi // Extend MediaSessionService
 class PlaybackService : MediaSessionService() {
-    private val managerHls = MultiPlayerPlaybackManager(HlsMediaSource.Factory(OkHttpDataSource.Factory(HttpClient.getHttpClient())))
-    private val managerProgressive = MultiPlayerPlaybackManager(ProgressiveMediaSource.Factory(VideoCache.get()))
-    private val managerLocal = MultiPlayerPlaybackManager()
+    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)
-                // .setNotificationIdProvider { session -> session.id.hashCode() }
-                .build()
+            DefaultMediaNotificationProvider.Builder(applicationContext).build()
         )
     }
 
     override fun onDestroy() {
-        managerHls.releaseAppPlayers()
-        managerLocal.releaseAppPlayers()
-        managerProgressive.releaseAppPlayers()
+        managerHls?.releaseAppPlayers()
+        managerLocal?.releaseAppPlayers()
+        managerProgressive?.releaseAppPlayers()
 
         super.onDestroy()
     }
 
-    fun getAppropriateMediaSessionManager(fileName: String): MultiPlayerPlaybackManager {
+    fun getAppropriateMediaSessionManager(fileName: String): MultiPlayerPlaybackManager? {
         return if (fileName.startsWith("file")) {
             managerLocal
         } else if (fileName.endsWith("m3u8")) {
@@ -51,34 +76,34 @@ class PlaybackService : MediaSessionService() {
         super.onUpdateNotification(session, startInForegroundRequired)
 
         // Overrides the notification with any player actually playing
-        managerHls.playingContent().forEach {
+        managerHls?.playingContent()?.forEach {
             if (it.player.isPlaying) {
                 super.onUpdateNotification(it, startInForegroundRequired)
             }
         }
-        managerLocal.playingContent().forEach {
+        managerLocal?.playingContent()?.forEach {
             if (it.player.isPlaying) {
                 super.onUpdateNotification(session, startInForegroundRequired)
             }
         }
-        managerProgressive.playingContent().forEach {
+        managerProgressive?.playingContent()?.forEach {
             if (it.player.isPlaying) {
                 super.onUpdateNotification(session, startInForegroundRequired)
             }
         }
 
         // Overrides again with playing with audio
-        managerHls.playingContent().forEach {
+        managerHls?.playingContent()?.forEach {
             if (it.player.isPlaying && it.player.volume > 0) {
                 super.onUpdateNotification(it, startInForegroundRequired)
             }
         }
-        managerLocal.playingContent().forEach {
+        managerLocal?.playingContent()?.forEach {
             if (it.player.isPlaying && it.player.volume > 0) {
                 super.onUpdateNotification(session, startInForegroundRequired)
             }
         }
-        managerProgressive.playingContent().forEach {
+        managerProgressive?.playingContent()?.forEach {
             if (it.player.isPlaying && it.player.volume > 0) {
                 super.onUpdateNotification(session, startInForegroundRequired)
             }
@@ -94,6 +119,6 @@ class PlaybackService : MediaSessionService() {
 
         val manager = getAppropriateMediaSessionManager(uri)
 
-        return manager.getMediaSession(id, uri, callbackUri, context = this, applicationContext = applicationContext)
+        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())
 

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

@@ -7,7 +7,7 @@ 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 com.vitorpamplona.amethyst.service.HttpClient
+import okhttp3.OkHttpClient
 
 @UnstableApi object VideoCache {
 
@@ -22,33 +22,33 @@ import com.vitorpamplona.amethyst.service.HttpClient
 
     @Synchronized
     @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
-    fun init(context: Context) {
-        if (!this::simpleCache.isInitialized) {
-            exoDatabaseProvider = StandaloneDatabaseProvider(context)
+    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

@@ -2,8 +2,8 @@ package com.vitorpamplona.amethyst
 
 import android.util.LruCache
 
-object VideoViewedPositionCache {
-    val cachedPosition = LruCache<String, Long>(10)
+class VideoViewedPositionCache {
+    val cachedPosition = LruCache<String, Long>(100)
 
     fun add(uri: String, position: Long) {
         cachedPosition.put(uri, position)

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

@@ -628,19 +628,19 @@ class Account(
         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(
@@ -655,7 +655,7 @@ class Account(
             privateKey = loggedIn.privKey!!
         )
 
-        Client.send(signedEvent)
+        Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent, null)
 
         return LocalCache.notes[signedEvent.id]
@@ -671,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
 
@@ -694,7 +695,7 @@ class Account(
             privateKey = loggedIn.privKey!!
         )
 
-        Client.send(signedEvent)
+        Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent)
     }
 
@@ -709,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
 
@@ -733,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)
     }
 
@@ -1547,7 +1549,9 @@ class Account(
             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/Note.kt

@@ -571,8 +571,15 @@ open class Note(val idHex: String) {
     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 accountChoices.hiddenUsers.contains(author?.pubkeyHex) ||
+        return isBoostedNoteHidden ||
+            accountChoices.hiddenUsers.contains(author?.pubkeyHex) ||
             accountChoices.spammers.contains(author?.pubkeyHex) ||
             (isSensitive && accountChoices.showSensitiveContent == false)
     }

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/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/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/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
@@ -56,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
@@ -78,7 +79,7 @@ open class NewMediaModel : ViewModel() {
                         uploadingPercentage.value = 0.2f
                         uploadingDescription.value = "Loading"
                         contentResolver.openInputStream(fileUri)?.use {
-                            createNIP95Record(it.readBytes(), contentType, description, sensitiveContent)
+                            createNIP95Record(it.readBytes(), contentType, description, sensitiveContent, relayList = relayList)
                         }
                             ?: run {
                                 viewModelScope.launch {
@@ -98,7 +99,7 @@ open class NewMediaModel : ViewModel() {
                             server = serverToUse,
                             contentResolver = contentResolver,
                             onSuccess = { imageUrl, mimeType ->
-                                createNIP94Record(imageUrl, mimeType, description, sensitiveContent)
+                                createNIP94Record(imageUrl, mimeType, description, sensitiveContent, relayList = relayList)
                             },
                             onError = {
                                 isUploadingImage = false
@@ -138,7 +139,7 @@ open class NewMediaModel : ViewModel() {
         return !isUploadingImage && galleryUri != null && selectedServer != null
     }
 
-    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String, sensitiveContent: Boolean) {
+    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"
@@ -162,7 +163,7 @@ open class NewMediaModel : ViewModel() {
                     onReady = {
                         uploadingPercentage.value = 0.90f
                         uploadingDescription.value = "Sending"
-                        account?.sendHeader(it)
+                        account?.sendHeader(it, relayList)
                         uploadingPercentage.value = 1.00f
                         isUploadingImage = false
                         onceUploaded()
@@ -191,7 +192,7 @@ open class NewMediaModel : ViewModel() {
         }
     }
 
-    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String, sensitiveContent: Boolean) {
+    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
         uploadingPercentage.value = 0.30f
         uploadingDescription.value = "Hashing"
 
@@ -210,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

@@ -7,17 +7,21 @@ import android.util.Size
 import android.widget.Toast
 import androidx.compose.foundation.Image
 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.Icon
+import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
@@ -33,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
@@ -70,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(
@@ -82,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()
@@ -97,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()

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

@@ -110,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)
@@ -144,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()
@@ -165,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()
                                 }
                             },
@@ -265,7 +304,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                         url,
                                         account.defaultFileServer,
                                         onAdd = { description, server, sensitiveContent ->
-                                            postViewModel.upload(url, description, sensitiveContent, server, context)
+                                            postViewModel.upload(url, description, sensitiveContent, server, context, relayList)
                                             account.changeDefaultFileServer(server)
                                         },
                                         onCancel = {

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, sensitiveContent: Boolean, 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, sensitiveContent)
+                            createNIP95Record(it.readBytes(), contentType, description, sensitiveContent, relayList = relayList)
                         }
                     } else {
                         ImageUploader.uploadImage(
@@ -370,7 +385,7 @@ open class NewPostViewModel() : ViewModel() {
         }
     }
 
-    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String, sensitiveContent: Boolean) {
+    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(
@@ -379,7 +394,7 @@ open class NewPostViewModel() : ViewModel() {
                 description,
                 sensitiveContent,
                 onReady = {
-                    val note = account?.sendHeader(it)
+                    val note = account?.sendHeader(it, relayList = relayList)
 
                     isUploadingImage = false
 
@@ -401,7 +416,7 @@ open class NewPostViewModel() : ViewModel() {
         }
     }
 
-    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String, sensitiveContent: Boolean) {
+    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
         viewModelScope.launch(Dispatchers.IO) {
             FileHeader.prepare(
                 bytes,
@@ -411,7 +426,7 @@ open class NewPostViewModel() : ViewModel() {
                 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/components/RichTextViewer.kt

@@ -64,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
@@ -285,7 +286,9 @@ private fun ZoomableContentView(
     accountViewModel: AccountViewModel
 ) {
     state.imagesForPager[word]?.let {
-        ZoomableContentView(it, state.imageList, accountViewModel)
+        Box(modifier = HalfVertPadding) {
+            ZoomableContentView(it, state.imageList, accountViewModel)
+        }
     }
 }
 

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
@@ -22,8 +20,7 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
 import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
-import com.vitorpamplona.amethyst.ui.theme.subtleBorder
+import com.vitorpamplona.amethyst.ui.theme.innerPostModifier
 
 @Composable
 fun UrlPreviewCard(
@@ -46,14 +43,10 @@ fun UrlPreviewCard(
         val uri = LocalUriHandler.current
 
         Row(
-            modifier = Modifier
-                .clickable { runCatching { uri.openUri(url) } }
-                .clip(shape = QuoteBorder)
-                .border(
-                    1.dp,
-                    MaterialTheme.colors.subtleBorder,
-                    QuoteBorder
-                )
+            modifier = MaterialTheme.colors.innerPostModifier
+                .clickable {
+                    runCatching { uri.openUri(url) }
+                }
         ) {
             Column {
                 AsyncImage(

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

@@ -34,7 +34,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.LayoutCoordinates
 import androidx.compose.ui.layout.boundsInWindow
 import androidx.compose.ui.layout.onGloballyPositioned
@@ -757,9 +756,9 @@ private fun KeepPlayingButton(
                 modifier = Size50Modifier
             ) {
                 if (keepPlaying.value) {
-                    LyricsIcon(Size22Modifier, Color.White)
+                    LyricsIcon(Size22Modifier, MaterialTheme.colors.onBackground)
                 } else {
-                    LyricsOffIcon(Size22Modifier, Color.White)
+                    LyricsOffIcon(Size22Modifier, MaterialTheme.colors.onBackground)
                 }
             }
         }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomHeaderCompose.kt

@@ -68,7 +68,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 @Composable
-fun ChatroomCompose(
+fun ChatroomHeaderCompose(
     baseNote: Note,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
@@ -305,13 +305,16 @@ private fun WatchNotificationChanges(
 @Composable
 fun LoadUser(baseUserHex: String, content: @Composable (User?) -> Unit) {
     var user by remember(baseUserHex) {
-        mutableStateOf<User?>(LocalCache.getUserIfExists(baseUserHex))
+        mutableStateOf(LocalCache.getUserIfExists(baseUserHex))
     }
 
     if (user == null) {
         LaunchedEffect(key1 = baseUserHex) {
             launch(Dispatchers.IO) {
-                user = LocalCache.checkGetOrCreateUser(baseUserHex)
+                val newUser = LocalCache.checkGetOrCreateUser(baseUserHex)
+                if (user != newUser) {
+                    user = newUser
+                }
             }
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt

@@ -29,7 +29,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.Dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
-import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size18Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size30Modifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -343,7 +343,7 @@ fun VerticalDotsIcon() {
     Icon(
         imageVector = Icons.Default.MoreVert,
         null,
-        modifier = Size15Modifier,
+        modifier = Size18Modifier,
         tint = MaterialTheme.colors.placeholderText
     )
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt

@@ -170,7 +170,6 @@ import com.vitorpamplona.amethyst.ui.theme.Size55dp
 import com.vitorpamplona.amethyst.ui.theme.SmallBorder
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.StdPadding
-import com.vitorpamplona.amethyst.ui.theme.StdStartPadding
 import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.UserNameMaxRowHeight
 import com.vitorpamplona.amethyst.ui.theme.UserNameRowHeight
@@ -2465,7 +2464,7 @@ private fun BoostedMark() {
         fontWeight = FontWeight.Bold,
         color = MaterialTheme.colors.placeholderText,
         maxLines = 1,
-        modifier = StdStartPadding
+        modifier = HalfStartPadding
     )
 }
 
@@ -2828,7 +2827,7 @@ fun DisplayFollowingHashtagsInPost(
     }
 
     firstTag?.let {
-        Column() {
+        Column(verticalArrangement = Arrangement.Center) {
             Row(verticalAlignment = CenterVertically) {
                 DisplayTagList(it, nav)
             }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/TimeAgoFormatter.kt

@@ -22,6 +22,8 @@ fun timeAgo(mills: Long?, context: Context): String {
         .replace(" hr. ago", context.getString(R.string.h))
         .replace(" min. ago", context.getString(R.string.m))
         .replace(" days ago", context.getString(R.string.d))
+        .replace(" hr ago", context.getString(R.string.h))
+        .replace(" min ago", context.getString(R.string.m))
         .replace("Yesterday", "1" + context.getString(R.string.d))
 }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt

@@ -17,7 +17,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
-import com.vitorpamplona.amethyst.ui.note.ChatroomCompose
+import com.vitorpamplona.amethyst.ui.note.ChatroomHeaderCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
@@ -113,7 +113,7 @@ private fun FeedLoaded(
         ) { _, item ->
             Row(Modifier.fillMaxWidth()) {
                 val (value, elapsed) = measureTimedValue {
-                    ChatroomCompose(
+                    ChatroomHeaderCompose(
                         item,
                         accountViewModel = accountViewModel,
                         nav = nav

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt

@@ -19,7 +19,6 @@ 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.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
@@ -124,6 +123,10 @@ import com.vitorpamplona.amethyst.ui.screen.equalImmutableLists
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
+import com.vitorpamplona.amethyst.ui.theme.EditFieldBorder
+import com.vitorpamplona.amethyst.ui.theme.EditFieldLeadingIconModifier
+import com.vitorpamplona.amethyst.ui.theme.EditFieldModifier
+import com.vitorpamplona.amethyst.ui.theme.EditFieldTrailingIconModifier
 import com.vitorpamplona.amethyst.ui.theme.Size25dp
 import com.vitorpamplona.amethyst.ui.theme.Size35dp
 import com.vitorpamplona.amethyst.ui.theme.SmallBorder
@@ -351,15 +354,13 @@ fun EditFieldRow(
     accountViewModel: AccountViewModel,
     onSendNewMessage: () -> Unit
 ) {
-    val context = LocalContext.current
-
     Row(
-        modifier = Modifier
-            .padding(start = 10.dp, end = 10.dp, bottom = 10.dp, top = 5.dp)
-            .fillMaxWidth(),
+        modifier = EditFieldModifier,
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically
     ) {
+        val context = LocalContext.current
+
         MyTextField(
             value = channelScreenModel.message,
             onValueChange = {
@@ -368,7 +369,7 @@ fun EditFieldRow(
             keyboardOptions = KeyboardOptions.Default.copy(
                 capitalization = KeyboardCapitalization.Sentences
             ),
-            shape = RoundedCornerShape(25.dp),
+            shape = EditFieldBorder,
             modifier = Modifier.weight(1f, true),
             placeholder = {
                 Text(
@@ -383,18 +384,14 @@ fun EditFieldRow(
                         onSendNewMessage()
                     },
                     isActive = channelScreenModel.message.text.isNotBlank() && !channelScreenModel.isUploadingImage,
-                    modifier = Modifier
-                        .height(32.dp)
-                        .padding(end = 10.dp)
+                    modifier = EditFieldTrailingIconModifier
                 )
             },
             leadingIcon = {
                 UploadFromGallery(
                     isUploading = channelScreenModel.isUploadingImage,
                     tint = MaterialTheme.colors.placeholderText,
-                    modifier = Modifier
-                        .height(32.dp)
-                        .padding(start = 2.dp)
+                    modifier = EditFieldLeadingIconModifier
                 ) {
                     val fileServer = if (isPrivate) {
                         // TODO: Make private servers

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt

@@ -26,13 +26,13 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
 import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
 import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status
 import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture
+import com.vitorpamplona.amethyst.ui.note.LoadUser
 import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.RefreshingChatroomFeedView
@@ -49,26 +49,15 @@ fun ChatroomScreen(
 ) {
     if (userId == null) return
 
-    var userRoom by remember(userId) { mutableStateOf<User?>(null) }
-
-    if (userRoom == null) {
-        LaunchedEffect(userId) {
-            launch(Dispatchers.IO) {
-                val newUser = LocalCache.checkGetOrCreateUser(userId)
-                if (newUser != userRoom) {
-                    userRoom = newUser
-                }
-            }
+    LoadUser(userId) {
+        it?.let {
+            PrepareChatroomViewModels(
+                baseUser = it,
+                accountViewModel = accountViewModel,
+                nav = nav
+            )
         }
     }
-
-    userRoom?.let {
-        PrepareChatroomViewModels(
-            baseUser = it,
-            accountViewModel = accountViewModel,
-            nav = nav
-        )
-    }
 }
 
 @Composable

app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt

@@ -3,7 +3,6 @@ package com.vitorpamplona.amethyst.ui.theme
 import androidx.compose.foundation.layout.defaultMinSize
 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.layout.width
@@ -29,6 +28,7 @@ val TabRowHeight = Modifier.height(40.dp)
 val SmallBorder = RoundedCornerShape(7.dp)
 val QuoteBorder = RoundedCornerShape(15.dp)
 val ButtonBorder = RoundedCornerShape(20.dp)
+val EditFieldBorder = RoundedCornerShape(25.dp)
 
 val ChatBubbleShapeMe = RoundedCornerShape(15.dp, 15.dp, 3.dp, 15.dp)
 val ChatBubbleShapeThem = RoundedCornerShape(3.dp, 15.dp, 15.dp, 15.dp)
@@ -69,6 +69,9 @@ val StdTopPadding = Modifier.padding(top = 10.dp)
 val HalfPadding = Modifier.padding(5.dp)
 val StdPadding = Modifier.padding(10.dp)
 
+val HalfHorzPadding = Modifier.padding(horizontal = 5.dp)
+val HalfVertPadding = Modifier.padding(vertical = 5.dp)
+
 val Size6Modifier = Modifier.size(6.dp)
 val Size10Modifier = Modifier.size(10.dp)
 val Size15Modifier = Modifier.size(15.dp)
@@ -95,8 +98,8 @@ val DividerThickness = 0.25.dp
 
 val ReactionRowHeight = Modifier.height(24.dp).padding(start = 10.dp)
 val ReactionRowHeightChat = Modifier.height(25.dp)
-val UserNameRowHeight = Modifier.height(22.dp).fillMaxWidth()
-val UserNameMaxRowHeight = Modifier.heightIn(max = 22.dp).fillMaxWidth()
+val UserNameRowHeight = Modifier.fillMaxWidth()
+val UserNameMaxRowHeight = Modifier.fillMaxWidth()
 
 val Height4dpModifier = Modifier.height(4.dp)
 
@@ -119,3 +122,13 @@ val ChatHeadlineBorders = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.
 val VolumeBottomIconSize = Modifier.size(70.dp).padding(10.dp)
 val PinBottomIconSize = Modifier.size(70.dp).padding(10.dp)
 val NIP05IconSize = Modifier.size(14.dp).padding(top = 1.dp, start = 1.dp, end = 1.dp)
+
+val EditFieldModifier = Modifier
+    .padding(start = 10.dp, end = 10.dp, bottom = 10.dp, top = 5.dp)
+    .fillMaxWidth()
+val EditFieldTrailingIconModifier = Modifier
+    .height(32.dp)
+    .padding(start = 5.dp, end = 10.dp)
+val EditFieldLeadingIconModifier = Modifier
+    .height(32.dp)
+    .padding(start = 2.dp)

app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt

@@ -151,7 +151,7 @@ val LightReplyBorderModifier = Modifier
     )
 
 val DarkInnerPostBorderModifier = Modifier
-    .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
+    .padding(top = 5.dp)
     .fillMaxWidth()
     .clip(shape = QuoteBorder)
     .border(

app/src/main/res/values-cs/strings.xml

@@ -23,6 +23,7 @@
     <string name="copy_note_id">Kopírovat ID poznámky</string>
     <string name="broadcast">Vysílání</string>
     <string name="request_deletion">Požadovat smazání</string>
+    <string name="block_report">Blockovat / Nahlásit</string>
     <string name="block_hide_user"><![CDATA[Blokovat a skrýt uživatele]]></string>
     <string name="report_spam_scam">Nahlásit spam / podvod</string>
     <string name="report_impersonation">Nahlásit zneužívání identity</string>
@@ -43,11 +44,11 @@
     <string name="new_amount_in_sats">Nová částka v sats</string>
     <string name="add">Přidat</string>
     <string name="replying_to">"odpovídá na "</string>
-    <string name="and">"a "</string>
+    <string name="and">" a "</string>
     <string name="in_channel">"v kanálu "</string>
     <string name="profile_banner">Banner profilu</string>
-    <string name="following">"Sleduje"</string>
-    <string name="followers">"Sledující"</string>
+    <string name="following">" Sleduje"</string>
+    <string name="followers">" Sledující"</string>
     <string name="profile">Profil</string>
     <string name="security_filters">Bezpečnostní filtry</string>
     <string name="log_out">Odhlásit</string>
@@ -164,6 +165,7 @@
     <string name="translations_show_in_lang_first">Zobrazit nejprve v %1$s</string>
     <string name="translations_always_translate_to_lang">Vždy překládat do %1$s</string>
     <string name="translations_never_translate_from_lang">Nikdy nepřekládat z %1$s</string>
+    <string name="nip_05">Nostr Adresa</string>
     <string name="never">nikdy</string>
     <string name="now">nyní</string>
     <string name="h">h</string>
@@ -447,4 +449,38 @@
     <string name="followed_tags">Sledované značky</string>
 
     <string name="relay_setup">Rele</string>
+
+    <string name="discover_live">Živě</string>
+    <string name="discover_community">Komunita</string>
+    <string name="discover_chat">Chaty</string>
+    <string name="community_approved_posts">Schválené příspěvky</string>
+
+    <string name="groups_no_descriptor">Tato skupina nemá popis ani pravidla. Promluvte si s majitelem, aby je přidal/a.</string>
+    <string name="community_no_descriptor">Tato komunita nemá popis. Promluvte si s majitelem, aby ho přidal/a.</string>
+
+    <string name="add_sensitive_content_label">Citlivý obsah</string>
+    <string name="add_sensitive_content_description">Před zobrazením tohoto obsahu přidá upozornění na citlivý obsah.</string>
+    <string name="settings">Nastavení</string>
+    <string name="always">Vždy</string>
+    <string name="wifi_only">Pouze Wi-Fi</string>
+    <string name="system">Systém</string>
+    <string name="light">Světlý</string>
+    <string name="dark">Tmavý</string>
+    <string name="application_preferences">Předvolby aplikace</string>
+    <string name="language">Jazyk</string>
+    <string name="theme">Motiv</string>
+    <string name="automatically_load_images_gifs">Automaticky načítat obrázky/gif</string>
+    <string name="automatically_play_videos">Automaticky přehrávat videa</string>
+    <string name="automatically_show_url_preview">Automaticky zobrazit náhled URL</string>
+    <string name="load_image">Načíst obrázek</string>
+
+    <string name="spamming_users">Spamovací uživatelé</string>
+
+    <string name="muted_button">Ztlumené. Klikněte pro odztlumení</string>
+    <string name="mute_button">Zvuk zapnutý. Klikněte pro ztlumení</string>
+    <string name="search_button">Hledat lokální a vzdálené záznamy</string>
+
+    <string name="nip05_verified">Adresa Nostr byla ověřena</string>
+    <string name="nip05_failed">Ověření adresy Nostr se nezdařilo</string>
+    <string name="nip05_checking">Kontrola adresy Nostr</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -24,6 +24,7 @@
     <string name="broadcast">Senden</string>
     <string name="request_deletion">Löschung beantragen</string>
     <string name="block_hide_user"><![CDATA[Benutzer blockieren und ausblenden]]></string>
+    <string name="block_report">Blockieren / Melden</string>
     <string name="report_spam_scam">Spam / Betrug melden</string>
     <string name="report_impersonation">Vortäuschung melden</string>
     <string name="report_explicit_content">Expliziten Inhalt melden</string>
@@ -168,6 +169,7 @@ anz der Bedingungen ist erforderlich</string>
     <string name="translations_show_in_lang_first">Zuerst in %1$s anzeigen</string>
     <string name="translations_always_translate_to_lang">Immer ins %1$s übersetzen</string>
     <string name="translations_never_translate_from_lang">Niemals aus dem %1$s übersetzen</string>
+    <string name="nip_05">Nostr-Adresse</string>
     <string name="never">nie</string>
     <string name="now">jetzt</string>
     <string name="h">h</string>
@@ -456,4 +458,38 @@ anz der Bedingungen ist erforderlich</string>
     <string name="followed_tags">Gefolgte Tags</string>
 
     <string name="relay_setup">Relais</string>
+
+    <string name="discover_live">Live</string>
+    <string name="discover_community">Community</string>
+    <string name="discover_chat">Chats</string>
+    <string name="community_approved_posts">Genehmigte Beiträge</string>
+
+    <string name="groups_no_descriptor">Diese Gruppe hat keine Beschreibung oder Regeln. Sprechen Sie mit dem Eigentümer, um eine hinzuzufügen.</string>
+    <string name="community_no_descriptor">Diese Community hat keine Beschreibung. Sprechen Sie mit dem Eigentümer, um eine hinzuzufügen.</string>
+
+    <string name="add_sensitive_content_label">Sensibler Inhalt</string>
+    <string name="add_sensitive_content_description">Fügt eine Warnung für sensiblen Inhalt hinzu, bevor dieser Inhalt angezeigt wird.</string>
+    <string name="settings">Einstellungen</string>
+    <string name="always">Immer</string>
+    <string name="wifi_only">Nur WLAN</string>
+    <string name="system">System</string>
+    <string name="light">Hell</string>
+    <string name="dark">Dunkel</string>
+    <string name="application_preferences">Anwendungseinstellungen</string>
+    <string name="language">Sprache</string>
+    <string name="theme">Design</string>
+    <string name="automatically_load_images_gifs">Bilder/GIFs automatisch laden</string>
+    <string name="automatically_play_videos">Videos automatisch abspielen</string>
+    <string name="automatically_show_url_preview">URL-Vorschau automatisch anzeigen</string>
+    <string name="load_image">Bild laden</string>
+
+    <string name="spamming_users">Spammer</string>
+
+    <string name="muted_button">Ton aus. Klicken, um Ton einzuschalten</string>
+    <string name="mute_button">Ton an. Klicken, um Ton auszuschalten</string>
+    <string name="search_button">Lokale und entfernte Einträge durchsuchen</string>
+
+    <string name="nip05_verified">Nostr-Adresse verifiziert</string>
+    <string name="nip05_failed">Nostr-Adresse konnte nicht verifiziert werden</string>
+    <string name="nip05_checking">Nostr-Adresse wird überprüft</string>
 </resources>

app/src/main/res/values-sv-rSE/strings.xml

@@ -23,6 +23,7 @@
     <string name="broadcast">Sänd ut</string>
     <string name="request_deletion">Begär radering</string>
     <string name="block_hide_user"><![CDATA[Blockera och göm användare]]></string>
+    <string name="block_report">Blockera / Rapportera</string>
     <string name="report_spam_scam">Rapportera Spam / Scam</string>
     <string name="report_impersonation">Rapportera identitetsstöld</string>
     <string name="report_explicit_content">Rapportera explicit innehåll</string>
@@ -163,6 +164,7 @@
     <string name="translations_show_in_lang_first">Visa i %1$s first</string>
     <string name="translations_always_translate_to_lang">Översätt alltid till %1$s</string>
     <string name="translations_never_translate_from_lang">Översätt aldrig från %1$s</string>
+    <string name="nip_05">Nostr-adress</string>
     <string name="never">aldrig</string>
     <string name="now">nu</string>
     <string name="h">h</string>
@@ -444,6 +446,40 @@
     <string name="followed_tags">Följda taggar</string>
 
     <string name="relay_setup">Reläer</string>
+
+    <string name="discover_live">Live</string>
+    <string name="discover_community">Gemenskap</string>
+    <string name="discover_chat">Chattar</string>
+    <string name="community_approved_posts">Godkända Inlägg</string>
+
+    <string name="groups_no_descriptor">Denna grupp har ingen beskrivning eller regler. Prata med ägaren för att lägga till en.</string>
+    <string name="community_no_descriptor">Denna gemenskap har ingen beskrivning. Prata med ägaren för att lägga till en.</string>
+
+    <string name="add_sensitive_content_label">Känsligt innehåll</string>
+    <string name="add_sensitive_content_description">Lägger till varning för känsligt innehåll innan detta innehåll visas.</string>
+    <string name="settings">Inställningar</string>
+    <string name="always">Alltid</string>
+    <string name="wifi_only">Endast Wi-Fi</string>
+    <string name="system">System</string>
+    <string name="light">Ljus</string>
+    <string name="dark">Mörk</string>
+    <string name="application_preferences">Applikationsinställningar</string>
+    <string name="language">Språk</string>
+    <string name="theme">Tema</string>
+    <string name="automatically_load_images_gifs">Ladda automatiskt bilder/gif</string>
+    <string name="automatically_play_videos">Spela automatiskt videor</string>
+    <string name="automatically_show_url_preview">Visa automatiskt förhandsgranskning av URL</string>
+    <string name="load_image">Ladda bild</string>
+
+    <string name="spamming_users">Spammare</string>
+
+    <string name="muted_button">Ljud avstängt. Klicka för att ta bort ljudlöst</string>
+    <string name="mute_button">Ljud på. Klicka för att stänga av ljudet</string>
+    <string name="search_button">Sök lokala och externa poster</string>
+
+    <string name="nip05_verified">Nostr-adress verifierad</string>
+    <string name="nip05_failed">Verifikation av Nostr-adress misslyckades</string>
+    <string name="nip05_checking">Kontrollerar Nostr-adress</string>
 </resources>
 
 

app/src/main/res/xml/locales_config.xml

@@ -2,6 +2,7 @@
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
     <locale android:name="ar"/>
     <locale android:name="cs"/>
+    <locale android:name="de"/>
     <locale android:name="eo"/>
     <locale android:name="es"/>
     <locale android:name="fa"/>