laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-08-10 00:16:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: dedupe public-channel rows in chatroom list updates

Browse Source 
When the initial chatroom list picked a ChannelMetadataEvent or
ChannelCreateEvent as the representative note for a public channel
(because no ChannelMessageEvent had been seen yet), the arrival of a
later ChannelMessageEvent caused updateListWith to append a second
entry for the same channel — its match check only recognized old
notes whose event was a ChannelMessageEvent. Two notes for the same
channelId then produced the same PublicChannelLazyKey in the LazyColumn
and crashed with IllegalArgumentException: Key was already used.

Extract the channel id from any of the three public-chat event types
when matching the existing entry so the new message replaces the
placeholder instead of duplicating it.
This commit is contained in:
Claude
2026-05-18 01:43:08 +00:00
parent 51e136abdd
commit cc83c24427
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListKnownFeedFilter.kt
+17 -1
View File
@@ -30,6 +30,8 @@ import com.vitorpamplona.quartz.experimental.ephemChat.chat.EphemeralChatEvent
import com.vitorpamplona.quartz.experimental.ephemChat.chat.RoomId
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
class ChatroomListKnownFeedFilter(
@@ -111,7 +113,7 @@ class ChatroomListKnownFeedFilter(
newRelevantPublicMessages.forEach { newNotePair ->
var hasUpdated = false
oldList.forEach { oldNote ->
val channelId = (oldNote.event as? ChannelMessageEvent)?.channelId()
val channelId = publicChannelIdOf(oldNote)
if (newNotePair.key == channelId) {
hasUpdated = true
if ((newNotePair.value.createdAt() ?: 0L) > (oldNote.createdAt() ?: 0L)) {
@@ -260,4 +262,18 @@ class ChatroomListKnownFeedFilter(
}
override fun sort(items: Set<Note>): List<Note> = items.sortedWith(DefaultFeedOrder)
// Maps a note that represents a public chat row to its channel id. The
// representative note for a channel may be the channel's create event
// (id == channelId), a metadata update, or a message — match all three so
// an arriving ChannelMessageEvent replaces an existing placeholder
// metadata/create note for the same channel instead of duplicating it
// (which would yield the same LazyColumn key twice).
private fun publicChannelIdOf(note: Note): String? =
when (val event = note.event) {
is ChannelMessageEvent -> event.channelId()
is ChannelMetadataEvent -> event.channelId()
is ChannelCreateEvent -> event.id
else -> null
}
}