Pending Zaps

A fairly large change that replaces Zaps in the codebase with "Zapping"
which is a tagged union consisting of a resolved Zap and a Pending Zap.
These are both counted as Zaps everywhere in Damus, except pending zaps
can be cancelled (most of the time).

damus/Models/Notifications/ZapGroup.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 class ZapGroup {
-    var zaps: [Zap]
+    var zaps: [Zapping]
     var msat_total: Int64
     var zappers: Set<String>
     
@@ -17,22 +17,16 @@ class ZapGroup {
             return 0
         }
         
-        return first.event.created_at
+        return first.created_at
     }
     
     func zap_requests() -> [NostrEvent] {
-        zaps.map { z in
-            if let priv = z.private_request {
-                return priv
-            } else {
-                return z.request.ev
-            }
-        }
+        zaps.map { z in z.request }
     }
     
     func would_filter(_ isIncluded: (NostrEvent) -> Bool) -> Bool {
         for zap in zaps {
-            if !isIncluded(zap.request_ev) {
+            if !isIncluded(zap.request) {
                 return true
             }
         }
@@ -41,7 +35,7 @@ class ZapGroup {
     }
     
     func filter(_ isIncluded: (NostrEvent) -> Bool) -> ZapGroup? {
-        let new_zaps = zaps.filter { isIncluded($0.request_ev) }
+        let new_zaps = zaps.filter { isIncluded($0.request) }
         guard new_zaps.count > 0 else {
             return nil
         }
@@ -59,15 +53,15 @@ class ZapGroup {
     }
     
     @discardableResult
-    func insert(_ zap: Zap) -> Bool {
+    func insert(_ zap: Zapping) -> Bool {
         if !insert_uniq_sorted_zap_by_created(zaps: &zaps, new_zap: zap) {
             return false
         }
         
-        msat_total += zap.invoice.amount
+        msat_total += zap.amount
         
-        if !zappers.contains(zap.request.ev.pubkey)  {
-            zappers.insert(zap.request.ev.pubkey)
+        if !zappers.contains(zap.request.pubkey)  {
+            zappers.insert(zap.request.pubkey)
         }
         
         return true