From 0fa6dce42c546420cb734697068a557f9ef5f626 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Mon, 17 Jun 2024 16:20:40 -0400
Subject: [PATCH] Fixes giftwrap date mismatch

---
 .../com/vitorpamplona/quartz/events/GiftWrapEvent.kt   |  6 ++----
 .../vitorpamplona/quartz/events/SealedGossipEvent.kt   | 10 +++-------
 .../java/com/vitorpamplona/quartz/utils/TimeUtils.kt   |  2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/GiftWrapEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/GiftWrapEvent.kt
index 9d4e8950c..7e98dcd4b 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/GiftWrapEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/GiftWrapEvent.kt
@@ -56,9 +56,7 @@ class GiftWrapEvent(
 
     override fun isContentEncoded() = true
 
-    fun preCachedGift(signer: NostrSigner): Event? {
-        return cachedInnerEvent[signer.pubKey]
-    }
+    fun preCachedGift(signer: NostrSigner): Event? = cachedInnerEvent[signer.pubKey]
 
     fun addToCache(
         pubKey: HexKey,
@@ -114,7 +112,7 @@ class GiftWrapEvent(
         fun create(
             event: Event,
             recipientPubKey: HexKey,
-            createdAt: Long = TimeUtils.randomWithinAWeek(),
+            createdAt: Long = TimeUtils.randomWithTwoDays(),
             onReady: (GiftWrapEvent) -> Unit,
         ) {
             val signer = NostrSignerInternal(KeyPair()) // GiftWrap is always a random key
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/SealedGossipEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/SealedGossipEvent.kt
index b6411f162..1ca4af9c6 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/SealedGossipEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/SealedGossipEvent.kt
@@ -58,9 +58,7 @@ class SealedGossipEvent(
 
     override fun isContentEncoded() = true
 
-    fun preCachedGossip(signer: NostrSigner): Event? {
-        return cachedInnerEvent[signer.pubKey]
-    }
+    fun preCachedGossip(signer: NostrSigner): Event? = cachedInnerEvent[signer.pubKey]
 
     fun addToCache(
         pubKey: HexKey,
@@ -133,7 +131,7 @@ class SealedGossipEvent(
             gossip: Gossip,
             encryptTo: HexKey,
             signer: NostrSigner,
-            createdAt: Long = TimeUtils.randomWithinAWeek(),
+            createdAt: Long = TimeUtils.randomWithTwoDays(),
             onReady: (SealedGossipEvent) -> Unit,
         ) {
             val msg = Gossip.toJson(gossip)
@@ -172,8 +170,6 @@ class Gossip(
 
         fun toJson(event: Gossip): String = Event.mapper.writeValueAsString(event)
 
-        fun create(event: Event): Gossip {
-            return Gossip(event.id, event.pubKey, event.createdAt, event.kind, event.tags, event.content)
-        }
+        fun create(event: Event): Gossip = Gossip(event.id, event.pubKey, event.createdAt, event.kind, event.tags, event.content)
     }
 }
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/utils/TimeUtils.kt b/quartz/src/main/java/com/vitorpamplona/quartz/utils/TimeUtils.kt
index 023fc9fb6..bb13e4f99 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/utils/TimeUtils.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/utils/TimeUtils.kt
@@ -55,5 +55,5 @@ object TimeUtils {
 
     fun oneWeekAgo() = now() - ONE_WEEK
 
-    fun randomWithinAWeek() = System.currentTimeMillis() / 1000 - CryptoUtils.randomInt(ONE_WEEK)
+    fun randomWithTwoDays() = System.currentTimeMillis() / 1000 - CryptoUtils.randomInt(twoDays())
 }