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

mute: integrate new MutelistManager

Browse Source 
This patch is slightly large (I think still within the guidelines tho) ,
but also pretty straightforward. I thought for a while about how I could
split this up in a straightforward way, and I couldn’t come up with
anything without breaking intermediate builds.

- Deleted a lot of old/unnecessary code (ie. the Collection extension
  for MuteItem, since we’re now using the MutelistManager sets)

- Changed damus_state.contacts to damus_state.mutelist_manager for all
  mute list manager work

- Updated MutelistView to take advantage of new code (this is probably
  the largest change in this patch)

Lighting-Address: fishcharlie@strike.me
Signed-off-by: Charlie Fish <contact@charlie.fish>
Reviewed-by: William Casarin <jb55@jb55.com>
Link: 20240210163650.42884-4-contact@charlie.fish
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
Charlie Fish
2024-02-10 09:36:48 -07:00
committed by William Casarin
parent a9baef7a21
commit 1d4d2b0204
24 changed files with 123 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DamusNotificationService/NotificationExtensionState.swift
View File

@@ -11,6 +11,7 @@ struct NotificationExtensionState: HeadlessDamusState {
let ndb: Ndb let ndb: Ndb
let settings: UserSettingsStore let settings: UserSettingsStore
let contacts: Contacts let contacts: Contacts
let mutelist_manager: MutelistManager
let keypair: Keypair let keypair: Keypair
let profiles: Profiles let profiles: Profiles
let zaps: Zaps let zaps: Zaps
@@ -27,6 +28,7 @@ struct NotificationExtensionState: HeadlessDamusState {
self.settings = UserSettingsStore() self.settings = UserSettingsStore()
self.contacts = Contacts(our_pubkey: keypair.pubkey) self.contacts = Contacts(our_pubkey: keypair.pubkey)
self.mutelist_manager = MutelistManager()
self.keypair = keypair self.keypair = keypair
self.profiles = Profiles(ndb: ndb) self.profiles = Profiles(ndb: ndb)
self.zaps = Zaps(our_pubkey: keypair.pubkey) self.zaps = Zaps(our_pubkey: keypair.pubkey)

9
damus/ContentView.swift
View File

@@ -550,7 +550,7 @@ struct ContentView: View {
return return
} }
ds.contacts.set_mutelist(mutelist) ds.mutelist_manager.set_mutelist(mutelist)
ds.postbox.send(mutelist) ds.postbox.send(mutelist)
confirm_overwrite_mutelist = false confirm_overwrite_mutelist = false
@@ -569,7 +569,7 @@ struct ContentView: View {
return return
} }
if ds.contacts.mutelist == nil { if ds.mutelist_manager.event == nil {
confirm_overwrite_mutelist = true confirm_overwrite_mutelist = true
} else { } else {
guard let keypair = ds.keypair.to_full(), guard let keypair = ds.keypair.to_full(),
@@ -578,11 +578,11 @@ struct ContentView: View {
return return
} }
guard let ev = create_or_update_mutelist(keypair: keypair, mprev: ds.contacts.mutelist, to_add: muting) else { guard let ev = create_or_update_mutelist(keypair: keypair, mprev: ds.mutelist_manager.event, to_add: muting) else {
return return
} }
ds.contacts.set_mutelist(ev) ds.mutelist_manager.set_mutelist(ev)
ds.postbox.send(ev) ds.postbox.send(ev)
} }
} }
@@ -660,6 +660,7 @@ struct ContentView: View {
likes: EventCounter(our_pubkey: pubkey), likes: EventCounter(our_pubkey: pubkey),
boosts: EventCounter(our_pubkey: pubkey), boosts: EventCounter(our_pubkey: pubkey),
contacts: Contacts(our_pubkey: pubkey), contacts: Contacts(our_pubkey: pubkey),
mutelist_manager: MutelistManager(),
profiles: Profiles(ndb: ndb), profiles: Profiles(ndb: ndb),
dms: home.dms, dms: home.dms,
previews: PreviewCache(), previews: PreviewCache(),

37
damus/Models/Contacts.swift
View File

@@ -13,51 +13,14 @@ class Contacts {
private var friend_of_friends: Set<Pubkey> = Set() private var friend_of_friends: Set<Pubkey> = Set()
/// Tracks which friends are friends of a given pubkey. /// Tracks which friends are friends of a given pubkey.
private var pubkey_to_our_friends = [Pubkey : Set<Pubkey>]() private var pubkey_to_our_friends = [Pubkey : Set<Pubkey>]()
private var muted: Set<MuteItem> = Set()
let our_pubkey: Pubkey let our_pubkey: Pubkey
var event: NostrEvent? var event: NostrEvent?
var mutelist: NostrEvent?
init(our_pubkey: Pubkey) { init(our_pubkey: Pubkey) {
self.our_pubkey = our_pubkey self.our_pubkey = our_pubkey
} }
func is_muted(_ item: MuteItem) -> Bool {
return muted.contains(item)
}
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 diff = old.symmetricDifference(new)
var new_mutes = Set<MuteItem>()
var new_unmutes = Set<MuteItem>()
for d in diff {
if new.contains(d) {
new_mutes.insert(d)
} else {
new_unmutes.insert(d)
}
}
// TODO: set local mutelist here
self.muted = ev.mute_list ?? Set<MuteItem>()
if new_mutes.count > 0 {
notify(.new_mutes(new_mutes))
}
if new_unmutes.count > 0 {
notify(.new_unmutes(new_unmutes))
}
}
func remove_friend(_ pubkey: Pubkey) { func remove_friend(_ pubkey: Pubkey) {
friends.remove(pubkey) friends.remove(pubkey)

2
damus/Models/ContentFilters.swift
View File

@@ -33,7 +33,7 @@ func get_repost_of_muted_user_filter(damus_state: DamusState) -> ((_ ev: NostrEv
guard ev.known_kind == .boost else { return true } guard ev.known_kind == .boost else { return true }
// This needs to use cached because it can be way too slow otherwise // This needs to use cached because it can be way too slow otherwise
guard let inner_ev = ev.get_cached_inner_event(cache: damus_state.events) else { return true } guard let inner_ev = ev.get_cached_inner_event(cache: damus_state.events) else { return true }
return should_show_event(contacts: damus_state.contacts, ev: inner_ev) return should_show_event(state: damus_state, ev: inner_ev)
} }
} }

5
damus/Models/DamusState.swift
View File

@@ -14,6 +14,7 @@ struct DamusState: HeadlessDamusState {
let likes: EventCounter let likes: EventCounter
let boosts: EventCounter let boosts: EventCounter
let contacts: Contacts let contacts: Contacts
let mutelist_manager: MutelistManager
let profiles: Profiles let profiles: Profiles
let dms: DirectMessagesModel let dms: DirectMessagesModel
let previews: PreviewCache let previews: PreviewCache
@@ -35,12 +36,13 @@ struct DamusState: HeadlessDamusState {
let ndb: Ndb let ndb: Ndb
var purple: DamusPurple var purple: DamusPurple
init(pool: RelayPool, keypair: Keypair, likes: EventCounter, boosts: EventCounter, contacts: Contacts, profiles: Profiles, dms: DirectMessagesModel, previews: PreviewCache, zaps: Zaps, lnurls: LNUrls, settings: UserSettingsStore, relay_filters: RelayFilters, relay_model_cache: RelayModelCache, drafts: Drafts, events: EventCache, bookmarks: BookmarksManager, postbox: PostBox, bootstrap_relays: [String], replies: ReplyCounter, wallet: WalletModel, nav: NavigationCoordinator, music: MusicController?, video: VideoController, ndb: Ndb, purple: DamusPurple? = nil) { init(pool: RelayPool, keypair: Keypair, likes: EventCounter, boosts: EventCounter, contacts: Contacts, mutelist_manager: MutelistManager, profiles: Profiles, dms: DirectMessagesModel, previews: PreviewCache, zaps: Zaps, lnurls: LNUrls, settings: UserSettingsStore, relay_filters: RelayFilters, relay_model_cache: RelayModelCache, drafts: Drafts, events: EventCache, bookmarks: BookmarksManager, postbox: PostBox, bootstrap_relays: [String], replies: ReplyCounter, wallet: WalletModel, nav: NavigationCoordinator, music: MusicController?, video: VideoController, ndb: Ndb, purple: DamusPurple? = nil) {
self.pool = pool self.pool = pool
self.keypair = keypair self.keypair = keypair
self.likes = likes self.likes = likes
self.boosts = boosts self.boosts = boosts
self.contacts = contacts self.contacts = contacts
self.mutelist_manager = mutelist_manager
self.profiles = profiles self.profiles = profiles
self.dms = dms self.dms = dms
self.previews = previews self.previews = previews
@@ -107,6 +109,7 @@ struct DamusState: HeadlessDamusState {
likes: EventCounter(our_pubkey: empty_pub), likes: EventCounter(our_pubkey: empty_pub),
boosts: EventCounter(our_pubkey: empty_pub), boosts: EventCounter(our_pubkey: empty_pub),
contacts: Contacts(our_pubkey: empty_pub), contacts: Contacts(our_pubkey: empty_pub),
mutelist_manager: MutelistManager(),
profiles: Profiles(ndb: .empty), profiles: Profiles(ndb: .empty),
dms: DirectMessagesModel(our_pubkey: empty_pub), dms: DirectMessagesModel(our_pubkey: empty_pub),
previews: PreviewCache(), previews: PreviewCache(),

1
damus/Models/HeadlessDamusState.swift
View File

@@ -15,6 +15,7 @@ protocol HeadlessDamusState {
var ndb: Ndb { get } var ndb: Ndb { get }
var settings: UserSettingsStore { get } var settings: UserSettingsStore { get }
var contacts: Contacts { get } var contacts: Contacts { get }
var mutelist_manager: MutelistManager { get }
var keypair: Keypair { get } var keypair: Keypair { get }
var profiles: Profiles { get } var profiles: Profiles { get }
var zaps: Zaps { get } var zaps: Zaps { get }

28
damus/Models/HomeModel.swift
View File

@@ -244,7 +244,7 @@ class HomeModel {
process_zap_event(state: damus_state, ev: ev) { zapres in process_zap_event(state: damus_state, ev: ev) { zapres in
guard case .done(let zap) = zapres, guard case .done(let zap) = zapres,
zap.target.pubkey == self.damus_state.keypair.pubkey, zap.target.pubkey == self.damus_state.keypair.pubkey,
should_show_event(contacts: self.damus_state.contacts, ev: zap.request.ev) else { should_show_event(state: self.damus_state, ev: zap.request.ev) else {
return return
} }
@@ -278,11 +278,11 @@ class HomeModel {
func filter_events() { func filter_events() {
events.filter { ev in events.filter { ev in
!damus_state.contacts.is_muted(.user(ev.pubkey, nil)) !damus_state.mutelist_manager.is_muted(.user(ev.pubkey, nil))
} }
self.dms.dms = dms.dms.filter { ev in self.dms.dms = dms.dms.filter { ev in
!damus_state.contacts.is_muted(.user(ev.pubkey, nil)) !damus_state.mutelist_manager.is_muted(.user(ev.pubkey, nil))
} }
notifications.filter { ev in notifications.filter { ev in
@@ -290,7 +290,7 @@ class HomeModel {
return false return false
} }
let event_muted = damus_state.contacts.mutelist?.mute_list?.event_muted_reason(ev) != nil let event_muted = damus_state.mutelist_manager.is_event_muted(ev)
return !event_muted return !event_muted
} }
} }
@@ -570,13 +570,13 @@ class HomeModel {
} }
// we only care about the most recent mutelist // we only care about the most recent mutelist
if let mutelist = damus_state.contacts.mutelist { if let mutelist = damus_state.mutelist_manager.event {
if ev.created_at <= mutelist.created_at { if ev.created_at <= mutelist.created_at {
return return
} }
} }
damus_state.contacts.set_mutelist(ev) damus_state.mutelist_manager.set_mutelist(ev)
migrate_old_muted_threads_to_new_mutelist(keypair: damus_state.keypair, damus_state: damus_state) migrate_old_muted_threads_to_new_mutelist(keypair: damus_state.keypair, damus_state: damus_state)
} }
@@ -588,7 +588,7 @@ class HomeModel {
} }
// we only care about the most recent mutelist // we only care about the most recent mutelist
if let mutelist = damus_state.contacts.mutelist { if let mutelist = damus_state.mutelist_manager.event {
if ev.created_at <= mutelist.created_at { if ev.created_at <= mutelist.created_at {
return return
} }
@@ -598,7 +598,7 @@ class HomeModel {
return return
} }
damus_state.contacts.set_mutelist(ev) damus_state.mutelist_manager.set_mutelist(ev)
migrate_old_muted_threads_to_new_mutelist(keypair: damus_state.keypair, damus_state: damus_state) migrate_old_muted_threads_to_new_mutelist(keypair: damus_state.keypair, damus_state: damus_state)
} }
@@ -616,7 +616,7 @@ class HomeModel {
// don't show notifications from ourselves // don't show notifications from ourselves
guard ev.pubkey != damus_state.pubkey, guard ev.pubkey != damus_state.pubkey,
event_has_our_pubkey(ev, our_pubkey: self.damus_state.pubkey), event_has_our_pubkey(ev, our_pubkey: self.damus_state.pubkey),
should_show_event(contacts: damus_state.contacts, ev: ev) else { should_show_event(state: damus_state, ev: ev) else {
return return
} }
@@ -654,7 +654,7 @@ class HomeModel {
func handle_text_event(sub_id: String, _ ev: NostrEvent) { func handle_text_event(sub_id: String, _ ev: NostrEvent) {
guard should_show_event(contacts: damus_state.contacts, ev: ev) else { guard should_show_event(state: damus_state, ev: ev) else {
return return
} }
@@ -683,7 +683,7 @@ class HomeModel {
} }
func handle_dm(_ ev: NostrEvent) { func handle_dm(_ ev: NostrEvent) {
guard should_show_event(contacts: damus_state.contacts, ev: ev) else { guard should_show_event(state: damus_state, ev: ev) else {
return return
} }
@@ -1090,13 +1090,13 @@ func event_has_our_pubkey(_ ev: NostrEvent, our_pubkey: Pubkey) -> Bool {
func should_show_event(event: NostrEvent, damus_state: DamusState) -> Bool { func should_show_event(event: NostrEvent, damus_state: DamusState) -> Bool {
return should_show_event( return should_show_event(
contacts: damus_state.contacts, state: damus_state,
ev: event ev: event
) )
} }
func should_show_event(contacts: Contacts, ev: NostrEvent) -> Bool { func should_show_event(state: DamusState, ev: NostrEvent, keypair: Keypair? = nil) -> Bool {
let event_muted = contacts.mutelist?.mute_list?.event_muted_reason(ev) != nil let event_muted = state.mutelist_manager.is_event_muted(ev, keypair: keypair)
if event_muted { if event_muted {
return false return false
} }

61
damus/Models/MuteItem.swift
View File

@@ -200,64 +200,3 @@ extension MuteItem: TagConvertible {
} }
} }
extension Collection where Element == MuteItem {
/// Check if an event is muted given a collection of ``MutedItem``.
///
/// - Parameter ev: The ``NostrEvent`` that you want to check the muted reason for.
/// - Returns: The ``MuteItem`` that matched the event. Or `nil` if the event is not muted.
func event_muted_reason(_ ev: NostrEvent) -> MuteItem? {
return self.first { muted_item in
switch muted_item {
case .user(let pubkey, let expiration_date):
return pubkey == ev.pubkey && !muted_item.is_expired()
case .hashtag(let hashtag, let expiration_date):
return ev.referenced_hashtags.contains(hashtag) && !muted_item.is_expired()
case .word(let word, let expiration_date):
return ev.content.lowercased().contains(word.lowercased()) && !muted_item.is_expired()
case .thread(let note_id, let expiration_date):
return ev.referenced_ids.contains(note_id) && !muted_item.is_expired()
}
}
}
var users: [Pubkey] {
return self.compactMap { muted_item in
if case .user(let pubkey, _) = muted_item,
!muted_item.is_expired() {
return pubkey
} else {
return nil
}
}
}
var hashtags: [Hashtag] {
return self.compactMap { muted_item in
if case .hashtag(let hashtag, _) = muted_item,
!muted_item.is_expired() {
return hashtag
} else {
return nil
}
}
}
var words: [String] {
return self.compactMap { muted_item in
if case .word(let str, _) = muted_item,
!muted_item.is_expired() {
return str
} else {
return nil
}
}
}
var threads: [NoteId] {
return self.compactMap { muted_item in
if case .thread(let note_id, _) = muted_item,
!muted_item.is_expired() {
return note_id
} else {
return nil
}
}
}
}

4
damus/Models/MutedThreadsManager.swift
View File

@@ -30,9 +30,9 @@ func migrate_old_muted_threads_to_new_mutelist(keypair: Keypair, damus_state: Da
let mutedThreads = loadOldMutedThreads(pubkey: fullKeypair.pubkey) let mutedThreads = loadOldMutedThreads(pubkey: fullKeypair.pubkey)
guard !mutedThreads.isEmpty else { return } guard !mutedThreads.isEmpty else { return }
// Set new muted system for those existing threads // Set new muted system for those existing threads
let previous_mute_list_event = damus_state.contacts.mutelist let previous_mute_list_event = damus_state.mutelist_manager.event
guard let new_mutelist_event = create_or_update_mutelist(keypair: fullKeypair, mprev: previous_mute_list_event, to_add: Set(mutedThreads.map { MuteItem.thread($0, nil) })) else { return } guard let new_mutelist_event = create_or_update_mutelist(keypair: fullKeypair, mprev: previous_mute_list_event, to_add: Set(mutedThreads.map { MuteItem.thread($0, nil) })) else { return }
damus_state.contacts.set_mutelist(new_mutelist_event) damus_state.mutelist_manager.set_mutelist(new_mutelist_event)
damus_state.postbox.send(new_mutelist_event) damus_state.postbox.send(new_mutelist_event)
// Set existing muted threads to an empty array // Set existing muted threads to an empty array
UserDefaults.standard.set([], forKey: getMutedThreadsKey(pubkey: keypair.pubkey)) UserDefaults.standard.set([], forKey: getMutedThreadsKey(pubkey: keypair.pubkey))

2
damus/Models/NotificationsManager.swift
View File

@@ -37,7 +37,7 @@ func should_display_notification(state: HeadlessDamusState, event ev: NostrEvent
} }
// Don't show notifications that match mute list. // Don't show notifications that match mute list.
if state.contacts.mutelist?.mute_list?.event_muted_reason(ev) != nil { if state.mutelist_manager.is_event_muted(ev, keypair: state.keypair) {
return false return false
} }

4
damus/Models/SearchHomeModel.swift
View File

@@ -35,7 +35,7 @@ class SearchHomeModel: ObservableObject {
} }
func filter_muted() { func filter_muted() {
events.filter { should_show_event(contacts: damus_state.contacts, ev: $0) } events.filter { should_show_event(state: damus_state, ev: $0) }
self.objectWillChange.send() self.objectWillChange.send()
} }
@@ -60,7 +60,7 @@ class SearchHomeModel: ObservableObject {
guard sub_id == self.base_subid || sub_id == self.profiles_subid else { guard sub_id == self.base_subid || sub_id == self.profiles_subid else {
return return
} }
if ev.is_textlike && should_show_event(contacts: damus_state.contacts, ev: ev) && !ev.is_reply(damus_state.keypair) if ev.is_textlike && should_show_event(state: damus_state, ev: ev) && !ev.is_reply(damus_state.keypair)
{ {
if !damus_state.settings.multiple_events_per_pubkey && seen_pubkey.contains(ev.pubkey) { if !damus_state.settings.multiple_events_per_pubkey && seen_pubkey.contains(ev.pubkey) {
return return

4
damus/Models/SearchModel.swift
View File

@@ -28,7 +28,7 @@ class SearchModel: ObservableObject {
func filter_muted() { func filter_muted() {
self.events.filter { self.events.filter {
should_show_event(contacts: state.contacts, ev: $0) should_show_event(state: state, ev: $0)
} }
self.objectWillChange.send() self.objectWillChange.send()
} }
@@ -57,7 +57,7 @@ class SearchModel: ObservableObject {
return return
} }
guard should_show_event(contacts: state.contacts, ev: ev) else { guard should_show_event(state: state, ev: ev) else {
return return
} }

1
damus/TestData.swift
View File

@@ -73,6 +73,7 @@ var test_damus_state: DamusState = ({
likes: .init(our_pubkey: our_pubkey), likes: .init(our_pubkey: our_pubkey),
boosts: .init(our_pubkey: our_pubkey), boosts: .init(our_pubkey: our_pubkey),
contacts: .init(our_pubkey: our_pubkey), contacts: .init(our_pubkey: our_pubkey),
mutelist_manager: MutelistManager(),
profiles: .init(ndb: ndb), profiles: .init(ndb: ndb),
dms: .init(our_pubkey: our_pubkey), dms: .init(our_pubkey: our_pubkey),
previews: .init(), previews: .init(),

9
damus/Util/Router.swift
View File

@@ -14,7 +14,7 @@ enum Route: Hashable {
case Relay(relay: String, showActionButtons: Binding<Bool>) case Relay(relay: String, showActionButtons: Binding<Bool>)
case RelayDetail(relay: String, metadata: RelayMetadata?) case RelayDetail(relay: String, metadata: RelayMetadata?)
case Following(following: FollowingModel) case Following(following: FollowingModel)
case MuteList(mutelist_items: Set<MuteItem>) case MuteList
case RelayConfig case RelayConfig
case Script(script: ScriptModel) case Script(script: ScriptModel)
case Bookmarks case Bookmarks
@@ -58,8 +58,8 @@ enum Route: Hashable {
RelayDetailView(state: damusState, relay: relay, nip11: metadata) RelayDetailView(state: damusState, relay: relay, nip11: metadata)
case .Following(let following): case .Following(let following):
FollowingView(damus_state: damusState, following: following) FollowingView(damus_state: damusState, following: following)
case .MuteList(let mutelist_items): case .MuteList:
MutelistView(damus_state: damusState, mutelist_items: mutelist_items) MutelistView(damus_state: damusState)
case .RelayConfig: case .RelayConfig:
RelayConfigView(state: damusState) RelayConfigView(state: damusState)
case .Bookmarks: case .Bookmarks:
@@ -139,9 +139,8 @@ enum Route: Hashable {
hasher.combine(relay) hasher.combine(relay)
case .Following: case .Following:
hasher.combine("following") hasher.combine("following")
case .MuteList(let users): case .MuteList:
hasher.combine("muteList") hasher.combine("muteList")
hasher.combine(users)
case .RelayConfig: case .RelayConfig:
hasher.combine("relayConfig") hasher.combine("relayConfig")
case .Bookmarks: case .Bookmarks:

2
damus/Views/DMChatView.swift
View File

@@ -20,7 +20,7 @@ struct DMChatView: View, KeyboardReadable {
ScrollViewReader { scroller in ScrollViewReader { scroller in
ScrollView { ScrollView {
LazyVStack(alignment: .leading) { LazyVStack(alignment: .leading) {
ForEach(Array(zip(dms.events, dms.events.indices)), id: \.0.id) { (ev, ind) in ForEach(Array(zip(dms.events, dms.events.indices)).filter { should_show_event(state: damus_state, ev: $0.0, keypair: damus_state.keypair)}, id: \.0.id) { (ev, ind) in
DMView(event: dms.events[ind], damus_state: damus_state) DMView(event: dms.events[ind], damus_state: damus_state)
.contextMenu{MenuItems(damus_state: damus_state, event: ev, target_pubkey: ev.pubkey, profileModel: ProfileModel(pubkey: ev.pubkey, damus: damus_state))} .contextMenu{MenuItems(damus_state: damus_state, event: ev, target_pubkey: ev.pubkey, profileModel: ProfileModel(pubkey: ev.pubkey, damus: damus_state))}
} }

4
damus/Views/DirectMessagesView.swift
View File

@@ -39,7 +39,7 @@ struct DirectMessagesView: View {
func filter_dms(dms: [DirectMessageModel]) -> [DirectMessageModel] { func filter_dms(dms: [DirectMessageModel]) -> [DirectMessageModel] {
return dms.filter({ dm in return dms.filter({ dm in
return damus_state.settings.friend_filter.filter(contacts: damus_state.contacts, pubkey: dm.pubkey) && !damus_state.contacts.is_muted(.user(dm.pubkey, nil)) return damus_state.settings.friend_filter.filter(contacts: damus_state.contacts, pubkey: dm.pubkey) && !damus_state.mutelist_manager.is_muted(.user(dm.pubkey, nil))
}) })
} }
@@ -53,7 +53,7 @@ struct DirectMessagesView: View {
func MaybeEvent(_ model: DirectMessageModel) -> some View { func MaybeEvent(_ model: DirectMessageModel) -> some View {
Group { Group {
if let ev = model.events.last { if let ev = model.events.last(where: { should_show_event(state: damus_state, ev: $0, keypair: damus_state.keypair) }) {
EventView(damus: damus_state, event: ev, pubkey: model.pubkey, options: options) EventView(damus: damus_state, event: ev, pubkey: model.pubkey, options: options)
.onTapGesture { .onTapGesture {
self.model.set_active_dm_model(model) self.model.set_active_dm_model(model)

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

@@ -55,7 +55,7 @@ struct MenuItems: View {
let bookmarked = damus_state.bookmarks.isBookmarked(event) let bookmarked = damus_state.bookmarks.isBookmarked(event)
self._isBookmarked = State(initialValue: bookmarked) self._isBookmarked = State(initialValue: bookmarked)
let muted_thread = (damus_state.contacts.mutelist?.mute_list?.event_muted_reason(event) != nil) let muted_thread = damus_state.mutelist_manager.is_event_muted(event)
self._isMutedThread = State(initialValue: muted_thread) self._isMutedThread = State(initialValue: muted_thread)
self.damus_state = damus_state self.damus_state = damus_state
@@ -111,11 +111,11 @@ struct MenuItems: View {
if event.known_kind != .dm { if event.known_kind != .dm {
MuteDurationMenu { duration in MuteDurationMenu { duration in
if let full_keypair = self.damus_state.keypair.to_full(), if let full_keypair = self.damus_state.keypair.to_full(),
let new_mutelist_ev = toggle_from_mutelist(keypair: full_keypair, prev: damus_state.contacts.mutelist, to_toggle: .thread(event.thread_id(keypair: damus_state.keypair), duration?.date_from_now)) { let new_mutelist_ev = toggle_from_mutelist(keypair: full_keypair, prev: damus_state.mutelist_manager.event, to_toggle: .thread(event.thread_id(keypair: damus_state.keypair), duration?.date_from_now)) {
damus_state.contacts.set_mutelist(new_mutelist_ev) damus_state.mutelist_manager.set_mutelist(new_mutelist_ev)
damus_state.postbox.send(new_mutelist_ev) damus_state.postbox.send(new_mutelist_ev)
} }
let muted = (damus_state.contacts.mutelist?.mute_list?.event_muted_reason(event) != nil) let muted = damus_state.mutelist_manager.is_event_muted(event)
isMutedThread = muted isMutedThread = muted
} label: { } label: {
let imageName = isMutedThread ? "mute" : "mute" let imageName = isMutedThread ? "mute" : "mute"

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

@@ -27,7 +27,7 @@ struct EventMutingContainerView<Content: View>: View {
self.damus_state = damus_state self.damus_state = damus_state
self.event = event self.event = event
self.content = content() self.content = content()
self._shown = State(initialValue: should_show_event(contacts: damus_state.contacts, ev: event)) self._shown = State(initialValue: should_show_event(state: damus_state, ev: event))
} }
init(damus_state: DamusState, event: NostrEvent, muteBox: @escaping MuteBoxViewClosure, @ViewBuilder content: () -> Content) { init(damus_state: DamusState, event: NostrEvent, muteBox: @escaping MuteBoxViewClosure, @ViewBuilder content: () -> Content) {
@@ -36,7 +36,7 @@ struct EventMutingContainerView<Content: View>: View {
} }
var should_mute: Bool { var should_mute: Bool {
return !should_show_event(contacts: damus_state.contacts, ev: event) return !should_show_event(state: damus_state, ev: event)
} }
var body: some View { var body: some View {
@@ -54,14 +54,14 @@ struct EventMutingContainerView<Content: View>: View {
} }
} }
.onReceive(handle_notify(.new_mutes)) { mutes in .onReceive(handle_notify(.new_mutes)) { mutes in
let new_muted_event_reason = mutes.event_muted_reason(event) let new_muted_event_reason = damus_state.mutelist_manager.event_muted_reason(event)
if new_muted_event_reason != nil { if new_muted_event_reason != nil {
shown = false shown = false
muted_reason = new_muted_event_reason muted_reason = new_muted_event_reason
} }
} }
.onReceive(handle_notify(.new_unmutes)) { unmutes in .onReceive(handle_notify(.new_unmutes)) { unmutes in
if unmutes.event_muted_reason(event) != nil { if damus_state.mutelist_manager.event_muted_reason(event) != nil {
shown = true shown = true
muted_reason = nil muted_reason = nil
} }

4
damus/Views/Muting/AddMuteItemView.swift
View File

@@ -72,7 +72,7 @@ struct AddMuteItemView: View {
// Actually update & relay the new mute list // Actually update & relay the new mute list
if let mute_item { if let mute_item {
let existing_mutelist = state.contacts.mutelist let existing_mutelist = state.mutelist_manager.event
guard guard
let full_keypair = state.keypair.to_full(), let full_keypair = state.keypair.to_full(),
@@ -81,7 +81,7 @@ struct AddMuteItemView: View {
return return
} }
state.contacts.set_mutelist(mutelist) state.mutelist_manager.set_mutelist(mutelist)
state.postbox.send(mutelist) state.postbox.send(mutelist)
} }

47
damus/Views/Muting/MutelistView.swift
View File

@@ -9,12 +9,16 @@ import SwiftUI
struct MutelistView: View { struct MutelistView: View {
let damus_state: DamusState let damus_state: DamusState
@State var mutelist_items: Set<MuteItem> = Set<MuteItem>()
@State var show_add_muteitem: Bool = false @State var show_add_muteitem: Bool = false
@State var users: [MuteItem] = []
@State var hashtags: [MuteItem] = []
@State var threads: [MuteItem] = []
@State var words: [MuteItem] = []
func RemoveAction(item: MuteItem) -> some View { func RemoveAction(item: MuteItem) -> some View {
Button { Button {
guard let mutelist = damus_state.contacts.mutelist, guard let mutelist = damus_state.mutelist_manager.event,
let keypair = damus_state.keypair.to_full(), let keypair = damus_state.keypair.to_full(),
let new_ev = remove_from_mutelist(keypair: keypair, let new_ev = remove_from_mutelist(keypair: keypair,
prev: mutelist, prev: mutelist,
@@ -23,20 +27,27 @@ struct MutelistView: View {
return return
} }
damus_state.contacts.set_mutelist(new_ev) damus_state.mutelist_manager.set_mutelist(new_ev)
damus_state.postbox.send(new_ev) damus_state.postbox.send(new_ev)
mutelist_items = new_ev.mute_list ?? Set<MuteItem>() updateMuteItems()
} label: { } label: {
Label(NSLocalizedString("Delete", comment: "Button to remove a user from their mutelist."), image: "delete") Label(NSLocalizedString("Delete", comment: "Button to remove a user from their mutelist."), image: "delete")
} }
.tint(.red) .tint(.red)
} }
func updateMuteItems() {
users = Array(damus_state.mutelist_manager.users)
hashtags = Array(damus_state.mutelist_manager.hashtags)
threads = Array(damus_state.mutelist_manager.threads)
words = Array(damus_state.mutelist_manager.words)
}
var body: some View { var body: some View {
List { List {
Section(NSLocalizedString("Users", comment: "Section header title for a list of muted users.")) { Section(NSLocalizedString("Users", comment: "Section header title for a list of muted users.")) {
ForEach(mutelist_items.users, id: \.self) { pubkey in ForEach(users, id: \.self) { user in
if case let MuteItem.user(pubkey, _) = user {
UserViewRow(damus_state: damus_state, pubkey: pubkey) UserViewRow(damus_state: damus_state, pubkey: pubkey)
.id(pubkey) .id(pubkey)
.swipeActions { .swipeActions {
@@ -47,8 +58,10 @@ struct MutelistView: View {
} }
} }
} }
}
Section(NSLocalizedString("Hashtags", comment: "Section header title for a list of hashtags that are muted.")) { Section(NSLocalizedString("Hashtags", comment: "Section header title for a list of hashtags that are muted.")) {
ForEach(mutelist_items.hashtags, id: \.hashtag) { hashtag in ForEach(hashtags, id: \.self) { item in
if case let MuteItem.hashtag(hashtag, _) = item {
Text("#\(hashtag.hashtag)") Text("#\(hashtag.hashtag)")
.id(hashtag.hashtag) .id(hashtag.hashtag)
.swipeActions { .swipeActions {
@@ -59,8 +72,10 @@ struct MutelistView: View {
} }
} }
} }
}
Section(NSLocalizedString("Words", comment: "Section header title for a list of words that are muted.")) { Section(NSLocalizedString("Words", comment: "Section header title for a list of words that are muted.")) {
ForEach(mutelist_items.words, id: \.self) { word in ForEach(words, id: \.self) { item in
if case let MuteItem.word(word, _) = item {
Text("\(word)") Text("\(word)")
.id(word) .id(word)
.swipeActions { .swipeActions {
@@ -68,8 +83,10 @@ struct MutelistView: View {
} }
} }
} }
}
Section(NSLocalizedString("Threads", comment: "Section header title for a list of threads that are muted.")) { Section(NSLocalizedString("Threads", comment: "Section header title for a list of threads that are muted.")) {
ForEach(mutelist_items.threads, id: \.self) { note_id in ForEach(threads, id: \.self) { item in
if case let MuteItem.thread(note_id, _) = item {
if let event = damus_state.events.lookup(note_id) { if let event = damus_state.events.lookup(note_id) {
EventView(damus: damus_state, event: event) EventView(damus: damus_state, event: event)
.id(note_id.hex()) .id(note_id.hex())
@@ -82,15 +99,16 @@ struct MutelistView: View {
} }
} }
} }
}
.navigationTitle(NSLocalizedString("Muted", comment: "Navigation title of view to see list of muted users & phrases.")) .navigationTitle(NSLocalizedString("Muted", comment: "Navigation title of view to see list of muted users & phrases."))
.onAppear { .onAppear {
mutelist_items = damus_state.contacts.mutelist?.mute_list ?? Set<MuteItem>() updateMuteItems()
} }
.onReceive(handle_notify(.new_mutes)) { new_mutes in .onReceive(handle_notify(.new_mutes)) { new_mutes in
mutelist_items = mutelist_items.union(new_mutes) updateMuteItems()
} }
.onReceive(handle_notify(.new_unmutes)) { new_unmutes in .onReceive(handle_notify(.new_unmutes)) { new_unmutes in
mutelist_items = mutelist_items.subtracting(new_unmutes) updateMuteItems()
} }
.toolbar { .toolbar {
ToolbarItem(placement: .topBarTrailing) { ToolbarItem(placement: .topBarTrailing) {
@@ -115,11 +133,6 @@ struct MutelistView: View {
struct MutelistView_Previews: PreviewProvider { struct MutelistView_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
MutelistView(damus_state: test_damus_state, mutelist_items: Set([ MutelistView(damus_state: test_damus_state)
.user(test_note.pubkey, nil),
.hashtag(Hashtag(hashtag: "test"), nil),
.word("test", nil),
.thread(test_note.id, nil)
]))
} }
} }

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

@@ -179,11 +179,11 @@ struct ProfileView: View {
notify(.report(.user(profile.pubkey))) notify(.report(.user(profile.pubkey)))
} }
if damus_state.contacts.is_muted(.user(profile.pubkey, nil)) { if damus_state.mutelist_manager.is_muted(.user(profile.pubkey, nil)) {
Button(NSLocalizedString("Unmute", comment: "Button to unmute a profile.")) { Button(NSLocalizedString("Unmute", comment: "Button to unmute a profile.")) {
guard guard
let keypair = damus_state.keypair.to_full(), let keypair = damus_state.keypair.to_full(),
let mutelist = damus_state.contacts.mutelist let mutelist = damus_state.mutelist_manager.event
else { else {
return return
} }
@@ -192,7 +192,7 @@ struct ProfileView: View {
return return
} }
damus_state.contacts.set_mutelist(new_ev) damus_state.mutelist_manager.set_mutelist(new_ev)
damus_state.postbox.send(new_ev) damus_state.postbox.send(new_ev)
} }
} else { } else {

2
damus/Views/SearchHomeView.swift
View File

@@ -59,7 +59,7 @@ struct SearchHomeView: View {
return false return false
} }
let event_muted = damus_state.contacts.mutelist?.mute_list?.event_muted_reason(ev) != nil let event_muted = damus_state.mutelist_manager.is_event_muted(ev)
if event_muted { if event_muted {
return false return false
} }

10
damus/Views/SearchView.swift
View File

@@ -62,13 +62,13 @@ struct SearchView: View {
Button { Button {
guard guard
let full_keypair = appstate.keypair.to_full(), let full_keypair = appstate.keypair.to_full(),
let existing_mutelist = appstate.contacts.mutelist, let existing_mutelist = appstate.mutelist_manager.event,
let mutelist = remove_from_mutelist(keypair: full_keypair, prev: existing_mutelist, to_remove: .hashtag(Hashtag(hashtag: hashtag), nil)) let mutelist = remove_from_mutelist(keypair: full_keypair, prev: existing_mutelist, to_remove: .hashtag(Hashtag(hashtag: hashtag), nil))
else { else {
return return
} }
appstate.contacts.set_mutelist(mutelist) appstate.mutelist_manager.set_mutelist(mutelist)
appstate.postbox.send(mutelist) appstate.postbox.send(mutelist)
} label: { } label: {
Text("Unmute Hashtag", comment: "Label represnting a button that the user can tap to unmute a given hashtag so they start seeing it in their feed again.") Text("Unmute Hashtag", comment: "Label represnting a button that the user can tap to unmute a given hashtag so they start seeing it in their feed again.")
@@ -88,7 +88,7 @@ struct SearchView: View {
} }
.onAppear { .onAppear {
if let hashtag_string = search.search.hashtag?.first { if let hashtag_string = search.search.hashtag?.first {
is_hashtag_muted = (appstate.contacts.mutelist?.mute_list ?? []).contains(MuteItem.hashtag(Hashtag(hashtag: hashtag_string), nil)) is_hashtag_muted = (appstate.mutelist_manager.event?.mute_list ?? []).contains(MuteItem.hashtag(Hashtag(hashtag: hashtag_string), nil))
} }
} }
} }
@@ -96,13 +96,13 @@ struct SearchView: View {
func mute_hashtag(hashtag_string: String, expiration_time: Date?) { func mute_hashtag(hashtag_string: String, expiration_time: Date?) {
guard guard
let full_keypair = appstate.keypair.to_full(), let full_keypair = appstate.keypair.to_full(),
let existing_mutelist = appstate.contacts.mutelist, let existing_mutelist = appstate.mutelist_manager.event,
let mutelist = create_or_update_mutelist(keypair: full_keypair, mprev: existing_mutelist, to_add: .hashtag(Hashtag(hashtag: hashtag_string), expiration_time)) let mutelist = create_or_update_mutelist(keypair: full_keypair, mprev: existing_mutelist, to_add: .hashtag(Hashtag(hashtag: hashtag_string), expiration_time))
else { else {
return return
} }
appstate.contacts.set_mutelist(mutelist) appstate.mutelist_manager.set_mutelist(mutelist)
appstate.postbox.send(mutelist) appstate.postbox.send(mutelist)
} }

2
damus/Views/SideMenuView.swift
View File

@@ -66,7 +66,7 @@ struct SideMenuView: View {
} }
} }
NavigationLink(value: Route.MuteList(mutelist_items: damus_state.contacts.mutelist?.mute_list ?? Set<MuteItem>())) { NavigationLink(value: Route.MuteList) {
navLabel(title: NSLocalizedString("Muted", comment: "Sidebar menu label for muted users view."), img: "mute") navLabel(title: NSLocalizedString("Muted", comment: "Sidebar menu label for muted users view."), img: "mute")
} }