Notifications

Changelog-Added: Add new Notifications View

damus/Util/EventCache.swift

@@ -0,0 +1,27 @@
+//
+//  EventCache.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-21.
+//
+
+import Foundation
+
+class EventCache {
+    private var events: [String: NostrEvent]
+    
+    func lookup(_ evid: String) -> NostrEvent? {
+        return events[evid]
+    }
+    
+    func insert(_ ev: NostrEvent) {
+        guard events[ev.id] == nil else {
+            return
+        }
+        events[ev.id] = ev
+    }
+    
+    init() {
+        self.events = [:]
+    }
+}

damus/Util/EventHolder.swift

@@ -12,7 +12,7 @@ class EventHolder: ObservableObject {
     private var has_event: Set<String>
     @Published var events: [NostrEvent]
     @Published var incoming: [NostrEvent]
-    @Published var should_queue: Bool
+    var should_queue: Bool
     
     var queued: Int {
         return incoming.count

damus/Util/InsertSort.swift

@@ -38,8 +38,7 @@ func insert_uniq_by_pubkey(events: inout [NostrEvent], new_ev: NostrEvent, cmp:
     return true
 }
 
-@discardableResult
-func insert_uniq_sorted_zap(zaps: inout [Zap], new_zap: Zap) -> Bool {
+func insert_uniq_sorted_zap(zaps: inout [Zap], new_zap: Zap, cmp: (Zap, Zap) -> Bool) -> Bool {
     var i: Int = 0
     
     for zap in zaps {
@@ -48,7 +47,7 @@ func insert_uniq_sorted_zap(zaps: inout [Zap], new_zap: Zap) -> Bool {
             return false
         }
         
-        if new_zap.invoice.amount > zap.invoice.amount {
+        if cmp(new_zap, zap)  {
             zaps.insert(new_zap, at: i)
             return true
         }
@@ -59,6 +58,19 @@ func insert_uniq_sorted_zap(zaps: inout [Zap], new_zap: Zap) -> Bool {
     return true
 }
 
+@discardableResult
+func insert_uniq_sorted_zap_by_created(zaps: inout [Zap], new_zap: Zap) -> Bool {
+    return insert_uniq_sorted_zap(zaps: &zaps, new_zap: new_zap) { (a, b) in
+        a.event.created_at > b.event.created_at
+    }
+}
+
+@discardableResult
+func insert_uniq_sorted_zap_by_amount(zaps: inout [Zap], new_zap: Zap) -> Bool {
+    return insert_uniq_sorted_zap(zaps: &zaps, new_zap: new_zap) { (a, b) in
+        a.invoice.amount > b.invoice.amount
+    }
+}
 
 func insert_uniq_sorted_event_created(events: inout [NostrEvent], new_ev: NostrEvent) -> Bool {
     return insert_uniq_sorted_event(events: &events, new_ev: new_ev) {

damus/Util/Zaps.swift

@@ -36,7 +36,7 @@ class Zaps {
                 if our_zaps[note_target.note_id] == nil {
                     our_zaps[note_target.note_id] = [zap]
                 } else {
-                    insert_uniq_sorted_zap(zaps: &(our_zaps[note_target.note_id]!), new_zap: zap)
+                    insert_uniq_sorted_zap_by_amount(zaps: &(our_zaps[note_target.note_id]!), new_zap: zap)
                 }
             case .profile(_):
                 break