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

Revert "Reduce battery usage by using exp backoff on connections"

Browse Source 
This is causing pretty bad fail to reconnect issues

This reverts commit 252a77fd97, reversing
changes made to a611a5d252.
This commit is contained in:
William Casarin
2023-03-17 07:54:29 -06:00
parent e0984aab34
commit 9091cb1aae
12 changed files with 161 additions and 323 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_to(sub_id: sub_id,
filters: [get_filter()],
handler: handle_nostr_event)
state.pool.subscribe(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_to(sub_id: sub_id, filters: filters, handler: handle_event)
self.damus_state.pool.subscribe(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_to(sub_id: sub_id, filters: filters, handler: handle_event)
self.damus_state.pool.subscribe(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_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)
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)
}
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_to(sub_id: base_subid, filters: [get_base_filter()], to: to_relays, handler: handle_event)
damus_state.pool.subscribe(sub_id: base_subid, filters: [get_base_filter()], handler: handle_event, to: to_relays)
}
func unsubscribe(to: String? = nil) {

4
damus/Models/ThreadModel.swift
View File

@@ -104,8 +104,8 @@ class ThreadModel: ObservableObject {
print("subscribing to thread \(event.id) with sub_id \(base_subid)")
loading = true
damus_state.pool.subscribe_to(sub_id: base_subid, filters: base_filters, handler: handle_event)
damus_state.pool.subscribe_to(sub_id: meta_subid, filters: meta_filters, handler: handle_event)
damus_state.pool.subscribe(sub_id: base_subid, filters: base_filters, handler: handle_event)
damus_state.pool.subscribe(sub_id: meta_subid, filters: meta_filters, handler: handle_event)
}
func add_event(_ ev: NostrEvent, privkey: String?) {

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_to(sub_id: zaps_subid, filters: [filter], handler: handle_event)
state.pool.subscribe(sub_id: zaps_subid, filters: [filter], handler: handle_event)
}
func unsubscribe() {