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

refactor(cli): use quartz DeletionIndex for retracted-report detection

Browse Source 
Replace the hand-rolled report-id/author matching with quartz's DeletionIndex —
the same NIP-09 indexer the Android app's LocalCache uses. It keys each deletion
under the deleter's pubkey, so hasBeenDeleted(report) is authoritative only when
the report's own author deleted it, and it also handles created_at ordering (and
addressable events, for free). Deletions come from the store, which already
verified them, so they're added as pre-verified.
This commit is contained in:
Claude
2026-07-07 13:31:04 +00:00
parent 8ee8ebdb00
commit 98709ef933
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/src/main/kotlin/com/vitorpamplona/amethyst/cli/commands/GrapeRankCommand.kt
+11 -12
View File
@@ -40,6 +40,7 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
import com.vitorpamplona.quartz.nip09Deletions.DeletionEvent
import com.vitorpamplona.quartz.nip09Deletions.DeletionIndex
import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
import com.vitorpamplona.quartz.nip56Reports.ReportEvent
import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
@@ -1042,9 +1043,11 @@ object GrapeRankCommand {
/**
* Feed reports into [builder], dropping any that a valid NIP-09 deletion has
* retracted. A report id counts as deleted only when a kind:5 in the store
* cites it AND is signed by the report's own author (NIP-09: a deletion is
* only authoritative from the event's author). Returns how many were dropped.
* retracted. Uses quartz's [DeletionIndex] — the same indexer the Android
* app's LocalCache runs — which keys each deletion under the DELETER's pubkey,
* so `hasBeenDeleted(report)` is true only when the report's own author
* deleted it (NIP-09: a deletion is authoritative only from the event's
* author). It also honours created_at ordering. Returns how many were dropped.
*/
private suspend fun materializeReports(
ctx: Context,
@@ -1053,20 +1056,16 @@ object GrapeRankCommand {
val reports = ctx.store.query<Event>(Filter(kinds = listOf(ReportEvent.KIND))).filterIsInstance<ReportEvent>()
if (reports.isEmpty()) return 0
val authorByReportId = HashMap<HexKey, HexKey>()
for (r in reports) authorByReportId[r.id] = r.pubKey
val deletedReportIds = HashSet<HexKey>()
// Everything in the store already passed verifyAndStore, so mark the
// deletions as verified and skip the redundant signature check.
val deletions = DeletionIndex()
for (ev in ctx.store.query<Event>(Filter(kinds = listOf(DeletionEvent.KIND)))) {
val del = ev as? DeletionEvent ?: continue
for (id in del.deleteEventIds()) {
if (authorByReportId[id] == del.pubKey) deletedReportIds.add(id)
}
if (ev is DeletionEvent) deletions.add(ev, wasVerified = true)
}
var dropped = 0
for (r in reports) {
if (r.id in deletedReportIds) {
if (deletions.hasBeenDeleted(r)) {
dropped++
continue
}