Fix reactions view to not show reactions from replies on parent note

Changelog-Fixed: Fix reactions view to not show reactions from replies on parent note

DamusNotificationService/NotificationExtensionState.swift

@@ -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)

DamusNotificationService/NotificationService.swift

@@ -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
         }
         

DamusNotificationService/PrivacyInfo.xcprivacy

@@ -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>

PrivacyInfo.xcprivacy

@@ -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>

damus.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		3169CAE6294E69C000EE4006 /* EmptyTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3169CAE5294E69C000EE4006 /* EmptyTimelineView.swift */; };
 		3169CAED294FCCFC00EE4006 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3169CAEC294FCCFC00EE4006 /* Constants.swift */; };
 		31D2E847295218AF006D67F8 /* Shimmer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31D2E846295218AF006D67F8 /* Shimmer.swift */; };
+		3A0A30BB2C21397A00F8C9BC /* EmojiPicker in Frameworks */ = {isa = PBXBuildFile; productRef = 3A0A30BA2C21397A00F8C9BC /* EmojiPicker */; };
 		3A23838E2A297DD200E5AA2E /* ZapButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A23838D2A297DD200E5AA2E /* ZapButtonModel.swift */; };
 		3A3040ED29A5CB86008A0F29 /* ReplyDescriptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040EC29A5CB86008A0F29 /* ReplyDescriptionTests.swift */; };
 		3A3040F129A8FF97008A0F29 /* LocalizationUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040F029A8FF97008A0F29 /* LocalizationUtil.swift */; };
@@ -20,11 +21,7 @@
 		3A4325A82961E11400BFCD9D /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 3A4325AA2961E11400BFCD9D /* Localizable.stringsdict */; };
 		3A4647CF2A413ADC00386AD8 /* CondensedProfilePicturesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A4647CE2A413ADC00386AD8 /* CondensedProfilePicturesView.swift */; };
 		3A48E7B029DFBE9D006E787E /* MutedThreadsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A48E7AF29DFBE9D006E787E /* MutedThreadsManager.swift */; };
-		3A5E47C52A4A6CF400C0D090 /* Trie.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A5E47C42A4A6CF400C0D090 /* Trie.swift */; };
-		3A5E47C72A4A76C800C0D090 /* TrieTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A5E47C62A4A76C800C0D090 /* TrieTests.swift */; };
 		3A8CC6CC2A2CFEF900940F5F /* StringUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8CC6CB2A2CFEF900940F5F /* StringUtil.swift */; };
-		3A90B1812A4EA3AF00000D94 /* UserSearchCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A90B1802A4EA3AF00000D94 /* UserSearchCache.swift */; };
-		3A90B1832A4EA3C600000D94 /* UserSearchCacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A90B1822A4EA3C600000D94 /* UserSearchCacheTests.swift */; };
 		3AA247FF297E3D900090C62D /* RepostsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA247FE297E3D900090C62D /* RepostsView.swift */; };
 		3AA24802297E3DC20090C62D /* RepostView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA24801297E3DC20090C62D /* RepostView.swift */; };
 		3AA59D1D2999B0400061C48E /* DraftsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA59D1C2999B0400061C48E /* DraftsModel.swift */; };
@@ -36,8 +33,10 @@
 		3ACB685F297633BC00C46468 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3ACB685D297633BC00C46468 /* Localizable.strings */; };
 		3ACBCB78295FE5C70037388A /* TimeAgoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ACBCB77295FE5C70037388A /* TimeAgoTests.swift */; };
 		3AE45AF6297BB2E700C1D842 /* LibreTranslateServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */; };
-		3AFE89C32BD4156F00AD31EF /* MCEmojiPicker in Frameworks */ = {isa = PBXBuildFile; productRef = 3AFE89C22BD4156F00AD31EF /* MCEmojiPicker */; };
 		3CCD1E6A2A874C4E0099A953 /* Nip98HTTPAuth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CCD1E692A874C4E0099A953 /* Nip98HTTPAuth.swift */; };
+		4C011B5E2BD0A56A002F2F9B /* ChatEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C011B5C2BD0A56A002F2F9B /* ChatEventView.swift */; };
+		4C011B5F2BD0A56A002F2F9B /* ChatroomThreadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C011B5D2BD0A56A002F2F9B /* ChatroomThreadView.swift */; };
+		4C011B612BD0B25C002F2F9B /* ReplyQuoteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C011B602BD0B25C002F2F9B /* ReplyQuoteView.swift */; };
 		4C06670128FC7C5900038D2A /* RelayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C06670028FC7C5900038D2A /* RelayView.swift */; };
 		4C06670428FC7EC500038D2A /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 4C06670328FC7EC500038D2A /* Kingfisher */; };
 		4C06670628FCB08600038D2A /* ImageCarousel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C06670528FCB08600038D2A /* ImageCarousel.swift */; };
@@ -98,6 +97,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 +135,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 +173,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 +247,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 */; };
@@ -398,6 +399,7 @@
 		5C14C29D2BBBA40B00079FD2 /* RelayAdminDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C14C29C2BBBA40B00079FD2 /* RelayAdminDetail.swift */; };
 		5C14C29F2BBBA5C600079FD2 /* RelayNipList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C14C29E2BBBA5C600079FD2 /* RelayNipList.swift */; };
 		5C42E78C29DB76D90086AAC1 /* EmptyUserSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C42E78B29DB76D90086AAC1 /* EmptyUserSearchView.swift */; };
+		5C4D9EA72C042FA5005EA0F7 /* HighlightPostView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4D9EA62C042FA5005EA0F7 /* HighlightPostView.swift */; };
 		5C513FBA297F72980072348F /* CustomPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FB9297F72980072348F /* CustomPicker.swift */; };
 		5C513FCC2984ACA60072348F /* QRCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FCB2984ACA60072348F /* QRCodeView.swift */; };
 		5C6E1DAD2A193EC2008FC15A /* GradientButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C6E1DAC2A193EC2008FC15A /* GradientButtonStyle.swift */; };
@@ -405,6 +407,11 @@
 		5C7389B12B6EFA7100781E0A /* ProxyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B02B6EFA7100781E0A /* ProxyView.swift */; };
 		5C7389B72B9E692E00781E0A /* MutinyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B62B9E692E00781E0A /* MutinyButton.swift */; };
 		5C7389B92B9E69ED00781E0A /* MutinyGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7389B82B9E69ED00781E0A /* MutinyGradient.swift */; };
+		5CC8529D2BD741CD0039FFC5 /* HighlightEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC8529C2BD741CD0039FFC5 /* HighlightEvent.swift */; };
+		5CC8529F2BD744F60039FFC5 /* HighlightView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC8529E2BD744F60039FFC5 /* HighlightView.swift */; };
+		5CC852A22BDED9B90039FFC5 /* HighlightDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC852A12BDED9B90039FFC5 /* HighlightDescription.swift */; };
+		5CC852A42BDF3CA10039FFC5 /* HighlightLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC852A32BDF3CA10039FFC5 /* HighlightLink.swift */; };
+		5CC852A62BE00F180039FFC5 /* HighlightEventRef.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC852A52BE00F180039FFC5 /* HighlightEventRef.swift */; };
 		5CC868DD2AA29B3200FB22BA /* NeutralButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC868DC2AA29B3200FB22BA /* NeutralButtonStyle.swift */; };
 		5CF2DCCC2AA3AF0B00984B8D /* RelayPicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF2DCCB2AA3AF0B00984B8D /* RelayPicView.swift */; };
 		5CF2DCCE2AABE1A500984B8D /* DamusLightGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF2DCCD2AABE1A500984B8D /* DamusLightGradient.swift */; };
@@ -462,6 +469,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 +493,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 */; };
@@ -493,6 +503,9 @@
 		D7870BC32AC47EBC0080BA88 /* EventLoaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7870BC22AC47EBC0080BA88 /* EventLoaderView.swift */; };
 		D789D1202AFEFBF20083A7AB /* secp256k1 in Frameworks */ = {isa = PBXBuildFile; productRef = D789D11F2AFEFBF20083A7AB /* secp256k1 */; };
 		D78CD5982B8990300014D539 /* DamusAppNotificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D78CD5972B8990300014D539 /* DamusAppNotificationView.swift */; };
+		D78DB8592C1CE9CA00F0AB12 /* SwipeActions in Frameworks */ = {isa = PBXBuildFile; productRef = D78DB8582C1CE9CA00F0AB12 /* SwipeActions */; };
+		D78DB85B2C20FE5000F0AB12 /* VectorMath.swift in Sources */ = {isa = PBXBuildFile; fileRef = D78DB85A2C20FE4F00F0AB12 /* VectorMath.swift */; };
+		D78DB85F2C20FED300F0AB12 /* ChatBubbleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D78DB85E2C20FED300F0AB12 /* ChatBubbleView.swift */; };
 		D798D21A2B0856CC00234419 /* Mentions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C7FF7D42823313F009601DB /* Mentions.swift */; };
 		D798D21B2B0856F200234419 /* NdbTagsIterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CDD1AE12A6B3074001CD4DF /* NdbTagsIterator.swift */; };
 		D798D21C2B0857E400234419 /* Bech32Object.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABEF29857E9200D66079 /* Bech32Object.swift */; };
@@ -551,7 +564,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 +623,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 +649,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 */; };
@@ -746,8 +761,6 @@
 		3A5CAE1D298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-CN"; path = "zh-CN.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A5CAE1E298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-CN"; path = "zh-CN.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A5CAE1F298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-CN"; path = "zh-CN.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
-		3A5E47C42A4A6CF400C0D090 /* Trie.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Trie.swift; sourceTree = "<group>"; };
-		3A5E47C62A4A76C800C0D090 /* TrieTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrieTests.swift; sourceTree = "<group>"; };
 		3A66D927299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3A66D928299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3A66D929299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ja; path = ja.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
@@ -761,8 +774,6 @@
 		3A8624DA299E82BE00BD8BE9 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3A8624DB299E82BE00BD8BE9 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = cs; path = cs.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		3A8CC6CB2A2CFEF900940F5F /* StringUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringUtil.swift; sourceTree = "<group>"; };
-		3A90B1802A4EA3AF00000D94 /* UserSearchCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserSearchCache.swift; sourceTree = "<group>"; };
-		3A90B1822A4EA3C600000D94 /* UserSearchCacheTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSearchCacheTests.swift; sourceTree = "<group>"; };
 		3A929C20297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "it-IT"; path = "it-IT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A929C21297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "it-IT"; path = "it-IT.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A929C22297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "it-IT"; path = "it-IT.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
@@ -823,6 +834,9 @@
 		3AF6336929884C6B0005672A /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3AF6336A29884C6B0005672A /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "pt-PT"; path = "pt-PT.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3CCD1E692A874C4E0099A953 /* Nip98HTTPAuth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Nip98HTTPAuth.swift; sourceTree = "<group>"; };
+		4C011B5C2BD0A56A002F2F9B /* ChatEventView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatEventView.swift; sourceTree = "<group>"; };
+		4C011B5D2BD0A56A002F2F9B /* ChatroomThreadView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatroomThreadView.swift; sourceTree = "<group>"; };
+		4C011B602BD0B25C002F2F9B /* ReplyQuoteView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReplyQuoteView.swift; sourceTree = "<group>"; };
 		4C06670028FC7C5900038D2A /* RelayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayView.swift; sourceTree = "<group>"; };
 		4C06670528FCB08600038D2A /* ImageCarousel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCarousel.swift; sourceTree = "<group>"; };
 		4C06670828FDE64700038D2A /* damus-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "damus-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -886,6 +900,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 +936,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 +1003,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>"; };
@@ -1325,6 +1340,7 @@
 		5C14C29C2BBBA40B00079FD2 /* RelayAdminDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayAdminDetail.swift; sourceTree = "<group>"; };
 		5C14C29E2BBBA5C600079FD2 /* RelayNipList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayNipList.swift; sourceTree = "<group>"; };
 		5C42E78B29DB76D90086AAC1 /* EmptyUserSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyUserSearchView.swift; sourceTree = "<group>"; };
+		5C4D9EA62C042FA5005EA0F7 /* HighlightPostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightPostView.swift; sourceTree = "<group>"; };
 		5C513FB9297F72980072348F /* CustomPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomPicker.swift; sourceTree = "<group>"; };
 		5C513FCB2984ACA60072348F /* QRCodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeView.swift; sourceTree = "<group>"; };
 		5C6E1DAC2A193EC2008FC15A /* GradientButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientButtonStyle.swift; sourceTree = "<group>"; };
@@ -1332,6 +1348,11 @@
 		5C7389B02B6EFA7100781E0A /* ProxyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyView.swift; sourceTree = "<group>"; };
 		5C7389B62B9E692E00781E0A /* MutinyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutinyButton.swift; sourceTree = "<group>"; };
 		5C7389B82B9E69ED00781E0A /* MutinyGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutinyGradient.swift; sourceTree = "<group>"; };
+		5CC8529C2BD741CD0039FFC5 /* HighlightEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightEvent.swift; sourceTree = "<group>"; };
+		5CC8529E2BD744F60039FFC5 /* HighlightView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightView.swift; sourceTree = "<group>"; };
+		5CC852A12BDED9B90039FFC5 /* HighlightDescription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightDescription.swift; sourceTree = "<group>"; };
+		5CC852A32BDF3CA10039FFC5 /* HighlightLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightLink.swift; sourceTree = "<group>"; };
+		5CC852A52BE00F180039FFC5 /* HighlightEventRef.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightEventRef.swift; sourceTree = "<group>"; };
 		5CC868DC2AA29B3200FB22BA /* NeutralButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NeutralButtonStyle.swift; sourceTree = "<group>"; };
 		5CF2DCCB2AA3AF0B00984B8D /* RelayPicView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayPicView.swift; sourceTree = "<group>"; };
 		5CF2DCCD2AABE1A500984B8D /* DamusLightGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusLightGradient.swift; sourceTree = "<group>"; };
@@ -1386,6 +1407,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 +1422,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>"; };
@@ -1407,6 +1431,8 @@
 		D7870BC02AC4750B0080BA88 /* MentionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MentionView.swift; sourceTree = "<group>"; };
 		D7870BC22AC47EBC0080BA88 /* EventLoaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventLoaderView.swift; sourceTree = "<group>"; };
 		D78CD5972B8990300014D539 /* DamusAppNotificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusAppNotificationView.swift; sourceTree = "<group>"; };
+		D78DB85A2C20FE4F00F0AB12 /* VectorMath.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VectorMath.swift; sourceTree = "<group>"; };
+		D78DB85E2C20FED300F0AB12 /* ChatBubbleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatBubbleView.swift; sourceTree = "<group>"; };
 		D798D21D2B0858BB00234419 /* MigratedTypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigratedTypes.swift; sourceTree = "<group>"; };
 		D798D2272B085CDA00234419 /* NdbNote+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NdbNote+.swift"; sourceTree = "<group>"; };
 		D798D22B2B086C7400234419 /* NostrEvent+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NostrEvent+.swift"; sourceTree = "<group>"; };
@@ -1427,12 +1453,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>"; };
@@ -1468,9 +1497,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				4C06670428FC7EC500038D2A /* Kingfisher in Frameworks */,
+				3A0A30BB2C21397A00F8C9BC /* EmojiPicker in Frameworks */,
+				D78DB8592C1CE9CA00F0AB12 /* SwipeActions in Frameworks */,
 				4C649881286E0EE300EAE2B3 /* secp256k1 in Frameworks */,
 				4C27C9322A64766F007DBC75 /* MarkdownUI in Frameworks */,
-				3AFE89C32BD4156F00AD31EF /* MCEmojiPicker in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1607,7 +1637,6 @@
 				4C363A93282704FA006E126D /* Post.swift */,
 				4C363A952827096D006E126D /* PostBlock.swift */,
 				4C363A9928283854006E126D /* Reply.swift */,
-				4C363A9B282838B9006E126D /* EventRef.swift */,
 				4C363AA328296DEE006E126D /* SearchModel.swift */,
 				0E8A4BB62AE4359200065E81 /* NostrFilter+Hashable.swift */,
 				4C3AC79A28306D7B00E1F516 /* Contacts.swift */,
@@ -1635,8 +1664,6 @@
 				3A48E7AF29DFBE9D006E787E /* MutedThreadsManager.swift */,
 				4C7D09772A0B0CC900943473 /* WalletModel.swift */,
 				3A23838D2A297DD200E5AA2E /* ZapButtonModel.swift */,
-				3A5E47C42A4A6CF400C0D090 /* Trie.swift */,
-				3A90B1802A4EA3AF00000D94 /* UserSearchCache.swift */,
 				D723C38D2AB8D83400065664 /* ContentFilters.swift */,
 				D7315A292ACDF3B70036E30A /* DamusCacheManager.swift */,
 				D7CB5D3D2B116DAD00AD4105 /* NotificationsManager.swift */,
@@ -1652,6 +1679,8 @@
 				D74AAFC12B153395006CF0F4 /* HeadlessDamusState.swift */,
 				B5C60C1F2B530D5100C5ECA7 /* MuteItem.swift */,
 				B533694D2B66D791008A805E /* MutelistManager.swift */,
+				D7D2A3802BF815D000E4B42B /* PushNotificationClient.swift */,
+				5CC8529C2BD741CD0039FFC5 /* HighlightEvent.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -1780,6 +1809,14 @@
 			path = flatbuffers;
 			sourceTree = "<group>";
 		};
+		4C45E5002BED4CE10025A428 /* NIP10 */ = {
+			isa = PBXGroup;
+			children = (
+				4C45E5012BED4D000025A428 /* ThreadReply.swift */,
+			);
+			path = NIP10;
+			sourceTree = "<group>";
+		};
 		4C478E2A2A9935D300489948 /* bindings */ = {
 			isa = PBXGroup;
 			children = (
@@ -1984,6 +2021,7 @@
 		4C75EFA227FA576C0006080F /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				D78DB85D2C20FE9E00F0AB12 /* Chat */,
 				D71AC4CA2BA8E3320076268E /* Extensions */,
 				BA3759952ABCCF360018D73B /* Camera */,
 				F71694E82A66221E001F4053 /* Onboarding */,
@@ -2377,6 +2415,7 @@
 		4CC7AAEE297F11B300430951 /* Events */ = {
 			isa = PBXGroup;
 			children = (
+				5CC852A02BDED9970039FFC5 /* Highlight */,
 				4CA927682A290F8F0098A105 /* Components */,
 				4CC7AAEF297F11C700430951 /* SelectedEventView.swift */,
 				4CC7AAF5297F1A6A00430951 /* EventBody.swift */,
@@ -2447,6 +2486,7 @@
 		4CE6DEDA27F7A08100C66700 = {
 			isa = PBXGroup;
 			children = (
+				D7FB14212BE5970000398331 /* PrivacyInfo.xcprivacy */,
 				4C32B9362A9AD44700DC3548 /* flatbuffers */,
 				4C9054862A6AEB4500811EEC /* nostrdb */,
 				4C19AE4A2A5CEF7C00C90DB7 /* nostrscript */,
@@ -2477,6 +2517,7 @@
 		4CE6DEE527F7A08100C66700 /* damus */ = {
 			isa = PBXGroup;
 			children = (
+				4C45E5002BED4CE10025A428 /* NIP10 */,
 				4C1D4FB32A7967990024F453 /* build-git-hash.txt */,
 				4CA3529C2A76AE47003BB08B /* Notify */,
 				4CC14FEC2A73FC9A007AEB17 /* Types */,
@@ -2535,8 +2576,6 @@
 				3A30410029AB12AA008A0F29 /* EventGroupViewTests.swift */,
 				4C8D00D329E3C5D40036AF10 /* NIP19Tests.swift */,
 				501F8C812A0224EB001AFC1D /* KeychainStorageTests.swift */,
-				3A5E47C62A4A76C800C0D090 /* TrieTests.swift */,
-				3A90B1822A4EA3C600000D94 /* UserSearchCacheTests.swift */,
 				4C4F14A62A2A61A30045A0B9 /* NostrScriptTests.swift */,
 				4C19AE542A5D977400C90DB7 /* HashtagTests.swift */,
 				3AAC7A012A60FE72002B50DF /* LocalizationUtilTests.swift */,
@@ -2552,6 +2591,9 @@
 				E06336A92B75832100A88E6B /* ImageMetadataTest.swift */,
 				D7CBD1D52B8D509800BFD889 /* DamusPurpleImpendingExpirationTests.swift */,
 				D72927AC2BAB515C00F93E90 /* RelayURLTests.swift */,
+				D753CEA92BE9DE04001C3A5D /* MutingTests.swift */,
+				4C2D34402BDAF1B300F9FB44 /* NIP10Tests.swift */,
+				D72E12792BEEEED000F4F781 /* NostrFilterTests.swift */,
 			);
 			path = damusTests;
 			sourceTree = "<group>";
@@ -2671,11 +2713,25 @@
 			path = Images;
 			sourceTree = "<group>";
 		};
+		5CC852A02BDED9970039FFC5 /* Highlight */ = {
+			isa = PBXGroup;
+			children = (
+				5CC8529E2BD744F60039FFC5 /* HighlightView.swift */,
+				5CC852A12BDED9B90039FFC5 /* HighlightDescription.swift */,
+				5CC852A32BDF3CA10039FFC5 /* HighlightLink.swift */,
+				5CC852A52BE00F180039FFC5 /* HighlightEventRef.swift */,
+				5C4D9EA62C042FA5005EA0F7 /* HighlightPostView.swift */,
+			);
+			path = Highlight;
+			sourceTree = "<group>";
+		};
 		7C0F392D29B57C8F0039859C /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
 				7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */,
 				4C7D09752A0AF19E00943473 /* FillAndStroke.swift */,
+				D72E12772BEED22400F4F781 /* Array.swift */,
+				D78DB85A2C20FE4F00F0AB12 /* VectorMath.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -2744,6 +2800,17 @@
 			path = Purple;
 			sourceTree = "<group>";
 		};
+		D78DB85D2C20FE9E00F0AB12 /* Chat */ = {
+			isa = PBXGroup;
+			children = (
+				4C011B5C2BD0A56A002F2F9B /* ChatEventView.swift */,
+				4C011B602BD0B25C002F2F9B /* ReplyQuoteView.swift */,
+				4C011B5D2BD0A56A002F2F9B /* ChatroomThreadView.swift */,
+				D78DB85E2C20FED300F0AB12 /* ChatBubbleView.swift */,
+			);
+			path = Chat;
+			sourceTree = "<group>";
+		};
 		D79C4C152AFEB061003A41B4 /* DamusNotificationService */ = {
 			isa = PBXGroup;
 			children = (
@@ -2752,6 +2819,7 @@
 				D79C4C182AFEB061003A41B4 /* Info.plist */,
 				D70A3B162B02DCE5008BD568 /* NotificationFormatter.swift */,
 				D74AAFC42B1538DE006CF0F4 /* NotificationExtensionState.swift */,
+				D7FB14242BE5A9A800398331 /* PrivacyInfo.xcprivacy */,
 			);
 			path = DamusNotificationService;
 			sourceTree = "<group>";
@@ -2824,7 +2892,8 @@
 				4C649880286E0EE300EAE2B3 /* secp256k1 */,
 				4C06670328FC7EC500038D2A /* Kingfisher */,
 				4C27C9312A64766F007DBC75 /* MarkdownUI */,
-				3AFE89C22BD4156F00AD31EF /* MCEmojiPicker */,
+				3A0A30BA2C21397A00F8C9BC /* EmojiPicker */,
+				D78DB8582C1CE9CA00F0AB12 /* SwipeActions */,
 			);
 			productName = damus;
 			productReference = 4CE6DEE327F7A08100C66700 /* damus.app */;
@@ -2964,7 +3033,8 @@
 				4CCF9AB02A1FE80B00E03CFB /* XCRemoteSwiftPackageReference "GSPlayer" */,
 				4C27C9302A64766F007DBC75 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */,
 				D7A343EC2AD0D77C00CED48B /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
-				3AFE89C12BD4156F00AD31EF /* XCRemoteSwiftPackageReference "MCEmojiPicker" */,
+				3A0A30B92C21397A00F8C9BC /* XCRemoteSwiftPackageReference "EmojiPicker" */,
+				D78DB8572C1CE9CA00F0AB12 /* XCRemoteSwiftPackageReference "SwipeActions" */,
 			);
 			productRefGroup = 4CE6DEE427F7A08100C66700 /* Products */;
 			projectDirPath = "";
@@ -2984,6 +3054,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 +3088,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D7FB14252BE5A9A800398331 /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3107,6 +3179,7 @@
 				4C75EFAD28049CFB0006080F /* PostButton.swift in Sources */,
 				D7EDED1E2B11797D0018B19C /* LongformEvent.swift in Sources */,
 				504323A92A3495B6006AE6DC /* RelayModelCache.swift in Sources */,
+				5C4D9EA72C042FA5005EA0F7 /* HighlightPostView.swift in Sources */,
 				3A8CC6CC2A2CFEF900940F5F /* StringUtil.swift in Sources */,
 				D7FD12262BD345A700CF195B /* FirstAidSettingsView.swift in Sources */,
 				D7870BC12AC4750B0080BA88 /* MentionView.swift in Sources */,
@@ -3137,6 +3210,7 @@
 				4C32B94D2A9AD44700DC3548 /* Offset.swift in Sources */,
 				4C633350283D40E500B1C9C3 /* HomeModel.swift in Sources */,
 				4C987B57283FD07F0042CE38 /* FollowersModel.swift in Sources */,
+				5CC852A42BDF3CA10039FFC5 /* HighlightLink.swift in Sources */,
 				4C32B9552A9AD44700DC3548 /* ByteBuffer.swift in Sources */,
 				4C32B95B2A9AD44700DC3548 /* NativeObject.swift in Sources */,
 				3AB72AB9298ECF30004BB58C /* Translator.swift in Sources */,
@@ -3153,7 +3227,6 @@
 				4C216F362870A9A700040376 /* InputDismissKeyboard.swift in Sources */,
 				D74AAFCF2B155D8C006CF0F4 /* ZapDataModel.swift in Sources */,
 				4C8D1A6F29F31E5000ACDF75 /* FriendsButton.swift in Sources */,
-				3A5E47C52A4A6CF400C0D090 /* Trie.swift in Sources */,
 				D7100C562B76F8E600C59298 /* PurpleViewPrimitives.swift in Sources */,
 				B57B4C642B312BFA00A232C0 /* RelayAuthenticationDetail.swift in Sources */,
 				D7EDED2E2B128E8A0018B19C /* CollectionExtension.swift in Sources */,
@@ -3208,6 +3281,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 */,
@@ -3216,6 +3290,7 @@
 				E02429952B7E97740088B16C /* CameraController.swift in Sources */,
 				31D2E847295218AF006D67F8 /* Shimmer.swift in Sources */,
 				5C14C29F2BBBA5C600079FD2 /* RelayNipList.swift in Sources */,
+				D78DB85B2C20FE5000F0AB12 /* VectorMath.swift in Sources */,
 				D7CB5D3E2B116DAD00AD4105 /* NotificationsManager.swift in Sources */,
 				50A16FFF2AA76A0900DFEC1F /* VideoController.swift in Sources */,
 				F7908E97298B1FDF00AB113A /* NIPURLBuilder.swift in Sources */,
@@ -3224,10 +3299,12 @@
 				F75BA12D29A1855400E10810 /* BookmarksManager.swift in Sources */,
 				4CC14FEF2A73FCCB007AEB17 /* IdType.swift in Sources */,
 				4C3EA67F28FFC01D00C48A62 /* InvoiceView.swift in Sources */,
+				4C011B612BD0B25C002F2F9B /* ReplyQuoteView.swift in Sources */,
 				D71AC4CC2BA8E3480076268E /* VisibilityTracker.swift in Sources */,
 				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 +3338,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 */,
@@ -3272,6 +3350,7 @@
 				4C3AC7A12835A81400E1F516 /* SetupView.swift in Sources */,
 				4C06670128FC7C5900038D2A /* RelayView.swift in Sources */,
 				4C285C8C28398BC7008A31F1 /* Keys.swift in Sources */,
+				5CC852A22BDED9B90039FFC5 /* HighlightDescription.swift in Sources */,
 				4C94D6432BA5AEFE00C26EFF /* QuoteRepostsView.swift in Sources */,
 				D7EDED332B12ACAE0018B19C /* DamusUserDefaults.swift in Sources */,
 				4CA352AE2A76C1AC003BB08B /* FollowedNotify.swift in Sources */,
@@ -3310,11 +3389,14 @@
 				4C64305C2A945AFF00B0C0E9 /* MusicController.swift in Sources */,
 				5053ACA72A56DF3B00851AE3 /* DeveloperSettingsView.swift in Sources */,
 				F79C7FAD29D5E9620000F946 /* EditPictureControl.swift in Sources */,
+				4C011B5F2BD0A56A002F2F9B /* ChatroomThreadView.swift in Sources */,
 				4C9F18E229AA9B6C008C55EC /* CustomizeZapView.swift in Sources */,
 				4C2859602A12A2BE004746F7 /* SupporterBadge.swift in Sources */,
 				4C1A9A2A29DDF54400516EAC /* DamusVideoPlayer.swift in Sources */,
 				4CA352A22A76AEC5003BB08B /* LikedNotify.swift in Sources */,
+				5CC8529F2BD744F60039FFC5 /* HighlightView.swift in Sources */,
 				BA37598D2ABCCE500018D73B /* PhotoCaptureProcessor.swift in Sources */,
+				5CC8529D2BD741CD0039FFC5 /* HighlightEvent.swift in Sources */,
 				4C9146FD2A2A87C200DDEA40 /* wasm.c in Sources */,
 				4C75EFAF28049D350006080F /* NostrFilter.swift in Sources */,
 				4C3EA64C28FF59AC00C48A62 /* bech32_util.c in Sources */,
@@ -3323,7 +3405,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 */,
@@ -3370,8 +3451,8 @@
 				4C8EC52529D1FA6C0085D9A8 /* DamusColors.swift in Sources */,
 				3A4647CF2A413ADC00386AD8 /* CondensedProfilePicturesView.swift in Sources */,
 				5C14C29B2BBBA29C00079FD2 /* RelaySoftwareDetail.swift in Sources */,
+				D78DB85F2C20FED300F0AB12 /* ChatBubbleView.swift in Sources */,
 				D2277EEA2A089BD5006C3807 /* Router.swift in Sources */,
-				3A90B1812A4EA3AF00000D94 /* UserSearchCache.swift in Sources */,
 				4C9D6D162B1AA9C6004E5CD9 /* DisplayTabBarNotify.swift in Sources */,
 				4CC14FF92A741939007AEB17 /* Referenced.swift in Sources */,
 				4C5C7E6A284EDE2E00A22DF5 /* SearchResultsView.swift in Sources */,
@@ -3427,6 +3508,7 @@
 				B51C1CEB2B55A60A00E312A9 /* MuteDurationMenu.swift in Sources */,
 				4CB88389296AF99A00DC99E7 /* EventDetailBar.swift in Sources */,
 				4C32B9512A9AD44700DC3548 /* FlatbuffersErrors.swift in Sources */,
+				5CC852A62BE00F180039FFC5 /* HighlightEventRef.swift in Sources */,
 				4CE8794E2996B16A00F758CC /* RelayToggle.swift in Sources */,
 				4C3AC79B28306D7B00E1F516 /* Contacts.swift in Sources */,
 				4C3EA63D28FF52D600C48A62 /* bolt11.c in Sources */,
@@ -3480,6 +3562,7 @@
 				4C30AC7229A5677A00E2BD5A /* NotificationsView.swift in Sources */,
 				4C1A9A2129DDD3E100516EAC /* KeySettingsView.swift in Sources */,
 				D723C38E2AB8D83400065664 /* ContentFilters.swift in Sources */,
+				4C011B5E2BD0A56A002F2F9B /* ChatEventView.swift in Sources */,
 				4C32B95A2A9AD44700DC3548 /* Verifiable.swift in Sources */,
 				4C73C5142A4437C10062CAC0 /* ZapUserView.swift in Sources */,
 				501F8C802A0220E1001AFC1D /* KeychainStorage.swift in Sources */,
@@ -3514,8 +3597,8 @@
 			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 */,
 				4C19AE552A5D977400C90DB7 /* HashtagTests.swift in Sources */,
 				D72927AD2BAB515C00F93E90 /* RelayURLTests.swift in Sources */,
@@ -3527,6 +3610,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 */,
@@ -3544,7 +3628,6 @@
 				75AD872B2AA23A460085EF2C /* Block+Tests.swift in Sources */,
 				E0E024112B7C19C20075735D /* TranslationTests.swift in Sources */,
 				F944F56E29EA9CCC0067B3BF /* DamusParseContentTests.swift in Sources */,
-				3A5E47C72A4A76C800C0D090 /* TrieTests.swift in Sources */,
 				B501062D2B363036003874F5 /* AuthIntegrationTests.swift in Sources */,
 				4CB883AE2976FA9300DC99E7 /* FormatTests.swift in Sources */,
 				D72A2D052AD9C1B5002AFF62 /* MockDamusState.swift in Sources */,
@@ -3553,6 +3636,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 +3657,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 +3966,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 +3987,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 +4033,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 +4049,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;
@@ -3985,6 +4069,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -4011,7 +4096,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.9;
+				MARKETING_VERSION = 1.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -4035,6 +4120,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -4061,7 +4147,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.9;
+				MARKETING_VERSION = 1.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -4266,12 +4352,12 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		3AFE89C12BD4156F00AD31EF /* XCRemoteSwiftPackageReference "MCEmojiPicker" */ = {
+		3A0A30B92C21397A00F8C9BC /* XCRemoteSwiftPackageReference "EmojiPicker" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/izyumkin/MCEmojiPicker";
+			repositoryURL = "https://github.com/tyiu/EmojiPicker.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.2.3;
+				minimumVersion = 0.1.1;
 			};
 		};
 		4C06670228FC7EC500038D2A /* XCRemoteSwiftPackageReference "Kingfisher" */ = {
@@ -4306,6 +4392,14 @@
 				minimumVersion = 0.2.26;
 			};
 		};
+		D78DB8572C1CE9CA00F0AB12 /* XCRemoteSwiftPackageReference "SwipeActions" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/aheze/SwipeActions";
+			requirement = {
+				kind = exactVersion;
+				version = 1.1.0;
+			};
+		};
 		D7A343EC2AD0D77C00CED48B /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing";
@@ -4317,10 +4411,10 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		3AFE89C22BD4156F00AD31EF /* MCEmojiPicker */ = {
+		3A0A30BA2C21397A00F8C9BC /* EmojiPicker */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 3AFE89C12BD4156F00AD31EF /* XCRemoteSwiftPackageReference "MCEmojiPicker" */;
+			package = 3A0A30B92C21397A00F8C9BC /* XCRemoteSwiftPackageReference "EmojiPicker" */;
-			productName = MCEmojiPicker;
+			productName = EmojiPicker;
 		};
 		4C06670328FC7EC500038D2A /* Kingfisher */ = {
 			isa = XCSwiftPackageProductDependency;
@@ -4342,6 +4436,11 @@
 			package = 4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1" */;
 			productName = secp256k1;
 		};
+		D78DB8582C1CE9CA00F0AB12 /* SwipeActions */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = D78DB8572C1CE9CA00F0AB12 /* XCRemoteSwiftPackageReference "SwipeActions" */;
+			productName = SwipeActions;
+		};
 		D7A343ED2AD0D77C00CED48B /* InlineSnapshotTesting */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = D7A343EC2AD0D77C00CED48B /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;

damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,24 @@
 {
+  "originHash" : "babaf4d5748afecf49bbb702530d8e9576460692f478b0a50ee43195dd4440e2",
   "pins" : [
+    {
+      "identity" : "emojikit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tyiu/EmojiKit",
+      "state" : {
+        "revision" : "05805f72d63a6d6a2d7dc7fe14abd37c1317b11a",
+        "version" : "0.1.2"
+      }
+    },
+    {
+      "identity" : "emojipicker",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tyiu/EmojiPicker.git",
+      "state" : {
+        "revision" : "0c28b4a1a6b8840cf2580bda59517f6d0a733dc8",
+        "version" : "0.1.1"
+      }
+    },
     {
       "identity" : "gsplayer",
       "kind" : "remoteSourceControl",
@@ -18,15 +37,6 @@
         "version" : "7.6.1"
       }
     },
-    {
-      "identity" : "mcemojipicker",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/izyumkin/MCEmojiPicker",
-      "state" : {
-        "revision" : "e0b4903b75ae1cc418d276d84d1cb946b8a1d73c",
-        "version" : "1.2.3"
-      }
-    },
     {
       "identity" : "secp256k1.swift",
       "kind" : "remoteSourceControl",
@@ -35,6 +45,15 @@
         "revision" : "40b4b38b3b1c83f7088c76189a742870e0ca06a9"
       }
     },
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections.git",
+      "state" : {
+        "revision" : "ee97538f5b81ae89698fd95938896dec5217b148",
+        "version" : "1.1.1"
+      }
+    },
     {
       "identity" : "swift-markdown-ui",
       "kind" : "remoteSourceControl",
@@ -60,7 +79,25 @@
         "revision" : "74203046135342e4a4a627476dd6caf8b28fe11b",
         "version" : "509.0.0"
       }
+    },
+    {
+      "identity" : "swift-trie",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tyiu/swift-trie",
+      "state" : {
+        "revision" : "4c50bff6c168f74425f70476be62a072980d2da7",
+        "version" : "0.1.2"
+      }
+    },
+    {
+      "identity" : "swipeactions",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/aheze/SwipeActions",
+      "state" : {
+        "revision" : "41e6f6dce02d8cfa164f8c5461a41340850ca3ab",
+        "version" : "1.1.0"
+      }
     }
   ],
-  "version" : 2
+  "version" : 3
 }

damus/Assets.xcassets/Colors/DamusAdaptableGrey 2.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xD7",
+          "green" : "0xD1",
+          "red" : "0xD1"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x13",
+          "green" : "0x11",
+          "red" : "0x11"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Assets.xcassets/Colors/DamusAdaptableLighterGrey.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF9",
+          "green" : "0xF3",
+          "red" : "0xF3"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x25",
+          "green" : "0x22",
+          "red" : "0x22"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Assets.xcassets/Colors/DamusAdaptablePurpleBackground 1.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "244",
+          "green" : "218",
+          "red" : "244"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "92",
+          "green" : "45",
+          "red" : "93"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Assets.xcassets/Colors/DamusAdaptablePurpleBackground 2.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "236",
+          "green" : "194",
+          "red" : "238"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "109",
+          "green" : "49",
+          "red" : "111"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Assets.xcassets/Colors/DamusAdaptablePurpleForeground.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "197",
+          "green" : "67",
+          "red" : "204"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "255",
+          "green" : "194",
+          "red" : "255"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Assets.xcassets/Colors/DamusHighlight.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF2",
+          "green" : "0xD8",
+          "red" : "0xF4"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x45",
+          "green" : "0x17",
+          "red" : "0x47"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Components/DamusColors.swift

@@ -10,6 +10,11 @@ import SwiftUI
 
 class DamusColors {
     static let adaptableGrey = Color("DamusAdaptableGrey")
+    static let adaptableGrey2 = Color("DamusAdaptableGrey 2")
+    static let adaptableLighterGrey = Color("DamusAdaptableLighterGrey")
+    static let adaptablePurpleBackground = Color("DamusAdaptablePurpleBackground 1")
+    static let adaptablePurpleBackground2 = Color("DamusAdaptablePurpleBackground 2")
+    static let adaptablePurpleForeground = Color("DamusAdaptablePurpleForeground")
     static let adaptableBlack = Color("DamusAdaptableBlack")
     static let adaptableWhite = Color("DamusAdaptableWhite")
     static let white = Color("DamusWhite")
@@ -23,6 +28,7 @@ class DamusColors {
     static let green = Color("DamusGreen")
     static let purple = Color("DamusPurple")
     static let deepPurple = Color("DamusDeepPurple")
+    static let highlight = Color("DamusHighlight")
     static let blue = Color("DamusBlue")
     static let bitcoin = Color("Bitcoin")
     static let success = Color("DamusSuccessPrimary")

damus/Components/SelectableText.swift

@@ -9,16 +9,20 @@ import UIKit
 import SwiftUI
 
 struct SelectableText: View {
-    
+    let damus_state: DamusState
+    let event: NostrEvent?
     let attributedString: AttributedString
     let textAlignment: NSTextAlignment
-    
+    @State private var showHighlightPost = false
+    @State private var selectedText = ""
     @State private var selectedTextHeight: CGFloat = .zero
     @State private var selectedTextWidth: CGFloat = .zero
-    
+
     let size: EventViewKind
-    
+
-    init(attributedString: AttributedString, textAlignment: NSTextAlignment? = nil, size: EventViewKind) {
+    init(damus_state: DamusState, event: NostrEvent?, attributedString: AttributedString, textAlignment: NSTextAlignment? = nil, size: EventViewKind) {
+        self.damus_state = damus_state
+        self.event = event
         self.attributedString = attributedString
         self.textAlignment = textAlignment ?? NSTextAlignment.natural
         self.size = size
@@ -32,6 +36,9 @@ struct SelectableText: View {
                 font: eventviewsize_to_uifont(size),
                 fixedWidth: selectedTextWidth,
                 textAlignment: self.textAlignment,
+                enableHighlighting: self.enableHighlighting(),
+                showHighlightPost: $showHighlightPost,
+                selectedText: $selectedText,
                 height: $selectedTextHeight
             )
             .padding([.leading, .trailing], -1.0)
@@ -46,8 +53,48 @@ struct SelectableText: View {
                 self.selectedTextWidth = newSize.width
             }
         }
+        .sheet(isPresented: $showHighlightPost) {
+            if let event {
+                HighlightPostView(damus_state: damus_state, event: event, selectedText: $selectedText)
+                    .presentationDragIndicator(.visible)
+                    .presentationDetents([.height(selectedTextHeight + 150), .medium, .large])
+            }
+        }
         .frame(height: selectedTextHeight)
     }
+    
+    func enableHighlighting() -> Bool {
+        self.event != nil
+    }
+}
+
+fileprivate class TextView: UITextView {
+    @Binding var showHighlightPost: Bool
+    @Binding var selectedText: String
+
+    init(frame: CGRect, textContainer: NSTextContainer?, showHighlightPost: Binding<Bool>, selectedText: Binding<String>) {
+        self._showHighlightPost = showHighlightPost
+        self._selectedText = selectedText
+        super.init(frame: frame, textContainer: textContainer)
+    }
+
+    required init?(coder: NSCoder) {
+            fatalError("init(coder:) has not been implemented")
+        }
+
+    override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {
+        if action == #selector(highlightText(_:)) {
+            return true
+        }
+        return super.canPerformAction(action, withSender: sender)
+    }
+
+    @objc public func highlightText(_ sender: Any?) {
+        guard let selectedRange = self.selectedTextRange else { return }
+        selectedText = self.text(in: selectedRange) ?? ""
+        showHighlightPost.toggle()
+    }
+
 }
 
  fileprivate struct TextViewRepresentable: UIViewRepresentable {
@@ -57,11 +104,13 @@ struct SelectableText: View {
     let font: UIFont
     let fixedWidth: CGFloat
     let textAlignment: NSTextAlignment
-
+    let enableHighlighting: Bool
+    @Binding var showHighlightPost: Bool
+    @Binding var selectedText: String
     @Binding var height: CGFloat
 
-    func makeUIView(context: UIViewRepresentableContext<Self>) -> UITextView {
+    func makeUIView(context: UIViewRepresentableContext<Self>) -> TextView {
-        let view = UITextView()
+        let view = TextView(frame: .zero, textContainer: nil, showHighlightPost: $showHighlightPost, selectedText: $selectedText)
         view.isEditable = false
         view.dataDetectorTypes = .all
         view.isSelectable = true
@@ -71,10 +120,15 @@ struct SelectableText: View {
         view.textContainerInset.left = 1.0
         view.textContainerInset.right = 1.0
         view.textAlignment = textAlignment
+
+        let menuController = UIMenuController.shared
+        let highlightItem = UIMenuItem(title: "Highlight", action: #selector(view.highlightText(_:)))
+        menuController.menuItems = self.enableHighlighting ? [highlightItem] : []
+
         return view
     }
 
-    func updateUIView(_ uiView: UITextView, context: UIViewRepresentableContext<Self>) {
+    func updateUIView(_ uiView: TextView, context: UIViewRepresentableContext<Self>) {
         let mutableAttributedString = createNSAttributedString()
         uiView.attributedText = mutableAttributedString
         uiView.textAlignment = self.textAlignment

damus/Components/TranslateView.swift

@@ -51,9 +51,9 @@ struct TranslateView: View {
                 .foregroundColor(.gray)
                 .font(.footnote)
                 .padding([.top, .bottom], 10)
-            
+
             if self.size == .selected {
-                SelectableText(attributedString: artifacts.content.attributed, size: self.size)
+                SelectableText(damus_state: damus_state, event: event, attributedString: artifacts.content.attributed, size: self.size)
             } else {
                 artifacts.content.text
                     .font(eventviewsize_to_font(self.size, font_size: font_size))

damus/Components/TruncatedText.swift

@@ -10,10 +10,12 @@ import SwiftUI
 struct TruncatedText: View {
     let text: CompatibleText
     let maxChars: Int
+    let show_show_more_button: Bool
     
-    init(text: CompatibleText, maxChars: Int = 280) {
+    init(text: CompatibleText, maxChars: Int = 280, show_show_more_button: Bool) {
         self.text = text
         self.maxChars = maxChars
+        self.show_show_more_button = show_show_more_button
     }
     
     var body: some View {
@@ -29,8 +31,10 @@ struct TruncatedText: View {
         
         if truncatedAttributedString != nil {
             Spacer()
-            Button(NSLocalizedString("Show more", comment: "Button to show entire note.")) { }
+            if self.show_show_more_button {
-                .allowsHitTesting(false)
+                Button(NSLocalizedString("Show more", comment: "Button to show entire note.")) { }
+                    .allowsHitTesting(false)
+            }
         }
     }
 }
@@ -38,10 +42,10 @@ struct TruncatedText: View {
 struct TruncatedText_Previews: PreviewProvider {
     static var previews: some View {
         VStack(spacing: 100) {
-            TruncatedText(text: CompatibleText(stringLiteral: "hello\nthere\none\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\neleven"))
+            TruncatedText(text: CompatibleText(stringLiteral: "hello\nthere\none\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\neleven"), show_show_more_button: true)
                 .frame(width: 200, height: 200)
             
-            TruncatedText(text: CompatibleText(stringLiteral: "hello\nthere\none\ntwo\nthree\nfour"))
+            TruncatedText(text: CompatibleText(stringLiteral: "hello\nthere\none\ntwo\nthree\nfour"), show_show_more_button: true)
                 .frame(width: 200, height: 200)
         }
     }

damus/ContentParsing.swift

@@ -59,66 +59,57 @@ func parse_note_content(content: NoteContent) -> Blocks {
     }
 }
 
-func interpret_event_refs_ndb(blocks: [Block], tags: TagsSequence) -> [EventRef] {
+func interpret_event_refs(tags: TagsSequence) -> ThreadReply? {
-    if tags.count == 0 {
+    // migration is long over, lets just do this to fix tests
-        return []
+    return interpret_event_refs_ndb(tags: tags)
-    }
-    
-    /// 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 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
+    return interp_event_refs_without_mentions_ndb(References<NoteRef>(tags: tags))
-    var evrefs: [EventRef] = []
+}
+
+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 {
+        if let marker = ref.marker {
-            first_ref = ref
+            any_marker = true
-            evrefs.append(.thread_id(ref))
+            switch marker {
-            first = false
+            case .root: root_id = ref
-        } else {
+            case .reply: reply_id = ref
-
+            case .mention: mention = ref
-            evrefs.append(.reply(ref))
+            }
-        }
+        // deprecated form, only activate if we don't have any markers set
-        count += 1
+        } else if !any_marker {
-    }
+            if first {
-
+                root_id = ref
-    if let first_ref, count == 1 {
+                first = false
-        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)))
             } else {
-                ev_refs.append(note_id)
+                reply_id = ref
             }
         }
-        i += 1
     }
-    
+
-    var replies = interp_event_refs_without_mentions(ev_refs)
+    // If either reply or root_id is blank while the other is not, then this is
-    replies.append(contentsOf: mentions)
+    // considered reply-to-root. We should always have a root and reply tag, if they
-    return replies
+    // 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) })
 }

damus/ContentView.swift

@@ -8,6 +8,7 @@
 import SwiftUI
 import AVKit
 import MediaPlayer
+import EmojiPicker
 
 struct ZapSheet {
     let target: ZapTarget
@@ -308,7 +309,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 +700,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(),
@@ -719,7 +720,8 @@ struct ContentView: View {
                                       music: MusicController(onChange: music_changed),
                                       video: VideoController(),
                                       ndb: ndb,
-                                      quote_reposts: .init(our_pubkey: pubkey)
+                                      quote_reposts: .init(our_pubkey: pubkey),
+                                      emoji_provider: DefaultEmojiProvider(showAllVariations: true)
         )
         
         home.damus_state = self.damus_state!

damus/Models/ContentFilters.swift

@@ -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
         }

damus/Models/CreateAccountModel.swift

@@ -9,31 +9,31 @@ import Foundation
 
 
 class CreateAccountModel: ObservableObject {
-    @Published var real_name: String = ""
+    @Published var display_name: String = ""
-    @Published var nick_name: String = ""
+    @Published var name: String = ""
     @Published var about: String = ""
     @Published var pubkey: Pubkey = .empty
     @Published var privkey: Privkey = .empty
     @Published var profile_image: URL? = nil
 
     var rendered_name: String {
-        if real_name.isEmpty {
+        if display_name.isEmpty {
-            return nick_name
+            return name
         }
-        return real_name
+        return display_name
     }
     
     var keypair: Keypair {
         return Keypair(pubkey: self.pubkey, privkey: self.privkey)
     }
     
-    init(real: String = "", nick: String = "", about: String = "") {
+    init(display_name: String = "", name: String = "", about: String = "") {
         let keypair = generate_new_keypair()
         self.pubkey = keypair.pubkey
         self.privkey = keypair.privkey
 
-        self.real_name = real
+        self.display_name = display_name
-        self.nick_name = nick
+        self.name = name
         self.about = about
     }
 }

damus/Models/DamusState.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import LinkPresentation
+import EmojiPicker
 
 class DamusState: HeadlessDamusState {
     let pool: RelayPool
@@ -36,8 +37,10 @@ class DamusState: HeadlessDamusState {
     let video: VideoController
     let ndb: Ndb
     var purple: DamusPurple
+    var push_notification_client: PushNotificationClient
+    let emoji_provider: EmojiProvider
 
-    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) {
+    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, emoji_provider: EmojiProvider) {
         self.pool = pool
         self.keypair = keypair
         self.likes = likes
@@ -68,6 +71,8 @@ class DamusState: HeadlessDamusState {
             keypair: keypair
         )
         self.quote_reposts = quote_reposts
+        self.push_notification_client = PushNotificationClient(keypair: keypair, settings: settings)
+        self.emoji_provider = emoji_provider
     }
 
     @discardableResult
@@ -97,6 +102,7 @@ class DamusState: HeadlessDamusState {
 
     func close() {
         print("txn: damus close")
+        wallet.disconnect()
         pool.close()
         ndb.close()
     }
@@ -112,7 +118,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(),
@@ -132,7 +138,8 @@ class DamusState: HeadlessDamusState {
             music: nil,
             video: VideoController(),
             ndb: .empty,
-            quote_reposts: .init(our_pubkey: empty_pub)
+            quote_reposts: .init(our_pubkey: empty_pub),
+            emoji_provider: DefaultEmojiProvider(showAllVariations: true)
         )
     }
 }

damus/Models/EventRef.swift

@@ -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
-    }
-}

damus/Models/HighlightEvent.swift

@@ -0,0 +1,34 @@
+//
+//  HighlightEvent.swift
+//  damus
+//
+//  Created by eric on 4/22/24.
+//
+
+import Foundation
+
+struct HighlightEvent {
+    let event: NostrEvent
+
+    var event_ref: String? = nil
+    var url_ref: URL? = nil
+    var context: String? = nil
+
+    static func parse(from ev: NostrEvent) -> HighlightEvent {
+        var highlight = HighlightEvent(event: ev)
+
+        for tag in ev.tags {
+            guard tag.count >= 2 else { continue }
+            switch tag[0].string() {
+            case "e":   highlight.event_ref = tag[1].string()
+            case "a":   highlight.event_ref = tag[1].string()
+            case "r":   highlight.url_ref = URL(string: tag[1].string())
+            case "context": highlight.context = tag[1].string()
+            default:
+                break
+            }
+        }
+
+        return highlight
+    }
+}

damus/Models/HomeModel.swift

@@ -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
     
@@ -180,7 +184,7 @@ class HomeModel: ContactsDelegate {
         }
 
         switch kind {
-        case .chat, .longform, .text:
+        case .chat, .longform, .text, .highlight:
             handle_text_event(sub_id: sub_id, ev)
         case .contacts:
             handle_contact_event(sub_id: sub_id, relay_id: relay_id, ev: ev)
@@ -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)
 
@@ -581,7 +586,7 @@ class HomeModel: ContactsDelegate {
     func subscribe_to_home_filters(friends fs: [Pubkey]? = nil, relay_id: RelayURL? = nil) {
         // TODO: separate likes?
         var home_filter_kinds: [NostrKind] = [
-            .text, .longform, .boost
+            .text, .longform, .boost, .highlight
         ]
         if !damus_state.settings.onlyzaps_mode {
             home_filter_kinds.append(.like)
@@ -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 {
+func should_show_event(state: DamusState, ev: NostrEvent) -> Bool {
-    let event_muted = state.mutelist_manager.is_event_muted(ev, keypair: keypair)
+    let event_muted = state.mutelist_manager.is_event_muted(ev)
     if event_muted {
         return false
     }

damus/Models/Mentions.swift

@@ -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: "")

damus/Models/MutelistManager.swift

@@ -8,12 +8,27 @@
 import Foundation
 
 class MutelistManager {
+    let user_keypair: Keypair
     private(set) var event: NostrEvent? = nil
 
-    var users: Set<MuteItem> = []
+    var users: Set<MuteItem> = [] {
-    var hashtags: Set<MuteItem> = []
+        didSet { self.reset_cache() }
-    var threads: Set<MuteItem> = []
+    }
-    var words: Set<MuteItem> = []
+    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 {
+    func is_event_muted(_ ev: NostrEvent) -> Bool {
-        return event_muted_reason(ev, keypair: keypair) != nil
+        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
+            }
+        }
+    }
 }

damus/Models/NotificationsManager.swift

@@ -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
     }
 

damus/Models/Post.swift

@@ -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
     }

damus/Models/ProfileModel.swift

@@ -60,11 +60,11 @@ class ProfileModel: ObservableObject, Equatable {
         damus.pool.unsubscribe(sub_id: sub_id)
         damus.pool.unsubscribe(sub_id: prof_subid)
     }
-    
+
     func subscribe() {
-        var text_filter = NostrFilter(kinds: [.text, .longform])
+        var text_filter = NostrFilter(kinds: [.text, .longform, .highlight])
         var profile_filter = NostrFilter(kinds: [.contacts, .metadata, .boost])
-        
+
         profile_filter.authors = [pubkey]
         
         text_filter.authors = [pubkey]

damus/Models/PushNotificationClient.swift

@@ -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)
+    }
+}

damus/Models/SearchHomeModel.swift

@@ -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

damus/Models/SearchModel.swift

@@ -36,7 +36,7 @@ class SearchModel: ObservableObject {
     func subscribe() {
         // since 1 month
         search.limit = self.limit
-        search.kinds = [.text, .like, .longform]
+        search.kinds = [.text, .like, .longform, .highlight]
 
         //likes_filter.ids = ref_events.referenced_ids!
 

damus/Models/ThreadModel.swift

@@ -20,7 +20,13 @@ class ThreadModel: ObservableObject {
         self.original_event = event
         add_event(event, keypair: damus_state.keypair)
     }
-    
+
+    func events() -> [NostrEvent] {
+        return Array(event_map).sorted(by: { a, b in
+            return a.created_at < b.created_at
+        })
+    }
+
     var is_original: Bool {
         return original_event.id == event.id
     }
@@ -60,7 +66,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]

damus/Models/Trie.swift

@@ -1,129 +0,0 @@
-//
-//  Trie.swift
-//  damus
-//
-//  Created by Terry Yiu on 6/26/23.
-//
-
-import Foundation
-
-/// Tree data structure of all the substring permutations of a collection of strings optimized for searching for values of type V.
-///
-/// Each node in the tree can have child nodes.
-/// Each node represents a single character in substrings, and each of its child nodes represent the subsequent character in those substrings.
-///
-/// A node that has no children mean that there are no substrings with any additional characters beyond the branch of letters leading up to that node.
-///
-/// A node that has values mean that there are strings that end in the character represented by the node and contain the substring represented by the branch of letters leading up to that node.
-///
-/// https://en.wikipedia.org/wiki/Trie
-class Trie<V: Hashable> {
-    private var children: [Character : Trie] = [:]
-
-    /// Separate exact matches from strict substrings so that exact matches appear first in returned results.
-    private var exactMatchValues = Set<V>()
-    private var substringMatchValues = Set<V>()
-
-    private var parent: Trie? = nil
-}
-
-extension Trie {
-    var hasChildren: Bool {
-        return !self.children.isEmpty
-    }
-
-    var hasValues: Bool {
-        return !self.exactMatchValues.isEmpty || !self.substringMatchValues.isEmpty
-    }
-
-    /// Finds the branch that matches the specified key and returns the values from all of its descendant nodes.
-    func find(key: String) -> [V] {
-        var currentNode = self
-
-        // Find branch with matching prefix.
-        for char in key {
-            if let child = currentNode.children[char] {
-                currentNode = child
-            } else {
-                return []
-            }
-        }
-
-        // Perform breadth-first search from matching branch and collect values from all descendants.
-        var substringMatches = Set<V>(currentNode.substringMatchValues)
-        var queue = Array(currentNode.children.values)
-
-        while !queue.isEmpty {
-            let node = queue.removeFirst()
-            substringMatches.formUnion(node.exactMatchValues)
-            substringMatches.formUnion(node.substringMatchValues)
-            queue.append(contentsOf: node.children.values)
-        }
-
-        // Prioritize exact matches to be returned first, and then remove exact matches from the set of partial substring matches that are appended afterward.
-        return Array(currentNode.exactMatchValues) + (substringMatches.subtracting(currentNode.exactMatchValues))
-    }
-
-    /// Inserts value of type V into this trie for the specified key. This function stores all substring endings of the key, not only the key itself.
-    /// Runtime performance is O(n^2) and storage cost is O(n), where n is the number of characters in the key.
-    func insert(key: String, value: V) {
-        // Create root branches for each character of the key to enable substring searches instead of only just prefix searches.
-        // Hence the nested loop.
-        for i in 0..<key.count {
-            var currentNode = self
-
-            // Find branch with matching prefix.
-            for char in key[key.index(key.startIndex, offsetBy: i)...] {
-                if let child = currentNode.children[char] {
-                    currentNode = child
-                } else {
-                    let child = Trie()
-                    child.parent = currentNode
-                    currentNode.children[char] = child
-                    currentNode = child
-                }
-            }
-
-            if i == 0 {
-                currentNode.exactMatchValues.insert(value)
-            } else {
-                currentNode.substringMatchValues.insert(value)
-            }
-        }
-    }
-
-    /// Removes value of type V from this trie for the specified key.
-    func remove(key: String, value: V) {
-        for i in 0..<key.count {
-            var currentNode = self
-
-            var foundLeafNode = true
-
-            // Find branch with matching prefix.
-            for j in i..<key.count {
-                let char = key[key.index(key.startIndex, offsetBy: j)]
-
-                if let child = currentNode.children[char] {
-                    currentNode = child
-                } else {
-                    foundLeafNode = false
-                    break
-                }
-            }
-
-            if foundLeafNode {
-                currentNode.exactMatchValues.remove(value)
-                currentNode.substringMatchValues.remove(value)
-
-                // Clean up the tree if this leaf node no longer holds values or children.
-                for j in (i..<key.count).reversed() {
-                    if let parent = currentNode.parent, !currentNode.hasValues && !currentNode.hasChildren {
-                        currentNode = parent
-                        let char = key[key.index(key.startIndex, offsetBy: j)]
-                        currentNode.children.removeValue(forKey: char)
-                    }
-                }
-            }
-        }
-    }
-}

damus/Models/UserSearchCache.swift

@@ -1,116 +0,0 @@
-//
-//  UserSearchCache.swift
-//  damus
-//
-//  Created by Terry Yiu on 6/27/23.
-//
-
-import Foundation
-
-/// Cache of searchable users by name, display_name, NIP-05 identifier, or own contact list petname.
-/// Optimized for fast searches of substrings by using a Trie.
-/// Optimal for performing user searches that could be initiated by typing quickly on a keyboard into a text input field.
-
-// TODO: replace with lmdb (the b tree should handle this just fine ?)
-//       we just need a name to profile index
-class UserSearchCache {
-    private let trie = Trie<Pubkey>()
-
-    func search(key: String) -> [Pubkey] {
-        let results = trie.find(key: key)
-        return results
-    }
-
-    /// Computes the differences between an old profile, if it exists, and a new profile, and updates the user search cache accordingly.
-    @MainActor
-    func updateProfile(id: Pubkey, profiles: Profiles, oldProfile: Profile?, newProfile: Profile) {
-        // Remove searchable keys tied to the old profile if they differ from the new profile
-        // to keep the trie clean without empty nodes while avoiding excessive graph searching.
-        if let oldProfile {
-            if let oldName = oldProfile.name, newProfile.name?.caseInsensitiveCompare(oldName) != .orderedSame {
-                trie.remove(key: oldName.lowercased(), value: id)
-            }
-            if let oldDisplayName = oldProfile.display_name, newProfile.display_name?.caseInsensitiveCompare(oldDisplayName) != .orderedSame {
-                trie.remove(key: oldDisplayName.lowercased(), value: id)
-            }
-            if let oldNip05 = oldProfile.nip05, newProfile.nip05?.caseInsensitiveCompare(oldNip05) != .orderedSame {
-                trie.remove(key: oldNip05.lowercased(), value: id)
-            }
-        }
-
-        addProfile(id: id, profiles: profiles, profile: newProfile)
-    }
-
-    /// Adds a profile to the user search cache.
-    @MainActor
-    private func addProfile(id: Pubkey, profiles: Profiles, profile: Profile) {
-        // Searchable by name.
-        if let name = profile.name {
-            trie.insert(key: name.lowercased(), value: id)
-        }
-
-        // Searchable by display name.
-        if let displayName = profile.display_name {
-            trie.insert(key: displayName.lowercased(), value: id)
-        }
-
-        // Searchable by NIP-05 identifier.
-        if let nip05 = profiles.is_validated(id) {
-            trie.insert(key: "\(nip05.username.lowercased())@\(nip05.host.lowercased())", value: id)
-        }
-    }
-
-    /// Computes the diffences between an old contacts event and a new contacts event for our own user, and updates the search cache accordingly.
-    func updateOwnContactsPetnames(id: Pubkey, oldEvent: NostrEvent?, newEvent: NostrEvent) {
-        guard newEvent.known_kind == .contacts && newEvent.pubkey == id else {
-            return
-        }
-
-        var petnames: [Pubkey: String] = [:]
-        for tag in newEvent.tags {
-            guard tag.count > 3,
-                  let chr = tag[0].single_char, chr == "p",
-                  let id = tag[1].id()
-            else {
-                return
-            }
-
-            let pubkey = Pubkey(id)
-
-            petnames[pubkey] = tag[3].string()
-        }
-
-        // Compute the diff with the old contacts list, if it exists,
-        // mark the ones that are the same to not be removed from the user search cache,
-        // and remove the old ones that are different from the user search cache.
-        if let oldEvent, oldEvent.known_kind == .contacts, oldEvent.pubkey == id {
-            for tag in oldEvent.tags {
-                guard tag.count >= 4,
-                      tag[0].matches_char("p"),
-                      let id = tag[1].id()
-                else {
-                    return
-                }
-
-                let pubkey = Pubkey(id)
-
-                let oldPetname = tag[3].string()
-
-                if let newPetname = petnames[pubkey] {
-                    if newPetname.caseInsensitiveCompare(oldPetname) == .orderedSame {
-                        petnames.removeValue(forKey: pubkey)
-                    } else {
-                        trie.remove(key: oldPetname, value: pubkey)
-                    }
-                } else {
-                    trie.remove(key: oldPetname, value: pubkey)
-                }
-            }
-        }
-
-        // Add the new petnames to the user search cache.
-        for (pubkey, petname) in petnames {
-            trie.insert(key: petname, value: pubkey)
-        }
-    }
-}

damus/Models/UserSettingsStore.swift

@@ -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 {

damus/NIP10/ThreadReply.swift

@@ -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
+    }
+}

damus/Nostr/NostrFilter.swift

@@ -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) })
+            }
+        }
+    }
 }

damus/Nostr/NostrKind.swift

@@ -22,6 +22,7 @@ enum NostrKind: UInt32, Codable {
     case longform = 30023
     case zap = 9735
     case zap_request = 9734
+    case highlight = 9802
     case nwc_request = 23194
     case nwc_response = 23195
     case http_auth = 27235

damus/Util/Constants.swift

@@ -10,8 +10,10 @@ import Foundation
 class Constants {
     //static let EXAMPLE_DEMOS: DamusState = .empty
     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_PRODUCTION_URL: URL = URL(string: "http://45.33.32.5: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: "http://45.33.32.5: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"
     

damus/Util/EventCache.swift

@@ -97,13 +97,13 @@ class EventCache {
     // TODO: remove me and change code to use ndb directly
     private let ndb: Ndb
     private var events: [NoteId: NostrEvent] = [:]
-    private var replies = ReplyMap()
     private var cancellable: AnyCancellable?
     private var image_metadata: [String: ImageMetadataState] = [:] // lowercased URL key
     private var event_data: [NoteId: EventData] = [:]
+    var replies = ReplyMap()
 
     //private var thread_latest: [String: Int64]
-    
+
     init(ndb: Ndb) {
         self.ndb = ndb
         cancellable = NotificationCenter.default.publisher(
@@ -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,11 +183,11 @@ 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)
         }
     }
-    
+
     func child_events(event: NostrEvent) -> [NostrEvent] {
         guard let xs = replies.lookup(event.id) else {
             return []
@@ -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) {

damus/Util/Extensions/Array.swift

@@ -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 })
+    }
+}

damus/Util/Extensions/VectorMath.swift

@@ -0,0 +1,27 @@
+//
+//  VectorMath.swift
+//  damus
+//
+//  Created by Daniel D’Aquino on 2024-06-17.
+//
+
+import Foundation
+
+extension CGPoint {
+    /// Summing a vector to a point
+    static func +(lhs: CGPoint, rhs: CGVector) -> CGPoint {
+        return CGPoint(x: lhs.x + rhs.dx, y: lhs.y + rhs.dy)
+    }
+    
+    /// Subtracting a vector from a point
+    static func -(lhs: CGPoint, rhs: CGVector) -> CGPoint {
+        return CGPoint(x: lhs.x - rhs.dx, y: lhs.y - rhs.dy)
+    }
+}
+
+extension CGVector {
+    /// Multiplying a vector by a scalar
+    static func *(lhs: CGVector, rhs: CGFloat) -> CGVector {
+        return CGVector(dx: lhs.dx * rhs, dy: lhs.dy * rhs)
+    }
+}

damus/Util/ReplyCounter.swift

@@ -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
             }

damus/Util/Router.swift

@@ -79,13 +79,13 @@ 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):
             TranslationSettingsView(settings: settings, damus_state: damusState)
         case .ReactionsSettings(let settings):
-            ReactionsSettingsView(settings: settings)
+            ReactionsSettingsView(settings: settings, damus_state: damusState)
         case .SearchSettings(let settings):
             SearchSettingsView(settings: settings)
         case .DeveloperSettings(let settings):
@@ -93,7 +93,8 @@ enum Route: Hashable {
         case .FirstAidSettings(settings: let settings):
             FirstAidSettingsView(damus_state: damusState, settings: settings)
         case .Thread(let thread):
-            ThreadView(state: damusState, thread: thread)
+            ChatroomThreadView(damus: damusState, thread: thread)
+            //ThreadView(state: damusState, thread: thread)
         case .Reposts(let reposts):
             RepostsView(damus_state: damusState, model: reposts)
         case .QuoteReposts(let quote_reposts):

damus/Views/ActionBar/EventActionBar.swift

@@ -6,28 +6,34 @@
 //
 
 import SwiftUI
-import MCEmojiPicker
+import EmojiPicker
+import EmojiKit
+import SwipeActions
 
 struct EventActionBar: View {
     let damus_state: DamusState
     let event: NostrEvent
     let generator = UIImpactFeedbackGenerator(style: .medium)
     let userProfile : ProfileModel
+    let swipe_context: SwipeContext?
+    let options: Options
     
     // just used for previews
     @State var show_share_sheet: Bool = false
     @State var show_share_action: Bool = false
     @State var show_repost_action: Bool = false
 
-    @State private var isOnTopHalfOfScreen: Bool = false
+    @State private var selectedEmoji: Emoji? = nil
 
     @ObservedObject var bar: ActionBarModel
     
-    init(damus_state: DamusState, event: NostrEvent, bar: ActionBarModel? = nil) {
+    init(damus_state: DamusState, event: NostrEvent, bar: ActionBarModel? = nil, options: Options = [], swipe_context: SwipeContext? = nil) {
         self.damus_state = damus_state
         self.event = event
         _bar = ObservedObject(wrappedValue: bar ?? make_actionbar_model(ev: event.id, damus: damus_state))
         self.userProfile = ProfileModel(pubkey: event.pubkey, damus: damus_state)
+        self.options = options
+        self.swipe_context = swipe_context
     }
     
     var lnurl: String? {
@@ -44,60 +50,176 @@ struct EventActionBar: View {
         return true
     }
     
-    var body: some View {
+    var space_if_spread: AnyView {
-        HStack {
+        if options.contains(.no_spread) {
-            if damus_state.keypair.privkey != nil {
+            return AnyView(EmptyView())
-                HStack(spacing: 4) {
-                    EventActionButton(img: "bubble2", col: bar.replied ? DamusColors.purple : Color.gray) {
-                        notify(.compose(.replying_to(event)))
-                    }
-                    .accessibilityLabel(NSLocalizedString("Reply", comment: "Accessibility label for reply button"))
-                    Text(verbatim: "\(bar.replies > 0 ? "\(bar.replies)" : "")")
-                        .font(.footnote.weight(.medium))
-                        .foregroundColor(bar.replied ? DamusColors.purple : Color.gray)
-                }
-            }
-            Spacer()
-            HStack(spacing: 4) {
-                
-                EventActionButton(img: "repost", col: bar.boosted ? Color.green : nil) {
-                    self.show_repost_action = true
-                }
-                .accessibilityLabel(NSLocalizedString("Reposts", comment: "Accessibility label for boosts button"))
-                Text(verbatim: "\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
-                    .font(.footnote.weight(.medium))
-                    .foregroundColor(bar.boosted ? Color.green : Color.gray)
-            }
-
-            if show_like {
-                Spacer()
-
-                HStack(spacing: 4) {
-                    LikeButton(damus_state: damus_state, liked: bar.liked, liked_emoji: bar.our_like != nil ? to_reaction_emoji(ev: bar.our_like!) : nil, isOnTopHalfOfScreen: $isOnTopHalfOfScreen) { emoji in
-                        if bar.liked {
-                            //notify(.delete, bar.our_like)
-                        } else {
-                            send_like(emoji: emoji)
-                        }
-                    }
-
-                    Text(verbatim: "\(bar.likes > 0 ? "\(bar.likes)" : "")")
-                        .font(.footnote.weight(.medium))
-                        .nip05_colorized(gradient: bar.liked)
-                }
-            }
-
-            if let lnurl = self.lnurl {
-                Spacer()
-                NoteZapButton(damus_state: damus_state, target: ZapTarget.note(id: event.id, author: event.pubkey), lnurl: lnurl, zaps: self.damus_state.events.get_cache_data(self.event.id).zaps_model)
-            }
-
-            Spacer()
-            EventActionButton(img: "upload", col: Color.gray) {
-                show_share_action = true
-            }
-            .accessibilityLabel(NSLocalizedString("Share", comment: "Button to share a note"))
         }
+        else {
+            return AnyView(Spacer())
+        }
+    }
+    
+    // MARK: Swipe action menu buttons
+    
+    var reply_swipe_button: some View {
+        SwipeAction(systemImage: "arrowshape.turn.up.left.fill", backgroundColor: DamusColors.adaptableGrey) {
+            notify(.compose(.replying_to(event)))
+            self.swipe_context?.state.wrappedValue = .closed
+        }
+        .allowSwipeToTrigger()
+        .swipeButtonStyle()
+        .accessibilityLabel(NSLocalizedString("Reply", comment: "Accessibility label for reply button"))
+    }
+    
+    var repost_swipe_button: some View {
+        SwipeAction(image: "repost", backgroundColor: DamusColors.adaptableGrey) {
+            self.show_repost_action = true
+            self.swipe_context?.state.wrappedValue = .closed
+        }
+        .swipeButtonStyle()
+        .accessibilityLabel(NSLocalizedString("Repost or quote this note", comment: "Accessibility label for repost/quote button"))
+    }
+    
+    var like_swipe_button: some View {
+        SwipeAction(image: "shaka", backgroundColor: DamusColors.adaptableGrey) {
+            send_like(emoji: damus_state.settings.default_emoji_reaction)
+            self.swipe_context?.state.wrappedValue = .closed
+        }
+        .swipeButtonStyle()
+        .accessibilityLabel(NSLocalizedString("React with default reaction emoji", comment: "Accessibility label for react button"))
+    }
+    
+    var share_swipe_button: some View {
+        SwipeAction(image: "upload", backgroundColor: DamusColors.adaptableGrey) {
+            show_share_action = true
+            self.swipe_context?.state.wrappedValue = .closed
+        }
+        .swipeButtonStyle()
+        .accessibilityLabel(NSLocalizedString("Share externally", comment: "Accessibility label for external share button"))
+    }
+    
+    // MARK: Bar buttons
+    
+    var reply_button: some View {
+        HStack(spacing: 4) {
+            EventActionButton(img: "bubble2", col: bar.replied ? DamusColors.purple : Color.gray) {
+                notify(.compose(.replying_to(event)))
+            }
+            .accessibilityLabel(NSLocalizedString("Reply", comment: "Accessibility label for reply button"))
+            Text(verbatim: "\(bar.replies > 0 ? "\(bar.replies)" : "")")
+                .font(.footnote.weight(.medium))
+                .foregroundColor(bar.replied ? DamusColors.purple : Color.gray)
+        }
+    }
+    
+    var repost_button: some View {
+        HStack(spacing: 4) {
+            
+            EventActionButton(img: "repost", col: bar.boosted ? Color.green : nil) {
+                self.show_repost_action = true
+            }
+            .accessibilityLabel(NSLocalizedString("Reposts", comment: "Accessibility label for boosts button"))
+            Text(verbatim: "\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
+                .font(.footnote.weight(.medium))
+                .foregroundColor(bar.boosted ? Color.green : Color.gray)
+        }
+    }
+    
+    var like_button: some View {
+        HStack(spacing: 4) {
+            LikeButton(damus_state: damus_state, liked: bar.liked, liked_emoji: bar.our_like != nil ? to_reaction_emoji(ev: bar.our_like!) : nil) { emoji in
+                if bar.liked {
+                    //notify(.delete, bar.our_like)
+                } else {
+                    send_like(emoji: emoji)
+                }
+            }
+            
+            Text(verbatim: "\(bar.likes > 0 ? "\(bar.likes)" : "")")
+                .font(.footnote.weight(.medium))
+                .nip05_colorized(gradient: bar.liked)
+        }
+    }
+    
+    var share_button: some View {
+        EventActionButton(img: "upload", col: Color.gray) {
+            show_share_action = true
+        }
+        .accessibilityLabel(NSLocalizedString("Share", comment: "Button to share a note"))
+    }
+    
+    // MARK: Main views
+    
+    var swipe_action_menu_content: some View {
+        Group {
+            self.reply_swipe_button
+            self.repost_swipe_button
+            if show_like {
+                self.like_swipe_button
+            }
+        }
+    }
+    
+    var swipe_action_menu_reverse_content: some View {
+        Group {
+            if show_like {
+                self.like_swipe_button
+            }
+            self.repost_swipe_button
+            self.reply_swipe_button
+        }
+    }
+    
+    var action_bar_content: some View {
+        let hide_items_without_activity = options.contains(.hide_items_without_activity)
+        let should_hide_chat_bubble = hide_items_without_activity && bar.replies == 0
+        let should_hide_repost = hide_items_without_activity && bar.boosts == 0
+        let should_hide_reactions = hide_items_without_activity && bar.likes == 0
+        let zap_model = self.damus_state.events.get_cache_data(self.event.id).zaps_model
+        let should_hide_zap = hide_items_without_activity && zap_model.zap_total > 0
+        let should_hide_share_button = hide_items_without_activity
+
+        return HStack(spacing: options.contains(.no_spread) ? 10 : 0) {
+            if damus_state.keypair.privkey != nil && !should_hide_chat_bubble {
+                self.reply_button
+            }
+            
+            if !should_hide_repost {
+                self.space_if_spread
+                self.repost_button
+            }
+            
+            if show_like && !should_hide_reactions {
+                self.space_if_spread
+                self.like_button
+            }
+                
+            if let lnurl = self.lnurl, !should_hide_zap {
+                self.space_if_spread
+                NoteZapButton(damus_state: damus_state, target: ZapTarget.note(id: event.id, author: event.pubkey), lnurl: lnurl, zaps: zap_model)
+            }
+            
+            if !should_hide_share_button {
+                self.space_if_spread
+                self.share_button
+            }
+        }
+    }
+    
+    var content: some View {
+        if options.contains(.swipe_action_menu) {
+            AnyView(self.swipe_action_menu_content)
+        }
+        else if options.contains(.swipe_action_menu_reverse) {
+            AnyView(self.swipe_action_menu_reverse_content)
+        }
+        else {
+            AnyView(self.action_bar_content)
+        }
+    }
+    
+    var body: some View {
+        self.content
         .onAppear {
             self.bar.update(damus: damus_state, evid: self.event.id)
         }
@@ -136,20 +258,6 @@ struct EventActionBar: View {
                 self.bar.our_like = liked.event
             }
         }
-        .background(
-            GeometryReader { geometry in
-                EmptyView()
-                    .onAppear {
-                        let eventActionBarY = geometry.frame(in: .global).midY
-                        let screenMidY = UIScreen.main.bounds.midY
-                        self.isOnTopHalfOfScreen = eventActionBarY > screenMidY
-                    }
-                    .onChange(of: geometry.frame(in: .global).midY) { newY in
-                        let screenMidY = UIScreen.main.bounds.midY
-                        self.isOnTopHalfOfScreen = newY > screenMidY
-                    }
-            }
-        )
     }
 
     func send_like(emoji: String) {
@@ -164,6 +272,17 @@ struct EventActionBar: View {
         
         damus_state.postbox.send(like_ev)
     }
+    
+    // MARK: Helper structures
+    
+    struct Options: OptionSet {
+        let rawValue: UInt32
+        
+        static let no_spread = Options(rawValue: 1 << 0)
+        static let hide_items_without_activity = Options(rawValue: 1 << 1)
+        static let swipe_action_menu = Options(rawValue: 1 << 2)
+        static let swipe_action_menu_reverse = Options(rawValue: 1 << 3)
+    }
 }
 
 
@@ -183,7 +302,6 @@ struct LikeButton: View {
     let damus_state: DamusState
     let liked: Bool
     let liked_emoji: String?
-    @Binding var isOnTopHalfOfScreen: Bool
     let action: (_ emoji: String) -> Void
 
     // For reactions background
@@ -192,7 +310,7 @@ struct LikeButton: View {
 
     @State private var isReactionsVisible = false
 
-    @State private var selectedEmoji: String = ""
+    @State private var selectedEmoji: Emoji?
 
     // Following four are Shaka animation properties
     let timer = Timer.publish(every: 0.10, on: .main, in: .common).autoconnect()
@@ -231,6 +349,11 @@ struct LikeButton: View {
                     .foregroundColor(.gray)
             }
         }
+        .sheet(isPresented: $isReactionsVisible) {
+            NavigationView {
+                EmojiPickerView(selectedEmoji: $selectedEmoji, emojiProvider: damus_state.emoji_provider)
+            }.presentationDetents([.medium, .large])
+        }
         .accessibilityLabel(NSLocalizedString("Like", comment: "Accessibility Label for Like button"))
         .rotationEffect(Angle(degrees: shouldAnimate ? rotationAngle : 0))
         .onReceive(self.timer) { _ in
@@ -245,14 +368,10 @@ struct LikeButton: View {
                 amountOfAngleIncrease = 20.0
             }
         })
-        .emojiPicker(
-            isPresented: $isReactionsVisible,
-            selectedEmoji: $selectedEmoji,
-            arrowDirection: isOnTopHalfOfScreen ? .down : .up,
-            isDismissAfterChoosing: true
-        )
         .onChange(of: selectedEmoji) { newSelectedEmoji in
-            self.action(newSelectedEmoji)
+            if let newSelectedEmoji {
+                self.action(newSelectedEmoji.value)
+            }
         }
     }
 
@@ -299,7 +418,6 @@ struct LikeButton: View {
     }
 }
 
-
 struct EventActionBar_Previews: PreviewProvider {
     static var previews: some View {
         let ds = test_damus_state
@@ -324,7 +442,44 @@ struct EventActionBar_Previews: PreviewProvider {
             EventActionBar(damus_state: ds, event: ev, bar: extra_max_bar)
 
             EventActionBar(damus_state: ds, event: ev, bar: mega_max_bar)
+            
+            EventActionBar(damus_state: ds, event: ev, bar: bar, options: [.no_spread])
         }
         .padding(20)
     }
 }
+
+// MARK: Helpers
+
+fileprivate struct SwipeButtonStyle: ViewModifier {
+    func body(content: Content) -> some View {
+        content
+            .frame(width: 50, height: 50)
+            .clipShape(Circle())
+            .overlay(Circle().stroke(Color.damusAdaptableGrey2, lineWidth: 2))
+    }
+}
+
+fileprivate extension View {
+    func swipeButtonStyle() -> some View {
+        modifier(SwipeButtonStyle())
+    }
+}
+
+// MARK: Needed extensions for SwipeAction
+
+public extension SwipeAction where Label == Image, Background == Color {
+    init(
+        image: String,
+        backgroundColor: Color = Color.primary.opacity(0.1),
+        highlightOpacity: Double = 0.5,
+        action: @escaping () -> Void
+    ) {
+        self.init(action: action) { highlight in
+            Image(image)
+        } background: { highlight in
+            backgroundColor
+                .opacity(highlight ? highlightOpacity : 1)
+        }
+    }
+}

damus/Views/Chat/ChatBubbleView.swift

@@ -0,0 +1,184 @@
+//
+//  ChatBubbleView.swift
+//  damus
+//
+//  Created by Daniel D’Aquino on 2024-06-17.
+//
+
+import Foundation
+import SwiftUI
+
+/// Use this view to display content inside of a custom-designed chat bubble shape.
+struct ChatBubble<T: View, U: ShapeStyle, V: View>: View {
+    /// The direction at which the chat bubble tip will be pointing towards
+    let direction: Direction
+    let stroke_content: U
+    let stroke_style: StrokeStyle
+    let background_style: V
+    @ViewBuilder let content: T
+    
+    // Constants, which are loosely tied to `OFFSET_X` and `OFFSET_Y`
+    let OFFSET_X_PADDING: CGFloat = 6
+    let OFFSET_Y_BOTTOM_PADDING: CGFloat = 3
+    
+    var body: some View {
+        self.content
+            .padding(direction == .left ? .leading : .trailing, OFFSET_X_PADDING)
+            .padding(.bottom, OFFSET_Y_BOTTOM_PADDING)
+            .background(self.background_style)
+            .clipShape(
+                BubbleShape(direction: self.direction)
+            )
+            .overlay(
+                BubbleShape(direction: self.direction)
+                    .stroke(self.stroke_content, style: self.stroke_style)
+            )
+            .padding(direction == .left ? .leading : .trailing, -OFFSET_X_PADDING)
+            .padding(.bottom, -OFFSET_Y_BOTTOM_PADDING)
+    }
+    
+    enum Direction {
+        case right
+        case left
+    }
+    
+    struct BubbleShape: Shape {
+        /// The direction at which the chat bubble tip will be pointing towards
+        let direction: Direction
+        
+        // MARK: Constant parameters that defines the shape and look of the chat bubbles
+        
+        /// The corner radius of the round edges
+        let CORNER_RADIUS: CGFloat = 10
+        /// The height of the chat bubble tip detail
+        let DETAIL_HEIGHT: CGFloat = 10
+        /// The horizontal distance between the chat bubble tip and the vertical edge of the bubble
+        let OFFSET_X: CGFloat = 7
+        /// The vertical distance between the chat bubble tip and the bottom edge of the bubble
+        let OFFSET_Y: CGFloat = 5
+        /// Value between 0 and 1 that determines curvature of the upper chat bubble curve detail
+        let DETAIL_CURVE_FACTOR: CGFloat = 0.75
+        /// Value between 0 and 1 that determines curvature of the lower chat bubble curve detail
+        let LOWER_DETAIL_CURVE_FACTOR: CGFloat = 0.4
+        /// The horizontal distance between the chat bubble tip and the point at which the lower chat bubble curve detail attaches to the bottom of the chat bubble
+        let LOWER_DETAIL_ATTACHMENT_OFFSET_X: CGFloat = 20
+        
+        func path(in rect: CGRect) -> Path {
+            return self.direction == .left ? self.draw_left_bubble(in: rect) : self.draw_right_bubble(in: rect)
+        }
+        
+        func draw_left_bubble(in rect: CGRect) -> Path {
+            return Path { p in
+                // Start at the top left, just below the end of the corner radius
+                let start = CGPoint(x: OFFSET_X, y: CORNER_RADIUS)
+                // Left edge
+                p.move(to: start)
+                p.addLine(to: CGPoint(x: OFFSET_X, y: rect.height - DETAIL_HEIGHT))
+                // Draw the chat bubble tip
+                p.addLine(to: CGPoint(x: OFFSET_X, y: rect.height - DETAIL_HEIGHT))
+                let tip_of_bubble = CGPoint(x: 0, y: rect.height)
+                p.addQuadCurve(
+                    to: tip_of_bubble,
+                    control: CGPoint(x: 0, y: rect.height - DETAIL_HEIGHT) + CGVector(dx: OFFSET_X, dy: DETAIL_HEIGHT) * DETAIL_CURVE_FACTOR
+                )
+                let lower_detail_attachment = CGPoint(x: LOWER_DETAIL_ATTACHMENT_OFFSET_X, y: rect.height - OFFSET_Y)
+                p.addCurve(
+                    to: lower_detail_attachment,
+                    control1: tip_of_bubble + CGVector(dx: LOWER_DETAIL_ATTACHMENT_OFFSET_X, dy: 0) * LOWER_DETAIL_CURVE_FACTOR,
+                    control2: lower_detail_attachment - CGVector(dx: LOWER_DETAIL_ATTACHMENT_OFFSET_X, dy: 0) * LOWER_DETAIL_CURVE_FACTOR
+                )
+                // Draw the bottom edge
+                p.addLine(to: CGPoint(x: rect.width - CORNER_RADIUS, y: rect.height - OFFSET_Y))
+                // Draw the bottom right round corner
+                p.addQuadCurve(
+                    to: CGPoint(x: rect.width, y: rect.height - OFFSET_Y - CORNER_RADIUS),
+                    control: CGPoint(x: rect.width, y: rect.height - OFFSET_Y)
+                )
+                // Draw right edge
+                p.addLine(to: CGPoint(x: rect.width, y: CORNER_RADIUS))
+                // Draw top right round corner
+                p.addQuadCurve(
+                    to: CGPoint(x: rect.width - CORNER_RADIUS, y: 0),
+                    control: CGPoint(x: rect.width, y: 0)
+                )
+                // Draw top edge
+                p.addLine(to: CGPoint(x: CORNER_RADIUS + OFFSET_X, y: 0))
+                // Draw top left round corner
+                p.addQuadCurve(
+                    to: start,
+                    control: CGPoint(x: OFFSET_X, y: 0)
+                )
+            }
+        }
+        
+        func draw_right_bubble(in rect: CGRect) -> Path {
+            return Path { p in
+                // Start at the top right, just below the end of the corner radius
+                let right_edge = rect.width - OFFSET_X
+                let start = CGPoint(x: right_edge, y: CORNER_RADIUS)
+                p.move(to: start)
+                // Right edge
+                p.addLine(to: CGPoint(x: right_edge, y: rect.height - DETAIL_HEIGHT))
+                // Draw the chat bubble tip
+                let tip_of_bubble = CGPoint(x: rect.width, y: rect.height)
+                p.addQuadCurve(
+                    to: tip_of_bubble,
+                    control: CGPoint(x: rect.width, y: rect.height - DETAIL_HEIGHT) + CGVector(dx: -OFFSET_X, dy: DETAIL_HEIGHT) * DETAIL_CURVE_FACTOR
+                )
+                let lower_detail_attachment = CGPoint(x: rect.width - LOWER_DETAIL_ATTACHMENT_OFFSET_X, y: rect.height - OFFSET_Y)
+                p.addCurve(
+                    to: lower_detail_attachment,
+                    control1: tip_of_bubble - CGVector(dx: LOWER_DETAIL_ATTACHMENT_OFFSET_X, dy: 0) * LOWER_DETAIL_CURVE_FACTOR,
+                    control2: lower_detail_attachment + CGVector(dx: LOWER_DETAIL_ATTACHMENT_OFFSET_X, dy: 0) * LOWER_DETAIL_CURVE_FACTOR
+                )
+                // Draw the bottom edge
+                p.addLine(to: CGPoint(x: CORNER_RADIUS, y: rect.height - OFFSET_Y))
+                // Draw the bottom left round corner
+                p.addQuadCurve(
+                    to: CGPoint(x: 0, y: rect.height - OFFSET_Y - CORNER_RADIUS),
+                    control: CGPoint(x: 0, y: rect.height - OFFSET_Y)
+                )
+                // Draw left edge
+                p.addLine(to: CGPoint(x: 0, y: CORNER_RADIUS))
+                // Draw top right round corner
+                p.addQuadCurve(
+                    to: CGPoint(x: CORNER_RADIUS, y: 0),
+                    control: CGPoint(x: 0, y: 0)
+                )
+                // Draw top edge
+                p.addLine(to: CGPoint(x: rect.width - CORNER_RADIUS - OFFSET_X, y: 0))
+                // Draw top left round corner
+                p.addQuadCurve(
+                    to: start,
+                    control: CGPoint(x: rect.width - OFFSET_X, y: 0)
+                )
+            }
+        }
+    }
+}
+
+#Preview {
+    VStack {
+        ChatBubble(
+            direction: .left,
+            stroke_content: Color.accentColor.opacity(0),
+            stroke_style: .init(lineWidth: 4),
+            background_style: Color.accentColor
+        ) {
+            Text("Hello there")
+                .padding()
+        }
+        .foregroundColor(.white)
+        
+        ChatBubble(
+            direction: .right,
+            stroke_content: Color.accentColor.opacity(0),
+            stroke_style: .init(lineWidth: 4),
+            background_style: Color.accentColor
+        ) {
+            Text("Hello there")
+                .padding()
+        }
+        .foregroundColor(.white)
+    }
+}

damus/Views/Chat/ChatEventView.swift

@@ -0,0 +1,324 @@
+//
+//  ChatView.swift
+//  damus
+//
+//  Created by William Casarin on 2022-04-19.
+//
+
+import SwiftUI
+import EmojiKit
+import EmojiPicker
+import SwipeActions
+
+fileprivate let CORNER_RADIUS: CGFloat = 10
+
+struct ChatEventView: View {
+    // MARK: Parameters
+    let event: NostrEvent
+    let selected_event: NostrEvent
+    let prev_ev: NostrEvent?
+    let next_ev: NostrEvent?
+    let damus_state: DamusState
+    var thread: ThreadModel
+    let scroll_to_event: ((_ id: NoteId) -> Void)?
+    let focus_event: (() -> Void)?
+    let highlight_bubble: Bool
+    
+    // MARK: long-press reaction control objects
+    /// Whether the user is actively pressing the view
+    @State var is_pressing = false
+    /// The dispatched work item scheduled by a timer to bounce the event bubble and show the emoji selector
+    @State var long_press_bounce_work_item: DispatchWorkItem?
+    @State var popover_state: PopoverState = .closed {
+        didSet {
+            let generator = UIImpactFeedbackGenerator(style: popover_state == .open_emoji_selector ? .heavy : .light)
+            generator.impactOccurred()
+        }
+    }
+    @State var selected_emoji: Emoji?
+
+    @State private var isOnTopHalfOfScreen: Bool = false
+    @ObservedObject var bar: ActionBarModel
+    
+    enum PopoverState: String {
+        case closed
+        case open_emoji_selector
+    }
+
+    var just_started: Bool {
+        return prev_ev == nil || prev_ev!.pubkey != event.pubkey
+    }
+
+    func next_replies_to_this() -> Bool {
+        guard let next = next_ev else {
+            return false
+        }
+
+        return damus_state.events.replies.lookup(next.id) != nil
+    }
+
+    func is_reply_to_prev(ref_id: NoteId) -> Bool {
+        guard let prev = prev_ev else {
+            return true
+        }
+
+        if let rep = damus_state.events.replies.lookup(event.id) {
+            return rep.contains(prev.id)
+        }
+
+        return false
+    }
+
+    var disable_animation: Bool {
+        self.damus_state.settings.disable_animation
+    }
+
+    var reply_quote_options: EventViewOptions {
+        return [.no_previews, .no_action_bar, .truncate_content_very_short, .no_show_more, .no_translate, .no_media]
+    }
+    
+    var profile_picture_view: some View {
+        VStack {
+            ProfilePicView(pubkey: event.pubkey, size: 32, highlight: .none, profiles: damus_state.profiles, disable_animation: disable_animation)
+                .onTapGesture {
+                    show_profile_action_sheet_if_enabled(damus_state: damus_state, pubkey: event.pubkey)
+                }
+        }
+        .frame(maxWidth: 32)
+    }
+    
+    var by_other_user: Bool {
+        return event.pubkey != damus_state.pubkey
+    }
+    
+    var is_ours: Bool { return !by_other_user }
+    
+    var event_bubble: some View {
+        ChatBubble(
+            direction: is_ours ? .right : .left,
+            stroke_content: Color.accentColor.opacity(highlight_bubble ? 1 : 0),
+            stroke_style: .init(lineWidth: 4),
+            background_style: by_other_user ? DamusColors.adaptableGrey : DamusColors.adaptablePurpleBackground
+        ) {
+            VStack(alignment: .leading, spacing: 4) {
+                if by_other_user {
+                    HStack {
+                        ProfileName(pubkey: event.pubkey, damus: damus_state)
+                            .onTapGesture {
+                                show_profile_action_sheet_if_enabled(damus_state: damus_state, pubkey: event.pubkey)
+                            }
+                        Text(verbatim: "\(format_relative_time(event.created_at))")
+                            .foregroundColor(.gray)
+                    }
+                }
+                
+                if let replying_to = event.direct_replies(),
+                   replying_to != selected_event.id {
+                    ReplyQuoteView(keypair: damus_state.keypair, quoter: event, event_id: replying_to, state: damus_state, thread: thread, options: reply_quote_options)
+                        .background(is_ours ? DamusColors.adaptablePurpleBackground2 : DamusColors.adaptableGrey2)
+                        .foregroundColor(is_ours ? Color.damusAdaptablePurpleForeground : Color.damusAdaptableBlack)
+                        .cornerRadius(5)
+                        .onTapGesture {
+                            self.scroll_to_event?(replying_to)
+                        }
+                }
+                
+                let blur_images = should_blur_images(settings: damus_state.settings, contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
+                NoteContentView(damus_state: damus_state, event: event, blur_images: blur_images, size: .normal, options: [])
+                    .padding(2)
+            }
+            .frame(minWidth: 150, alignment: is_ours ? .trailing : .leading)
+            .padding(10)
+        }
+        .tint(is_ours ? Color.white : Color.accentColor)
+        .overlay(
+            ZStack(alignment: is_ours ? .bottomLeading : .bottomTrailing) {
+                VStack {
+                    Spacer()
+                    self.action_bar
+                        .padding(.horizontal, 5)
+                }
+            }
+        )
+        .onTapGesture {
+            if popover_state == .closed {
+                focus_event?()
+            }
+            else {
+                popover_state = .closed
+                let generator = UIImpactFeedbackGenerator(style: .light)
+                generator.impactOccurred()
+            }
+        }
+    }
+    
+    var event_bubble_with_long_press_interaction: some View {
+        ZStack(alignment: is_ours ? .bottomLeading : .bottomTrailing) {
+            self.event_bubble
+                .sheet(isPresented: Binding(get: { popover_state == .open_emoji_selector }, set: { new_state in
+                    withAnimation(new_state == true ? .easeIn(duration: 0.5) : .easeOut(duration: 0.1)) {
+                        popover_state = new_state == true ? .open_emoji_selector : .closed
+                    }
+                })) {
+                    NavigationView {
+                        EmojiPickerView(selectedEmoji: $selected_emoji, emojiProvider: damus_state.emoji_provider)
+                    }.presentationDetents([.medium, .large])
+                }
+                .onChange(of: selected_emoji) { newSelectedEmoji in
+                    if let newSelectedEmoji {
+                        send_like(emoji: newSelectedEmoji.value)
+                        popover_state = .closed
+                    }
+                }
+        }
+        .scaleEffect(self.popover_state == .open_emoji_selector ? 1.08 : is_pressing ? 1.02 : 1)
+        .shadow(color: (is_pressing || self.popover_state == .open_emoji_selector) ? .black.opacity(0.1) : .black.opacity(0.3), radius: (is_pressing || self.popover_state == .open_emoji_selector) ? 8 : 0, y: (is_pressing || self.popover_state == .open_emoji_selector) ? 15 : 0)
+        .onLongPressGesture(minimumDuration: 0.5, maximumDistance: 10, perform: {
+            long_press_bounce_work_item?.cancel()
+        }, onPressingChanged: { is_pressing in
+            withAnimation(is_pressing ? .easeIn(duration: 0.5) : .easeOut(duration: 0.1)) {
+                self.is_pressing = is_pressing
+                if popover_state != .closed {
+                    return
+                }
+                if self.is_pressing {
+                    let item = DispatchWorkItem {
+                        // Ensure the action is performed only if the condition is still valid
+                        if self.is_pressing {
+                            withAnimation(.bouncy(duration: 0.2, extraBounce: 0.35)) {
+                                popover_state = .open_emoji_selector
+                            }
+                        }
+                    }
+                    long_press_bounce_work_item = item
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: item)
+                }
+            }
+        })
+        .background(
+            GeometryReader { geometry in
+                EmptyView()
+                    .onAppear {
+                        let eventActionBarY = geometry.frame(in: .global).midY
+                        let screenMidY = UIScreen.main.bounds.midY
+                        self.isOnTopHalfOfScreen = eventActionBarY > screenMidY
+                    }
+                    .onChange(of: geometry.frame(in: .global).midY) { newY in
+                        let screenMidY = UIScreen.main.bounds.midY
+                        self.isOnTopHalfOfScreen = newY > screenMidY
+                    }
+            }
+        )
+    }
+    
+    func send_like(emoji: String) {
+        guard let keypair = damus_state.keypair.to_full(),
+              let like_ev = make_like_event(keypair: keypair, liked: event, content: emoji) else {
+            return
+        }
+
+        self.bar.our_like = like_ev
+
+        let generator = UIImpactFeedbackGenerator(style: .medium)
+        generator.impactOccurred()
+        
+        damus_state.postbox.send(like_ev)
+    }
+    
+    var action_bar: some View {
+        return Group {
+            if !bar.is_empty {
+                HStack {
+                    if by_other_user {
+                        Spacer()
+                    }
+                    EventActionBar(damus_state: damus_state, event: event, bar: bar, options: [.no_spread, .hide_items_without_activity])
+                        .padding(10)
+                        .background(DamusColors.adaptableLighterGrey)
+                        .disabled(true)
+                        .cornerRadius(100)
+                        .overlay(RoundedRectangle(cornerSize: CGSize(width: 100, height: 100)).stroke(DamusColors.adaptableWhite, lineWidth: 1))
+                        .shadow(color: Color.black.opacity(0.05),radius: 3, y: 3)
+                        .scaleEffect(0.7, anchor: is_ours ? .leading : .trailing)
+                    if !by_other_user {
+                        Spacer()
+                    }
+                }
+                .padding(.vertical, -20)
+            }
+        }
+    }
+    
+    var event_bubble_with_long_press_and_swipe_interactions: some View {
+        Group {
+            SwipeView {
+                self.event_bubble_with_long_press_interaction
+            } leadingActions: { context in
+                EventActionBar(
+                    damus_state: damus_state,
+                    event: event,
+                    bar: bar,
+                    options: is_ours ? [.swipe_action_menu_reverse] : [.swipe_action_menu],
+                    swipe_context: context
+                )
+            }
+            .swipeSpacing(-20)
+            .swipeActionsStyle(.mask)
+            .swipeMinimumDistance(20)
+        }
+    }
+    
+    var content: some View {
+        return VStack {
+            HStack(alignment: .bottom, spacing: 4) {
+                if by_other_user {
+                    self.profile_picture_view
+                }
+                else {
+                    Spacer()
+                }
+                
+                self.event_bubble_with_long_press_and_swipe_interactions
+                
+                if !by_other_user {
+                    self.profile_picture_view
+                }
+                else {
+                    Spacer()
+                }
+            }
+            .contentShape(Rectangle())
+            .id(event.id)
+            .padding([.bottom], bar.is_empty ? 6 : 16)
+        }
+    }
+
+    var body: some View {
+        if [.boost, .zap, .longform].contains(where: { event.known_kind == $0 }) {
+            EmptyView()
+        } else {
+            self.content
+        }
+    }
+}
+
+extension Notification.Name {
+    static var toggle_thread_view: Notification.Name {
+        return Notification.Name("convert_to_thread")
+    }
+}
+
+#Preview {
+    let bar = make_actionbar_model(ev: test_note.id, damus: test_damus_state)
+    return ChatEventView(event: test_note, selected_event: test_note, prev_ev: nil, next_ev: nil, damus_state: test_damus_state, thread: ThreadModel(event: test_note, damus_state: test_damus_state), scroll_to_event: nil, focus_event: nil, highlight_bubble: false, bar: bar)
+}
+
+#Preview {
+    let bar = make_actionbar_model(ev: test_note.id, damus: test_damus_state)
+    return ChatEventView(event: test_short_note, selected_event: test_note, prev_ev: nil, next_ev: nil, damus_state: test_damus_state, thread: ThreadModel(event: test_note, damus_state: test_damus_state), scroll_to_event: nil, focus_event: nil, highlight_bubble: false, bar: bar)
+}
+
+#Preview {
+    let bar = make_actionbar_model(ev: test_note.id, damus: test_damus_state)
+    return ChatEventView(event: test_short_note, selected_event: test_note, prev_ev: nil, next_ev: nil, damus_state: test_damus_state, thread: ThreadModel(event: test_note, damus_state: test_damus_state), scroll_to_event: nil, focus_event: nil, highlight_bubble: true, bar: bar)
+}

damus/Views/Chat/ChatroomThreadView.swift

@@ -0,0 +1,195 @@
+//
+//  ChatroomView.swift
+//  damus
+//
+//  Created by William Casarin on 2022-04-19.
+//
+
+import SwiftUI
+import SwipeActions
+
+struct ChatroomThreadView: View {
+    @Environment(\.dismiss) var dismiss
+    @State var once: Bool = false
+    let damus: DamusState
+    @ObservedObject var thread: ThreadModel
+    @State var selected_note_id: NoteId? = nil
+    @State var user_just_posted_flag: Bool = false
+    @Namespace private var animation
+    
+    @State var parent_events: [NostrEvent] = []
+    @State var sorted_child_events: [NostrEvent] = []
+    
+    func compute_events(selected_event: NostrEvent? = nil) {
+        let selected_event = selected_event ?? thread.event
+        self.parent_events = damus.events.parent_events(event: selected_event, keypair: damus.keypair)
+        let all_recursive_child_events = self.recursive_child_events(event: selected_event)
+        self.sorted_child_events = all_recursive_child_events.filter({
+            should_show_event(event: $0, damus_state: damus)    // Hide muted events from chatroom conversation
+        }).sorted(by: { a, b in
+            return a.created_at < b.created_at
+        })
+    }
+    
+    func recursive_child_events(event: NdbNote) -> [NdbNote] {
+        let immediate_children = damus.events.child_events(event: event)
+        var indirect_children: [NdbNote] = []
+        for immediate_child in immediate_children {
+            indirect_children.append(contentsOf: self.recursive_child_events(event: immediate_child))
+        }
+        return immediate_children + indirect_children
+    }
+    
+    func go_to_event(scroller: ScrollViewProxy, note_id: NoteId) {
+        scroll_to_event(scroller: scroller, id: note_id, delay: 0, animate: true, anchor: .top)
+        selected_note_id = note_id
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
+            withAnimation {
+                selected_note_id = nil
+            }
+        })
+    }
+    
+    func set_active_event(scroller: ScrollViewProxy, ev: NdbNote) {
+        withAnimation {
+            self.compute_events(selected_event: ev)
+            thread.set_active_event(ev, keypair: self.damus.keypair)
+            self.go_to_event(scroller: scroller, note_id: ev.id)
+        }
+    }
+
+    var body: some View {
+        ScrollViewReader { scroller in
+            ScrollView(.vertical) {
+                LazyVStack(alignment: .leading, spacing: 8) {
+                    // MARK: - Parents events view
+                    ForEach(parent_events, id: \.id) { parent_event in
+                        EventMutingContainerView(damus_state: damus, event: parent_event) {
+                            EventView(damus: damus, event: parent_event)
+                                .matchedGeometryEffect(id: parent_event.id.hex(), in: animation, anchor: .center)
+                        }
+                        .padding(.horizontal)
+                        .onTapGesture {
+                            self.set_active_event(scroller: scroller, ev: parent_event)
+                        }
+                        .id(parent_event.id)
+                        
+                        Divider()
+                            .padding(.top, 4)
+                            .padding(.leading, 25 * 2)
+                        
+                    }.background(GeometryReader { geometry in
+                        // get the height and width of the EventView view
+                        let eventHeight = geometry.frame(in: .global).height
+                        //                    let eventWidth = geometry.frame(in: .global).width
+                        
+                        // vertical gray line in the background
+                        Rectangle()
+                            .fill(Color.gray.opacity(0.25))
+                            .frame(width: 2, height: eventHeight)
+                            .offset(x: 40, y: 40)
+                    })
+                    
+                    // MARK: - Actual event view
+                    EventMutingContainerView(
+                        damus_state: damus,
+                        event: self.thread.event,
+                        muteBox: { event_shown, muted_reason in
+                            AnyView(
+                                EventMutedBoxView(shown: event_shown, reason: muted_reason)
+                                .padding(5)
+                            )
+                        }
+                    ) {
+                        SelectedEventView(damus: damus, event: self.thread.event, size: .selected)
+                            .matchedGeometryEffect(id: self.thread.event.id.hex(), in: animation, anchor: .center)
+                    }
+                    .id(self.thread.event.id)
+                    
+                    
+                    // MARK: - Children view
+                    let events = sorted_child_events
+                    let count = events.count
+                    SwipeViewGroup {
+                        ForEach(Array(zip(events, events.indices)), id: \.0.id) { (ev, ind) in
+                            ChatEventView(event: events[ind],
+                                     selected_event: self.thread.event,
+                                     prev_ev: ind > 0 ? events[ind-1] : nil,
+                                     next_ev: ind == count-1 ? nil : events[ind+1],
+                                     damus_state: damus,
+                                     thread: thread,
+                                     scroll_to_event: { note_id in
+                                self.go_to_event(scroller: scroller, note_id: note_id)
+                            },
+                                     focus_event: {
+                                self.set_active_event(scroller: scroller, ev: ev)
+                            },
+                                     highlight_bubble: selected_note_id == ev.id,
+                                     bar: make_actionbar_model(ev: ev.id, damus: damus)
+                            )
+                            .padding(.horizontal)
+                            .id(ev.id)
+                            .matchedGeometryEffect(id: ev.id.hex(), in: animation, anchor: .center)
+                        }
+                    }
+                }
+                .padding(.top)
+                EndBlock()
+            }
+            .onReceive(handle_notify(.post), perform: { notify in
+                switch notify {
+                    case .post(_):
+                        user_just_posted_flag = true
+                    case .cancel:
+                        return
+                }
+            })
+            .onReceive(thread.objectWillChange) {
+                self.compute_events()
+                if let last_event = thread.events().last, last_event.pubkey == damus.pubkey, user_just_posted_flag {
+                    self.go_to_event(scroller: scroller, note_id: last_event.id)
+                    user_just_posted_flag = false
+                }
+            }
+            .onAppear() {
+                thread.subscribe()
+                self.compute_events()
+                scroll_to_event(scroller: scroller, id: thread.event.id, delay: 0.1, animate: false)
+            }
+            .onDisappear() {
+                thread.unsubscribe()
+            }
+        }
+    }
+
+    func toggle_thread_view() {
+        NotificationCenter.default.post(name: .toggle_thread_view, object: nil)
+    }
+}
+
+
+
+
+struct ChatroomView_Previews: PreviewProvider {
+    static var previews: some View {
+        Group {
+            ChatroomThreadView(damus: test_damus_state, thread: ThreadModel(event: test_note, damus_state: test_damus_state))
+                .previewDisplayName("Test note")
+            
+            let test_thread = ThreadModel(event: test_thread_note_1, damus_state: test_damus_state)
+            ChatroomThreadView(damus: test_damus_state, thread: test_thread)
+                .onAppear {
+                    test_thread.add_event(test_thread_note_2, keypair: test_keypair)
+                    test_thread.add_event(test_thread_note_3, keypair: test_keypair)
+                    test_thread.add_event(test_thread_note_4, keypair: test_keypair)
+                    test_thread.add_event(test_thread_note_5, keypair: test_keypair)
+                    test_thread.add_event(test_thread_note_6, keypair: test_keypair)
+                    test_thread.add_event(test_thread_note_7, keypair: test_keypair)
+                }
+        }
+    }
+}
+
+func scroll_after_load(thread: ThreadModel, proxy: ScrollViewProxy) {
+    scroll_to_event(scroller: proxy, id: thread.event.id, delay: 0.1, animate: false)
+}

damus/Views/Chat/ReplyQuoteView.swift

@@ -0,0 +1,70 @@
+//
+//  ReplyQuoteView.swift
+//  damus
+//
+//  Created by William Casarin on 2022-04-19.
+//
+
+import SwiftUI
+
+struct ReplyQuoteView: View {
+    let keypair: Keypair
+    let quoter: NostrEvent
+    let event_id: NoteId
+    let state: DamusState
+    @ObservedObject var thread: ThreadModel
+    let options: EventViewOptions
+    
+    func content(event: NdbNote) -> some View {
+        ZStack(alignment: .leading) {
+            VStack(alignment: .leading) {
+                HStack(alignment: .center) {
+                    if should_show_event(event: event, damus_state: state) {
+                        ProfilePicView(pubkey: event.pubkey, size: 14, highlight: .reply, profiles: state.profiles, disable_animation: false)
+                        let blur_images = should_blur_images(settings: state.settings, contacts: state.contacts, ev: event, our_pubkey: state.pubkey)
+                        NoteContentView(damus_state: state, event: event, blur_images: blur_images, size: .small, options: options)
+                            .font(.callout)
+                            .lineLimit(1)
+                            .padding(.bottom, -7)
+                            .padding(.top, -5)
+                            .frame(maxWidth: .infinity, alignment: .leading)
+                            .frame(height: 20)
+                            .clipped()
+                    }
+                    else {
+                        Text("Note you've muted", comment: "Label indicating note has been muted")
+                            .italic()
+                            .font(.caption)
+                            .opacity(0.5)
+                            .padding(.bottom, -7)
+                            .padding(.top, -5)
+                            .frame(maxWidth: .infinity, alignment: .leading)
+                            .frame(height: 20)
+                            .clipped()
+                    }
+                }
+            }
+            .padding(5)
+            .padding(.leading, 5+3)
+            Rectangle()
+                .foregroundStyle(.accent)
+                .frame(width: 3)
+        }
+    }
+
+    var body: some View {
+        Group {
+            if let event = state.events.lookup(event_id) {
+                self.content(event: event)
+            }
+        }
+    }
+}
+
+struct ReplyQuoteView_Previews: PreviewProvider {
+    static var previews: some View {
+        let s = test_damus_state
+        let quoter = test_note
+        ReplyQuoteView(keypair: s.keypair, quoter: quoter, event_id: test_note.id, state: s, thread: ThreadModel(event: quoter, damus_state: s), options: [.no_previews, .no_action_bar, .truncate_content_very_short, .no_show_more, .no_translate])
+    }
+}

damus/Views/CreateAccountView.swift

@@ -25,68 +25,44 @@ struct CreateAccountView: View {
     var body: some View {
         ZStack(alignment: .top) {
             VStack {
+                Spacer()
                 VStack(alignment: .center) {
-                    EditPictureControl(uploader: .nostrBuild, pubkey: account.pubkey, image_url: $account.profile_image , uploadObserver: profileUploadObserver, callback: uploadedProfilePicture)
+                   
-
+                    EditPictureControl(uploader: .nostrBuild, pubkey: account.pubkey, size: 75, setup: true, image_url: $account.profile_image , uploadObserver: profileUploadObserver, callback: uploadedProfilePicture)
-                    Text("Public Key", comment: "Label to indicate the public key of the account.")
+                        .shadow(radius: 2)
+                        .padding(.top, 100)
+                    
+                    Text("Add Photo", comment: "Label to indicate user can add a photo.")
                         .bold()
-                        .padding()
+                        .foregroundColor(DamusColors.neutral6)
-                        .onTapGesture {
-                            regen_key()
-                        }
-
-                    KeyText($account.pubkey)
-                        .padding(.horizontal, 20)
-                        .onTapGesture {
-                            regen_key()
-                        }
-                }
-                .frame(minWidth: 300, maxWidth: .infinity, minHeight: 250, alignment: .center)
-                .background {
-                    RoundedRectangle(cornerRadius: 12)
-                        .fill(DamusColors.adaptableGrey, strokeBorder: .gray.opacity(0.5), lineWidth: 1)
                 }
                 
                 SignupForm {
-                    FormLabel(NSLocalizedString("Display name", comment: "Label to prompt display name entry."), optional: true)
+                    FormLabel(NSLocalizedString("Name", comment: "Label to prompt name entry."), optional: false)
-                    FormTextInput(NSLocalizedString("Satoshi Nakamoto", comment: "Name of Bitcoin creator(s)."), text: $account.real_name)
+                        .foregroundColor(DamusColors.neutral6)
+                    FormTextInput(NSLocalizedString("Satoshi Nakamoto", comment: "Name of Bitcoin creator(s)."), text: $account.name)
                         .textInputAutocapitalization(.words)
 
-                    FormLabel(NSLocalizedString("About", comment: "Label to prompt for about text entry for user to describe about themself."), optional: true)
+                    FormLabel(NSLocalizedString("Bio", comment: "Label to prompt bio entry for user to describe themself."), optional: true)
-                    FormTextInput(NSLocalizedString("Creator(s) of Bitcoin. Absolute legend.", comment: "Example description about Bitcoin creator(s), Satoshi Nakamoto."), text: $account.about)
+                        .foregroundColor(DamusColors.neutral6)
+                    FormTextInput(NSLocalizedString("Absolute legend.", comment: "Example Bio"), text: $account.about)
                 }
-                .padding(.top, 10)
+                .padding(.top, 25)
 
                 Button(action: {
                     nav.push(route: Route.SaveKeys(account: account))
                 }) {
                     HStack {
-                        Text("Create account now", comment: "Button to create account.")
+                        Text("Next", comment: "Button to continue with account creation.")
                             .fontWeight(.semibold)
                     }
                     .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
                 }
                 .buttonStyle(GradientButtonStyle())
-                .disabled(profileUploadObserver.isLoading)
+                .disabled(profileUploadObserver.isLoading || account.name.isEmpty)
-                .opacity(profileUploadObserver.isLoading ? 0.5 : 1)
+                .opacity(profileUploadObserver.isLoading || account.name.isEmpty ? 0.5 : 1)
                 .padding(.top, 20)
                 
-                HStack(spacing: 0) {
-                    Text("By signing up, you agree to our ", comment: "Ask the user if they already have an account on Nostr")
-                        .font(.subheadline)
-                        .foregroundColor(Color("DamusMediumGrey"))
-
-                    Button(action: {
-                        nav.push(route: Route.EULA)
-                    }, label: {
-                        Text("EULA")
-                            .font(.subheadline)
-                    })
-                    .padding(.vertical, 5)
-
-                    Spacer()
-                }
-
                 LoginPrompt()
                     .padding(.top)
                 
@@ -94,8 +70,8 @@ struct CreateAccountView: View {
             }
             .padding()
         }
+        .background(DamusBackground(maxHeight: UIScreen.main.bounds.size.height/2), alignment: .top)
         .dismissKeyboardOnTap()
-        .navigationTitle("Create account")
         .navigationBarTitleDisplayMode(.inline)
         .navigationBarBackButtonHidden(true)
         .navigationBarItems(leading: BackNav())
@@ -111,7 +87,7 @@ struct LoginPrompt: View {
     var body: some View {
         HStack {
             Text("Already on Nostr?", comment: "Ask the user if they already have an account on Nostr")
-                .foregroundColor(Color("DamusMediumGrey"))
+                .foregroundColor(DamusColors.neutral6)
 
             Button(NSLocalizedString("Login", comment: "Button to navigate to login view.")) {
                 self.dismiss()
@@ -127,8 +103,8 @@ struct BackNav: View {
     var body: some View {
         Image("chevron-left")
             .foregroundColor(DamusColors.adaptableBlack)
-        .onTapGesture {
+            .onTapGesture {
-            self.dismiss()
+                self.dismiss()
         }
     }
 }
@@ -148,20 +124,11 @@ extension View {
 
 struct CreateAccountView_Previews: PreviewProvider {
     static var previews: some View {
-        let model = CreateAccountModel(real: "", nick: "jb55", about: "")
+        let model = CreateAccountModel(display_name: "", name: "jb55", about: "")
         return CreateAccountView(account: model, nav: .init())
     }
 }
 
-func KeyText(_ pubkey: Binding<Pubkey>) -> some View {
-    let bechkey = bech32_encode(hrp: PUBKEY_HRP, pubkey.wrappedValue.bytes)
-    return Text(bechkey)
-        .textSelection(.enabled)
-        .multilineTextAlignment(.center)
-        .font(.callout.monospaced())
-        .foregroundStyle(DamusLogoGradient.gradient)
-}
-
 func FormTextInput(_ title: String, text: Binding<String>) -> some View {
     return TextField("", text: text)
         .placeholder(when: text.wrappedValue.isEmpty) {
@@ -171,6 +138,10 @@ func FormTextInput(_ title: String, text: Binding<String>) -> some View {
         .background {
             RoundedRectangle(cornerRadius: 12)
                 .stroke(.gray.opacity(0.5), lineWidth: 1)
+                .background {
+                    RoundedRectangle(cornerRadius: 12)
+                        .foregroundColor(.damusAdaptableWhite)
+                }
         }
         .font(.body.bold())
 }
@@ -183,6 +154,10 @@ func FormLabel(_ title: String, optional: Bool = false) -> some View {
             Text("optional", comment: "Label indicating that a form input is optional.")
                 .font(.callout)
                 .foregroundColor(DamusColors.mediumGrey)
+        } else {
+            Text("required", comment: "Label indicating that a form input is required.")
+                .font(.callout)
+                .foregroundColor(DamusColors.mediumGrey)
         }
     }
 }

damus/Views/DMChatView.swift

@@ -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))}
                     }

damus/Views/DirectMessagesView.swift

@@ -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)

damus/Views/EventView.swift

@@ -45,6 +45,8 @@ struct EventView: View {
                 }
             } else if event.known_kind == .longform {
                 LongformPreview(state: damus, ev: event, options: options)
+            } else if event.known_kind == .highlight {
+                HighlightView(state: damus, event: event, options: options)
             } else {
                 TextEvent(damus: damus, event: event, pubkey: pubkey, options: options)
                     //.padding([.top], 6)

damus/Views/Events/Components/ReplyPart.swift

@@ -13,18 +13,18 @@ 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)) {
+            if let reply_ref = event.thread_reply()?.reply {
-                ReplyDescription(event: event, replying_to: replying_to, ndb: ndb)
+                let replying_to = events.lookup(reply_ref.note_id)
+                if event.known_kind != .highlight {
+                    ReplyDescription(event: event, replying_to: replying_to, ndb: ndb)
+                } else if event.known_kind == .highlight {
+                    HighlightDescription(event: event, highlighted_event: replying_to, ndb: ndb)
+                }
+                else {
+                    EmptyView()
+                }
             } else {
                 EmptyView()
             }

damus/Views/Events/EventBody.swift

@@ -35,6 +35,8 @@ struct EventBody: View {
             if !options.contains(.truncate_content) {
                 note_content
             }
+        } else if event.known_kind == .highlight {
+            HighlightBodyView(state: damus_state, ev: event, options: options)
         } else {
             note_content
         }

damus/Views/Events/EventMenu.swift

@@ -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)
                     }

damus/Views/Events/Highlight/HighlightDescription.swift

@@ -0,0 +1,53 @@
+//
+//  HighlightDescription.swift
+//  damus
+//
+//  Created by eric on 4/28/24.
+//
+
+import SwiftUI
+
+// Modified from Reply Description
+struct HighlightDescription: View {
+    let event: NostrEvent
+    let highlighted_event: NostrEvent?
+    let ndb: Ndb
+
+    var body: some View {
+        (Text(Image(systemName: "highlighter")) + Text(verbatim: " \(highlight_desc(ndb: ndb, event: event, highlighted_event: highlighted_event))"))
+            .font(.footnote)
+            .foregroundColor(.gray)
+            .frame(maxWidth: .infinity, alignment: .leading)
+
+    }
+}
+
+struct HighlightDescription_Previews: PreviewProvider {
+    static var previews: some View {
+        HighlightDescription(event: test_note, highlighted_event: test_note, ndb: test_damus_state.ndb)
+    }
+}
+
+func highlight_desc(ndb: Ndb, event: NostrEvent, highlighted_event: NostrEvent?, locale: Locale = Locale.current) -> String {
+    let desc = make_reply_description(event, replying_to: highlighted_event)
+    let pubkeys = desc.pubkeys
+
+    let bundle = bundleForLocale(locale: locale)
+
+    if pubkeys.count == 0 {
+        return NSLocalizedString("Highlighted", bundle: bundle, comment: "Label to indicate that the user is highlighting their own post.")
+    }
+
+    guard let profile_txn = NdbTxn(ndb: ndb) else  {
+        return ""
+    }
+
+    let names: [String] = pubkeys.map { pk in
+        let prof = ndb.lookup_profile_with_txn(pk, txn: profile_txn)
+
+        return Profile.displayName(profile: prof?.profile, pubkey: pk).username.truncate(maxLength: 50)
+    }
+
+    let uniqueNames: [String] = Array(Set(names))
+    return String(format: NSLocalizedString("Highlighted %@", bundle: bundle, comment: "Label to indicate that the user is highlighting 1 user."), locale: locale, uniqueNames.first ?? "")
+}

damus/Views/Events/Highlight/HighlightEventRef.swift

@@ -0,0 +1,92 @@
+//
+//  HighlightEventRef.swift
+//  damus
+//
+//  Created by eric on 4/29/24.
+//
+
+import SwiftUI
+import Kingfisher
+
+struct HighlightEventRef: View {
+    let damus_state: DamusState
+    let event_ref: NoteId
+
+    init(damus_state: DamusState, event_ref: NoteId) {
+        self.damus_state = damus_state
+        self.event_ref = event_ref
+    }
+
+    struct FailedImage: View {
+        var body: some View {
+            Image("markdown")
+                .resizable()
+                .foregroundColor(DamusColors.neutral6)
+                .background(DamusColors.neutral3)
+                .frame(width: 35, height: 35)
+                .clipShape(RoundedRectangle(cornerRadius: 10))
+                .overlay(RoundedRectangle(cornerRadius: 10).stroke(.gray.opacity(0.5), lineWidth: 0.5))
+                .scaledToFit()
+        }
+    }
+
+    var body: some View {
+        EventLoaderView(damus_state: damus_state, event_id: event_ref) { event in
+            EventMutingContainerView(damus_state: damus_state, event: event) {
+                if event.known_kind == .longform {
+                    HStack(alignment: .top, spacing: 10) {
+                        let longform_event = LongformEvent.parse(from: event)
+                        if let url = longform_event.image {
+                            KFAnimatedImage(url)
+                                .callbackQueue(.dispatch(.global(qos:.background)))
+                                .backgroundDecode(true)
+                                .imageContext(.note, disable_animation: true)
+                                .image_fade(duration: 0.25)
+                                .cancelOnDisappear(true)
+                                .configure { view in
+                                    view.framePreloadCount = 3
+                                }
+                                .background {
+                                    FailedImage()
+                                }
+                                .frame(width: 35, height: 35)
+                                .clipShape(RoundedRectangle(cornerRadius: 10))
+                                .overlay(RoundedRectangle(cornerRadius: 10).stroke(.gray.opacity(0.5), lineWidth: 0.5))
+                                .scaledToFit()
+                        } else {
+                            FailedImage()
+                        }
+
+                        VStack(alignment: .leading, spacing: 5) {
+                            Text(longform_event.title ?? "Untitled")
+                                .font(.system(size: 14, weight: .bold))
+                                .lineLimit(1)
+
+                            let profile_txn = damus_state.profiles.lookup(id: longform_event.event.pubkey, txn_name: "highlight-profile")
+                            let profile = profile_txn?.unsafeUnownedValue
+
+                            if let display_name = profile?.display_name {
+                                Text(display_name)
+                                    .font(.system(size: 12))
+                                    .foregroundColor(.gray)
+                            } else if let name = profile?.name {
+                                Text(name)
+                                    .font(.system(size: 12))
+                                    .foregroundColor(.gray)
+                            }
+                        }
+                    }
+                    .padding([.leading, .vertical], 7)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .cornerRadius(10)
+                    .overlay(
+                        RoundedRectangle(cornerRadius: 10)
+                            .stroke(DamusColors.neutral3, lineWidth: 2)
+                    )
+                } else {
+                    EmptyView()
+                }
+            }
+        }
+    }
+}

damus/Views/Events/Highlight/HighlightLink.swift

@@ -0,0 +1,101 @@
+//
+//  HighlightLink.swift
+//  damus
+//
+//  Created by eric on 4/28/24.
+//
+
+import SwiftUI
+import Kingfisher
+
+struct HighlightLink: View {
+    let state: DamusState
+    let url: URL
+    let content: String
+    @Environment(\.openURL) var openURL
+
+    func text_fragment_url() -> URL? {
+        let fragmentDirective = "#:~:"
+        let textDirective = "text="
+        let separator = ","
+        var text = ""
+
+        let components = content.components(separatedBy: " ")
+        if components.count <= 10 {
+            text = content
+        } else {
+            let textStart = Array(components.prefix(5)).joined(separator: " ")
+            let textEnd = Array(components.suffix(2)).joined(separator: " ")
+            text = textStart + separator + textEnd
+        }
+
+        let url_with_fragments = url.absoluteString + fragmentDirective + textDirective + text
+        return URL(string: url_with_fragments)
+    }
+
+    func get_url_icon() -> URL? {
+        var icon = URL(string: url.absoluteString + "/favicon.ico")
+        if let url_host = url.host() {
+            icon = URL(string: "https://" + url_host + "/favicon.ico")
+        }
+        return icon
+    }
+
+    var body: some View {
+        Button(action: {
+            openURL(text_fragment_url() ?? url)
+        }, label: {
+            HStack(spacing: 10) {
+                if let url = get_url_icon() {
+                    KFAnimatedImage(url)
+                        .imageContext(.pfp, disable_animation: true)
+                        .cancelOnDisappear(true)
+                        .configure { view in
+                            view.framePreloadCount = 3
+                        }
+                        .placeholder { _ in
+                            Image("link")
+                                .resizable()
+                                .padding(5)
+                                .foregroundColor(DamusColors.neutral6)
+                                .background(DamusColors.adaptableWhite)
+                        }
+                        .frame(width: 35, height: 35)
+                        .clipShape(RoundedRectangle(cornerRadius: 10))
+                        .scaledToFit()
+                } else {
+                    Image("link")
+                        .resizable()
+                        .padding(5)
+                        .foregroundColor(DamusColors.neutral6)
+                        .background(DamusColors.adaptableWhite)
+                        .frame(width: 35, height: 35)
+                        .clipShape(RoundedRectangle(cornerRadius: 10))
+                }
+
+                Text(url.absoluteString)
+                    .font(eventviewsize_to_font(.normal, font_size: state.settings.font_size))
+                    .foregroundColor(DamusColors.adaptableBlack)
+                    .truncationMode(.tail)
+                    .lineLimit(1)
+            }
+            .padding([.leading, .vertical], 7)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .background(DamusColors.neutral3)
+            .cornerRadius(10)
+            .overlay(
+                RoundedRectangle(cornerRadius: 10)
+                    .stroke(DamusColors.neutral3, lineWidth: 2)
+            )
+        })
+    }
+}
+
+struct HighlightLink_Previews: PreviewProvider {
+    static var previews: some View {
+        let url = URL(string: "https://damus.io")!
+        VStack {
+            HighlightLink(state: test_damus_state, url: url, content: "")
+        }
+    }
+}

damus/Views/Events/Highlight/HighlightPostView.swift

@@ -0,0 +1,78 @@
+//
+//  HighlightPostView.swift
+//  damus
+//
+//  Created by eric on 5/26/24.
+//
+
+import SwiftUI
+
+struct HighlightPostView: View {
+    let damus_state: DamusState
+    let event: NostrEvent
+    @Binding var selectedText: String
+
+    @Environment(\.dismiss) var dismiss
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            VStack {
+                HStack(spacing: 5.0) {
+                    Button(action: {
+                        dismiss()
+                    }, label: {
+                        Text("Cancel", comment: "Button to cancel out of highlighting a note.")
+                            .padding(10)
+                    })
+                    .buttonStyle(NeutralButtonStyle())
+
+                    Spacer()
+
+                    Button(NSLocalizedString("Post", comment: "Button to post a highlight.")) {
+                        var tags: [[String]] = [ ["e", "\(self.event.id)"] ]
+                        tags.append(["context", self.event.content])
+
+                        let kind = NostrKind.highlight.rawValue
+                        guard let ev = NostrEvent(content: selectedText, keypair: damus_state.keypair, kind: kind, tags: tags) else {
+                            return
+                        }
+                        damus_state.postbox.send(ev)
+                        dismiss()
+                    }
+                    .bold()
+                    .buttonStyle(GradientButtonStyle(padding: 10))
+                }
+
+                Divider()
+                    .foregroundColor(DamusColors.neutral3)
+                    .padding(.top, 5)
+            }
+            .frame(height: 30)
+            .padding()
+            .padding(.top, 15)
+
+            HStack {
+                var attributedString: AttributedString {
+                    var attributedString = AttributedString(self.event.content)
+
+                    if let range = attributedString.range(of: selectedText) {
+                        attributedString[range].backgroundColor = DamusColors.highlight
+                    }
+
+                    return attributedString
+                }
+
+                Text(attributedString)
+                    .lineSpacing(5)
+                    .padding(10)
+            }
+            .overlay(
+                RoundedRectangle(cornerRadius: 25).fill(DamusColors.highlight).frame(width: 4),
+                alignment: .leading
+            )
+            .padding()
+
+            Spacer()
+        }
+    }
+}

damus/Views/Events/Highlight/HighlightView.swift

@@ -0,0 +1,192 @@
+//
+//  HighlightView.swift
+//  damus
+//
+//  Created by eric on 4/22/24.
+//
+
+import SwiftUI
+import Kingfisher
+
+struct HighlightTruncatedText: View {
+    let attributedString: AttributedString
+    let maxChars: Int
+
+    init(attributedString: AttributedString, maxChars: Int = 360) {
+        self.attributedString = attributedString
+        self.maxChars = maxChars
+    }
+
+    var body: some View {
+        VStack(alignment: .leading) {
+
+            let truncatedAttributedString: AttributedString? = attributedString.truncateOrNil(maxLength: maxChars)
+
+            if let truncatedAttributedString {
+                Text(truncatedAttributedString)
+                    .fixedSize(horizontal: false, vertical: true)
+            } else {
+                Text(attributedString)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+
+            if truncatedAttributedString != nil {
+                Spacer()
+                Button(NSLocalizedString("Show more", comment: "Button to show entire note.")) { }
+                    .allowsHitTesting(false)
+            }
+        }
+    }
+}
+
+struct HighlightBodyView: View {
+    let state: DamusState
+    let event: HighlightEvent
+    let options: EventViewOptions
+
+    init(state: DamusState, ev: HighlightEvent, options: EventViewOptions) {
+        self.state = state
+        self.event = ev
+        self.options = options
+    }
+
+    init(state: DamusState, ev: NostrEvent, options: EventViewOptions) {
+        self.state = state
+        self.event = HighlightEvent.parse(from: ev)
+        self.options = options
+    }
+
+    var body: some View {
+        Group {
+            if options.contains(.wide) {
+                Main.padding(.horizontal)
+            } else {
+                Main
+            }
+        }
+    }
+
+    var truncate: Bool {
+        return options.contains(.truncate_content)
+    }
+
+    var truncate_very_short: Bool {
+        return options.contains(.truncate_content_very_short)
+    }
+
+    func truncatedText(attributedString: AttributedString) -> some View {
+        Group {
+            if truncate_very_short {
+                HighlightTruncatedText(attributedString: attributedString, maxChars: 140)
+                    .font(eventviewsize_to_font(.normal, font_size: state.settings.font_size))
+            }
+            else if truncate {
+                HighlightTruncatedText(attributedString: attributedString)
+                    .font(eventviewsize_to_font(.normal, font_size: state.settings.font_size))
+            } else {
+                Text(attributedString)
+                    .font(eventviewsize_to_font(.normal, font_size: state.settings.font_size))
+            }
+        }
+    }
+
+    var Main: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            HStack {
+                var attributedString: AttributedString {
+                    var attributedString: AttributedString = ""
+                    if let context = event.context {
+                        if context.count < event.event.content.count {
+                            attributedString = AttributedString(event.event.content)
+                        } else {
+                            attributedString = AttributedString(context)
+                        }
+                    } else {
+                        attributedString = AttributedString(event.event.content)
+                    }
+
+                    if let range = attributedString.range(of: event.event.content) {
+                        attributedString[range].backgroundColor = DamusColors.highlight
+                    }
+                    return attributedString
+                }
+
+                truncatedText(attributedString: attributedString)
+                    .lineSpacing(5)
+                    .padding(10)
+            }
+            .overlay(
+                RoundedRectangle(cornerRadius: 25).fill(DamusColors.highlight).frame(width: 4),
+                alignment: .leading
+            )
+            .padding(.bottom, 10)
+
+            if let url = event.url_ref {
+                HighlightLink(state: state, url: url, content: event.event.content)
+            } else {
+                if let evRef = event.event_ref {
+                    if let eventHex = hex_decode_id(evRef) {
+                        HighlightEventRef(damus_state: state, event_ref: NoteId(eventHex))
+                            .padding(.top, 5)
+                    }
+                }
+            }
+
+        }
+    }
+}
+
+struct HighlightView: View {
+    let state: DamusState
+    let event: HighlightEvent
+    let options: EventViewOptions
+
+    init(state: DamusState, event: NostrEvent, options: EventViewOptions) {
+        self.state = state
+        self.event = HighlightEvent.parse(from: event)
+        self.options = options.union(.no_mentions)
+    }
+
+    var body: some View {
+        VStack(alignment: .leading) {
+            EventShell(state: state, event: event.event, options: options) {
+                HighlightBodyView(state: state, ev: event, options: options)
+            }
+        }
+    }
+}
+
+struct HighlightView_Previews: PreviewProvider {
+    static var previews: some View {
+
+        let content = "Nostr, a decentralized and open social network protocol. Without ads, toxic algorithms, or censorship"
+        let context = "Damus is built on Nostr, a decentralized and open social network protocol. Without ads, toxic algorithms, or censorship, Damus gives you access to the social network that a truly free and healthy society needs — and deserves."
+
+        let test_highlight_event = HighlightEvent.parse(from: NostrEvent(
+            content: content,
+            keypair: test_keypair,
+            kind: NostrKind.highlight.rawValue,
+            tags: [
+                ["context", context],
+                ["r", "https://damus.io"],
+                ["p", "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"],
+            ])!
+        )
+
+        let test_highlight_event2 = HighlightEvent.parse(from: NostrEvent(
+            content: content,
+            keypair: test_keypair,
+            kind: NostrKind.highlight.rawValue,
+            tags: [
+                ["context", context],
+                ["e", "36017b098859d62e1dbd802290d59c9de9f18bb0ca00ba4b875c2930dd5891ae"],
+                ["p", "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"],
+            ])!
+        )
+        VStack {
+            HighlightView(state: test_damus_state, event: test_highlight_event.event, options: [])
+
+            HighlightView(state: test_damus_state, event: test_highlight_event2.event, options: [.wide])
+        }
+    }
+}

damus/Views/Events/Longform/LongformPreview.swift

@@ -51,13 +51,13 @@ struct LongformPreviewBody: View {
     func truncatedText(content: CompatibleText) -> some View {
         Group {
             if truncate_very_short {
-                TruncatedText(text: content, maxChars: 140)
+                TruncatedText(text: content, maxChars: 140, show_show_more_button: !options.contains(.no_show_more))
                     .font(header ? .body : .caption)
                     .foregroundColor(.gray)
                     .padding(.horizontal, 10)
             }
             else if truncate {
-                TruncatedText(text: content)
+                TruncatedText(text: content, show_show_more_button: !options.contains(.no_show_more))
                     .font(header ? .body : .caption)
                     .foregroundColor(.gray)
                     .padding(.horizontal, 10)

damus/Views/Events/Longform/LongformView.swift

@@ -21,10 +21,10 @@ struct LongformView: View {
     var options: EventViewOptions {
         return [.wide, .no_mentions, .no_replying_to]
     }
-    
+
     var body: some View {
         EventShell(state: state, event: event.event, options: options) {
-            SelectableText(attributedString: AttributedString(stringLiteral: event.title ?? "Untitled"), size: .title)
+            SelectableText(damus_state: state, event: event.event, attributedString: AttributedString(stringLiteral: event.title ?? "Untitled"), size: .title)
 
             NoteContentView(damus_state: state, event: event.event, blur_images: false, size: .selected, options: options)
         }

damus/Views/Events/SelectedEventView.swift

@@ -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,17 @@ struct SelectedEventView: View {
                 .minimumScaleFactor(0.75)
                 .lineLimit(1)
 
-                if event_is_reply(event.event_refs(damus.keypair)) {
+                if let reply_ref = event.thread_reply()?.reply {
-                    ReplyDescription(event: event, replying_to: replying_to, ndb: damus.ndb)
+                    let replying_to = damus.events.lookup(reply_ref.note_id)
+                    if event.known_kind == .highlight {
+                        HighlightDescription(event: event, highlighted_event: replying_to, ndb: damus.ndb)
+                            .padding(.horizontal)
+                    } else {
+                        ReplyDescription(event: event, replying_to: replying_to, ndb: damus.ndb)
+                            .padding(.horizontal)
+                    }
+                } else if event.known_kind == .highlight {
+                    HighlightDescription(event: event, highlighted_event: nil, ndb: damus.ndb)
                         .padding(.horizontal)
                 }
 

damus/Views/Events/TextEvent.swift

@@ -21,9 +21,11 @@ struct EventViewOptions: OptionSet {
     static let no_mentions = EventViewOptions(rawValue: 1 << 9)
     static let no_media = EventViewOptions(rawValue: 1 << 10)
     static let truncate_content_very_short = EventViewOptions(rawValue: 1 << 11)
+    static let no_previews = EventViewOptions(rawValue: 1 << 12)
+    static let no_show_more = EventViewOptions(rawValue: 1 << 13)
 
     static let embedded: EventViewOptions = [.no_action_bar, .small_pfp, .wide, .truncate_content, .nested]
-    static let embedded_text_only: EventViewOptions = [.no_action_bar, .small_pfp, .wide, .truncate_content, .nested, .no_media, .truncate_content_very_short]
+    static let embedded_text_only: EventViewOptions = [.no_action_bar, .small_pfp, .wide, .truncate_content, .nested, .no_media, .truncate_content_very_short, .no_previews]
 }
 
 struct TextEvent: View {

damus/Views/LoginView.swift

@@ -62,8 +62,9 @@ struct LoginView: View {
     var body: some View {
         ZStack(alignment: .top) {
             VStack {
+                Spacer()
+                
                 SignInHeader()
-                    .padding(.top, 100)
                 
                 SignInEntry(key: $key, shouldSaveKey: $shouldSaveKey)
                 
@@ -112,8 +113,9 @@ struct LoginView: View {
                 Spacer()
             }
             .padding()
+            .padding(.bottom, 50)
         }
-        .background(DamusBackground(maxHeight: 350), alignment: .top)
+        .background(DamusBackground(maxHeight: UIScreen.main.bounds.size.height/2), alignment: .top)
         .onAppear {
             credential_handler.check_credentials()
         }
@@ -320,9 +322,13 @@ struct KeyInput: View {
         }
         .padding(.vertical, 2)
         .padding(.horizontal, 10)
-        .overlay {
+        .background {
             RoundedRectangle(cornerRadius: 12)
                 .stroke(.gray, lineWidth: 1)
+                .background {
+                    RoundedRectangle(cornerRadius: 12)
+                        .foregroundColor(.damusAdaptableWhite)
+                }
         }
     }
 }
@@ -337,11 +343,12 @@ struct SignInHeader: View {
                 .padding(.bottom)
             
             Text("Sign in", comment: "Title of view to log into an account.")
+                .foregroundColor(DamusColors.neutral6)
                 .font(.system(size: 32, weight: .bold))
                 .padding(.bottom, 5)
             
             Text("Welcome to the social network you control", comment: "Welcome text")
-                .foregroundColor(Color("DamusMediumGrey"))
+                .foregroundColor(DamusColors.neutral6)
         }
     }
 }
@@ -353,6 +360,7 @@ struct SignInEntry: View {
     var body: some View {
         VStack(alignment: .leading) {
             Text("Enter your account key", comment: "Prompt for user to enter an account key to login.")
+                .foregroundColor(DamusColors.neutral6)
                 .fontWeight(.medium)
                 .padding(.top, 30)
             
@@ -444,7 +452,9 @@ struct LoginView_Previews: PreviewProvider {
         let bech32_pubkey = "KeyInput"
         Group {
             LoginView(key: pubkey, nav: .init())
+                .previewDevice(PreviewDevice(rawValue: "iPhone SE (3rd generation)"))
             LoginView(key: bech32_pubkey, nav: .init())
+                .previewDevice(PreviewDevice(rawValue: "iPhone 15 Pro Max"))
         }
     }
 }

damus/Views/NoteContentView.swift

@@ -78,11 +78,11 @@ struct NoteContentView: View {
     func truncatedText(content: CompatibleText) -> some View {
         Group {
             if truncate_very_short {
-                TruncatedText(text: content, maxChars: 140)
+                TruncatedText(text: content, maxChars: 140, show_show_more_button: !options.contains(.no_show_more))
                     .font(eventviewsize_to_font(size, font_size: damus_state.settings.font_size))
             }
             else if truncate {
-                TruncatedText(text: content)
+                TruncatedText(text: content, show_show_more_button: !options.contains(.no_show_more))
                     .font(eventviewsize_to_font(size, font_size: damus_state.settings.font_size))
             } else {
                 content.text
@@ -132,10 +132,10 @@ struct NoteContentView: View {
         VStack(alignment: .leading) {
             if size == .selected {
                 if with_padding {
-                    SelectableText(attributedString: artifacts.content.attributed, size: self.size)
+                    SelectableText(damus_state: damus_state, event: self.event, attributedString: artifacts.content.attributed, size: self.size)
                         .padding(.horizontal)
                 } else {
-                    SelectableText(attributedString: artifacts.content.attributed, size: self.size)
+                    SelectableText(damus_state: damus_state, event: self.event, attributedString: artifacts.content.attributed, size: self.size)
                 }
             } else {
                 if with_padding {
@@ -185,18 +185,22 @@ struct NoteContentView: View {
                     invoicesView(invoices: artifacts.invoices)
                 }
             }
-            
+
-            if damus_state.settings.media_previews {
+            if damus_state.settings.media_previews, has_previews {
                 if with_padding {
                     previewView(links: artifacts.links).padding(.horizontal)
                 } else {
                     previewView(links: artifacts.links)
                 }
             }
-            
+
         }
     }
-    
+
+    var has_previews: Bool {
+        !options.contains(.no_previews)
+    }
+
     func loadMediaButton(artifacts: NoteArtifactsSeparated) -> some View {
         Button(action: {
             load_media = true
@@ -397,6 +401,14 @@ struct NoteContentView_Previews: PreviewProvider {
                     .border(Color.red)
             }
             .previewDisplayName("Long-form note")
+            
+            VStack {
+                NoteContentView(damus_state: state, event: test_note, blur_images: false, size: .small, options: [.no_previews, .no_action_bar, .truncate_content_very_short, .no_show_more])
+                    .font(.callout)
+                    .foregroundColor(.secondary)
+                    .lineLimit(1)
+            }
+            .previewDisplayName("Small single-line note")
         }
     }
 }

damus/Views/PostView.swift

@@ -92,13 +92,24 @@ struct PostView: View {
     }
     
     func send_post() {
-        let refs = references.filter { ref in
+        // don't add duplicate pubkeys but retain order
-            if case .pubkey(let pk) = ref, filtered_pubkeys.contains(pk) {
+        var pkset = Set<Pubkey>()
-                return false
+
+        // 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)
 }
 

damus/Views/Profile/AboutView.swift

@@ -26,7 +26,7 @@ struct AboutView: View {
         Group {
             if let about_string {
                 let truncated_about = show_full_about ? about_string : about_string.truncateOrNil(maxLength: max_about_length)
-                SelectableText(attributedString: truncated_about ?? about_string, textAlignment: self.text_alignment, size: .subheadline)
+                SelectableText(damus_state: state, event: nil, attributedString: truncated_about ?? about_string, textAlignment: self.text_alignment, size: .subheadline)
 
                 if truncated_about != nil {
                     if show_full_about {

damus/Views/Profile/EditPictureControl.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import Kingfisher
 
 class ImageUploadingObserver: ObservableObject {
     @Published var isLoading: Bool = false
@@ -14,6 +15,8 @@ class ImageUploadingObserver: ObservableObject {
 struct EditPictureControl: View {
     let uploader: MediaUploader
     let pubkey: Pubkey
+    var size: CGFloat? = 25
+    var setup: Bool? = false
     @Binding var image_url: URL?
     @ObservedObject var uploadObserver: ImageUploadingObserver
     let callback: (URL?) -> Void
@@ -43,20 +46,53 @@ struct EditPictureControl: View {
             if uploadObserver.isLoading {
                 ProgressView()
                     .progressViewStyle(CircularProgressViewStyle(tint: DamusColors.purple))
+                    .frame(width: size, height: size)
                     .padding(10)
                     .background(DamusColors.white.opacity(0.7))
                     .clipShape(Circle())
                     .shadow(color: DamusColors.purple, radius: 15, x: 0, y: 0)
+            } else if let url = image_url {
+                KFAnimatedImage(url)
+                    .imageContext(.pfp, disable_animation: false)
+                    .onFailure(fallbackUrl: URL(string: robohash(pubkey)), cacheKey: url.absoluteString)
+                    .cancelOnDisappear(true)
+                    .configure { view in
+                        view.framePreloadCount = 3
+                    }
+                    .scaledToFill()
+                    .frame(width: (size ?? 25) + 10, height: (size ?? 25) + 10)
+                    .foregroundColor(DamusColors.white)
+                    .clipShape(Circle())
+                    .overlay(Circle().stroke(.white, lineWidth: 4))
             } else {
-                Image("camera")
+                if setup ?? false {
-                    .resizable()
+                    Image(systemName: "person")
-                    .scaledToFit()
+                        .resizable()
-                    .frame(width: 25, height: 25)
+                        .scaledToFit()
-                    .foregroundColor(DamusColors.purple)
+                        .frame(width: size, height: size)
-                    .padding(10)
+                        .foregroundColor(DamusColors.white)
-                    .background(DamusColors.white.opacity(0.7))
+                        .padding(20)
-                    .clipShape(Circle())
+                        .clipShape(Circle())
-                    .shadow(color: DamusColors.purple, radius: 15, x: 0, y: 0)
+                        .background {
+                            Circle()
+                                .fill(PinkGradient, strokeBorder: .white, lineWidth: 4)
+                        }
+                        
+                } else {
+                    Image("camera")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: size, height: size)
+                        .foregroundColor(DamusColors.purple)
+                        .padding(10)
+                        .background(DamusColors.white.opacity(0.7))
+                        .clipShape(Circle())
+                        .background {
+                            Circle()
+                                .fill(DamusColors.purple, strokeBorder: .white, lineWidth: 2)
+                        }
+                }
+                    
             }
         }
         .sheet(isPresented: $show_camera) {
@@ -110,7 +146,7 @@ struct EditPictureControl_Previews: PreviewProvider {
         let observer = ImageUploadingObserver()
         ZStack {
             Color.gray
-            EditPictureControl(uploader: .nostrBuild, pubkey: test_pubkey, image_url: url, uploadObserver: observer) { _ in
+            EditPictureControl(uploader: .nostrBuild, pubkey: test_pubkey, size: 100, setup: false, image_url: url, uploadObserver: observer) { _ in
                 //
             }
         }

damus/Views/Profile/ProfileView.swift

@@ -70,6 +70,7 @@ struct ProfileView: View {
     @State var show_share_sheet: Bool = false
     @State var show_qr_code: Bool = false
     @State var action_sheet_presented: Bool = false
+    @State var mute_dialog_presented: Bool = false
     @State var filter_state : FilterState = .posts
     @State var yOffset: CGFloat = 0
 
@@ -162,7 +163,10 @@ struct ProfileView: View {
         Button(action: {
             action_sheet_presented = true
         }) {
-            navImage(img: "share3")
+            Image(systemName: "ellipsis")
+                .frame(width: 33, height: 33)
+                .background(Color.black.opacity(0.6))
+                .clipShape(Circle())
         }
         .confirmationDialog(NSLocalizedString("Actions", comment: "Title for confirmation dialog to either share, report, or mute a profile."), isPresented: $action_sheet_presented) {
             Button(NSLocalizedString("Share", comment: "Button to share the link to a profile.")) {
@@ -196,15 +200,21 @@ struct ProfileView: View {
                         damus_state.postbox.send(new_ev)
                     }
                 } else {
-                    MuteDurationMenu { duration in
+                    Button(NSLocalizedString("Mute", comment: "Button to mute a profile"), role: .destructive) {
-                        notify(.mute(.user(profile.pubkey, duration?.date_from_now)))
+                        mute_dialog_presented = true
-                    } label: {
-                        Text("Mute", comment: "Button to mute a profile.")
-                            .foregroundStyle(.red)
                     }
                 }
             }
         }
+        .confirmationDialog(NSLocalizedString("Mute", comment: "Title for confirmation dialog to mute a profile."), isPresented: $mute_dialog_presented) {
+            ForEach(DamusDuration.allCases, id: \.self) { duration in
+                Button {
+                    notify(.mute(.user(profile.pubkey, duration.date_from_now)))
+                } label: {
+                    Text(duration.title)
+                }
+            }
+        }
     }
 
     var customNavbar: some View {

damus/Views/ReactionsView.swift

@@ -16,7 +16,7 @@ struct ReactionsView: View {
     var body: some View {
         ScrollView {
             LazyVStack {
-                ForEach(model.events.events, id: \.id) { ev in
+                ForEach(model.events.events.filter { $0.last_refid() == model.target }, id: \.id) { ev in
                     ReactionView(damus_state: damus_state, reaction: ev)
                 }
             }

damus/Views/SaveKeysView.swift

@@ -11,8 +11,6 @@ import Security
 struct SaveKeysView: View {
     let account: CreateAccountModel
     let pool: RelayPool = RelayPool(ndb: Ndb()!)
-    @State var pub_copied: Bool = false
-    @State var priv_copied: Bool = false
     @State var loading: Bool = false
     @State var error: String? = nil
     
@@ -31,81 +29,98 @@ struct SaveKeysView: View {
     var body: some View {
         ZStack(alignment: .top) {
             VStack(alignment: .center) {
+
+                Spacer()
+                
+                Image("logo-nobg")
+                    .resizable()
+                    .shadow(color: DamusColors.purple, radius: 2)
+                    .frame(width: 56, height: 56, alignment: .center)
+                    .padding(.top, 20.0)
+                
                 if account.rendered_name.isEmpty {
                     Text("Welcome!", comment: "Text to welcome user.")
-                        .font(.title.bold())
+                        .font(.title)
-                        .padding(.bottom, 10)
+                        .fontWeight(.heavy)
+                        .foregroundStyle(DamusLogoGradient.gradient)
                 } else {
                     Text("Welcome, \(account.rendered_name)!", comment: "Text to welcome user.")
-                        .font(.title.bold())
+                        .font(.title)
-                        .padding(.bottom, 10)
+                        .fontWeight(.heavy)
+                        .foregroundStyle(DamusLogoGradient.gradient)
                 }
                 
-                Text("Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus.", comment: "Reminder to user that they should save their account information.")
+                Text("Save your login info?", comment: "Ask user if they want to save their account information.")
-                    .padding(.bottom, 10)
+                    .font(.title)
+                    .fontWeight(.heavy)
+                    .foregroundColor(DamusColors.neutral6)
+                    .padding(.top, 5)
                 
-                Text("Private Key", comment: "Label to indicate that the text below is the user's private key used by only the user themself as a secret to login to access their account.")
+                Text("We'll save your account key, so you won't need to enter it manually next time you log in.", comment: "Reminder to user that they should save their account information.")
-                    .font(.title2.bold())
+                    .font(.system(size: 14))
-                    .padding(.bottom, 10)
+                    .foregroundColor(DamusColors.neutral6)
+                    .padding(.top, 2)
+                    .padding(.bottom, 100)
+                    .multilineTextAlignment(.center)
                 
-                Text("This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!", comment: "Label to describe that a private key is the user's secret account key and what they should do with it.")
+                Spacer()
-                    .padding(.bottom, 10)
                 
-                SaveKeyView(text: account.privkey.nsec, textContentType: .newPassword, is_copied: $priv_copied, focus: $privkey_focused)
+                if loading {
-                    .padding(.bottom, 10)
+                    ProgressView()
-
+                        .progressViewStyle(.circular)
-                if priv_copied {
+                } else if let err = error {
-                    if loading {
+                    Text("Error: \(err)", comment: "Error message indicating why saving keys failed.")
-                        ProgressView()
+                        .foregroundColor(.red)
-                            .progressViewStyle(.circular)
+                    
-                    } else if let err = error {
+                    Button(action: {
-                        Text("Error: \(err)", comment: "Error message indicating why saving keys failed.")
+                        complete_account_creation(account)
-                            .foregroundColor(.red)
+                    }) {
-
+                        HStack {
-                        Button(action: {
+                            Text("Retry", comment:  "Button to retry completing account creation after an error occurred.")
-                            complete_account_creation(account)
+                                .fontWeight(.semibold)
-                        }) {
-                            HStack {
-                                Text("Retry", comment:  "Button to retry completing account creation after an error occurred.")
-                                    .fontWeight(.semibold)
-                            }
-                            .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
                         }
-                        .buttonStyle(GradientButtonStyle())
+                        .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
-                        .padding(.top, 20)
-                    } else {
-                        Button(action: {
-                            complete_account_creation(account)
-                        }) {
-                            HStack {
-                                Text("Let's go!", comment:  "Button to complete account creation and start using the app.")
-                                    .fontWeight(.semibold)
-                            }
-                            .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
-                        }
-                        .buttonStyle(GradientButtonStyle())
-                        .padding(.top, 20)
                     }
+                    .buttonStyle(GradientButtonStyle())
+                    .padding(.top, 20)
+                } else {
+                    
+                    Button(action: {
+                        save_key(account)
+                        complete_account_creation(account)
+                    }) {
+                        HStack {
+                            Text("Save", comment:  "Button to save key, complete account creation, and start using the app.")
+                                .fontWeight(.semibold)
+                        }
+                        .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
+                    }
+                    .buttonStyle(GradientButtonStyle())
+                    .padding(.top, 20)
+                    
+                    Button(action: {
+                        complete_account_creation(account)
+                    }) {
+                        HStack {
+                            Text("Not now", comment:  "Button to not save key, complete account creation, and start using the app.")
+                                .fontWeight(.semibold)
+                        }
+                        .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
+                    }
+                    .buttonStyle(NeutralButtonStyle(padding: EdgeInsets(top: 15, leading: 15, bottom: 15, trailing: 15), cornerRadius: 12))
+                    .padding(.top, 20)
                 }
             }
             .padding(20)
         }
-        .background(
+        .background(DamusBackground(maxHeight: UIScreen.main.bounds.size.height/2), alignment: .top)
-            Image("eula-bg")
-                .resizable()
-                .blur(radius: 70)
-                .ignoresSafeArea(),
-            alignment: .top
-        )
         .navigationBarBackButtonHidden(true)
         .navigationBarItems(leading: BackNav())
-        .onAppear {
+
-            // Hack to force keyboard to show up for a short moment and then hiding it to register password autofill flow.
+    }
-            pubkey_focused = true
+    
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+    func save_key(_ account: CreateAccountModel) {
-                pubkey_focused = false
+        credential_handler.save_credential(pubkey: account.pubkey, privkey: account.privkey)
-            }
-        }
     }
     
     func complete_account_creation(_ account: CreateAccountModel) {
@@ -122,8 +137,6 @@ struct SaveKeysView: View {
         }
 
         self.pool.register_handler(sub_id: "signup", handler: handle_event)
-        
-        credential_handler.save_credential(pubkey: account.pubkey, privkey: account.privkey)
 
         self.loading = true
         
@@ -188,74 +201,13 @@ struct SaveKeysView: View {
     }
 }
 
-struct SaveKeyView: View {
-    let text: String
-    let textContentType: UITextContentType
-    @Binding var is_copied: Bool
-    var focus: FocusState<Bool>.Binding
-    
-    func copy_text() {
-        UIPasteboard.general.string = text
-        is_copied = true
-    }
-    
-    var body: some View {
-        HStack {
-            Spacer()
-            VStack {
-                spacerBlock(width: 0, height: 0)
-                Button(action: copy_text) {
-                    Label("", image: is_copied ? "check-circle.fill" : "copy2")
-                        .foregroundColor(is_copied ? .green : .gray)
-                        .background {
-                            if is_copied {
-                                Circle()
-                                    .foregroundColor(.white)
-                                    .frame(width: 25, height: 25, alignment: .center)
-                                    .padding(.leading, -8)
-                                    .padding(.top, 1)
-                            } else {
-                                EmptyView()
-                            }
-                        }
-                }
-            }
-
-            TextField("", text: .constant(text))
-                .padding(5)
-                .background {
-                    RoundedRectangle(cornerRadius: 4.0).opacity(0.1)
-                }
-                .textSelection(.enabled)
-                .font(.callout.monospaced())
-                .onTapGesture {
-                    copy_text()
-                    // Hack to force keyboard to hide. Showing keyboard on text field is necessary to register password autofill flow but the text itself should not be modified.
-                    DispatchQueue.main.async {
-                        end_editing()
-                    }
-                }
-                .textContentType(textContentType)
-                .deleteDisabled(true)
-                .focused(focus)
-            
-            spacerBlock(width: 0, height: 0) /// set a 'width' > 0 here to vary key Text's aspect ratio
-        }
-    }
-    
-    @ViewBuilder private func spacerBlock(width: CGFloat, height: CGFloat) -> some View {
-        Color.orange.opacity(1)
-            .frame(width: width, height: height)
-    }
-}
-
 struct SaveKeysView_Previews: PreviewProvider {
     static var previews: some View {
-        let model = CreateAccountModel(real: "William", nick: "jb55", about: "I'm me")
+        let model = CreateAccountModel(display_name: "William", name: "jb55", about: "I'm me")
         SaveKeysView(account: model)
     }
 }
 
 func create_account_to_metadata(_ model: CreateAccountModel) -> Profile {
-    return Profile(name: model.nick_name, display_name: model.real_name, about: model.about, picture: model.profile_image?.absoluteString, banner: nil, website: nil, lud06: nil, lud16: nil, nip05: nil, damus_donation: nil)
+    return Profile(name: model.name, display_name: model.display_name, about: model.about, picture: model.profile_image?.absoluteString, banner: nil, website: nil, lud06: nil, lud16: nil, nip05: nil, damus_donation: nil)
 }

damus/Views/Settings/FirstAidSettingsView.swift

@@ -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"))

damus/Views/Settings/NotificationSettingsView.swift

@@ -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())
     }
 }

damus/Views/Settings/ReactionsSettingsView.swift

@@ -6,22 +6,20 @@
 //
 
 import SwiftUI
-import MCEmojiPicker
+import EmojiPicker
+import EmojiKit
 
 struct ReactionsSettingsView: View {
     @ObservedObject var settings: UserSettingsStore
+    let damus_state: DamusState
     @State private var isReactionsVisible: Bool = false
 
+    @State private var selectedEmoji: Emoji? = nil
+
     var body: some View {
         Form {
             Section {
                 Text(settings.default_emoji_reaction)
-                    .emojiPicker(
-                        isPresented: $isReactionsVisible,
-                        selectedEmoji: $settings.default_emoji_reaction,
-                        arrowDirection: .up,
-                        isDismissAfterChoosing: true
-                    )
                     .onTapGesture {
                         isReactionsVisible = true
                     }
@@ -31,43 +29,23 @@ struct ReactionsSettingsView: View {
         }
         .navigationTitle(NSLocalizedString("Reactions", comment: "Title of emoji reactions view"))
         .navigationBarTitleDisplayMode(.large)
+        .sheet(isPresented: $isReactionsVisible) {
+            NavigationView {
+                EmojiPickerView(selectedEmoji: $selectedEmoji, emojiProvider: damus_state.emoji_provider)
+            }
+            .presentationDetents([.medium, .large])
+        }
+        .onChange(of: selectedEmoji) { newEmoji in
+            guard let newEmoji else {
+                return
+            }
+            settings.default_emoji_reaction = newEmoji.value
+        }
     }
 }
 
-/// From: https://stackoverflow.com/a/39425959
-extension Character {
-    /// A simple emoji is one scalar and presented to the user as an Emoji
-    var isSimpleEmoji: Bool {
-        guard let firstScalar = unicodeScalars.first else { return false }
-        return firstScalar.properties.isEmoji && firstScalar.value > 0x238C
-    }
-
-    /// Checks if the scalars will be merged into an emoji
-    var isCombinedIntoEmoji: Bool { unicodeScalars.count > 1 && unicodeScalars.first?.properties.isEmoji ?? false }
-
-    var isEmoji: Bool { isSimpleEmoji || isCombinedIntoEmoji }
-}
-
-extension String {
-    var isSingleEmoji: Bool { count == 1 && containsEmoji }
-
-    var containsEmoji: Bool { contains { $0.isEmoji } }
-
-    var containsOnlyEmoji: Bool { !isEmpty && !contains { !$0.isEmoji } }
-
-    var emojiString: String { emojis.map { String($0) }.reduce("", +) }
-
-    var emojis: [Character] { filter { $0.isEmoji } }
-
-    var emojiScalars: [UnicodeScalar] { filter { $0.isEmoji }.flatMap { $0.unicodeScalars } }
-}
-
-func isValidEmoji(_ string: String) -> Bool {
-    return string.isSingleEmoji
-}
-
 struct ReactionsSettingsView_Previews: PreviewProvider {
     static var previews: some View {
-        ReactionsSettingsView(settings: UserSettingsStore())
+        ReactionsSettingsView(settings: UserSettingsStore(), damus_state: test_damus_state)
     }
 }

damus/Views/SetupView.swift

@@ -28,32 +28,53 @@ struct SetupView: View {
                         .fontWeight(.heavy)
                         .foregroundStyle(DamusLogoGradient.gradient)
 
-                    Text("The go-to iOS Nostr client", comment: "Quick description of what Damus is")
+                    Text("The social network you control", comment: "Quick description of what Damus is")
-                        .foregroundColor(DamusColors.mediumGrey)
+                        .foregroundColor(DamusColors.neutral6)
                         .padding(.top, 10)
                     
-                    WhatIsNostr()
-                        .padding()
-                    
-                    WhyWeNeedNostr()
-                        .padding()
-                    
                     Spacer()
                     
+                    Button(action: {
+                        navigationCoordinator.push(route: Route.CreateAccount)
+                    }) {
+                        HStack {
+                            Text("Create Account", comment: "Button to continue to the create account page.")
+                                .fontWeight(.semibold)
+                        }
+                        .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
+                    }
+                    .buttonStyle(GradientButtonStyle())
+                    .padding(.horizontal)
+                    
                     Button(action: {
                         navigationCoordinator.push(route: Route.Login)
                     }) {
                         HStack {
-                            Text("Let's get started!", comment: "Button to continue to login page.")
+                            Text("Sign In", comment: "Button to continue to login page.")
                                 .fontWeight(.semibold)
                         }
                         .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
                     }
                     .buttonStyle(GradientButtonStyle())
                     .padding()
+                    
+                    HStack(spacing: 0) {
+                        Text("By continuing you agree to our ")
+                            .font(.subheadline)
+                            .foregroundColor(DamusColors.neutral6)
+
+                        Button(action: {
+                            navigationCoordinator.push(route: Route.EULA)
+                        }, label: {
+                            Text("EULA", comment: "End User License Agreement")
+                                .font(.subheadline)
+                        })
+                        .padding(.vertical, 5)
+                    }
+                    .padding(.bottom)
                 }
             }
-            .background(DamusBackground(maxHeight: 300), alignment: .top)
+            .background(DamusBackground(maxHeight: UIScreen.main.bounds.size.height/2), alignment: .top)
             .navigationDestination(for: Route.self) { route in
                 route.view(navigationCoordinator: navigationCoordinator, damusState: DamusState.empty)
             }
@@ -63,61 +84,6 @@ struct SetupView: View {
     }
 }
 
-struct LearnAboutNostrLink: View {
-    @Environment(\.openURL) var openURL
-    var body: some View {
-        HStack {
-            Button(action: {
-                openURL(URL(string: "https://nostr.com")!)
-            }, label: {
-                Text("Learn more about Nostr", comment: "Button that opens up a webpage where the user can learn more about Nostr.")
-                    .foregroundColor(.accentColor)
-            })
-            
-            Image(systemName: "arrow.up.right")
-                .font(.footnote)
-                .foregroundColor(.accentColor)
-        }
-    }
-}
-
-struct WhatIsNostr: View {
-    var body: some View {
-        HStack(alignment: .top) {
-            Image("nostr-logo")
-            VStack(alignment: .leading) {
-                Text("What is Nostr?", comment: "Heading text for section describing what is Nostr.")
-                    .fontWeight(.bold)
-                    .padding(.vertical, 10)
-                
-                Text("Nostr is a protocol, designed for simplicity, that aims to create a censorship-resistant global social network", comment: "Description about what is Nostr.")
-                    .foregroundColor(DamusColors.mediumGrey)
-                
-                LearnAboutNostrLink()
-                    .padding(.top, 10)
-            }
-            Spacer()
-        }
-    }
-}
-
-struct WhyWeNeedNostr: View {
-    var body: some View {
-        HStack(alignment: .top) {
-            Image("lightbulb")
-            VStack(alignment: .leading) {
-                Text("Why we need Nostr?", comment: "Heading text for section describing why Nostr is needed.")
-                    .fontWeight(.bold)
-                    .padding(.vertical, 10)
-                
-                Text("Social media has developed into a key way information flows around the world. Unfortunately, our current social media systems are broken", comment: "Description about why Nostr is needed.")
-                    .foregroundColor(DamusColors.mediumGrey)
-            }
-            Spacer()
-        }
-    }
-}
-
 struct SetupView_Previews: PreviewProvider {
     static var previews: some View {
         Group {

damus/Views/Timeline/InnerTimelineView.swift

@@ -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 {

damus/Views/TimelineView.swift

@@ -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
                     })
             }

damus/damusApp.swift

@@ -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 state: DamusState? = nil
-    var settings: UserSettingsStore? = 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 state else {
-        guard let settings = self.settings else { return }
-        if !settings.enable_experimental_push_notifications {
             return
         }
         
-        // Send the device token and pubkey to the server
+        Task {
-        let token = deviceToken.map { String(format: "%02.2hhx", $0) }.joined()
+            try await state.push_notification_client.set_device_token(new_device_token: deviceToken)
-        
-        print("Received device token: \(token)")
-
-        guard let pubkey = keypair?.pubkey else {
-            return
         }
-
-        // 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

damusTests/AuthIntegrationTests.swift

@@ -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`

damusTests/Mocking/MockDamusState.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 @testable import damus
+import EmojiPicker
 
 // Generates a test damus state with configurable mock parameters
 func generate_test_damus_state(
@@ -25,7 +26,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),
@@ -50,7 +51,9 @@ func generate_test_damus_state(
                            music: .init(onChange: {_ in }),
                            video: .init(),
                            ndb: ndb,
-                           quote_reposts: .init(our_pubkey: our_pubkey) )
+                           quote_reposts: .init(our_pubkey: our_pubkey),
+                           emoji_provider: DefaultEmojiProvider(showAllVariations: false)
+    )
 
     return damus
 }

damusTests/MutingTests.swift

@@ -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))
+    }
+}

damusTests/NIP10Tests.swift

@@ -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.
+        }
+    }
+
+}

damusTests/NostrFilterTests.swift

@@ -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)
+    }
+}

damusTests/ReplyTests.swift

@@ -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 tr = interpret_event_refs(tags: ev.tags)
-        let event_refs = interpret_event_refs(blocks: blocks, tags: ev.tags)
+        XCTAssertNotNil(tr)
+        guard let tr else { return }
 
-        XCTAssertEqual(event_refs.count, 2)
+        XCTAssertEqual(tr.root.note_id, thread_id)
-        let r1 = event_refs[0]
+        XCTAssertEqual(tr.reply.note_id, reply_id)
-        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)
     }
     
     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 tr = interpret_event_refs(tags: ev.tags)
-        let event_refs = interpret_event_refs(blocks: blocks, tags: ev.tags)
 
-        XCTAssertEqual(event_refs.count, 1)
+        XCTAssertNotNil(tr)
-        let r = event_refs[0]
+        guard let tr else { return }
-        
+
-        XCTAssertEqual(r.is_direct_reply, .some(.note_id(thread_id)))
+        XCTAssertEqual(tr.root.note_id, thread_id)
-        XCTAssertEqual(r.is_reply, .some(.note_id(thread_id)))
+        XCTAssertEqual(tr.reply.note_id, thread_id)
-        XCTAssertEqual(r.is_thread_id, .some(.note_id(thread_id)))
+        XCTAssertNil(tr.mention)
-        XCTAssertNil(r.is_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]  = [
+        let tags = [
-            .event(thread_id),
+            ["e", thread_id.hex()],
-            .event(reply_id),
+            ["e", reply_id.hex()],
-            .pubkey(pubkey)
+            ["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")
-    }
-
 }

damusTests/TrieTests.swift

@@ -1,79 +0,0 @@
-//
-//  TrieTests.swift
-//  damusTests
-//
-//  Created by Terry Yiu on 6/26/23.
-//
-
-import XCTest
-@testable import damus
-
-final class TrieTests: XCTestCase {
-
-    func testFind() throws {
-        let trie = Trie<String>()
-
-        let keys = ["foobar", "food", "foo", "somethingelse", "duplicate", "duplicate"]
-        keys.forEach {
-            trie.insert(key: $0, value: $0)
-        }
-
-        let allResults = trie.find(key: "")
-        XCTAssertEqual(Set(allResults), Set(["foobar", "food", "foo", "somethingelse", "duplicate"]))
-
-        let fooResults = trie.find(key: "foo")
-        XCTAssertEqual(fooResults.first, "foo")
-        XCTAssertEqual(Set(fooResults), Set(["foobar", "food", "foo"]))
-
-        let foodResults = trie.find(key: "food")
-        XCTAssertEqual(foodResults, ["food"])
-
-        let ooResults = trie.find(key: "oo")
-        XCTAssertEqual(Set(ooResults), Set(["foobar", "food", "foo"]))
-
-        let aResults = trie.find(key: "a")
-        XCTAssertEqual(Set(aResults), Set(["foobar", "duplicate"]))
-
-        let notFoundResults = trie.find(key: "notfound")
-        XCTAssertEqual(notFoundResults, [])
-
-        // Sanity check that the root node has children.
-        XCTAssertTrue(trie.hasChildren)
-
-        // Sanity check that the root node has no values.
-        XCTAssertFalse(trie.hasValues)
-    }
-
-    func testRemove() {
-        let trie = Trie<String>()
-
-        let keys = ["foobar", "food", "foo", "somethingelse", "duplicate", "duplicate"]
-        keys.forEach {
-            trie.insert(key: $0, value: $0)
-        }
-
-        keys.forEach {
-            trie.remove(key: $0, value: $0)
-        }
-
-        let allResults = trie.find(key: "")
-        XCTAssertTrue(allResults.isEmpty)
-
-        let fooResults = trie.find(key: "foo")
-        XCTAssertTrue(fooResults.isEmpty)
-
-        let foodResults = trie.find(key: "food")
-        XCTAssertTrue(foodResults.isEmpty)
-
-        let ooResults = trie.find(key: "oo")
-        XCTAssertTrue(ooResults.isEmpty)
-
-        let aResults = trie.find(key: "a")
-        XCTAssertTrue(aResults.isEmpty)
-
-        // Verify that removal of values from all the keys that were inserted in the trie previously also resulted in the cleanup of the trie.
-        XCTAssertFalse(trie.hasChildren)
-        XCTAssertFalse(trie.hasValues)
-    }
-
-}

damusTests/UserSearchCacheTests.swift

@@ -1,136 +0,0 @@
-//
-//  UserSearchCacheTests.swift
-//  damusTests
-//
-//  Created by Terry Yiu on 6/30/23.
-//
-
-import XCTest
-@testable import damus
-
-// TODO: Update these tests to work with NostrDB Profile changes (https://github.com/damus-io/damus/issues/1586)
-final class UserSearchCacheTests: XCTestCase {
-    /*
-    var keypair: FullKeypair? = nil
-    let damusState = test_damus_state
-    let nip05 = "_@somedomain.com"
-
-    @MainActor
-    override func setUpWithError() throws {
-        keypair = try XCTUnwrap(generate_new_keypair())
-
-        if let keypair {
-            let pubkey = keypair.pubkey
-            let validatedNip05 = try XCTUnwrap(NIP05.parse(nip05))
-
-            damusState.profiles.set_validated(pubkey, nip05: validatedNip05)
-
-            let profile = Profile(name: "tyiu", display_name: "Terry Yiu", about: nil, picture: nil, banner: nil, website: nil, lud06: nil, lud16: nil, nip05: nip05, damus_donation: nil)
-
-            // Lookup to synchronize access on profiles dictionary to avoid race conditions.
-            let _ = damusState.profiles.lookup(id: pubkey)
-        }
-    }
-
-    override func tearDown() {
-        keypair = nil
-    }
-
-    func testSearch() throws {
-        let keypair = try XCTUnwrap(keypair)
-        XCTAssertEqual(damusState.user_search_cache.search(key: "tyiu"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "ty"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "terry yiu"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "rry"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "somedomain"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "dom"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "i"), [keypair.pubkey])
-    }
-
-    @MainActor
-    func testUpdateProfile() throws {
-        let keypair = try XCTUnwrap(keypair)
-
-        let newNip05 = "_@other.xyz"
-        _ = try XCTUnwrap(NIP05.parse(newNip05))
-
-        damusState.profiles.set_validated(keypair.pubkey, nip05: NIP05.parse(newNip05))
-
-        // Old profile attributes are removed from cache.
-        XCTAssertEqual(damusState.user_search_cache.search(key: "tyiu"), [])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "ty"), [])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "Terry Yiu"), [])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "rry"), [])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "somedomain"), [])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "dom"), [])
-
-        // New profile attributes are added to cache.
-        XCTAssertEqual(damusState.user_search_cache.search(key: "whoami"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "hoa"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "t-dawg"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "daw"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "other"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "xyz"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "the"), [keypair.pubkey])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "y"), [keypair.pubkey])
-    }
-    */
-
-    /*
-    func testUpdateOwnContactsPetnames() throws {
-        let keypair = try XCTUnwrap(keypair)
-        let damus = Pubkey(hex: "3efdaebb1d8923ebd99c9e7ace3b4194ab45512e2be79c1b7d68d9243e0d2681")!
-        let jb55 = Pubkey(hex: "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245")!
-
-        var pubkeysToPetnames = [Pubkey: String]()
-        pubkeysToPetnames[damus] = "damus"
-        pubkeysToPetnames[jb55] = "jb55"
-
-        let contactsEvent = try createContactsEventWithPetnames(pubkeysToPetnames: pubkeysToPetnames)
-
-        // Initial own contacts event caching on searchable petnames.
-        damusState.user_search_cache.updateOwnContactsPetnames(id: keypair.pubkey, oldEvent: nil, newEvent: contactsEvent)
-
-        XCTAssertEqual(damusState.user_search_cache.search(key: "damus"), [damus])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "jb55"), [jb55])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "5"), [jb55])
-
-        // Replace one of the petnames and verify if the cache updates accordingly.
-
-        pubkeysToPetnames.removeValue(forKey: jb55)
-        pubkeysToPetnames[jb55] = "bill"
-        let newContactsEvent = try createContactsEventWithPetnames(pubkeysToPetnames: pubkeysToPetnames)
-
-        damusState.user_search_cache.updateOwnContactsPetnames(id: keypair.pubkey, oldEvent: contactsEvent, newEvent: newContactsEvent)
-
-        XCTAssertEqual(damusState.user_search_cache.search(key: "damus"), [damus])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "jb55"), [])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "5"), [])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "bill"), [jb55])
-        XCTAssertEqual(damusState.user_search_cache.search(key: "l"), [jb55])
-    }
-    */
-
-    /*
-    private func createContactsEventWithPetnames(pubkeysToPetnames: [Pubkey: String]) throws -> NostrEvent {
-        let keypair = try XCTUnwrap(keypair)
-
-        let bootstrapRelays = load_bootstrap_relays(pubkey: keypair.pubkey)
-        let relayInfo = RelayInfo(read: true, write: true)
-        var relays: [String: RelayInfo] = [:]
-
-        for relay in bootstrapRelays {
-            relays[relay] = relayInfo
-        }
-
-        let relayJson = encode_json(relays)!
-
-        let tags: [[String]] = pubkeysToPetnames.enumerated().map {
-            ["p", $0.element.key.description, "", $0.element.value]
-        }
-
-        return NostrEvent(content: relayJson, keypair: keypair.to_keypair(), kind: NostrKind.contacts.rawValue, tags: tags)!
-    }
-     */
-
-}

damusTests/damusTests.swift

@@ -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

nostrdb/NdbNote+.swift

@@ -14,7 +14,7 @@ extension NdbNote {
     }
 
     func get_cached_inner_event(cache: EventCache) -> NdbNote? {
-        guard self.known_kind == .boost else {
+        guard self.known_kind == .boost || self.known_kind == .highlight else {
             return nil
         }
 

nostrdb/NdbNote.swift

@@ -277,7 +277,7 @@ class NdbNote: Encodable, Equatable, Hashable {
 // Extension to make NdbNote compatible with NostrEvent's original API
 extension NdbNote {
     var is_textlike: Bool {
-        return kind == 1 || kind == 42 || kind == 30023
+        return kind == 1 || kind == 42 || kind == 30023 || kind == 9802
     }
 
     var is_quote_repost: NoteId? {
@@ -340,9 +340,8 @@ extension NdbNote {
         References<RefId>(tags: self.tags)
     }
 
-    func event_refs(_ keypair: Keypair) -> [EventRef] {
+    func thread_reply() -> ThreadReply? {
-        let refs = interpret_event_refs_ndb(blocks: self.blocks(keypair).blocks, tags: self.tags)
+        ThreadReply(tags: self.tags)
-        return refs
     }
 
     func get_content(_ keypair: Keypair) -> String {
@@ -388,23 +387,17 @@ extension NdbNote {
         return dec
     }
 
-    public func direct_replies(_ keypair: Keypair) -> [NoteId] {
+    public func direct_replies() -> NoteId? {
-        return event_refs(keypair).reduce(into: []) { acc, evref in
+        return thread_reply()?.reply.note_id
-            if let direct_reply = evref.is_direct_reply {
-                acc.append(direct_reply.note_id)
-            }
-        }
     }
 
     // NDBTODO: just use Id
-    public func thread_id(keypair: Keypair) -> NoteId {
+    public func thread_id() -> NoteId {
-        for ref in event_refs(keypair) {
+        guard let root = self.thread_reply()?.root else {
-            if let thread_id = ref.is_thread_id {
+            return self.id
-                return thread_id.note_id
-            }
         }
 
-        return self.id
+        return root.note_id
     }
 
     public func last_refid() -> NoteId? {
@@ -428,8 +421,8 @@ extension NdbNote {
     }
      */
 
-    func is_reply(_ keypair: Keypair) -> Bool {
+    func is_reply() -> Bool {
-        return event_is_reply(self.event_refs(keypair))
+        return thread_reply() != nil
     }
 
     func note_language(_ keypair: Keypair) -> String? {

nostrdb/Test/NdbTests.swift

@@ -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)