feat(nip29): inline group rows in Messages list + view-mode setting (C, part 3)

The default "inline" Messages view: joined NIP-29 channels appear as rows in the Messages list, each with a tappable chip naming its host relay. - RelayGroupViewMode setting (INLINE default / GROUPED) on AccountSettings. - ChatroomListKnownFeedFilter includes joined relay-group channels' latest messages in the flat feed when the mode is INLINE (excluded in GROUPED, where they'll be reached via relay rows). - ChatroomHeaderCompose resolves a relay-group row via the note's channel gatherer (like Marmot groups) and renders RelayGroupRoomCompose: name + a relay chip. Row tap opens the chat (Route.RelayGroup); chip tap opens that relay's channel list (Route.RelayGroupServer). Remaining: the Settings toggle + persistence for the view mode, and the GROUPED mode's relay rows. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01B5MLY4hq5LXJ2D5WeLRyXj
2026-10-06 03:38:23 +00:00 · 2026-07-07 21:51:52 +00:00
parent b03b335466
commit 34c1e4b6bb
4 changed files with 156 additions and 1 deletions
@@ -26,6 +26,7 @@ import com.vitorpamplona.amethyst.commons.model.clink.ClinkDebitWalletEntryNorm
 import com.vitorpamplona.amethyst.commons.model.emphChat.EphemeralChatRepository
 import com.vitorpamplona.amethyst.commons.model.nip28PublicChats.PublicChatListRepository
 import com.vitorpamplona.amethyst.commons.model.nip29RelayGroups.RelayGroupRepository
+import com.vitorpamplona.amethyst.commons.model.nip29RelayGroups.RelayGroupViewMode
 import com.vitorpamplona.amethyst.commons.model.nip47WalletConnect.NwcWalletEntryNorm
 import com.vitorpamplona.amethyst.commons.model.payments.PaymentSource
 import com.vitorpamplona.amethyst.commons.model.payments.PaymentSourceResolver
@@ -272,6 +273,7 @@ class AccountSettings(
    var callMaxBitrateBps: Int = 1_500_000,
    val callsEnabled: MutableStateFlow<Boolean> = MutableStateFlow(true),
    val defaultRelayAuthPolicy: MutableStateFlow<RelayAuthPolicy> = MutableStateFlow(RelayAuthPolicy.IF_IN_MY_LIST),
+    val relayGroupViewMode: MutableStateFlow<RelayGroupViewMode> = MutableStateFlow(RelayGroupViewMode.DEFAULT),
 ) : EphemeralChatRepository,
    RelayGroupRepository,
    PublicChatListRepository {
@@ -20,12 +20,18 @@
 */
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.rooms

+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -33,6 +39,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
@@ -40,6 +47,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
@@ -47,6 +55,7 @@ import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
 import com.vitorpamplona.amethyst.commons.model.emphChat.EphemeralChatChannel
 import com.vitorpamplona.amethyst.commons.model.marmotGroups.MarmotGroupChatroom
 import com.vitorpamplona.amethyst.commons.model.nip28PublicChats.PublicChatChannel
+import com.vitorpamplona.amethyst.commons.model.nip29RelayGroups.RelayGroupChannel
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.model.nip11RelayInfo.loadRelayInfo
@@ -80,6 +89,7 @@ import com.vitorpamplona.amethyst.ui.theme.grayText
 import com.vitorpamplona.amethyst.ui.theme.newItemBubbleModifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.quartz.experimental.ephemChat.chat.EphemeralChatEvent
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.displayUrl
 import com.vitorpamplona.quartz.nip17Dm.base.ChatroomKey
 import com.vitorpamplona.quartz.nip17Dm.base.ChatroomKeyable
 import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent
@@ -138,6 +148,12 @@ private fun ChatroomEntry(
        return
    }

+    val relayGroup = lastMessage.inGatherers?.firstNotNullOfOrNull { it as? RelayGroupChannel }
+    if (relayGroup != null) {
+        RelayGroupRoomCompose(lastMessage, relayGroup, accountViewModel, nav)
+        return
+    }
+
    val baseNoteEvent = lastMessage.event
    when (baseNoteEvent) {
        // ChannelMessageEvent and ChannelMetadataEvent both expose channelId() via
@@ -299,6 +315,80 @@ private fun MarmotGroupRoomCompose(
    )
 }

+@Composable
+private fun RelayGroupRoomCompose(
+    lastMessage: Note,
+    baseChannel: RelayGroupChannel,
+    accountViewModel: AccountViewModel,
+    nav: INav,
+) {
+    val channelState by observeChannel(baseChannel, accountViewModel)
+    val channel = channelState?.channel as? RelayGroupChannel ?: baseChannel
+
+    val author = lastMessage.author
+    val noteEvent = lastMessage.event
+    val lastContent =
+        if (author != null && noteEvent != null) {
+            val authorName by observeUserName(author, accountViewModel)
+            "$authorName: ${noteEvent.content.take(200)}"
+        } else {
+            ""
+        }
+
+    ChannelName(
+        channelIdHex = channel.groupId.id,
+        channelPicture = channel.profilePicture(),
+        channelTitle = { modifier ->
+            Row(verticalAlignment = Alignment.CenterVertically, modifier = modifier) {
+                Text(
+                    text = channel.toBestDisplayName(),
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.weight(1f, fill = false),
+                )
+                Spacer(Modifier.width(6.dp))
+                RelayNameChip(
+                    label = channel.groupId.relayUrl.displayUrl(),
+                    onClick = { nav.nav(Route.RelayGroupServer(channel.groupId.relayUrl.url)) },
+                )
+            }
+        },
+        channelLastTime = lastMessage.createdAt(),
+        channelLastContent = lastContent,
+        hasNewMessages = false,
+        loadProfilePicture = accountViewModel.settings.showProfilePictures(),
+        loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
+        autoPlayGif =
+            accountViewModel.settings.autoPlayVideosFlow
+                .collectAsStateWithLifecycle()
+                .value,
+        onClick = { nav.nav(Route.RelayGroup(channel.groupId.id, channel.groupId.relayUrl.url)) },
+    )
+}
+
+/** A small tappable chip naming the relay a channel is hosted on. */
+@Composable
+private fun RelayNameChip(
+    label: String,
+    onClick: () -> Unit,
+) {
+    Surface(
+        shape = RoundedCornerShape(6.dp),
+        color = MaterialTheme.colorScheme.secondaryContainer,
+        modifier = Modifier.clickable(onClick = onClick),
+    ) {
+        Text(
+            text = label,
+            style = MaterialTheme.typography.labelSmall,
+            color = MaterialTheme.colorScheme.onSecondaryContainer,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp),
+        )
+    }
+}
+
@Composable
 private fun ChannelTitleWithLabelInfo(
    channelName: String,
@@ -20,6 +20,7 @@
 */
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.rooms.dal

+import com.vitorpamplona.amethyst.commons.model.nip29RelayGroups.RelayGroupViewMode
 import com.vitorpamplona.amethyst.commons.util.replace
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -29,11 +30,13 @@ import com.vitorpamplona.amethyst.ui.dal.sortedByDefaultFeedOrder
 import com.vitorpamplona.quartz.experimental.ephemChat.chat.EphemeralChatEvent
 import com.vitorpamplona.quartz.experimental.ephemChat.chat.RoomId
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer
 import com.vitorpamplona.quartz.nip17Dm.base.ChatroomKey
 import com.vitorpamplona.quartz.nip17Dm.base.ChatroomKeyable
 import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent
 import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelMetadataEvent
 import com.vitorpamplona.quartz.nip28PublicChat.message.ChannelMessageEvent
+import com.vitorpamplona.quartz.nip29RelayGroups.GroupId

 class ChatroomListKnownFeedFilter(
    val account: Account,
@@ -89,7 +92,26 @@ class ChatroomListKnownFeedFilter(
                }
            }

-        return sort((privateMessages + publicChannels + ephemeralChats + marmotGroups).toSet())
+        // NIP-29 relay groups the user joined (kind 10009) appear inline in the
+        // Messages list (the "inline" view mode), each row tagged with its host
+        // relay. In the "grouped" mode they're reached via relay rows instead, so
+        // they're excluded from this flat feed.
+        val relayGroups =
+            if (account.settings.relayGroupViewMode.value == RelayGroupViewMode.INLINE) {
+                account.relayGroupList.liveRelayGroupList.value.mapNotNull { groupTag ->
+                    val relay = RelayUrlNormalizer.normalizeOrNull(groupTag.relayUrl) ?: return@mapNotNull null
+                    LocalCache
+                        .getOrCreateRelayGroupChannel(GroupId(groupTag.groupId, relay))
+                        .notes
+                        .filter { _, it -> account.isAcceptable(it) && it.event != null }
+                        .sortedByDefaultFeedOrder()
+                        .firstOrNull()
+                }
+            } else {
+                emptyList()
+            }
+
+        return sort((privateMessages + publicChannels + ephemeralChats + marmotGroups + relayGroups).toSet())
    }

    override fun updateListWith(
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.commons.model.nip29RelayGroups
+
+/**
+ * How the user's joined NIP-29 relay groups are surfaced in the Messages tab.
+ *
+ * - [INLINE] (default): each joined channel is a row in the Messages list,
+ *   tagged with a chip naming its host relay. Relaxed, everything-in-one-list.
+ * - [GROUPED]: the Messages list shows a row per host relay; tapping a relay
+ *   opens its channel list. For treating each relay's groups as a set.
+ */
+enum class RelayGroupViewMode {
+    INLINE,
+    GROUPED,
+    ;
+
+    companion object {
+        val DEFAULT = INLINE
+
+        fun fromName(name: String?): RelayGroupViewMode = entries.firstOrNull { it.name == name } ?: DEFAULT
+    }
+}