highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-06-27 09:00:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Narrowing the redownloads of reactions down.

Browse Source
This commit is contained in:
Vitor Pamplona 2023-11-20 18:58:25 -05:00
parent 5a9d6929e5
commit 9acad8b3f5
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/vitorpamplona/amethyst/service/NostrDataSource.kt
View File

@ -61,7 +61,7 @@ abstract class NostrDataSource(val debugName: String) {
if (type == Relay.StateType.EOSE && subscriptionId != null && subscriptionId in subscriptions.keys) {
// updates a per subscripton since date
subscriptions[subscriptionId]?.updateEOSE(
TimeUtils.fiveMinutesAgo(), // in case people's clock is slighly off.
TimeUtils.oneMinuteAgo(), // in case people's clock is slighly off.
relay.url
)
}

9
app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt
View File

@ -156,6 +156,15 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
}
}
addressesToWatch.forEach {
val eose = it.lastReactionsDownloadTime[relayUrl]
if (eose == null) {
it.lastReactionsDownloadTime = it.lastReactionsDownloadTime + Pair(relayUrl, EOSETime(time))
} else {
eose.time = time
}
}
// Many relays operate with limits in the amount of filters.
// As information comes, the filters will be rotated to get more data.
invalidateFilters()

2
app/src/main/java/com/vitorpamplona/amethyst/service/OnlineCheck.kt
View File

@ -29,6 +29,8 @@ object OnlineChecker {
return checkOnlineCache.get(url).online
}
Log.d("OnlineChecker", "isOnline $url")
return try {
val request = Request.Builder()
.header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")

4
app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
View File

@ -207,7 +207,7 @@ class Relay(
"EVENT" -> {
val event = Event.fromJson(msgArray.get(2))
// Log.w("Relay", "Relay onEVENT $url, $channel")
Log.w("Relay", "Relay onEVENT $url, $channel ${msgArray.get(2)}")
listeners.forEach {
it.onEvent(this@Relay, channel, event)
if (afterEOSE) {
@ -276,7 +276,7 @@ class Relay(
if (filters.isNotEmpty()) {
val request =
"""["REQ","$requestId",${filters.take(10).joinToString(",") { it.filter.toJson(url) }}]"""
// println("FILTERSSENT $url $request")
Log.d("Relay", "onFilterSent $url $requestId $request")
socket?.send(request)
eventUploadCounterInBytes += request.bytesUsedInMemory()
afterEOSE = false

1
quartz/src/main/java/com/vitorpamplona/quartz/utils/TimeUtils.kt
View File

@ -11,6 +11,7 @@ object TimeUtils {
const val oneWeek = 7 * oneDay
fun now() = System.currentTimeMillis() / 1000
fun oneMinuteAgo() = now() - oneMinute
fun fiveMinutesAgo() = now() - fiveMinutes
fun oneHourAgo() = now() - oneHour
fun oneHourAhead() = now() + oneHour