nostr/damus
1
0
Fork 0
mirror of git://jb55.com/damus synced 2024-09-29 08:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

mute: adding filtering support for MuteItem events

Browse Source 
This patch depends on: Receiving New Mute List Type

- Changes NewMutesNotify, NewUnmutesNotify & MuteNotify to use MuteItem instead of Pubkey
- Changes is_muted in Contacts.swift to take in a MuteItem instead of a Pubkey
    - A lot of changes here were just modifying callers of that to accept the new parameter type

Related: https://github.com/damus-io/damus/issues/1718
Related: https://github.com/damus-io/damus/issues/856
Lighting Address: fishcharlie@strike.me

Signed-off-by: Charlie Fish <contact@charlie.fish>
Reviewed-by: William Casarin <jb55@jb55.com>
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
Charlie Fish 2024-01-17 18:17:40 -07:00 committed by William Casarin
parent 2861ee2c12
commit 61a9e44898
11 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
damus/ContentView.swift
View File

@ -71,7 +71,7 @@ struct ContentView: View {
@State var active_sheet: Sheets? = nil
@State var damus_state: DamusState!
@SceneStorage("ContentView.selected_timeline") var selected_timeline: Timeline = .home
@State var muting: Pubkey? = nil
@State var muting: MuteItem? = nil
@State var confirm_mute: Bool = false
@State var hide_bar: Bool = false
@State var user_muted_confirm: Bool = false
@ -366,8 +366,8 @@ struct ContentView: View {
.onReceive(handle_notify(.report)) { target in
self.active_sheet = .report(target)
}
.onReceive(handle_notify(.mute)) { pubkey in
self.muting = pubkey
.onReceive(handle_notify(.mute)) { mute_item in
self.muting = mute_item
self.confirm_mute = true
}
.onReceive(handle_notify(.attached_wallet)) { nwc in
@ -526,7 +526,7 @@ struct ContentView: View {
user_muted_confirm = false
}
}, message: {
if let pubkey = self.muting {
if case let .user(pubkey, _) = self.muting {
let profile_txn = damus_state!.profiles.lookup(id: pubkey)
let profile = profile_txn?.unsafeUnownedValue
let name = Profile.displayName(profile: profile, pubkey: pubkey).username.truncate(maxLength: 50)
@ -544,13 +544,13 @@ struct ContentView: View {
Button(NSLocalizedString("Yes, Overwrite", comment: "Text of button that confirms to overwrite the existing mutelist.")) {
guard let ds = damus_state,
let keypair = ds.keypair.to_full(),
let pubkey = muting,
let mutelist = create_or_update_mutelist(keypair: keypair, mprev: nil, to_add: .user(pubkey, nil))
let muting,
let mutelist = create_or_update_mutelist(keypair: keypair, mprev: nil, to_add: muting)
else {
return
}
damus_state?.contacts.set_mutelist(mutelist)
ds.contacts.set_mutelist(mutelist)
ds.postbox.send(mutelist)
confirm_overwrite_mutelist = false
@ -573,21 +573,21 @@ struct ContentView: View {
confirm_overwrite_mutelist = true
} else {
guard let keypair = ds.keypair.to_full(),
let pubkey = muting
let muting
else {
return
}
guard let ev = create_or_update_mutelist(keypair: keypair, mprev: ds.contacts.mutelist, to_add: .user(pubkey, nil)) else {
guard let ev = create_or_update_mutelist(keypair: keypair, mprev: ds.contacts.mutelist, to_add: muting) else {
return
}
damus_state?.contacts.set_mutelist(ev)
ds.contacts.set_mutelist(ev)
ds.postbox.send(ev)
}
}
}, message: {
if let pubkey = muting {
if case let .user(pubkey, _) = muting {
let profile_txn = damus_state?.profiles.lookup(id: pubkey)
let profile = profile_txn?.unsafeUnownedValue
let name = Profile.displayName(profile: profile, pubkey: pubkey).username.truncate(maxLength: 50)

18
damus/Models/Contacts.swift
View File

@ -13,7 +13,7 @@ class Contacts {
private var friend_of_friends: Set<Pubkey> = Set()
/// Tracks which friends are friends of a given pubkey.
private var pubkey_to_our_friends = [Pubkey : Set<Pubkey>]()
private var muted: Set<Pubkey> = Set()
private var muted: Set<MuteItem> = Set()
let our_pubkey: Pubkey
var event: NostrEvent?
@ -23,20 +23,20 @@ class Contacts {
self.our_pubkey = our_pubkey
}
func is_muted(_ pk: Pubkey) -> Bool {
return muted.contains(pk)
func is_muted(_ item: MuteItem) -> Bool {
return muted.contains(item)
}
func set_mutelist(_ ev: NostrEvent) {
let oldlist = self.mutelist
self.mutelist = ev
let old = oldlist.map({ ev in Set(ev.referenced_pubkeys) }) ?? Set<Pubkey>()
let new = Set(ev.referenced_pubkeys)
let old: Set<MuteItem> = oldlist?.mute_list ?? Set<MuteItem>()
let new: Set<MuteItem> = ev.mute_list ?? Set<MuteItem>()
let diff = old.symmetricDifference(new)
var new_mutes = Set<Pubkey>()
var new_unmutes = Set<Pubkey>()
var new_mutes = Set<MuteItem>()
var new_unmutes = Set<MuteItem>()
for d in diff {
if new.contains(d) {
@ -47,7 +47,7 @@ class Contacts {
}
// TODO: set local mutelist here
self.muted = Set(ev.referenced_pubkeys)
self.muted = ev.mute_list ?? Set<MuteItem>()
if new_mutes.count > 0 {
notify(.new_mutes(new_mutes))

14
damus/Models/HomeModel.swift
View File

@ -278,11 +278,11 @@ class HomeModel {
func filter_events() {
events.filter { ev in
!damus_state.contacts.is_muted(ev.pubkey)
!damus_state.contacts.is_muted(.user(ev.pubkey, nil))
}
self.dms.dms = dms.dms.filter { ev in
!damus_state.contacts.is_muted(ev.pubkey)
!damus_state.contacts.is_muted(.user(ev.pubkey, nil))
}
notifications.filter { ev in
@ -290,7 +290,8 @@ class HomeModel {
return false
}
return !damus_state.contacts.is_muted(ev.pubkey) && !damus_state.muted_threads.isMutedThread(ev, keypair: damus_state.keypair)
let event_muted = damus_state.contacts.mutelist?.mute_list?.event_muted_reason(ev) != nil
return !event_muted
}
}
@ -1093,11 +1094,8 @@ func should_show_event(event: NostrEvent, damus_state: DamusState) -> Bool {
}
func should_show_event(keypair: Keypair, hellthreads: MutedThreadsManager, contacts: Contacts, ev: NostrEvent) -> Bool {
if contacts.is_muted(ev.pubkey) {
return false
}
if hellthreads.isMutedThread(ev, keypair: keypair) {
let event_muted = contacts.mutelist?.mute_list?.event_muted_reason(ev) != nil
if event_muted {
return false
}

11
damus/Models/NotificationsManager.swift
View File

@ -36,16 +36,11 @@ func should_display_notification(state: HeadlessDamusState, event ev: NostrEvent
return false
}
// Don't show notifications from muted threads.
if state.muted_threads.isMutedThread(ev, keypair: state.keypair) {
// Don't show notifications that match mute list.
if state.contacts.mutelist?.mute_list?.event_muted_reason(ev) != nil {
return false
}
// Don't show notifications from muted users
if state.contacts.is_muted(ev.pubkey) {
return false
}
// Don't show notifications for old events
guard ev.age < EVENT_MAX_AGE_FOR_NOTIFICATION else {
return false

6
damus/Notify/MuteNotify.swift
View File

@ -8,8 +8,8 @@
import Foundation
struct MuteNotify: Notify {
typealias Payload = Pubkey
var payload: Payload
typealias Payload = MuteItem
var payload: MuteItem
}
extension NotifyHandler {
@ -19,7 +19,7 @@ extension NotifyHandler {
}
extension Notifications {
static func mute(_ target: Pubkey) -> Notifications<MuteNotify> {
static func mute(_ target: MuteItem) -> Notifications<MuteNotify> {
.init(.init(payload: target))
}
}

4
damus/Notify/NewMutesNotify.swift
View File

@ -8,7 +8,7 @@
import Foundation
struct NewMutesNotify: Notify {
typealias Payload = Set<Pubkey>
typealias Payload = Set<MuteItem>
var payload: Payload
}
@ -19,7 +19,7 @@ extension NotifyHandler {
}
extension Notifications {
static func new_mutes(_ pubkeys: Set<Pubkey>) -> Notifications<NewMutesNotify> {
static func new_mutes(_ pubkeys: Set<MuteItem>) -> Notifications<NewMutesNotify> {
.init(.init(payload: pubkeys))
}
}

4
damus/Notify/NewUnmutesNotify.swift
View File

@ -8,7 +8,7 @@
import Foundation
struct NewUnmutesNotify: Notify {
typealias Payload = Set<Pubkey>
typealias Payload = Set<MuteItem>
var payload: Payload
}
@ -19,7 +19,7 @@ extension NotifyHandler {
}
extension Notifications {
static func new_unmutes(_ pubkeys: Set<Pubkey>) -> Notifications<NewUnmutesNotify> {
static func new_unmutes(_ pubkeys: Set<MuteItem>) -> Notifications<NewUnmutesNotify> {
.init(.init(payload: pubkeys))
}
}

2
damus/Views/DirectMessagesView.swift
View File

@ -39,7 +39,7 @@ struct DirectMessagesView: View {
func filter_dms(dms: [DirectMessageModel]) -> [DirectMessageModel] {
return dms.filter({ dm in
return damus_state.settings.friend_filter.filter(contacts: damus_state.contacts, pubkey: dm.pubkey) && !damus_state.contacts.is_muted(dm.pubkey)
return damus_state.settings.friend_filter.filter(contacts: damus_state.contacts, pubkey: dm.pubkey) && !damus_state.contacts.is_muted(.user(dm.pubkey, nil))
})
}

2
damus/Views/Events/EventMenu.swift
View File

@ -142,7 +142,7 @@ struct MenuItems: View {
}
Button(role: .destructive) {
notify(.mute(target_pubkey))
notify(.mute(.user(target_pubkey, nil)))
} label: {
Label(NSLocalizedString("Mute user", comment: "Context menu option for muting users."), image: "mute")
}

5
damus/Views/Events/EventMutingContainerView.swift
View File

@ -49,12 +49,13 @@ struct EventMutingContainerView<Content: View>: View {
}
}
.onReceive(handle_notify(.new_mutes)) { mutes in
if mutes.contains(event.pubkey) {
let new_muted_event_reason = mutes.event_muted_reason(event)
if new_muted_event_reason != nil {
shown = false
}
}
.onReceive(handle_notify(.new_unmutes)) { unmutes in
if unmutes.contains(event.pubkey) {
if unmutes.event_muted_reason(event) != nil {
shown = true
}
}

4
damus/Views/Profile/ProfileView.swift
View File

@ -179,7 +179,7 @@ struct ProfileView: View {
notify(.report(.user(profile.pubkey)))
}
if damus_state.contacts.is_muted(profile.pubkey) {
if damus_state.contacts.is_muted(.user(profile.pubkey, nil)) {
Button(NSLocalizedString("Unmute", comment: "Button to unmute a profile.")) {
guard
let keypair = damus_state.keypair.to_full(),
@ -197,7 +197,7 @@ struct ProfileView: View {
}
} else {
Button(NSLocalizedString("Mute", comment: "Button to mute a profile."), role: .destructive) {
notify(.mute(profile.pubkey))
notify(.mute(.user(profile.pubkey, nil)))
}
}
}