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

Fix profile and event loading in global view

Browse Source 
Changelog-Fixed: Fix profile and event loading in global view
This commit is contained in:
William Casarin
2022-12-26 07:37:42 -08:00
parent 8964a5941e
commit f8dc9f42dd
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
damus/Nostr/RelayPool.swift
View File

@@ -41,12 +41,19 @@ class RelayPool {
}
func remove_handler(sub_id: String) {
handlers = handlers.filter { $0.sub_id != sub_id }
self.handlers = handlers.filter { $0.sub_id != sub_id }
print("removing \(sub_id) handler, current: \(handlers.count)")
}
func register_handler(sub_id: String, handler: @escaping (String, NostrConnectionEvent) -> ()) {
for handler in handlers {
// don't add duplicate handlers
if handler.sub_id == sub_id {
return
}
}
self.handlers.append(RelayHandler(sub_id: sub_id, callback: handler))
print("registering \(sub_id) handler, current: \(self.handlers.count)")
}
func remove_relay(_ relay_id: String) {
@@ -125,8 +132,10 @@ class RelayPool {
}
func unsubscribe(sub_id: String, to: [String]? = nil) {
self.remove_handler(sub_id: sub_id)
self.send(.unsubscribe(sub_id))
if to == nil {
self.remove_handler(sub_id: sub_id)
}
self.send(.unsubscribe(sub_id), to: to)
}
func subscribe(sub_id: String, filters: [NostrFilter], handler: @escaping (String, NostrConnectionEvent) -> ()) {

2
damus/Views/SearchHomeView.swift
View File

@@ -85,8 +85,6 @@ struct SearchHomeView: View {
print("search change 1")
}
.onAppear {
// TODO: This will always be empty when switching between tabs
// We'll need to store these in
if model.events.isEmpty {
model.subscribe()
}