e951370a76
This commit tries to replace all usage of `String` to represent relay URLs and use `RelayURL` which automatically converts strings to a canonical relay URL format that is more reliable and avoids issues related to trailing slashes. Test 1: Main issue fix ----------------------- PASS Device: iPhone 15 Simulator iOS: 17.4 Damus: This commit Steps: 1. Delete all connected relays 2. Add `wss://relay.damus.io/` (with the trailing slash) to the relay list 3. Try to post. Post should succeed. PASS 4. Try removing this newly added relay. Relay should be removed successfully. PASS Test 2: Persistent relay list after upgrade -------------------------------------------- PASS Device: iPhone 15 Simulator iOS: 17.4 Damus: 1.8 (1) `247f313b` + This commit Steps: 1. Downgrade to old version 2. Add some relays to the list, some without a trailing slash, some with 3. Upgrade to this commit 4. All relays added in step 2 should still be there, and ones with a trailing slash should have been corrected to remove the trailing slash Test 3: Miscellaneous regression tests -------------------------------------- Device: iPhone 15 Simulator iOS: 17.4 Damus: This commit Coverage: 1. Posting works 2. Search works 3. Relay connection status works 4. Adding relays work 5. Removing relays work 6. Adding relay with trailing slashes works (it fixes itself to remove the trailing slash) 7. Adding relays with different paths works (e.g. wss://yabu.me/v1 and wss://yabu.me/v2) 8. Adding duplicate relay (but with trailing slash) gets rejected as expected 9. Relay details page works. All items on that view loads correctly 10. Relay logs work 11. Getting follower counts and seeing follow lists on profiles still work 12. Relay list changes persist after app restart 13. Notifications view still work 14. Copying the user's pubkey and profile link works 15. Share note + copy link button still works 16. Connecting NWC wallet works 17. One-tap zaps work 18. Onboarding works 19. Unit tests all passing Closes: https://github.com/damus-io/damus/issues/2072 Changelog-Fixed: Fix bug that would cause connection issues with relays defined with a trailing slash URL, and an inability to delete them. Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Signed-off-by: William Casarin <jb55@jb55.com>
104 lines
3.3 KiB
Swift
104 lines
3.3 KiB
Swift
//
|
||
// NostrEvent+.swift
|
||
// damus
|
||
//
|
||
// Created by Daniel D’Aquino on 2023-11-17.
|
||
//
|
||
|
||
import Foundation
|
||
|
||
func make_zap_request_event(keypair: FullKeypair, content: String, relays: [RelayDescriptor], target: ZapTarget, zap_type: ZapType) -> MakeZapRequest? {
|
||
var tags = zap_target_to_tags(target)
|
||
var relay_tag = ["relays"]
|
||
relay_tag.append(contentsOf: relays.map { $0.url.absoluteString })
|
||
tags.append(relay_tag)
|
||
|
||
var kp = keypair
|
||
|
||
let now = UInt32(Date().timeIntervalSince1970)
|
||
|
||
var privzap_req: PrivateZapRequest?
|
||
|
||
var message = content
|
||
switch zap_type {
|
||
case .pub:
|
||
break
|
||
case .non_zap:
|
||
break
|
||
case .anon:
|
||
tags.append(["anon"])
|
||
kp = generate_new_keypair()
|
||
case .priv:
|
||
guard let priv_kp = generate_private_keypair(our_privkey: keypair.privkey, id: NoteId(target.id), created_at: now) else {
|
||
return nil
|
||
}
|
||
kp = priv_kp
|
||
guard let privreq = make_private_zap_request_event(identity: keypair, enc_key: kp, target: target, message: message) else {
|
||
return nil
|
||
}
|
||
tags.append(["anon", privreq.enc])
|
||
message = ""
|
||
privzap_req = privreq
|
||
}
|
||
|
||
guard let ev = NostrEvent(content: message, keypair: kp.to_keypair(), kind: 9734, tags: tags, createdAt: now) else {
|
||
return nil
|
||
}
|
||
let zapreq = ZapRequest(ev: ev)
|
||
if let privzap_req {
|
||
return .priv(zapreq, privzap_req)
|
||
} else {
|
||
return .normal(zapreq)
|
||
}
|
||
}
|
||
|
||
func zap_target_to_tags(_ target: ZapTarget) -> [[String]] {
|
||
switch target {
|
||
case .profile(let pk):
|
||
return [["p", pk.hex()]]
|
||
case .note(let note_target):
|
||
return [["e", note_target.note_id.hex()],
|
||
["p", note_target.author.hex()]]
|
||
}
|
||
}
|
||
|
||
func make_private_zap_request_event(identity: FullKeypair, enc_key: FullKeypair, target: ZapTarget, message: String) -> PrivateZapRequest? {
|
||
// target tags must be the same as zap request target tags
|
||
let tags = zap_target_to_tags(target)
|
||
|
||
guard let note = NostrEvent(content: message, keypair: identity.to_keypair(), kind: 9733, tags: tags),
|
||
let note_json = encode_json(note),
|
||
let enc = encrypt_message(message: note_json, privkey: enc_key.privkey, to_pk: target.pubkey, encoding: .bech32)
|
||
else {
|
||
return nil
|
||
}
|
||
|
||
return PrivateZapRequest(req: ZapRequest(ev: note), enc: enc)
|
||
}
|
||
|
||
func make_first_contact_event(keypair: Keypair) -> NostrEvent? {
|
||
let bootstrap_relays = load_bootstrap_relays(pubkey: keypair.pubkey)
|
||
let rw_relay_info = RelayInfo(read: true, write: true)
|
||
var relays: [RelayURL: RelayInfo] = [:]
|
||
|
||
for relay in bootstrap_relays {
|
||
relays[relay] = rw_relay_info
|
||
}
|
||
|
||
let relay_json = encode_json(relays)!
|
||
let damus_pubkey = "3efdaebb1d8923ebd99c9e7ace3b4194ab45512e2be79c1b7d68d9243e0d2681"
|
||
let tags = [
|
||
["p", damus_pubkey],
|
||
["p", keypair.pubkey.hex()] // you're a friend of yourself!
|
||
]
|
||
return NostrEvent(content: relay_json, keypair: keypair, kind: NostrKind.contacts.rawValue, tags: tags)
|
||
}
|
||
|
||
func make_metadata_event(keypair: FullKeypair, metadata: Profile) -> NostrEvent? {
|
||
guard let metadata_json = encode_json(metadata) else {
|
||
return nil
|
||
}
|
||
return NostrEvent(content: metadata_json, keypair: keypair.to_keypair(), kind: NostrKind.metadata.rawValue, tags: [])
|
||
|
||
}
|