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>
110 lines
3.0 KiB
Swift
110 lines
3.0 KiB
Swift
//
|
|
// EventsModel.swift
|
|
// damus
|
|
//
|
|
// Created by William Casarin on 2022-05-24.
|
|
//
|
|
|
|
import Foundation
|
|
|
|
class EventsModel: ObservableObject {
|
|
let state: DamusState
|
|
let target: NoteId
|
|
let kind: QueryKind
|
|
let sub_id = UUID().uuidString
|
|
let profiles_id = UUID().uuidString
|
|
var events: EventHolder
|
|
@Published var loading: Bool
|
|
|
|
enum QueryKind {
|
|
case kind(NostrKind)
|
|
case quotes
|
|
}
|
|
|
|
init(state: DamusState, target: NoteId, kind: NostrKind) {
|
|
self.state = state
|
|
self.target = target
|
|
self.kind = .kind(kind)
|
|
self.loading = true
|
|
self.events = EventHolder(on_queue: { ev in
|
|
preload_events(state: state, events: [ev])
|
|
})
|
|
}
|
|
|
|
init(state: DamusState, target: NoteId, query: EventsModel.QueryKind) {
|
|
self.state = state
|
|
self.target = target
|
|
self.kind = query
|
|
self.loading = true
|
|
self.events = EventHolder(on_queue: { ev in
|
|
preload_events(state: state, events: [ev])
|
|
})
|
|
}
|
|
|
|
public static func quotes(state: DamusState, target: NoteId) -> EventsModel {
|
|
EventsModel(state: state, target: target, query: .quotes)
|
|
}
|
|
|
|
public static func reposts(state: DamusState, target: NoteId) -> EventsModel {
|
|
EventsModel(state: state, target: target, kind: .boost)
|
|
}
|
|
|
|
public static func likes(state: DamusState, target: NoteId) -> EventsModel {
|
|
EventsModel(state: state, target: target, kind: .like)
|
|
}
|
|
|
|
private func get_filter() -> NostrFilter {
|
|
var filter: NostrFilter
|
|
switch kind {
|
|
case .kind(let k):
|
|
filter = NostrFilter(kinds: [k])
|
|
filter.referenced_ids = [target]
|
|
case .quotes:
|
|
filter = NostrFilter(kinds: [.text])
|
|
filter.quotes = [target]
|
|
}
|
|
filter.limit = 500
|
|
return filter
|
|
}
|
|
|
|
func subscribe() {
|
|
state.pool.subscribe(sub_id: sub_id,
|
|
filters: [get_filter()],
|
|
handler: handle_nostr_event)
|
|
}
|
|
|
|
func unsubscribe() {
|
|
state.pool.unsubscribe(sub_id: sub_id)
|
|
}
|
|
|
|
private func handle_event(relay_id: RelayURL, ev: NostrEvent) {
|
|
if events.insert(ev) {
|
|
objectWillChange.send()
|
|
}
|
|
}
|
|
|
|
func handle_nostr_event(relay_id: RelayURL, ev: NostrConnectionEvent) {
|
|
guard case .nostr_event(let nev) = ev, nev.subid == self.sub_id
|
|
else {
|
|
return
|
|
}
|
|
|
|
switch nev {
|
|
case .event(_, let ev):
|
|
handle_event(relay_id: relay_id, ev: ev)
|
|
case .notice:
|
|
break
|
|
case .ok:
|
|
break
|
|
case .auth:
|
|
break
|
|
case .eose:
|
|
self.loading = false
|
|
guard let txn = NdbTxn(ndb: self.state.ndb) else {
|
|
return
|
|
}
|
|
load_profiles(context: "events_model", profiles_subid: profiles_id, relay_id: relay_id, load: .from_events(events.all_events), damus_state: state, txn: txn)
|
|
}
|
|
}
|
|
}
|