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

simplified call site usage of NostrFilter

Browse Source
This commit is contained in:
Bryan Montz
2023-03-05 00:28:08 -06:00
committed by William Casarin
parent 6804fbb607
commit fe4277e817
17 changed files with 62 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
damus/Models/EventsModel.swift
View File

@@ -24,7 +24,7 @@ class EventsModel: ObservableObject {
}
private func get_filter() -> NostrFilter {
var filter = NostrFilter.filter_kinds([kind.rawValue])
var filter = NostrFilter(kinds: [kind])
filter.referenced_ids = [target]
filter.limit = 500
return filter

10
damus/Models/FollowersModel.swift
View File

@@ -30,9 +30,8 @@ class FollowersModel: ObservableObject {
}
func get_filter() -> NostrFilter {
var filter = NostrFilter.filter_contacts
filter.pubkeys = [target]
return filter
NostrFilter(kinds: [.contacts],
pubkeys: [target])
}
func subscribe() {
@@ -56,14 +55,13 @@ class FollowersModel: ObservableObject {
}
func load_profiles(relay_id: String) {
var filter = NostrFilter.filter_profiles
let authors = find_profiles_to_fetch_from_keys(profiles: damus_state.profiles, pks: contacts ?? [])
if authors.isEmpty {
return
}
filter.authors = authors
let filter = NostrFilter(kinds: [.metadata],
authors: authors)
damus_state.pool.subscribe_to(sub_id: profiles_id, filters: [filter], to: [relay_id], handler: handle_event)
}

2
damus/Models/FollowingModel.swift
View File

@@ -21,7 +21,7 @@ class FollowingModel {
}
func get_filter() -> NostrFilter {
var f = NostrFilter.filter_kinds([NostrKind.metadata.rawValue])
var f = NostrFilter(kinds: [.metadata])
f.authors = self.contacts.reduce(into: Array<String>()) { acc, pk in
// don't fetch profiles we already have
if damus_state.profiles.has_fresh_profile(id: pk) {

43
damus/Models/HomeModel.swift
View File

@@ -397,10 +397,9 @@ class HomeModel: ObservableObject {
/// Send the initial filters, just our contact list mostly
func send_initial_filters(relay_id: String) {
var filter = NostrFilter.filter_contacts
filter.authors = [self.damus_state.pubkey]
filter.limit = 1
var filter = NostrFilter(kinds: [.contacts],
limit: 1,
authors: [damus_state.pubkey])
pool.send(.subscribe(.init(filters: [filter], sub_id: init_subid)), to: [relay_id])
}
@@ -411,23 +410,19 @@ class HomeModel: ObservableObject {
var friends = damus_state.contacts.get_friend_list()
friends.append(damus_state.pubkey)
var contacts_filter = NostrFilter.filter_kinds([NostrKind.metadata.rawValue])
var contacts_filter = NostrFilter(kinds: [.metadata])
contacts_filter.authors = friends
var our_contacts_filter = NostrFilter.filter_kinds([NostrKind.contacts.rawValue, NostrKind.metadata.rawValue])
var our_contacts_filter = NostrFilter(kinds: [.contacts, .metadata])
our_contacts_filter.authors = [damus_state.pubkey]
var our_blocklist_filter = NostrFilter.filter_kinds([NostrKind.list.rawValue])
var our_blocklist_filter = NostrFilter(kinds: [.list])
our_blocklist_filter.parameter = ["mute"]
our_blocklist_filter.authors = [damus_state.pubkey]
var dms_filter = NostrFilter.filter_kinds([
NostrKind.dm.rawValue,
])
var dms_filter = NostrFilter(kinds: [.dm])
var our_dms_filter = NostrFilter.filter_kinds([
NostrKind.dm.rawValue,
])
var our_dms_filter = NostrFilter(kinds: [.dm])
// friends only?...
//dms_filter.authors = friends
@@ -436,27 +431,27 @@ class HomeModel: ObservableObject {
our_dms_filter.authors = [ damus_state.pubkey ]
// TODO: separate likes?
var home_filter_kinds = [
NostrKind.text.rawValue,
NostrKind.boost.rawValue
var home_filter_kinds: [NostrKind] = [
.text,
.boost
]
if !damus_state.settings.onlyzaps_mode {
home_filter_kinds.append(NostrKind.like.rawValue)
home_filter_kinds.append(.like)
}
var home_filter = NostrFilter.filter_kinds(home_filter_kinds)
var home_filter = NostrFilter(kinds: home_filter_kinds)
// include our pubkey as well even if we're not technically a friend
home_filter.authors = friends
home_filter.limit = 500
var notifications_filter_kinds = [
NostrKind.text.rawValue,
NostrKind.boost.rawValue,
NostrKind.zap.rawValue,
var notifications_filter_kinds: [NostrKind] = [
.text,
.boost,
.zap,
]
if !damus_state.settings.onlyzaps_mode {
notifications_filter_kinds.append(NostrKind.like.rawValue)
notifications_filter_kinds.append(.like)
}
var notifications_filter = NostrFilter.filter_kinds(notifications_filter_kinds)
var notifications_filter = NostrFilter(kinds: notifications_filter_kinds)
notifications_filter.pubkeys = [damus_state.pubkey]
notifications_filter.limit = 500

11
damus/Models/ProfileModel.swift
View File

@@ -69,16 +69,9 @@ class ProfileModel: ObservableObject, Equatable {
}
func subscribe() {
var text_filter = NostrFilter.filter_kinds([
NostrKind.text.rawValue,
NostrKind.chat.rawValue,
])
var text_filter = NostrFilter(kinds: [.text, .chat])
var profile_filter = NostrFilter.filter_kinds([
NostrKind.contacts.rawValue,
NostrKind.metadata.rawValue,
NostrKind.boost.rawValue,
])
var profile_filter = NostrFilter(kinds: [.contacts, .metadata, .boost])
profile_filter.authors = [pubkey]

8
damus/Models/SearchHomeModel.swift
View File

@@ -27,7 +27,7 @@ class SearchHomeModel: ObservableObject {
}
func get_base_filter() -> NostrFilter {
var filter = NostrFilter.filter_kinds([NostrKind.text.rawValue, NostrKind.chat.rawValue])
var filter = NostrFilter(kinds: [.text, .chat])
filter.limit = self.limit
filter.until = Int64(Date.now.timeIntervalSince1970)
return filter
@@ -126,16 +126,16 @@ enum PubkeysToLoad {
}
func load_profiles(profiles_subid: String, relay_id: String, load: PubkeysToLoad, damus_state: DamusState) {
var filter = NostrFilter.filter_profiles
let authors = find_profiles_to_fetch(profiles: damus_state.profiles, load: load, cache: damus_state.events)
filter.authors = authors
guard !authors.isEmpty else {
return
}
print("loading \(authors.count) profiles from \(relay_id)")
let filter = NostrFilter(kinds: [.metadata],
authors: authors)
damus_state.pool.subscribe_to(sub_id: profiles_subid, filters: [filter], to: [relay_id]) { sub_id, conn_ev in
let (sid, done) = handle_subid_event(pool: damus_state.pool, relay_id: relay_id, ev: conn_ev) { sub_id, ev in
guard sub_id == profiles_subid else {

2
damus/Models/SearchModel.swift
View File

@@ -34,7 +34,7 @@ class SearchModel: ObservableObject {
func subscribe() {
// since 1 month
search.limit = self.limit
search.kinds = [NostrKind.text.rawValue, NostrKind.like.rawValue]
search.kinds = [.text, .like]
//likes_filter.ids = ref_events.referenced_ids!

6
damus/Models/ThreadModel.swift
View File

@@ -56,16 +56,16 @@ class ThreadModel: ObservableObject {
let thread_id = event.thread_id(privkey: nil)
ref_events.referenced_ids = [thread_id, event.id]
ref_events.kinds = [NostrKind.text.rawValue]
ref_events.kinds = [.text]
ref_events.limit = 1000
event_filter.ids = [thread_id, event.id]
meta_events.referenced_ids = [event.id]
var kinds = [NostrKind.zap.rawValue, NostrKind.text.rawValue, NostrKind.boost.rawValue]
var kinds: [NostrKind] = [.zap, .text, .boost]
if !damus_state.settings.onlyzaps_mode {
kinds.append(NostrKind.like.rawValue)
kinds.append(.like)
}
meta_events.kinds = kinds

2
damus/Models/ZapsModel.swift
View File

@@ -24,7 +24,7 @@ class ZapsModel: ObservableObject {
}
func subscribe() {
var filter = NostrFilter.filter_kinds([NostrKind.zap.rawValue])
var filter = NostrFilter(kinds: [.zap])
switch target {
case .profile(let profile_id):
filter.pubkeys = [profile_id]