move text event to its own file, improve zaps

damus/Views/Events/BuilderEventView.swift

@@ -31,23 +31,30 @@ struct BuilderEventView: View {
             return
         }
         
-        // Is current event
-        if id == subscription_uuid {
-            if event != nil {
-                return
-            }
-            
-            event = nostr_event
-            
-            unsubscribe()
+        guard id == subscription_uuid else {
+            return
         }
+        
+        guard nostr_event.known_kind == .text else {
+            return
+        }
+        
+        if event != nil {
+            return
+        }
+        
+        event = nostr_event
+        
+        unsubscribe()
     }
     
     func load() {
         subscribe(filters: [
+            NostrFilter(ids: [self.event_id], limit: 1),
             NostrFilter(
-                ids: [self.event_id],
-                limit: 1
+                kinds: [NostrKind.zap.rawValue],
+                referenced_ids: [self.event_id],
+                limit: 500
             )
         ])
     }

damus/Views/Events/TextEvent.swift

@@ -0,0 +1,72 @@
+//
+//  TextEvent.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-03.
+//
+
+import SwiftUI
+
+struct TextEvent: View {
+    let damus: DamusState
+    let event: NostrEvent
+    let pubkey: String
+    let has_action_bar: Bool
+    let booster_pubkey: String?
+    
+    var body: some View {
+        HStack(alignment: .top) {
+            let profile = damus.profiles.lookup(id: pubkey)
+        
+            VStack {
+                let pmodel = ProfileModel(pubkey: pubkey, damus: damus)
+                let pv = ProfileView(damus_state: damus, profile: pmodel, followers: FollowersModel(damus_state: damus, target: pubkey))
+                
+                NavigationLink(destination: pv) {
+                    ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus.profiles)
+                }
+                
+                Spacer()
+            }
+
+            VStack(alignment: .leading) {
+                HStack(alignment: .center) {
+                    EventProfileName(pubkey: pubkey, profile: profile, damus: damus, show_friend_confirmed: true, size: .normal)
+                    
+                    Text("\(format_relative_time(event.created_at))")
+                        .foregroundColor(.gray)
+                    
+                    Spacer()
+                }
+                
+                EventBody(damus_state: damus, event: event, size: .normal)
+                
+                if let mention = first_eref_mention(ev: event, privkey: damus.keypair.privkey) {
+                    BuilderEventView(damus: damus, event_id: mention.ref.id)
+                }
+                
+                if has_action_bar {
+                    Rectangle().frame(height: 2).opacity(0)
+                    
+                    let bar = make_actionbar_model(ev: event, damus: damus)
+                    
+                    EventActionBar(damus_state: damus, event: event, bar: bar)
+                        .padding([.top], 4)
+                }
+            }
+            .padding([.leading], 2)
+        }
+        .contentShape(Rectangle())
+        .background(event_validity_color(event.validity))
+        .id(event.id)
+        .frame(maxWidth: .infinity, minHeight: PFP_SIZE)
+        .padding([.bottom], 2)
+        .event_context_menu(event, keypair: damus.keypair, target_pubkey: pubkey)
+    }
+}
+
+struct TextEvent_Previews: PreviewProvider {
+    static var previews: some View {
+        TextEvent(damus: test_damus_state(), event: test_event, pubkey: "pk", has_action_bar: true, booster_pubkey: nil)
+    }
+}

damus/Views/Events/ZapEvent.swift

@@ -0,0 +1,33 @@
+//
+//  ZapEvent.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-03.
+//
+
+import SwiftUI
+
+struct ZapEvent: View {
+    let damus: DamusState
+    let zap: Zap
+    
+    var body: some View {
+        VStack(alignment: .leading) {
+            Text("⚡️ \(format_msats(zap.invoice.amount))")
+                .font(.headline)
+                .padding([.top], 2)
+
+            TextEvent(damus: damus, event: zap.request.ev, pubkey: zap.request.ev.pubkey, has_action_bar: false, booster_pubkey: nil)
+                .padding([.top], 1)
+        }
+    }
+}
+
+/*
+struct ZapEvent_Previews: PreviewProvider {
+    static var previews: some View {
+        ZapEvent()
+    }
+}
+
+*/