Merge branch 'master' into exp-backoff

damus/Nostr/Nostr.swift

@@ -141,6 +141,9 @@ struct Profile: Codable {
     }
     
     static func displayName(profile: Profile?, pubkey: String) -> String {
+        if pubkey == "anon" {
+            return "Anonymous"
+        }
         let pk = bech32_nopre_pubkey(pubkey) ?? pubkey
         return profile?.name ?? abbrev_pubkey(pk)
     }

damus/Nostr/NostrEvent.swift

@@ -168,6 +168,9 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
             return decrypted(privkey: privkey) ?? "*failed to decrypt content*"
         }
         
+        return content
+        
+        /*
         switch validity {
         case .ok:
             return content
@@ -176,6 +179,7 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
         case .bad_sig:
             return content + "\n\n*WARNING: invalid signature, could be forged!*"
         }
+         */
     }
 
     var description: String {
@@ -573,14 +577,25 @@ func zap_target_to_tags(_ target: ZapTarget) -> [[String]] {
     }
 }
 
-func make_zap_request_event(pubkey: String, privkey: String, content: String, relays: [RelayDescriptor], target: ZapTarget) -> NostrEvent {
+func make_zap_request_event(pubkey: String, privkey: String, content: String, relays: [RelayDescriptor], target: ZapTarget, is_anon: Bool) -> NostrEvent {
     var tags = zap_target_to_tags(target)
     var relay_tag = ["relays"]
     relay_tag.append(contentsOf: relays.map { $0.url.absoluteString })
     tags.append(relay_tag)
-    let ev = NostrEvent(content: content, pubkey: pubkey, kind: 9734, tags: tags)
+    
+    var priv = privkey
+    var pub = pubkey
+    
+    if is_anon {
+        tags.append(["anon"])
+        let kp = generate_new_keypair()
+        pub = kp.pubkey
+        priv = kp.privkey!
+    }
+    
+    let ev = NostrEvent(content: content, pubkey: pub, kind: 9734, tags: tags)
     ev.id = calculate_event_id(ev: ev)
-    ev.sig = sign_event(privkey: privkey, ev: ev)
+    ev.sig = sign_event(privkey: priv, ev: ev)
     return ev
 }
 
@@ -835,7 +850,7 @@ func first_eref_mention(ev: NostrEvent, privkey: String?) -> Mention? {
 extension [ReferencedId] {
     var pRefs: [ReferencedId] {
         get {
-            self.filter { ref in
+            Set(self).filter { ref in
                 ref.key == "p"
             }
         }

damus/Nostr/NostrKind.swift

@@ -21,4 +21,5 @@ enum NostrKind: Int {
     case chat = 42
     case list = 30000
     case zap = 9735
+    case zap_request = 9734
 }