fix: Concord channel rows stuck on "No messages yet" despite having messages

consumeConcordRumor attaches a message row to its ConcordChannel BEFORE
justConsume loads the event (so the note carries its gatherer through the
Messages filter). That means Channel.addNote ran while createdAt() was still
null and never set lastNote — and on reprojects the containsKey guard skips
addNote entirely, so lastNote stayed null forever for every Concord channel.
The list/hub rows read lastNote, so they always showed "No messages yet" (and
activity sorting was a no-op) even after messages had loaded.

Adds Channel.refreshAfterEventLoad(note), called right after justConsume once
the event is present: it picks lastNote when newer and invalidates the notes
flow so previews, unread counts, and ordering recompute. Regression-tested in
commons (ConcordChannelLastNoteTest).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01P9Uv3h6GhSQVuUTY5Ffm6e
This commit is contained in:
Claude
2026-07-15 21:59:25 +00:00
parent dbb8cc522e
commit b8966049b8
3 changed files with 120 additions and 1 deletions
@@ -790,7 +790,15 @@ object LocalCache : ILocalCache, ICacheProvider {
// permanent "Event is loading…" ghost. Drop it; the reverse order (delete after the message)
// is already handled by the normal deletion cascade unlinking the note from its gatherers.
messageRow?.let { (ch, note) ->
if (note.event == null) ch.removeNote(note)
if (note.event == null) {
ch.removeNote(note)
} else {
// The row was attached (addNote) BEFORE justConsume set the event, so addNote saw a
// null createdAt and could not pick lastNote or order the feed. The event is loaded
// now — refresh so the channel's last-message preview, unread count, and ordering are
// correct (otherwise lastNote stays null forever and every row reads "No messages yet").
ch.refreshAfterEventLoad(note)
}
}
}
@@ -116,6 +116,24 @@ abstract class Channel : NotesGatherer {
}
}
/**
* Refresh derived state after an already-[addNote]'d [note] finishes loading its event.
*
* Most channels attach a note whose event is already set, so [addNote] can pick [lastNote] and
* order the feed right away. Concord is the exception: it attaches a message row to its channel
* *before* the rumor is consumed (so the row already carries its gatherer when it flows through
* the Messages filter), which means [addNote] ran while `createdAt()` was still null and could
* neither set [lastNote] nor sort correctly. Once the event lands, call this so [lastNote] and
* any notes-flow observers (row previews, unread counts, ordering) reflect the real message.
*/
fun refreshAfterEventLoad(note: Note) {
if (!notes.containsKey(note.idHex)) return
if ((note.createdAt() ?: 0L) > (lastNote?.createdAt() ?: 0L)) {
lastNote = note
}
flowSet?.notes?.invalidateData()
}
override fun removeNote(note: Note) {
if (notes.containsKey(note.idHex)) {
notes.remove(note.idHex)
@@ -0,0 +1,93 @@
/*
* 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.concord
import com.vitorpamplona.amethyst.commons.model.Note
import com.vitorpamplona.quartz.concord.cord03Channels.ConcordChannelId
import com.vitorpamplona.quartz.nip01Core.core.Event
import com.vitorpamplona.quartz.utils.EventFactory
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertNull
/**
* Regression cover for the Concord attach-before-consume ordering: `LocalCache.consumeConcordRumor`
* attaches a message row to its [ConcordChannel] (so the note carries its gatherer through the
* Messages filter) *before* `justConsume` loads the event, so [com.vitorpamplona.amethyst.commons.model.Channel.addNote]
* runs while `createdAt()` is null and cannot pick [com.vitorpamplona.amethyst.commons.model.Channel.lastNote].
* Without the [com.vitorpamplona.amethyst.commons.model.Channel.refreshAfterEventLoad] follow-up,
* `lastNote` stays null forever and every channel row renders "No messages yet" even after messages
* have loaded.
*/
class ConcordChannelLastNoteTest {
private val community = "aa".repeat(32)
private val channelId = "cc".repeat(32)
private val author = "bb".repeat(32)
private fun channel() = ConcordChannel(ConcordChannelId(community, channelId))
private fun event(createdAt: Long): Event = EventFactory.create("00".repeat(32), author, createdAt, 1, arrayOf(), "hi", "22".repeat(64))
@Test
fun lastNoteStaysNullUntilEventLoads_thenReflectsIt() {
val c = channel()
val note = Note("11".repeat(32))
// Attach exactly as Concord does — before the rumor is consumed, so the event is still null.
c.addNote(note)
assertNull(c.lastNote, "addNote can't pick lastNote while createdAt() is null (the bug)")
// justConsume loads the event; the follow-up refresh must now set lastNote.
note.event = event(1000)
c.refreshAfterEventLoad(note)
assertEquals(note, c.lastNote)
}
@Test
fun refreshKeepsTheNewestAndIgnoresLaterOlderLoads() {
val c = channel()
val older = Note("11".repeat(32))
val newer = Note("22".repeat(32))
c.addNote(older)
c.addNote(newer)
older.event = event(1000)
c.refreshAfterEventLoad(older)
newer.event = event(2000)
c.refreshAfterEventLoad(newer)
assertEquals(newer, c.lastNote)
// An out-of-order older message loading afterwards must not overwrite the newest.
val evenOlder = Note("33".repeat(32))
c.addNote(evenOlder)
evenOlder.event = event(500)
c.refreshAfterEventLoad(evenOlder)
assertEquals(newer, c.lastNote)
}
@Test
fun refreshIsANoOpForANoteNotInThisChannel() {
val c = channel()
val stray = Note("44".repeat(32)).apply { event = event(9999) }
c.refreshAfterEventLoad(stray)
assertNull(c.lastNote)
}
}