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

Revert "mute: receiving New Mute List Type"

Browse Source 
This reverts commit 2861ee2c12.
This commit is contained in:
William Casarin
2024-01-25 12:10:15 -08:00
parent b5c384da43
commit 66fd1dd444
1 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
damus/Models/HomeModel.swift
View File

@@ -158,9 +158,10 @@ class HomeModel {
// profile metadata processing is handled by nostrdb // profile metadata processing is handled by nostrdb
break break
case .list_deprecated: case .list_deprecated:
handle_old_list_event(ev) handle_list_event(ev)
case .mute_list: case .mute_list:
handle_mute_list_event(ev) // @TODO: this will be implemented in a future patch
break
case .boost: case .boost:
handle_boost_event(sub_id: sub_id, ev) handle_boost_event(sub_id: sub_id, ev)
case .like: case .like:
@@ -463,13 +464,10 @@ class HomeModel {
var our_contacts_filter = NostrFilter(kinds: [.contacts, .metadata]) var our_contacts_filter = NostrFilter(kinds: [.contacts, .metadata])
our_contacts_filter.authors = [damus_state.pubkey] our_contacts_filter.authors = [damus_state.pubkey]
var our_old_blocklist_filter = NostrFilter(kinds: [.list_deprecated]) var our_blocklist_filter = NostrFilter(kinds: [.list_deprecated])
our_old_blocklist_filter.parameter = ["mute"] our_blocklist_filter.parameter = ["mute"]
our_old_blocklist_filter.authors = [damus_state.pubkey]
var our_blocklist_filter = NostrFilter(kinds: [.mute_list])
our_blocklist_filter.authors = [damus_state.pubkey] our_blocklist_filter.authors = [damus_state.pubkey]
var dms_filter = NostrFilter(kinds: [.dm]) var dms_filter = NostrFilter(kinds: [.dm])
var our_dms_filter = NostrFilter(kinds: [.dm]) var our_dms_filter = NostrFilter(kinds: [.dm])
@@ -493,7 +491,7 @@ class HomeModel {
notifications_filter.limit = 500 notifications_filter.limit = 500
var notifications_filters = [notifications_filter] var notifications_filters = [notifications_filter]
var contacts_filters = [contacts_filter, our_contacts_filter, our_blocklist_filter, our_old_blocklist_filter] var contacts_filters = [contacts_filter, our_contacts_filter, our_blocklist_filter]
var dms_filters = [dms_filter, our_dms_filter] var dms_filters = [dms_filter, our_dms_filter]
let last_of_kind = get_last_of_kind(relay_id: relay_id) let last_of_kind = get_last_of_kind(relay_id: relay_id)
@@ -562,29 +560,12 @@ class HomeModel {
pool.send(.subscribe(sub), to: relay_ids) pool.send(.subscribe(sub), to: relay_ids)
} }
func handle_mute_list_event(_ ev: NostrEvent) { func handle_list_event(_ ev: NostrEvent) {
// we only care about our mutelist
guard ev.pubkey == damus_state.pubkey else {
return
}
// we only care about the most recent mutelist
if let mutelist = damus_state.contacts.mutelist {
if ev.created_at <= mutelist.created_at {
return
}
}
damus_state.contacts.set_mutelist(ev)
}
func handle_old_list_event(_ ev: NostrEvent) {
// we only care about our lists // we only care about our lists
guard ev.pubkey == damus_state.pubkey else { guard ev.pubkey == damus_state.pubkey else {
return return
} }
// we only care about the most recent mutelist
if let mutelist = damus_state.contacts.mutelist { if let mutelist = damus_state.contacts.mutelist {
if ev.created_at <= mutelist.created_at { if ev.created_at <= mutelist.created_at {
return return