Revert "mute: adding filtering support for MuteItem events"

This reverts commit 61a9e44898.

damus/Models/Contacts.swift

@@ -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<MuteItem> = Set()
+    private var muted: Set<Pubkey> = Set()
 
     let our_pubkey: Pubkey
     var event: NostrEvent?
@@ -23,20 +23,20 @@ class Contacts {
         self.our_pubkey = our_pubkey
     }
     
-    func is_muted(_ item: MuteItem) -> Bool {
-        return muted.contains(item)
+    func is_muted(_ pk: Pubkey) -> Bool {
+        return muted.contains(pk)
     }
-
+    
     func set_mutelist(_ ev: NostrEvent) {
         let oldlist = self.mutelist
         self.mutelist = ev
 
-        let old: Set<MuteItem> = oldlist?.mute_list ?? Set<MuteItem>()
-        let new: Set<MuteItem> = ev.mute_list ?? Set<MuteItem>()
+        let old = oldlist.map({ ev in Set(ev.referenced_pubkeys) }) ?? Set<Pubkey>()
+        let new = Set(ev.referenced_pubkeys)
         let diff = old.symmetricDifference(new)
         
-        var new_mutes = Set<MuteItem>()
-        var new_unmutes = Set<MuteItem>()
+        var new_mutes = Set<Pubkey>()
+        var new_unmutes = Set<Pubkey>()
 
         for d in diff {
             if new.contains(d) {
@@ -47,7 +47,7 @@ class Contacts {
         }
 
         // TODO: set local mutelist here
-        self.muted = ev.mute_list ?? Set<MuteItem>()
+        self.muted = Set(ev.referenced_pubkeys)
 
         if new_mutes.count > 0 {
             notify(.new_mutes(new_mutes))

damus/Models/HomeModel.swift

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

damus/Models/NotificationsManager.swift

@@ -36,11 +36,16 @@ func should_display_notification(state: HeadlessDamusState, event ev: NostrEvent
         return false
     }
 
-    // Don't show notifications that match mute list.
-    if state.contacts.mutelist?.mute_list?.event_muted_reason(ev) != nil {
+    // Don't show notifications from muted threads.
+    if state.muted_threads.isMutedThread(ev, keypair: state.keypair) {
         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