highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-11-10 07:37:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates relays that are sending old versions of replaceables or events that have been already deleted.

Browse Source
This commit is contained in:
Vitor Pamplona
2024-07-11 11:36:59 -04:00
parent ad449ba239
commit 9641940bd9
2 changed files with 59 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
commons/src/main/java/com/vitorpamplona/amethyst/commons/data/DeletionIndex.kt
View File

@@ -43,14 +43,14 @@ class DeletionIndex {
// stores a set of id OR atags (kind:pubkey:dtag) by pubkey with the created at of the deletion event.
// Anything newer than the date should not be deleted.
private val deletedReferencesBefore = LargeCache<DeletionRequest, Long>()
private val deletedReferencesBefore = LargeCache<DeletionRequest, DeletionEvent>()
fun add(event: DeletionEvent): Boolean {
var atLeastOne = false
event.tags.forEach {
if (it.size > 1 && (it[0] == "a" || it[0] == "e")) {
if (add(it[1], event.pubKey, event.createdAt)) {
if (add(it[1], event.pubKey, event)) {
atLeastOne = true
}
}
@@ -62,18 +62,34 @@ class DeletionIndex {
private fun add(
ref: String,
byPubKey: HexKey,
createdAt: Long,
deletionEvent: DeletionEvent,
): Boolean {
val key = DeletionRequest(ref, byPubKey)
val previousDeletionTime = deletedReferencesBefore.get(key)
val previousDeletionEvent = deletedReferencesBefore.get(key)
if (previousDeletionTime == null || createdAt > previousDeletionTime) {
deletedReferencesBefore.put(key, createdAt)
if (previousDeletionEvent == null || deletionEvent.createdAt > previousDeletionEvent.createdAt) {
deletedReferencesBefore.put(key, deletionEvent)
return true
}
return false
}
fun hasBeenDeletedBy(event: Event): DeletionEvent? {
deletedReferencesBefore.get(DeletionRequest(event.id, event.pubKey))?.let {
return it
}
if (event is AddressableEvent) {
deletedReferencesBefore.get(DeletionRequest(event.addressTag(), event.pubKey))?.let {
if (event.createdAt <= it.createdAt) {
return it
}
}
}
return null
}
fun hasBeenDeleted(event: Event): Boolean {
val key = DeletionRequest(event.id, event.pubKey)
if (hasBeenDeleted(key)) return true
@@ -91,7 +107,7 @@ class DeletionIndex {
key: DeletionRequest,
createdAt: Long,
): Boolean {
val deletionTime = deletedReferencesBefore.get(key)
return deletionTime != null && createdAt <= deletionTime
val deletionEvent = deletedReferencesBefore.get(key)
return deletionEvent != null && createdAt <= deletionEvent.createdAt
}
}