Add auto-translate setting

Add optional language filter on Universe feed
Revert "Revert "Don't make previews full bleed""
2023-03-27 10:31:58 -04:00 · 2023-03-27 10:26:18 -04:00 · 2023-03-26 09:36:02 -06:00 · 2023-03-26 09:35:53 -06:00 · 2023-03-26 09:35:07 -06:00 · 2023-03-25 07:54:04 -06:00
292 changed files with 14202 additions and 26581 deletions
@@ -1,3 +1,250 @@
+## [1.3.0-7] - 2023-03-24
+
+- New experimental timeline view
+
+[1.3.0-7]: https://github.com/damus-io/damus/releases/tag/v1.3.0-7
+
+## [1.3.0-6] - 2023-03-21
+
+### Fixed
+
+- Fix bug where nostr: links and QRs stopped working (William Casarin)
+
+
+[1.3.0-6]: https://github.com/damus-io/damus/releases/tag/v1.3.0-6
+
+## [1.3.0-5] - 2023-03-20
+
+### Added
+
+- Add Time Ago to DM View (Joel Klabo)
+
+
+### Fixed
+
+- Fixed internal links opening in other nostr clients (William Casarin)
+- Remove authentication for copying npub (Swift)
+
+
+[1.3.0-5]: https://github.com/damus-io/damus/releases/tag/v1.3.0-5
+
+## [1.3.0-4] - 2023-03-17
+
+### Changed
+
+- It's much easier to tag users in replies and posts (William Casarin)
+
+
+### Fixed
+
+- Fix bug where small black text appears during image upload (William Casarin)
+
+
+[1.3.0-4]: https://github.com/damus-io/damus/releases/tag/v1.3.0-4
+
+## [1.3.0-3] - 2023-03-17
+
+### Fixed
+
+- Fix image upload url delay after progress bar disappears (William Casarin)
+- Fix issue where damus stops trying to reconnect (William Casarin)
+
+[1.3.0-3]: https://github.com/damus-io/damus/releases/tag/v1.3.0-3
+
+## [1.3.0-2] - 2023-03-16
+
+### Added
+
+- Add image uploader (Swift)
+- Add option to always show images (never blur) (William Casarin)
+
+
+### Changed
+
+- Fixed embedded note popping (William Casarin)
+- Bump notification limit from 100 to 500 (William Casarin)
+
+
+### Fixed
+
+- Fix zap button preventing scrolling (William Casarin)
+
+
+[1.3.0-2]: https://github.com/damus-io/damus/releases/tag/v1.3.0-2
+
+## [1.3.0] - 2023-03-15
+
+### Added
+
+- Extend user tagging search to all local profiles (William Casarin)
+- Vibrate when a zap is received (Swift)
+- New and Improved Share sheet (ericholguin)
+
+
+### Changed
+
+- Reduce battery usage by using exp backoff on connections (Bryan Montz)
+- Don't show both realname and username if they are the same (William Casarin)
+- Show error on invalid lightning tip address (Swift)
+- Make DM Content More Visible (Joel Klabo)
+- Remove spaces from hashtag searches (gladiusKatana)
+
+
+### Fixed
+
+- Show @ mentions for users with display_names and no username (William Casarin)
+- Make user search case insensitive (William Casarin)
+- Fix repost button sometimes not working (OlegAba)
+- Don't show follows you for your own profile (benthecarman)
+- Fix json appearing in profile searches (gladiusKatana)
+- Fix unexpected font size when posting (Bryan Montz)
+- Fix keyboard sticking issues (OlegAba)
+- Fixed tab bar background color on macOS (Joel Klabo)
+- Fix some links getting interpreted as images (gladiusKatana)
+
+
+[1.3.0]: https://github.com/damus-io/damus/releases/tag/v1.3.0
+
+## [1.2.0-4] - 2023-03-05
+
+### Added
+
+- Add ellipsis button to notes (ericholguin)
+
+
+### Changed
+
+- Immediately search for events and profiles (William Casarin)
+- Use long-press for custom zaps (William Casarin)
+- Make shaka animation smoother (Swift)
+
+
+### Fixed
+
+- Fixed hit detection bugs on profile page (OlegAba)
+- Fix disappearing text on Thread view (Bryan Montz)
+- Render links in notification summaries (Joel Klabo)
+- Don't show notifications from ourselves (William Casarin)
+- Fix issue where navbar back button would show the wrong text (Jack Chakany)
+- Fix case sensitivity when searching hashtags (randymcmillan)
+- Fix issue where opening reposts shows json (William Casarin)
+
+
+[1.2.0-4]: https://github.com/damus-io/damus/releases/tag/v1.2.0-4
+
+## [1.2.0-3] - 2023-03-04
+
+### Added
+
+- Add additional info to recommended relay view (ericholguin)
+- Add shaka animation (Swift)
+- Add option to disable image animation (OlegAba)
+- Add additional warning when deleting account (ericholguin)
+- Threads now load instantly and are cached (William Casarin)
+
+
+### Fixed
+
+- Wrap long profile display names (OlegAba)
+- Fixed weird scaling on profile pictures (OlegAba)
+- Fixed width of copy pubkey on profile page (Joel Klabo)
+- Make damus purple use more consistent in mentions (Joel Klabo)
+
+
+
+[1.2.0-3]: https://github.com/damus-io/damus/releases/tag/v1.2.0-3
+
+## [1.1.0-10] - 2023-03-01
+
+### Added
+
+- Truncate large posts and add a show more button (OlegAba)
+- Private Zaps (William Casarin)
+
+
+### Fixed
+
+- Fix default zap amount setting not getting updated (William Casarin)
+- Fix issue where keyboard covers custom zap comment (William Casarin)
+
+
+[1.1.0-10]: https://github.com/damus-io/damus/releases/tag/v1.1.0-10
+
+## [1.1.0-9] - 2023-02-26
+
+### Added
+
+- Customized zaps (William Casarin)
+- Add new Notifications View (William Casarin)
+- Bookmarking (Joel Klabo)
+
+### Changed
+
+- No more inline npubs when tagging users (Swift)
+
+
+### Fixed
+
+- Fix alignment of side menu labels (Joel Klabo)
+- Fix duplicated participants in reply-to view (Joel Klabo)
+- Load missing profiles in Zaps view (William Casarin)
+- Fix memory leak with inline videos (William Casarin)
+- Eliminate popping when scrolling (William Casarin)
+
+
+[1.1.0-9]: https://github.com/damus-io/damus/releases/tag/v1.1.0-9
+
+## [1.1.0-3] - 2023-02-20
+
+### Added
+
+- Add a "load more" button instead of always inserting events in timelines (William Casarin)
+- Added the ability to select text on posts (OlegAba)
+- Added Posts or Post & Replies selector to Profile (ericholguin)
+- Improved profile navbar (OlegAba)
+
+
+### Changed
+
+- Rename global feed to universe (William Casarin)
+- Improve look of post view (ericholguin)
+- Added a 20MB content length limit for all image files (OlegAba)
+- Improved EventActionBar button spacing (Bryan Montz)
+- Polished profile key copy buttons, added animation (Bryan Montz)
+- Format large numbers of action bar actions (Joel Klabo)
+- Improved blur on images, especially in dark mode (Bryan Montz)
+
+
+### Fixed
+
+- Remove trailing slash when adding a relay (middlingphys)
+- Scroll to top of events instead of the bottom (OlegAba)
+- Fix lag on startup when you have lots of DMs (William Casarin)
+- Fix an issues where dm notifications appear without any new events (William Casarin)
+- Fix some hangs when scrolling by images (OlegAba)
+- Force default zap amount text field to accept only numbers (Terry Yiu)
+
+
+
+[1.1.0-3]: https://github.com/damus-io/damus/releases/tag/v1.1.0-3
+
+## [1.1.0-2] - 2023-02-14
+
+### Added
+
+- Save drafts to posts, replies and DMs (Terry Yiu)
+
+### Fixed
+
+- Ensure stats get updated in realtime on action bars (William Casarin)
+- Fix reposts not getting counted properly (William Casarin)
+- Fix a bug where zaps on other people's posts weren't showing (William Casarin)
+- Fix punctuation getting included in some urls (Gert Goet)
+- Improve language detection (Terry Yiu)
+- Fix some animated image crashes (William Casarin)
+
+
+[1.1.0-2]: https://github.com/damus-io/damus/releases/tag/v1.1.0-2
 ## [1.0.0-15] - 2023-02-10

 ### Added
@@ -108,24 +108,6 @@ All user-facing strings must have a comment in order to provide context to trans

 [transifex]: https://explore.transifex.com/damus/damus-ios/

-#### Export Source Translations
-
-If user-facing strings have been added or changed, please export them for translation as part of your pull request or commit by running:
-
-```zsh
-./devtools/export-source-translation.sh
-```
-
-This command will export source translations to `translations/en-US.xcloc/Localized Contents/en-US.xliff`, which the Transifex integration will read from the `master` branch and allow translators to translate those strings.
-
-#### Import Translations
-
-Once 100% of strings have been translated for a given locale, Transifex will open up a pull request with the `translations/<locale>.xliff` file changed. Currently, it must be manually imported into the project before merging the pull request by running:
-
-```zsh
-./devtools/import-translation.sh <locale_code_in_snake_case>
-```
-
 ### Awards

 There may be nostr badges awarded for contributors in the future... :)
@@ -11,6 +11,11 @@
 		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 */; };
+		3A3040ED29A5CB86008A0F29 /* ReplyDescriptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040EC29A5CB86008A0F29 /* ReplyDescriptionTests.swift */; };
+		3A3040EF29A8FEE9008A0F29 /* EventDetailBarTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040EE29A8FEE9008A0F29 /* EventDetailBarTests.swift */; };
+		3A3040F129A8FF97008A0F29 /* LocalizationUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040F029A8FF97008A0F29 /* LocalizationUtil.swift */; };
+		3A3040F329A91366008A0F29 /* ProfileViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040F229A91366008A0F29 /* ProfileViewTests.swift */; };
+		3A30410129AB12AA008A0F29 /* EventGroupViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A30410029AB12AA008A0F29 /* EventGroupViewTests.swift */; };
 		3A4325A82961E11400BFCD9D /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 3A4325AA2961E11400BFCD9D /* Localizable.stringsdict */; };
 		3AA247FD297E3CFF0090C62D /* RepostsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA247FC297E3CFF0090C62D /* RepostsModel.swift */; };
 		3AA247FF297E3D900090C62D /* RepostsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA247FE297E3D900090C62D /* RepostsView.swift */; };
@@ -42,6 +47,12 @@
 		4C285C8A2838B985008A31F1 /* ProfilePictureSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C285C892838B985008A31F1 /* ProfilePictureSelector.swift */; };
 		4C285C8C28398BC7008A31F1 /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C285C8B28398BC6008A31F1 /* Keys.swift */; };
 		4C285C8E28399BFE008A31F1 /* SaveKeysView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C285C8D28399BFD008A31F1 /* SaveKeysView.swift */; };
+		4C2CDDF7299D4A5E00879FD5 /* Debouncer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2CDDF6299D4A5E00879FD5 /* Debouncer.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 */; };
+		4C30AC7829A577AB00E2BD5A /* EventCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C30AC7729A577AB00E2BD5A /* EventCache.swift */; };
+		4C30AC8029A6A53F00E2BD5A /* ProfilePicturesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C30AC7F29A6A53F00E2BD5A /* ProfilePicturesView.swift */; };
 		4C363A8428233689006E126D /* Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A8328233689006E126D /* Parser.swift */; };
 		4C363A8828236948006E126D /* BlocksView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A8728236948006E126D /* BlocksView.swift */; };
 		4C363A8A28236B57006E126D /* MentionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C363A8928236B57006E126D /* MentionView.swift */; };
@@ -92,6 +103,9 @@
 		4C3EA67F28FFC01D00C48A62 /* InvoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA67E28FFC01D00C48A62 /* InvoiceView.swift */; };
 		4C42812C298C848200DBF26F /* TranslateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C42812B298C848200DBF26F /* TranslateView.swift */; };
 		4C477C9E282C3A4800033AA3 /* TipCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C477C9D282C3A4800033AA3 /* TipCounter.swift */; };
+		4C54AA0729A540BA003E4487 /* NotificationsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C54AA0629A540BA003E4487 /* NotificationsModel.swift */; };
+		4C54AA0A29A55429003E4487 /* EventGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C54AA0929A55429003E4487 /* EventGroup.swift */; };
+		4C54AA0C29A5543C003E4487 /* ZapGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C54AA0B29A5543C003E4487 /* ZapGroup.swift */; };
 		4C5C7E68284ED36500A22DF5 /* SearchHomeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5C7E67284ED36500A22DF5 /* SearchHomeModel.swift */; };
 		4C5C7E6A284EDE2E00A22DF5 /* SearchResultsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5C7E69284EDE2E00A22DF5 /* SearchResultsView.swift */; };
 		4C5F9114283D694D0052CD1C /* FollowTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5F9113283D694D0052CD1C /* FollowTarget.swift */; };
@@ -121,6 +135,10 @@
 		4C90BD1C283AC38E008EE7EF /* Bech32Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C90BD1B283AC38E008EE7EF /* Bech32Tests.swift */; };
 		4C987B57283FD07F0042CE38 /* FollowersModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C987B56283FD07F0042CE38 /* FollowersModel.swift */; };
 		4C99737B28C92A9200E53835 /* ChatroomMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C99737A28C92A9200E53835 /* ChatroomMetadata.swift */; };
+		4C9BB83129C0ED4F00FC4E37 /* DisplayName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9BB83029C0ED4F00FC4E37 /* DisplayName.swift */; };
+		4C9BB83429C12D9900FC4E37 /* EventProfileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9BB83329C12D9900FC4E37 /* EventProfileName.swift */; };
+		4C9F18E229AA9B6C008C55EC /* CustomizeZapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9F18E129AA9B6C008C55EC /* CustomizeZapView.swift */; };
+		4C9F18E429ABDE6D008C55EC /* MaybeAnonPfpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9F18E329ABDE6D008C55EC /* MaybeAnonPfpView.swift */; };
 		4CA2EFA0280E37AC0044ACD8 /* TimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */; };
 		4CAAD8AD298851D000060CEA /* AccountDeletion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CAAD8AC298851D000060CEA /* AccountDeletion.swift */; };
 		4CAAD8B029888AD200060CEA /* RelayConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */; };
@@ -154,7 +172,14 @@
 		4CC7AAF6297F1A6A00430951 /* EventBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF5297F1A6A00430951 /* EventBody.swift */; };
 		4CC7AAF8297F1CEE00430951 /* EventProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF7297F1CEE00430951 /* EventProfile.swift */; };
 		4CC7AAFA297F64AC00430951 /* EventMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF9297F64AC00430951 /* EventMenu.swift */; };
+		4CCEB7A929B29DD50078AA28 /* SearchResultsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CCEB7A829B29DD50078AA28 /* SearchResultsModel.swift */; };
+		4CCEB7AE29B53D260078AA28 /* SearchingEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CCEB7AD29B53D260078AA28 /* SearchingEventView.swift */; };
+		4CCEB7B029B5415A0078AA28 /* SearchingProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CCEB7AF29B5415A0078AA28 /* SearchingProfileView.swift */; };
+		4CD348EF29C3659D00497EB2 /* ImageUploadModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD348EE29C3659D00497EB2 /* ImageUploadModel.swift */; };
 		4CD7641B28A1641400B6928F /* EndBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD7641A28A1641400B6928F /* EndBlock.swift */; };
+		4CE0E2AF29A2E82100DB4CA2 /* EventHolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE0E2AE29A2E82100DB4CA2 /* EventHolder.swift */; };
+		4CE0E2B229A3DF6900DB4CA2 /* LoadMoreButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE0E2B129A3DF6900DB4CA2 /* LoadMoreButton.swift */; };
+		4CE0E2B629A3ED5500DB4CA2 /* InnerTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE0E2B529A3ED5500DB4CA2 /* InnerTimelineView.swift */; };
 		4CE4F8CD281352B30009DFBB /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F8CC281352B30009DFBB /* Notifications.swift */; };
 		4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */; };
 		4CE4F9E1285287B800C00DD9 /* TextFieldAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F9E0285287B800C00DD9 /* TextFieldAlert.swift */; };
@@ -197,23 +222,36 @@
 		4CF0ABEE29844B5500D66079 /* AnyEncodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABED29844B5500D66079 /* AnyEncodable.swift */; };
 		4CF0ABF029857E9200D66079 /* Bech32Object.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABEF29857E9200D66079 /* Bech32Object.swift */; };
 		4CF0ABF62985CD5500D66079 /* UserSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABF52985CD5500D66079 /* UserSearch.swift */; };
+		4CFF8F6329CC9AD7008DB934 /* ImageContextMenuModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF8F6229CC9AD7008DB934 /* ImageContextMenuModifier.swift */; };
+		4CFF8F6729CC9E3A008DB934 /* ImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF8F6629CC9E3A008DB934 /* ImageView.swift */; };
+		4CFF8F6929CC9ED1008DB934 /* ImageContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF8F6829CC9ED1008DB934 /* ImageContainerView.swift */; };
+		4CFF8F6B29CD0079008DB934 /* RepostedEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF8F6A29CD0079008DB934 /* RepostedEvent.swift */; };
+		4CFF8F6D29CD022E008DB934 /* WideEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF8F6C29CD022E008DB934 /* WideEventView.swift */; };
 		4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FE60CDC295E1C5E00105A1F /* Wallet.swift */; };
+		50A50A8D29A09E1C00C01BE7 /* RequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A50A8C29A09E1C00C01BE7 /* RequestTests.swift */; };
 		5C513FBA297F72980072348F /* CustomPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FB9297F72980072348F /* CustomPicker.swift */; };
 		5C513FCC2984ACA60072348F /* QRCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FCB2984ACA60072348F /* QRCodeView.swift */; };
+		5CF72FC229B9142F00124A13 /* ShareAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF72FC129B9142F00124A13 /* ShareAction.swift */; };
 		6439E014296790CF0020672B /* ProfileZoomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6439E013296790CF0020672B /* ProfileZoomView.swift */; };
 		643EA5C8296B764E005081BB /* RelayFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 643EA5C7296B764E005081BB /* RelayFilterView.swift */; };
 		647D9A8D2968520300A295DE /* SideMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647D9A8C2968520300A295DE /* SideMenuView.swift */; };
 		64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64FBD06E296255C400D9D3B2 /* Theme.swift */; };
 		6C7DE41F2955169800E66263 /* Vault in Frameworks */ = {isa = PBXBuildFile; productRef = 6C7DE41E2955169800E66263 /* Vault */; };
-		7C45AE71297353390031D7BC /* KFImageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C45AE70297353390031D7BC /* KFImageModel.swift */; };
+		7C0F392F29B57CAF0039859C /* Binding+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C0F392E29B57CAF0039859C /* Binding+.swift */; };
 		7C60CAEF298471A1009C80D6 /* CoreSVG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C60CAEE298471A1009C80D6 /* CoreSVG.swift */; };
 		7C902AE32981D55B002AB16E /* ZoomableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */; };
+		7C95CAEE299DCEF1009DCB67 /* KFOptionSetter+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */; };
+		7CFF6317299FEFE5005D382A /* SelectableText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CFF6316299FEFE5005D382A /* SelectableText.swift */; };
 		9609F058296E220800069BF3 /* BannerImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9609F057296E220800069BF3 /* BannerImageView.swift */; };
+		9C83F89329A937B900136C08 /* TextViewWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C83F89229A937B900136C08 /* TextViewWrapper.swift */; };
+		9CA876E229A00CEA0003B9A3 /* AttachMediaUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CA876E129A00CE90003B9A3 /* AttachMediaUtility.swift */; };
 		BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA693073295D649800ADDB87 /* UserSettingsStore.swift */; };
 		BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */; };
 		DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */; };
 		E990020F2955F837003BBC5A /* EditMetadataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E990020E2955F837003BBC5A /* EditMetadataView.swift */; };
-		E9E4ED0B295867B900DD7078 /* ThreadV2View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */; };
+		E9E4ED0B295867B900DD7078 /* ThreadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E4ED0A295867B900DD7078 /* ThreadView.swift */; };
+		F75BA12D29A1855400E10810 /* BookmarksManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75BA12C29A1855400E10810 /* BookmarksManager.swift */; };
+		F75BA12F29A18EF500E10810 /* BookmarksView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75BA12E29A18EF500E10810 /* BookmarksView.swift */; };
 		F7908E92298B0F0700AB113A /* RelayDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7908E91298B0F0700AB113A /* RelayDetailView.swift */; };
 		F7908E97298B1FDF00AB113A /* NIPURLBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7908E96298B1FDF00AB113A /* NIPURLBuilder.swift */; };
 		F7F0BA25297892BD009531F3 /* SwipeToDismiss.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */; };
@@ -249,6 +287,21 @@
 		3A25EF142992DA5D008ABE69 /* el-GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "el-GR"; path = "el-GR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A25EF152992DA5D008ABE69 /* el-GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "el-GR"; path = "el-GR.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A2B8B0A296A8982009CC16D /* en-US */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "en-US"; path = "en-US.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3A3040EC29A5CB86008A0F29 /* ReplyDescriptionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyDescriptionTests.swift; sourceTree = "<group>"; };
+		3A3040EE29A8FEE9008A0F29 /* EventDetailBarTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventDetailBarTests.swift; sourceTree = "<group>"; };
+		3A3040F029A8FF97008A0F29 /* LocalizationUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizationUtil.swift; sourceTree = "<group>"; };
+		3A3040F229A91366008A0F29 /* ProfileViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewTests.swift; sourceTree = "<group>"; };
+		3A3040F929A91ED6008A0F29 /* zh-HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-HK"; path = "zh-HK.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3A3040FA29A91EFC008A0F29 /* zh-HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-HK"; path = "zh-HK.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3A3040FB29A91F03008A0F29 /* zh-HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-HK"; path = "zh-HK.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3A3040FC29A91F31008A0F29 /* zh-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-TW"; path = "zh-TW.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3A3040FD29A91F31008A0F29 /* zh-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-TW"; path = "zh-TW.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3A3040FE29A91F31008A0F29 /* zh-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-TW"; path = "zh-TW.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3A3040FF29AB02D1008A0F29 /* en-US */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-US"; path = "en-US.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3A30410029AB12AA008A0F29 /* EventGroupViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventGroupViewTests.swift; sourceTree = "<group>"; };
+		3A41E559299D52BE001FA465 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3A41E55A299D52BE001FA465 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3A41E55B299D52BE001FA465 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = id; path = id.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		3A4F3320297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-FR"; path = "fr-FR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A4F3321297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-FR"; path = "fr-FR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A4F3322297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "fr-FR"; path = "fr-FR.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
@@ -259,6 +312,12 @@
 		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>"; };
+		3A827A18299FC69D00C4D171 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3A827A19299FC69D00C4D171 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3A827A1A299FC69D00C4D171 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ru; path = ru.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		3A8624D9299E82BE00BD8BE9 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		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>"; };
 		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>"; };
@@ -272,6 +331,12 @@
 		3AA247FE297E3D900090C62D /* RepostsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostsView.swift; sourceTree = "<group>"; };
 		3AA24801297E3DC20090C62D /* RepostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostView.swift; sourceTree = "<group>"; };
 		3AA59D1C2999B0400061C48E /* DraftsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraftsModel.swift; sourceTree = "<group>"; };
+		3AA5E70229B682A5002701ED /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3AA5E70329B682AD002701ED /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3AA5E70429B682B3002701ED /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = uk; path = uk.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		3AA5E70529B9E83E002701ED /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3AA5E70629B9E844002701ED /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3AA5E70729B9E84A002701ED /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = bg; path = bg.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		3AAA95C9298DF87B00F3D526 /* TranslationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslationService.swift; sourceTree = "<group>"; };
 		3AAA95CB298E07E900F3D526 /* DeepLPlan.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeepLPlan.swift; sourceTree = "<group>"; };
 		3AB5B86A2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -284,6 +349,21 @@
 		3ACB685B297633BC00C46468 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3ACB685E297633BC00C46468 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3ACBCB77295FE5C70037388A /* TimeAgoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeAgoTests.swift; sourceTree = "<group>"; };
+		3AD14EB529C40F38009D2D9C /* hu-HU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "hu-HU"; path = "hu-HU.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3AD14EB629C40F38009D2D9C /* hu-HU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hu-HU"; path = "hu-HU.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3AD14EB729C40F38009D2D9C /* hu-HU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hu-HU"; path = "hu-HU.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3AD14EB829C40F3F009D2D9C /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "sv-SE"; path = "sv-SE.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3AD14EB929C40F3F009D2D9C /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sv-SE"; path = "sv-SE.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3AD14EBA29C40F3F009D2D9C /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sv-SE"; path = "sv-SE.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3AD14EBB29C40F47009D2D9C /* fr-CA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-CA"; path = "fr-CA.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3AD14EBC29C40F47009D2D9C /* fr-CA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "fr-CA"; path = "fr-CA.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3AD14EBD29C40F47009D2D9C /* fr-CA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-CA"; path = "fr-CA.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3AD5662B29BD2F5300BF77C5 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3AD5662C29BD2F5300BF77C5 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = fa; path = fa.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		3AD5662D29BD2F5300BF77C5 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3AD5663129C0DA4B00BF77C5 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3AD5663229C0DA4B00BF77C5 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ko; path = ko.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		3AD5663329C0DA4B00BF77C5 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibreTranslateServer.swift; sourceTree = "<group>"; };
 		3AEB8003297CCEA800713A25 /* tr-TR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "tr-TR"; path = "tr-TR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3AEB8004297CCEA800713A25 /* tr-TR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "tr-TR"; path = "tr-TR.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -312,6 +392,12 @@
 		4C285C892838B985008A31F1 /* ProfilePictureSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfilePictureSelector.swift; sourceTree = "<group>"; };
 		4C285C8B28398BC6008A31F1 /* Keys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Keys.swift; sourceTree = "<group>"; };
 		4C285C8D28399BFD008A31F1 /* SaveKeysView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SaveKeysView.swift; sourceTree = "<group>"; };
+		4C2CDDF6299D4A5E00879FD5 /* Debouncer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Debouncer.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>"; };
+		4C30AC7729A577AB00E2BD5A /* EventCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventCache.swift; sourceTree = "<group>"; };
+		4C30AC7F29A6A53F00E2BD5A /* ProfilePicturesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfilePicturesView.swift; sourceTree = "<group>"; };
 		4C363A8328233689006E126D /* Parser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Parser.swift; sourceTree = "<group>"; };
 		4C363A8728236948006E126D /* BlocksView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlocksView.swift; sourceTree = "<group>"; };
 		4C363A8928236B57006E126D /* MentionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MentionView.swift; sourceTree = "<group>"; };
@@ -392,6 +478,9 @@
 		4C42812B298C848200DBF26F /* TranslateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslateView.swift; sourceTree = "<group>"; };
 		4C477C9D282C3A4800033AA3 /* TipCounter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipCounter.swift; sourceTree = "<group>"; };
 		4C4A3A5A288A1B2200453788 /* damus.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = damus.entitlements; sourceTree = "<group>"; };
+		4C54AA0629A540BA003E4487 /* NotificationsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsModel.swift; sourceTree = "<group>"; };
+		4C54AA0929A55429003E4487 /* EventGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventGroup.swift; sourceTree = "<group>"; };
+		4C54AA0B29A5543C003E4487 /* ZapGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapGroup.swift; sourceTree = "<group>"; };
 		4C5C7E67284ED36500A22DF5 /* SearchHomeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchHomeModel.swift; sourceTree = "<group>"; };
 		4C5C7E69284EDE2E00A22DF5 /* SearchResultsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultsView.swift; sourceTree = "<group>"; };
 		4C5F9113283D694D0052CD1C /* FollowTarget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowTarget.swift; sourceTree = "<group>"; };
@@ -421,6 +510,10 @@
 		4C90BD1B283AC38E008EE7EF /* Bech32Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bech32Tests.swift; sourceTree = "<group>"; };
 		4C987B56283FD07F0042CE38 /* FollowersModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowersModel.swift; sourceTree = "<group>"; };
 		4C99737A28C92A9200E53835 /* ChatroomMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatroomMetadata.swift; sourceTree = "<group>"; };
+		4C9BB83029C0ED4F00FC4E37 /* DisplayName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayName.swift; sourceTree = "<group>"; };
+		4C9BB83329C12D9900FC4E37 /* EventProfileName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventProfileName.swift; sourceTree = "<group>"; };
+		4C9F18E129AA9B6C008C55EC /* CustomizeZapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomizeZapView.swift; sourceTree = "<group>"; };
+		4C9F18E329ABDE6D008C55EC /* MaybeAnonPfpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MaybeAnonPfpView.swift; sourceTree = "<group>"; };
 		4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineView.swift; sourceTree = "<group>"; };
 		4CAAD8AC298851D000060CEA /* AccountDeletion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountDeletion.swift; sourceTree = "<group>"; };
 		4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayConfigView.swift; sourceTree = "<group>"; };
@@ -454,7 +547,14 @@
 		4CC7AAF5297F1A6A00430951 /* EventBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventBody.swift; sourceTree = "<group>"; };
 		4CC7AAF7297F1CEE00430951 /* EventProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventProfile.swift; sourceTree = "<group>"; };
 		4CC7AAF9297F64AC00430951 /* EventMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventMenu.swift; sourceTree = "<group>"; };
+		4CCEB7A829B29DD50078AA28 /* SearchResultsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultsModel.swift; sourceTree = "<group>"; };
+		4CCEB7AD29B53D260078AA28 /* SearchingEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchingEventView.swift; sourceTree = "<group>"; };
+		4CCEB7AF29B5415A0078AA28 /* SearchingProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchingProfileView.swift; sourceTree = "<group>"; };
+		4CD348EE29C3659D00497EB2 /* ImageUploadModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageUploadModel.swift; sourceTree = "<group>"; };
 		4CD7641A28A1641400B6928F /* EndBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndBlock.swift; sourceTree = "<group>"; };
+		4CE0E2AE29A2E82100DB4CA2 /* EventHolder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventHolder.swift; sourceTree = "<group>"; };
+		4CE0E2B129A3DF6900DB4CA2 /* LoadMoreButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadMoreButton.swift; sourceTree = "<group>"; };
+		4CE0E2B529A3ED5500DB4CA2 /* InnerTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InnerTimelineView.swift; sourceTree = "<group>"; };
 		4CE4F8CC281352B30009DFBB /* Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = "<group>"; };
 		4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigView.swift; sourceTree = "<group>"; };
 		4CE4F9E0285287B800C00DD9 /* TextFieldAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldAlert.swift; sourceTree = "<group>"; };
@@ -500,22 +600,35 @@
 		4CF0ABED29844B5500D66079 /* AnyEncodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyEncodable.swift; sourceTree = "<group>"; };
 		4CF0ABEF29857E9200D66079 /* Bech32Object.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bech32Object.swift; sourceTree = "<group>"; };
 		4CF0ABF52985CD5500D66079 /* UserSearch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSearch.swift; sourceTree = "<group>"; };
+		4CFF8F6229CC9AD7008DB934 /* ImageContextMenuModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageContextMenuModifier.swift; sourceTree = "<group>"; };
+		4CFF8F6629CC9E3A008DB934 /* ImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageView.swift; sourceTree = "<group>"; };
+		4CFF8F6829CC9ED1008DB934 /* ImageContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageContainerView.swift; sourceTree = "<group>"; };
+		4CFF8F6A29CD0079008DB934 /* RepostedEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostedEvent.swift; sourceTree = "<group>"; };
+		4CFF8F6C29CD022E008DB934 /* WideEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WideEventView.swift; sourceTree = "<group>"; };
 		4FE60CDC295E1C5E00105A1F /* Wallet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Wallet.swift; sourceTree = "<group>"; };
+		50A50A8C29A09E1C00C01BE7 /* RequestTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestTests.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>"; };
+		5CF72FC129B9142F00124A13 /* ShareAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareAction.swift; sourceTree = "<group>"; };
 		6439E013296790CF0020672B /* ProfileZoomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileZoomView.swift; sourceTree = "<group>"; };
 		643EA5C7296B764E005081BB /* RelayFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayFilterView.swift; sourceTree = "<group>"; };
 		647D9A8C2968520300A295DE /* SideMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuView.swift; sourceTree = "<group>"; };
 		64FBD06E296255C400D9D3B2 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
-		7C45AE70297353390031D7BC /* KFImageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KFImageModel.swift; sourceTree = "<group>"; };
+		7C0F392E29B57CAF0039859C /* Binding+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Binding+.swift"; sourceTree = "<group>"; };
 		7C60CAEE298471A1009C80D6 /* CoreSVG.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreSVG.swift; sourceTree = "<group>"; };
 		7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZoomableScrollView.swift; sourceTree = "<group>"; };
+		7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KFOptionSetter+.swift"; sourceTree = "<group>"; };
+		7CFF6316299FEFE5005D382A /* SelectableText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableText.swift; sourceTree = "<group>"; };
 		9609F057296E220800069BF3 /* BannerImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BannerImageView.swift; sourceTree = "<group>"; };
+		9C83F89229A937B900136C08 /* TextViewWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextViewWrapper.swift; sourceTree = "<group>"; };
+		9CA876E129A00CE90003B9A3 /* AttachMediaUtility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachMediaUtility.swift; sourceTree = "<group>"; };
 		BA693073295D649800ADDB87 /* UserSettingsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSettingsStore.swift; sourceTree = "<group>"; };
 		BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectWalletView.swift; sourceTree = "<group>"; };
 		DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkdownTests.swift; sourceTree = "<group>"; };
 		E990020E2955F837003BBC5A /* EditMetadataView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditMetadataView.swift; sourceTree = "<group>"; };
-		E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadV2View.swift; sourceTree = "<group>"; };
+		E9E4ED0A295867B900DD7078 /* ThreadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadView.swift; sourceTree = "<group>"; };
+		F75BA12C29A1855400E10810 /* BookmarksManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksManager.swift; sourceTree = "<group>"; };
+		F75BA12E29A18EF500E10810 /* BookmarksView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksView.swift; sourceTree = "<group>"; };
 		F7908E91298B0F0700AB113A /* RelayDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayDetailView.swift; sourceTree = "<group>"; };
 		F7908E96298B1FDF00AB113A /* NIPURLBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIPURLBuilder.swift; sourceTree = "<group>"; };
 		F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwipeToDismiss.swift; sourceTree = "<group>"; };
@@ -563,6 +676,7 @@
 			isa = PBXGroup;
 			children = (
 				3AA24801297E3DC20090C62D /* RepostView.swift */,
+				4CFF8F6A29CD0079008DB934 /* RepostedEvent.swift */,
 			);
 			path = Reposts;
 			sourceTree = "<group>";
@@ -624,6 +738,8 @@
 		4C0A3F8D280F63FF000448DE /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				4CCEB7A729B29DC90078AA28 /* Search */,
+				4C54AA0829A55416003E4487 /* Notifications */,
 				3AA247FC297E3CFF0090C62D /* RepostsModel.swift */,
 				4C0A3F8E280F640A000448DE /* ThreadModel.swift */,
 				4C0A3F92280F66F5000448DE /* ReplyMap.swift */,
@@ -644,6 +760,7 @@
 				4C63334F283D40E500B1C9C3 /* HomeModel.swift */,
 				4C633351283D419F00B1C9C3 /* SignalModel.swift */,
 				4C5F9113283D694D0052CD1C /* FollowTarget.swift */,
+				F75BA12C29A1855400E10810 /* BookmarksManager.swift */,
 				4C5F9115283D855D0052CD1C /* EventsModel.swift */,
 				4C5F9117283D88E40052CD1C /* FollowingModel.swift */,
 				4C987B56283FD07F0042CE38 /* FollowersModel.swift */,
@@ -655,7 +772,6 @@
 				BA693073295D649800ADDB87 /* UserSettingsStore.swift */,
 				4FE60CDC295E1C5E00105A1F /* Wallet.swift */,
 				4CB88392296F798300DC99E7 /* ReactionsModel.swift */,
-				7C45AE70297353390031D7BC /* KFImageModel.swift */,
 				4CF0ABD32980996B00D66079 /* Report.swift */,
 				4CF0ABDD2981A69500D66079 /* MutelistModel.swift */,
 				3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */,
@@ -663,13 +779,39 @@
 				3AAA95CB298E07E900F3D526 /* DeepLPlan.swift */,
 				4CE8795A2996C47A00F758CC /* ZapsModel.swift */,
 				3AA59D1C2999B0400061C48E /* DraftsModel.swift */,
+				4C54AA0629A540BA003E4487 /* NotificationsModel.swift */,
+				4CD348EE29C3659D00497EB2 /* ImageUploadModel.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
 		};
+		4C30AC7029A5676F00E2BD5A /* Notifications */ = {
+			isa = PBXGroup;
+			children = (
+				4C30AC7129A5677A00E2BD5A /* NotificationsView.swift */,
+				4C30AC7329A5680900E2BD5A /* EventGroupView.swift */,
+				4C30AC7529A5770900E2BD5A /* NotificationItemView.swift */,
+				4C30AC7F29A6A53F00E2BD5A /* ProfilePicturesView.swift */,
+			);
+			path = Notifications;
+			sourceTree = "<group>";
+		};
+		4C54AA0829A55416003E4487 /* Notifications */ = {
+			isa = PBXGroup;
+			children = (
+				4C54AA0929A55429003E4487 /* EventGroup.swift */,
+				4C54AA0B29A5543C003E4487 /* ZapGroup.swift */,
+			);
+			path = Notifications;
+			sourceTree = "<group>";
+		};
 		4C75EFA227FA576C0006080F /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				4CFF8F6129CC9A80008DB934 /* Images */,
+				4CCEB7AC29B53D180078AA28 /* Search */,
+				4C30AC7029A5676F00E2BD5A /* Notifications */,
+				4CE0E2B029A3DF4700DB4CA2 /* Timeline */,
 				4CE879562996C44A00F758CC /* Zaps */,
 				4CB9D4A52992D01900A9A7E4 /* Profile */,
 				4CAAD8AE29888A9B00060CEA /* Relays */,
@@ -681,6 +823,7 @@
 				4CB88387296AF97C00DC99E7 /* ActionBar */,
 				4CE4F9E228528C5200C00DD9 /* AddRelayView.swift */,
 				4C363A8728236948006E126D /* BlocksView.swift */,
+				F75BA12E29A18EF500E10810 /* BookmarksView.swift */,
 				4C285C8128385570008A31F1 /* CarouselView.swift */,
 				4C0A3F8B280F5FCA000448DE /* ChatroomView.swift */,
 				4C0A3F90280F6528000448DE /* ChatView.swift */,
@@ -700,11 +843,9 @@
 				4C363A8D28236FE4006E126D /* NoteContentView.swift */,
 				4C75EFAC28049CFB0006080F /* PostButton.swift */,
 				4C75EFA327FA577B0006080F /* PostView.swift */,
+				9CA876E129A00CE90003B9A3 /* AttachMediaUtility.swift */,
+				9C83F89229A937B900136C08 /* TextViewWrapper.swift */,
 				4CEE2AF8280B2EAC00AB5EEF /* PowView.swift */,
-				4CEE2AF6280B2DEA00AB5EEF /* ProfileName.swift */,
-				4C285C892838B985008A31F1 /* ProfilePictureSelector.swift */,
-				4CEE2AF2280B25C500AB5EEF /* ProfilePicView.swift */,
-				4C8682862814DE470026224F /* ProfileView.swift */,
 				4C3AC7A42836987600E1F516 /* MainTabView.swift */,
 				4C363A8B28236B92006E126D /* PubkeyView.swift */,
 				4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */,
@@ -715,7 +856,7 @@
 				4C363AA128296A7E006E126D /* SearchView.swift */,
 				BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */,
 				4C3AC7A02835A81400E1F516 /* SetupView.swift */,
-				E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */,
+				E9E4ED0A295867B900DD7078 /* ThreadView.swift */,
 				4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */,
 				4CB55EF4295E679D007FD187 /* UserRelaysView.swift */,
 				647D9A8C2968520300A295DE /* SideMenuView.swift */,
@@ -754,6 +895,7 @@
 		4C7FF7D628233637009601DB /* Util */ = {
 			isa = PBXGroup;
 			children = (
+				7C0F392D29B57C8F0039859C /* Extensions */,
 				4CE879492995B58700F758CC /* Relays */,
 				4CF0ABEA29844B2F00D66079 /* AnyCodable */,
 				4CC7AAE6297EFA7B00430951 /* Zap.swift */,
@@ -780,6 +922,11 @@
 				4CB883A72975FC1800DC99E7 /* Zaps.swift */,
 				4CB883B5297730E400DC99E7 /* LNUrls.swift */,
 				3AB72AB8298ECF30004BB58C /* Translator.swift */,
+				4C2CDDF6299D4A5E00879FD5 /* Debouncer.swift */,
+				4CE0E2AE29A2E82100DB4CA2 /* EventHolder.swift */,
+				3A3040F029A8FF97008A0F29 /* LocalizationUtil.swift */,
+				4C30AC7729A577AB00E2BD5A /* EventCache.swift */,
+				4C9BB83029C0ED4F00FC4E37 /* DisplayName.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -804,6 +951,7 @@
 			children = (
 				4CEE2B01280B39E800AB5EEF /* EventActionBar.swift */,
 				4CB88388296AF99A00DC99E7 /* EventDetailBar.swift */,
+				5CF72FC129B9142F00124A13 /* ShareAction.swift */,
 			);
 			path = ActionBar;
 			sourceTree = "<group>";
@@ -819,8 +967,14 @@
 		4CB9D4A52992D01900A9A7E4 /* Profile */ = {
 			isa = PBXGroup;
 			children = (
+				4CEE2AF6280B2DEA00AB5EEF /* ProfileName.swift */,
+				4C285C892838B985008A31F1 /* ProfilePictureSelector.swift */,
+				4CEE2AF2280B25C500AB5EEF /* ProfilePicView.swift */,
+				4C8682862814DE470026224F /* ProfileView.swift */,
 				4CB9D4A62992D02B00A9A7E4 /* ProfileNameView.swift */,
 				4CB9D4A82992D2F400A9A7E4 /* FollowsYou.swift */,
+				4C9F18E329ABDE6D008C55EC /* MaybeAnonPfpView.swift */,
+				4C9BB83329C12D9900FC4E37 /* EventProfileName.swift */,
 			);
 			path = Profile;
 			sourceTree = "<group>";
@@ -838,10 +992,37 @@
 				4CF0ABE6298444FC00D66079 /* MutedEventView.swift */,
 				4C3D52B5298DB4E6001C5831 /* ZapEvent.swift */,
 				4C3D52B7298DB5C6001C5831 /* TextEvent.swift */,
+				4CFF8F6C29CD022E008DB934 /* WideEventView.swift */,
 			);
 			path = Events;
 			sourceTree = "<group>";
 		};
+		4CCEB7A729B29DC90078AA28 /* Search */ = {
+			isa = PBXGroup;
+			children = (
+				4CCEB7A829B29DD50078AA28 /* SearchResultsModel.swift */,
+			);
+			path = Search;
+			sourceTree = "<group>";
+		};
+		4CCEB7AC29B53D180078AA28 /* Search */ = {
+			isa = PBXGroup;
+			children = (
+				4CCEB7AD29B53D260078AA28 /* SearchingEventView.swift */,
+				4CCEB7AF29B5415A0078AA28 /* SearchingProfileView.swift */,
+			);
+			path = Search;
+			sourceTree = "<group>";
+		};
+		4CE0E2B029A3DF4700DB4CA2 /* Timeline */ = {
+			isa = PBXGroup;
+			children = (
+				4CE0E2B129A3DF6900DB4CA2 /* LoadMoreButton.swift */,
+				4CE0E2B529A3ED5500DB4CA2 /* InnerTimelineView.swift */,
+			);
+			path = Timeline;
+			sourceTree = "<group>";
+		};
 		4CE4F9DF285287A000C00DD9 /* Components */ = {
 			isa = PBXGroup;
 			children = (
@@ -860,6 +1041,7 @@
 				7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */,
 				4CB883AF297705DD00DC99E7 /* ZapButton.swift */,
 				4C42812B298C848200DBF26F /* TranslateView.swift */,
+				7CFF6316299FEFE5005D382A /* SelectableText.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -919,6 +1101,7 @@
 		4CE6DEF627F7A08200C66700 /* damusTests */ = {
 			isa = PBXGroup;
 			children = (
+				50A50A8C29A09E1C00C01BE7 /* RequestTests.swift */,
 				DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */,
 				4C90BD1B283AC38E008EE7EF /* Bech32Tests.swift */,
 				4C363A9F2828A8DD006E126D /* LikeTests.swift */,
@@ -930,6 +1113,10 @@
 				4CF0ABDB2981A19E00D66079 /* ListTests.swift */,
 				4CB883A9297612FF00DC99E7 /* ZapTests.swift */,
 				4CB883AD2976FA9300DC99E7 /* FormatTests.swift */,
+				3A3040EC29A5CB86008A0F29 /* ReplyDescriptionTests.swift */,
+				3A3040EE29A8FEE9008A0F29 /* EventDetailBarTests.swift */,
+				3A3040F229A91366008A0F29 /* ProfileViewTests.swift */,
+				3A30410029AB12AA008A0F29 /* EventGroupViewTests.swift */,
 			);
 			path = damusTests;
 			sourceTree = "<group>";
@@ -964,6 +1151,7 @@
 			isa = PBXGroup;
 			children = (
 				4CE879572996C45300F758CC /* ZapsView.swift */,
+				4C9F18E129AA9B6C008C55EC /* CustomizeZapView.swift */,
 			);
 			path = Zaps;
 			sourceTree = "<group>";
@@ -1002,6 +1190,25 @@
 			path = Posting;
 			sourceTree = "<group>";
 		};
+		4CFF8F6129CC9A80008DB934 /* Images */ = {
+			isa = PBXGroup;
+			children = (
+				4CFF8F6229CC9AD7008DB934 /* ImageContextMenuModifier.swift */,
+				4CFF8F6629CC9E3A008DB934 /* ImageView.swift */,
+				4CFF8F6829CC9ED1008DB934 /* ImageContainerView.swift */,
+			);
+			path = Images;
+			sourceTree = "<group>";
+		};
+		7C0F392D29B57C8F0039859C /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */,
+				7C0F392E29B57CAF0039859C /* Binding+.swift */,
+			);
+			path = Extensions;
+			sourceTree = "<group>";
+		};
 		F7F0BA23297892AE009531F3 /* Modifiers */ = {
 			isa = PBXGroup;
 			children = (
@@ -1116,6 +1323,18 @@
 				"zh-CN",
 				"el-GR",
 				ja,
+				id,
+				cs,
+				ru,
+				"zh-HK",
+				"zh-TW",
+				uk,
+				bg,
+				fa,
+				ko,
+				"hu-HU",
+				"sv-SE",
+				"fr-CA",
 			);
 			mainGroup = 4CE6DEDA27F7A08100C66700;
 			packageReferences = (
@@ -1170,8 +1389,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				4C3AC79D2833036D00E1F516 /* FollowingView.swift in Sources */,
+				5CF72FC229B9142F00124A13 /* ShareAction.swift in Sources */,
 				4C363A8A28236B57006E126D /* MentionView.swift in Sources */,
 				4CE4F8CD281352B30009DFBB /* Notifications.swift in Sources */,
+				4C30AC7829A577AB00E2BD5A /* EventCache.swift in Sources */,
 				4C285C8428385690008A31F1 /* CreateAccountView.swift in Sources */,
 				4C216F34286F5ACD00040376 /* DMView.swift in Sources */,
 				4C3EA64428FF558100C48A62 /* sha256.c in Sources */,
@@ -1184,9 +1405,11 @@
 				4CE8794C2995B59E00F758CC /* RelayMetadatas.swift in Sources */,
 				4C363A8C28236B92006E126D /* PubkeyView.swift in Sources */,
 				4C5C7E68284ED36500A22DF5 /* SearchHomeModel.swift in Sources */,
+				4C54AA0C29A5543C003E4487 /* ZapGroup.swift in Sources */,
 				4C75EFB728049D990006080F /* RelayPool.swift in Sources */,
 				4CF0ABEE29844B5500D66079 /* AnyEncodable.swift in Sources */,
 				4CB8838D296F710400DC99E7 /* Reposted.swift in Sources */,
+				4CCEB7A929B29DD50078AA28 /* SearchResultsModel.swift in Sources */,
 				4C3EA67728FF7A9800C48A62 /* talstr.c in Sources */,
 				4CE6DEE927F7A08100C66700 /* ContentView.swift in Sources */,
 				4CEE2AF5280B29E600AB5EEF /* TimeAgo.swift in Sources */,
@@ -1195,8 +1418,10 @@
 				4C363AA228296A7E006E126D /* SearchView.swift in Sources */,
 				4CC7AAED297F0B9E00430951 /* Highlight.swift in Sources */,
 				4C285C8A2838B985008A31F1 /* ProfilePictureSelector.swift in Sources */,
+				4C9F18E429ABDE6D008C55EC /* MaybeAnonPfpView.swift in Sources */,
 				4C75EFB92804A2740006080F /* EventView.swift in Sources */,
 				3AA247FD297E3CFF0090C62D /* RepostsModel.swift in Sources */,
+				F75BA12F29A18EF500E10810 /* BookmarksView.swift in Sources */,
 				4CB883B6297730E400DC99E7 /* LNUrls.swift in Sources */,
 				4C7FF7D52823313F009601DB /* Mentions.swift in Sources */,
 				4C633350283D40E500B1C9C3 /* HomeModel.swift in Sources */,
@@ -1210,6 +1435,8 @@
 				F7F0BA272978E54D009531F3 /* ParicipantsView.swift in Sources */,
 				4C0A3F91280F6528000448DE /* ChatView.swift in Sources */,
 				4CF0ABE32981BC7D00D66079 /* UserView.swift in Sources */,
+				4CE0E2AF29A2E82100DB4CA2 /* EventHolder.swift in Sources */,
+				4CE0E2B229A3DF6900DB4CA2 /* LoadMoreButton.swift in Sources */,
 				4CF0ABF029857E9200D66079 /* Bech32Object.swift in Sources */,
 				4C3D52B8298DB5C6001C5831 /* TextEvent.swift in Sources */,
 				4C216F362870A9A700040376 /* InputDismissKeyboard.swift in Sources */,
@@ -1219,21 +1446,26 @@
 				4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */,
 				4C285C8E28399BFE008A31F1 /* SaveKeysView.swift in Sources */,
 				F7F0BA25297892BD009531F3 /* SwipeToDismiss.swift in Sources */,
+				4C9BB83429C12D9900FC4E37 /* EventProfileName.swift in Sources */,
 				4CB8838F296F781C00DC99E7 /* ReactionsView.swift in Sources */,
 				4C649844285A952100EAE2B3 /* LocalUserConfig.swift in Sources */,
 				4C75EFB328049D640006080F /* NostrEvent.swift in Sources */,
 				4CA2EFA0280E37AC0044ACD8 /* TimelineView.swift in Sources */,
+				4C30AC7629A5770900E2BD5A /* NotificationItemView.swift in Sources */,
 				4C363A8428233689006E126D /* Parser.swift in Sources */,
 				3AAA95CA298DF87B00F3D526 /* TranslationService.swift in Sources */,
 				4CE4F9E328528C5200C00DD9 /* AddRelayView.swift in Sources */,
 				4C363A9A28283854006E126D /* Reply.swift in Sources */,
 				BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */,
+				4CFF8F6729CC9E3A008DB934 /* ImageView.swift in Sources */,
 				4C90BD18283A9EE5008EE7EF /* LoginView.swift in Sources */,
 				4CB8838B296F6E1E00DC99E7 /* NIP05Badge.swift in Sources */,
 				4C3EA66828FF5F9900C48A62 /* hex.c in Sources */,
-				E9E4ED0B295867B900DD7078 /* ThreadV2View.swift in Sources */,
+				E9E4ED0B295867B900DD7078 /* ThreadView.swift in Sources */,
+				4CD348EF29C3659D00497EB2 /* ImageUploadModel.swift in Sources */,
 				4C3BEFDC281DCE6100B3DE84 /* Liked.swift in Sources */,
 				4CF0ABE7298444FD00D66079 /* MutedEventView.swift in Sources */,
+				9C83F89329A937B900136C08 /* TextViewWrapper.swift in Sources */,
 				4CF0ABE12981A83900D66079 /* MutelistView.swift in Sources */,
 				4CB883A82975FC1800DC99E7 /* Zaps.swift in Sources */,
 				4C75EFB128049D510006080F /* NostrResponse.swift in Sources */,
@@ -1242,11 +1474,13 @@
 				31D2E847295218AF006D67F8 /* Shimmer.swift in Sources */,
 				F7908E97298B1FDF00AB113A /* NIPURLBuilder.swift in Sources */,
 				4C285C8228385570008A31F1 /* CarouselView.swift in Sources */,
+				3A3040F129A8FF97008A0F29 /* LocalizationUtil.swift in Sources */,
+				F75BA12D29A1855400E10810 /* BookmarksManager.swift in Sources */,
 				4C3EA67F28FFC01D00C48A62 /* InvoiceView.swift in Sources */,
 				4CE8794829941DA700F758CC /* RelayFilters.swift in Sources */,
 				4CEE2B02280B39E800AB5EEF /* EventActionBar.swift in Sources */,
 				4C3BEFE0281DE1ED00B3DE84 /* DamusState.swift in Sources */,
-				7C45AE71297353390031D7BC /* KFImageModel.swift in Sources */,
+				4CCEB7AE29B53D260078AA28 /* SearchingEventView.swift in Sources */,
 				4CF0ABE929844AF100D66079 /* AnyCodable.swift in Sources */,
 				4C0A3F8F280F640A000448DE /* ThreadModel.swift in Sources */,
 				4CC7AAF2297F129C00430951 /* EmbeddedEventView.swift in Sources */,
@@ -1254,6 +1488,8 @@
 				4CC7AAE7297EFA7B00430951 /* Zap.swift in Sources */,
 				4C3BEFD22819DB9B00B3DE84 /* ProfileModel.swift in Sources */,
 				4C0A3F93280F66F5000448DE /* ReplyMap.swift in Sources */,
+				7C95CAEE299DCEF1009DCB67 /* KFOptionSetter+.swift in Sources */,
+				4CCEB7B029B5415A0078AA28 /* SearchingProfileView.swift in Sources */,
 				BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */,
 				3169CAE6294E69C000EE4006 /* EmptyTimelineView.swift in Sources */,
 				4CC7AAF0297F11C700430951 /* SelectedEventView.swift in Sources */,
@@ -1270,15 +1506,22 @@
 				4C285C8C28398BC7008A31F1 /* Keys.swift in Sources */,
 				4CACA9DC280C38C000D9BBE8 /* Profiles.swift in Sources */,
 				4CE879582996C45300F758CC /* ZapsView.swift in Sources */,
+				4C30AC7429A5680900E2BD5A /* EventGroupView.swift in Sources */,
 				4C633352283D419F00B1C9C3 /* SignalModel.swift in Sources */,
+				4CFF8F6D29CD022E008DB934 /* WideEventView.swift in Sources */,
 				9609F058296E220800069BF3 /* BannerImageView.swift in Sources */,
 				4C363A94282704FA006E126D /* Post.swift in Sources */,
 				4C216F32286E388800040376 /* DMChatView.swift in Sources */,
 				4CAAD8AD298851D000060CEA /* AccountDeletion.swift in Sources */,
+				4CFF8F6329CC9AD7008DB934 /* ImageContextMenuModifier.swift in Sources */,
+				4C54AA0A29A55429003E4487 /* EventGroup.swift in Sources */,
 				4C3EA67928FF7ABF00C48A62 /* list.c in Sources */,
 				4C64987E286D082C00EAE2B3 /* DirectMessagesModel.swift in Sources */,
+				9CA876E229A00CEA0003B9A3 /* AttachMediaUtility.swift in Sources */,
+				4CE0E2B629A3ED5500DB4CA2 /* InnerTimelineView.swift in Sources */,
 				4C363A8828236948006E126D /* BlocksView.swift in Sources */,
 				4C06670628FCB08600038D2A /* ImageCarousel.swift in Sources */,
+				4C9F18E229AA9B6C008C55EC /* CustomizeZapView.swift in Sources */,
 				4C75EFAF28049D350006080F /* NostrFilter.swift in Sources */,
 				4C3EA64C28FF59AC00C48A62 /* bech32_util.c in Sources */,
 				4C42812C298C848200DBF26F /* TranslateView.swift in Sources */,
@@ -1294,11 +1537,13 @@
 				4C3EA64F28FF59F200C48A62 /* tal.c in Sources */,
 				4CB88393296F798300DC99E7 /* ReactionsModel.swift in Sources */,
 				4CB88396296F7F8B00DC99E7 /* ReactionView.swift in Sources */,
+				4CFF8F6B29CD0079008DB934 /* RepostedEvent.swift in Sources */,
 				4C8682872814DE470026224F /* ProfileView.swift in Sources */,
 				4C5F9114283D694D0052CD1C /* FollowTarget.swift in Sources */,
 				4CF0ABD629817F5B00D66079 /* ReportView.swift in Sources */,
 				4CB8838629656C8B00DC99E7 /* NIP05.swift in Sources */,
 				4CF0ABD82981980C00D66079 /* Lists.swift in Sources */,
+				4C30AC8029A6A53F00E2BD5A /* ProfilePicturesView.swift in Sources */,
 				4C5C7E6A284EDE2E00A22DF5 /* SearchResultsView.swift in Sources */,
 				7C60CAEF298471A1009C80D6 /* CoreSVG.swift in Sources */,
 				6439E014296790CF0020672B /* ProfileZoomView.swift in Sources */,
@@ -1327,6 +1572,10 @@
 				4CE8794E2996B16A00F758CC /* RelayToggle.swift in Sources */,
 				4C3AC79B28306D7B00E1F516 /* Contacts.swift in Sources */,
 				4C3EA63D28FF52D600C48A62 /* bolt11.c in Sources */,
+				4C9BB83129C0ED4F00FC4E37 /* DisplayName.swift in Sources */,
+				7CFF6317299FEFE5005D382A /* SelectableText.swift in Sources */,
+				4CFF8F6929CC9ED1008DB934 /* ImageContainerView.swift in Sources */,
+				4C54AA0729A540BA003E4487 /* NotificationsModel.swift in Sources */,
 				4CB55EF3295E5D59007FD187 /* RecommendedRelayView.swift in Sources */,
 				4CF0ABEC29844B4700D66079 /* AnyDecodable.swift in Sources */,
 				4C5F9118283D88E40052CD1C /* FollowingModel.swift in Sources */,
@@ -1342,6 +1591,7 @@
 				4CE879552996BAB900F758CC /* RelayPaidDetail.swift in Sources */,
 				4CF0ABD42980996B00D66079 /* Report.swift in Sources */,
 				4C06670B28FDE64700038D2A /* damus.c in Sources */,
+				4C2CDDF7299D4A5E00879FD5 /* Debouncer.swift in Sources */,
 				3AAA95CC298E07E900F3D526 /* DeepLPlan.swift in Sources */,
 				4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */,
 				3AA247FF297E3D900090C62D /* RepostsView.swift in Sources */,
@@ -1350,11 +1600,13 @@
 				4C99737B28C92A9200E53835 /* ChatroomMetadata.swift in Sources */,
 				4CC7AAF4297F18B400430951 /* ReplyDescription.swift in Sources */,
 				4C75EFA427FA577B0006080F /* PostView.swift in Sources */,
+				4C30AC7229A5677A00E2BD5A /* NotificationsView.swift in Sources */,
 				4C75EFB528049D790006080F /* Relay.swift in Sources */,
 				4CEE2AF1280B216B00AB5EEF /* EventDetailView.swift in Sources */,
 				4CC7AAFA297F64AC00430951 /* EventMenu.swift in Sources */,
 				4C75EFBB2804A34C0006080F /* ProofOfWork.swift in Sources */,
 				4C3AC7A52836987600E1F516 /* MainTabView.swift in Sources */,
+				7C0F392F29B57CAF0039859C /* Binding+.swift in Sources */,
 				3AA59D1D2999B0400061C48E /* DraftsModel.swift in Sources */,
 				3169CAED294FCCFC00EE4006 /* Constants.swift in Sources */,
 				4CB9D4A72992D02B00A9A7E4 /* ProfileNameView.swift in Sources */,
@@ -1365,8 +1617,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3A3040ED29A5CB86008A0F29 /* ReplyDescriptionTests.swift in Sources */,
+				3A30410129AB12AA008A0F29 /* EventGroupViewTests.swift in Sources */,
 				3ACBCB78295FE5C70037388A /* TimeAgoTests.swift in Sources */,
 				DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */,
+				3A3040EF29A8FEE9008A0F29 /* EventDetailBarTests.swift in Sources */,
 				4C3EA67B28FF7B3900C48A62 /* InvoiceTests.swift in Sources */,
 				4C363A9E2828A822006E126D /* ReplyTests.swift in Sources */,
 				4CB883AA297612FF00DC99E7 /* ZapTests.swift in Sources */,
@@ -1374,7 +1629,9 @@
 				4CB883AE2976FA9300DC99E7 /* FormatTests.swift in Sources */,
 				4C363AA02828A8DD006E126D /* LikeTests.swift in Sources */,
 				4C90BD1C283AC38E008EE7EF /* Bech32Tests.swift in Sources */,
+				50A50A8D29A09E1C00C01BE7 /* RequestTests.swift in Sources */,
 				4CE6DEF827F7A08200C66700 /* damusTests.swift in Sources */,
+				3A3040F329A91366008A0F29 /* ProfileViewTests.swift in Sources */,
 				4CF0ABDC2981A19E00D66079 /* ListTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1421,6 +1678,18 @@
 				3A5CAE1F298DC0DB00B5334F /* zh-CN */,
 				3A25EF152992DA5D008ABE69 /* el-GR */,
 				3A66D929299472FA008B44F4 /* ja */,
+				3A41E55B299D52BE001FA465 /* id */,
+				3A8624DB299E82BE00BD8BE9 /* cs */,
+				3A827A1A299FC69D00C4D171 /* ru */,
+				3A3040FB29A91F03008A0F29 /* zh-HK */,
+				3A3040FD29A91F31008A0F29 /* zh-TW */,
+				3AA5E70429B682B3002701ED /* uk */,
+				3AA5E70729B9E84A002701ED /* bg */,
+				3AD5662C29BD2F5300BF77C5 /* fa */,
+				3AD5663229C0DA4B00BF77C5 /* ko */,
+				3AD14EB529C40F38009D2D9C /* hu-HU */,
+				3AD14EB829C40F3F009D2D9C /* sv-SE */,
+				3AD14EBC29C40F47009D2D9C /* fr-CA */,
 			);
 			name = Localizable.stringsdict;
 			sourceTree = "<group>";
@@ -1441,6 +1710,18 @@
 				3A5CAE1D298DC0DB00B5334F /* zh-CN */,
 				3A25EF132992DA5D008ABE69 /* el-GR */,
 				3A66D927299472FA008B44F4 /* ja */,
+				3A41E559299D52BE001FA465 /* id */,
+				3A8624D9299E82BE00BD8BE9 /* cs */,
+				3A827A18299FC69D00C4D171 /* ru */,
+				3A3040F929A91ED6008A0F29 /* zh-HK */,
+				3A3040FC29A91F31008A0F29 /* zh-TW */,
+				3AA5E70329B682AD002701ED /* uk */,
+				3AA5E70529B9E83E002701ED /* bg */,
+				3AD5662B29BD2F5300BF77C5 /* fa */,
+				3AD5663329C0DA4B00BF77C5 /* ko */,
+				3AD14EB629C40F38009D2D9C /* hu-HU */,
+				3AD14EB929C40F3F009D2D9C /* sv-SE */,
+				3AD14EBB29C40F47009D2D9C /* fr-CA */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -1461,6 +1742,19 @@
 				3A5CAE1E298DC0DB00B5334F /* zh-CN */,
 				3A25EF142992DA5D008ABE69 /* el-GR */,
 				3A66D928299472FA008B44F4 /* ja */,
+				3A41E55A299D52BE001FA465 /* id */,
+				3A8624DA299E82BE00BD8BE9 /* cs */,
+				3A827A19299FC69D00C4D171 /* ru */,
+				3A3040FA29A91EFC008A0F29 /* zh-HK */,
+				3A3040FE29A91F31008A0F29 /* zh-TW */,
+				3A3040FF29AB02D1008A0F29 /* en-US */,
+				3AA5E70229B682A5002701ED /* uk */,
+				3AA5E70629B9E844002701ED /* bg */,
+				3AD5662D29BD2F5300BF77C5 /* fa */,
+				3AD5663129C0DA4B00BF77C5 /* ko */,
+				3AD14EB729C40F38009D2D9C /* hu-HU */,
+				3AD14EBA29C40F3F009D2D9C /* sv-SE */,
+				3AD14EBD29C40F47009D2D9C /* fr-CA */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1596,7 +1890,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -1619,7 +1913,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1638,7 +1932,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -1661,7 +1955,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -11,24 +11,6 @@
        }
      },
      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xC5",
-          "green" : "0x43",
-          "red" : "0xCC"
-        }
-      },
-      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,24 +11,6 @@
        }
      },
      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x00",
-          "green" : "0x00",
-          "red" : "0x00"
-        }
-      },
-      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,24 +11,6 @@
        }
      },
      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0x4D",
-          "red" : "0x4B"
-        }
-      },
-      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,24 +11,6 @@
        }
      },
      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x1E",
-          "green" : "0x1C",
-          "red" : "0x1C"
-        }
-      },
-      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,24 +11,6 @@
        }
      },
      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x4F",
-          "green" : "0xC3",
-          "red" : "0x66"
-        }
-      },
-      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,24 +11,6 @@
        }
      },
      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xF4",
-          "green" : "0xEE",
-          "red" : "0xEE"
-        }
-      },
-      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,24 +11,6 @@
        }
      },
      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x5F",
-          "green" : "0x5F",
-          "red" : "0x5F"
-        }
-      },
-      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,24 +11,6 @@
        }
      },
      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xC5",
-          "green" : "0x43",
-          "red" : "0xCC"
-        }
-      },
-      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -11,24 +11,6 @@
        }
      },
      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0xFF",
-          "red" : "0xFF"
-        }
-      },
-      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic-copy.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic-key.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,52 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic-message-black.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "ic-message-white 1.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic-nipverified.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic-qr.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "profile-banner.jpeg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "bbw.jpg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "bitcoin-p2p.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "blixt-wallet.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "bluewallet.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "breez.jpg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "cashapp.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "digital-nomad.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "encrypted-message.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic-lightning.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic-tick.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "lnlink.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "damus-nobg.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "muun.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "phoenix.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "river.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "strike.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "undercover.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "walletofsatoshi.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "zebedee.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -2,16 +2,7 @@
  "images" : [
    {
      "filename" : "zeus.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
    }
  ],
  "info" : {
@@ -52,6 +52,7 @@ struct CustomPicker<SelectionValue: Hashable, Content: View>: View {
                .accentColor(tag == selection ? textColor() : .gray)
            }
        }
+        .background(Color(UIColor.systemBackground))
    }
    
    func textColor() -> Color {
@@ -31,190 +31,7 @@ struct ShareSheet: UIViewControllerRepresentable {
    }
 }

-struct ImageContextMenuModifier: ViewModifier {
-    let url: URL?
-    let image: UIImage?
-    @Binding var showShareSheet: Bool
-    
-    func body(content: Content) -> some View {
-        return content.contextMenu {
-            Button {
-                UIPasteboard.general.url = url
-            } label: {
-                Label(NSLocalizedString("Copy Image URL", comment: "Context menu option to copy the URL of an image into clipboard."), systemImage: "doc.on.doc")
-            }
-            if let someImage = image {
-                Button {
-                    UIPasteboard.general.image = someImage
-                } label: {
-                    Label(NSLocalizedString("Copy Image", comment: "Context menu option to copy an image into clipboard."), systemImage: "photo.on.rectangle")
-                }
-                Button {
-                    UIImageWriteToSavedPhotosAlbum(someImage, nil, nil, nil)
-                } label: {
-                    Label(NSLocalizedString("Save Image", comment: "Context menu option to save an image."), systemImage: "square.and.arrow.down")
-                }
-            }
-            Button {
-                showShareSheet = true
-            } label: {
-                Label(NSLocalizedString("Share", comment: "Button to share an image."), systemImage: "square.and.arrow.up")
-            }
-        }
-    }
-}

-private struct ImageContainerView: View {
-    
-    @ObservedObject var imageModel: KFImageModel
-    
-    @State private var image: UIImage?
-    @State private var showShareSheet = false
-    
-    init(url: URL?) {
-        self.imageModel = KFImageModel(
-            url: url,
-            fallbackUrl: nil,
-            maxByteSize: 2000000, // 2 MB
-            downsampleSize: CGSize(width: 400, height: 400)
-        )
-    }
-    
-    private struct ImageHandler: ImageModifier {
-        @Binding var handler: UIImage?
-        
-        func modify(_ image: UIImage) -> UIImage {
-            handler = image
-            return image
-        }
-    }
-    
-    var body: some View {
-        
-        KFAnimatedImage(imageModel.url)
-            .callbackQueue(.dispatch(.global(qos: .background)))
-            .processingQueue(.dispatch(.global(qos: .background)))
-            .cacheOriginalImage()
-            .configure { view in
-                view.framePreloadCount = 1
-            }
-            .scaleFactor(UIScreen.main.scale)
-            .loadDiskFileSynchronously()
-            .fade(duration: 0.1)
-            .imageModifier(ImageHandler(handler: $image))
-            .onFailure { _ in
-                imageModel.downloadFailed()
-            }
-            .id(imageModel.refreshID)
-            .clipped()
-            .modifier(ImageContextMenuModifier(url: imageModel.url, image: image, showShareSheet: $showShareSheet))
-            .sheet(isPresented: $showShareSheet) {
-                ShareSheet(activityItems: [imageModel.url])
-            }
-        
-        // TODO: Update ImageCarousel with serializer and processor
-        // .serialize(by: imageModel.serializer)
-        // .setProcessor(imageModel.processor)
-    }
-}
-
-struct ImageView: View {
-    
-    let urls: [URL?]
-    
-    @Environment(\.presentationMode) var presentationMode
-    
-    @State private var selectedIndex = 0
-    @State var showMenu = true
-    
-    var safeAreaInsets: UIEdgeInsets? {
-        return UIApplication
-                .shared
-                .connectedScenes
-                .flatMap { ($0 as? UIWindowScene)?.windows ?? [] }
-                .first { $0.isKeyWindow }?.safeAreaInsets
-    }
-    
-    var navBarView: some View {
-        VStack {
-            HStack {
-                Text(urls[selectedIndex]?.lastPathComponent ?? "")
-                    .bold()
-                
-                Spacer()
-                
-                Button(action: {
-                    presentationMode.wrappedValue.dismiss()
-                }, label: {
-                    Image(systemName: "xmark")
-                })
-            }
-            .padding()
-            
-            Divider()
-                .ignoresSafeArea()
-        }
-        .background(.regularMaterial)
-    }
-    
-    var tabViewIndicator: some View {
-        HStack(spacing: 10) {
-            ForEach(urls.indices, id: \.self) { index in
-                Capsule()
-                    .fill(index == selectedIndex ? Color(UIColor.label) : Color.secondary)
-                    .frame(width: 7, height: 7)
-            }
-        }
-        .padding()
-        .background(.regularMaterial)
-        .clipShape(Capsule())
-    }
-    
-    var body: some View {
-        ZStack {
-            Color(.systemBackground)
-                .ignoresSafeArea()
-            
-            TabView(selection: $selectedIndex) {
-                ForEach(urls.indices, id: \.self) { index in
-                    ZoomableScrollView {
-                        ImageContainerView(url: urls[index])
-                            .aspectRatio(contentMode: .fit)
-                            .padding(.top, safeAreaInsets?.top)
-                            .padding(.bottom, safeAreaInsets?.bottom)
-                    }
-                    .modifier(SwipeToDismissModifier(minDistance: 50, onDismiss: {
-                        presentationMode.wrappedValue.dismiss()
-                    }))
-                    .ignoresSafeArea()
-                    .tag(index)
-                }
-            }
-            .ignoresSafeArea()
-            .tabViewStyle(PageTabViewStyle(indexDisplayMode: .never))
-            .gesture(TapGesture(count: 2).onEnded {
-                // Prevents menu from hiding on double tap
-            })
-            .gesture(TapGesture(count: 1).onEnded {
-                showMenu.toggle()
-            })
-            .overlay(
-                VStack {
-                    if showMenu {
-                        navBarView
-                        Spacer()
-                        
-                        if (urls.count > 1) {
-                            tabViewIndicator
-                        }
-                    }
-                }
-                .animation(.easeInOut, value: showMenu)
-                .padding(.bottom, safeAreaInsets?.bottom)
-            )
-        }
-    }
-}

 struct ImageCarousel: View {
    var urls: [URL]
@@ -229,33 +46,29 @@ struct ImageCarousel: View {
                    .foregroundColor(Color.clear)
                    .overlay {
                        KFAnimatedImage(url)
-                            .callbackQueue(.dispatch(.global(qos: .background)))
-                            .processingQueue(.dispatch(.global(qos: .background)))
-                            .cacheOriginalImage()
-                            .loadDiskFileSynchronously()
-                            .scaleFactor(UIScreen.main.scale)
-                            .fade(duration: 0.1)
+                            .imageContext(.note)
+                            .cancelOnDisappear(true)
                            .configure { view in
                                view.framePreloadCount = 3
                            }
-                            .aspectRatio(contentMode: .fit)
+                            .aspectRatio(contentMode: .fill)
+                            //.cornerRadius(10)
                            .tabItem {
                                Text(url.absoluteString)
                            }
                            .id(url.absoluteString)
-                            .contextMenu {
-                                Button(NSLocalizedString("Copy Image", comment: "Context menu option to copy an image to clipboard.")) {
-                                    UIPasteboard.general.string = url.absoluteString
-                                }
-                            }
+//                            .contextMenu {
+//                                Button(NSLocalizedString("Copy Image", comment: "Context menu option to copy an image to clipboard.")) {
+//                                    UIPasteboard.general.string = url.absoluteString
+//                                }
+//                            }
                    }
            }
        }
-        .cornerRadius(10)
        .fullScreenCover(isPresented: $open_sheet) {
            ImageView(urls: urls)
        }
-        .frame(height: 200)
+        .frame(height: 350)
        .onTapGesture {
            open_sheet = true
        }
@@ -15,12 +15,10 @@ struct Reposted: View {
    var body: some View {
        HStack(alignment: .center) {
            Image(systemName: "arrow.2.squarepath")
-                .font(.footnote)
                .foregroundColor(Color.gray)
            ProfileName(pubkey: pubkey, profile: profile, damus: damus, show_friend_confirmed: true, show_nip5_domain: false)
                    .foregroundColor(Color.gray)
            Text("Reposted", comment: "Text indicating that the post was reposted (i.e. re-shared).")
-                .font(.footnote)
                .foregroundColor(Color.gray)
        }
    }
@@ -0,0 +1,100 @@
+//
+//  SelectableText.swift
+//  damus
+//
+//  Created by Oleg Abalonski on 2/16/23.
+//
+
+import UIKit
+import SwiftUI
+
+struct SelectableText: View {
+    
+    let attributedString: AttributedString
+    
+    @State private var selectedTextHeight: CGFloat = .zero
+    @State private var selectedTextWidth: CGFloat = .zero
+    
+    var body: some View {
+        GeometryReader { geo in
+            TextViewRepresentable(
+                attributedString: attributedString,
+                textColor: UIColor.label,
+                font: UIFont.preferredFont(forTextStyle: .title2),
+                fixedWidth: selectedTextWidth,
+                height: $selectedTextHeight
+            )
+            .padding([.leading, .trailing], -1.0)
+            .onAppear {
+                self.selectedTextWidth = geo.size.width
+            }
+            .onChange(of: geo.size) { newSize in
+                self.selectedTextWidth = newSize.width
+            }
+        }
+        .frame(height: selectedTextHeight)
+    }
+}
+
+ fileprivate struct TextViewRepresentable: UIViewRepresentable {
+
+    let attributedString: AttributedString
+    let textColor: UIColor
+    let font: UIFont
+    let fixedWidth: CGFloat
+
+    @Binding var height: CGFloat
+
+    func makeUIView(context: UIViewRepresentableContext<Self>) -> UITextView {
+        let view = UITextView()
+        view.isEditable = false
+        view.dataDetectorTypes = .all
+        view.isSelectable = true
+        view.backgroundColor = .clear
+        view.textContainer.lineFragmentPadding = 0
+        view.textContainerInset = .zero
+        view.textContainerInset.left = 1.0
+        view.textContainerInset.right = 1.0
+        return view
+    }
+
+    func updateUIView(_ uiView: UITextView, context: UIViewRepresentableContext<Self>) {
+        let mutableAttributedString = createNSAttributedString()
+        uiView.attributedText = mutableAttributedString
+
+        let newHeight = mutableAttributedString.height(containerWidth: fixedWidth)
+
+        DispatchQueue.main.async {
+            height = newHeight
+        }
+    }
+
+    func createNSAttributedString() -> NSMutableAttributedString {
+        let mutableAttributedString = NSMutableAttributedString(attributedString)
+        let myAttribute = [
+            NSAttributedString.Key.font: font,
+            NSAttributedString.Key.foregroundColor: textColor
+        ]
+
+        mutableAttributedString.addAttributes(
+            myAttribute,
+            range: NSRange.init(location: 0, length: mutableAttributedString.length)
+        )
+
+        return mutableAttributedString
+    }
+}
+
+fileprivate extension NSAttributedString {
+
+    func height(containerWidth: CGFloat) -> CGFloat {
+
+        let rect = self.boundingRect(
+            with: CGSize.init(width: containerWidth, height: CGFloat.greatestFiniteMagnitude),
+            options: [.usesLineFragmentOrigin, .usesFontLeading],
+            context: nil
+        )
+
+        return ceil(rect.size.height)
+    }
+}
@@ -11,7 +11,6 @@ import NaturalLanguage
 struct TranslateView: View {
    let damus_state: DamusState
    let event: NostrEvent
-    let size: EventViewKind
    
    @State var checkingTranslationStatus: Bool = false
    @State var currentLanguage: String = "en"
@@ -19,6 +18,8 @@ struct TranslateView: View {
    @State var translated_note: String? = nil
    @State var show_translated_note: Bool = false
    @State var translated_artifacts: NoteArtifacts? = nil
+
+    let preferredLanguages = Set(Locale.preferredLanguages.map { localeToLanguage($0) })
    
    var TranslateButton: some View {
        Button(NSLocalizedString("Translate Note", comment: "Button to translate note from different language.")) {
@@ -34,9 +35,7 @@ struct TranslateView: View {
            }
            .translate_button_style()
            
-            Text(artifacts.content)
-                .font(eventviewsize_to_font(size))
-                .fixedSize(horizontal: false, vertical: true)
+            SelectableText(attributedString: artifacts.content)
        }
    }
    
@@ -83,24 +82,7 @@ struct TranslateView: View {
                currentLanguage = Locale.current.languageCode ?? "en"
            }

-            // Rely on Apple's NLLanguageRecognizer to tell us which language it thinks the note is in
-            // and filter on only the text portions of the content as URLs and hashtags confuse the language recognizer.
-            let originalBlocks = event.blocks(damus_state.keypair.privkey)
-            let originalOnlyText = originalBlocks.compactMap { $0.is_text }.joined(separator: " ")
-
-            // Only accept language recognition hypothesis if there's at least a 50% probability that it's accurate.
-            let languageRecognizer = NLLanguageRecognizer()
-            languageRecognizer.processString(originalOnlyText)
-            noteLanguage = languageRecognizer.languageHypotheses(withMaximum: 1).first(where: { $0.value >= 0.5 })?.key.rawValue ?? currentLanguage
-
-            if let lang = noteLanguage, noteLanguage != currentLanguage {
-                // If the detected dominant language is a variant, remove the variant component and just take the language part as translation services typically only supports the variant-less language.
-                if #available(iOS 16, *) {
-                    noteLanguage = Locale.LanguageCode(stringLiteral: lang).identifier(.alpha2)
-                } else {
-                    noteLanguage = NSLocale(localeIdentifier: lang).languageCode
-                }
-            }
+            noteLanguage = event.note_language(damus_state.keypair.privkey) ?? currentLanguage
            
            guard let note_lang = noteLanguage else {
                noteLanguage = currentLanguage
@@ -109,9 +91,9 @@ struct TranslateView: View {
                return
            }
            
-            if note_lang != currentLanguage {
+            if !preferredLanguages.contains(note_lang) {
                do {
-                    // If the note language is different from our language, send a translation request.
+                    // If the note language is different from our preferred languages, send a translation request.
                    let translator = Translator(damus_state.settings)
                    let originalContent = event.get_content(damus_state.keypair.privkey)
                    translated_note = try await translator.translate(originalContent, from: note_lang, to: currentLanguage)
@@ -135,14 +117,24 @@ struct TranslateView: View {
            }

            checkingTranslationStatus = false
-        
+
+            show_translated_note = damus_state.settings.auto_translate
        }
    }
 }

+extension View {
+    func translate_button_style() -> some View {
+        return self
+            .font(.footnote)
+            .contentShape(Rectangle())
+            .padding([.top, .bottom], 10)
+    }
+}
+
 struct TranslateView_Previews: PreviewProvider {
    static var previews: some View {
        let ds = test_damus_state()
-        TranslateView(damus_state: ds, event: test_event, size: .selected)
+        TranslateView(damus_state: ds, event: test_event)
    }
 }
@@ -12,11 +12,7 @@ struct UserView: View {
    let pubkey: String
    
    var body: some View {
-        let pmodel = ProfileModel(pubkey: pubkey, damus: damus_state)
-        let followers = FollowersModel(damus_state: damus_state, target: pubkey)
-        let pv = ProfileView(damus_state: damus_state, profile: pmodel, followers: followers)
-        
-        NavigationLink(destination: pv) {
+        NavigationLink(destination: ProfileView(damus_state: damus_state, pubkey: pubkey)) {
            ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles)
        
            VStack(alignment: .leading) {
@@ -7,6 +7,22 @@

 import SwiftUI

+enum ZappingEventType {
+    case failed(ZappingError)
+    case got_zap_invoice(String)
+}
+
+enum ZappingError {
+    case fetching_invoice
+    case bad_lnurl
+}
+
+struct ZappingEvent {
+    let is_custom: Bool
+    let type: ZappingEventType
+    let event: NostrEvent
+}
+
 struct ZapButton: View {
    let damus_state: DamusState
    let event: NostrEvent
@@ -19,61 +35,8 @@ struct ZapButton: View {
    @State var slider_value: Double = 0.0
    @State var slider_visible: Bool = false
    @State var showing_select_wallet: Bool = false
-    
-    func send_zap() {
-        guard let privkey = damus_state.keypair.privkey else {
-            return
-        }
-        
-        // Only take the first 10 because reasons
-        let relays = Array(damus_state.pool.descriptors.prefix(10))
-        let target = ZapTarget.note(id: event.id, author: event.pubkey)
-        // TODO: gather comment?
-        let content = ""
-        let zapreq = make_zap_request_event(pubkey: damus_state.pubkey, privkey: privkey, content: content, relays: relays, target: target)
-        
-        zapping = true
-        
-        Task {
-            var mpayreq = damus_state.lnurls.lookup(target.pubkey)
-            if mpayreq == nil {
-                mpayreq = await fetch_static_payreq(lnurl)
-            }
-            
-            guard let payreq = mpayreq else {
-                // TODO: show error
-                DispatchQueue.main.async {
-                    zapping = false
-                }
-                return
-            }
-            
-            DispatchQueue.main.async {
-                damus_state.lnurls.endpoints[target.pubkey] = payreq
-            }
-            
-            let zap_amount = get_default_zap_amount(pubkey: damus_state.pubkey) ?? 1000
-            guard let inv = await fetch_zap_invoice(payreq, zapreq: zapreq, sats: zap_amount) else {
-                DispatchQueue.main.async {
-                    zapping = false
-                }
-                return
-            }
-            
-            DispatchQueue.main.async {
-                zapping = false
-                
-                if should_show_wallet_selector(damus_state.pubkey) {
-                    self.invoice = inv
-                    self.showing_select_wallet = true
-                } else {
-                    open_with_wallet(wallet: get_default_wallet(damus_state.pubkey).model, invoice: inv)
-                }
-            }
-        }
-        
-        //damus_state.pool.send(.event(zapreq))
-    }
+    @State var showing_zap_customizer: Bool = false
+    @State var is_charging: Bool = false
    
    var zap_img: String {
        if bar.zapped {
@@ -92,6 +55,10 @@ struct ZapButton: View {
            return Color.orange
        }
        
+        if is_charging {
+            return Color.yellow
+        }
+        
        if !zapping {
            return nil
        }
@@ -100,24 +67,67 @@ struct ZapButton: View {
    }
    
    var body: some View {
-        ZStack {
-            EventActionButton(img: zap_img, col: zap_color) {
-                if bar.zapped {
-                    //notify(.delete, bar.our_tip)
-                } else if !zapping {
-                    send_zap()
+        HStack(spacing: 4) {
+            Button(action: {
+            }, label: {
+                Image(systemName: zap_img)
+                    .foregroundColor(zap_color == nil ? Color.gray : zap_color!)
+                    .font(.footnote.weight(.medium))
+            })
+            .simultaneousGesture(LongPressGesture().onEnded {_  in
+                guard !zapping else {
+                    return
                }
-            }
+                
+                self.showing_zap_customizer = true
+            })
+            .highPriorityGesture(TapGesture().onEnded {_  in
+                guard !zapping else {
+                    return
+                }
+                
+                send_zap(damus_state: damus_state, event: event, lnurl: lnurl, is_custom: false, comment: nil, amount_sats: nil, zap_type: ZapType.pub)
+                self.zapping = true
+            })
            .accessibilityLabel(NSLocalizedString("Zap", comment: "Accessibility label for zap button"))
-            
-            Text("\(bar.zap_total > 0 ? "\(format_msats_abbrev(bar.zap_total))" : "")")
-                .offset(x: 22)
-                .font(.footnote)
-                .foregroundColor(bar.zapped ? Color.orange : Color.gray)
+
+            if bar.zap_total > 0 {
+                Text(verbatim: format_msats_abbrev(bar.zap_total))
+                    .font(.footnote)
+                    .foregroundColor(bar.zapped ? Color.orange : Color.gray)
+            }
+        }
+        .sheet(isPresented: $showing_zap_customizer) {
+            CustomizeZapView(state: damus_state, event: event, lnurl: lnurl)
        }
        .sheet(isPresented: $showing_select_wallet, onDismiss: {showing_select_wallet = false}) {
            SelectWalletView(showingSelectWallet: $showing_select_wallet, our_pubkey: damus_state.pubkey, invoice: invoice)
        }
+        .onReceive(handle_notify(.zapping)) { notif in
+            let zap_ev = notif.object as! ZappingEvent
+            
+            guard zap_ev.event.id == self.event.id else {
+                return
+            }
+            
+            guard !zap_ev.is_custom else {
+                return
+            }
+            
+            switch zap_ev.type {
+            case .failed:
+                break
+            case .got_zap_invoice(let inv):
+                if should_show_wallet_selector(damus_state.pubkey) {
+                    self.invoice = inv
+                    self.showing_select_wallet = true
+                } else {
+                    open_with_wallet(wallet: get_default_wallet(damus_state.pubkey).model, invoice: inv)
+                }
+            }
+            
+            self.zapping = false
+        }
    }
 }

@@ -129,3 +139,56 @@ struct ZapButton_Previews: PreviewProvider {
    }
 }

+
+
+func send_zap(damus_state: DamusState, event: NostrEvent, lnurl: String, is_custom: Bool, comment: String?, amount_sats: Int?, zap_type: ZapType) {
+    guard let keypair = damus_state.keypair.to_full() else {
+        return
+    }
+    
+    // Only take the first 10 because reasons
+    let relays = Array(damus_state.pool.descriptors.prefix(10))
+    let target = ZapTarget.note(id: event.id, author: event.pubkey)
+    let content = comment ?? ""
+    
+    let zapreq = make_zap_request_event(keypair: keypair, content: content, relays: relays, target: target, zap_type: zap_type)
+    
+    Task {
+        var mpayreq = damus_state.lnurls.lookup(target.pubkey)
+        if mpayreq == nil {
+            mpayreq = await fetch_static_payreq(lnurl)
+        }
+        
+        guard let payreq = mpayreq else {
+            // TODO: show error
+            DispatchQueue.main.async {
+                let typ = ZappingEventType.failed(.bad_lnurl)
+                let ev = ZappingEvent(is_custom: is_custom, type: typ, event: event)
+                notify(.zapping, ev)
+            }
+            return
+        }
+        
+        DispatchQueue.main.async {
+            damus_state.lnurls.endpoints[target.pubkey] = payreq
+        }
+        
+        let zap_amount = amount_sats ?? get_default_zap_amount(pubkey: damus_state.pubkey) ?? 1000
+        
+        guard let inv = await fetch_zap_invoice(payreq, zapreq: zapreq, sats: zap_amount, zap_type: zap_type, comment: comment) else {
+            DispatchQueue.main.async {
+                let typ = ZappingEventType.failed(.fetching_invoice)
+                let ev = ZappingEvent(is_custom: is_custom, type: typ, event: event)
+                notify(.zapping, ev)
+            }
+            return
+        }
+        
+        DispatchQueue.main.async {
+            let ev = ZappingEvent(is_custom: is_custom, type: .got_zap_invoice(inv), event: event)
+            notify(.zapping, ev)
+        }
+    }
+    
+    return
+}
@@ -11,11 +11,8 @@ import Starscream
 var BOOTSTRAP_RELAYS = [
    "wss://relay.damus.io",
    "wss://eden.nostr.land",
-    "wss://relay.snort.social",
-    "wss://offchain.pub",
+    "wss://nostr.wine",
    "wss://nos.lol",
-    "wss://relay.current.fyi",
-    "wss://brb.io",
 ]

 struct TimestampedProfile {
@@ -81,7 +78,7 @@ struct ContentView: View {
    @State var event: NostrEvent? = nil
    @State var active_profile: String? = nil
    @State var active_search: NostrFilter? = nil
-    @State var active_event_id: String? = nil
+    @State var active_event: NostrEvent? = nil
    @State var profile_open: Bool = false
    @State var thread_open: Bool = false
    @State var search_open: Bool = false
@@ -89,10 +86,11 @@ struct ContentView: View {
    @State var confirm_block: Bool = false
    @State var user_blocked_confirm: Bool = false
    @State var confirm_overwrite_mutelist: Bool = false
+    @State var current_boost: NostrEvent? = nil
    @State var filter_state : FilterState = .posts_and_replies
    @State private var isSideBarOpened = false
    @StateObject var home: HomeModel = HomeModel()
-
+    
    // connect retry timer
    let timer = Timer.publish(every: 4, on: .main, in: .common).autoconnect()

@@ -136,7 +134,7 @@ struct ContentView: View {
    func contentTimelineView(filter: (@escaping (NostrEvent) -> Bool)) -> some View {
        ZStack {
            if let damus = self.damus_state {
-                TimelineView(events: $home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter)
+                TimelineView(events: home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter)
            }
        }
    }
@@ -147,27 +145,23 @@ struct ContentView: View {
        search_open = false
        isSideBarOpened = false
    }
-
-    var timelineNavItem: some View {
-        VStack {
-            switch selected_timeline {
-            case .home:
-                Image("damus-home")
-                .resizable()
-                .frame(width:30,height:30)
-                .shadow(color: Color("DamusPurple"), radius: 2)
-            case .dms:
-                Text("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.")
-                    .bold()
-            case .notifications:
-                Text("Notifications", comment: "Toolbar label for Notifications view.")
-                    .bold()
-            case .search:
-                Text("Global", comment: "Toolbar label for Global view where posts from all connected relay servers appear.")
-                    .bold()
-            case .none:
-                Text("", comment: "Toolbar label for unknown views. This label would be displayed only if a new timeline view is added but a toolbar label was not explicitly assigned to it yet.")
-            }
+    
+    var timelineNavItem: Text {
+        switch selected_timeline {
+        case .home:
+            return Text("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.")
+                .bold()
+        case .dms:
+            return Text("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.")
+                .bold()
+        case .notifications:
+            return Text("Notifications", comment: "Toolbar label for Notifications view.")
+                .bold()
+        case .search:
+            return Text("Universe 🛸", comment: "Toolbar label for the universal view where posts from all connected relay servers appear.")
+                .bold()
+        case .none:
+            return Text(verbatim: "")
        }
    }
    
@@ -176,24 +170,31 @@ struct ContentView: View {
            NavigationLink(destination: MaybeProfileView, isActive: $profile_open) {
                EmptyView()
            }
-            NavigationLink(destination: MaybeThreadView, isActive: $thread_open) {
-                EmptyView()
+            if let active_event {
+                let thread = ThreadModel(event: active_event, damus_state: damus_state!)
+                NavigationLink(destination: ThreadView(state: damus_state!, thread: thread), isActive: $thread_open) {
+                    EmptyView()
+                }
            }
            NavigationLink(destination: MaybeSearchView, isActive: $search_open) {
                EmptyView()
            }
            switch selected_timeline {
            case .search:
-                SearchHomeView(damus_state: damus_state!, model: SearchHomeModel(damus_state: damus_state!))
+                if #available(iOS 16.0, *) {
+                    SearchHomeView(damus_state: damus_state!, model: SearchHomeModel(damus_state: damus_state!))
+                        .scrollDismissesKeyboard(.immediately)
+                } else {
+                    // Fallback on earlier versions
+                    SearchHomeView(damus_state: damus_state!, model: SearchHomeModel(damus_state: damus_state!))
+                }
                
            case .home:
                PostingTimelineView
                
            case .notifications:
-                VStack(spacing: 0) {
-                    Divider()
-                    TimelineView(events: $home.notifications, loading: $home.loading, damus: damus, show_friend_icon: true, filter: { _ in true })
-                }
+                NotificationsView(state: damus, notifications: home.notifications)
+                
            case .dms:
                DirectMessagesView(damus_state: damus_state!)
                    .environmentObject(home.dms)
@@ -202,15 +203,25 @@ struct ContentView: View {
                EmptyView()
            }
        }
-        .navigationBarTitle(selected_timeline == .home ?  NSLocalizedString("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.") : NSLocalizedString("Global", comment: "Navigation bar title for Global view where posts from all connected relay servers appear."), displayMode: .inline)
+        .navigationBarTitle(timeline_name(selected_timeline), displayMode: .inline)
        .toolbar {
            ToolbarItem(placement: .principal) {
-                timelineNavItem
-                    .opacity(isSideBarOpened ? 0 : 1)
-                    .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
+                VStack {
+                    if selected_timeline == .home {
+                        Image("damus-home")
+                            .resizable()
+                            .frame(width:30,height:30)
+                            .shadow(color: Color("DamusPurple"), radius: 2)
+                            .opacity(isSideBarOpened ? 0 : 1)
+                            .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
+                    } else {
+                        timelineNavItem
+                            .opacity(isSideBarOpened ? 0 : 1)
+                            .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
+                    }
+                }
            }
        }
-        .ignoresSafeArea(.keyboard)
    }
    
    var MaybeSearchView: some View {
@@ -223,16 +234,6 @@ struct ContentView: View {
        }
    }
    
-    var MaybeThreadView: some View {
-        Group {
-            if let evid = self.active_event_id {
-                BuildThreadV2View(damus: damus_state!, event_id: evid)
-            } else {
-                EmptyView()
-            }
-        }
-    }
-    
    var MaybeProfileView: some View {
        Group {
            if let pk = self.active_profile {
@@ -263,49 +264,47 @@ struct ContentView: View {
        VStack(alignment: .leading, spacing: 0) {
            if let damus = self.damus_state {
                NavigationView {
-                    ZStack {
-                        TabView { // Prevents navbar appearance change on scroll
-                            MainContent(damus: damus)
-                                .toolbar() {
-                                    ToolbarItem(placement: .navigationBarLeading) {
-                                        Button {
-                                            isSideBarOpened.toggle()
-                                        } label: {
-                                            ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles)
-                                                .opacity(isSideBarOpened ? 0 : 1)
-                                                .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
-                                        }
-                                        .disabled(isSideBarOpened)
+                    TabView { // Prevents navbar appearance change on scroll
+                        MainContent(damus: damus)
+                            .toolbar() {
+                                ToolbarItem(placement: .navigationBarLeading) {
+                                    Button {
+                                        isSideBarOpened.toggle()
+                                    } label: {
+                                        ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles)
+                                            .opacity(isSideBarOpened ? 0 : 1)
+                                            .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
                                    }
-                                    
-                                    ToolbarItem(placement: .navigationBarTrailing) {
-                                        HStack(alignment: .center) {
-                                            if home.signal.signal != home.signal.max_signal {
-                                                NavigationLink(destination: RelayConfigView(state: damus_state!)) {
-                                                    Text("\(home.signal.signal)/\(home.signal.max_signal)", comment: "Fraction of how many of the user's relay servers that are operational.")
-                                                        .font(.callout)
-                                                        .foregroundColor(.gray)
-                                                }
+                                    .disabled(isSideBarOpened)
+                                }
+                                
+                                ToolbarItem(placement: .navigationBarTrailing) {
+                                    HStack(alignment: .center) {
+                                        if home.signal.signal != home.signal.max_signal {
+                                            NavigationLink(destination: RelayConfigView(state: damus_state!)) {
+                                                Text("\(home.signal.signal)/\(home.signal.max_signal)", comment: "Fraction of how many of the user's relay servers that are operational.")
+                                                    .font(.callout)
+                                                    .foregroundColor(.gray)
                                            }
-                                            
-                                            // maybe expand this to other timelines in the future
-                                            if selected_timeline == .search {
-                                                Button(action: {
-                                                    //isFilterVisible.toggle()
-                                                    self.active_sheet = .filter
-                                                }) {
-                                                    // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease...,  line.3.horizontail.decrease
-                                                    Label("Filter", systemImage: "line.3.horizontal.decrease")
-                                                        .foregroundColor(.gray)
-                                                        //.contentShape(Rectangle())
-                                                }
+                                        }
+                                        
+                                        // maybe expand this to other timelines in the future
+                                        if selected_timeline == .search {
+                                            Button(action: {
+                                                //isFilterVisible.toggle()
+                                                self.active_sheet = .filter
+                                            }) {
+                                                // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease...,  line.3.horizontail.decrease
+                                                Label(NSLocalizedString("Filter", comment: "Button label text for filtering relay servers."), systemImage: "line.3.horizontal.decrease")
+                                                    .foregroundColor(.gray)
+                                                    //.contentShape(Rectangle())
                                            }
                                        }
                                    }
                                }
-                        }
-                        .tabViewStyle(.page(indexDisplayMode: .never))
+                            }
                    }
+                    .tabViewStyle(.page(indexDisplayMode: .never))
                    .overlay(
                        SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
                    )
@@ -314,8 +313,10 @@ struct ContentView: View {
            
                TabBar(new_events: $home.new_events, selected: $selected_timeline, isSidebarVisible: $isSideBarOpened, action: switch_timeline)
                    .padding([.bottom], 8)
+                    .background(Color(uiColor: .systemBackground).ignoresSafeArea())
            }
        }
+        .ignoresSafeArea(.keyboard)
        .onAppear() {
            self.connect()
            setup_notifications()
@@ -328,7 +329,7 @@ struct ContentView: View {
                PostView(replying_to: nil, references: [], damus_state: damus_state!)
            case .reply(let event):
                ReplyView(replying_to: event, damus: damus_state!)
-            case .event(let event):
+            case .event:
                EventDetailView()
            case .filter:
                let timeline = selected_timeline ?? .home
@@ -352,7 +353,11 @@ struct ContentView: View {
                    active_profile = ref.ref_id
                    profile_open = true
                } else if ref.key == "e" {
-                    active_event_id = ref.ref_id
+                    find_event(state: damus_state!, evid: ref.ref_id, search_type: .event, find_from: nil) { ev in
+                        if let ev {
+                            active_event = ev
+                        }
+                    }
                    thread_open = true
                }
            case .filter(let filt):
@@ -364,12 +369,7 @@ struct ContentView: View {
            
        }
        .onReceive(handle_notify(.boost)) { notif in
-            guard let privkey = self.privkey else {
-                return
-            }
-            let ev = notif.object as! NostrEvent
-            let boost = make_boost_event(pubkey: pubkey, privkey: privkey, boosted: ev)
-            self.damus_state?.pool.send(.event(boost))
+            current_boost = (notif.object as? NostrEvent)
        }
        .onReceive(handle_notify(.open_thread)) { obj in
            //let ev = obj.object as! NostrEvent
@@ -486,7 +486,7 @@ struct ContentView: View {
        }, message: {
            if let pubkey = self.blocking {
                let profile = damus_state!.profiles.lookup(id: pubkey)
-                let name = Profile.displayName(profile: profile, pubkey: pubkey)
+                let name = Profile.displayName(profile: profile, pubkey: pubkey).username
                Text("\(name) has been blocked", comment: "Alert message that informs a user was blocked.")
            } else {
                Text("User has been blocked", comment: "Alert message that informs a user was blocked.")
@@ -554,12 +554,22 @@ struct ContentView: View {
        }, message: {
            if let pubkey = blocking {
                let profile = damus_state?.profiles.lookup(id: pubkey)
-                let name = Profile.displayName(profile: profile, pubkey: pubkey)
+                let name = Profile.displayName(profile: profile, pubkey: pubkey).username
                Text("Block \(name)?", comment: "Alert message prompt to ask if a user should be blocked.")
            } else {
                Text("Could not find user to block...", comment: "Alert message to indicate that the blocked user could not be found.")
            }
        })
+        .alert(NSLocalizedString("Repost", comment: "Title of alert for confirming to repost a post."), isPresented: $current_boost.mappedToBool()) {
+            Button(NSLocalizedString("Cancel", comment: "Button to cancel out of reposting a post.")) {
+                current_boost = nil
+            }
+            Button(NSLocalizedString("Repost", comment: "Button to confirm reposting a post.")) {
+                self.damus_state?.pool.send(.event(current_boost!))
+            }
+        } message: {
+            Text("Are you sure you want to repost this?", comment: "Alert message to ask if user wants to repost a post.")
+        }
    }
    
    func switch_timeline(_ timeline: Timeline) {
@@ -615,7 +625,9 @@ struct ContentView: View {
                                      settings: UserSettingsStore(),
                                      relay_filters: relay_filters,
                                      relay_metadata: metadatas,
-                                      drafts: Drafts()
+                                      drafts: Drafts(),
+                                      events: EventCache(),
+                                      bookmarks: BookmarksManager(pubkey: pubkey)
        )
        home.damus_state = self.damus_state!
        
@@ -764,3 +776,68 @@ func setup_notifications() {
    }
 }

+
+func find_event(state: DamusState, evid: String, search_type: SearchType, find_from: [String]?, callback: @escaping (NostrEvent?) -> ()) {
+    if let ev = state.events.lookup(evid) {
+        callback(ev)
+        return
+    }
+    
+    let subid = UUID().description
+    
+    var has_event = false
+    
+    var filter = search_type == .event ? NostrFilter.filter_ids([ evid ]) : NostrFilter.filter_authors([ evid ])
+    
+    if search_type == .profile {
+        filter.kinds = [0]
+    }
+    
+    filter.limit = 1
+    var attempts = 0
+    
+    state.pool.subscribe_to(sub_id: subid, filters: [filter], to: find_from) { relay_id, res  in
+        guard case .nostr_event(let ev) = res else {
+            return
+        }
+        
+        guard ev.subid == subid else {
+            return
+        }
+        
+        switch ev {
+        case .event(_, let ev):
+            has_event = true
+            callback(ev)
+            state.pool.unsubscribe(sub_id: subid)
+        case .eose:
+            if !has_event {
+                attempts += 1
+                if attempts == state.pool.descriptors.count / 2 {
+                    callback(nil)
+                }
+                state.pool.unsubscribe(sub_id: subid, to: [relay_id])
+            }
+        case .notice(_):
+            break
+        }
+
+    }
+}
+
+
+func timeline_name(_ timeline: Timeline?) -> String {
+    guard let timeline else {
+        return ""
+    }
+    switch timeline {
+    case .home:
+        return "Home"
+    case .notifications:
+        return "Notifications"
+    case .search:
+        return "Universe 🛸"
+    case .dms:
+        return "DMs"
+    }
+}
@@ -14,6 +14,16 @@
 				<string>nostr</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>CFBundleURLName</key>
+			<string>io.damus</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>damus</string>
+			</array>
+		</dict>
 	</array>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
@@ -0,0 +1,71 @@
+//
+//  BookmarksManager.swift
+//  damus
+//
+//  Created by Joel Klabo on 2/18/23.
+//
+
+import Foundation
+
+fileprivate func get_bookmarks_key(pubkey: String) -> String {
+    pk_setting_key(pubkey, key: "bookmarks")
+}
+
+func load_bookmarks(pubkey: String) -> [NostrEvent] {
+    let key = get_bookmarks_key(pubkey: pubkey)
+    return (UserDefaults.standard.stringArray(forKey: key) ?? []).compactMap {
+        event_from_json(dat: $0)
+    }
+}
+
+func save_bookmarks(pubkey: String, current_value: [NostrEvent], value: [NostrEvent]) -> Bool {
+    let uniq_bookmarks = Array(Set(value))
+    
+    if uniq_bookmarks != current_value {
+        let encoded = uniq_bookmarks.map(event_to_json)
+        UserDefaults.standard.set(encoded, forKey: get_bookmarks_key(pubkey: pubkey))
+        return true
+    }
+    
+    return false
+}
+
+class BookmarksManager: ObservableObject {
+    
+    private let userDefaults = UserDefaults.standard
+    private let pubkey: String
+    
+    private var _bookmarks: [NostrEvent]
+    var bookmarks: [NostrEvent] {
+        get {
+            return _bookmarks
+        }
+        set {
+            if save_bookmarks(pubkey: pubkey, current_value: _bookmarks, value: newValue) {
+                self._bookmarks = newValue
+                self.objectWillChange.send()
+            }
+        }
+    }
+    
+    init(pubkey: String) {
+        self._bookmarks = load_bookmarks(pubkey: pubkey)
+        self.pubkey = pubkey
+    }
+    
+    func isBookmarked(_ ev: NostrEvent) -> Bool {
+        return bookmarks.contains(ev)
+    }
+    
+    func updateBookmark(_ ev: NostrEvent) {
+        if isBookmarked(ev) {
+            bookmarks = bookmarks.filter { $0 != ev }
+        } else {
+            bookmarks.append(ev)
+        }
+    }
+    
+    func clearAll() {
+        bookmarks = []
+    }
+}
@@ -24,6 +24,8 @@ struct DamusState {
    let relay_filters: RelayFilters
    let relay_metadata: RelayMetadatas
    let drafts: Drafts
+    let events: EventCache
+    let bookmarks: BookmarksManager
    
    var pubkey: String {
        return keypair.pubkey
@@ -32,9 +34,8 @@ struct DamusState {
    var is_privkey_user: Bool {
        keypair.privkey != nil
    }
-
    
    static var empty: DamusState {
-        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(our_pubkey: ""), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel(our_pubkey: ""), previews: PreviewCache(), zaps: Zaps(our_pubkey: ""), lnurls: LNUrls(), settings: UserSettingsStore(), relay_filters: RelayFilters(our_pubkey: ""), relay_metadata: RelayMetadatas(), drafts: Drafts())
+        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(our_pubkey: ""), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel(our_pubkey: ""), previews: PreviewCache(), zaps: Zaps(our_pubkey: ""), lnurls: LNUrls(), settings: UserSettingsStore(), relay_filters: RelayFilters(our_pubkey: ""), relay_metadata: RelayMetadatas(), drafts: Drafts(), events: EventCache(), bookmarks: BookmarksManager(pubkey: ""))
    }
 }
@@ -8,6 +8,6 @@
 import Foundation

 class Drafts: ObservableObject {
-    @Published var post: String = ""
-    @Published var replies: [NostrEvent: String] = [:]
+    @Published var post: NSMutableAttributedString = NSMutableAttributedString(string: "")
+    @Published var replies: [NostrEvent: NSMutableAttributedString] = [:]
 }
@@ -9,9 +9,63 @@ import Foundation


 class EventsModel: ObservableObject {
-    var has_event: Set<String> = Set()
+    let state: DamusState
+    let target: String
+    let kind: NostrKind
+    let sub_id = UUID().uuidString
+    let profiles_id = UUID().uuidString
+    
    @Published var events: [NostrEvent] = []
    
-    init() {
+    init(state: DamusState, target: String, kind: NostrKind) {
+        self.state = state
+        self.target = target
+        self.kind = kind
+    }
+    
+    private func get_filter() -> NostrFilter {
+        var filter = NostrFilter.filter_kinds([kind.rawValue])
+        filter.referenced_ids = [target]
+        filter.limit = 500
+        return filter
+    }
+    
+    func subscribe() {
+        state.pool.subscribe(sub_id: sub_id,
+                             filters: [get_filter()],
+                             handler: handle_nostr_event)
+    }
+    
+    func unsubscribe() {
+        state.pool.unsubscribe(sub_id: sub_id)
+    }
+    
+    private func handle_event(relay_id: String, ev: NostrEvent) {
+        guard ev.kind == kind.rawValue else {
+            return
+        }
+        
+        guard last_etag(tags: ev.tags) == target else {
+            return
+        }
+        
+        if insert_uniq_sorted_event(events: &self.events, new_ev: ev, cmp: { a, b in a.created_at < b.created_at } ) {
+            objectWillChange.send()
+        }
+    }
+    
+    func handle_nostr_event(relay_id: String, ev: NostrConnectionEvent) {
+        guard case .nostr_event(let nev) = ev else {
+            return
+        }
+        
+        switch nev {
+        case .event(_, let ev):
+            handle_event(relay_id: relay_id, ev: ev)
+        case .notice(_):
+            break
+        case .eose(_):
+            load_profiles(profiles_subid: profiles_id, relay_id: relay_id, load: .from_events(events), damus_state: state)
+        }
    }
 }
@@ -38,6 +38,9 @@ class HomeModel: ObservableObject {
    var channels: [String: NostrEvent] = [:]
    var last_event_of_kind: [String: [Int: NostrEvent]] = [:]
    var done_init: Bool = false
+    var incoming_dms: [NostrEvent] = []
+    let dm_debouncer = Debouncer(interval: 0.5)
+    var should_debounce_dms = true

    let home_subid = UUID().description
    let contacts_subid = UUID().description
@@ -47,25 +50,33 @@ class HomeModel: ObservableObject {
    let profiles_subid = UUID().description

    @Published var new_events: NewEventsBits = NewEventsBits()
-    @Published var notifications: [NostrEvent] = []
+    @Published var notifications = NotificationsModel()
    @Published var dms: DirectMessagesModel
-    @Published var events: [NostrEvent] = []
+    @Published var events = EventHolder()
    @Published var loading: Bool = false
    @Published var signal: SignalModel = SignalModel()

    init() {
        self.damus_state = DamusState.empty
-        self.dms = DirectMessagesModel(our_pubkey: damus_state.pubkey)
+        self.dms = DirectMessagesModel(our_pubkey: "")
    }
-
+    
    init(damus_state: DamusState) {
        self.damus_state = damus_state
        self.dms = DirectMessagesModel(our_pubkey: damus_state.pubkey)
+        self.setup_debouncer()
    }

    var pool: RelayPool {
        return damus_state.pool
    }
+    
+    func setup_debouncer() {
+        // turn off debouncer after initial load
+        DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
+            self.should_debounce_dms = false
+        }
+    }

    func has_sub_id_event(sub_id: String, ev_id: String) -> Bool {
        if !has_event.keys.contains(sub_id) {
@@ -114,36 +125,43 @@ class HomeModel: ObservableObject {
            handle_channel_meta(ev)
        case .zap:
            handle_zap_event(ev)
+        case .zap_request:
+            break
        }
    }
    
-    func handle_zap_event_with_zapper(_ ev: NostrEvent, our_pubkey: String, zapper: String) {
-        guard let zap = Zap.from_zap_event(zap_ev: ev, zapper: zapper) else {
+    func handle_zap_event_with_zapper(_ ev: NostrEvent, our_keypair: Keypair, zapper: String) {
+        guard let zap = Zap.from_zap_event(zap_ev: ev, zapper: zapper, our_privkey: our_keypair.privkey) else {
            return
        }
        
        damus_state.zaps.add_zap(zap: zap)
        
-        guard zap.target.pubkey == our_pubkey else {
+        guard zap.target.pubkey == our_keypair.pubkey else {
            return
        }
        
-        if !insert_uniq_sorted_event(events: &notifications, new_ev: ev, cmp: { $0.created_at > $1.created_at }) {
+        if !notifications.insert_zap(zap) {
            return
        }
-        
-        handle_last_event(ev: ev, timeline: .notifications)
+
+        if handle_last_event(ev: ev, timeline: .notifications) && damus_state.settings.zap_vibration {
+            // Generate zap vibration
+            zap_vibrate(zap_amount: zap.invoice.amount)
+        }
+
        return
    }
-    
+
    func handle_zap_event(_ ev: NostrEvent) {
        // These are zap notifications
        guard let ptag = event_tag(ev, name: "p") else {
            return
        }
        
+        let our_keypair = damus_state.keypair
        if let local_zapper = damus_state.profiles.lookup_zapper(pubkey: ptag) {
-            handle_zap_event_with_zapper(ev, our_pubkey: damus_state.pubkey, zapper: local_zapper)
+            handle_zap_event_with_zapper(ev, our_keypair: our_keypair, zapper: local_zapper)
            return
        }
        
@@ -162,7 +180,7 @@ class HomeModel: ObservableObject {
            
            DispatchQueue.main.async {
                self.damus_state.profiles.zappers[ptag] = zapper
-                self.handle_zap_event_with_zapper(ev, our_pubkey: self.damus_state.pubkey, zapper: zapper)
+                self.handle_zap_event_with_zapper(ev, our_keypair: our_keypair, zapper: zapper)
            }
        }
        
@@ -180,9 +198,9 @@ class HomeModel: ObservableObject {
    }
    
    func filter_muted() {
-        self.events = events.filter { !damus_state.contacts.is_muted($0.pubkey) }
+        events.filter { !damus_state.contacts.is_muted($0.pubkey) }
        self.dms.dms = dms.dms.filter { !damus_state.contacts.is_muted($0.0) }
-        self.notifications = notifications.filter { !damus_state.contacts.is_muted($0.pubkey) }
+        notifications.filter { !damus_state.contacts.is_muted($0.pubkey) }
    }
    
    func handle_delete_event(_ ev: NostrEvent) {
@@ -214,7 +232,7 @@ class HomeModel: ObservableObject {
            guard inner_ev.is_valid else {
                return
            }
-
+           
            if inner_ev.is_textlike {
                handle_text_event(sub_id: sub_id, ev)
            }
@@ -240,12 +258,11 @@ class HomeModel: ObservableObject {
            return
        }

-        // CHECK SIGS ON THESE
-
        switch damus_state.likes.add_event(ev, target: e.ref_id) {
        case .already_counted:
            break
        case .success(let n):
+            handle_notification(ev: ev)
            let liked = Counted(event: ev, id: e.ref_id, total: n)
            notify(.liked, liked)
            notify(.update_stats, e.ref_id)
@@ -303,10 +320,11 @@ class HomeModel: ObservableObject {
            case .eose(let sub_id):
                
                if sub_id == dms_subid {
-                    let dms = dms.dms.flatMap { $0.1.events }
-                    load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: dms, damus_state: damus_state)
+                    var dms = dms.dms.flatMap { $0.1.events }
+                    dms.append(contentsOf: incoming_dms)
+                    load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, load: .from_events(dms), damus_state: damus_state)
                } else if sub_id == notifications_subid {
-                    load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: notifications, damus_state: damus_state)
+                    load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, load: .from_keys(notifications.uniq_pubkeys()), damus_state: damus_state)
                }
                
                self.loading = false
@@ -359,7 +377,6 @@ class HomeModel: ObservableObject {
        // TODO: separate likes?
        var home_filter = NostrFilter.filter_kinds([
            NostrKind.text.rawValue,
-            NostrKind.chat.rawValue,
            NostrKind.like.rawValue,
            NostrKind.boost.rawValue,
        ])
@@ -369,13 +386,12 @@ class HomeModel: ObservableObject {

        var notifications_filter = NostrFilter.filter_kinds([
            NostrKind.text.rawValue,
-            NostrKind.chat.rawValue,
            NostrKind.like.rawValue,
            NostrKind.boost.rawValue,
            NostrKind.zap.rawValue,
        ])
        notifications_filter.pubkeys = [damus_state.pubkey]
-        notifications_filter.limit = 100
+        notifications_filter.limit = 500

        var home_filters = [home_filter]
        var notifications_filters = [notifications_filter]
@@ -441,46 +457,82 @@ class HomeModel: ObservableObject {
    }

    func handle_notification(ev: NostrEvent) {
+        // don't show notifications from ourselves
+        guard ev.pubkey != damus_state.pubkey else {
+            return
+        }
+        
        guard event_has_our_pubkey(ev, our_pubkey: self.damus_state.pubkey) else {
            return
        }
        
-        if !insert_uniq_sorted_event(events: &notifications, new_ev: ev, cmp: { $0.created_at > $1.created_at }) {
+        guard should_show_event(contacts: damus_state.contacts, ev: ev) else {
            return
        }
-
+        
+        damus_state.events.insert(ev)
+        if let inner_ev = ev.inner_event {
+            damus_state.events.insert(inner_ev)
+        }
+        
+        if !notifications.insert_event(ev) {
+            return
+        }
+        
        handle_last_event(ev: ev, timeline: .notifications)
    }
-    
-    func handle_last_event(ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) {
+
+    @discardableResult
+    func handle_last_event(ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) -> Bool {
        if let new_bits = handle_last_events(new_events: self.new_events, ev: ev, timeline: timeline, shouldNotify: shouldNotify) {
            new_events = new_bits
+            return true
+        } else {
+            return false
        }
    }

-    func insert_home_event(_ ev: NostrEvent) -> Bool {
-        let ok = insert_uniq_sorted_event(events: &self.events, new_ev: ev, cmp: { $0.created_at > $1.created_at })
-        if ok {
+    func insert_home_event(_ ev: NostrEvent) {
+        if events.insert(ev) {
            handle_last_event(ev: ev, timeline: .home)
        }
-        return ok
    }

    func handle_text_event(sub_id: String, _ ev: NostrEvent) {
        guard should_show_event(contacts: damus_state.contacts, ev: ev) else {
            return
        }
+        
+        damus_state.events.insert(ev)

        if sub_id == home_subid {
-            let _ = insert_home_event(ev)
+            insert_home_event(ev)
        } else if sub_id == notifications_subid {
            handle_notification(ev: ev)
        }
    }
-
+    
    func handle_dm(_ ev: NostrEvent) {
-        if let notifs = handle_incoming_dm(contacts: damus_state.contacts, prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, ev: ev) {
-            self.new_events = notifs
+        guard should_show_event(contacts: damus_state.contacts, ev: ev) else {
+            return
+        }
+        
+        if !should_debounce_dms {
+            self.incoming_dms.append(ev)
+            if let notifs = handle_incoming_dms(prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, evs: self.incoming_dms) {
+                self.new_events = notifs
+            }
+            self.incoming_dms = []
+            return
+        }
+        
+        incoming_dms.append(ev)
+        
+        dm_debouncer.debounce {
+            if let notifs = handle_incoming_dms(prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, evs: self.incoming_dms) {
+                self.new_events = notifs
+            }
+            self.incoming_dms = []
        }
    }
 }
@@ -626,14 +678,14 @@ func process_metadata_event(our_pubkey: String, profiles: Profiles, ev: NostrEve
    
    // load pfps asap
    let picture = tprof.profile.picture ?? robohash(ev.pubkey)
-    if let _ = URL(string: picture) {
+    if URL(string: picture) != nil {
        DispatchQueue.main.async {
            notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
        }
    }
    
    let banner = tprof.profile.banner ?? ""
-    if let _ = URL(string: banner) {
+    if URL(string: banner) != nil {
        DispatchQueue.main.async {
            notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
        }
@@ -761,14 +813,11 @@ func fetch_relay_metadata(relay_id: String) async throws -> RelayMetadata? {
 func process_relay_metadata() {
 }

-func handle_incoming_dm(contacts: Contacts, prev_events: NewEventsBits, dms: DirectMessagesModel, our_pubkey: String, ev: NostrEvent) -> NewEventsBits? {
-    // hide blocked users
-    guard should_show_event(contacts: contacts, ev: ev) else {
-        return prev_events
-    }
-    
+@discardableResult
+func handle_incoming_dm(ev: NostrEvent, our_pubkey: String, dms: DirectMessagesModel, prev_events: NewEventsBits) -> (Bool, NewEventsBits?) {
    var inserted = false
    var found = false
+    
    let ours = ev.pubkey == our_pubkey
    var i = 0

@@ -795,15 +844,34 @@ func handle_incoming_dm(contacts: Contacts, prev_events: NewEventsBits, dms: Dir
    }

    if !found {
-        inserted = true
        let model = DirectMessageModel(events: [ev], our_pubkey: our_pubkey)
        dms.dms.append((the_pk, model))
+        inserted = true
    }
+    
+    var new_bits: NewEventsBits? = nil
+    if inserted {
+        new_bits = handle_last_events(new_events: prev_events, ev: ev, timeline: .dms, shouldNotify: !ours)
+    }
+    
+    return (inserted, new_bits)
+}
+
+@discardableResult
+func handle_incoming_dms(prev_events: NewEventsBits, dms: DirectMessagesModel, our_pubkey: String, evs: [NostrEvent]) -> NewEventsBits? {
+    var inserted = false

    var new_events: NewEventsBits? = nil
+    
+    for ev in evs {
+        let res = handle_incoming_dm(ev: ev, our_pubkey: our_pubkey, dms: dms, prev_events: prev_events)
+        inserted = res.0 || inserted
+        if let new = res.1 {
+            new_events = new
+        }
+    }
+    
    if inserted {
-        new_events = handle_last_events(new_events: prev_events, ev: ev, timeline: .dms, shouldNotify: !ours)
-
        dms.dms = dms.dms.filter({ $0.1.events.count > 0 }).sorted { a, b in
            return a.1.events.last!.created_at > b.1.events.last!.created_at
        }
@@ -847,3 +915,16 @@ func should_show_event(contacts: Contacts, ev: NostrEvent) -> Bool {
    return ev.should_show_event
 }

+func zap_vibrate(zap_amount: Int64) {
+    let sats = zap_amount / 1000
+    var vibration_generator: UIImpactFeedbackGenerator
+    if sats >= 10000 {
+        vibration_generator = UIImpactFeedbackGenerator(style: .heavy)
+    } else if sats >= 1000 {
+        vibration_generator = UIImpactFeedbackGenerator(style: .medium)
+    } else {
+        vibration_generator = UIImpactFeedbackGenerator(style: .light)
+    }
+    vibration_generator.impactOccurred()
+}
+
@@ -0,0 +1,28 @@
+//
+//  ImageUploadModel.swift
+//  damus
+//
+//  Created by William Casarin on 2023-03-16.
+//
+
+import Foundation
+import UIKit
+
+
+class ImageUploadModel: NSObject, URLSessionTaskDelegate, ObservableObject {
+    @Published var progress: Double? = nil
+    
+    func start(img: UIImage, uploader: ImageUploader) async -> ImageUploadResult {
+        let res = await create_image_upload_request(imageToUpload: img, imageUploader: uploader, progress: self)
+        DispatchQueue.main.async {
+            self.progress = nil
+        }
+        return res
+    }
+    
+    func urlSession(_ session: URLSession, task: URLSessionTask, didSendBodyData bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) {
+        DispatchQueue.main.async {
+            self.progress = Double(totalBytesSent) / Double(totalBytesExpectedToSend)
+        }
+    }
+}
@@ -1,114 +0,0 @@
-//
-//  KFImageModel.swift
-//  damus
-//
-//  Created by Oleg Abalonski on 1/11/23.
-//
-
-import UIKit
-import Kingfisher
-
-class KFImageModel: ObservableObject {
-    
-    let url: URL?
-    let fallbackUrl: URL?
-    let processor: ImageProcessor
-    let serializer: CacheSerializer
-    
-    @Published var refreshID = ""
-    
-    init(url: URL?, fallbackUrl: URL?, maxByteSize: Int, downsampleSize: CGSize) {
-        self.url = url
-        self.fallbackUrl = fallbackUrl
-        self.processor = CustomImageProcessor(maxSize: maxByteSize, downsampleSize: downsampleSize)
-        self.serializer = CustomCacheSerializer(maxSize: maxByteSize, downsampleSize: downsampleSize)
-    }
-    
-    func refresh() -> Void {
-        DispatchQueue.main.async {
-            self.refreshID = UUID().uuidString
-        }
-    }
-    
-    func cache(_ image: UIImage, forKey key: String) -> Void {
-        KingfisherManager.shared.cache.store(image, forKey: key, processorIdentifier: processor.identifier) { _ in
-            self.refresh()
-        }
-    }
-    
-    func downloadFailed() -> Void {
-        guard let url = url, let fallbackUrl = fallbackUrl else { return }
-        
-        DispatchQueue.global(qos: .background).async {
-            KingfisherManager.shared.downloader.downloadImage(with: fallbackUrl) { result in
-                
-                var fallbackImage: UIImage {
-                    switch result {
-                    case .success(let imageLoadingResult):
-                        return imageLoadingResult.image
-                    case .failure(let error):
-                        print(error)
-                        return UIImage()
-                    }
-                }
-                
-                self.cache(fallbackImage, forKey: url.absoluteString)
-            }
-        }
-    }
-}
-
-struct CustomImageProcessor: ImageProcessor {
-    
-    let maxSize: Int
-    let downsampleSize: CGSize
-    
-    let identifier = "com.damus.customimageprocessor"
-    
-    func process(item: ImageProcessItem, options: KingfisherParsedOptionsInfo) -> KFCrossPlatformImage? {
-        
-        switch item {
-        case .image(_):
-            // This case will never run
-            return DefaultImageProcessor.default.process(item: item, options: options)
-        case .data(let data):
-            
-            // Handle large image size
-            if data.count > maxSize {
-                return KingfisherWrapper.downsampledImage(data: data, to: downsampleSize, scale: options.scaleFactor)
-            }
-            
-            // Handle SVG image
-            if let dataString = String(data: data, encoding: .utf8),
-                let svg = SVG(dataString) {
-                
-                    let render = UIGraphicsImageRenderer(size: svg.size)
-                    let image = render.image { context in
-                        svg.draw(in: context.cgContext)
-                    }
-
-                    return image.kf.scaled(to: options.scaleFactor)
-            }
-            
-            return DefaultImageProcessor.default.process(item: item, options: options)
-        }
-    }
-}
-
-struct CustomCacheSerializer: CacheSerializer {
-    
-    let maxSize: Int
-    let downsampleSize: CGSize
-
-    func data(with image: Kingfisher.KFCrossPlatformImage, original: Data?) -> Data? {
-        return DefaultCacheSerializer.default.data(with: image, original: original)
-    }
-
-    func image(with data: Data, options: Kingfisher.KingfisherParsedOptionsInfo) -> Kingfisher.KFCrossPlatformImage? {
-        if data.count > maxSize {
-            return KingfisherWrapper.downsampledImage(data: data, to: downsampleSize, scale: options.scaleFactor)
-        }
-
-        return DefaultCacheSerializer.default.image(with: data, options: options)
-    }
-}
@@ -94,6 +94,14 @@ enum Block {
        return nil
    }
    
+    var is_note_mention: Bool {
+        guard case .mention(let mention) = self else {
+            return false
+        }
+        
+        return mention.type == .event
+    }
+    
    var is_mention: Bool {
        if case .mention = self {
            return true
@@ -211,6 +219,32 @@ enum Amount: Equatable {
    }
 }

+func format_actions_abbrev(_ actions: Int) -> String {
+    let formatter = NumberFormatter()
+    formatter.numberStyle = .decimal
+    formatter.positiveSuffix = "m"
+    formatter.positivePrefix = ""
+    formatter.minimumFractionDigits = 0
+    formatter.maximumFractionDigits = 3
+    formatter.roundingMode = .down
+    formatter.roundingIncrement = 0.1
+    formatter.multiplier = 1
+        
+    if actions >= 1_000_000 {
+        formatter.positiveSuffix = "m"
+        formatter.multiplier = 0.000001
+    } else if actions >= 1000 {
+        formatter.positiveSuffix = "k"
+        formatter.multiplier = 0.001
+    } else {
+        return "\(actions)"
+    }
+    
+    let actions = NSNumber(value: actions)
+    
+    return formatter.string(from: actions) ?? "\(actions)"
+}
+
 func format_msats_abbrev(_ msats: Int64) -> String {
    let formatter = NumberFormatter()
    formatter.numberStyle = .decimal
@@ -237,17 +271,19 @@ func format_msats_abbrev(_ msats: Int64) -> String {
    return formatter.string(from: sats) ?? sats.stringValue
 }

-func format_msats(_ msat: Int64) -> String {
+func format_msats(_ msat: Int64, locale: Locale = Locale.current) -> String {
    let numberFormatter = NumberFormatter()
    numberFormatter.numberStyle = .decimal
    numberFormatter.minimumFractionDigits = 0
    numberFormatter.maximumFractionDigits = 3
    numberFormatter.roundingMode = .down
+    numberFormatter.locale = locale

    let sats = NSNumber(value: (Double(msat) / 1000.0))
    let formattedSats = numberFormatter.string(from: sats) ?? sats.stringValue

-    return String(format: NSLocalizedString("sats_count", comment: "Amount of sats."), sats.decimalValue as NSDecimalNumber, formattedSats)
+    let format = localizedStringFormat(key: "sats_count", locale: locale)
+    return String(format: format, locale: locale, sats.decimalValue as NSDecimalNumber, formattedSats)
 }

 func convert_invoice_block(_ b: invoice_block) -> Block? {
@@ -0,0 +1,32 @@
+//
+//  ReactionGroup.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-21.
+//
+
+import Foundation
+
+class EventGroup {
+    var events: [NostrEvent]
+    
+    var last_event_at: Int64 {
+        guard let first = self.events.first else {
+            return 0
+        }
+        
+        return first.created_at
+    }
+    
+    init() {
+        self.events = []
+    }
+    
+    init(events: [NostrEvent]) {
+        self.events = events
+    }
+    
+    func insert(_ ev: NostrEvent) -> Bool {
+        return insert_uniq_sorted_event_created(events: &events, new_ev: ev)
+    }
+}
@@ -0,0 +1,59 @@
+//
+//  ZapGroup.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-21.
+//
+
+import Foundation
+
+class ZapGroup {
+    var zaps: [Zap]
+    var msat_total: Int64
+    var zappers: Set<String>
+    
+    var last_event_at: Int64 {
+        guard let first = zaps.first else {
+            return 0
+        }
+        
+        return first.event.created_at
+    }
+    
+    func zap_requests() -> [NostrEvent] {
+        zaps.map { z in
+            if let priv = z.private_request {
+                return priv
+            } else {
+                return z.request.ev
+            }
+        }
+    }
+    
+    init(zaps: [Zap]) {
+        self.zaps = zaps
+        self.msat_total = 0
+        self.zappers = Set()
+    }
+    
+    init() {
+        self.zaps = []
+        self.msat_total = 0
+        self.zappers = Set()
+    }
+    
+    func insert(_ zap: Zap) -> Bool {
+        if !insert_uniq_sorted_zap_by_created(zaps: &zaps, new_zap: zap) {
+            return false
+        }
+        
+        msat_total += zap.invoice.amount
+        
+        if !zappers.contains(zap.request.ev.pubkey)  {
+            zappers.insert(zap.request.ev.pubkey)
+        }
+        
+        return true
+    }
+}
+
@@ -0,0 +1,320 @@
+//
+//  NotificationsModel.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-21.
+//
+
+import Foundation
+
+enum NotificationItem {
+    case repost(String, EventGroup)
+    case reaction(String, EventGroup)
+    case profile_zap(ZapGroup)
+    case event_zap(String, ZapGroup)
+    case reply(NostrEvent)
+    
+    var is_reply: NostrEvent? {
+        if case .reply(let ev) = self {
+            return ev
+        }
+        return nil
+    }
+    
+    var is_zap: ZapGroup? {
+        switch self {
+        case .profile_zap(let zapgrp):
+            return zapgrp
+        case .event_zap(_, let zapgrp):
+            return zapgrp
+        case .reaction:
+            return nil
+        case .reply:
+            return nil
+        case .repost:
+            return nil
+        }
+    }
+    
+    var id: String {
+        switch self {
+        case .repost(let evid, _):
+            return "repost_" + evid
+        case .reaction(let evid, _):
+            return "reaction_" + evid
+        case .profile_zap:
+            return "profile_zap"
+        case .event_zap(let evid, _):
+            return "event_zap_" + evid
+        case .reply(let ev):
+            return "reply_" + ev.id
+        }
+    }
+    
+    var last_event_at: Int64 {
+        switch self {
+        case .reaction(_, let evgrp):
+            return evgrp.last_event_at
+        case .repost(_, let evgrp):
+            return evgrp.last_event_at
+        case .profile_zap(let zapgrp):
+            return zapgrp.last_event_at
+        case .event_zap(_, let zapgrp):
+            return zapgrp.last_event_at
+        case .reply(let reply):
+            return reply.created_at
+        }
+    }
+}
+
+class NotificationsModel: ObservableObject, ScrollQueue {
+    var incoming_zaps: [Zap]
+    var incoming_events: [NostrEvent]
+    var should_queue: Bool
+    
+    // mappings from events to
+    var zaps: [String: ZapGroup]
+    var profile_zaps: ZapGroup
+    var reactions: [String: EventGroup]
+    var reposts: [String: EventGroup]
+    var replies: [NostrEvent]
+    var has_reply: Set<String>
+    
+    @Published var notifications: [NotificationItem]
+    
+    init() {
+        self.zaps = [:]
+        self.reactions = [:]
+        self.reposts = [:]
+        self.replies = []
+        self.has_reply = Set()
+        self.should_queue = true
+        self.incoming_zaps = []
+        self.incoming_events = []
+        self.profile_zaps = ZapGroup()
+        self.notifications = []
+    }
+    
+    func set_should_queue(_ val: Bool) {
+        self.should_queue = val
+    }
+    
+    func uniq_pubkeys() -> [String] {
+        var pks = Set<String>()
+        
+        for ev in incoming_events {
+            pks.insert(ev.pubkey)
+        }
+        
+        for grp in reposts {
+            for ev in grp.value.events {
+                pks.insert(ev.pubkey)
+            }
+        }
+        
+        for ev in replies {
+            pks.insert(ev.pubkey)
+        }
+        
+        for zap in incoming_zaps {
+            pks.insert(zap.request.ev.pubkey)
+        }
+        
+        return Array(pks)
+    }
+    
+    func build_notifications() -> [NotificationItem] {
+        var notifs: [NotificationItem] = []
+        
+        for el in zaps {
+            let evid = el.key
+            let zapgrp = el.value
+            
+            let notif: NotificationItem = .event_zap(evid, zapgrp)
+            notifs.append(notif)
+        }
+        
+        if !profile_zaps.zaps.isEmpty {
+            notifs.append(.profile_zap(profile_zaps))
+        }
+        
+        for el in reposts {
+            let evid = el.key
+            let evgrp = el.value
+            
+            notifs.append(.repost(evid, evgrp))
+        }
+        
+        for el in reactions {
+            let evid = el.key
+            let evgrp = el.value
+            
+            notifs.append(.reaction(evid, evgrp))
+        }
+        
+        for reply in replies {
+            notifs.append(.reply(reply))
+        }
+        
+        notifs.sort { $0.last_event_at > $1.last_event_at }
+        return notifs
+    }
+    
+    
+    private func insert_repost(_ ev: NostrEvent) -> Bool {
+        guard let reposted_ev = ev.inner_event else {
+            return false
+        }
+        
+        let id = reposted_ev.id
+        
+        if let evgrp = self.reposts[id] {
+            return evgrp.insert(ev)
+        } else {
+            let evgrp = EventGroup()
+            self.reposts[id] = evgrp
+            return evgrp.insert(ev)
+        }
+    }
+    
+    private func insert_text(_ ev: NostrEvent) -> Bool {
+        guard !has_reply.contains(ev.id) else {
+            return false
+        }
+        
+        has_reply.insert(ev.id)
+        replies.append(ev)
+        
+        return true
+    }
+    
+    private func insert_reaction(_ ev: NostrEvent) -> Bool {
+        guard let ref_id = ev.referenced_ids.last else {
+            return false
+        }
+        
+        let id = ref_id.id
+        
+        if let evgrp = self.reactions[id] {
+            return evgrp.insert(ev)
+        } else {
+            let evgrp = EventGroup()
+            self.reactions[id] = evgrp
+            return evgrp.insert(ev)
+        }
+    }
+    
+    private func insert_event_immediate(_ ev: NostrEvent) -> Bool {
+        if ev.known_kind == .boost {
+            return insert_repost(ev)
+        } else if ev.known_kind == .like {
+            return insert_reaction(ev)
+        } else if ev.known_kind == .text {
+            return insert_text(ev)
+        }
+        
+        return false
+    }
+    
+    private func insert_zap_immediate(_ zap: Zap) -> Bool {
+        switch zap.target {
+        case .note(let notezt):
+            let id = notezt.note_id
+            if let zapgrp = self.zaps[notezt.note_id] {
+                return zapgrp.insert(zap)
+            } else {
+                let zapgrp = ZapGroup()
+                self.zaps[id] = zapgrp
+                return zapgrp.insert(zap)
+            }
+            
+        case .profile:
+            return profile_zaps.insert(zap)
+        }
+    }
+    
+    func insert_event(_ ev: NostrEvent) -> Bool {
+        if should_queue {
+            return insert_uniq_sorted_event_created(events: &incoming_events, new_ev: ev)
+        }
+        
+        if insert_event_immediate(ev) {
+            self.notifications = build_notifications()
+            return true
+        }
+        
+        return false
+    }
+    
+    func insert_zap(_ zap: Zap) -> Bool {
+        if should_queue {
+            return insert_uniq_sorted_zap_by_created(zaps: &incoming_zaps, new_zap: zap)
+        }
+        
+        if insert_zap_immediate(zap) {
+            self.notifications = build_notifications()
+            return true
+        }
+        
+        return false
+    }
+    
+    func filter(_ isIncluded: (NostrEvent) -> Bool)  {
+        var changed = false
+        var count = 0
+        
+        count = incoming_events.count
+        incoming_events = incoming_events.filter(isIncluded)
+        changed = changed || incoming_events.count != count
+        
+        count = profile_zaps.zaps.count
+        profile_zaps.zaps = profile_zaps.zaps.filter { zap in isIncluded(zap.request.ev) }
+        changed = changed || profile_zaps.zaps.count != count
+        
+        for el in reactions {
+            count = el.value.events.count
+            el.value.events = el.value.events.filter(isIncluded)
+            changed = changed || el.value.events.count != count
+        }
+        
+        for el in reposts {
+            count = el.value.events.count
+            el.value.events = el.value.events.filter(isIncluded)
+            changed = changed || el.value.events.count != count
+        }
+        
+        for el in zaps {
+            count = el.value.zaps.count
+            el.value.zaps = el.value.zaps.filter {
+                isIncluded($0.request.ev)
+            }
+            changed = changed || el.value.zaps.count != count
+        }
+        
+        count = replies.count
+        replies = replies.filter(isIncluded)
+        changed = changed || replies.count != count
+        
+        if changed {
+            self.notifications = build_notifications()
+        }
+    }
+    
+    func flush() -> Bool {
+        var inserted = false
+        
+        for zap in incoming_zaps {
+            inserted = insert_zap_immediate(zap) || inserted
+        }
+        
+        for event in incoming_events {
+            inserted = insert_event_immediate(event) || inserted
+        }
+        
+        if inserted {
+            self.notifications = build_notifications()
+        }
+        
+        return inserted
+    }
+}
@@ -8,14 +8,16 @@
 import Foundation

 class ProfileModel: ObservableObject, Equatable {
-    @Published var events: [NostrEvent] = []
+    var events: EventHolder = EventHolder()
    @Published var contacts: NostrEvent? = nil
    @Published var following: Int = 0
    @Published var relays: [String: RelayInfo]? = nil
+    @Published var progress: Int = 0
    
    let pubkey: String
    let damus: DamusState
    
+    
    var seen_event: Set<String> = Set()
    var sub_id = UUID().description
    var prof_subid = UUID().description
@@ -111,7 +113,9 @@ class ProfileModel: ObservableObject, Equatable {
            return
        }
        if ev.is_textlike || ev.known_kind == .boost {
-            let _ = insert_uniq_sorted_event(events: &self.events, new_ev: ev, cmp: { $0.created_at > $1.created_at})
+            if self.events.insert(ev) {
+                self.objectWillChange.send()
+            }
        } else if ev.known_kind == .contacts {
            handle_profile_contact_event(ev)
        } else if ev.known_kind == .metadata {
@@ -125,15 +129,16 @@ class ProfileModel: ObservableObject, Equatable {
        case .ws_event:
            return
        case .nostr_event(let resp):
+            guard resp.subid == self.sub_id || resp.subid == self.prof_subid else {
+                return
+            }
            switch resp {
-            case .event(let sid, let ev):
-                if sid != self.sub_id && sid != self.prof_subid {
-                    return
-                }
+            case .event(_, let ev):
                add_event(ev)
            case .notice(let notice):
                notify(.notice, notice)
            case .eose:
+                progress += 1
                break
            }
        }
@@ -8,71 +8,9 @@
 import Foundation


-class ReactionsModel: ObservableObject {
-    let state: DamusState
-    let target: String
-    let sub_id: String
-    let profiles_id: String
+final class ReactionsModel: EventsModel {
    
-    @Published var reactions: [NostrEvent]
-    
-    init (state: DamusState, target: String) {
-        self.state = state
-        self.target = target
-        self.sub_id = UUID().description
-        self.profiles_id = UUID().description
-        self.reactions = []
-    }
-    
-    func get_filter() -> NostrFilter {
-        var filter = NostrFilter.filter_kinds([7])
-        filter.referenced_ids = [target]
-        filter.limit = 500
-        return filter
-    }
-    
-    func subscribe() {
-        let filter = get_filter()
-        let filters = [filter]
-        self.state.pool.subscribe(sub_id: sub_id, filters: filters, handler: handle_nostr_event)
-    }
-    
-    func unsubscribe() {
-        self.state.pool.unsubscribe(sub_id: sub_id)
-    }
-    
-    func handle_event(relay_id: String, ev: NostrEvent) {
-        guard ev.kind == 7 else {
-            return
-        }
-        
-        guard let reacted_to = last_etag(tags: ev.tags) else {
-            return
-        }
-        
-        guard reacted_to == self.target else {
-            return
-        }
-        
-        if insert_uniq_sorted_event(events: &self.reactions, new_ev: ev, cmp: { a, b in a.created_at < b.created_at } ) {
-            objectWillChange.send()
-        }
-    }
-    
-    func handle_nostr_event(relay_id: String, ev: NostrConnectionEvent) {
-        guard case .nostr_event(let nev) = ev else {
-            return
-        }
-        
-        switch nev {
-        case .event(_, let ev):
-            handle_event(relay_id: relay_id, ev: ev)
-            
-        case .notice(_):
-            break
-        case .eose(_):
-            load_profiles(profiles_subid: profiles_id, relay_id: relay_id, events: reactions, damus_state: state)
-            break
-        }
+    init(state: DamusState, target: String) {
+        super.init(state: state, target: target, kind: .like)
    }
 }
@@ -8,12 +8,25 @@
 import Foundation

 class ReplyMap {
-    var replies: [String: String] = [:]
+    var replies: [String: Set<String>] = [:]
    
-    func lookup(_ id: String) -> String? {
+    func lookup(_ id: String) -> Set<String>? {
        return replies[id]
    }
-    func add(id: String, reply_id: String) {
-        replies[id] = reply_id
+    
+    private func ensure_set(id: String) {
+        if replies[id] == nil {
+            replies[id] = Set()
+        }
+    }
+    
+    @discardableResult
+    func add(id: String, reply_id: String) -> Bool {
+        ensure_set(id: id)
+        if (replies[id]!).contains(reply_id) {
+            return false
+        }
+        replies[id]!.insert(reply_id)
+        return true
    }
 }
@@ -7,71 +7,9 @@

 import Foundation

-class RepostsModel: ObservableObject {
-    let state: DamusState
-    let target: String
-    let sub_id: String
-    let profiles_id: String
-
-    @Published var reposts: [NostrEvent]
-
-    init (state: DamusState, target: String) {
-        self.state = state
-        self.target = target
-        self.sub_id = UUID().description
-        self.profiles_id = UUID().description
-        self.reposts = []
-    }
-
-    func get_filter() -> NostrFilter {
-        var filter = NostrFilter.filter_kinds([NostrKind.boost.rawValue])
-        filter.referenced_ids = [target]
-        filter.limit = 500
-        return filter
-    }
-
-    func subscribe() {
-        let filter = get_filter()
-        let filters = [filter]
-        self.state.pool.subscribe(sub_id: sub_id, filters: filters, handler: handle_nostr_event)
-    }
-
-    func unsubscribe() {
-        self.state.pool.unsubscribe(sub_id: sub_id)
-    }
-
-    func handle_event(relay_id: String, ev: NostrEvent) {
-        guard ev.kind == NostrKind.boost.rawValue else {
-            return
-        }
-
-        guard let reposted_event = last_etag(tags: ev.tags) else {
-            return
-        }
-
-        guard reposted_event == self.target else {
-            return
-        }
-
-        if insert_uniq_sorted_event(events: &self.reposts, new_ev: ev, cmp: { a, b in a.created_at < b.created_at } ) {
-            objectWillChange.send()
-        }
-    }
-
-    func handle_nostr_event(relay_id: String, ev: NostrConnectionEvent) {
-        guard case .nostr_event(let nev) = ev else {
-            return
-        }
-
-        switch nev {
-        case .event(_, let ev):
-            handle_event(relay_id: relay_id, ev: ev)
-
-        case .notice(_):
-            break
-        case .eose(_):
-            load_profiles(profiles_subid: profiles_id, relay_id: relay_id, events: reposts, damus_state: state)
-            break
-        }
+final class RepostsModel: EventsModel {
+    
+    init(state: DamusState, target: String) {
+        super.init(state: state, target: target, kind: .boost)
    }
 }
@@ -0,0 +1,12 @@
+//
+//  SearchResultsModel.swift
+//  damus
+//
+//  Created by William Casarin on 2023-03-03.
+//
+
+import Foundation
+
+
+class SearchResultsModel: ObservableObject {
+}
@@ -10,7 +10,7 @@ import Foundation

 /// The data model for the SearchHome view, typically something global-like
 class SearchHomeModel: ObservableObject {
-    @Published var events: [NostrEvent] = []
+    var events: EventHolder = EventHolder()
    @Published var loading: Bool = false

    var seen_pubkey: Set<String> = Set()
@@ -31,7 +31,8 @@ class SearchHomeModel: ObservableObject {
    }
    
    func filter_muted() {
-        events = events.filter { should_show_event(contacts: damus_state.contacts, ev: $0) }
+        events.filter { should_show_event(contacts: damus_state.contacts, ev: $0) }
+        self.objectWillChange.send()
    }
    
    func subscribe() {
@@ -61,8 +62,8 @@ class SearchHomeModel: ObservableObject {
                }
                seen_pubkey.insert(ev.pubkey)
                
-                let _ = insert_uniq_sorted_event(events: &events, new_ev: ev) {
-                    $0.created_at > $1.created_at
+                if self.events.insert(ev) {
+                    self.objectWillChange.send()
                }
            }
        case .notice(let msg):
@@ -75,7 +76,7 @@ class SearchHomeModel: ObservableObject {
                // global events are not realtime
                unsubscribe(to: relay_id)
                
-                load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: events, damus_state: damus_state)
+                load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, load: .from_events(events.all_events), damus_state: damus_state)
            }
            
            
@@ -97,8 +98,31 @@ func find_profiles_to_fetch_pk(profiles: Profiles, event_pubkeys: [String]) -> [
    
    return Array(pubkeys)
 }
+
+func find_profiles_to_fetch(profiles: Profiles, load: PubkeysToLoad) -> [String] {
+    switch load {
+    case .from_events(let events):
+        return find_profiles_to_fetch_from_events(profiles: profiles, events: events)
+    case .from_keys(let pks):
+        return find_profiles_to_fetch_from_keys(profiles: profiles, pks: pks)
+    }
+}
+
+func find_profiles_to_fetch_from_keys(profiles: Profiles, pks: [String]) -> [String] {
+    var pubkeys = Set<String>()
    
-func find_profiles_to_fetch(profiles: Profiles, events: [NostrEvent]) -> [String] {
+    for pk in pks {
+        if profiles.lookup(id: pk) != nil {
+            continue
+        }
+        
+        pubkeys.insert(pk)
+    }
+    
+    return Array(pubkeys)
+}
+
+func find_profiles_to_fetch_from_events(profiles: Profiles, events: [NostrEvent]) -> [String] {
    var pubkeys = Set<String>()
    
    for ev in events {
@@ -112,9 +136,14 @@ func find_profiles_to_fetch(profiles: Profiles, events: [NostrEvent]) -> [String
    return Array(pubkeys)
 }

-func load_profiles(profiles_subid: String, relay_id: String, events: [NostrEvent], damus_state: DamusState) {
+enum PubkeysToLoad {
+    case from_events([NostrEvent])
+    case from_keys([String])
+}
+
+func load_profiles(profiles_subid: String, relay_id: String, load: PubkeysToLoad, damus_state: DamusState) {
    var filter = NostrFilter.filter_profiles
-    let authors = find_profiles_to_fetch(profiles: damus_state.profiles, events: events)
+    let authors = find_profiles_to_fetch(profiles: damus_state.profiles, load: load)
    filter.authors = authors
    
    guard !authors.isEmpty else {
@@ -9,7 +9,7 @@ import Foundation


 class SearchModel: ObservableObject {
-    @Published var events: [NostrEvent] = []
+    var events: EventHolder = EventHolder()
    @Published var loading: Bool = false
    @Published var channel_name: String? = nil
    
@@ -26,7 +26,8 @@ class SearchModel: ObservableObject {
    }
    
    func filter_muted()  {
-        self.events = self.events.filter { should_show_event(contacts: contacts, ev: $0) }
+        self.events.filter { should_show_event(contacts: contacts, ev: $0) }
+        self.objectWillChange.send()
    }
    
    func subscribe() {
@@ -57,7 +58,7 @@ class SearchModel: ObservableObject {
            return
        }
        
-        if insert_uniq_sorted_event(events: &self.events, new_ev: ev, cmp: { $0.created_at > $1.created_at } ) {
+        if self.events.insert(ev) {
            objectWillChange.send()
        }
    }
@@ -30,162 +30,100 @@ enum InitialEvent {

 /// manages the lifetime of a thread
 class ThreadModel: ObservableObject {
-    @Published var initial_event: InitialEvent
-    @Published var events: [NostrEvent] = []
-    @Published var event_map: [String: Int] = [:]
+    @Published var event: NostrEvent
+    var event_map: Set<NostrEvent>
+    
    @Published var loading: Bool = false

    var replies: ReplyMap = ReplyMap()
    
-    var event: NostrEvent? {
-        switch initial_event {
-        case .event(let ev):
-            return ev
-        case .event_id(let evid):
-            for event in events {
-                if event.id == evid {
-                    return event
-                }
-            }
-            return nil
-        }
+    init(event: NostrEvent, damus_state: DamusState) {
+        self.damus_state = damus_state
+        self.event_map = Set()
+        self.event = event
+        add_event(event, privkey: nil)
    }
    
    let damus_state: DamusState
    
    let profiles_subid = UUID().description
-    var base_subid = UUID().description
-   
-    init(evid: String, damus_state: DamusState) {
-        self.damus_state = damus_state
-        self.initial_event = .event_id(evid)
-    }
+    let base_subid = UUID().description
+    let meta_subid = UUID().description
    
-    init(event: NostrEvent, damus_state: DamusState) {
-        self.damus_state = damus_state
-        self.initial_event = .event(event)
+    var subids: [String] {
+        return [profiles_subid, base_subid, meta_subid]
    }
    
    func unsubscribe() {
+        self.damus_state.pool.remove_handler(sub_id: base_subid)
+        self.damus_state.pool.remove_handler(sub_id: meta_subid)
+        self.damus_state.pool.remove_handler(sub_id: profiles_subid)
        self.damus_state.pool.unsubscribe(sub_id: base_subid)
-        print("unsubscribing from thread \(initial_event.id) with sub_id \(base_subid)")
+        self.damus_state.pool.unsubscribe(sub_id: meta_subid)
+        self.damus_state.pool.unsubscribe(sub_id: profiles_subid)
+        print("unsubscribing from thread \(event.id) with sub_id \(base_subid)")
    }
    
-    func reset_events() {
-        self.events.removeAll()
-        self.event_map.removeAll()
-        self.replies.replies.removeAll()
-    }
-    
-    func should_resubscribe(_ ev_b: NostrEvent) -> Bool {
-        if self.events.count == 0 {
-            return true
-        }
+    @discardableResult
+    func set_active_event(_ ev: NostrEvent, privkey: String?) -> Bool {
+        self.event = ev
+        add_event(ev, privkey: privkey)
        
-        if ev_b.is_root_event() {
-            return false
-        }
-
-        // rough heuristic to save us from resubscribing all the time
-        //return ev_b.count_ids() != self.event.count_ids()
-        return true
-    }
-    
-    func set_active_event(_ ev: NostrEvent, privkey: String?) {
-        if should_resubscribe(ev) {
-            unsubscribe()
-            self.initial_event = .event(ev)
-            subscribe()
-        } else {
-            self.initial_event = .event(ev)
-            if events.count == 0 {
-                add_event(ev, privkey: privkey)
-            }
-        }
+        //self.objectWillChange.send()
+        return false
    }
    
    func subscribe() {
+        var meta_events = NostrFilter()
+        var event_filter = NostrFilter()
        var ref_events = NostrFilter()
-        var events_filter = NostrFilter()
        //var likes_filter = NostrFilter.filter_kinds(7])

-        // TODO: add referenced relays
-        switch self.initial_event {
-        case .event(let ev):
-            ref_events.referenced_ids = ev.referenced_ids.map { $0.ref_id }
-            ref_events.referenced_ids?.append(ev.id)
-            ref_events.limit = 50
-            events_filter.ids = ref_events.referenced_ids ?? []
-            events_filter.limit = 100
-            events_filter.ids?.append(ev.id)
-        case .event_id(let evid):
-            ref_events.referenced_ids = [evid]
-            ref_events.limit = 50
-            events_filter.ids = [evid]
-            events_filter.limit = 100
+        let thread_id = event.thread_id(privkey: nil)
+        
+        ref_events.referenced_ids = [thread_id, event.id]
+        ref_events.kinds = [1]
+        ref_events.limit = 1000
+        
+        event_filter.ids = [thread_id, event.id]
+        
+        meta_events.referenced_ids = [event.id]
+        meta_events.kinds = [9735, 1, 6, 7]
+        meta_events.limit = 1000
+        
+        /*
+        if let last_ev = self.events.last {
+            if last_ev.created_at <= Int64(Date().timeIntervalSince1970) {
+                ref_events.since = last_ev.created_at
+            }
        }
+         */
+        
+        let base_filters = [event_filter, ref_events]
+        let meta_filters = [meta_events]

-        //likes_filter.ids = ref_events.referenced_ids!
-
-        print("subscribing to thread \(initial_event.id) with sub_id \(base_subid)")
-        damus_state.pool.register_handler(sub_id: base_subid, handler: handle_event)
+        print("subscribing to thread \(event.id) with sub_id \(base_subid)")
        loading = true
-        damus_state.pool.send(.subscribe(.init(filters: [ref_events, events_filter], sub_id: base_subid)))
-    }
-    
-    func lookup(_ event_id: String) -> NostrEvent? {
-        if let i = event_map[event_id] {
-            return events[i]
-        }
-        return nil
+        damus_state.pool.subscribe(sub_id: base_subid, filters: base_filters, handler: handle_event)
+        damus_state.pool.subscribe(sub_id: meta_subid, filters: meta_filters, handler: handle_event)
    }
    
    func add_event(_ ev: NostrEvent, privkey: String?) {
-        guard ev.should_show_event else {
+        if event_map.contains(ev) {
            return
        }
        
-        if event_map[ev.id] != nil {
-            return
-        }
+        let the_ev = damus_state.events.upsert(ev)
+        damus_state.events.add_replies(ev: the_ev)
        
-        for reply in ev.direct_replies(privkey) {
-            self.replies.add(id: ev.id, reply_id: reply.ref_id)
-        }
-        
-        if insert_uniq_sorted_event(events: &self.events, new_ev: ev, cmp: { $0.created_at < $1.created_at }) {
-            objectWillChange.send()
-        }
-        //self.events.append(ev)
-        //self.events = self.events.sorted { $0.created_at < $1.created_at }
-        
-        var i: Int = 0
-        for ev in events {
-            self.event_map[ev.id] = i
-            i += 1
-        }
-        
-        if let evid = self.initial_event.is_event_id {
-            if ev.id == evid {
-                // this should trigger a resubscribe...
-                set_active_event(ev, privkey: privkey)
-            }
-        }
-        
-    }
-    
-    func handle_channel_meta(_ ev: NostrEvent) {
-        guard let meta: ChatroomMetadata = decode_json(ev.content) else {
-            return
-        }
-        
-        notify(.chatroom_meta, meta)
+        event_map.insert(ev)
+        objectWillChange.send()
    }
    
    func handle_event(relay_id: String, ev: NostrConnectionEvent) {
        
        let (sub_id, done) = handle_subid_event(pool: damus_state.pool, relay_id: relay_id, ev: ev) { sid, ev in
-            guard sid == base_subid || sid == profiles_subid else {
+            guard subids.contains(sid) else {
                return
            }
            
@@ -193,21 +131,19 @@ class ThreadModel: ObservableObject {
                process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
            } else if ev.is_textlike {
                self.add_event(ev, privkey: self.damus_state.keypair.privkey)
-            } else if ev.known_kind == .channel_meta || ev.known_kind == .channel_create {
-                handle_channel_meta(ev)
            }
        }
        
-        guard done && (sub_id == base_subid || sub_id == profiles_subid) else {
+        guard done, let sub_id, subids.contains(sub_id) else {
            return
        }
        
-        if (events.contains { ev in ev.id == initial_event.id }) {
+        if event_map.contains(event) {
            loading = false
        }
        
        if sub_id == self.base_subid {
-            load_profiles(profiles_subid: self.profiles_subid, relay_id: relay_id, events: events, damus_state: damus_state)
+            load_profiles(profiles_subid: self.profiles_subid, relay_id: relay_id, load: .from_events(Array(event_map)), damus_state: damus_state)
        }
    }

@@ -23,7 +23,7 @@ enum TranslationService: String, CaseIterable, Identifiable {
    var model: Model {
        switch self {
        case .none:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("None", comment: "Dropdown option for selecting no translation service."))
+            return .init(tag: self.rawValue, displayName: NSLocalizedString("none_translation_service", value: "None", comment: "Dropdown option for selecting no translation service."))
        case .libretranslate:
            return .init(tag: self.rawValue, displayName: NSLocalizedString("LibreTranslate (Open Source)", comment: "Dropdown option for selecting LibreTranslate as the translation service."))
        case .deepl:
@@ -7,6 +7,7 @@

 import Foundation
 import Vault
+import UIKit

 func should_show_wallet_selector(_ pubkey: String) -> Bool {
    return UserDefaults.standard.object(forKey: "show_wallet_selector") as? Bool ?? true
@@ -34,6 +35,10 @@ func get_default_zap_amount(pubkey: String) -> Int? {
    return amt
 }

+func should_disable_image_animation() -> Bool {
+    return (UserDefaults.standard.object(forKey: "disable_animation") as? Bool)
+            ?? UIAccessibility.isReduceMotionEnabled
+ }

 func get_default_wallet(_ pubkey: String) -> Wallet {
    if let defaultWalletName = UserDefaults.standard.string(forKey: "default_wallet"),
@@ -45,6 +50,15 @@ func get_default_wallet(_ pubkey: String) -> Wallet {
    }
 }

+func get_image_uploader(_ pubkey: String) -> ImageUploader {
+    if let defaultImageUploader = UserDefaults.standard.string(forKey: "default_image_uploader"),
+       let defaultImageUploader = ImageUploader(rawValue: defaultImageUploader) {
+        return defaultImageUploader
+    } else {
+        return .nostrBuild
+    }
+}
+
 private func get_translation_service(_ pubkey: String) -> TranslationService? {
    guard let translation_service = UserDefaults.standard.string(forKey: "translation_service") else {
        return nil
@@ -83,6 +97,12 @@ class UserSettingsStore: ObservableObject {
            UserDefaults.standard.set(default_wallet.rawValue, forKey: "default_wallet")
        }
    }
+
+    @Published var default_image_uploader: ImageUploader {
+        didSet {
+            UserDefaults.standard.set(default_image_uploader.rawValue, forKey: "default_image_uploader")
+        }
+    }
    
    @Published var show_wallet_selector: Bool {
        didSet {
@@ -95,6 +115,30 @@ class UserSettingsStore: ObservableObject {
            UserDefaults.standard.set(left_handed, forKey: "left_handed")
        }
    }
+    
+    @Published var always_show_images: Bool {
+        didSet {
+            UserDefaults.standard.set(always_show_images, forKey: "always_show_images")
+        }
+    }
+
+    @Published var zap_vibration: Bool {
+        didSet {
+            UserDefaults.standard.set(zap_vibration, forKey: "zap_vibration")
+        }
+    }
+
+    @Published var auto_translate: Bool {
+        didSet {
+            UserDefaults.standard.set(auto_translate, forKey: "auto_translate")
+        }
+    }
+
+    @Published var show_only_preferred_languages: Bool {
+        didSet {
+            UserDefaults.standard.set(show_only_preferred_languages, forKey: "show_only_preferred_languages")
+        }
+    }

    @Published var translation_service: TranslationService {
        didSet {
@@ -159,14 +203,27 @@ class UserSettingsStore: ObservableObject {
            }
        }
    }
+    
+    @Published var disable_animation: Bool {
+        didSet {
+            UserDefaults.standard.set(disable_animation, forKey: "disable_animation")
+        }
+     }

    init() {
        // TODO: pubkey-scoped settings
        let pubkey = ""
        self.default_wallet = get_default_wallet(pubkey)
        show_wallet_selector = should_show_wallet_selector(pubkey)
+        always_show_images = UserDefaults.standard.object(forKey: "always_show_images") as? Bool ?? false
+
+        default_image_uploader = get_image_uploader(pubkey)

        left_handed = UserDefaults.standard.object(forKey: "left_handed") as? Bool ?? false
+        zap_vibration = UserDefaults.standard.object(forKey: "zap_vibration") as? Bool ?? false
+        disable_animation = should_disable_image_animation()
+        auto_translate = UserDefaults.standard.object(forKey: "auto_translate") as? Bool ?? false
+        show_only_preferred_languages = UserDefaults.standard.object(forKey: "show_only_preferred_languages") as? Bool ?? false

        // Note from @tyiu:
        // Default translation service is disabled by default for now until we gain some confidence that it is working well in production.
@@ -13,6 +13,7 @@ class ZapsModel: ObservableObject {
    var zaps: [Zap]
    
    let zaps_subid = UUID().description
+    let profiles_subid = UUID().description
    
    init(state: DamusState, target: ZapTarget) {
        self.state = state
@@ -44,34 +45,39 @@ class ZapsModel: ObservableObject {
            return
        }
        
-        guard case .event(_, let ev) = resp else {
-            return
-        }
-        
-        guard ev.kind == 9735 else {
-            return
-        }
-        
-        if let zap = state.zaps.zaps[ev.id] {
-            if insert_uniq_sorted_zap(zaps: &zaps, new_zap: zap) {
-                objectWillChange.send()
-            }
-        } else {
-            guard let zapper = state.profiles.lookup_zapper(pubkey: target.pubkey) else {
+        switch resp {
+        case .notice:
+            break
+        case .eose:
+            let events = self.zaps.map { $0.request.ev }
+            load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, load: .from_events(events), damus_state: state)
+        case .event(_, let ev):
+            guard ev.kind == 9735 else {
                return
            }
            
-            guard let zap = Zap.from_zap_event(zap_ev: ev, zapper: zapper) else {
-                return
-            }
-            
-            state.zaps.add_zap(zap: zap)
-            
-            if insert_uniq_sorted_zap(zaps: &zaps, new_zap: zap) {
-                objectWillChange.send()
+            if let zap = state.zaps.zaps[ev.id] {
+                if insert_uniq_sorted_zap_by_amount(zaps: &zaps, new_zap: zap) {
+                    objectWillChange.send()
+                }
+            } else {
+                guard let zapper = state.profiles.lookup_zapper(pubkey: target.pubkey) else {
+                    return
+                }
+                
+                guard let zap = Zap.from_zap_event(zap_ev: ev, zapper: zapper, our_privkey: state.keypair.privkey) else {
+                    return
+                }
+                
+                state.zaps.add_zap(zap: zap)
+                
+                if insert_uniq_sorted_zap_by_amount(zaps: &zaps, new_zap: zap) {
+                    objectWillChange.send()
+                }
            }
        }
        
        
+        
    }
 }
@@ -140,9 +140,8 @@ struct Profile: Codable {
        try container.encode(value)
    }
    
-    static func displayName(profile: Profile?, pubkey: String) -> String {
-        let pk = bech32_nopre_pubkey(pubkey) ?? pubkey
-        return profile?.name ?? abbrev_pubkey(pk)
+    static func displayName(profile: Profile?, pubkey: String) -> DisplayName {
+        return parse_display_name(profile: profile, pubkey: pubkey)
    }
 }

@@ -10,6 +10,7 @@ import CommonCrypto
 import secp256k1
 import secp256k1_implementation
 import CryptoKit
+import NaturalLanguage



@@ -157,7 +158,7 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
            pubkey = refkey.ref_id
        }

-        let dec = decrypt_dm(key, pubkey: pubkey, content: self.content)
+        let dec = decrypt_dm(key, pubkey: pubkey, content: self.content, encoding: .base64)
        self.decrypted_content = dec

        return dec
@@ -168,6 +169,9 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
            return decrypted(privkey: privkey) ?? "*failed to decrypt content*"
        }
        
+        return content
+        
+        /*
        switch validity {
        case .ok:
            return content
@@ -176,6 +180,7 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
        case .bad_sig:
            return content + "\n\n*WARNING: invalid signature, could be forged!*"
        }
+         */
    }

    var description: String {
@@ -211,6 +216,16 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
            }
        }
    }
+    
+    public func thread_id(privkey: String?) -> String {
+        for ref in event_refs(privkey) {
+            if let thread_id = ref.is_thread_id {
+                return thread_id.ref_id
+            }
+        }
+        
+        return self.id
+    }

    public func last_refid() -> ReferencedId? {
        var mlast: Int? = nil
@@ -245,6 +260,25 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
        return event_is_reply(self, privkey: privkey)
    }

+    func note_language(_ privkey: String?) -> String? {
+        // Rely on Apple's NLLanguageRecognizer to tell us which language it thinks the note is in
+        // and filter on only the text portions of the content as URLs and hashtags confuse the language recognizer.
+        let originalBlocks = blocks(privkey)
+        let originalOnlyText = originalBlocks.compactMap { $0.is_text }.joined(separator: " ")
+
+        // Only accept language recognition hypothesis if there's at least a 50% probability that it's accurate.
+        let languageRecognizer = NLLanguageRecognizer()
+        languageRecognizer.processString(originalOnlyText)
+
+        guard let locale = languageRecognizer.languageHypotheses(withMaximum: 1).first(where: { $0.value >= 0.5 })?.key.rawValue else {
+            return nil
+        }
+
+        // Remove the variant component and just take the language part as translation services typically only supports the variant-less language.
+        // Moreover, speakers of one variant can generally understand other variants.
+        return localeToLanguage(locale)
+    }
+
    public var referenced_ids: [ReferencedId] {
        return get_referenced_ids(key: "e")
    }
@@ -278,21 +312,7 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
        return (self.flags & 1) != 0
    }

-    init(content: String, pubkey: String, kind: Int = 1, tags: [[String]] = [], createdAt: Int64 = Int64(Date().timeIntervalSince1970)) {
-        self.id = ""
-        self.sig = ""
-
-        self.content = content
-        self.pubkey = pubkey
-        self.kind = kind
-        self.tags = tags
-        self.created_at = createdAt
-    }
-    
-    /// Intiialization statement used to specificy ID
-    ///
-    /// This is mainly used for contant and testing data
-    init(id: String, content: String, pubkey: String, kind: Int = 1, tags: [[String]] = []) {
+    init(id: String = "", content: String, pubkey: String, kind: Int = 1, tags: [[String]] = [], createdAt: Int64 = Int64(Date().timeIntervalSince1970)) {
        self.id = id
        self.sig = ""

@@ -300,7 +320,7 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
        self.pubkey = pubkey
        self.kind = kind
        self.tags = tags
-        self.created_at = Int64(Date().timeIntervalSince1970)
+        self.created_at = createdAt
    }

    init(from: NostrEvent, content: String? = nil) {
@@ -587,14 +607,115 @@ func zap_target_to_tags(_ target: ZapTarget) -> [[String]] {
    }
 }

-func make_zap_request_event(pubkey: String, privkey: String, content: String, relays: [RelayDescriptor], target: ZapTarget) -> NostrEvent {
+func make_private_zap_request_event(identity: FullKeypair, enc_key: FullKeypair, target: ZapTarget, message: String) -> String? {
+    // target tags must be the same as zap request target tags
+    let tags = zap_target_to_tags(target)
+    
+    let note = NostrEvent(content: message, pubkey: identity.pubkey, kind: 9733, tags: tags)
+    note.id = calculate_event_id(ev: note)
+    note.sig = sign_event(privkey: identity.privkey, ev: note)
+    
+    guard let note_json = encode_json(note) else {
+        return nil
+    }
+    return encrypt_message(message: note_json, privkey: enc_key.privkey, to_pk: target.pubkey, encoding: .bech32)
+}
+
+func decrypt_private_zap(our_privkey: String, zapreq: NostrEvent, target: ZapTarget) -> NostrEvent? {
+    guard let anon_tag = zapreq.tags.first(where: { t in t.count >= 2 && t[0] == "anon" }) else {
+        return nil
+    }
+    
+    let enc_note = anon_tag[1]
+    
+    var note = decrypt_note(our_privkey: our_privkey, their_pubkey: zapreq.pubkey, enc_note: enc_note, encoding: .bech32)
+    
+    // check to see if the private note was from us
+    if note == nil {
+        guard let our_private_keypair = generate_private_keypair(our_privkey: our_privkey, id: target.id, created_at: zapreq.created_at) else{
+            return nil
+        }
+        // use our private keypair and their pubkey to get the shared secret
+        note = decrypt_note(our_privkey: our_private_keypair.privkey, their_pubkey: target.pubkey, enc_note: enc_note, encoding: .bech32)
+    }
+    
+    guard let note else {
+        return nil
+    }
+        
+    guard note.kind == 9733 else {
+        return nil
+    }
+    
+    let zr_etag = zapreq.referenced_ids.first
+    let note_etag = note.referenced_ids.first
+    
+    guard zr_etag == note_etag else {
+        return nil
+    }
+    
+    let zr_ptag = zapreq.referenced_pubkeys.first
+    let note_ptag = note.referenced_pubkeys.first
+    
+    guard let zr_ptag, let note_ptag, zr_ptag == note_ptag else {
+        return nil
+    }
+    
+    guard validate_event(ev: note) == .ok else {
+        return nil
+    }
+    
+    return note
+}
+
+func generate_private_keypair(our_privkey: String, id: String, created_at: Int64) -> FullKeypair? {
+    let to_hash = our_privkey + id + String(created_at)
+    guard let dat = to_hash.data(using: .utf8) else {
+        return nil
+    }
+    let privkey_bytes = sha256(dat)
+    let privkey = hex_encode(privkey_bytes)
+    guard let pubkey = privkey_to_pubkey(privkey: privkey) else {
+        return nil
+    }
+    
+    return FullKeypair(pubkey: pubkey, privkey: privkey)
+}
+
+func make_zap_request_event(keypair: FullKeypair, content: String, relays: [RelayDescriptor], target: ZapTarget, zap_type: ZapType) -> NostrEvent? {
    var tags = zap_target_to_tags(target)
    var relay_tag = ["relays"]
    relay_tag.append(contentsOf: relays.map { $0.url.absoluteString })
    tags.append(relay_tag)
-    let ev = NostrEvent(content: content, pubkey: pubkey, kind: 9734, tags: tags)
+    
+    var kp = keypair
+    
+    let now = Int64(Date().timeIntervalSince1970)
+    
+    var message = content
+    switch zap_type {
+    case .pub:
+        break
+    case .non_zap:
+        break
+    case .anon:
+        tags.append(["anon"])
+        kp = generate_new_keypair().to_full()!
+    case .priv:
+        guard let priv_kp = generate_private_keypair(our_privkey: keypair.privkey, id: target.id, created_at: now) else {
+            return nil
+        }
+        kp = priv_kp
+        guard let privreq = make_private_zap_request_event(identity: keypair, enc_key: kp, target: target, message: message) else {
+            return nil
+        }
+        tags.append(["anon", privreq])
+        message = ""
+    }
+    
+    let ev = NostrEvent(content: message, pubkey: kp.pubkey, kind: 9734, tags: tags, createdAt: now)
    ev.id = calculate_event_id(ev: ev)
-    ev.sig = sign_event(privkey: privkey, ev: ev)
+    ev.sig = sign_event(privkey: kp.privkey, ev: ev)
    return ev
 }

@@ -624,14 +745,14 @@ func event_to_json(ev: NostrEvent) -> String {
    return str
 }

-func decrypt_dm(_ privkey: String?, pubkey: String, content: String) -> String? {
+func decrypt_dm(_ privkey: String?, pubkey: String, content: String, encoding: EncEncoding) -> String? {
    guard let privkey = privkey else {
        return nil
    }
    guard let shared_sec = get_shared_secret(privkey: privkey, pubkey: pubkey) else {
        return nil
    }
-    guard let dat = decode_dm_base64(content) else {
+    guard let dat = (encoding == .base64 ? decode_dm_base64(content) : decode_dm_bech32(content)) else {
        return nil
    }
    guard let dat = aes_decrypt(data: dat.content, iv: dat.iv, shared_sec: shared_sec) else {
@@ -640,6 +761,13 @@ func decrypt_dm(_ privkey: String?, pubkey: String, content: String) -> String?
    return String(data: dat, encoding: .utf8)
 }

+func decrypt_note(our_privkey: String, their_pubkey: String, enc_note: String, encoding: EncEncoding) -> NostrEvent? {
+    guard let dec = decrypt_dm(our_privkey, pubkey: their_pubkey, content: enc_note, encoding: encoding) else {
+        return nil
+    }
+    
+    return decode_nostr_event_json(json: dec)
+}

 func get_shared_secret(privkey: String, pubkey: String) -> [UInt8]? {
    guard let privkey_bytes = try? privkey.bytes else {
@@ -685,6 +813,39 @@ struct DirectMessageBase64 {
    let iv: [UInt8]
 }

+
+
+func encode_dm_bech32(content: [UInt8], iv: [UInt8]) -> String {
+    let content_bech32 = bech32_encode(hrp: "pzap", content)
+    let iv_bech32 = bech32_encode(hrp: "iv", iv)
+    return content_bech32 + "_" + iv_bech32
+}
+
+func decode_dm_bech32(_ all: String) -> DirectMessageBase64? {
+    let parts = all.split(separator: "_")
+    guard parts.count == 2 else {
+        return nil
+    }
+    
+    let content_bech32 = String(parts[0])
+    let iv_bech32 = String(parts[1])
+    
+    guard let content_tup = try? bech32_decode(content_bech32) else {
+        return nil
+    }
+    guard let iv_tup = try? bech32_decode(iv_bech32) else {
+        return nil
+    }
+    guard content_tup.hrp == "pzap" else {
+        return nil
+    }
+    guard iv_tup.hrp == "iv" else {
+        return nil
+    }
+    
+    return DirectMessageBase64(content: content_tup.data.bytes, iv: iv_tup.data.bytes)
+}
+
 func encode_dm_base64(content: [UInt8], iv: [UInt8]) -> String {
    let content_b64 = base64_encode(content)
    let iv_b64 = base64_encode(iv)
@@ -849,7 +1010,7 @@ func first_eref_mention(ev: NostrEvent, privkey: String?) -> Mention? {
 extension [ReferencedId] {
    var pRefs: [ReferencedId] {
        get {
-            self.filter { ref in
+            Set(self).filter { ref in
                ref.key == "p"
            }
        }
@@ -37,13 +37,17 @@ struct NostrFilter: Codable, Equatable {
    }
    
    public static func filter_hashtag(_ htags: [String]) -> NostrFilter {
-        return NostrFilter(ids: nil, kinds: nil, referenced_ids: nil, pubkeys: nil, since: nil, until: nil, authors: nil, hashtag: htags)
+        return NostrFilter(ids: nil, kinds: nil, referenced_ids: nil, pubkeys: nil, since: nil, until: nil, authors: nil, hashtag: htags.map { $0.lowercased() })
    }

    public static var filter_text: NostrFilter {
        return filter_kinds([1])
    }
-
+    
+    public static func filter_ids(_ ids: [String]) -> NostrFilter {
+        return NostrFilter(ids: ids, kinds: nil, referenced_ids: nil, pubkeys: nil, since: nil, until: nil, authors: nil, hashtag: nil)
+    }
+    
    public static var filter_profiles: NostrFilter {
        return filter_kinds([0])
    }
@@ -21,4 +21,5 @@ enum NostrKind: Int {
    case chat = 42
    case list = 30000
    case zap = 9735
+    case zap_request = 9734
 }
@@ -127,6 +127,9 @@ func decode_nostr_uri(_ s: String) -> NostrLink? {
    var uri = s.replacingOccurrences(of: "nostr://", with: "")
    uri = uri.replacingOccurrences(of: "nostr:", with: "")
    
+    uri = uri.replacingOccurrences(of: "damus://", with: "")
+    uri = uri.replacingOccurrences(of: "damus:", with: "")
+    
    let parts = uri.split(separator: ":")
        .reduce(into: Array<String>()) { acc, str in
            guard let decoded = str.removingPercentEncoding else {
@@ -137,7 +140,7 @@ func decode_nostr_uri(_ s: String) -> NostrLink? {
        }
    
    if tag_is_hashtag(parts) {
-        return .filter(NostrFilter.filter_hashtag([parts[1].lowercased()]))
+        return .filter(NostrFilter.filter_hashtag([parts[1]]))
    }
    
    if let rid = tag_to_refid(parts) {
@@ -72,7 +72,7 @@ func char_to_hex(_ c: UInt8) -> UInt8?
    return nil;
 }

-
+@discardableResult
 func hex_decode(_ str: String) -> [UInt8]?
 {
    if str.count == 0 {
@@ -13,42 +13,41 @@ enum NostrConnectionEvent {
    case nostr_event(NostrResponse)
 }

-class RelayConnection: WebSocketDelegate {
-    var isConnected: Bool = false
-    var isConnecting: Bool = false
-    var isReconnecting: Bool = false
-    var last_connection_attempt: Double = 0
-    var socket: WebSocket
-    var handleEvent: (NostrConnectionEvent) -> ()
-    let url: URL
+final class RelayConnection: WebSocketDelegate {
+    private(set) var isConnected = false
+    private(set) var isConnecting = false
+    private(set) var isReconnecting = false
+    
+    private(set) var last_connection_attempt: TimeInterval = 0
+    private lazy var socket = {
+        let req = URLRequest(url: url)
+        let socket = WebSocket(request: req, compressionHandler: .none)
+        socket.delegate = self
+        return socket
+    }()
+    private var handleEvent: (NostrConnectionEvent) -> ()
+    private let url: URL

    init(url: URL, handleEvent: @escaping (NostrConnectionEvent) -> ()) {
        self.url = url
        self.handleEvent = handleEvent
-        // just init, we don't actually use this one
-        self.socket = make_websocket(url: url)
    }
    
    func reconnect() {
-        if self.isConnected {
-            self.isReconnecting = true
-            self.disconnect()
+        if isConnected {
+            isReconnecting = true
+            disconnect()
        } else {
            // we're already disconnected, so just connect
-            self.connect(force: true)
+            connect(force: true)
        }
    }
    
-    func connect(force: Bool = false){
-        if !force && (self.isConnected || self.isConnecting) {
+    func connect(force: Bool = false) {
+        if !force && (isConnected || isConnecting) {
            return
        }
-
-        var req = URLRequest(url: self.url)
-        req.timeoutInterval = 5
-        socket = make_websocket(url: url)
-        socket.delegate = self
-
+        
        isConnecting = true
        last_connection_attempt = Date().timeIntervalSince1970
        socket.connect()
@@ -68,7 +67,9 @@ class RelayConnection: WebSocketDelegate {

        socket.write(string: req)
    }
-
+    
+    // MARK: - WebSocketDelegate
+    
    func didReceive(event: WebSocketEvent, client: WebSocket) {
        switch event {
        case .connected:
@@ -83,15 +84,25 @@ class RelayConnection: WebSocketDelegate {
                self.connect()
            }

-        case .cancelled: fallthrough
-        case .error:
+        case .cancelled, .error:
            self.isConnecting = false
            self.isConnected = false

        case .text(let txt):
-            if let ev = decode_nostr_event(txt: txt) {
-                handleEvent(.nostr_event(ev))
-                return
+            if txt.count > 2000 {
+                DispatchQueue.global(qos: .default).async {
+                    if let ev = decode_nostr_event(txt: txt) {
+                        DispatchQueue.main.async {
+                            self.handleEvent(.nostr_event(ev))
+                        }
+                        return
+                    }
+                }
+            } else {
+                if let ev = decode_nostr_event(txt: txt) {
+                    handleEvent(.nostr_event(ev))
+                    return
+                }
            }

            print("decode failed for \(txt)")
@@ -103,7 +114,6 @@ class RelayConnection: WebSocketDelegate {

        handleEvent(.ws_event(event))
    }
-
 }

 func make_nostr_req(_ req: NostrRequest) -> String? {
@@ -127,7 +137,7 @@ func make_nostr_push_event(ev: NostrEvent) -> String? {
 }

 func make_nostr_unsubscribe_req(_ sub_id: String) -> String? {
-    return "[\"CLOSE\",\"\(sub_id)\"]"
+    "[\"CLOSE\",\"\(sub_id)\"]"
 }

 func make_nostr_subscription_req(_ filters: [NostrFilter], sub_id: String) -> String? {
@@ -144,10 +154,3 @@ func make_nostr_subscription_req(_ filters: [NostrFilter], sub_id: String) -> St
    req += "]"
    return req
 }
-
-func make_websocket(url: URL) -> WebSocket {
-    let req = URLRequest(url: url)
-    //req.setValue("chat,superchat", forHTTPHeaderField: "Sec-WebSocket-Protocol")
-    return WebSocket(request: req, compressionHandler: .none)
-}
-
@@ -195,27 +195,13 @@ class RelayPool {
            relay.connection.send(req)
        }
    }
-
+    
    func get_relays(_ ids: [String]) -> [Relay] {
-        var relays: [Relay] = []
-
-        for id in ids {
-            if let relay = get_relay(id) {
-                relays.append(relay)
-            }
-        }
-
-        return relays
+        relays.filter { ids.contains($0.id) }
    }
-
+    
    func get_relay(_ id: String) -> Relay? {
-        for relay in relays {
-            if relay.id == id {
-                return relay
-            }
-        }
-
-        return nil
+        relays.first(where: { $0.id == id })
    }
    
    func record_last_pong(relay_id: String, event: NostrConnectionEvent) {
@@ -143,6 +143,7 @@ func eightToFiveBits(_ input: [UInt8]) -> [UInt8] {
 }
    
    /// Decode Bech32 string
+@discardableResult
 public func bech32_decode(_ str: String) throws -> (hrp: String, data: Data)? {
    guard let strBytes = str.data(using: .utf8) else {
        throw Bech32Error.nonUTF8String
@@ -0,0 +1,27 @@
+//
+//  Debouncer.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-15.
+//
+
+import Foundation
+
+class Debouncer {
+    private let queue = DispatchQueue.main
+    private var workItem: DispatchWorkItem?
+    private var interval: TimeInterval
+
+    init(interval: TimeInterval) {
+        self.interval = interval
+    }
+
+    func debounce(action: @escaping () -> Void) {
+        // Cancel the previous work item if it hasn't yet executed
+        workItem?.cancel()
+
+        // Create a new work item with a delay
+        workItem = DispatchWorkItem { action() }
+        queue.asyncAfter(deadline: .now() + interval, execute: workItem!)
+    }
+}
@@ -0,0 +1,66 @@
+//
+//  DisplayName.swift
+//  damus
+//
+//  Created by William Casarin on 2023-03-14.
+//
+
+import Foundation
+
+
+struct BothNames {
+    let username: String
+    let display_name: String
+}
+
+enum DisplayName {
+    case both(BothNames)
+    case one(String)
+    
+    var display_name: String {
+        switch self {
+        case .one(let one):
+            return one
+        case .both(let b):
+            return b.display_name
+        }
+    }
+    
+    var username: String {
+        switch self {
+        case .one(let one):
+            return one
+        case .both(let b):
+            return b.username
+        }
+    }
+}
+
+
+func parse_display_name(profile: Profile?, pubkey: String) -> DisplayName {
+    if pubkey == "anon" {
+        return .one("Anonymous")
+    }
+    
+    guard let profile else {
+        return .one(abbrev_bech32_pubkey(pubkey: pubkey))
+    }
+    
+    let name = profile.name?.isEmpty == false ? profile.name : nil
+    let disp_name = profile.display_name?.isEmpty == false ? profile.display_name : nil
+    
+    if let name, let disp_name, name != disp_name {
+        return .both(BothNames(username: name, display_name: disp_name))
+    }
+    
+    if let one = name ?? disp_name {
+        return .one(one)
+    }
+    
+    return .one(abbrev_bech32_pubkey(pubkey: pubkey))
+}
+
+func abbrev_bech32_pubkey(pubkey: String) -> String {
+    let pk = bech32_nopre_pubkey(pubkey) ?? pubkey
+    return abbrev_pubkey(pk)
+}
@@ -0,0 +1,92 @@
+//
+//  EventCache.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-21.
+//
+
+import Combine
+import Foundation
+import UIKit
+
+class EventCache {
+    private var events: [String: NostrEvent] = [:]
+    private var replies = ReplyMap()
+    private var cancellable: AnyCancellable?
+    
+    //private var thread_latest: [String: Int64]
+    
+    init() {
+        cancellable = NotificationCenter.default.publisher(
+            for: UIApplication.didReceiveMemoryWarningNotification
+        ).sink { [weak self] _ in
+            self?.prune()
+        }
+    }
+    
+    func parent_events(event: NostrEvent) -> [NostrEvent] {
+        var parents: [NostrEvent] = []
+        
+        var ev = event
+        
+        while true {
+            guard let direct_reply = ev.direct_replies(nil).first else {
+                break
+            }
+            
+            guard let next_ev = lookup(direct_reply.ref_id), next_ev != ev else {
+                break
+            }
+            
+            parents.append(next_ev)
+            ev = next_ev
+        }
+        
+        return parents.reversed()
+    }
+    
+    func add_replies(ev: NostrEvent) {
+        for reply in ev.direct_replies(nil) {
+            replies.add(id: reply.ref_id, reply_id: ev.id)
+        }
+    }
+    
+    func child_events(event: NostrEvent) -> [NostrEvent] {
+        guard let xs = replies.lookup(event.id) else {
+            return []
+        }
+        let evs: [NostrEvent] = xs.reduce(into: [], { evs, evid in
+            guard let ev = self.lookup(evid) else {
+                return
+            }
+            
+            evs.append(ev)
+        }).sorted(by: { $0.created_at < $1.created_at })
+        return evs
+    }
+    
+    func upsert(_ ev: NostrEvent) -> NostrEvent {
+        if let found = lookup(ev.id) {
+            return found
+        }
+        
+        insert(ev)
+        return ev
+    }
+    
+    func lookup(_ evid: String) -> NostrEvent? {
+        return events[evid]
+    }
+    
+    func insert(_ ev: NostrEvent) {
+        guard events[ev.id] == nil else {
+            return
+        }
+        events[ev.id] = ev
+    }
+    
+    private func prune() {
+        events = [:]
+        replies.replies = [:]
+    }
+}
@@ -0,0 +1,103 @@
+//
+//  EventHolder.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-19.
+//
+
+import Foundation
+
+/// Used for holding back events until they're ready to be displayed
+class EventHolder: ObservableObject, ScrollQueue {
+    private var has_event: Set<String>
+    @Published var events: [NostrEvent]
+    @Published var incoming: [NostrEvent]
+    var should_queue: Bool
+    
+    func set_should_queue(_ val: Bool) {
+        self.should_queue = val
+    }
+    
+    var queued: Int {
+        return incoming.count
+    }
+    
+    var has_incoming: Bool {
+        return queued > 0
+    }
+    
+    var all_events: [NostrEvent] {
+        events + incoming
+    }
+    
+    init() {
+        self.should_queue = false
+        self.events = []
+        self.incoming = []
+        self.has_event = Set()
+    }
+    
+    init(events: [NostrEvent], incoming: [NostrEvent]) {
+        self.should_queue = false
+        self.events = events
+        self.incoming = incoming
+        self.has_event = Set()
+    }
+    
+    func filter(_ isIncluded: (NostrEvent) -> Bool) {
+        self.events = self.events.filter(isIncluded)
+        self.incoming = self.incoming.filter(isIncluded)
+    }
+    
+    func insert(_ ev: NostrEvent) -> Bool {
+        if should_queue {
+            return insert_queued(ev)
+        } else {
+            return insert_immediate(ev)
+        }
+    }
+    
+    private func insert_immediate(_ ev: NostrEvent) -> Bool {
+        if has_event.contains(ev.id) {
+            return false
+        }
+        
+        has_event.insert(ev.id)
+        
+        if insert_uniq_sorted_event_created(events: &self.events, new_ev: ev) {
+            return true
+        }
+        
+        return false
+    }
+    
+    private func insert_queued(_ ev: NostrEvent) -> Bool {
+        if has_event.contains(ev.id) {
+            return false
+        }
+        
+        has_event.insert(ev.id)
+        
+        incoming.append(ev)
+        return true
+    }
+    
+    func flush() {
+        guard !incoming.isEmpty else {
+            return
+        }
+        
+        var changed = false
+        for event in incoming {
+            if insert_uniq_sorted_event_created(events: &events, new_ev: event) {
+                changed = true
+            }
+        }
+        
+        if changed {
+            self.objectWillChange.send()
+        }
+        
+        self.incoming = []
+    }
+}
@@ -0,0 +1,49 @@
+//
+//  Binding+.swift
+//  damus
+//
+//  Created by Oleg Abalonski on 3/5/23.
+//  Ref: https://josephduffy.co.uk/posts/mapping-optional-binding-to-bool
+
+import os.log
+import SwiftUI
+
+extension Binding where Value == Bool {
+    /// Creates a binding by mapping an optional value to a `Bool` that is
+    /// `true` when the value is non-`nil` and `false` when the value is `nil`.
+    ///
+    /// When the value of the produced binding is set to `false` the value
+    /// of `bindingToOptional`'s `wrappedValue` is set to `nil`.
+    ///
+    /// Setting the value of the produce binding to `true` does nothing and
+    /// will log an error.
+    ///
+    /// - parameter bindingToOptional: A `Binding` to an optional value, used to calculate the `wrappedValue`.
+    public init<Wrapped>(mappedTo bindingToOptional: Binding<Wrapped?>) {
+        self.init(
+            get: { bindingToOptional.wrappedValue != nil },
+            set: { newValue in
+                if !newValue {
+                    bindingToOptional.wrappedValue = nil
+                } else {
+                    os_log(
+                        .error,
+                        "Optional binding mapped to optional has been set to `true`, which will have no effect. Current value: %@",
+                        String(describing: bindingToOptional.wrappedValue)
+                    )
+                }
+            }
+        )
+    }
+}
+
+extension Binding {
+    /// Returns a binding by mapping this binding's value to a `Bool` that is
+    /// `true` when the value is non-`nil` and `false` when the value is `nil`.
+    ///
+    /// When the value of the produced binding is set to `false` this binding's value
+    /// is set to `nil`.
+    public func mappedToBool<Wrapped>() -> Binding<Bool> where Value == Wrapped? {
+        return Binding<Bool>(mappedTo: self)
+    }
+}
@@ -0,0 +1,147 @@
+//
+//  KFOptionSetter+.swift
+//  damus
+//
+//  Created by Oleg Abalonski on 2/15/23.
+//
+
+import UIKit
+import Kingfisher
+
+extension KFOptionSetter {
+    
+    func imageContext(_ imageContext: ImageContext) -> Self {
+        options.callbackQueue = .dispatch(.global(qos: .background))
+        options.processingQueue = .dispatch(.global(qos: .background))
+        options.downloader = CustomImageDownloader.shared
+        options.processor = CustomImageProcessor(
+            maxSize: imageContext.maxMebibyteSize(),
+            downsampleSize: imageContext.downsampleSize()
+        )
+        options.cacheSerializer = CustomCacheSerializer(
+            maxSize: imageContext.maxMebibyteSize(),
+            downsampleSize: imageContext.downsampleSize()
+        )
+        options.backgroundDecode = true
+        options.cacheOriginalImage = true
+        options.scaleFactor = UIScreen.main.scale
+        options.onlyLoadFirstFrame = should_disable_image_animation()
+        
+        return self
+    }
+    
+    func onFailure(fallbackUrl: URL?, cacheKey: String?) -> Self {
+        guard let url = fallbackUrl, let key = cacheKey else { return self }
+        let imageResource = ImageResource(downloadURL: url, cacheKey: key)
+        let source = imageResource.convertToSource()
+        options.alternativeSources = [source]
+        
+        return self
+    }
+}
+
+let MAX_FILE_SIZE = 20_971_520 // 20MiB
+
+enum ImageContext {
+    case pfp
+    case banner
+    case note
+    
+    func maxMebibyteSize() -> Int {
+        switch self {
+        case .pfp:
+            return 5_242_880 // 5Mib
+        case .banner, .note:
+            return 20_971_520 // 20MiB
+        }
+    }
+    
+    func downsampleSize() -> CGSize {
+        switch self {
+        case .pfp:
+            return CGSize(width: 200, height: 200)
+        case .banner:
+            return CGSize(width: 750, height: 250)
+        case .note:
+            return CGSize(width: 500, height: 500)
+        }
+    }
+}
+
+struct CustomImageProcessor: ImageProcessor {
+    
+    let maxSize: Int
+    let downsampleSize: CGSize
+    
+    let identifier = "com.damus.customimageprocessor"
+    
+    func process(item: ImageProcessItem, options: KingfisherParsedOptionsInfo) -> KFCrossPlatformImage? {
+        
+        switch item {
+        case .image(_):
+            // This case will never run
+            return DefaultImageProcessor.default.process(item: item, options: options)
+        case .data(let data):
+            
+            // Handle large image size
+            if data.count > maxSize {
+                return KingfisherWrapper.downsampledImage(data: data, to: downsampleSize, scale: options.scaleFactor)
+            }
+            
+            // Handle SVG image
+            if let dataString = String(data: data, encoding: .utf8),
+                let svg = SVG(dataString) {
+                
+                    let render = UIGraphicsImageRenderer(size: svg.size)
+                    let image = render.image { context in
+                        svg.draw(in: context.cgContext)
+                    }
+
+                    return image.kf.scaled(to: options.scaleFactor)
+            }
+            
+            return DefaultImageProcessor.default.process(item: item, options: options)
+        }
+    }
+}
+
+struct CustomCacheSerializer: CacheSerializer {
+    
+    let maxSize: Int
+    let downsampleSize: CGSize
+
+    func data(with image: Kingfisher.KFCrossPlatformImage, original: Data?) -> Data? {
+        return DefaultCacheSerializer.default.data(with: image, original: original)
+    }
+
+    func image(with data: Data, options: Kingfisher.KingfisherParsedOptionsInfo) -> Kingfisher.KFCrossPlatformImage? {
+        if data.count > maxSize {
+            return KingfisherWrapper.downsampledImage(data: data, to: downsampleSize, scale: options.scaleFactor)
+        }
+
+        return DefaultCacheSerializer.default.image(with: data, options: options)
+    }
+}
+
+class CustomSessionDelegate: SessionDelegate {
+    override func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, didReceive response: URLResponse, completionHandler: @escaping (URLSession.ResponseDisposition) -> Void) {
+        let contentLength = response.expectedContentLength
+        
+        // Content-Length header is optional (-1 when missing)
+        if (contentLength != -1 && contentLength > MAX_FILE_SIZE) {
+            return super.urlSession(session, dataTask: dataTask, didReceive: URLResponse(), completionHandler: completionHandler)
+        }
+        
+        super.urlSession(session, dataTask: dataTask, didReceive: response, completionHandler: completionHandler)
+    }
+}
+
+class CustomImageDownloader: ImageDownloader {
+    
+    static let shared = CustomImageDownloader(name: "shared")
+    
+    override init(name: String) {
+        super.init(name: name)
+        sessionDelegate = CustomSessionDelegate()
+    }
+}
@@ -38,7 +38,7 @@ func insert_uniq_by_pubkey(events: inout [NostrEvent], new_ev: NostrEvent, cmp:
    return true
 }

-func insert_uniq_sorted_zap(zaps: inout [Zap], new_zap: Zap) -> Bool {
+func insert_uniq_sorted_zap(zaps: inout [Zap], new_zap: Zap, cmp: (Zap, Zap) -> Bool) -> Bool {
    var i: Int = 0
    
    for zap in zaps {
@@ -47,7 +47,7 @@ func insert_uniq_sorted_zap(zaps: inout [Zap], new_zap: Zap) -> Bool {
            return false
        }
        
-        if new_zap.invoice.amount > zap.invoice.amount {
+        if cmp(new_zap, zap)  {
            zaps.insert(new_zap, at: i)
            return true
        }
@@ -58,6 +58,27 @@ func insert_uniq_sorted_zap(zaps: inout [Zap], new_zap: Zap) -> Bool {
    return true
 }

+@discardableResult
+func insert_uniq_sorted_zap_by_created(zaps: inout [Zap], new_zap: Zap) -> Bool {
+    return insert_uniq_sorted_zap(zaps: &zaps, new_zap: new_zap) { (a, b) in
+        a.event.created_at > b.event.created_at
+    }
+}
+
+@discardableResult
+func insert_uniq_sorted_zap_by_amount(zaps: inout [Zap], new_zap: Zap) -> Bool {
+    return insert_uniq_sorted_zap(zaps: &zaps, new_zap: new_zap) { (a, b) in
+        a.invoice.amount > b.invoice.amount
+    }
+}
+
+func insert_uniq_sorted_event_created(events: inout [NostrEvent], new_ev: NostrEvent) -> Bool {
+    return insert_uniq_sorted_event(events: &events, new_ev: new_ev) {
+        $0.created_at > $1.created_at
+    }
+}
+
+@discardableResult
 func insert_uniq_sorted_event(events: inout [NostrEvent], new_ev: NostrEvent, cmp: (NostrEvent, NostrEvent) -> Bool) -> Bool {
    var i: Int = 0
    
@@ -9,8 +9,10 @@ import Foundation

 struct LNUrlPayRequest: Decodable {
    let allowsNostr: Bool?
+    let commentAllowed: Int?
    let nostrPubkey: String?
    
+    let metadata: String?
    let minSendable: Int64?
    let maxSendable: Int64?
    let status: String?
@@ -10,10 +10,11 @@ import LinkPresentation

 class CustomLinkView: LPLinkView {
    override var intrinsicContentSize: CGSize { CGSize(width: 0, height: super.intrinsicContentSize.height) }
+    
 }

 enum Metadata {
-    case linkmeta(LPLinkMetadata)
+    case linkmeta(CachedMetadata)
    case url(URL)
 }

@@ -26,12 +27,19 @@ struct LinkViewRepresentable: UIViewRepresentable {
    func makeUIView(context: Context) -> CustomLinkView {
        switch meta {
        case .linkmeta(let linkmeta):
-            return CustomLinkView(metadata: linkmeta)
+            return CustomLinkView(metadata: linkmeta.meta)
        case .url(let url):
            return CustomLinkView(url: url)
        }
    }
 
    func updateUIView(_ uiView: CustomLinkView, context: Context) {
+        switch meta {
+        case .linkmeta(let cached):
+            cached.intrinsic_height = uiView.intrinsicContentSize.height
+        case .url:
+            return
+        }
+        
    }
 }
@@ -0,0 +1,34 @@
+//
+//  LocalizationUtil.swift
+//  damus
+//
+//  Created by Terry Yiu on 2/24/23.
+//
+
+import Foundation
+
+func bundleForLocale(locale: Locale?) -> Bundle {
+    if locale == nil {
+        return Bundle.main
+    }
+
+    let path = Bundle.main.path(forResource: locale!.identifier, ofType: "lproj")
+    return path != nil ? (Bundle(path: path!) ?? Bundle.main) : Bundle.main
+}
+
+func localizedStringFormat(key: String, locale: Locale?) -> String {
+    let bundle = bundleForLocale(locale: locale)
+    let fallback = bundleForLocale(locale: Locale(identifier: "en-US")).localizedString(forKey: key, value: nil, table: nil)
+    return bundle.localizedString(forKey: key, value: fallback, table: nil)
+}
+
+/**
+ Removes the variant part of a locale code so that it contains only the language code.
+ */
+func localeToLanguage(_ locale: String) -> String? {
+    if #available(iOS 16, *) {
+        return Locale.LanguageCode(stringLiteral: locale).identifier(.alpha2)
+    } else {
+        return NSLocale(localeIdentifier: locale).languageCode
+    }
+}
@@ -8,8 +8,8 @@
 import Foundation

 public struct Markdown {
-    private let detector = try! NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
-
+    private var detector = try? NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
+    
    /// Ensure the specified URL has a scheme by prepending "https://" if it's absent.
    static func withScheme(_ url: any StringProtocol) -> any StringProtocol {
        return url.contains("://") ? url : "https://" + url
@@ -31,6 +31,9 @@ public struct Markdown {

    /// Process the input text and add markdown for any embedded URLs.
    public func process(_ input: String) -> AttributedString {
+        guard let detector else {
+            return AttributedString(stringLiteral: input)
+        }
        let matches = detector.matches(in: input, options: [], range: NSRange(location: 0, length: input.utf16.count))
        var output = input
        // Start with the last match, because replacing the first would invalidate all subsequent indices
@@ -101,6 +101,9 @@ extension Notification.Name {
    static var update_stats: Notification.Name {
        return Notification.Name("update_stats")
    }
+    static var zapping: Notification.Name {
+        return Notification.Name("zapping")
+    }
 }

 func handle_notify(_ name: Notification.Name) -> NotificationCenter.Publisher {
@@ -0,0 +1,8 @@
+//
+//  PostBox.swift
+//  damus
+//
+//  Created by William Casarin on 2023-03-20.
+//
+
+import Foundation
@@ -8,8 +8,18 @@
 import Foundation
 import LinkPresentation

+class CachedMetadata {
+    let meta: LPLinkMetadata
+    var intrinsic_height: CGFloat?
+    
+    init(meta: LPLinkMetadata) {
+        self.meta = meta
+        self.intrinsic_height = nil
+    }
+}
+
 enum Preview {
-    case value(LinkViewRepresentable)
+    case value(CachedMetadata)
    case failed
 }

@@ -20,12 +30,12 @@ class PreviewCache {
        return previews[evid]
    }
    
-    func store(evid: String, preview: LinkViewRepresentable?)  {
+    func store(evid: String, preview: LPLinkMetadata?)  {
        switch preview {
        case .none:
            previews[evid] = .failed
        case .some(let meta):
-            previews[evid] = .value(meta)
+            previews[evid] = .value(CachedMetadata(meta: meta))
        }
    }
    
--- a/Show More
+++ b/Show More