v0.52.2

Sensitive content Hungarian translation

README.md

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

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 180
-        versionName "0.52.0"
+        versionCode 182
+        versionName "0.52.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

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

@@ -232,7 +232,7 @@ open class Note(val idHex: String) {
     fun isZappedBy(user: User, account: Account): Boolean {
         // Zaps who the requester was the user
         return zaps.any {
-            it.key.author === user || account.decryptZapContentAuthor(it.key)?.pubKey == user.pubkeyHex
+            it.key.author?.pubkeyHex == user.pubkeyHex || account.decryptZapContentAuthor(it.key)?.pubKey == user.pubkeyHex
         } || zapPayments.any {
             val zapResponseEvent = it.value?.event as? LnZapPaymentResponseEvent
             val response = if (zapResponseEvent != null) {
@@ -245,11 +245,11 @@ open class Note(val idHex: String) {
     }
 
     fun isReactedBy(user: User): Boolean {
-        return reactions.any { it.author === user }
+        return reactions.any { it.author?.pubkeyHex == user.pubkeyHex }
     }
 
     fun isBoostedBy(user: User): Boolean {
-        return boosts.any { it.author === user }
+        return boosts.any { it.author?.pubkeyHex == user.pubkeyHex }
     }
 
     fun reportsBy(user: User): Set<Note> {

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

@@ -299,7 +299,7 @@ class User(val pubkeyHex: String) {
     fun hasSentMessagesTo(user: User?): Boolean {
         val messagesToUser = privateChatrooms[user] ?: return false
 
-        return messagesToUser.roomMessages.any { this === it.author }
+        return messagesToUser.roomMessages.any { this.pubkeyHex == it.author?.pubkeyHex }
     }
 
     fun hasReport(loggedIn: User, type: ReportEvent.ReportType): Boolean {

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

@@ -73,7 +73,7 @@ private fun DisplayEvent(
     nip19: Nip19.Return,
     nav: (String) -> Unit
 ) {
-    var noteBase by remember { mutableStateOf<Note?>(null) }
+    var noteBase by remember(nip19) { mutableStateOf<Note?>(null) }
 
     LaunchedEffect(key1 = nip19.hex) {
         withContext(Dispatchers.IO) {
@@ -129,7 +129,7 @@ private fun DisplayNote(
     nip19: Nip19.Return,
     nav: (String) -> Unit
 ) {
-    var noteBase by remember { mutableStateOf<Note?>(null) }
+    var noteBase by remember(nip19) { mutableStateOf<Note?>(null) }
 
     LaunchedEffect(key1 = nip19.hex) {
         withContext(Dispatchers.IO) {
@@ -185,7 +185,7 @@ private fun DisplayAddress(
     nip19: Nip19.Return,
     nav: (String) -> Unit
 ) {
-    var noteBase by remember { mutableStateOf<Note?>(null) }
+    var noteBase by remember(nip19) { mutableStateOf<Note?>(null) }
 
     LaunchedEffect(key1 = nip19.hex) {
         withContext(Dispatchers.IO) {
@@ -217,7 +217,7 @@ private fun DisplayUser(
     nip19: Nip19.Return,
     nav: (String) -> Unit
 ) {
-    var userBase by remember { mutableStateOf<User?>(null) }
+    var userBase by remember(nip19) { mutableStateOf<User?>(null) }
 
     LaunchedEffect(key1 = nip19.hex) {
         withContext(Dispatchers.IO) {
@@ -227,7 +227,7 @@ private fun DisplayUser(
 
     userBase?.let {
         val userState by it.live().metadata.observeAsState()
-        val route = remember { "User/${it.pubkeyHex}" }
+        val route = remember(userState) { "User/${it.pubkeyHex}" }
         val userDisplayName = remember(userState) { userState?.user?.toBestDisplayName() }
         val userTags = remember(userState) { userState?.user?.info?.latestMetadata?.tags }
 

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

@@ -95,7 +95,7 @@ fun RichTextViewer(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val isMarkdown = remember { isMarkdown(content) }
+    val isMarkdown = remember(content) { isMarkdown(content) }
 
     Column(modifier = modifier) {
         if (isMarkdown) {
@@ -124,7 +124,7 @@ private fun RenderRegular(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    var state by remember {
+    var state by remember(content) {
         mutableStateOf(RichTextViewerState(content, emptySet(), emptyMap(), emptyList(), emptyMap()))
     }
 
@@ -344,9 +344,9 @@ private fun RenderContentAsMarkdown(content: String, backgroundColor: Color, tag
         )
     )
 
-    var markdownWithSpecialContent by remember { mutableStateOf<String?>(null) }
-    var nip19References by remember { mutableStateOf<List<Nip19.Return>>(emptyList()) }
-    var refresh by remember { mutableStateOf(0) }
+    var markdownWithSpecialContent by remember(content) { mutableStateOf<String?>(null) }
+    var nip19References by remember(content) { mutableStateOf<List<Nip19.Return>>(emptyList()) }
+    var refresh by remember(content) { mutableStateOf(0) }
 
     LaunchedEffect(key1 = content) {
         withContext(Dispatchers.IO) {
@@ -365,8 +365,8 @@ private fun RenderContentAsMarkdown(content: String, backgroundColor: Color, tag
     }
 
     nip19References.forEach {
-        var baseUser by remember { mutableStateOf<User?>(null) }
-        var baseNote by remember { mutableStateOf<Note?>(null) }
+        var baseUser by remember(it) { mutableStateOf<User?>(null) }
+        var baseNote by remember(it) { mutableStateOf<Note?>(null) }
 
         LaunchedEffect(key1 = it.hex) {
             withContext(Dispatchers.IO) {

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

@@ -21,7 +21,7 @@ import kotlinx.coroutines.launch
 fun UrlPreview(url: String, urlText: String) {
     val context = LocalContext.current
 
-    var urlPreviewState by remember {
+    var urlPreviewState by remember(url) {
         val default = UrlCachedPreviewer.cache[url]?.let {
             if (it.allFetchComplete() && it.url == url) {
                 UrlPreviewState.Loaded(it)

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

@@ -42,10 +42,10 @@ fun UrlPreviewCard(
             )
     ) {
         Column {
-            val validatedUrl = remember { URL(previewInfo.url) }
+            val validatedUrl = remember(url) { URL(previewInfo.url) }
 
             // correctly treating relative images
-            val imageUrl = remember {
+            val imageUrl = remember(url) {
                 if (previewInfo.image.startsWith("/")) {
                     URL(validatedUrl, previewInfo.image).toString()
                 } else {

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

@@ -2,9 +2,9 @@ package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
+import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.*
 
 object NotificationFeedFilter : AdditiveFeedFilter<Note>() {
@@ -36,7 +36,7 @@ object NotificationFeedFilter : AdditiveFeedFilter<Note>() {
                 (isGlobal || it.author?.pubkeyHex in followingKeySet) &&
                 it.event?.isTaggedUser(loggedInUserHex) ?: false &&
                 (it.author == null || !account.isHidden(it.author!!.pubkeyHex)) &&
-                tagsAnEventByUser(it, loggedInUser)
+                tagsAnEventByUser(it, loggedInUserHex)
         }.toSet()
     }
 
@@ -44,27 +44,27 @@ object NotificationFeedFilter : AdditiveFeedFilter<Note>() {
         return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
     }
 
-    fun tagsAnEventByUser(note: Note, author: User): Boolean {
+    fun tagsAnEventByUser(note: Note, authorHex: HexKey): Boolean {
         val event = note.event
 
         if (event is BaseTextNoteEvent) {
             val isAuthoredPostCited = event.findCitations().any {
-                LocalCache.notes[it]?.author === author || LocalCache.addressables[it]?.author === author
+                LocalCache.notes[it]?.author?.pubkeyHex == authorHex || LocalCache.addressables[it]?.author?.pubkeyHex == authorHex
             }
 
             return isAuthoredPostCited ||
                 (
-                    event.citedUsers().contains(author.pubkeyHex) ||
-                        note.replyTo?.any { it.author === author } == true
+                    event.citedUsers().contains(authorHex) ||
+                        note.replyTo?.any { it.author?.pubkeyHex == authorHex } == true
                     )
         }
 
         if (event is ReactionEvent) {
-            return note.replyTo?.lastOrNull()?.author === author
+            return note.replyTo?.lastOrNull()?.author?.pubkeyHex == authorHex
         }
 
         if (event is RepostEvent) {
-            return note.replyTo?.lastOrNull()?.author === author
+            return note.replyTo?.lastOrNull()?.author?.pubkeyHex == authorHex
         }
 
         return true

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

@@ -37,8 +37,6 @@ 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.graphics.ColorFilter
-import androidx.compose.ui.graphics.ColorMatrix
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.layout.onSizeChanged
@@ -66,6 +64,7 @@ import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
 import com.vitorpamplona.amethyst.ui.components.SensitivityWarning
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.RelayIconFilter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -118,7 +117,7 @@ fun ChatroomMessageCompose(
         LaunchedEffect(key1 = noteReportsState, key2 = accountState) {
             withContext(Dispatchers.IO) {
                 account.userProfile().let { loggedIn ->
-                    val newCanPreview = note.author === loggedIn ||
+                    val newCanPreview = note.author?.pubkeyHex == loggedIn.pubkeyHex ||
                         (note.author?.let { loggedIn.isFollowingCached(it) } ?: true) ||
                         !(noteForReports.hasAnyReports())
 
@@ -538,31 +537,27 @@ private fun RelayBadges(baseNote: Note) {
 }
 
 @Composable
-private fun RenderRelay(dirtyUrl: String) {
+fun RenderRelay(dirtyUrl: String) {
     val uri = LocalUriHandler.current
-    val website = remember {
-        val cleanUrl = dirtyUrl.removePrefix("wss://").removePrefix("ws://")
+    val website = remember(dirtyUrl) {
+        val cleanUrl = dirtyUrl.trim().removePrefix("wss://").removePrefix("ws://").removeSuffix("/")
         "https://$cleanUrl"
     }
-    val iconUrl = remember {
-        val cleanUrl = dirtyUrl.removePrefix("wss://").removePrefix("ws://")
+    val iconUrl = remember(dirtyUrl) {
+        val cleanUrl = dirtyUrl.trim().removePrefix("wss://").removePrefix("ws://").removeSuffix("/")
         "https://$cleanUrl/favicon.ico"
     }
 
-    val clickableModifier = remember {
+    val clickableModifier = remember(dirtyUrl) {
         Modifier
-            .size(15.dp)
             .padding(1.dp)
+            .size(15.dp)
             .clickable(onClick = { uri.openUri(website) })
     }
 
-    val colorFilter = remember {
-        ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0.5f) })
-    }
-
-    val iconModifier = remember {
+    val iconModifier = remember(dirtyUrl) {
         Modifier
-            .size(15.dp)
+            .size(13.dp)
             .clip(shape = CircleShape)
     }
 
@@ -571,10 +566,10 @@ private fun RenderRelay(dirtyUrl: String) {
     ) {
         RobohashFallbackAsyncImage(
             robot = iconUrl,
-            robotSize = 15.dp,
+            robotSize = 13.dp,
             model = iconUrl,
             contentDescription = stringResource(id = R.string.relay_icon),
-            colorFilter = colorFilter,
+            colorFilter = RelayIconFilter,
             modifier = iconModifier.background(MaterialTheme.colors.background)
         )
     }

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

@@ -452,7 +452,7 @@ fun FastNoteAuthorPicture(
 
     val showFollowingMark by remember(accountFollowsState) {
         derivedStateOf {
-            accountFollowsState?.user?.isFollowingCached(author) == true || (author === accountFollowsState?.user)
+            accountFollowsState?.user?.isFollowingCached(author) == true || (author.pubkeyHex == accountFollowsState?.user?.pubkeyHex)
         }
     }
 

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

@@ -57,14 +57,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.ColorMatrix
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
@@ -115,7 +112,6 @@ import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status
 import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
-import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
 import com.vitorpamplona.amethyst.ui.components.SensitivityWarning
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.components.VideoView
@@ -194,7 +190,7 @@ fun NoteCompose(
         LaunchedEffect(key1 = noteReportsState, key2 = accountState) {
             withContext(Dispatchers.IO) {
                 account.userProfile().let { loggedIn ->
-                    val newCanPreview = note.author === loggedIn ||
+                    val newCanPreview = note.author?.pubkeyHex == loggedIn.pubkeyHex ||
                         (note.author?.let { loggedIn.isFollowingCached(it) } ?: true) ||
                         !(noteForReports.hasAnyReports())
 
@@ -1912,46 +1908,11 @@ private fun VerticalRelayPanelWithFlow(
     // FlowRow Seems to be a lot faster than LazyVerticalGrid
     FlowRow() {
         relays.forEach { url ->
-            RelayIconCompose(url)
+            RenderRelay(url)
         }
     }
 }
 
-@Composable
-@Stable
-private fun RelayIconCompose(url: String) {
-    val uri = LocalUriHandler.current
-
-    val model = remember(url) { "https://$url/favicon.ico" }
-
-    val boxModifier = remember {
-        Modifier
-            .padding(1.dp)
-            .size(15.dp)
-    }
-    val iconModifier = remember(url) {
-        Modifier
-            .width(13.dp)
-            .height(13.dp)
-            .clip(shape = CircleShape)
-            .clickable(onClick = { uri.openUri("https://$url") })
-    }
-    val colorFilter = remember {
-        ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0.5f) })
-    }
-
-    Box(boxModifier) {
-        RobohashFallbackAsyncImage(
-            robot = model,
-            robotSize = 15.dp,
-            model = model,
-            contentDescription = stringResource(R.string.relay_icon),
-            colorFilter = colorFilter,
-            modifier = iconModifier.background(MaterialTheme.colors.background)
-        )
-    }
-}
-
 @Composable
 private fun ShowMoreRelaysButton(onClick: () -> Unit) {
     val boxModifier = remember {
@@ -2069,7 +2030,7 @@ fun UserPicture(
     }
 
     val showFollowingMark = remember(accountState) {
-        accountState?.user?.isFollowingCached(baseUser) == true || baseUser === accountState?.user
+        accountState?.user?.isFollowingCached(baseUser) == true || baseUser.pubkeyHex == accountState?.user?.pubkeyHex
     }
 
     // BaseUser is the same reference as accountState.user

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

@@ -116,10 +116,10 @@ fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Uni
     val cardShape = RoundedCornerShape(5.dp)
     val clipboardManager = LocalClipboardManager.current
     val scope = rememberCoroutineScope()
-    var showSelectTextDialog by remember { mutableStateOf(false) }
-    var showDeleteAlertDialog by remember { mutableStateOf(false) }
-    var showBlockAlertDialog by remember { mutableStateOf(false) }
-    var showReportDialog by remember { mutableStateOf(false) }
+    var showSelectTextDialog by remember(note) { mutableStateOf(false) }
+    var showDeleteAlertDialog by remember(note) { mutableStateOf(false) }
+    var showBlockAlertDialog by remember(note) { mutableStateOf(false) }
+    var showReportDialog by remember(note) { mutableStateOf(false) }
 
     val backgroundColor = if (MaterialTheme.colors.isLight) {
         MaterialTheme.colors.primary

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

@@ -280,7 +280,7 @@ class UserReactionsViewModel : ViewModel() {
 fun UserReplyReaction(
     replyCount: Int?
 ) {
-    val showCounts = remember { showCount(replyCount) }
+    val showCounts = remember(replyCount) { showCount(replyCount) }
 
     Icon(
         painter = painterResource(R.drawable.ic_comment),
@@ -302,7 +302,7 @@ fun UserReplyReaction(
 fun UserBoostReaction(
     boostCount: Int?
 ) {
-    val showCounts = remember { showCount(boostCount) }
+    val showCounts = remember(boostCount) { showCount(boostCount) }
 
     Icon(
         painter = painterResource(R.drawable.ic_retweeted),
@@ -324,7 +324,7 @@ fun UserBoostReaction(
 fun UserLikeReaction(
     likeCount: Int?
 ) {
-    val showCounts = remember { showCount(likeCount) }
+    val showCounts = remember(likeCount) { showCount(likeCount) }
 
     Icon(
         painter = painterResource(R.drawable.ic_liked),
@@ -346,7 +346,7 @@ fun UserLikeReaction(
 fun UserZapReaction(
     amount: BigDecimal?
 ) {
-    val showAmounts = remember { showAmountAxis(amount) }
+    val showAmounts = remember(amount) { showAmountAxis(amount) }
 
     Icon(
         imageVector = Icons.Default.Bolt,

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

@@ -210,7 +210,7 @@ class AccountViewModel(private val account: Account) : ViewModel() {
     }
 
     fun isLoggedUser(user: User?): Boolean {
-        return account.userProfile() === user
+        return account.userProfile().pubkeyHex == user?.pubkeyHex
     }
 
     fun isFollowing(user: User?): Boolean {

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

@@ -7,7 +7,6 @@ import androidx.compose.animation.Crossfade
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -47,12 +46,8 @@ 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.graphics.ColorFilter
-import androidx.compose.ui.graphics.ColorMatrix
 import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -73,7 +68,6 @@ import com.vitorpamplona.amethyst.ui.actions.NewMediaModel
 import com.vitorpamplona.amethyst.ui.actions.NewMediaView
 import com.vitorpamplona.amethyst.ui.actions.NewPostView
 import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status
-import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
 import com.vitorpamplona.amethyst.ui.dal.VideoFeedFilter
 import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.note.FileHeaderDisplay
@@ -82,6 +76,7 @@ import com.vitorpamplona.amethyst.ui.note.LikeReaction
 import com.vitorpamplona.amethyst.ui.note.NoteAuthorPicture
 import com.vitorpamplona.amethyst.ui.note.NoteDropDownMenu
 import com.vitorpamplona.amethyst.ui.note.NoteUsernameDisplay
+import com.vitorpamplona.amethyst.ui.note.RenderRelay
 import com.vitorpamplona.amethyst.ui.note.ViewCountReaction
 import com.vitorpamplona.amethyst.ui.note.ZapReaction
 import com.vitorpamplona.amethyst.ui.screen.FeedEmpty
@@ -317,35 +312,13 @@ private fun RenderVideoOrPictureNote(
 @Composable
 private fun RelayBadges(baseNote: Note) {
     val noteRelaysState by baseNote.live().relays.observeAsState()
-    val noteRelays = noteRelaysState?.note?.relays ?: emptySet()
-
-    var expanded by remember { mutableStateOf(false) }
-
-    val relaysToDisplay = noteRelays
-
-    val uri = LocalUriHandler.current
+    val noteRelays = remember(noteRelaysState) {
+        noteRelaysState?.note?.relays ?: emptySet()
+    }
 
     FlowRow() {
-        relaysToDisplay.forEach {
-            val url = it.removePrefix("wss://").removePrefix("ws://")
-            Box(
-                Modifier
-                    .size(15.dp)
-                    .padding(1.dp)
-            ) {
-                RobohashFallbackAsyncImage(
-                    robot = "https://$url/favicon.ico",
-                    robotSize = 15.dp,
-                    model = "https://$url/favicon.ico",
-                    contentDescription = stringResource(id = R.string.relay_icon),
-                    colorFilter = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) }),
-                    modifier = Modifier
-                        .fillMaxSize(1f)
-                        .clip(shape = CircleShape)
-                        .background(MaterialTheme.colors.background)
-                        .clickable(onClick = { uri.openUri("https://$url") })
-                )
-            }
+        noteRelays.forEach { dirtyUrl ->
+            RenderRelay(dirtyUrl)
         }
     }
 }

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

@@ -1,6 +1,8 @@
 package com.vitorpamplona.amethyst.ui.theme
 
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.ColorMatrix
 
 val Purple200 = Color(0xFFBB86FC)
 val Purple500 = Color(0xFF6200EE)
@@ -15,3 +17,5 @@ val FollowsFollow = Color.Yellow
 val NIP05Verified = Color.Blue
 
 val WarningColor = Color(0xFFC62828)
+
+val RelayIconFilter = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0.5f) })

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

@@ -385,4 +385,10 @@
     <string name="channel_list_join_channel">Csatlakozás</string>
 
     <string name="today">Ma</string>
+
+    <string name="content_warning">Tartalomra vonatkozó figyelmeztetés</string>
+    <string name="content_warning_explanation">Ez a bejegyzés érzékeny tartalmat tartalmaz, amelyet egyesek sértőnek vagy zavarónak találhatnak</string>
+    <string name="content_warning_hide_all_sensitive_content">Az érzékeny tartalmat mindig rejtse el</string>
+    <string name="content_warning_show_all_sensitive_content">Az érzékeny tartalmat mindig jelenítse meg</string>
+    <string name="content_warning_see_warnings">A tartalomra vonatkozó figyelmeztetéseket mindig jelenítse meg</string>
 </resources>