tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refinements to RelayConnection and RelayPool

Browse Source
This commit is contained in:
Bryan Montz
2023-02-24 22:39:58 -06:00
parent 0210ae5d61
commit 673358408a
9 changed files with 135 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
damus/Models/EventsModel.swift
View File

@@ -31,9 +31,9 @@ class EventsModel: ObservableObject {
}
func subscribe() {
state.pool.subscribe(sub_id: sub_id,
filters: [get_filter()],
handler: handle_nostr_event)
state.pool.subscribe_to(sub_id: sub_id,
filters: [get_filter()],
handler: handle_nostr_event)
}
func unsubscribe() {

2
damus/Models/FollowersModel.swift
View File

@@ -40,7 +40,7 @@ class FollowersModel: ObservableObject {
let filter = get_filter()
let filters = [filter]
print_filters(relay_id: "following", filters: [filters])
self.damus_state.pool.subscribe(sub_id: sub_id, filters: filters, handler: handle_event)
self.damus_state.pool.subscribe_to(sub_id: sub_id, filters: filters, handler: handle_event)
}
func unsubscribe() {

2
damus/Models/FollowingModel.swift
View File

@@ -41,7 +41,7 @@ class FollowingModel {
}
let filters = [filter]
print_filters(relay_id: "following", filters: [filters])
self.damus_state.pool.subscribe(sub_id: sub_id, filters: filters, handler: handle_event)
self.damus_state.pool.subscribe_to(sub_id: sub_id, filters: filters, handler: handle_event)
}
func unsubscribe() {

4
damus/Models/ProfileModel.swift
View File

@@ -83,8 +83,8 @@ class ProfileModel: ObservableObject, Equatable {
print("subscribing to profile \(pubkey) with sub_id \(sub_id)")
print_filters(relay_id: "profile", filters: [[text_filter], [profile_filter]])
damus.pool.subscribe(sub_id: sub_id, filters: [text_filter], handler: handle_event)
damus.pool.subscribe(sub_id: prof_subid, filters: [profile_filter], handler: handle_event)
damus.pool.subscribe_to(sub_id: sub_id, filters: [text_filter], handler: handle_event)
damus.pool.subscribe_to(sub_id: prof_subid, filters: [profile_filter], handler: handle_event)
}
func handle_profile_contact_event(_ ev: NostrEvent) {

2
damus/Models/SearchHomeModel.swift
View File

@@ -38,7 +38,7 @@ class SearchHomeModel: ObservableObject {
func subscribe() {
loading = true
let to_relays = determine_to_relays(pool: damus_state.pool, filters: damus_state.relay_filters)
damus_state.pool.subscribe(sub_id: base_subid, filters: [get_base_filter()], handler: handle_event, to: to_relays)
damus_state.pool.subscribe_to(sub_id: base_subid, filters: [get_base_filter()], to: to_relays, handler: handle_event)
}
func unsubscribe(to: String? = nil) {

2
damus/Models/ZapsModel.swift
View File

@@ -29,7 +29,7 @@ class ZapsModel: ObservableObject {
case .note(let note_target):
filter.referenced_ids = [note_target.note_id]
}
state.pool.subscribe(sub_id: zaps_subid, filters: [filter], handler: handle_event)
state.pool.subscribe_to(sub_id: zaps_subid, filters: [filter], handler: handle_event)
}
func unsubscribe() {