Fix reaction events to not tag all e and p tags in the thread

Changelog-Fixed: Fix reaction events to not tag all e and p tags in the thread
Improve UX feedback around notification mode setting
2024-06-05 18:41:51 -04:00 · 2024-05-24 16:49:09 -07:00 · 2024-05-24 16:49:09 -07:00 · 2024-05-24 16:49:09 -07:00 · 2024-05-24 16:49:09 -07:00 · 2024-05-24 16:49:09 -07:00
50 changed files with 1107 additions and 528 deletions
@@ -28,7 +28,7 @@ struct NotificationExtensionState: HeadlessDamusState {
        self.settings = UserSettingsStore()
        
        self.contacts = Contacts(our_pubkey: keypair.pubkey)
-        self.mutelist_manager = MutelistManager()
+        self.mutelist_manager = MutelistManager(user_keypair: keypair)
        self.keypair = keypair
        self.profiles = Profiles(ndb: ndb)
        self.zaps = Zaps(our_pubkey: keypair.pubkey)
@@ -40,15 +40,32 @@ class NotificationService: UNNotificationServiceExtension {
            return
        }
        
-        guard should_display_notification(state: state, event: nostr_event) else {
+        // Don't show notification details that match mute list.
+        // TODO: Remove this code block once we get notification suppression entitlement from Apple. It will be covered by the `guard should_display_notification` block
+        if state.mutelist_manager.is_event_muted(nostr_event) {
+            // We cannot really suppress muted notifications until we have the notification supression entitlement.
+            // The best we can do if we ever get those muted notifications (which we generally won't due to server-side processing) is to obscure the details
+            let content = UNMutableNotificationContent()
+            content.title = NSLocalizedString("Muted event", comment: "Title for a push notification which has been muted")
+            content.body = NSLocalizedString("This is an event that has been muted according to your mute list rules. We cannot suppress this notification, but we obscured the details to respect your preferences", comment: "Description for a push notification which has been muted, and explanation that we cannot suppress it")
+            content.sound = UNNotificationSound.default
+            contentHandler(content)
+            return
+        }
+        
+        guard should_display_notification(state: state, event: nostr_event, mode: .push) else {
            // We should not display notification for this event. Suppress notification.
-            contentHandler(UNNotificationContent())
+            // contentHandler(UNNotificationContent())
+            // TODO: We cannot really suppress until we have the notification supression entitlement. Show the raw notification
+            contentHandler(request.content)
            return
        }
        
        guard let notification_object = generate_local_notification_object(from: nostr_event, state: state) else {
            // We could not process this notification. Probably an unsupported nostr event kind. Suppress.
-            contentHandler(UNNotificationContent())
+            // contentHandler(UNNotificationContent())
+            // TODO: We cannot really suppress until we have the notification supression entitlement. Show the raw notification
+            contentHandler(request.content)
            return
        }
        
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>1C8F.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>1C8F.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>
@@ -98,6 +98,7 @@
 		4C2B10282A7B0F5C008AA43E /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2B10272A7B0F5C008AA43E /* Log.swift */; };
 		4C2B7BF22A71B6540049DEE7 /* Id.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2B7BF12A71B6540049DEE7 /* Id.swift */; };
 		4C2CDDF7299D4A5E00879FD5 /* Debouncer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2CDDF6299D4A5E00879FD5 /* Debouncer.swift */; };
+		4C2D34412BDAF1B300F9FB44 /* NIP10Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2D34402BDAF1B300F9FB44 /* NIP10Tests.swift */; };
 		4C30AC7229A5677A00E2BD5A /* NotificationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C30AC7129A5677A00E2BD5A /* NotificationsView.swift */; };
 		4C30AC7429A5680900E2BD5A /* EventGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C30AC7329A5680900E2BD5A /* EventGroupView.swift */; };
 		4C30AC7629A5770900E2BD5A /* NotificationItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C30AC7529A5770900E2BD5A /* NotificationItemView.swift */; };
@@ -135,7 +136,6 @@
 		4C363A94282704FA006E126D /* Post.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A93282704FA006E126D /* Post.swift */; };
 		4C363A962827096D006E126D /* PostBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A952827096D006E126D /* PostBlock.swift */; };
 		4C363A9A28283854006E126D /* Reply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A9928283854006E126D /* Reply.swift */; };
-		4C363A9C282838B9006E126D /* EventRef.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A9B282838B9006E126D /* EventRef.swift */; };
 		4C363A9E2828A822006E126D /* ReplyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A9D2828A822006E126D /* ReplyTests.swift */; };
 		4C363AA02828A8DD006E126D /* LikeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A9F2828A8DD006E126D /* LikeTests.swift */; };
 		4C363AA228296A7E006E126D /* SearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363AA128296A7E006E126D /* SearchView.swift */; };
@@ -174,6 +174,7 @@
 		4C3EA67D28FFBBA300C48A62 /* InvoicesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA67C28FFBBA200C48A62 /* InvoicesView.swift */; };
 		4C3EA67F28FFC01D00C48A62 /* InvoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA67E28FFC01D00C48A62 /* InvoiceView.swift */; };
 		4C42812C298C848200DBF26F /* TranslateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C42812B298C848200DBF26F /* TranslateView.swift */; };
+		4C45E5022BED4D000025A428 /* ThreadReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C45E5012BED4D000025A428 /* ThreadReply.swift */; };
 		4C463CBF2B960B96008A8C36 /* PurpleBackdrop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C463CBE2B960B96008A8C36 /* PurpleBackdrop.swift */; };
 		4C4793012A993CDA00489948 /* mdb.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C4793002A993B9A00489948 /* mdb.c */; settings = {COMPILER_FLAGS = "-w"; }; };
 		4C4793042A993DC000489948 /* midl.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C4793032A993DB900489948 /* midl.c */; settings = {COMPILER_FLAGS = "-w"; }; };
@@ -247,6 +248,7 @@
 		4C8D1A6C29F1DFC200ACDF75 /* FriendIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8D1A6B29F1DFC200ACDF75 /* FriendIcon.swift */; };
 		4C8D1A6F29F31E5000ACDF75 /* FriendsButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8D1A6E29F31E5000ACDF75 /* FriendsButton.swift */; };
 		4C8EC52529D1FA6C0085D9A8 /* DamusColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8EC52429D1FA6C0085D9A8 /* DamusColors.swift */; };
+		4C8FA7242BED58A900798A6A /* ThreadReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C45E5012BED4D000025A428 /* ThreadReply.swift */; };
 		4C9054852A6AEAA000811EEC /* NdbTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9054842A6AEAA000811EEC /* NdbTests.swift */; };
 		4C90BD18283A9EE5008EE7EF /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C90BD17283A9EE5008EE7EF /* LoginView.swift */; };
 		4C90BD1A283AA67F008EE7EF /* Bech32.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C90BD19283AA67F008EE7EF /* Bech32.swift */; };
@@ -462,6 +464,8 @@
 		D72A2D022AD9C136002AFF62 /* EventViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D72A2CFF2AD9B66B002AFF62 /* EventViewTests.swift */; };
 		D72A2D052AD9C1B5002AFF62 /* MockDamusState.swift in Sources */ = {isa = PBXBuildFile; fileRef = D72A2D042AD9C1B5002AFF62 /* MockDamusState.swift */; };
 		D72A2D072AD9C1FB002AFF62 /* MockProfiles.swift in Sources */ = {isa = PBXBuildFile; fileRef = D72A2D062AD9C1FB002AFF62 /* MockProfiles.swift */; };
+		D72E12782BEED22500F4F781 /* Array.swift in Sources */ = {isa = PBXBuildFile; fileRef = D72E12772BEED22400F4F781 /* Array.swift */; };
+		D72E127A2BEEEED000F4F781 /* NostrFilterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D72E12792BEEEED000F4F781 /* NostrFilterTests.swift */; };
 		D7315A2A2ACDF3B70036E30A /* DamusCacheManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7315A292ACDF3B70036E30A /* DamusCacheManager.swift */; };
 		D7315A2C2ACDF4DA0036E30A /* DamusCacheManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7315A2B2ACDF4DA0036E30A /* DamusCacheManagerTests.swift */; };
 		D7373BA62B688EA300F7783D /* DamusPurpleTranslationSetupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7373BA52B688EA200F7783D /* DamusPurpleTranslationSetupView.swift */; };
@@ -484,6 +488,7 @@
 		D74AAFD62B155F0C006CF0F4 /* WalletConnect+.swift in Sources */ = {isa = PBXBuildFile; fileRef = D74AAFD52B155F0C006CF0F4 /* WalletConnect+.swift */; };
 		D74F430A2B23F0BE00425B75 /* DamusPurple.swift in Sources */ = {isa = PBXBuildFile; fileRef = D74F43092B23F0BE00425B75 /* DamusPurple.swift */; };
 		D74F430C2B23FB9B00425B75 /* StoreObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = D74F430B2B23FB9B00425B75 /* StoreObserver.swift */; };
+		D753CEAA2BE9DE04001C3A5D /* MutingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D753CEA92BE9DE04001C3A5D /* MutingTests.swift */; };
 		D76556D62B1E6C08001B0CCC /* DamusPurpleWelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D76556D52B1E6C08001B0CCC /* DamusPurpleWelcomeView.swift */; };
 		D76874F32AE3632B00FB0F68 /* ProfileZapLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D76874F22AE3632B00FB0F68 /* ProfileZapLinkView.swift */; };
 		D77BFA0B2AE3051200621634 /* ProfileActionSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77BFA0A2AE3051200621634 /* ProfileActionSheetView.swift */; };
@@ -551,7 +556,6 @@
 		D7CCFC072B05833200323D86 /* NdbNote.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C90548A2A6AEDEE00811EEC /* NdbNote.swift */; };
 		D7CCFC082B05834500323D86 /* NoteId.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC14FF42A740BB7007AEB17 /* NoteId.swift */; };
 		D7CCFC0B2B0585EA00323D86 /* nostrdb.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CE9FBB82A6B3B26007E485C /* nostrdb.c */; settings = {COMPILER_FLAGS = "-w"; }; };
-		D7CCFC0E2B0587C300323D86 /* EventRef.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A9B282838B9006E126D /* EventRef.swift */; };
 		D7CCFC0F2B0587F600323D86 /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C285C8B28398BC6008A31F1 /* Keys.swift */; };
 		D7CCFC102B05880F00323D86 /* Id.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2B7BF12A71B6540049DEE7 /* Id.swift */; };
 		D7CCFC112B05884E00323D86 /* AsciiCharacter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5D5C9C2A6B2CB40024563C /* AsciiCharacter.swift */; };
@@ -611,6 +615,7 @@
 		D7CE1B472B0BE719002EDAD4 /* NativeObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C32B9462A9AD44700DC3548 /* NativeObject.swift */; };
 		D7CE1B482B0BE719002EDAD4 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C32B93D2A9AD44700DC3548 /* Message.swift */; };
 		D7CE1B492B0BE729002EDAD4 /* DisplayName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9BB83029C0ED4F00FC4E37 /* DisplayName.swift */; };
+		D7D2A3812BF815D000E4B42B /* PushNotificationClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7D2A3802BF815D000E4B42B /* PushNotificationClient.swift */; };
 		D7DBD41F2B02F15E002A6197 /* NostrKind.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BEFD32819DE8F00B3DE84 /* NostrKind.swift */; };
 		D7DEEF2F2A8C021E00E0C99F /* NostrEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7DEEF2E2A8C021E00E0C99F /* NostrEventTests.swift */; };
 		D7EDED152B11776B0018B19C /* LibreTranslateServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */; };
@@ -636,6 +641,8 @@
 		D7EDED332B12ACAE0018B19C /* DamusUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7EDED322B12ACAE0018B19C /* DamusUserDefaults.swift */; };
 		D7EDED342B12ACAE0018B19C /* DamusUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7EDED322B12ACAE0018B19C /* DamusUserDefaults.swift */; };
 		D7FB10A72B0C371A00FA8D42 /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2B10272A7B0F5C008AA43E /* Log.swift */; };
+		D7FB14222BE5970000398331 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = D7FB14212BE5970000398331 /* PrivacyInfo.xcprivacy */; };
+		D7FB14252BE5A9A800398331 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = D7FB14242BE5A9A800398331 /* PrivacyInfo.xcprivacy */; };
 		D7FD12262BD345A700CF195B /* FirstAidSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7FD12252BD345A700CF195B /* FirstAidSettingsView.swift */; };
 		D7FF94002AC7AC5300FD969D /* RelayURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7FF93FF2AC7AC5200FD969D /* RelayURL.swift */; };
 		E02429952B7E97740088B16C /* CameraController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02429942B7E97740088B16C /* CameraController.swift */; };
@@ -886,6 +893,7 @@
 		4C2B10272A7B0F5C008AA43E /* Log.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Log.swift; sourceTree = "<group>"; };
 		4C2B7BF12A71B6540049DEE7 /* Id.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Id.swift; sourceTree = "<group>"; };
 		4C2CDDF6299D4A5E00879FD5 /* Debouncer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Debouncer.swift; sourceTree = "<group>"; };
+		4C2D34402BDAF1B300F9FB44 /* NIP10Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIP10Tests.swift; sourceTree = "<group>"; };
 		4C30AC7129A5677A00E2BD5A /* NotificationsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsView.swift; sourceTree = "<group>"; };
 		4C30AC7329A5680900E2BD5A /* EventGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventGroupView.swift; sourceTree = "<group>"; };
 		4C30AC7529A5770900E2BD5A /* NotificationItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationItemView.swift; sourceTree = "<group>"; };
@@ -921,7 +929,6 @@
 		4C363A93282704FA006E126D /* Post.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Post.swift; sourceTree = "<group>"; };
 		4C363A952827096D006E126D /* PostBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostBlock.swift; sourceTree = "<group>"; };
 		4C363A9928283854006E126D /* Reply.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Reply.swift; sourceTree = "<group>"; };
-		4C363A9B282838B9006E126D /* EventRef.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventRef.swift; sourceTree = "<group>"; };
 		4C363A9D2828A822006E126D /* ReplyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyTests.swift; sourceTree = "<group>"; };
 		4C363A9F2828A8DD006E126D /* LikeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LikeTests.swift; sourceTree = "<group>"; };
 		4C363AA128296A7E006E126D /* SearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchView.swift; sourceTree = "<group>"; };
@@ -989,6 +996,7 @@
 		4C3EA67C28FFBBA200C48A62 /* InvoicesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvoicesView.swift; sourceTree = "<group>"; };
 		4C3EA67E28FFC01D00C48A62 /* InvoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvoiceView.swift; sourceTree = "<group>"; };
 		4C42812B298C848200DBF26F /* TranslateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslateView.swift; sourceTree = "<group>"; };
+		4C45E5012BED4D000025A428 /* ThreadReply.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadReply.swift; sourceTree = "<group>"; };
 		4C463CBE2B960B96008A8C36 /* PurpleBackdrop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurpleBackdrop.swift; sourceTree = "<group>"; };
 		4C478E242A9932C100489948 /* Ndb.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ndb.swift; sourceTree = "<group>"; };
 		4C478E262A99353500489948 /* threadpool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = threadpool.h; sourceTree = "<group>"; };
@@ -1386,6 +1394,8 @@
 		D72A2CFF2AD9B66B002AFF62 /* EventViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventViewTests.swift; sourceTree = "<group>"; };
 		D72A2D042AD9C1B5002AFF62 /* MockDamusState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockDamusState.swift; sourceTree = "<group>"; };
 		D72A2D062AD9C1FB002AFF62 /* MockProfiles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockProfiles.swift; sourceTree = "<group>"; };
+		D72E12772BEED22400F4F781 /* Array.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Array.swift; sourceTree = "<group>"; };
+		D72E12792BEEEED000F4F781 /* NostrFilterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NostrFilterTests.swift; sourceTree = "<group>"; };
 		D7315A292ACDF3B70036E30A /* DamusCacheManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusCacheManager.swift; sourceTree = "<group>"; };
 		D7315A2B2ACDF4DA0036E30A /* DamusCacheManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusCacheManagerTests.swift; sourceTree = "<group>"; };
 		D7373BA52B688EA200F7783D /* DamusPurpleTranslationSetupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusPurpleTranslationSetupView.swift; sourceTree = "<group>"; };
@@ -1399,6 +1409,7 @@
 		D74AAFD52B155F0C006CF0F4 /* WalletConnect+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WalletConnect+.swift"; sourceTree = "<group>"; };
 		D74F43092B23F0BE00425B75 /* DamusPurple.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusPurple.swift; sourceTree = "<group>"; };
 		D74F430B2B23FB9B00425B75 /* StoreObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreObserver.swift; sourceTree = "<group>"; };
+		D753CEA92BE9DE04001C3A5D /* MutingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutingTests.swift; sourceTree = "<group>"; };
 		D76556D52B1E6C08001B0CCC /* DamusPurpleWelcomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusPurpleWelcomeView.swift; sourceTree = "<group>"; };
 		D76874F22AE3632B00FB0F68 /* ProfileZapLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileZapLinkView.swift; sourceTree = "<group>"; };
 		D77BFA0A2AE3051200621634 /* ProfileActionSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileActionSheetView.swift; sourceTree = "<group>"; };
@@ -1427,12 +1438,15 @@
 		D7CB5D5E2B11770C00AD4105 /* FollowState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowState.swift; sourceTree = "<group>"; };
 		D7CBD1D32B8D21DC00BFD889 /* DamusPurpleNotificationManagement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusPurpleNotificationManagement.swift; sourceTree = "<group>"; };
 		D7CBD1D52B8D509800BFD889 /* DamusPurpleImpendingExpirationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusPurpleImpendingExpirationTests.swift; sourceTree = "<group>"; };
+		D7D2A3802BF815D000E4B42B /* PushNotificationClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushNotificationClient.swift; sourceTree = "<group>"; };
 		D7DEEF2E2A8C021E00E0C99F /* NostrEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NostrEventTests.swift; sourceTree = "<group>"; };
 		D7EDED1B2B1178FE0018B19C /* NoteContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteContent.swift; sourceTree = "<group>"; };
 		D7EDED1D2B11797D0018B19C /* LongformEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LongformEvent.swift; sourceTree = "<group>"; };
 		D7EDED202B117DCA0018B19C /* SequenceUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SequenceUtils.swift; sourceTree = "<group>"; };
 		D7EDED2D2B128E8A0018B19C /* CollectionExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionExtension.swift; sourceTree = "<group>"; };
 		D7EDED322B12ACAE0018B19C /* DamusUserDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusUserDefaults.swift; sourceTree = "<group>"; };
+		D7FB14212BE5970000398331 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		D7FB14242BE5A9A800398331 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		D7FD12252BD345A700CF195B /* FirstAidSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstAidSettingsView.swift; sourceTree = "<group>"; };
 		D7FF93FF2AC7AC5200FD969D /* RelayURL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayURL.swift; sourceTree = "<group>"; };
 		E02429942B7E97740088B16C /* CameraController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraController.swift; sourceTree = "<group>"; };
@@ -1607,7 +1621,6 @@
 				4C363A93282704FA006E126D /* Post.swift */,
 				4C363A952827096D006E126D /* PostBlock.swift */,
 				4C363A9928283854006E126D /* Reply.swift */,
-				4C363A9B282838B9006E126D /* EventRef.swift */,
 				4C363AA328296DEE006E126D /* SearchModel.swift */,
 				0E8A4BB62AE4359200065E81 /* NostrFilter+Hashable.swift */,
 				4C3AC79A28306D7B00E1F516 /* Contacts.swift */,
@@ -1652,6 +1665,7 @@
 				D74AAFC12B153395006CF0F4 /* HeadlessDamusState.swift */,
 				B5C60C1F2B530D5100C5ECA7 /* MuteItem.swift */,
 				B533694D2B66D791008A805E /* MutelistManager.swift */,
+				D7D2A3802BF815D000E4B42B /* PushNotificationClient.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -1780,6 +1794,14 @@
 			path = flatbuffers;
 			sourceTree = "<group>";
 		};
+		4C45E5002BED4CE10025A428 /* NIP10 */ = {
+			isa = PBXGroup;
+			children = (
+				4C45E5012BED4D000025A428 /* ThreadReply.swift */,
+			);
+			path = NIP10;
+			sourceTree = "<group>";
+		};
 		4C478E2A2A9935D300489948 /* bindings */ = {
 			isa = PBXGroup;
 			children = (
@@ -2447,6 +2469,7 @@
 		4CE6DEDA27F7A08100C66700 = {
 			isa = PBXGroup;
 			children = (
+				D7FB14212BE5970000398331 /* PrivacyInfo.xcprivacy */,
 				4C32B9362A9AD44700DC3548 /* flatbuffers */,
 				4C9054862A6AEB4500811EEC /* nostrdb */,
 				4C19AE4A2A5CEF7C00C90DB7 /* nostrscript */,
@@ -2477,6 +2500,7 @@
 		4CE6DEE527F7A08100C66700 /* damus */ = {
 			isa = PBXGroup;
 			children = (
+				4C45E5002BED4CE10025A428 /* NIP10 */,
 				4C1D4FB32A7967990024F453 /* build-git-hash.txt */,
 				4CA3529C2A76AE47003BB08B /* Notify */,
 				4CC14FEC2A73FC9A007AEB17 /* Types */,
@@ -2552,6 +2576,9 @@
 				E06336A92B75832100A88E6B /* ImageMetadataTest.swift */,
 				D7CBD1D52B8D509800BFD889 /* DamusPurpleImpendingExpirationTests.swift */,
 				D72927AC2BAB515C00F93E90 /* RelayURLTests.swift */,
+				D753CEA92BE9DE04001C3A5D /* MutingTests.swift */,
+				4C2D34402BDAF1B300F9FB44 /* NIP10Tests.swift */,
+				D72E12792BEEEED000F4F781 /* NostrFilterTests.swift */,
 			);
 			path = damusTests;
 			sourceTree = "<group>";
@@ -2676,6 +2703,7 @@
 			children = (
 				7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */,
 				4C7D09752A0AF19E00943473 /* FillAndStroke.swift */,
+				D72E12772BEED22400F4F781 /* Array.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -2752,6 +2780,7 @@
 				D79C4C182AFEB061003A41B4 /* Info.plist */,
 				D70A3B162B02DCE5008BD568 /* NotificationFormatter.swift */,
 				D74AAFC42B1538DE006CF0F4 /* NotificationExtensionState.swift */,
+				D7FB14242BE5A9A800398331 /* PrivacyInfo.xcprivacy */,
 			);
 			path = DamusNotificationService;
 			sourceTree = "<group>";
@@ -2984,6 +3013,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4C1D4FB42A7967990024F453 /* build-git-hash.txt in Resources */,
+				D7FB14222BE5970000398331 /* PrivacyInfo.xcprivacy in Resources */,
 				3ACB685F297633BC00C46468 /* Localizable.strings in Resources */,
 				4CE6DEEE27F7A08200C66700 /* Preview Assets.xcassets in Resources */,
 				3ACB685C297633BC00C46468 /* InfoPlist.strings in Resources */,
@@ -3017,6 +3047,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D7FB14252BE5A9A800398331 /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3208,6 +3239,7 @@
 				4C86F7C62A76C51100EC0817 /* AttachedWalletNotify.swift in Sources */,
 				4CF0ABE12981A83900D66079 /* MutelistView.swift in Sources */,
 				4CB883A82975FC1800DC99E7 /* Zaps.swift in Sources */,
+				4C45E5022BED4D000025A428 /* ThreadReply.swift in Sources */,
 				D74AAFD42B155ECB006CF0F4 /* Zaps+.swift in Sources */,
 				4C75EFB128049D510006080F /* NostrResponse.swift in Sources */,
 				4C7D09592A05BEAD00943473 /* KeyboardVisible.swift in Sources */,
@@ -3228,6 +3260,7 @@
 				4CE8794829941DA700F758CC /* RelayFilters.swift in Sources */,
 				4CEE2B02280B39E800AB5EEF /* EventActionBar.swift in Sources */,
 				4C3BEFE0281DE1ED00B3DE84 /* DamusState.swift in Sources */,
+				D72E12782BEED22500F4F781 /* Array.swift in Sources */,
 				4C198DF529F88D2E004C165C /* ImageMetadata.swift in Sources */,
 				4CCEB7AE29B53D260078AA28 /* SearchingEventView.swift in Sources */,
 				4CF0ABE929844AF100D66079 /* AnyCodable.swift in Sources */,
@@ -3261,6 +3294,7 @@
 				5CF2DCCC2AA3AF0B00984B8D /* RelayPicView.swift in Sources */,
 				4C687C242A5FA86D0092C550 /* SearchHeaderView.swift in Sources */,
 				64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */,
+				D7D2A3812BF815D000E4B42B /* PushNotificationClient.swift in Sources */,
 				4C1A9A2329DDDB8100516EAC /* IconLabel.swift in Sources */,
 				4CA352AC2A76C07F003BB08B /* NewUnmutesNotify.swift in Sources */,
 				4C3EA64928FF597700C48A62 /* bech32.c in Sources */,
@@ -3323,7 +3357,6 @@
 				4CE1399029F0661A00AC6A0B /* RepostAction.swift in Sources */,
 				4CE1399229F0666100AC6A0B /* ShareActionButton.swift in Sources */,
 				4C42812C298C848200DBF26F /* TranslateView.swift in Sources */,
-				4C363A9C282838B9006E126D /* EventRef.swift in Sources */,
 				4C5E54032A9522F600FF6E60 /* UserStatus.swift in Sources */,
 				4C7D095F2A098C5D00943473 /* ConnectWalletView.swift in Sources */,
 				3AA24802297E3DC20090C62D /* RepostView.swift in Sources */,
@@ -3514,6 +3547,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4C2D34412BDAF1B300F9FB44 /* NIP10Tests.swift in Sources */,
 				4C684A572A7FFAE6005E6031 /* UrlTests.swift in Sources */,
 				3A90B1832A4EA3C600000D94 /* UserSearchCacheTests.swift in Sources */,
 				4C9B0DEE2A65A75F00CBDA21 /* AttrStringTestExtensions.swift in Sources */,
@@ -3527,6 +3561,7 @@
 				4C8D00D429E3C5D40036AF10 /* NIP19Tests.swift in Sources */,
 				3A30410129AB12AA008A0F29 /* EventGroupViewTests.swift in Sources */,
 				501F8C822A0224EB001AFC1D /* KeychainStorageTests.swift in Sources */,
+				D72E127A2BEEEED000F4F781 /* NostrFilterTests.swift in Sources */,
 				B5B4D1432B37D47600844320 /* NdbExtensions.swift in Sources */,
 				3ACBCB78295FE5C70037388A /* TimeAgoTests.swift in Sources */,
 				D72A2D072AD9C1FB002AFF62 /* MockProfiles.swift in Sources */,
@@ -3553,6 +3588,7 @@
 				4C90BD1C283AC38E008EE7EF /* Bech32Tests.swift in Sources */,
 				50A50A8D29A09E1C00C01BE7 /* RequestTests.swift in Sources */,
 				4CE6DEF827F7A08200C66700 /* damusTests.swift in Sources */,
+				D753CEAA2BE9DE04001C3A5D /* MutingTests.swift in Sources */,
 				3A3040F329A91366008A0F29 /* ProfileViewTests.swift in Sources */,
 				4CF0ABDC2981A19E00D66079 /* ListTests.swift in Sources */,
 				4C684A552A7E91FE005E6031 /* LongPostTests.swift in Sources */,
@@ -3573,10 +3609,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4C8FA7242BED58A900798A6A /* ThreadReply.swift in Sources */,
 				D798D21F2B0858D600234419 /* MigratedTypes.swift in Sources */,
 				D7CE1B472B0BE719002EDAD4 /* NativeObject.swift in Sources */,
 				D7CB5D552B11758A00AD4105 /* UnmuteThreadNotify.swift in Sources */,
-				D7CCFC0E2B0587C300323D86 /* EventRef.swift in Sources */,
 				D7CCFC192B058A3F00323D86 /* Block.swift in Sources */,
 				D7CCFC112B05884E00323D86 /* AsciiCharacter.swift in Sources */,
 				D798D2202B08592000234419 /* NdbTagIterator.swift in Sources */,
@@ -3882,7 +3918,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -3903,7 +3939,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MACOSX_DEPLOYMENT_TARGET = 12.3;
-				MARKETING_VERSION = 1.8;
+				MARKETING_VERSION = 1.9;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3949,7 +3985,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -3965,7 +4001,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MACOSX_DEPLOYMENT_TARGET = 12.3;
-				MARKETING_VERSION = 1.8;
+				MARKETING_VERSION = 1.9;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -4011,7 +4047,6 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -4061,7 +4096,6 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -59,66 +59,57 @@ func parse_note_content(content: NoteContent) -> Blocks {
    }
 }

-func interpret_event_refs_ndb(blocks: [Block], tags: TagsSequence) -> [EventRef] {
-    if tags.count == 0 {
-        return []
-    }
-    
-    /// build a set of indices for each event mention
-    let mention_indices = build_mention_indices(blocks, type: .e)
-
-    /// simpler case with no mentions
-    if mention_indices.count == 0 {
-        return interp_event_refs_without_mentions_ndb(tags.note.referenced_noterefs)
-    }
-    
-    return interp_event_refs_with_mentions_ndb(tags: tags, mention_indices: mention_indices)
+func interpret_event_refs(tags: TagsSequence) -> ThreadReply? {
+    // migration is long over, lets just do this to fix tests
+    return interpret_event_refs_ndb(tags: tags)
 }

-func interp_event_refs_without_mentions_ndb(_ ev_tags: References<NoteRef>) -> [EventRef] {
+func interpret_event_refs_ndb(tags: TagsSequence) -> ThreadReply? {
+    if tags.count == 0 {
+        return nil
+    }

-    var count = 0
-    var evrefs: [EventRef] = []
+    return interp_event_refs_without_mentions_ndb(References<NoteRef>(tags: tags))
+}
+
+func interp_event_refs_without_mentions_ndb(_ ev_tags: References<NoteRef>) -> ThreadReply? {
    var first: Bool = true
-    var first_ref: NoteRef? = nil
+    var root_id: NoteRef? = nil
+    var reply_id: NoteRef? = nil
+    var mention: NoteRef? = nil
+    var any_marker: Bool = false

    for ref in ev_tags {
-        if first {
-            first_ref = ref
-            evrefs.append(.thread_id(ref))
-            first = false
-        } else {
-
-            evrefs.append(.reply(ref))
-        }
-        count += 1
-    }
-
-    if let first_ref, count == 1 {
-        let r = first_ref
-        return [.reply_to_root(r)]
-    }
-
-    return evrefs
-}
-
-func interp_event_refs_with_mentions_ndb(tags: TagsSequence, mention_indices: Set<Int>) -> [EventRef] {
-    var mentions: [EventRef] = []
-    var ev_refs: [NoteRef] = []
-    var i: Int = 0
-
-    for tag in tags {
-        if let note_id = NoteRef.from_tag(tag: tag) {
-            if mention_indices.contains(i) {
-                mentions.append(.mention(.noteref(note_id, index: i)))
+        if let marker = ref.marker {
+            any_marker = true
+            switch marker {
+            case .root: root_id = ref
+            case .reply: reply_id = ref
+            case .mention: mention = ref
+            }
+        // deprecated form, only activate if we don't have any markers set
+        } else if !any_marker {
+            if first {
+                root_id = ref
+                first = false
            } else {
-                ev_refs.append(note_id)
+                reply_id = ref
            }
        }
-        i += 1
    }
-    
-    var replies = interp_event_refs_without_mentions(ev_refs)
-    replies.append(contentsOf: mentions)
-    return replies
+
+    // If either reply or root_id is blank while the other is not, then this is
+    // considered reply-to-root. We should always have a root and reply tag, if they
+    // are equal this is reply-to-root
+    if reply_id == nil && root_id != nil {
+        reply_id = root_id
+    } else if root_id == nil && reply_id != nil {
+        root_id = reply_id
+    }
+
+    guard let reply_id, let root_id else {
+        return nil
+    }
+
+    return ThreadReply(root: root_id, reply: reply_id, mention: mention.map { m in .noteref(m) })
 }
@@ -308,7 +308,7 @@ struct ContentView: View {
                active_sheet = .onboardingSuggestions
                hasSeenOnboardingSuggestions = true
            }
-            self.appDelegate?.settings = damus_state?.settings
+            self.appDelegate?.state = damus_state
        }
        .sheet(item: $active_sheet) { item in
            switch item {
@@ -699,7 +699,7 @@ struct ContentView: View {
                                      likes: EventCounter(our_pubkey: pubkey),
                                      boosts: EventCounter(our_pubkey: pubkey),
                                      contacts: Contacts(our_pubkey: pubkey),
-                                      mutelist_manager: MutelistManager(),
+                                      mutelist_manager: MutelistManager(user_keypair: keypair),
                                      profiles: Profiles(ndb: ndb),
                                      dms: home.dms,
                                      previews: PreviewCache(),
@@ -16,7 +16,7 @@ enum FilterState : Int {
    func filter(ev: NostrEvent) -> Bool {
        switch self {
        case .posts:
-            return ev.known_kind == .boost || !ev.is_reply(.empty)
+            return ev.known_kind == .boost || !ev.is_reply()
        case .posts_and_replies:
            return true
        }
@@ -36,6 +36,7 @@ class DamusState: HeadlessDamusState {
    let video: VideoController
    let ndb: Ndb
    var purple: DamusPurple
+    var push_notification_client: PushNotificationClient

    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: [RelayURL], replies: ReplyCounter, wallet: WalletModel, nav: NavigationCoordinator, music: MusicController?, video: VideoController, ndb: Ndb, purple: DamusPurple? = nil, quote_reposts: EventCounter) {
        self.pool = pool
@@ -68,6 +69,7 @@ class DamusState: HeadlessDamusState {
            keypair: keypair
        )
        self.quote_reposts = quote_reposts
+        self.push_notification_client = PushNotificationClient(keypair: keypair, settings: settings)
    }

    @discardableResult
@@ -112,7 +114,7 @@ class DamusState: HeadlessDamusState {
            likes: EventCounter(our_pubkey: empty_pub),
            boosts: EventCounter(our_pubkey: empty_pub),
            contacts: Contacts(our_pubkey: empty_pub),
-            mutelist_manager: MutelistManager(),
+            mutelist_manager: MutelistManager(user_keypair: kp),
            profiles: Profiles(ndb: .empty),
            dms: DirectMessagesModel(our_pubkey: empty_pub),
            previews: PreviewCache(),
@@ -1,147 +0,0 @@
-//
-//  EventRef.swift
-//  damus
-//
-//  Created by William Casarin on 2022-05-08.
-//
-
-import Foundation
-
-enum EventRef: Equatable {
-    case mention(Mention<NoteRef>)
-    case thread_id(NoteRef)
-    case reply(NoteRef)
-    case reply_to_root(NoteRef)
-
-    var is_mention: NoteRef? {
-        if case .mention(let m) = self { return m.ref }
-        return nil
-    }
-    
-    var is_direct_reply: NoteRef? {
-        switch self {
-        case .mention:
-            return nil
-        case .thread_id:
-            return nil
-        case .reply(let refid):
-            return refid
-        case .reply_to_root(let refid):
-            return refid
-        }
-    }
-    
-    var is_thread_id: NoteRef? {
-        switch self {
-        case .mention:
-            return nil
-        case .thread_id(let referencedId):
-            return referencedId
-        case .reply:
-            return nil
-        case .reply_to_root(let referencedId):
-            return referencedId
-        }
-    }
-    
-    var is_reply: NoteRef? {
-        switch self {
-        case .mention:
-            return nil
-        case .thread_id:
-            return nil
-        case .reply(let refid):
-            return refid
-        case .reply_to_root(let refid):
-            return refid
-        }
-    }
-}
-
-func build_mention_indices(_ blocks: [Block], type: MentionType) -> Set<Int> {
-    return blocks.reduce(into: []) { acc, block in
-        switch block {
-        case .mention(let m):
-            if m.ref.key == type, let idx = m.index {
-                acc.insert(idx)
-            }
-        case .relay:
-            return
-        case .text:
-            return
-        case .hashtag:
-            return
-        case .url:
-            return
-        case .invoice:
-            return
-        }
-    }
-}
-
-func interp_event_refs_without_mentions(_ refs: [NoteRef]) -> [EventRef] {
-    if refs.count == 0 {
-        return []
-    }
-
-    if refs.count == 1 {
-        return [.reply_to_root(refs[0])]
-    }
-    
-    var evrefs: [EventRef] = []
-    var first: Bool = true
-    for ref in refs {
-        if first {
-            evrefs.append(.thread_id(ref))
-            first = false
-        } else {
-            evrefs.append(.reply(ref))
-        }
-    }
-    return evrefs
-}
-
-func interp_event_refs_with_mentions(tags: Tags, mention_indices: Set<Int>) -> [EventRef] {
-    var mentions: [EventRef] = []
-    var ev_refs: [NoteRef] = []
-    var i: Int = 0
-
-    for tag in tags {
-        if let ref = NoteRef.from_tag(tag: tag) {
-            if mention_indices.contains(i) {
-                let mention = Mention<NoteRef>(index: i, ref: ref)
-                mentions.append(.mention(mention))
-            } else {
-                ev_refs.append(ref)
-            }
-        }
-        i += 1
-    }
-    
-    var replies = interp_event_refs_without_mentions(ev_refs)
-    replies.append(contentsOf: mentions)
-    return replies
-}
-
-func interpret_event_refs(blocks: [Block], tags: Tags) -> [EventRef] {
-    if tags.count == 0 {
-        return []
-    }
-    
-    /// build a set of indices for each event mention
-    let mention_indices = build_mention_indices(blocks, type: .e)
-
-    /// simpler case with no mentions
-    if mention_indices.count == 0 {
-        return interp_event_refs_without_mentions_ndb(References<NoteRef>(tags: tags))
-    }
-    
-    return interp_event_refs_with_mentions(tags: tags, mention_indices: mention_indices)
-}
-
-
-func event_is_reply(_ refs: [EventRef]) -> Bool {
-    return refs.contains { evref in
-        return evref.is_reply != nil
-    }
-}
@@ -42,6 +42,10 @@ enum HomeResubFilter {
 }

 class HomeModel: ContactsDelegate {
+    // The maximum amount of contacts placed on a home feed subscription filter.
+    // If the user has more contacts, chunking or other techniques will be used to avoid sending huge filters
+    let MAX_CONTACTS_ON_FILTER = 500
+    
    // Don't trigger a user notification for events older than a certain age
    static let event_max_age_for_notification: TimeInterval = EVENT_MAX_AGE_FOR_NOTIFICATION
    
@@ -545,7 +549,8 @@ class HomeModel: ContactsDelegate {
        notifications_filter.limit = 500

        var notifications_filters = [notifications_filter]
-        var contacts_filters = [contacts_filter, our_contacts_filter, our_blocklist_filter, our_old_blocklist_filter]
+        let contacts_filter_chunks = contacts_filter.chunked(on: .authors, into: MAX_CONTACTS_ON_FILTER)
+        var contacts_filters = contacts_filter_chunks + [our_contacts_filter, our_blocklist_filter, our_old_blocklist_filter]
        var dms_filters = [dms_filter, our_dms_filter]
        let last_of_kind = get_last_of_kind(relay_id: relay_id)

@@ -598,7 +603,7 @@ class HomeModel: ContactsDelegate {
        home_filter.authors = friends
        home_filter.limit = 500

-        var home_filters = [home_filter]
+        var home_filters = home_filter.chunked(on: .authors, into: MAX_CONTACTS_ON_FILTER)

        let followed_hashtags = Array(damus_state.contacts.get_followed_hashtags())
        if followed_hashtags.count != 0 {
@@ -728,7 +733,7 @@ class HomeModel: ContactsDelegate {
    func got_new_dm(notifs: NewEventsBits, ev: NostrEvent) {
        notification_status.new_events = notifs
        
-        guard should_display_notification(state: damus_state, event: ev),
+        guard should_display_notification(state: damus_state, event: ev, mode: .local),
              let notification_object = generate_local_notification_object(from: ev, state: damus_state)
        else {
            return
@@ -1148,8 +1153,8 @@ func should_show_event(event: NostrEvent, damus_state: DamusState) -> Bool {
    )
 }

-func should_show_event(state: DamusState, ev: NostrEvent, keypair: Keypair? = nil) -> Bool {
-    let event_muted = state.mutelist_manager.is_event_muted(ev, keypair: keypair)
+func should_show_event(state: DamusState, ev: NostrEvent) -> Bool {
+    let event_muted = state.mutelist_manager.is_event_muted(ev)
    if event_muted {
        return false
    }
@@ -292,9 +292,8 @@ func make_post_tags(post_blocks: [Block], tags: [[String]]) -> PostTags {
 }

 func post_to_event(post: NostrPost, keypair: FullKeypair) -> NostrEvent? {
-    let tags = post.references.map({ r in r.tag }) + post.tags
    let post_blocks = parse_post_blocks(content: post.content)
-    let post_tags = make_post_tags(post_blocks: post_blocks, tags: tags)
+    let post_tags = make_post_tags(post_blocks: post_blocks, tags: post.tags)
    let content = post_tags.blocks
        .map(\.asString)
        .joined(separator: "")
@@ -8,12 +8,27 @@
 import Foundation

 class MutelistManager {
+    let user_keypair: Keypair
    private(set) var event: NostrEvent? = nil

-    var users: Set<MuteItem> = []
-    var hashtags: Set<MuteItem> = []
-    var threads: Set<MuteItem> = []
-    var words: Set<MuteItem> = []
+    var users: Set<MuteItem> = [] {
+        didSet { self.reset_cache() }
+    }
+    var hashtags: Set<MuteItem> = [] {
+        didSet { self.reset_cache() }
+    }
+    var threads: Set<MuteItem> = [] {
+        didSet { self.reset_cache() }
+    }
+    var words: Set<MuteItem> = [] {
+        didSet { self.reset_cache() }
+    }
+    
+    var muted_notes_cache: [NoteId: EventMuteStatus] = [:]
+    
+    init(user_keypair: Keypair) {
+        self.user_keypair = user_keypair
+    }

    func refresh_sets() {
        guard let referenced_mute_items = event?.referenced_mute_items else { return }
@@ -41,6 +56,10 @@ class MutelistManager {
        threads = new_threads
        words = new_words
    }
+    
+    func reset_cache() {
+        self.muted_notes_cache = [:]
+    }

    func is_muted(_ item: MuteItem) -> Bool {
        switch item {
@@ -55,8 +74,8 @@ class MutelistManager {
        }
    }

-    func is_event_muted(_ ev: NostrEvent, keypair: Keypair? = nil) -> Bool {
-        return event_muted_reason(ev, keypair: keypair) != nil
+    func is_event_muted(_ ev: NostrEvent) -> Bool {
+        return self.event_muted_reason(ev) != nil
    }

    func set_mutelist(_ ev: NostrEvent) {
@@ -114,15 +133,27 @@ class MutelistManager {
            threads.remove(item)
        }
    }
+    
+    func event_muted_reason(_ ev: NostrEvent) -> MuteItem? {
+        if let cached_mute_status = self.muted_notes_cache[ev.id] {
+            return cached_mute_status.mute_reason()
+        }
+        if let reason = self.compute_event_muted_reason(ev) {
+            self.muted_notes_cache[ev.id] = .muted(reason: reason)
+            return reason
+        }
+        self.muted_notes_cache[ev.id] = .not_muted
+        return nil
+    }


    /// 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, keypair: Keypair? = nil) -> MuteItem? {
+    func compute_event_muted_reason(_ ev: NostrEvent) -> MuteItem? {
        // Events from the current user should not be muted.
-        guard keypair?.pubkey != ev.pubkey else { return nil }
+        guard self.user_keypair.pubkey != ev.pubkey else { return nil }

        // Check if user is muted
        let check_user_item = MuteItem.user(ev.pubkey, nil)
@@ -147,7 +178,7 @@ class MutelistManager {
        }

        // Check if word is muted
-        if let keypair, let content: String = ev.maybe_get_content(keypair)?.lowercased() {
+        if let content: String = ev.maybe_get_content(self.user_keypair)?.lowercased() {
            for word in words {
                if case .word(let string, _) = word {
                    if content.contains(string.lowercased()) {
@@ -159,4 +190,18 @@ class MutelistManager {

        return nil
    }
+    
+    enum EventMuteStatus {
+        case muted(reason: MuteItem)
+        case not_muted
+        
+        func mute_reason() -> MuteItem? {
+            switch self {
+                case .muted(reason: let reason):
+                    return reason
+                case .not_muted:
+                    return nil
+            }
+        }
+    }
 }
@@ -13,7 +13,7 @@ import UIKit
 let EVENT_MAX_AGE_FOR_NOTIFICATION: TimeInterval = 12 * 60 * 60

 func process_local_notification(state: HeadlessDamusState, event ev: NostrEvent) {
-    guard should_display_notification(state: state, event: ev) else {
+    guard should_display_notification(state: state, event: ev, mode: .local) else {
        // We should not display notification. Exit.
        return
    }
@@ -25,7 +25,12 @@ func process_local_notification(state: HeadlessDamusState, event ev: NostrEvent)
    create_local_notification(profiles: state.profiles, notify: local_notification)
 }

-func should_display_notification(state: HeadlessDamusState, event ev: NostrEvent) -> Bool {
+func should_display_notification(state: HeadlessDamusState, event ev: NostrEvent, mode: UserSettingsStore.NotificationsMode) -> Bool {
+    // Do not show notification if it's coming from a mode different from the one selected by our user
+    guard state.settings.notifications_mode == mode else {
+        return false
+    }
+    
    if ev.known_kind == nil {
        return false
    }
@@ -37,7 +42,7 @@ func should_display_notification(state: HeadlessDamusState, event ev: NostrEvent
    }

    // Don't show notifications that match mute list.
-    if state.mutelist_manager.is_event_muted(ev, keypair: state.keypair) {
+    if state.mutelist_manager.is_event_muted(ev) {
        return false
    }

@@ -10,12 +10,10 @@ import Foundation
 struct NostrPost {
    let kind: NostrKind
    let content: String
-    let references: [RefId]
    let tags: [[String]]

-    init(content: String, references: [RefId], kind: NostrKind = .text, tags: [[String]] = []) {
+    init(content: String, kind: NostrKind = .text, tags: [[String]] = []) {
        self.content = content
-        self.references = references
        self.kind = kind
        self.tags = tags
    }
@@ -0,0 +1,105 @@
+//
+//  PushNotificationClient.swift
+//  damus
+//
+//  Created by Daniel D’Aquino on 2024-05-17.
+//
+
+import Foundation
+
+struct PushNotificationClient {
+    let keypair: Keypair
+    let settings: UserSettingsStore
+    private(set) var device_token: Data? = nil
+    
+    mutating func set_device_token(new_device_token: Data) async throws {
+        self.device_token = new_device_token
+        if settings.enable_experimental_push_notifications && settings.notifications_mode == .push {
+            try await self.send_token()
+        }
+    }
+    
+    func send_token() async throws {
+        guard let device_token else { return }
+        // Send the device token and pubkey to the server
+        let token = device_token.map { String(format: "%02.2hhx", $0) }.joined()
+        
+        Log.info("Sending device token to server: %s", for: .push_notifications, token)
+
+        let pubkey = self.keypair.pubkey
+
+        // Send those as JSON to the server
+        let json: [String: Any] = ["deviceToken": token, "pubkey": pubkey.hex()]
+
+        // create post request
+        let url = self.settings.send_device_token_to_localhost ? Constants.DEVICE_TOKEN_RECEIVER_TEST_URL : Constants.DEVICE_TOKEN_RECEIVER_PRODUCTION_URL
+        let json_data = try JSONSerialization.data(withJSONObject: json)
+        
+        
+        let (data, response) = try await make_nip98_authenticated_request(
+            method: .post,
+            url: url,
+            payload: json_data,
+            payload_type: .json,
+            auth_keypair: self.keypair
+        )
+        
+        if let httpResponse = response as? HTTPURLResponse {
+            switch httpResponse.statusCode {
+                case 200:
+                    Log.info("Sent device token to Damus push notification server successfully", for: .push_notifications)
+                default:
+                    Log.error("Error in sending device_token to Damus push notification server. HTTP status code: %d; Response: %s", for: .push_notifications, httpResponse.statusCode, String(data: data, encoding: .utf8) ?? "Unknown")
+                    throw ClientError.http_response_error(status_code: httpResponse.statusCode, response: data)
+            }
+        }
+        
+        return
+    }
+    
+    func revoke_token() async throws {
+        guard let device_token else { return }
+        // Send the device token and pubkey to the server
+        let token = device_token.map { String(format: "%02.2hhx", $0) }.joined()
+        
+        Log.info("Revoking device token from server: %s", for: .push_notifications, token)
+
+        let pubkey = self.keypair.pubkey
+
+        // Send those as JSON to the server
+        let json: [String: Any] = ["deviceToken": token, "pubkey": pubkey.hex()]
+
+        // create post request
+        let url = self.settings.send_device_token_to_localhost ? Constants.DEVICE_TOKEN_REVOKER_TEST_URL : Constants.DEVICE_TOKEN_REVOKER_PRODUCTION_URL
+        let json_data = try JSONSerialization.data(withJSONObject: json)
+        
+        
+        let (data, response) = try await make_nip98_authenticated_request(
+            method: .post,
+            url: url,
+            payload: json_data,
+            payload_type: .json,
+            auth_keypair: self.keypair
+        )
+        
+        if let httpResponse = response as? HTTPURLResponse {
+            switch httpResponse.statusCode {
+                case 200:
+                    Log.info("Sent device token removal request to Damus push notification server successfully", for: .push_notifications)
+                default:
+                    Log.error("Error in sending device_token removal to Damus push notification server. HTTP status code: %d; Response: %s", for: .push_notifications, httpResponse.statusCode, String(data: data, encoding: .utf8) ?? "Unknown")
+                    throw ClientError.http_response_error(status_code: httpResponse.statusCode, response: data)
+            }
+        }
+        
+        return
+    }
+}
+
+// MARK: Helper structures
+
+extension PushNotificationClient {
+    enum ClientError: Error {
+        case http_response_error(status_code: Int, response: Data)
+    }
+}
@@ -60,7 +60,7 @@ class SearchHomeModel: ObservableObject {
            guard sub_id == self.base_subid || sub_id == self.profiles_subid else {
                return
            }
-            if ev.is_textlike && should_show_event(state: damus_state, ev: ev) && !ev.is_reply(damus_state.keypair)
+            if ev.is_textlike && should_show_event(state: damus_state, ev: ev) && !ev.is_reply()
            {
                if !damus_state.settings.multiple_events_per_pubkey && seen_pubkey.contains(ev.pubkey) {
                    return
@@ -60,7 +60,7 @@ class ThreadModel: ObservableObject {
        var event_filter = NostrFilter()
        var ref_events = NostrFilter()

-        let thread_id = event.thread_id(keypair: .empty)
+        let thread_id = event.thread_id()

        ref_events.referenced_ids = [thread_id, event.id]
        ref_events.kinds = [.text]
@@ -155,6 +155,9 @@ class UserSettingsStore: ObservableObject {
    @Setting(key: "like_notification", default_value: true)
    var like_notification: Bool
    
+    @StringSetting(key: "notifications_mode", default_value: .local)
+    var notifications_mode: NotificationsMode
+    
    @Setting(key: "notification_only_from_following", default_value: false)
    var notification_only_from_following: Bool
    
@@ -326,6 +329,36 @@ class UserSettingsStore: ObservableObject {
    @Setting(key: "latest_contact_event_id", default_value: nil)
    var latest_contact_event_id_hex: String?
    
+    
+    // MARK: Helper types
+    
+    enum NotificationsMode: String, CaseIterable, Identifiable, StringCodable, Equatable {
+        var id: String { self.rawValue }
+
+        func to_string() -> String {
+            return rawValue
+        }
+        
+        init?(from string: String) {
+            guard let notifications_mode = NotificationsMode(rawValue: string) else {
+                return nil
+            }
+            self = notifications_mode
+        }
+        
+        func text_description() -> String {
+            switch self {
+                case .local:
+                    NSLocalizedString("Local", comment: "Option for notification mode setting: Local notification mode")
+                case .push:
+                    NSLocalizedString("Push", comment: "Option for notification mode setting: Push notification mode")
+            }
+        }
+        
+        case local
+        case push
+    }
+    
 }

 func pk_setting_key(_ pubkey: Pubkey, key: String) -> String {
@@ -0,0 +1,32 @@
+//
+//  ThreadReply.swift
+//  damus
+//
+//  Created by William Casarin on 2024-05-09.
+//
+
+import Foundation
+
+
+struct ThreadReply {
+    let root: NoteRef
+    let reply: NoteRef
+    let mention: Mention<NoteRef>?
+
+    var is_reply_to_root: Bool {
+        return root.id == reply.id
+    }
+
+    init(root: NoteRef, reply: NoteRef, mention: Mention<NoteRef>?) {
+        self.root = root
+        self.reply = reply
+        self.mention = mention
+    }
+
+    init?(tags: TagsSequence) {
+        guard let tr = interpret_event_refs_ndb(tags: tags) else {
+            return nil
+        }
+        self = tr
+    }
+}
@@ -443,16 +443,17 @@ func make_boost_event(keypair: FullKeypair, boosted: NostrEvent) -> NostrEvent?
 }

 func make_like_event(keypair: FullKeypair, liked: NostrEvent, content: String = "🤙") -> NostrEvent? {
-    var tags = liked.tags.reduce(into: [[String]]()) { ts, tag in
-        guard tag.count >= 2,
-              (tag[0].matches_char("e") || tag[0].matches_char("p")) else {
-            return
-        }
-        ts.append(tag.strings())
+    var tags: [[String]] = []
+
+    if liked.is_non_parameterized_replaceable {
+        tags.append(["a", "\(liked.kind.description):\(liked.pubkey.hex()):"])
+    } else if liked.is_parameterized_replaceable, let dTag = liked.tags.first(where: { $0.count >= 2 && $0[0].matches_char("d") }) {
+        tags.append(["a", "\(liked.kind.description):\(liked.pubkey.hex()):\(dTag[1])"])
    }

    tags.append(["e", liked.id.hex()])
    tags.append(["p", liked.pubkey.hex()])
+    tags.append(["k", liked.kind.description])

    return NostrEvent(content: content, keypair: keypair.to_keypair(), kind: 7, tags: tags)
 }
@@ -54,4 +54,68 @@ struct NostrFilter: Codable, Equatable {
    public static func filter_hashtag(_ htags: [String]) -> NostrFilter {
        NostrFilter(hashtag: htags.map { $0.lowercased() })
    }
+    
+    /// Splits the filter on a given filter path/axis into chunked filters
+    ///
+    /// - Parameter path: The path where chunking should be done
+    /// - Parameter chunk_size: The maximum size of each chunk.
+    /// - Returns: An array of arrays, where each contained array is a chunk of the original array with up to `size` elements.
+    func chunked(on path: ChunkPath, into chunk_size: Int) -> [Self] {
+        let chunked_slices = self.get_slice(from: path).chunked(into: chunk_size)
+        var chunked_filters: [NostrFilter] = []
+        for chunked_slice in chunked_slices {
+            var chunked_filter = self
+            chunked_filter.apply_slice(chunked_slice)
+            chunked_filters.append(chunked_filter)
+        }
+        return chunked_filters
+    }
+    
+    /// Gets a slice from a NostrFilter on a given path/axis
+    ///
+    /// - Parameter path: The path where chunking should be done
+    /// - Parameter chunk_size: The maximum size of each chunk.
+    /// - Returns: An array of arrays, where each contained array is a chunk of the original array with up to `size` elements.
+    func get_slice(from path: ChunkPath) -> Slice {
+        switch path {
+            case .pubkeys:
+                return .pubkeys(self.pubkeys)
+            case .authors:
+                return .authors(self.authors)
+        }
+    }
+    
+    /// Overrides one member/axis of a NostrFilter using a specific slice
+    /// - Parameter slice: The slice to be applied on this NostrFilter
+    mutating func apply_slice(_ slice: Slice) {
+        switch slice {
+            case .pubkeys(let pubkeys):
+                self.pubkeys = pubkeys
+            case .authors(let authors):
+                self.authors = authors
+        }
+    }
+    
+    
+    /// A path to one of the axes of a NostrFilter.
+    enum ChunkPath {
+        case pubkeys
+        case authors
+        // Other paths/axes not supported yet
+    }
+    
+    /// Represents the value of a single axis of a NostrFilter
+    enum Slice {
+        case pubkeys([Pubkey]?)
+        case authors([Pubkey]?)
+        
+        func chunked(into chunk_size: Int) -> [Slice] {
+            switch self {
+                case .pubkeys(let array):
+                    return (array ?? []).chunked(into: chunk_size).map({ .pubkeys($0) })
+                case .authors(let array):
+                    return (array ?? []).chunked(into: chunk_size).map({ .authors($0) })
+            }
+        }
+    }
 }
@@ -73,7 +73,7 @@ var test_damus_state: DamusState = ({
                           likes: .init(our_pubkey: our_pubkey),
                           boosts: .init(our_pubkey: our_pubkey),
                           contacts: .init(our_pubkey: our_pubkey),
-                           mutelist_manager: MutelistManager(),
+                           mutelist_manager: MutelistManager(user_keypair: test_keypair),
                           profiles: .init(ndb: ndb),
                           dms: .init(our_pubkey: our_pubkey),
                           previews: .init(),
@@ -12,6 +12,8 @@ class Constants {
    static let DAMUS_APP_GROUP_IDENTIFIER: String = "group.com.damus"
    static let DEVICE_TOKEN_RECEIVER_PRODUCTION_URL: URL = URL(string: "https://notify.damus.io:8000/user-info")!
    static let DEVICE_TOKEN_RECEIVER_TEST_URL: URL = URL(string: "http://localhost:8000/user-info")!
+    static let DEVICE_TOKEN_REVOKER_PRODUCTION_URL: URL = URL(string: "https://notify.damus.io:8000/user-info/remove")!
+    static let DEVICE_TOKEN_REVOKER_TEST_URL: URL = URL(string: "http://localhost:8000/user-info/remove")!
    static let MAIN_APP_BUNDLE_IDENTIFIER: String = "com.jb55.damus2"
    static let NOTIFICATION_EXTENSION_BUNDLE_IDENTIFIER: String = "com.jb55.damus2.DamusNotificationService"
    
@@ -169,7 +169,7 @@ class EventCache {
        var ev = event
        
        while true {
-            guard let direct_reply = ev.direct_replies(keypair).last,
+            guard let direct_reply = ev.direct_replies(),
                  let next_ev = lookup(direct_reply), next_ev != ev
            else {
                break
@@ -183,7 +183,7 @@ class EventCache {
    }
    
    func add_replies(ev: NostrEvent, keypair: Keypair) {
-        for reply in ev.direct_replies(keypair) {
+        if let reply = ev.direct_replies() {
            replies.add(id: reply, reply_id: ev.id)
        }
    }
@@ -218,7 +218,16 @@ class EventCache {
     */

    func lookup(_ evid: NoteId) -> NostrEvent? {
-        return events[evid]
+        if let ev = events[evid] {
+            return ev
+        }
+
+        if let ev = self.ndb.lookup_note(evid)?.unsafeUnownedValue?.to_owned() {
+            events[ev.id] = ev
+            return ev
+        }
+
+        return nil
    }
    
    func insert(_ ev: NostrEvent) {
@@ -0,0 +1,26 @@
+//
+//  Array.swift
+//  damus
+//
+//  Created by Daniel D’Aquino on 2024-05-10.
+//
+
+import Foundation
+
+extension Array {
+    /// Splits the array into chunks of the specified size.
+    /// - Parameter size: The maximum size of each chunk.
+    /// - Returns: An array of arrays, where each contained array is a chunk of the original array with up to `size` elements.
+    func chunked(into size: Int) -> [[Element]] {
+        guard size > 0 else { return [self] }
+        return stride(from: 0, to: count, by: size).map {
+            Array(self[$0..<Swift.min($0 + size, count)])
+        }
+    }
+}
+
+extension Array where Element: Equatable {
+    mutating func removeAll(equalTo item: Element) {
+        self.removeAll(where: { $0 == item })
+    }
+}
@@ -39,7 +39,7 @@ class ReplyCounter {
        
        counted.insert(event.id)
        
-        for reply in event.direct_replies(keypair) {
+        if let reply = event.direct_replies() {
            if event.pubkey == our_pubkey {
                self.our_replies[reply] = event
            }
@@ -79,7 +79,7 @@ enum Route: Hashable {
        case .AppearanceSettings(let settings):
            AppearanceSettingsView(damus_state: damusState, settings: settings)
        case .NotificationSettings(let settings):
-            NotificationSettingsView(settings: settings)
+            NotificationSettingsView(damus_state: damusState, settings: settings)
        case .ZapSettings(let settings):
            ZapSettingsView(settings: settings)
        case .TranslationSettings(let settings):
@@ -20,7 +20,7 @@ struct DMChatView: View, KeyboardReadable {
        ScrollViewReader { scroller in
            ScrollView {
                LazyVStack(alignment: .leading) {
-                    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
+                    ForEach(Array(zip(dms.events, dms.events.indices)).filter { should_show_event(state: damus_state, ev: $0.0)}, id: \.0.id) { (ev, ind) in
                        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))}
                    }
@@ -55,7 +55,7 @@ struct DirectMessagesView: View {
    
    func MaybeEvent(_ model: DirectMessageModel) -> some View {
        Group {
-            if let ev = model.events.last(where: { should_show_event(state: damus_state, ev: $0, keypair: damus_state.keypair) }) {
+            if let ev = model.events.last(where: { should_show_event(state: damus_state, ev: $0) }) {
                EventView(damus: damus_state, event: ev, pubkey: model.pubkey, options: options)
                    .onTapGesture {
                        self.model.set_active_dm_model(model)
@@ -13,18 +13,10 @@ struct ReplyPart: View {
    let keypair: Keypair
    let ndb: Ndb

-    var replying_to: NostrEvent? {
-        guard let note_ref = event.event_refs(keypair).first(where: { evref in evref.is_direct_reply != nil })?.is_direct_reply else {
-            return nil
-        }
-
-        return events.lookup(note_ref.note_id)
-    }
-
    var body: some View {
        Group {
-            if event_is_reply(event.event_refs(keypair)) {
-                ReplyDescription(event: event, replying_to: replying_to, ndb: ndb)
+            if let reply_ref = event.thread_reply()?.reply {
+                ReplyDescription(event: event, replying_to: events.lookup(reply_ref.note_id), ndb: ndb)
            } else {
                EmptyView()
            }
@@ -111,7 +111,7 @@ struct MenuItems: View {
            if event.known_kind != .dm {
                MuteDurationMenu { duration in
                    if let full_keypair = self.damus_state.keypair.to_full(),
-                       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)) {
+                       let new_mutelist_ev = toggle_from_mutelist(keypair: full_keypair, prev: damus_state.mutelist_manager.event, to_toggle: .thread(event.thread_id(), duration?.date_from_now)) {
                        damus_state.mutelist_manager.set_mutelist(new_mutelist_ev)
                        damus_state.postbox.send(new_mutelist_ev)
                    }
@@ -36,6 +36,7 @@ let test_longform_event = LongformEvent.parse(from: NostrEvent(
    keypair: test_keypair,
    kind: NostrKind.longform.rawValue,
    tags: [
+        ["d", UUID().uuidString],
        ["title", "What is WASTOIDS?"],
        ["summary", "WASTOIDS is an audio/visual feed, created by Sam Means..."],
        ["published_at", "1685638715"],
@@ -18,14 +18,6 @@ struct SelectedEventView: View {
    
    @StateObject var bar: ActionBarModel

-    var replying_to: NostrEvent? {
-        guard let note_ref = event.event_refs(damus.keypair).first(where: { evref in evref.is_direct_reply != nil })?.is_direct_reply else {
-            return nil
-        }
-
-        return damus.events.lookup(note_ref.note_id)
-    }
-    
    init(damus: DamusState, event: NostrEvent, size: EventViewKind) {
        self.damus = damus
        self.event = event
@@ -48,8 +40,8 @@ struct SelectedEventView: View {
                .minimumScaleFactor(0.75)
                .lineLimit(1)

-                if event_is_reply(event.event_refs(damus.keypair)) {
-                    ReplyDescription(event: event, replying_to: replying_to, ndb: damus.ndb)
+                if let reply_ref = event.thread_reply()?.reply {
+                    ReplyDescription(event: event, replying_to: damus.events.lookup(reply_ref.note_id), ndb: damus.ndb)
                        .padding(.horizontal)
                }

@@ -92,13 +92,24 @@ struct PostView: View {
    }
    
    func send_post() {
-        let refs = references.filter { ref in
-            if case .pubkey(let pk) = ref, filtered_pubkeys.contains(pk) {
-                return false
+        // don't add duplicate pubkeys but retain order
+        var pkset = Set<Pubkey>()
+
+        // we only want pubkeys really
+        let pks = references.reduce(into: Array<Pubkey>()) { acc, ref in
+            guard case .pubkey(let pk) = ref else {
+                return
            }
-            return true
+            
+            if pkset.contains(pk) || filtered_pubkeys.contains(pk) {
+                return
+            }
+
+            pkset.insert(pk)
+            acc.append(pk)
        }
-        let new_post = build_post(state: damus_state, post: self.post, action: action, uploadedMedias: uploadedMedias, references: refs)
+
+        let new_post = build_post(state: damus_state, post: self.post, action: action, uploadedMedias: uploadedMedias, pubkeys: pks)

        notify(.post(.post(new_post)))

@@ -604,7 +615,24 @@ private func isAlphanumeric(_ char: Character) -> Bool {
    return char.isLetter || char.isNumber
 }

-func build_post(state: DamusState, post: NSMutableAttributedString, action: PostAction, uploadedMedias: [UploadedMedia], references: [RefId]) -> NostrPost {
+func nip10_reply_tags(replying_to: NostrEvent, keypair: Keypair) -> [[String]] {
+    guard let nip10 = replying_to.thread_reply() else {
+        // we're replying to a post that isn't in a thread,
+        // just add a single reply-to-root tag
+        return [["e", replying_to.id.hex(), "", "root"]]
+    }
+
+    // otherwise use the root tag from the parent's nip10 reply and include the note
+    // that we are replying to's note id.
+    let tags = [
+        ["e", nip10.root.note_id.hex(), nip10.root.relay ?? "", "root"],
+        ["e", replying_to.id.hex(), "", "reply"]
+    ]
+
+    return tags
+}
+
+func build_post(state: DamusState, post: NSMutableAttributedString, action: PostAction, uploadedMedias: [UploadedMedia], pubkeys: [Pubkey]) -> NostrPost {
    post.enumerateAttributes(in: NSRange(location: 0, length: post.length), options: []) { attributes, range, stop in
        if let link = attributes[.link] as? String {
            let nextCharIndex = range.upperBound
@@ -634,20 +662,35 @@ func build_post(state: DamusState, post: NSMutableAttributedString, action: Post

    let imagesString = uploadedMedias.map { $0.uploadedURL.absoluteString }.joined(separator: " ")

-    var tags = uploadedMedias.compactMap { $0.metadata?.to_tag() }
-
    if !imagesString.isEmpty {
        content.append(" " + imagesString + " ")
    }

-    if case .quoting(let ev) = action {
+    var tags: [[String]] = []
+
+    switch action {
+    case .replying_to(let replying_to):
+        // start off with the reply tags
+        tags = nip10_reply_tags(replying_to: replying_to, keypair: state.keypair)
+
+    case .quoting(let ev):
        content.append(" nostr:" + bech32_note_id(ev.id))

        if let quoted_ev = state.events.lookup(ev.id) {
            tags.append(["p", quoted_ev.pubkey.hex()])
        }
+    case .posting(let postTarget):
+        break
+    }
+    
+    // include pubkeys
+    tags += pubkeys.map { pk in
+        ["p", pk.hex()]
    }

-    return NostrPost(content: content, references: references, kind: .text, tags: tags)
+    // append additional tags
+    tags += uploadedMedias.compactMap { $0.metadata?.to_tag() }
+
+    return NostrPost(content: content, kind: .text, tags: tags)
 }

@@ -72,7 +72,7 @@ struct FirstAidSettingsView: View {
            }
            
            if damus_state.contacts.event != nil {
-                Text(NSLocalizedString("We did not detect any issues that we can automatically fix for you. If you are having issues, please contact Damus support", comment: "Message indicating that no First Aid actions are available."))
+                Text("We did not detect any issues that we can automatically fix for you. If you are having issues, please contact Damus support: [support@damus.io](mailto:support@damus.io)", comment: "Message indicating that no First Aid actions are available.")
            }
        }
        .navigationTitle(NSLocalizedString("First Aid", comment: "Navigation title for first aid settings and tools"))
@@ -8,7 +8,9 @@
 import SwiftUI

 struct NotificationSettingsView: View {
+    let damus_state: DamusState
    @ObservedObject var settings: UserSettingsStore
+    @State var notification_mode_setting_error: String? = nil
    
    @Environment(\.dismiss) var dismiss
    
@@ -24,8 +26,60 @@ struct NotificationSettingsView: View {
        })
    }
    
+    func try_to_set_notifications_mode(new_value: UserSettingsStore.NotificationsMode) {
+        notification_mode_setting_error = nil
+        if new_value == .push {
+            Task {
+                do {
+                    try await damus_state.push_notification_client.send_token()
+                    settings.notifications_mode = new_value
+                }
+                catch {
+                    notification_mode_setting_error = String(format: NSLocalizedString("Error configuring push notifications with the server: %@", comment: "Error label shown when user tries to enable push notifications but something fails"), error.localizedDescription)
+                }
+            }
+        }
+        else {
+            Task {
+                do {
+                    try await damus_state.push_notification_client.revoke_token()
+                    settings.notifications_mode = new_value
+                }
+                catch {
+                    notification_mode_setting_error = String(format: NSLocalizedString("Error disabling push notifications with the server: %@", comment: "Error label shown when user tries to disable push notifications but something fails"), error.localizedDescription)
+                }
+            }
+        }
+    }
+    
    var body: some View {
        Form {
+            if settings.enable_experimental_push_notifications {
+                Section(
+                    header: Text("General", comment: "Section header for general damus notifications user configuration"),
+                    footer: VStack {
+                        if let notification_mode_setting_error {
+                            Text(notification_mode_setting_error)
+                                .foregroundStyle(.damusDangerPrimary)
+                        }
+                    }
+                ) {
+                    Picker(NSLocalizedString("Notifications mode", comment: "Prompt selection of the notification mode (Feature to switch between local notifications (generated from user's own phone) or push notifications (generated by Damus server)."),
+                        selection: Binding(
+                                get: { settings.notifications_mode },
+                                set: { newValue in
+                                    self.try_to_set_notifications_mode(new_value: newValue)
+                                }
+                        )
+                    ) {
+                        ForEach(UserSettingsStore.NotificationsMode.allCases, id: \.self) { notification_mode in
+                            Text(notification_mode.text_description())
+                                .tag(notification_mode.rawValue)
+                        }
+                    }
+                }
+            }
+            
            Section(header: Text("Local Notifications", comment: "Section header for damus local notifications user configuration")) {
                Toggle(NSLocalizedString("Zaps", comment: "Setting to enable Zap Local Notification"), isOn: $settings.zap_notification)
                    .toggleStyle(.switch)
@@ -65,6 +119,6 @@ struct NotificationSettingsView: View {

 struct NotificationSettings_Previews: PreviewProvider {
    static var previews: some View {
-        NotificationSettingsView(settings: UserSettingsStore())
+        NotificationSettingsView(damus_state: test_damus_state, settings: UserSettingsStore())
    }
 }
@@ -13,10 +13,10 @@ struct InnerTimelineView: View {
    let state: DamusState
    let filter: (NostrEvent) -> Bool

-    init(events: EventHolder, damus: DamusState, filter: @escaping (NostrEvent) -> Bool) {
+    init(events: EventHolder, damus: DamusState, filter: @escaping (NostrEvent) -> Bool, apply_mute_rules: Bool = true) {
        self.events = events
        self.state = damus
-        self.filter = filter
+        self.filter = apply_mute_rules ? { filter($0) && !damus.mutelist_manager.is_event_muted($0) } : filter
    }
    
    var event_options: EventViewOptions {
@@ -15,15 +15,15 @@ struct TimelineView<Content: View>: View {
    let show_friend_icon: Bool
    let filter: (NostrEvent) -> Bool
    let content: Content?
-    let debouncer: Debouncer
+    let apply_mute_rules: Bool

-    init(events: EventHolder, loading: Binding<Bool>, damus: DamusState, show_friend_icon: Bool, filter: @escaping (NostrEvent) -> Bool, content: (() -> Content)? = nil) {
+    init(events: EventHolder, loading: Binding<Bool>, damus: DamusState, show_friend_icon: Bool, filter: @escaping (NostrEvent) -> Bool, apply_mute_rules: Bool = true, content: (() -> Content)? = nil) {
        self.events = events
        self._loading = loading
        self.damus = damus
        self.show_friend_icon = show_friend_icon
        self.filter = filter
-        self.debouncer = Debouncer(interval: 0.5)
+        self.apply_mute_rules = apply_mute_rules
        self.content = content?()
    }

@@ -42,14 +42,12 @@ struct TimelineView<Content: View>: View {
                    .id("startblock")
                    .frame(height: 1)

-                InnerTimelineView(events: events, damus: damus, filter: loading ? { _ in true } : filter)
+                InnerTimelineView(events: events, damus: damus, filter: loading ? { _ in true } : filter, apply_mute_rules: self.apply_mute_rules)
                    .redacted(reason: loading ? .placeholder : [])
                    .shimmer(loading)
                    .disabled(loading)
                    .background(GeometryReader { proxy -> Color in
-                        debouncer.debounce_immediate {
-                            handle_scroll_queue(proxy, queue: self.events)
-                        }
+                        handle_scroll_queue(proxy, queue: self.events)
                        return Color.clear
                    })
            }
@@ -54,14 +54,12 @@ struct MainView: View {
        .onAppear {
            orientationTracker.setDeviceMajorAxis()
            keypair = get_saved_keypair()
-            appDelegate.keypair = keypair
        }
    }
 }

 class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDelegate {
-    var keypair: Keypair? = nil
-    var settings: UserSettingsStore? = nil
+    var state: DamusState? = nil
    
    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
        UNUserNotificationCenter.current().delegate = self
@@ -71,51 +69,13 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
    }
    
    func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
-        // Return if this feature is disabled
-        guard let settings = self.settings else { return }
-        if !settings.enable_experimental_push_notifications {
+        guard let state else {
            return
        }
        
-        // Send the device token and pubkey to the server
-        let token = deviceToken.map { String(format: "%02.2hhx", $0) }.joined()
-        
-        print("Received device token: \(token)")
-
-        guard let pubkey = keypair?.pubkey else {
-            return
+        Task {
+            try await state.push_notification_client.set_device_token(new_device_token: deviceToken)
        }
-
-        // Send those as JSON to the server
-        let json: [String: Any] = ["deviceToken": token, "pubkey": pubkey.hex()]
-
-        // create post request
-        let url = settings.send_device_token_to_localhost ? Constants.DEVICE_TOKEN_RECEIVER_TEST_URL : Constants.DEVICE_TOKEN_RECEIVER_PRODUCTION_URL
-        var request = URLRequest(url: url)
-        request.httpMethod = "POST"
-
-        // insert json data to the request
-        request.httpBody = try? JSONSerialization.data(withJSONObject: json, options: [])
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-
-        let task = URLSession.shared.dataTask(with: request) { data, response, error in
-            guard let data = data, error == nil else {
-                print(error?.localizedDescription ?? "No data")
-                return
-            }
-
-            if let response = response as? HTTPURLResponse, !(200...299).contains(response.statusCode) {
-                print("Unexpected status code: \(response.statusCode)")
-                return
-            }
-
-            let responseJSON = try? JSONSerialization.jsonObject(with: data, options: [])
-            if let responseJSON = responseJSON as? [String: Any] {
-                print(responseJSON)
-            }
-        }
-
-        task.resume()
    }

    // Handle the notification in the foreground state
@@ -9,6 +9,7 @@ import XCTest
@testable import damus

 final class AuthIntegrationTests: XCTestCase {
+    /*
    func testAuthIntegrationFilterNostrWine() {
        // Create relay pool and connect to `wss://filter.nostr.wine`
        let relay_url = RelayURL("wss://filter.nostr.wine")!
@@ -67,6 +68,7 @@ final class AuthIntegrationTests: XCTestCase {
        XCTAssertEqual(sent_msg["kind"] as! Int, 22242)
        XCTAssertEqual((sent_msg["tags"] as! [[String]]).first { $0[0] == "challenge" }![1], json_received[1] as! String)
    }
+     */

    func testAuthIntegrationRelayDamusIo() {
        // Create relay pool and connect to `wss://relay.damus.io`
@@ -10,15 +10,7 @@ import XCTest

 class LikeTests: XCTestCase {

-    override func setUpWithError() throws {
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-
-    override func tearDownWithError() throws {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-    }
-
-    func testLikeHasNotification() throws {
+    func testReactionTextNote() throws {
        let cindy = Pubkey(hex: "9d9181f0aea6500e1f360e07b9f37e25c72169b5158ae78df53f295272b6b71c")!
        let bob = Pubkey(hex: "218837fe8c94a66ae33af277bcbda45a0319e7726220cd76171b9dd1a468af91")!
        let liked = NostrEvent(content: "awesome #[0] post",
@@ -28,9 +20,30 @@ class LikeTests: XCTestCase {
        let like_ev = make_like_event(keypair: test_keypair_full, liked: liked)!

        XCTAssertTrue(like_ev.referenced_pubkeys.contains(test_keypair.pubkey))
-        XCTAssertTrue(like_ev.referenced_pubkeys.contains(cindy))
-        XCTAssertTrue(like_ev.referenced_pubkeys.contains(bob))
+        XCTAssertFalse(like_ev.referenced_pubkeys.contains(cindy))
+        XCTAssertFalse(like_ev.referenced_pubkeys.contains(bob))
        XCTAssertEqual(like_ev.last_refid()!, id)
+        XCTAssertTrue(like_ev.tags.allSatisfy { !$0[0].matches_char("a") })
+
+        let kindTag = try XCTUnwrap(like_ev.tags.first(where: { $0.count >= 2 && $0[0].matches_char("k") }))
+        XCTAssertTrue(kindTag[1].matches_str("1"))
+    }
+
+    func testReactionLongFormNote() throws {
+        let liked = test_longform_event.event
+        let id = liked.id
+        let like_ev = make_like_event(keypair: test_keypair_full, liked: liked)!
+
+        XCTAssertTrue(like_ev.referenced_pubkeys.contains(test_keypair.pubkey))
+        XCTAssertEqual(like_ev.last_refid()!, id)
+
+        let dTagValue = try XCTUnwrap(liked.tags.first { $0[0].matches_char("d") })
+        let aTag = try XCTUnwrap(like_ev.tags.first { $0[0].matches_char("a") })
+        XCTAssertTrue(aTag[1].matches_str("30023:\(test_keypair.pubkey.hex()):\(dTagValue[1])"))
+
+        let kindTag = try XCTUnwrap(like_ev.tags.first(where: { $0.count >= 2 && $0[0].matches_char("k") }))
+//        FIXME(tyiu) the assertion below fails for some reason even though in a different test, I was able to assert kind 1 just fine.
+//        XCTAssertTrue(kindTag[1].matches_str("30023"))
    }

    func testToReactionEmoji() {
@@ -25,7 +25,7 @@ func generate_test_damus_state(
        return profiles
    }()
    
-    let mutelist_manager = MutelistManager()
+    let mutelist_manager = MutelistManager(user_keypair: test_keypair)
    let damus = DamusState(pool: pool,
                           keypair: test_keypair,
                           likes: .init(our_pubkey: our_pubkey),
@@ -0,0 +1,43 @@
+//
+//  MutingTests.swift
+//  damusTests
+//
+//  Created by Daniel D’Aquino on 2024-05-06.
+//
+import Foundation
+
+import XCTest
+@testable import damus
+
+final class MutingTests: XCTestCase {
+    func testWordMuting() {
+        // Setup some test data
+        let test_note = NostrEvent(
+            content: "Nostr is the super app. Because it’s actually an ecosystem of apps, all of which make each other better. People haven’t grasped that yet. They will when it’s more accessible and onboarding is more straightforward and intuitive.",
+            keypair: jack_keypair,
+            createdAt: UInt32(Date().timeIntervalSince1970 - 100)
+        )!
+        let spammy_keypair = generate_new_keypair().to_keypair()
+        let spammy_test_note = NostrEvent(
+            content: "Some spammy airdrop just arrived! Why stack sats when you can get scammed instead with some random coin? Call 1-800-GET-SCAMMED to claim your airdrop today!",
+            keypair: spammy_keypair,
+            createdAt: UInt32(Date().timeIntervalSince1970 - 100)
+        )!
+        
+        let mute_item: MuteItem = .word("airdrop", nil)
+        let existing_mutelist = test_damus_state.mutelist_manager.event
+
+        guard
+            let full_keypair = test_damus_state.keypair.to_full(),
+            let mutelist = create_or_update_mutelist(keypair: full_keypair, mprev: existing_mutelist, to_add: mute_item)
+        else {
+            return
+        }
+
+        test_damus_state.mutelist_manager.set_mutelist(mutelist)
+        test_damus_state.postbox.send(mutelist)
+        
+        XCTAssert(test_damus_state.mutelist_manager.is_event_muted(spammy_test_note))
+        XCTAssertFalse(test_damus_state.mutelist_manager.is_event_muted(test_note))
+    }
+}
@@ -0,0 +1,257 @@
+//
+//  NIP10Tests.swift
+//  damusTests
+//
+//  Created by William Casarin on 2024-04-25.
+//
+
+import XCTest
+@testable import damus
+
+final class NIP10Tests: XCTestCase {
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testExample() throws {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+        // Any test you write for XCTest can be annotated as throws and async.
+        // Mark your test throws to produce an unexpected failure when your test encounters an uncaught error.
+        // Mark your test async to allow awaiting for asynchronous code to complete. Check the results with assertions afterwards.
+    }
+
+    func test_root_with_mention_nip10() {
+        let root_id_hex = "a32d70d331f4bea7a859ac71d85a9b4e0c2d1fa9aaf7237a17f85a6227f52fdb"
+        let root_id = NoteId(hex: root_id_hex)!
+        let mention_hex = "e47b7e156acec6881c89a53f1a9e349a982024245e2c398f8a5b4973b7a89ab3"
+        let mention_id = NoteId(hex: mention_hex)!
+
+        let tags =
+            [["e", root_id_hex,"","root"],
+             ["e", mention_hex,"","mention"],
+             ["p","c4eabae1be3cf657bc1855ee05e69de9f059cb7a059227168b80b89761cbc4e0"],
+             ["p","604e96e099936a104883958b040b47672e0f048c98ac793f37ffe4c720279eb2"],
+             ["p","ffd375eb40eb486656a028edbc83825f58ff0d5c4a1ba22fe7745d284529ed08","","mention"],
+             ["q","e47b7e156acec6881c89a53f1a9e349a982024245e2c398f8a5b4973b7a89ab3"]
+            ]
+
+        let note = NdbNote(content: "hi", keypair: test_keypair, kind: 1, tags: tags)!
+        let thread = ThreadReply(tags: note.tags)
+
+        XCTAssertNotNil(thread)
+        guard let thread else { return }
+
+        XCTAssertEqual(thread.root.note_id, root_id)
+        XCTAssertEqual(thread.reply.note_id, root_id)
+        XCTAssertEqual(thread.mention?.ref.note_id, mention_id)
+    }
+
+    func test_new_nip10() {
+        let root_note_id_hex = "7c7d37bc8c04d2ec65cbc7d9275253e6b5cc34b5d10439f158194a3feefa8d52"
+        let direct_reply_hex = "7c7d37bc8c04d2ec65cbc7d9275253e6b5cc34b5d10439f158194a3feefa8d51"
+        let reply_hex = "7c7d37bc8c04d2ec65cbc7d9275253e6b5cc34b5d10439f158194a3feefa8d53"
+        let mention_hex = "7c7d37bc8c04d2ec65cbc7d9275253e6b5cc34b5d10439f158194a3feefa8d54"
+
+        let tags = [
+            ["e", mention_hex, "", "mention"],
+            ["e", direct_reply_hex, "", "reply"],
+            ["e", root_note_id_hex, "", "root"],
+            ["e", reply_hex, "", "reply"],
+        ]
+
+        let root_note_id = NoteId(hex: root_note_id_hex)!
+        let reply_id = NoteId(hex: reply_hex)!
+        let mention_id = NoteId(hex: mention_hex)!
+
+        let note = NdbNote(content: "hi", keypair: test_keypair, kind: 1, tags: tags)!
+        let tr = interp_event_refs_without_mentions_ndb(note.referenced_noterefs)
+
+        XCTAssertEqual(tr?.root.note_id, root_note_id)
+        XCTAssertEqual(tr?.reply.note_id, reply_id)
+        XCTAssertEqual(tr?.mention?.ref.note_id, mention_id)
+    }
+
+    func test_repost_root() {
+        let mention_hex = "7c7d37bc8c04d2ec65cbc7d9275253e6b5cc34b5d10439f158194a3feefa8d52"
+        let tags = [
+            ["e", mention_hex, "", "mention"],
+        ]
+
+        let mention_id = NoteId(hex: mention_hex)!
+        let note = NdbNote(content: "hi", keypair: test_keypair, kind: 1, tags: tags)!
+        let tr = note.thread_reply()
+
+        XCTAssertNil(tr)
+    }
+    
+    func test_direct_reply_old_nip10() {
+        let root_note_id_hex = "7c7d37bc8c04d2ec65cbc7d9275253e6b5cc34b5d10439f158194a3feefa8d52"
+        let tags = [
+            ["e", root_note_id_hex],
+        ]
+
+        let root_note_id = NoteId(hex: root_note_id_hex)!
+
+        let note = NdbNote(content: "hi", keypair: test_keypair, kind: 1, tags: tags)!
+        let tr = note.thread_reply()
+
+        XCTAssertNotNil(tr)
+        guard let tr else { return }
+
+        XCTAssertEqual(tr.root.note_id, root_note_id)
+        XCTAssertEqual(tr.reply.note_id, root_note_id)
+        XCTAssertEqual(tr.is_reply_to_root, true)
+    }
+
+    func test_direct_reply_new_nip10() {
+        let root_note_id_hex = "7c7d37bc8c04d2ec65cbc7d9275253e6b5cc34b5d10439f158194a3feefa8d52"
+        let tags = [
+            ["e", root_note_id_hex, "", "root"],
+        ]
+
+        let root_note_id = NoteId(hex: root_note_id_hex)!
+
+        let note = NdbNote(content: "hi", keypair: test_keypair, kind: 1, tags: tags)!
+        let tr = note.thread_reply()
+        XCTAssertNotNil(tr)
+        guard let tr else { return }
+
+        XCTAssertEqual(tr.root.note_id, root_note_id)
+        XCTAssertEqual(tr.reply.note_id, root_note_id)
+        XCTAssertNil(tr.mention)
+        XCTAssertEqual(tr.is_reply_to_root, true)
+    }
+    
+    // seen in the wild by the gleasonator
+    func test_single_marker() {
+        let root_note_id_hex = "7c7d37bc8c04d2ec65cbc7d9275253e6b5cc34b5d10439f158194a3feefa8d52"
+        let tags = [
+            ["e", root_note_id_hex, "", "reply"],
+        ]
+        
+        let root_note_id = NoteId(hex: root_note_id_hex)!
+        let note = NdbNote(content: "hi", keypair: test_keypair, kind: 1, tags: tags)!
+        let tr = note.thread_reply()
+        XCTAssertNotNil(tr)
+        guard let tr else { return }
+
+        XCTAssertNil(tr.mention)
+        XCTAssertEqual(tr.root.note_id, root_note_id)
+        XCTAssertEqual(tr.reply.note_id, root_note_id)
+        XCTAssertEqual(tr.is_reply_to_root, true)
+    }
+
+    func test_marker_reply() {
+        let note_json = """
+        {
+          "pubkey": "5b0183ab6c3e322bf4d41c6b3aef98562a144847b7499543727c5539a114563e",
+          "content": "Can’t zap you btw",
+          "id": "a8dc8b74852d7ad114d5d650b2125459c0cba3c1fdcaaf527e03f24082e11ab3",
+          "created_at": 1715275773,
+          "sig": "4ee5d8f954c6c087ce51ad02d30dd226eea939cd9ef4e8a8ce4bfaf3aba0a852316cfda83ce3fc9a3d98392a738e7c6b036a3b2aced1392db1be3ca190835a17",
+          "kind": 1,
+          "tags": [
+            [
+              "e",
+              "1bb940ce0ba0d4a3b2a589355d908498dcd7452f941cf520072218f7e6ede75e",
+              "wss://relay.nostrplebs.com",
+              "reply"
+            ],
+            [
+              "p",
+              "6e75f7972397ca3295e0f4ca0fbc6eb9cc79be85bafdd56bd378220ca8eee74e"
+            ],
+            [
+              "e",
+              "00152d2945459fb394fed2ea95af879c903c4ec42d96327a739fa27c023f20e0",
+              "wss://nostr.mutinywallet.com/",
+              "root"
+            ]
+          ]
+        }
+        """;
+
+        let replying_to_hex = "a8dc8b74852d7ad114d5d650b2125459c0cba3c1fdcaaf527e03f24082e11ab3"
+        let pk = Pubkey(hex: "5b0183ab6c3e322bf4d41c6b3aef98562a144847b7499543727c5539a114563e")!
+        //let last_reply_hex = "1bb940ce0ba0d4a3b2a589355d908498dcd7452f941cf520072218f7e6ede75e"
+        let note = decode_nostr_event_json(json: note_json)!
+        let reply = build_post(state: test_damus_state, post: .init(string: "hello"), action: .replying_to(note), uploadedMedias: [], pubkeys: [pk] + note.referenced_pubkeys.map({pk in pk}))
+        let root_hex = "00152d2945459fb394fed2ea95af879c903c4ec42d96327a739fa27c023f20e0"
+
+        XCTAssertEqual(reply.tags,
+            [
+                ["e", root_hex, "wss://nostr.mutinywallet.com/", "root"],
+                ["e", replying_to_hex, "", "reply"],
+                ["p", "5b0183ab6c3e322bf4d41c6b3aef98562a144847b7499543727c5539a114563e"],
+                ["p", "6e75f7972397ca3295e0f4ca0fbc6eb9cc79be85bafdd56bd378220ca8eee74e"],
+            ])
+    }
+
+    func test_mixed_nip10() {
+
+        let root_note_id_hex = "27e71cf53299dafb5dc7bcc0a078357418a4375cb1097bf5184662493f79a627"
+        let reply_hex = "1a616998552cf76e9786f76ac68f6104cdae46377330735c68bfe0b9426d2fa8"
+
+        let tags = [
+            [ "e", root_note_id_hex, "", "root" ],
+            [ "e", "f99046bd87be7508d55e139de48517c06ef90830d77a5d3213df858d77bb2f8f" ],
+            [ "e", reply_hex, "", "reply" ],
+            [ "p", "3efdaebb1d8923ebd99c9e7ace3b4194ab45512e2be79c1b7d68d9243e0d2681" ],
+            [ "p", "8ea485266b2285463b13bf835907161c22bb3da1e652b443db14f9cee6720a43" ],
+            [ "p", "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245" ]
+        ]
+        
+
+        let root_note_id = NoteId(hex: root_note_id_hex)!
+        let reply_id = NoteId(hex: reply_hex)!
+
+        let note = NdbNote(content: "hi", keypair: test_keypair, kind: 1, tags: tags)!
+        let tr = note.thread_reply()
+        XCTAssertNotNil(tr)
+        guard let tr else { return }
+
+        XCTAssertEqual(tr.root.note_id, root_note_id)
+        XCTAssertEqual(tr.reply.note_id, reply_id)
+        XCTAssertEqual(tr.is_reply_to_root, false)
+    }
+
+    func test_deprecated_nip10() {
+        let root_note_id_hex = "7c7d37bc8c04d2ec65cbc7d9275253e6b5cc34b5d10439f158194a3feefa8d52"
+        let direct_reply_hex = "7c7d37bc8c04d2ec65cbc7d9275253e6b5cc34b5d10439f158194a3feefa8d51"
+        let reply_hex = "7c7d37bc8c04d2ec65cbc7d9275253e6b5cc34b5d10439f158194a3feefa8d53"
+        let tags = [
+            ["e", root_note_id_hex],
+            ["e", direct_reply_hex],
+            ["e", reply_hex],
+        ]
+
+        let root_note_id = NoteId(hex: root_note_id_hex)!
+        let direct_reply_id = NoteId(hex: direct_reply_hex)!
+        let reply_id = NoteId(hex: reply_hex)!
+
+        let note = NdbNote(content: "hi", keypair: test_keypair, kind: 1, tags: tags)!
+        let tr = note.thread_reply()
+        XCTAssertNotNil(tr)
+        guard let tr else { return }
+
+        XCTAssertEqual(tr.root.note_id, root_note_id)
+        XCTAssertEqual(tr.reply.note_id, reply_id)
+        XCTAssertEqual(tr.is_reply_to_root, false)
+    }
+
+
+
+    func testPerformanceExample() throws {
+        // This is an example of a performance test case.
+        self.measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+
+}
@@ -0,0 +1,77 @@
+//
+//  NostrFilterTests.swift
+//  damusTests
+//
+//  Created by Daniel D’Aquino on 2024-05-10.
+//
+
+import XCTest
+@testable import damus
+
+final class NostrFilterTests: XCTestCase {
+    func testChunkedWithPubKeys() {
+        // Given a NostrFilter with a list of pubkeys
+        let test_pubkey_1 = Pubkey(hex: "760f108754eb415561239d4079e71766d87e23f7e71c8e5b00d759e54dd8d082")!
+        let test_pubkey_2 = Pubkey(hex: "065eab63e939ea2f2f72f2305886b13e5e301302da67b5fe8a18022b278fe872")!
+        let test_pubkey_3 = Pubkey(hex: "aa146d7c6618ebe993702a74c561f54fc046c8a16e388b828cb2f631a1ed9602")!
+        let test_pubkey_4 = Pubkey(hex: "2f7108dcd33fb484be3e09cea24a1e96868fbc0842e691ca19db63781801089e")!
+        let test_pubkey_5 = Pubkey(hex: "1cc7c458e6b565a856d7c3791f4eb5ca5890b1f2433f452ed7a917f9aa0e5250")!
+        let test_pubkey_6 = Pubkey(hex: "2ee1f46a847b6613c33fd766db1e64c7f727c63774fa3ee952261d2c03b81cf2")!
+        let test_pubkey_7 = Pubkey(hex: "214664a7ca3236b9dd5f76550d322f390fd70cc12908a2e3ff2cdf50085d4ef2")!
+        let test_pubkey_8 = Pubkey(hex: "40255b02f3d8ccd6178d50f5ce1c1ac2867b3d919832176957b021c1816fce2f")!
+        let pubkeys: [Pubkey] = [test_pubkey_1, test_pubkey_2, test_pubkey_3, test_pubkey_4]
+        let authors: [Pubkey] = [test_pubkey_5, test_pubkey_6, test_pubkey_7, test_pubkey_8]
+        let filter = NostrFilter(
+            pubkeys: pubkeys,
+            authors: authors
+        )
+        
+        let chunked_pubkeys_filters_size_2 = filter.chunked(on: .pubkeys, into: 2)
+        XCTAssertEqual(chunked_pubkeys_filters_size_2.count, 2)
+        XCTAssertEqual(chunked_pubkeys_filters_size_2[0].pubkeys, [test_pubkey_1, test_pubkey_2])
+        XCTAssertEqual(chunked_pubkeys_filters_size_2[1].pubkeys, [test_pubkey_3, test_pubkey_4])
+        XCTAssertEqual(chunked_pubkeys_filters_size_2[0].authors, authors)
+        XCTAssertEqual(chunked_pubkeys_filters_size_2[1].authors, authors)
+        
+        let chunked_pubkeys_filters_size_3 = filter.chunked(on: .pubkeys, into: 3)
+        XCTAssertEqual(chunked_pubkeys_filters_size_3.count, 2)
+        XCTAssertEqual(chunked_pubkeys_filters_size_3[0].pubkeys, [test_pubkey_1, test_pubkey_2, test_pubkey_3])
+        XCTAssertEqual(chunked_pubkeys_filters_size_3[1].pubkeys, [test_pubkey_4])
+        XCTAssertEqual(chunked_pubkeys_filters_size_3[0].authors, authors)
+        XCTAssertEqual(chunked_pubkeys_filters_size_3[1].authors, authors)
+        
+        let chunked_pubkeys_filters_size_4 = filter.chunked(on: .pubkeys, into: 4)
+        XCTAssertEqual(chunked_pubkeys_filters_size_4.count, 1)
+        XCTAssertEqual(chunked_pubkeys_filters_size_4[0].pubkeys, [test_pubkey_1, test_pubkey_2, test_pubkey_3, test_pubkey_4])
+        XCTAssertEqual(chunked_pubkeys_filters_size_4[0].authors, authors)
+        
+        let chunked_pubkeys_filters_size_5 = filter.chunked(on: .pubkeys, into: 5)
+        XCTAssertEqual(chunked_pubkeys_filters_size_5.count, 1)
+        XCTAssertEqual(chunked_pubkeys_filters_size_5[0].pubkeys, [test_pubkey_1, test_pubkey_2, test_pubkey_3, test_pubkey_4])
+        XCTAssertEqual(chunked_pubkeys_filters_size_5[0].authors, authors)
+        
+        let chunked_authors_filters_size_2 = filter.chunked(on: .authors, into: 2)
+        XCTAssertEqual(chunked_authors_filters_size_2.count, 2)
+        XCTAssertEqual(chunked_authors_filters_size_2[0].authors, [test_pubkey_5, test_pubkey_6])
+        XCTAssertEqual(chunked_authors_filters_size_2[1].authors, [test_pubkey_7, test_pubkey_8])
+        XCTAssertEqual(chunked_authors_filters_size_2[0].pubkeys, pubkeys)
+        XCTAssertEqual(chunked_authors_filters_size_2[1].pubkeys, pubkeys)
+
+        let chunked_authors_filters_size_3 = filter.chunked(on: .authors, into: 3)
+        XCTAssertEqual(chunked_authors_filters_size_3.count, 2)
+        XCTAssertEqual(chunked_authors_filters_size_3[0].authors, [test_pubkey_5, test_pubkey_6, test_pubkey_7])
+        XCTAssertEqual(chunked_authors_filters_size_3[1].authors, [test_pubkey_8])
+        XCTAssertEqual(chunked_authors_filters_size_3[0].pubkeys, pubkeys)
+        XCTAssertEqual(chunked_authors_filters_size_3[1].pubkeys, pubkeys)
+        
+        let chunked_authors_filters_size_4 = filter.chunked(on: .authors, into: 4)
+        XCTAssertEqual(chunked_authors_filters_size_4.count, 1)
+        XCTAssertEqual(chunked_authors_filters_size_4[0].authors, [test_pubkey_5, test_pubkey_6, test_pubkey_7, test_pubkey_8])
+        XCTAssertEqual(chunked_authors_filters_size_4[0].pubkeys, pubkeys)
+        
+        let chunked_authors_filters_size_5 = filter.chunked(on: .authors, into: 5)
+        XCTAssertEqual(chunked_authors_filters_size_5.count, 1)
+        XCTAssertEqual(chunked_authors_filters_size_5[0].authors, [test_pubkey_5, test_pubkey_6, test_pubkey_7, test_pubkey_8])
+        XCTAssertEqual(chunked_authors_filters_size_5[0].pubkeys, pubkeys)
+    }
+}
@@ -18,24 +18,6 @@ class ReplyTests: XCTestCase {
        // Put teardown code here. This method is called after the invocation of each test method in the class.
    }
    
-    func testMentionIsntReply() throws {
-        let evid = NoteId(hex: "4090a9017a2beac3f17795d1aafb80d9f2b9eda97e4738501082ed5c927be014")!
-        let content = "this is #[0] a mention"
-        let tags = [evid.tag]
-        let ev = NostrEvent(content: content, keypair: test_keypair, tags: tags)!
-        let blocks = parse_note_content(content: .init(note: ev, keypair: test_keypair)).blocks
-        let event_refs = interpret_event_refs(blocks: blocks, tags: ev.tags)
-
-        XCTAssertEqual(event_refs.count, 1)
-        
-        let ref = event_refs[0]
-        
-        XCTAssertNil(ref.is_reply)
-        XCTAssertNil(ref.is_thread_id)
-        XCTAssertNil(ref.is_direct_reply)
-        XCTAssertEqual(ref.is_mention, .some(.init(note_id: evid)))
-    }
-    
    func testAtAtEnd() {
        let content = "what @"
        let blocks = parse_post_blocks(content: content)
@@ -70,49 +52,20 @@ class ReplyTests: XCTestCase {
        XCTAssertEqual(blocks[2].asHashtag, "nope")
    }
    
-    func testRootReplyWithMention() throws {
-        let content = "this is #[1] a mention"
-        let thread_id = NoteId(hex: "c75e5cbafbefd5de2275f831c2a2386ea05ec5e5a78a5ccf60d467582db48945")!
-        let mentioned_id = NoteId(hex: "5a534797e8cd3b9f4c1cf63e20e48bd0e8bd7f8c4d6353fbd576df000f6f54d3")!
-        let tags = [thread_id.tag, mentioned_id.tag]
-        let ev = NostrEvent(content: content, keypair: test_keypair, tags: tags)!
-        let blocks = parse_note_content(content: .init(note: ev, keypair: test_keypair)).blocks
-        let event_refs = interpret_event_refs(blocks: blocks, tags: ev.tags)
-
-        XCTAssertEqual(event_refs.count, 2)
-        XCTAssertNotNil(event_refs[0].is_reply)
-        XCTAssertNotNil(event_refs[0].is_thread_id)
-        XCTAssertNotNil(event_refs[0].is_reply)
-        XCTAssertNotNil(event_refs[0].is_direct_reply)
-        XCTAssertEqual(event_refs[0].is_reply, .some(NoteRef(note_id: thread_id)))
-        XCTAssertEqual(event_refs[0].is_thread_id, .some(NoteRef(note_id: thread_id)))
-        XCTAssertNotNil(event_refs[1].is_mention)
-        XCTAssertEqual(event_refs[1].is_mention, .some(NoteRef(note_id: mentioned_id)))
-    }
-    
    func testEmptyMention() throws {
        let content = "this is some & content"
        let ev = NostrEvent(content: content, keypair: test_keypair, tags: [])!
        let blocks = parse_note_content(content: .init(note: ev, keypair: test_keypair)).blocks
        let post_blocks = parse_post_blocks(content: content)
        let post_tags = make_post_tags(post_blocks: post_blocks, tags: [])
-        let event_refs = interpret_event_refs(blocks: blocks, tags: ev.tags)
+        let tr = interpret_event_refs(tags: ev.tags)

-        XCTAssertEqual(event_refs.count, 0)
+        XCTAssertNil(tr)
        XCTAssertEqual(post_tags.blocks.count, 1)
        XCTAssertEqual(post_tags.tags.count, 0)
        XCTAssertEqual(post_blocks.count, 1)
    }

-    func testManyMentions() throws {
-        let content = "#[10]"
-        let tags: [[String]] = [[],[],[],[],[],[],[],[],[],[],["p", "3e999f94e2cb34ef44a64b351141ac4e51b5121b2d31aed4a6c84602a1144692"]]
-        let ev = NostrEvent(content: content, keypair: test_keypair, tags: tags)!
-        let blocks = parse_note_content(content: .init(note: ev, keypair: test_keypair)).blocks
-        let mentions = blocks.filter { $0.asMention != nil }
-        XCTAssertEqual(mentions.count, 1)
-    }
-
    func testNewlineMentions() throws {
        let bech32_pk = "npub1xtscya34g58tk0z605fvr788k263gsu6cy9x0mhnm87echrgufzsevkk5s"
        let pk = bech32_pubkey_decode(bech32_pk)!
@@ -123,7 +76,7 @@ class ReplyTests: XCTestCase {
        post.append(user_tag_attr_string(profile: profile, pubkey: pk))
        post.append(.init(string: "\n"))

-        let post_note = build_post(state: test_damus_state, post: post, action: .posting(.none), uploadedMedias: [], references: [.pubkey(pk)])
+        let post_note = build_post(state: test_damus_state, post: post, action: .posting(.none), uploadedMedias: [], pubkeys: [pk])

        let expected_render = "nostr:\(pk.npub)\nnostr:\(pk.npub)"
        XCTAssertEqual(post_note.content, expected_render)
@@ -145,17 +98,12 @@ class ReplyTests: XCTestCase {
        let reply_id = NoteId(hex: "80093e9bdb495728f54cda2bad4aed096877189552b3d41264e73b9a9595be22")!
        let tags = [thread_id.tag, reply_id.tag]
        let ev = NostrEvent(content: content, keypair: test_keypair, tags: tags)!
-        let blocks = parse_note_content(content: .init(note: ev, keypair: test_keypair)).blocks
-        let event_refs = interpret_event_refs(blocks: blocks, tags: ev.tags)
+        let tr = interpret_event_refs(tags: ev.tags)
+        XCTAssertNotNil(tr)
+        guard let tr else { return }

-        XCTAssertEqual(event_refs.count, 2)
-        let r1 = event_refs[0]
-        let r2 = event_refs[1]
-        
-        XCTAssertEqual(r1.is_thread_id, .some(.note_id(thread_id)))
-        XCTAssertEqual(r2.is_reply, .some(.note_id(reply_id)))
-        XCTAssertEqual(r2.is_direct_reply, .some(.note_id(reply_id)))
-        XCTAssertNil(r1.is_direct_reply)
+        XCTAssertEqual(tr.root.note_id, thread_id)
+        XCTAssertEqual(tr.reply.note_id, reply_id)
    }
    
    func testRootReply() throws {
@@ -163,16 +111,14 @@ class ReplyTests: XCTestCase {
        let thread_id = NoteId(hex: "53f60f5114c06f069ffe9da2bc033e533d09cae44d37a8462154a663771a4ce6")!
        let tags = [thread_id.tag]
        let ev = NostrEvent(content: content, keypair: test_keypair, tags: tags)!
-        let blocks = parse_note_content(content: .content(ev.content,nil)).blocks
-        let event_refs = interpret_event_refs(blocks: blocks, tags: ev.tags)
+        let tr = interpret_event_refs(tags: ev.tags)

-        XCTAssertEqual(event_refs.count, 1)
-        let r = event_refs[0]
-        
-        XCTAssertEqual(r.is_direct_reply, .some(.note_id(thread_id)))
-        XCTAssertEqual(r.is_reply, .some(.note_id(thread_id)))
-        XCTAssertEqual(r.is_thread_id, .some(.note_id(thread_id)))
-        XCTAssertNil(r.is_mention)
+        XCTAssertNotNil(tr)
+        guard let tr else { return }
+
+        XCTAssertEqual(tr.root.note_id, thread_id)
+        XCTAssertEqual(tr.reply.note_id, thread_id)
+        XCTAssertNil(tr.mention)
    }

    func testAdjacentComposedMention() throws {
@@ -262,28 +208,6 @@ class ReplyTests: XCTestCase {
        XCTAssertEqual(new_post.string, "cc @jb55 ")
    }

-    func testNoReply() throws {
-        let content = "this is a #[0] reply"
-        let ev = NostrEvent(content: content, keypair: test_keypair, tags: [])!
-        let blocks = parse_note_content(content: .init(note: ev, keypair: test_keypair)).blocks
-        let event_refs = interpret_event_refs(blocks: blocks, tags:ev.tags)
-
-        XCTAssertEqual(event_refs.count, 0)
-    }
-    
-    func testParseMention() throws {
-        let note_id = NoteId(hex: "53f60f5114c06f069ffe9da2bc033e533d09cae44d37a8462154a663771a4ce6")!
-        let tags = [note_id.tag]
-        let ev = NostrEvent(content: "this is #[0] a mention", keypair: test_keypair, tags: tags)!
-        let parsed = parse_note_content(content: .init(note: ev, keypair: test_keypair)).blocks
-
-        XCTAssertNotNil(parsed)
-        XCTAssertEqual(parsed.count, 3)
-        XCTAssertEqual(parsed[0].asText, "this is ")
-        XCTAssertNotNil(parsed[1].asMention)
-        XCTAssertEqual(parsed[2].asText, " a mention")
-    }
-    
    func testEmptyPostReference() throws {
        let parsed = parse_post_blocks(content: "")
        XCTAssertEqual(parsed.count, 0)
@@ -315,7 +239,7 @@ class ReplyTests: XCTestCase {
        let pk = Pubkey(hex: "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245")!
        let content = "this is a @\(pk.npub) mention"
        let blocks = parse_post_blocks(content: content)
-        let post = NostrPost(content: content, references: [.event(evid)])
+        let post = NostrPost(content: content, tags: [["e", evid.hex()]])
        let ev = post_to_event(post: post, keypair: test_keypair_full)!

        XCTAssertEqual(ev.tags.count, 2)
@@ -330,7 +254,7 @@ class ReplyTests: XCTestCase {
        let nsec = "nsec1jmzdz7d0ldqctdxwm5fzue277ttng2pk28n2u8wntc2r4a0w96ssnyukg7"
        let content = "this is a @\(nsec) mention"
        let blocks = parse_post_blocks(content: content)
-        let post = NostrPost(content: content, references: [.event(evid)])
+        let post = NostrPost(content: content, tags: [["e", evid.hex()]])
        let ev = post_to_event(post: post, keypair: test_keypair_full)!

        XCTAssertEqual(ev.tags.count, 2)
@@ -344,13 +268,13 @@ class ReplyTests: XCTestCase {
        let thread_id = NoteId(hex: "a250fc93570c3e87f9c9b08d6b3ef7b8e05d346df8a52c69e30ffecdb178fb9e")!
        let reply_id = NoteId(hex: "9a180a10f16dac9566543ad1fc29616aab272b0cf123ab5d58843e16f4ef03a3")!

-        let refs: [RefId]  = [
-            .event(thread_id),
-            .event(reply_id),
-            .pubkey(pubkey)
+        let tags = [
+            ["e", thread_id.hex()],
+            ["e", reply_id.hex()],
+            ["p", pubkey.hex()]
        ]

-        let post = NostrPost(content: "this is a (@\(pubkey.npub)) mention", references: refs)
+        let post = NostrPost(content: "this is a (@\(pubkey.npub)) mention", tags: tags)
        let ev = post_to_event(post: post, keypair: test_keypair_full)!
        
        XCTAssertEqual(ev.content, "this is a (nostr:\(pubkey.npub)) mention")
@@ -442,14 +366,4 @@ class ReplyTests: XCTestCase {
        XCTAssertEqual(t2, " event mention")
    }
    
-    func testParseInvalidMention() throws {
-        let parsed = parse_note_content(content: .content("this is #[0] a mention",nil)).blocks
-
-        XCTAssertNotNil(parsed)
-        XCTAssertEqual(parsed.count, 3)
-        XCTAssertEqual(parsed[0].asText, "this is ")
-        XCTAssertEqual(parsed[1].asText, "#[0]")
-        XCTAssertEqual(parsed[2].asText, " a mention")
-    }
-
 }
@@ -192,7 +192,7 @@ class damusTests: XCTestCase {
     */

    func testMakeHashtagPost() {
-        let post = NostrPost(content: "#damus some content #bitcoin derp #かっこいい wow", references: [])
+        let post = NostrPost(content: "#damus some content #bitcoin derp #かっこいい wow", tags: [])
        let ev = post_to_event(post: post, keypair: test_keypair_full)!

        XCTAssertEqual(ev.tags.count, 3)
@@ -269,7 +269,7 @@ class damusTests: XCTestCase {
 }

 private func createEventFromContentString(_ content: String) -> NostrEvent {
-    let post = NostrPost(content: content, references: [])
+    let post = NostrPost(content: content, tags: [])
    guard let ev = post_to_event(post: post, keypair: test_keypair_full) else {
        XCTFail("Could not create event")
        return test_note
@@ -280,6 +280,17 @@ extension NdbNote {
        return kind == 1 || kind == 42 || kind == 30023
    }

+    var is_non_parameterized_replaceable: Bool {
+        switch kind {
+        case 10000..<20000, 0, 3: return true
+        default: return false
+        }
+    }
+
+    var is_parameterized_replaceable: Bool {
+        (30000..<40000).contains(kind)
+    }
+
    var is_quote_repost: NoteId? {
        guard kind == 1, let quoted_note_id = referenced_quote_ids.first else {
            return nil
@@ -340,9 +351,8 @@ extension NdbNote {
        References<RefId>(tags: self.tags)
    }

-    func event_refs(_ keypair: Keypair) -> [EventRef] {
-        let refs = interpret_event_refs_ndb(blocks: self.blocks(keypair).blocks, tags: self.tags)
-        return refs
+    func thread_reply() -> ThreadReply? {
+        ThreadReply(tags: self.tags)
    }

    func get_content(_ keypair: Keypair) -> String {
@@ -388,23 +398,17 @@ extension NdbNote {
        return dec
    }

-    public func direct_replies(_ keypair: Keypair) -> [NoteId] {
-        return event_refs(keypair).reduce(into: []) { acc, evref in
-            if let direct_reply = evref.is_direct_reply {
-                acc.append(direct_reply.note_id)
-            }
-        }
+    public func direct_replies() -> NoteId? {
+        return thread_reply()?.reply.note_id
    }

    // NDBTODO: just use Id
-    public func thread_id(keypair: Keypair) -> NoteId {
-        for ref in event_refs(keypair) {
-            if let thread_id = ref.is_thread_id {
-                return thread_id.note_id
-            }
+    public func thread_id() -> NoteId {
+        guard let root = self.thread_reply()?.root else {
+            return self.id
        }

-        return self.id
+        return root.note_id
    }

    public func last_refid() -> NoteId? {
@@ -428,8 +432,8 @@ extension NdbNote {
    }
     */

-    func is_reply(_ keypair: Keypair) -> Bool {
-        return event_is_reply(self.event_refs(keypair))
+    func is_reply() -> Bool {
+        return thread_reply() != nil
    }

    func note_language(_ keypair: Keypair) -> String? {
@@ -202,52 +202,6 @@ final class NdbTests: XCTestCase {
        return opts
    }

-    func test_perf_interp_evrefs_old() {
-        guard let event = decode_nostr_event_json(test_reply_json) else {
-            return
-        }
-        self.measure(options: longer_iter()) {
-            let blocks = event.blocks(test_keypair).blocks
-            let xs = interpret_event_refs(blocks: blocks, tags: event.tags)
-            XCTAssertEqual(xs.count, 1)
-        }
-    }
-
-    func test_perf_interp_evrefs_ndb() {
-        guard let note = NdbNote.owned_from_json(json: test_reply_json) else {
-            return
-        }
-        self.measure(options: longer_iter()) {
-            let blocks = note.blocks(test_keypair).blocks
-            let xs = interpret_event_refs_ndb(blocks: blocks, tags: note.tags)
-            XCTAssertEqual(xs.count, 1)
-        }
-    }
-
-    func test_decoded_events_are_equal() {
-        let event = decode_nostr_event_json(test_reply_json)
-        let note = NdbNote.owned_from_json(json: test_reply_json)
-
-        XCTAssertNotNil(note)
-        XCTAssertNotNil(event)
-        guard let note else { return }
-        guard let event else { return }
-
-        XCTAssertEqual(note.content_len, UInt32(event.content.utf8.count))
-        XCTAssertEqual(note.pubkey, event.pubkey)
-        XCTAssertEqual(note.id, event.id)
-
-        let ev_blocks = event.blocks(test_keypair)
-        let note_blocks = note.blocks(test_keypair)
-
-        XCTAssertEqual(ev_blocks, note_blocks)
-
-        let event_refs = interpret_event_refs(blocks: ev_blocks.blocks, tags: event.tags)
-        let note_refs  = interpret_event_refs_ndb(blocks: note_blocks.blocks, tags: note.tags)
-
-        XCTAssertEqual(event_refs, note_refs)
-    }
-
    func test_iteration_perf() throws {
        guard let note = NdbNote.owned_from_json(json: test_contact_list_json) else {
            XCTAssert(false)
Author	SHA1	Message	Date
tyiu	5ff352361c	Fix reaction events to not tag all e and p tags in the thread Changelog-Fixed: Fix reaction events to not tag all e and p tags in the thread	2024-06-05 18:41:51 -04:00
Daniel D’Aquino	2c84184dbd	Improve UX feedback around notification mode setting Changing the notification mode setting requires successfully sending or revoking the device token to the server. As this is an action that might fail, it is important to have a clear UX feedback in case this fails. Testing -------- PASS Device: iPhone 15 simulator iOS: 17.4 Damus: This commit strfry-push-notify: d6c2ff289c80e0a90874a7499ed6408394659fc9 Coverage: 1. Checked that push notification mode setting is invisible when experimental push notifications mode is disabled 2. Checked that push notification mode setting is visible when experimental push notifications mode is enabled 3. Checked that switching between push and local notifications sends requests to the server 4. Checked that switching to push notification mode will cause local notifications to be suppressed and push notifications will be sent to the APNS server 5. Checked that switching back to local notification mode will cause local notifications to be displayed, and push notifications will NOT be sent to APNS 6. Checked that if the API server is off, switching from local to push notification modes is not possible and shows an error to the user. 7. Checked that sending APNS payload to Apple's test APNS page will actually deliver the push notification successfully. Closes: https://github.com/damus-io/damus/issues/1704 Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Reviewed-by: William Casarin <jb55@jb55.com>	2024-05-24 16:49:09 -07:00
Daniel D’Aquino	901a6fc98f	Revoke device token when user switches to local notification mode Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Reviewed-by: William Casarin <jb55@jb55.com>	2024-05-24 16:49:09 -07:00
Daniel D’Aquino	a0f6bdd8d9	Send device token when switching to push notifications mode Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Reviewed-by: William Casarin <jb55@jb55.com>	2024-05-24 16:49:09 -07:00
Daniel D’Aquino	8feb228ea0	Add NIP-98 authentication to push notification client Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Reviewed-by: William Casarin <jb55@jb55.com>	2024-05-24 16:49:09 -07:00
Daniel D’Aquino	b148fb735e	Move device token sending logic to its own component This commit moves the device token logic to a new PushNotificationClient, to move complexity from this specific feature away from damusApp.swift This commit also slightly improves the handling of device tokens, by caching it on the client struct even if the user is using local notifications, so that the device token can be sent to the server immediately after switching to push notifications mode. Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Reviewed-by: William Casarin <jb55@jb55.com>	2024-05-24 16:49:09 -07:00
Daniel D’Aquino	0a9bcb6189	Add notification mode setting This allows the user to switch between local and push notifications Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Reviewed-by: William Casarin <jb55@jb55.com>	2024-05-24 16:49:09 -07:00
Daniel D’Aquino	5a68cfa448	Fallback push notification suppression while we do not have entitlement We do not have the ability to suppress push notifications yet (we are waiting to receive the entitlement from Apple) In the meantime, attempt to fallback gracefully where possible Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Reviewed-by: William Casarin <jb55@jb55.com>	2024-05-24 16:49:09 -07:00
alltheseas	c99aaea598	Add working email hyperlink Closes: https://github.com/damus-io/damus/issues/2260 Closes: https://github.com/damus-io/damus/prs/2272 Changelog-Changed: Added first aid contact damus support email Signed-off-by: elsat <npub1zafcms4xya5ap9zr7xxr0jlrtrattwlesytn2s42030lzu0dwlzqpd26k5> Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-17 15:38:05 -07:00
Daniel D’Aquino	46185c55d1	Chunk home filters to avoid hitting max filter item limits When a user is following several accounts, they may get a stale feed caused by the subscription request being rejected by relays (due to max filter item limits). This commit implements a fix that gets around the issue by creating several chunked filters for the home feed event and contact metadata subscriptions. This is a short to medium-term practical fix, where we get around the practical limitations imposed by most relays. In the future we should work on longer-term solutions, which will likely require protocol improvements Main Test --------- Procedure: 1. Login with Elsat's npub (Or some account that follows about 2K people) 2. Check the home feed. There should be fresh notes. REPRO: Device: iPhone 15 simulator iOS: 17.4 Damus: 1.9 (3) (`0d9954290a`) Results: - No fresh notes, most recent post is from several hours ago (Feed is stale) FIX TEST: Device: iPhone 15 simulator iOS: 17.4 Damus: This commit Results: - Fresh notes appear, most recent post is from a few seconds ago. Other testing: -------------- - New automated test passing - All other automated tests passing - Tested scrolling down the feed on these conditions: - Device: iPhone 13 Mini - iOS: 17.4.1 - Accounts: - One with about 160 contacts and 10 relays (Daniel D’Aquino) - One with about 1K+ contacts and 9 relays (Freedom Smuggler) - One with about 981 contacts and 6 relays (jb55) - Elsat's account (2K+ accounts and 8 relays) - Result: None of those were stale Changelog-Fixed: Fix stale feed issue when follow list is too big Closes: https://github.com/damus-io/damus/issues/2194 Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Reviewed-by: William Casarin <jb55@jb55.com>	2024-05-13 10:56:15 -07:00
William Casarin	52aefc8d64	nip10: simplify and fix reply-to-root bugs This removes EventRefs alltogether and uses the form we use in Damus Android. This simplifies our ThreadReply logic and fixes a reply-to-root bug Reported-by: NotBiebs <justinbieber@stemstr.app> Changelog-Fixed: Fix thread bug where a quote isn't picked up as a reply Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-11 09:19:22 -07:00
William Casarin	8dbdff7ff0	1.9 (4) Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-10 13:22:20 -07:00
Daniel D’Aquino	784fb20b4f	Fix incorrect Privacy manifest plist key Xcode entered the key description text instead of the actual key code on our privacy manifest files. This commit fixes that key. Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Link: 20240509233547.69137-1-daniel@daquino.me Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-10 09:22:03 -07:00
William Casarin	0d9954290a	1.9 (3) Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-09 15:29:38 -07:00
William Casarin	13a7ee82d0	nip10: be nicer to deprecated nip10 to ease the transition, let's not add more than 2 etags or deprecated nip10 gets confused Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-09 15:28:16 -07:00
William Casarin	23138c5e03	v1.9 (2) Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-09 15:03:58 -07:00
William Casarin	213a622dde	version: damus versions should be inherited from the project Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-09 15:02:24 -07:00
William Casarin	4ac3da7612	events: try nostrdb cache if we don't have one in-memory Our nip10 logic looks for notes only in the in-memory cache. This means sometimes threads don't get fully loaded if for whatever reason it's in the nostrdb cache but not in-memory. Ideally we would just remove our in-memory cache, but for now let's just hack it so it falls back to nostrdb and makes an owned note. Changelog-Fixed: Fixed threads not loading sometimes Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-09 14:44:22 -07:00
William Casarin	bb1f912f78	nip10: consolidate event_ref logic into ThreadReply These are overlapping concepts, lets slowly get rid of EventRef Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-09 14:44:22 -07:00
William Casarin	a190a5e8fb	nip10: handle invalid reply-with-no-root I noticed a few clients do this even though its not valid. Let's handle it. Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-09 13:49:06 -07:00
William Casarin	514a053dce	nip10: marker replies This should drastically increase compatibility for damus replies in other clients. Also filter non-pubkey references when replying so we don't run into the q-tag bug. Changelog-Added: Added nip10 marker replies Changelog-Fixed: Fixed issue where some replies were including the q tag Fixes: https://github.com/damus-io/damus/issues/2239 Fixes: https://github.com/damus-io/damus/issues/2233 Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-09 13:33:04 -07:00
William Casarin	0b199a18b4	Revert "perf: debounce scroll queue" This perf change was experimental and probably minor anyways This reverts commit `d49cf5a505`. Fixes: https://github.com/damus-io/damus/issues/2235 Changelog-Fixed: Fixed issue where timeline was scrolling when it isn't supposed to Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-09 11:11:29 -07:00
William Casarin	23a125ea0f	test: add missing mute test file Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-07 18:13:23 -07:00
Daniel D’Aquino	f406d27507	Add basic word muting automated test Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-07 18:06:08 -07:00
Daniel D’Aquino	ceb6eb03fb	Implement cache on MutelistManager To filter muted events on a timeline, we need to check if an event is muted. However, we need to do so in a very efficient manner, to avoid performance degradation. This commit improves performance by caching mute statuses for as long as the mutelist stays the same. Testing -------- PASS Device: iPhone 13 Mini iOS: 17.4.1 Damus: This commit Damus baseline: bb8dba6df6e2534dfb193402399b31a4fae8052d Steps: 1. Downgrade to baseline version, Run SwiftUI profiler on Xcode instruments 2. Scroll down home feed. Try to notice hangs and microhangs on the UI 3. Upgrade to version under test. Start the same profiler test. 4. Check that hangs/microhangs frequency and severity are roughly the same. Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Reviewed-by: William Casarin <jb55@jb55.com> Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-07 18:05:45 -07:00
Daniel D’Aquino	b917b4e9d6	Apply mute rules to Timeline views by default Mute rules were not applied in all timeline views. This commit adds code to filter out muted events on timelines. It also provides an opt-out parameter if there is ever a need to a timeline without mute filters Testing -------- PASS Device: iPhone 13 Mini iOS: 17.4.1 Damus: This commit Coverage: 1. Add a muted keyword 2. Go to home view, check that events with that keyword are now not showing up Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-07 18:05:45 -07:00
Daniel D’Aquino	e981ae247e	Mute: Add `user_keypair` to MutelistManager The user keypair is necessary to determine whether or not a given event is muted or not. Previously, the user keypair had to be passed on each function call as an optional parameter, and word filtering would not work unless the caller remembered to add the keypair parameter. All usages of MutelistManager functions indicate that the desired base keypair is always the same as the DamusState's keypair that owns the MutelistManager. Therefore, it is simpler and less error prone to simply pass the keypair to MutelistManager during its initialization. Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-07 18:05:45 -07:00
William Casarin	dcd7b5b111	nip10: fix mixed nip10 markers Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-07 14:07:47 -07:00
William Casarin	a721256e9b	nip10: add marker nip10 support when reading notes We still need to add these when writing notes. Changelog-Added: Add marker nip10 support when reading notes Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-07 14:07:39 -07:00
William Casarin	007bcc8687	test: disable broken auth test Signed-off-by: William Casarin <jb55@jb55.com>	2024-05-07 14:07:14 -07:00
Daniel D’Aquino	ccb94e6d69	Merge pull request #2201 from tyiu/thai Add Thai as a supported language	2024-05-06 13:06:55 -07:00
William Casarin	3c9fd36654	Merge commit `0a6e40798a` ("docs: add NIP04 to readme for encrypted DM's")	2024-05-06 11:54:42 -07:00
Daniel D’Aquino	9a9b5d5f4f	Merge Privacy report updates from release branch 'v1.8_relay_fix_and_video_player'	2024-05-06 11:25:52 -07:00
Daniel D’Aquino	d4f041aead	Fill up missing Privacy report information for App submission This commit adds missing privacy report information for both damus and the notification extension. It details the reason we use - File timestamps - UserDefaults The reason codes were taken from Apple's documentation: https://developer.apple.com/documentation/bundleresources/privacy_manifest_files/describing_use_of_required_reason_api Testing -------- PASS Damus: this commit Steps: 1. Build app for archival 2. Access the local archive and perform a secondary click 3. Click on "Generate Privacy Report" 4. Open the privacy report PDF. It should show no errors. PASS Closes: https://github.com/damus-io/damus/issues/2184 Signed-off-by: Daniel D’Aquino <daniel@daquino.me> Reviewed-by: William Casarin <jb55@jb55.com>	2024-05-06 11:21:35 -07:00
Fonta1n3	0a6e40798a	docs: add NIP04 to readme for encrypted DM's	2024-03-13 09:23:18 +08:00