damus

commit 805afd12169b72181c10572439283359b332cff0
parent 12eb50255af20fc33898b03dd820f0de352dc627
Author: William Casarin <jb55@jb55.com>
Date:   Tue, 16 Aug 2022 12:26:26 -0700

Revert "don't process older contact events"

This reverts commit be3e65f657f47642bb0abd34b8568c33928a9bcd.

Diffstat:
M
damus/Models/HomeModel.swift
 | 
25
+++++--------------------

1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/damus/Models/HomeModel.swift b/damus/Models/HomeModel.swift
@@ -424,7 +424,7 @@ func add_contact_if_friend(contacts: Contacts, ev: NostrEvent) {
 }
 
 func load_our_contacts(contacts: Contacts, our_pubkey: String, ev: NostrEvent) {
-    guard should_process_our_contact_event(ev, contacts: contacts, our_pubkey: our_pubkey) else {
+    guard ev.pubkey == our_pubkey else {
         return
     }
 
@@ -504,7 +504,7 @@ func process_metadata_event(image_cache: ImageCache, profiles: Profiles, ev: Nos
 
     let tprof = TimestampedProfile(profile: profile, timestamp: ev.created_at)
     profiles.add(id: ev.pubkey, profile: tprof)
-
+    
     // load pfps asap
     let picture = tprof.profile.picture ?? robohash(ev.pubkey)
     if let url = URL(string: picture) {
@@ -517,7 +517,7 @@ func process_metadata_event(image_cache: ImageCache, profiles: Profiles, ev: Nos
             return res
         }
     }
-
+    
     notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
 }
 
@@ -527,27 +527,12 @@ func robohash(_ pk: String) -> String {
 
 func process_contact_event(pool: RelayPool, contacts: Contacts, pubkey: String, ev: NostrEvent) {
     load_our_contacts(contacts: contacts, our_pubkey: pubkey, ev: ev)
-    load_our_relays(our_pubkey: pubkey, contacts: contacts, pool: pool, ev: ev)
+    load_our_relays(our_pubkey: pubkey, pool: pool, ev: ev)
     add_contact_if_friend(contacts: contacts, ev: ev)
 }
 
-func should_process_our_contact_event(_ ev: NostrEvent, contacts: Contacts, our_pubkey: String) -> Bool {
+func load_our_relays(our_pubkey: String, pool: RelayPool, ev: NostrEvent) {
     guard ev.pubkey == our_pubkey else {
-        return false
-    }
-
-    if let contacts_ev = contacts.event {
-        guard ev.created_at > contacts_ev.created_at else {
-            // this is an older contacts event, ignore
-            return false
-        }
-    }
-
-    return true
-}
-
-func load_our_relays(our_pubkey: String, contacts: Contacts, pool: RelayPool, ev: NostrEvent) {
-    guard should_process_our_contact_event(ev, contacts: contacts, our_pubkey: our_pubkey) else {
         return
     }