feat: Phase 7 — Marmot group chat UI & ViewModel layer

Add complete UI layer for Marmot Protocol MLS group messaging: State models (commons/commonMain/): - MarmotGroupChatroom: tracks decrypted inner messages per group - MarmotGroupList: manages all group chatrooms with change notifications - MarmotGroupFeedFilter: feed filter for group message feeds - MarmotGroupFeedViewModel: ViewModel exposing group messages Account integration: - Add marmotGroupList to IAccount interface and implementations - GroupEventHandler indexes inner events into MarmotGroupList - AccountViewModel gains sendMarmotGroupMessage, createMarmotGroup, publishMarmotKeyPackage helper methods Android screens (amethyst/): - MarmotGroupListScreen: lists all groups with last message preview - MarmotGroupChatScreen: group conversation with message composer - MarmotGroupChatView: message feed + simple text composer - CreateGroupDialog: create new MLS group with display name - AddMemberDialog: add member by npub/hex (KeyPackage fetch TBD) Navigation & integration: - Route.MarmotGroupList and Route.MarmotGroupChat routes - Wired into AppNavigation nav graph - "MLS Groups" button added to ChannelFabColumn on Messages screen - Marmot group newest messages appear in ChatroomListKnownFeedFilter https://claude.ai/code/session_0194SxKfAU61PY92eqP4cCXM
2026-04-05 20:38:23 +00:00
parent e1304ddcab
commit 7ed036bbaa
19 changed files with 1137 additions and 1 deletions
@@ -20,6 +20,7 @@
 */
 package com.vitorpamplona.amethyst.commons.model

+import com.vitorpamplona.amethyst.commons.model.marmotGroups.MarmotGroupList
 import com.vitorpamplona.amethyst.commons.model.privateChats.ChatroomList
 import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
@@ -101,6 +102,9 @@ interface IAccount {
    /** Chatroom list for private DM conversations */
    val chatroomList: ChatroomList

+    /** Marmot MLS group chat list */
+    val marmotGroupList: MarmotGroupList
+
    /** Whether a note is acceptable (not hidden, not blocked, etc.) */
    fun isAcceptable(note: Note): Boolean

@@ -0,0 +1,107 @@
+/*
+ * 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.marmotGroups
+
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.commons.model.Channel.Companion.DefaultFeedOrder
+import com.vitorpamplona.amethyst.commons.model.ListChange
+import com.vitorpamplona.amethyst.commons.model.Note
+import com.vitorpamplona.amethyst.commons.model.NotesGatherer
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import java.lang.ref.WeakReference
+
+/**
+ * Represents a Marmot MLS group chat room.
+ * Tracks decrypted inner messages for a single group.
+ * Follows the same pattern as [com.vitorpamplona.amethyst.commons.model.privateChats.Chatroom].
+ */
+@Stable
+class MarmotGroupChatroom(
+    val nostrGroupId: HexKey,
+) : NotesGatherer {
+    var messages: Set<Note> = setOf()
+    var displayName = MutableStateFlow<String?>(null)
+    var memberCount = MutableStateFlow(0)
+    var newestMessage: Note? = null
+
+    private var changesFlow: WeakReference<MutableSharedFlow<ListChange<Note>>> = WeakReference(null)
+
+    fun changesFlow(): MutableSharedFlow<ListChange<Note>> {
+        val current = changesFlow.get()
+        if (current != null) return current
+        val new = MutableSharedFlow<ListChange<Note>>(0, 100, BufferOverflow.DROP_OLDEST)
+        changesFlow = WeakReference(new)
+        return new
+    }
+
+    override fun removeNote(note: Note) {
+        removeMessageSync(note)
+    }
+
+    @Synchronized
+    fun addMessageSync(msg: Note): Boolean {
+        if (msg !in messages) {
+            messages = messages + msg
+            msg.addGatherer(this)
+
+            val createdAt = msg.createdAt() ?: 0L
+            if (createdAt > (newestMessage?.createdAt() ?: 0L)) {
+                newestMessage = msg
+            }
+
+            changesFlow.get()?.tryEmit(ListChange.Addition(msg))
+            return true
+        }
+        return false
+    }
+
+    @Synchronized
+    fun removeMessageSync(msg: Note): Boolean {
+        if (msg in messages) {
+            messages = messages - msg
+            msg.removeGatherer(this)
+
+            if (msg == newestMessage) {
+                newestMessage = messages.maxByOrNull { it.createdAt() ?: 0L }
+            }
+
+            changesFlow.get()?.tryEmit(ListChange.Deletion(msg))
+            return true
+        }
+        return false
+    }
+
+    fun pruneMessagesToTheLatestOnly(): Set<Note> {
+        val sorted = messages.sortedWith(DefaultFeedOrder)
+        val toKeep =
+            sorted.take(100).toSet() +
+                sorted.filter { it.flowSet?.isInUse() ?: false }
+
+        val toRemove = messages.minus(toKeep)
+        messages = toKeep
+
+        changesFlow.get()?.tryEmit(ListChange.SetDeletion<Note>(toRemove))
+        return toRemove
+    }
+}
@@ -0,0 +1,67 @@
+/*
+ * 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.marmotGroups
+
+import com.vitorpamplona.amethyst.commons.model.Note
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.utils.cache.LargeCache
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+
+/**
+ * Tracks all Marmot MLS group chatrooms for an account.
+ * Follows the same pattern as [com.vitorpamplona.amethyst.commons.model.privateChats.ChatroomList].
+ */
+class MarmotGroupList {
+    var rooms = LargeCache<HexKey, MarmotGroupChatroom>()
+        private set
+
+    private val _groupListChanges = MutableSharedFlow<HexKey>(0, 20, BufferOverflow.DROP_OLDEST)
+    val groupListChanges = _groupListChanges
+
+    fun getOrCreateGroup(nostrGroupId: HexKey): MarmotGroupChatroom = rooms.getOrCreate(nostrGroupId) { MarmotGroupChatroom(nostrGroupId) }
+
+    fun addMessage(
+        nostrGroupId: HexKey,
+        msg: Note,
+    ) {
+        val chatroom = getOrCreateGroup(nostrGroupId)
+        if (chatroom.addMessageSync(msg)) {
+            _groupListChanges.tryEmit(nostrGroupId)
+        }
+    }
+
+    fun removeMessage(
+        nostrGroupId: HexKey,
+        msg: Note,
+    ) {
+        val chatroom = getOrCreateGroup(nostrGroupId)
+        if (chatroom.removeMessageSync(msg)) {
+            _groupListChanges.tryEmit(nostrGroupId)
+        }
+    }
+
+    fun allGroupIds(): List<HexKey> {
+        val result = mutableListOf<HexKey>()
+        rooms.forEach { key, _ -> result.add(key) }
+        return result
+    }
+}
@@ -0,0 +1,56 @@
+/*
+ * 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.ui.feeds
+
+import com.vitorpamplona.amethyst.commons.model.IAccount
+import com.vitorpamplona.amethyst.commons.model.Note
+import com.vitorpamplona.amethyst.commons.model.marmotGroups.MarmotGroupList
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+
+/**
+ * Feed filter for messages within a single Marmot MLS group.
+ * Retrieves decrypted inner events from the [MarmotGroupList].
+ */
+class MarmotGroupFeedFilter(
+    val nostrGroupId: HexKey,
+    val marmotGroupList: MarmotGroupList,
+    val account: IAccount,
+) : AdditiveFeedFilter<Note>(),
+    ChangesFlowFilter<Note> {
+    fun chatroom() = marmotGroupList.getOrCreateGroup(nostrGroupId)
+
+    override fun changesFlow() = chatroom().changesFlow()
+
+    override fun feedKey(): String = nostrGroupId
+
+    override fun feed(): List<Note> =
+        chatroom()
+            .messages
+            .filter { account.isAcceptable(it) }
+            .sortedWith(DefaultFeedOrder)
+
+    override fun applyFilter(newItems: Set<Note>): Set<Note> {
+        val chatroom = chatroom()
+        return newItems.filter { it in chatroom.messages && account.isAcceptable(it) }.toSet()
+    }
+
+    override fun sort(items: Set<Note>): List<Note> = items.sortedWith(DefaultFeedOrder)
+}
@@ -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.viewmodels
+
+import com.vitorpamplona.amethyst.commons.model.IAccount
+import com.vitorpamplona.amethyst.commons.model.cache.ICacheProvider
+import com.vitorpamplona.amethyst.commons.model.marmotGroups.MarmotGroupList
+import com.vitorpamplona.amethyst.commons.ui.feeds.MarmotGroupFeedFilter
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+
+/**
+ * ViewModel for a single Marmot group conversation feed.
+ * Exposes the decrypted inner messages for the group.
+ */
+class MarmotGroupFeedViewModel(
+    val nostrGroupId: HexKey,
+    val account: IAccount,
+    marmotGroupList: MarmotGroupList,
+    cacheProvider: ICacheProvider,
+) : ListChangeFeedViewModel(
+        MarmotGroupFeedFilter(nostrGroupId, marmotGroupList, account),
+        cacheProvider,
+    )