Add export and import translation scripts

.github/workflows/export-translations.yaml

@@ -1,49 +0,0 @@
-name: Export Source Translations
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  export-source-translations:
-    name: Update translations branch
-    runs-on: macos-12
-    strategy:
-      matrix:
-        include:
-          - xcode: "14.2"
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-      - name: Run export script
-        run: |
-          sh devtools/export-source-translation.sh
-      - name: Push source translations to Transifex
-        uses: transifex/cli-action@v2
-        with:
-          token: ${{ secrets.TX_TOKEN }}
-          args: push --branch ''
-      - name: Remove extraneous /tmp/tx file from running transifex cli that breaks the next pull step
-        run: |
-          rm -rf /tmp/tx
-      - name: Pull translations from Transifex
-        uses: transifex/cli-action@v2
-        with:
-          token: ${{ secrets.TX_TOKEN }}
-          args: pull --branch ''
-      - name: Commit translation changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Update Translations 🤖
-          branch: translations
-          create_branch: true
-          push_options: '--force'
-      - name: Create Pull Request
-        uses: repo-sync/pull-request@v2
-        with:
-          source_branch: "translations"
-          destination_branch: "master"
-          pr_title: "Update Translations 🤖"
-        if: steps.auto-commit-action.outputs.changes_detected == 'true'
-

.tx/config

@@ -1,24 +0,0 @@
-[main]
-host     = https://www.transifex.com
-lang_map = aa_DJ: aa-DJ, af_ZA: af-ZA, am_ET: am-ET, ar_AA: ar-AA, ar_AE: ar-AE, ar_DZ: ar-DZ, ar_EG: ar-EG, ar_IQ: ar-IQ, ar_JO: ar-JO, ar_LB: ar-LB, ar_SA: ar-SA, ar_SD: ar-SD, ar_SY: ar-SY, as_IN: as-IN, ast_ES: ast-ES, az_AZ: az-AZ, az_IR: az-IR, be_BY: be-BY, bem_ZM: bem-ZM, bg_BG: bg-BG, bg_US: bg-US, bn_BD: bn-BD, bn_IN: bn-IN, bo_CN: bo-CN, bqi_IR: bqi-IR, br_FR: br-FR, bs_BA: bs-BA, bs_BA-SRP: bs-BA-SRP, ca_ES: ca-ES, cs_CZ: cs-CZ, cy_GB: cy-GB, da_DK: da-DK, de_AT: de-AT, de_CH: de-CH, de_DE: de-DE, dz_BT: dz-BT, el_CY: el-CY, el_DE: el-DE, el_GR: el-GR, en_AE: en-AE, en_AL: en-AL, en_AT: en-AT, en_AU: en-AU, en_BA: en-BA, en_BA-SRP: en-BA-SRP, en_BD: en-BD, en_BE: en-BE, en_BG: en-BG, en_BH: en-BH, en_BR: en-BR, en_CA: en-CA, en_CH: en-CH, en_CL: en-CL, en_CO: en-CO, en_CY: en-CY, en_CZ: en-CZ, en_DE: en-DE, en_DK: en-DK, en_EC: en-EC, en_EG: en-EG, en_ES: en-ES, en_FI: en-FI, en_FJ: en-FJ, en_FR: en-FR, en_GB: en-GB, en_GH: en-GH, en_GR: en-GR, en_HK: en-HK, en_HR: en-HR, en_HU: en-HU, en_IE: en-IE, en_IN: en-IN, en_IT: en-IT, en_JP: en-JP, en_KR: en-KR, en_KW: en-KW, en_LK: en-LK, en_MX: en-MX, en_MY: en-MY, en_NG: en-NG, en_NL: en-NL, en_NO: en-NO, en_NZ: en-NZ, en_PE: en-PE, en_PG: en-PG, en_PH: en-PH, en_PK: en-PK, en_PL: en-PL, en_PR: en-PR, en_PT: en-PT, en_QA: en-QA, en_RO: en-RO, en_RS: en-RS, en_SA: en-SA, en_SE: en-SE, en_SG: en-SG, en_SI: en-SI, en_SK: en-SK, en_TT: en-TT, en_UG: en-UG, en_ZA: en-ZA, en_ZM: en-ZM, en_ee: en-ee, en_lt: en-lt, en_lv: en-lv, es_419: es-419, es_AR: es-AR, es_BO: es-BO, es_CL: es-CL, es_CO: es-CO, es_CR: es-CR, es_CU: es-CU, es_DO: es-DO, es_EC: es-EC, es_ES: es-ES, es_GT: es-GT, es_HN: es-HN, es_MX: es-MX, es_NI: es-NI, es_PA: es-PA, es_PE: es-PE, es_PR: es-PR, es_PY: es-PY, es_SA: es-SA, es_SV: es-SV, es_US: es-US, es_UY: es-UY, es_VE: es-VE, et_EE: et-EE, eu_ES: eu-ES, fa_AF: fa-AF, fa_IR: fa-IR, ff_SN: ff-SN, fi_FI: fi-FI, fil_PH: fil-PH, fo_FO: fo-FO, fr_BE: fr-BE, fr_CA: fr-CA, fr_CH: fr-CH, fr_CI: fr-CI, fr_CM: fr-CM, fr_FR: fr-FR, fr_GA: fr-GA, fr_LU: fr-LU, fy_NL: fy-NL, ga_IE: ga-IE, gl_ES: gl-ES, gu_IN: gu-IN, gug_PY: gug-PY, he_IL: he-IL, hi_IN: hi-IN, hr_BA: hr-BA, hr_BA-SRP: hr-BA-SRP, hr_HR: hr-HR, ht_HT: ht-HT, hu_HU: hu-HU, hu_RO: hu-RO, hu_SK: hu-SK, hy_AM: hy-AM, hy_RU: hy-RU, hye_RU: hye-RU, id_ID: id-ID, is_IS: is-IS, it_CH: it-CH, it_IT: it-IT, ja_JP: ja-JP, ka_GE: ka-GE, kk_KZ: kk-KZ, km_KH: km-KH, kn_IN: kn-IN, ko_KR: ko-KR, ks_IN: ks-IN, ku_IQ: ku-IQ, lg_UG: lg-UG, lo_LA: lo-LA, loz_ZM: loz-ZM, lt_LT: lt-LT, lv_LV: lv-LV, mhr_RU: mhr-RU, mk_MK: mk-MK, ml_IN: ml-IN, mn_MN: mn-MN, mr_IN: mr-IN, ms_BN: ms-BN, ms_MY: ms-MY, mt_MT: mt-MT, my_MM: my-MM, nb_NO: nb-NO, ne_NP: ne-NP, nl_BE: nl-BE, nl_NL: nl-NL, nn_NO: nn-NO, no_NO: no-NO, or_IN: or-IN, pa_IN: pa-IN, pa_PK: pa-PK, pl_PL: pl-PL, ps_AF: ps-AF, pt_AO: pt-AO, pt_BR: pt-BR, pt_MZ: pt-MZ, pt_PT: pt-PT, qu_EC: qu-EC, ro_MD: ro-MD, ro_RO: ro-RO, ru_RU: ru-RU, ru_UA: ru-UA, ru_ee: ru-ee, ru_lt: ru-lt, ru_lv: ru-lv, si_LK: si-LK, sk_SK: sk-SK, sl_SI: sl-SI, sq_AL: sq-AL, sr_BA-SRP: sr-BA-SRP, sr_ME: sr-ME, sr_RS: sr-RS, st_ZA: st-ZA, sv_FI: sv-FI, sv_SE: sv-SE, sw_CD: sw-CD, sw_KE: sw-KE, sw_TZ: sw-TZ, sw_UG: sw-UG, ta_IN: ta-IN, ta_LK: ta-LK, te_IN: te-IN, tg_TJ: tg-TJ, th_TH: th-TH, tk_TM: tk-TM, tl_PH: tl-PH, tr_CY: tr-CY, tr_DE: tr-DE, tr_TR: tr-TR, uk_UA: uk-UA, ur_PK: ur-PK, uz_UZ: uz-UZ, vi_VN: vi-VN, wo_SN: wo-SN, yue_CN: yue-CN, zh_CN: zh-CN, zh_HK: zh-HK, zh_SG: zh-SG, zh_TW: zh-TW, zu_ZA: zu-ZA
-
-[o:damus:p:damus-ios-staging:r:infopliststrings]
-file_filter   = damus/<lang>.lproj/InfoPlist.strings
-source_file   = damus/en-US.xcloc/Source Contents/damus/en-US.lproj/InfoPlist.strings
-type          = STRINGS_UTF8
-minimum_perc  = 0
-resource_name = damus..en-US.lproj/InfoPlist.strings (translations)
-
-[o:damus:p:damus-ios-staging:r:localizablestrings]
-file_filter   = damus/<lang>.lproj/Localizable.strings
-source_file   = damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings
-type          = STRINGS_UTF8
-minimum_perc  = 0
-resource_name = damus..en-US.lproj/Localizable.strings (translations)
-
-[o:damus:p:damus-ios-staging:r:localizablestringsdict]
-file_filter   = damus/<lang>.lproj/Localizable.stringsdict
-source_file   = damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict
-type          = STRINGSDICT
-minimum_perc  = 0
-resource_name = damus..en-US.lproj/Localizable.stringsdict (translations)

CHANGELOG.md

@@ -1,325 +1,8 @@
-## [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
-
-- Relay Filtering (William Casarin)
-- Japanese translations (Terry Yiu)
-- Add password autofill on account login and creation (Terry Yiu)
-- Show if relay is paid (William Casarin)
-- Add "Follows You" indicator on profile (William Casarin)
-- Add screen to select individual relays when posting/broadcasting (Andrii Sievrikov)
-- Relay Detail View (Joel Klabo)
-- Warn when attempting to post an nsec key (Terry Yiu)
-- DeepL translation integration (Terry Yiu)
-- Use local authentication (faceid) to access private key (Andrii Sievrikov)
-- Add accessibility labels to action bar (Bryan Montz)
-- Copy invoice button (Joel Klabo)
-- Receive Lightning Zaps (William Casarin)
-- Allow text selection in bio (Suhail Saqan)
-
-
-### Changed
-
-- Show "Follow Back" button on profile page (William Casarin)
-- When on your profile page, open relay view instead for your own relays (Terry Yiu)
-- Updated QR code view, include profile image, etc (ericholguin)
-- Clicking relay numbers now goes to relay config (radixrat)
-
-### Fixed
-
-- Load zaps, likes and reposts when you open a thread (William Casarin)
-- Fix bug where sidebar navigation fails to pop when switching timelines (William Casarin)
-- Use lnaddress before lnurl for tip addresses to avoid Anigma scamming (William Casarin)
-- Fix sidebar navigation bugs (OlegAba)
-- Fix issue where navigation fails pop to root when switching timelines (William Casarin)
-- Make @ mentions case insensitive (William Casarin)
-- Fix some lnurls not getting decoded properly (William Casarin)
-- Hide incoming DMs from blocked users (William Casarin)
-- Hide blocked users from search results (William Casarin)
-- Fix Cash App invoice payments (Rob Seward)
-- DM Padding (OlegAba)
-- Check for broken lnurls (William Casarin)
-
-
-
-[1.0.0-15]: https://github.com/damus-io/damus/releases/tag/v1.0.0-15
-## [1.0.0-13] - 2023-01-30
-
-### Added
-
-- LibreTranslate note translations (Terry Yiu)
-- Added support for account deletion (William Casarin)
-- User tagging and autocompletion in posts (Swift)
-
-
-### Changed
-
-- Remove redundant logout button from settings (Jonathan Milligan)
-- Moved relay config to its own sidebar entry (William Casarin)
-- New stylized tabs (ericholguin)
-
-
-### Fixed
-
-- Fix hidden profile action sheet when clicking ... (William Casarin)
-- Fixed height of DM input (Terry Yiu)
-- Fixed bug where copying pubkey from context menu only copied your own pubkey (Terry Yiu)
-
-
-
-[1.0.0-13]: https://github.com/damus-io/damus/releases/tag/v1.0.0-13
 ## [1.0.0-12] - 2023-01-28
 
 ### Added
 
-- Added Arabic and Portuguese translations (Barodane, Antonio Chagas)
+- Added arabic and portugese translations (William Casarin)
 - Add QRCode view for sharing your pubkey (ericholguin)
 - Added nostr: uri handling (William Casarin)
 
@@ -346,7 +29,7 @@
 ### Added
 
 - Reposts view (Terry Yiu)
-- Translations for it_IT, it_CH, fr_FR, de_DE, de_AT and lv_LV (Nicolò Carcagnì, Solobalbo, Gregor, Peter Gerstbach, SYX)
+- Translations for it_IT, it_CH, fr_FR, de_DE, de_AT and lv_LV (William Casarin)
 - Added ability to block users (William Casarin)
 - Added a way to report content (William Casarin)
 - Stretchable profile cover header (Swift)
@@ -373,7 +56,7 @@
 
 - Show website on profiles (William Casarin)
 - Add the ability to choose participants when replying (Joel Klabo)
-- Translations for de_AT, de_DE, tr_TR, fr_FR (Gregor, Peter Gerstbach, Taylan Benli, Solobalbo)
+- Translations for de_AT, de_DE, tr_TR, fr_FR (William Casarin)
 - Add DM Message Requests (William Casarin)
 
 
@@ -393,7 +76,7 @@
 
 - Drastically improved image viewer (OlegAba)
 - Added pinch to zoom on images (Swift)
-- Add Latin American Spanish translations (Nicolás Valencia)
+- Add Latin American Spanish translations (William Casarin)
 - Added SVG profile picture support (OlegAba)
 
 
@@ -806,3 +489,4 @@
 
 [0.1.2]: https://github.com/damus-io/damus/releases/tag/v0.1.2
 
+

README.md

@@ -1,4 +1,3 @@
-[![Run Test Suite](https://github.com/damus-io/damus/actions/workflows/run-tests.yaml/badge.svg?branch=master)](https://github.com/damus-io/damus/actions/workflows/run-tests.yaml)
 
 # damus
 
@@ -26,7 +25,7 @@ damus implements the following [Nostr Implementation Possibilities][nips]
 ## Getting Started on Damus 
 
 ### Damus iOS
-1) Get the Damus app on the iOS App Store: https://apps.apple.com/ca/app/damus/id1628663131
+1) Get the Damus app on TestFlight: https://testflight.apple.com/join/CLwjLxWl
 
 #### ⚙️ Settings (gear icon, top right)
 - Relays: You can add more relays to send your notes to by tapping the "+". 
@@ -49,7 +48,7 @@ damus implements the following [Nostr Implementation Possibilities][nips]
   4. Add @ direcly followed by the pubkey (e.g., `@npub1xtscya34g58tk0z605fvr788k263gsu6cy9x0mhnm87echrgufzsevkk5s`)
 - You can also long-press a Note to grab their User ID aka pubkey or Note ID to link directly to a Note.
 - Currently you can't delete your Notes in the iOS app
-- Share images by pasting the image url which you can grab from imgbb, imgur, etc. (i.e., `https://i.ibb.co/2SHZbwm/alpha60.jpg`). Currently images only load for people you follow in the 🏠 Personal Feed. Images are not automatically loaded in 🔍 Global Feed
+- Share images by pasting the image url which you can grab from imgbb, imgur, etc. (i.e., `(https://i.ibb.co/2SHZbwm/alpha60.jpg)`). Currently images only load for people you follow in the 🏠 Personal Feed. Images are not automatically loaded in 🔍 Global Feed
 - Engaging with Notes
   - 💬 Replying to a Note: Tap the chat icon underneath the note. This will show up in the users’ notifications and in your 🏠 Personal and 🔍 Global Feeds
   - ♺ Reposts: Tap the repost icon which will show up in your 🏠 Personal and 🔍 Global Feeds
@@ -108,6 +107,24 @@ 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... :)

damus-c/damus.c

@@ -26,10 +26,6 @@ static inline int is_boundary(char c) {
     return !isalnum(c);
 }
 
-static inline int is_invalid_url_ending(char c) {
-    return c == '!' || c == '?' || c == ')' || c == '.' || c == ',' || c == ';';
-}
-
 static void make_cursor(struct cursor *c, const u8 *content, size_t len)
 {
     c->start = content;
@@ -59,8 +55,8 @@ static int consume_until_whitespace(struct cursor *cur, int or_end) {
     while (cur->p < cur->end) {
         c = *cur->p;
         
-        if (is_whitespace(c))
-            return consumedAtLeastOne;
+        if (is_whitespace(c) && consumedAtLeastOne)
+            return 1;
         
         cur->p++;
         consumedAtLeastOne = true;
@@ -225,9 +221,6 @@ static int parse_url(struct cursor *cur, struct block *block) {
         return 0;
     }
     
-    // strip any unwanted characters
-    while(is_invalid_url_ending(peek_char(cur, -1))) cur->p--;
-    
     block->type = BLOCK_URL;
     block->block.str.start = (const char *)start;
     block->block.str.end = (const char *)cur->p;

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

@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/onevcat/Kingfisher",
       "state" : {
-        "revision" : "415b1d97fb38bda1e5a6b2dde63354720832110b",
-        "version" : "7.6.1"
+        "revision" : "017f94ccfdacabb1ae7f45b75b4217b24c06e6ac",
+        "version" : "7.4.0"
       }
     },
     {

damus/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xC5",
+          "green" : "0x43",
+          "red" : "0xCC"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

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

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x00",
+          "green" : "0x00",
+          "red" : "0x00"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

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

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0x4D",
+          "red" : "0x4B"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

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

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x1E",
+          "green" : "0x1C",
+          "red" : "0x1C"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

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

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x4F",
+          "green" : "0xC3",
+          "red" : "0x66"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

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

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF4",
+          "green" : "0xEE",
+          "red" : "0xEE"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

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

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x5F",
+          "green" : "0x5F",
+          "red" : "0x5F"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

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

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xC5",
+          "green" : "0x43",
+          "red" : "0xCC"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

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

@@ -11,6 +11,24 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

damus/Assets.xcassets/Profile/ic-copy.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-copy.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Assets.xcassets/Profile/ic-key.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-key.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Assets.xcassets/Profile/ic-message.imageset/Contents.json

@@ -0,0 +1,52 @@
+{
+  "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
+  }
+}

damus/Assets.xcassets/Profile/ic-nipverified.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-nipverified.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Assets.xcassets/Profile/ic-qr.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-qr.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Assets.xcassets/Profile/profile-banner.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "profile-banner.jpeg",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/bbw.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "bbw.jpg",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/bitcoin-p2p.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "bitcoin-p2p.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/blixt-wallet.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "blixt-wallet.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/bluewallet.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "bluewallet.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/breez.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "breez.jpg",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/cashapp.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "cashapp.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/digital-nomad.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "digital-nomad.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/encrypted-message.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "encrypted-message.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/ic-lightning.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-lightning.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Assets.xcassets/ic-tick.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic-tick.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

damus/Assets.xcassets/lnlink.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "lnlink.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/logo-nobg.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "damus-nobg.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/muun.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "muun.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/phoenix.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "phoenix.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/river.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "river.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/strike.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "strike.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/undercover.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "undercover.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/walletofsatoshi.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "walletofsatoshi.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/zebedee.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "zebedee.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Assets.xcassets/zeusln.imageset/Contents.json

@@ -2,7 +2,16 @@
   "images" : [
     {
       "filename" : "zeus.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

damus/Components/CustomPicker.swift

@@ -1,61 +0,0 @@
-//
-//  CustomPicker.swift
-//  damus
-//
-//  Created by Eric Holguin on 1/22/23.
-//
-
-import SwiftUI
-
-let RECTANGLE_GRADIENT = LinearGradient(gradient: Gradient(colors: [
-    Color("DamusPurple"),
-    Color("DamusBlue")
-]), startPoint: .leading, endPoint: .trailing)
-
-struct CustomPicker<SelectionValue: Hashable, Content: View>: View {
-    
-    @Environment(\.colorScheme) var colorScheme
-    
-    @Namespace var picker
-    @Binding var selection: SelectionValue
-    @ViewBuilder let content: Content
-    
-    public var body: some View {
-        let contentMirror = Mirror(reflecting: content)
-        let blocksCount = Mirror(reflecting: contentMirror.descendant("value")!).children.count
-        HStack {
-            ForEach(0..<blocksCount, id: \.self) { index in
-                let tupleBlock = contentMirror.descendant("value", ".\(index)")
-                let text = Mirror(reflecting: tupleBlock!).descendant("content") as! Text
-                let tag = Mirror(reflecting: tupleBlock!).descendant("modifier", "value", "tagged") as! SelectionValue
-                
-                Button {
-                    withAnimation(.spring()) {
-                        selection = tag
-                    }
-                } label: {
-                    text
-                        .padding(EdgeInsets(top: 15, leading: 0, bottom: 10, trailing: 0))
-                        .font(.system(size: 14, weight: .heavy))
-                }
-                .background(
-                    Group {
-                        if tag == selection {
-                            Rectangle().fill(RECTANGLE_GRADIENT).frame(height: 2.5)
-                                .matchedGeometryEffect(id: "selector", in: picker)
-                                .cornerRadius(2.5)
-                        }
-                    },
-                    alignment: .bottom
-                )
-                .frame(maxWidth: .infinity)
-                .accentColor(tag == selection ? textColor() : .gray)
-            }
-        }
-        .background(Color(UIColor.systemBackground))
-    }
-    
-    func textColor() -> Color {
-        colorScheme == .light ? Color("DamusBlack") : Color("DamusWhite")
-    }
-}

damus/Components/ImageCarousel.swift

@@ -31,7 +31,190 @@ 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]
@@ -46,29 +229,33 @@ struct ImageCarousel: View {
                     .foregroundColor(Color.clear)
                     .overlay {
                         KFAnimatedImage(url)
-                            .imageContext(.note)
-                            .cancelOnDisappear(true)
+                            .callbackQueue(.dispatch(.global(qos: .background)))
+                            .processingQueue(.dispatch(.global(qos: .background)))
+                            .cacheOriginalImage()
+                            .loadDiskFileSynchronously()
+                            .scaleFactor(UIScreen.main.scale)
+                            .fade(duration: 0.1)
                             .configure { view in
                                 view.framePreloadCount = 3
                             }
-                            .aspectRatio(contentMode: .fill)
-                            //.cornerRadius(10)
+                            .aspectRatio(contentMode: .fit)
                             .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: 350)
+        .frame(height: 200)
         .onTapGesture {
             open_sheet = true
         }

damus/Components/InvoiceView.swift

@@ -7,84 +7,6 @@
 
 import SwiftUI
 
-struct InvoiceView: View {
-    @Environment(\.colorScheme) var colorScheme
-    @Environment(\.openURL) private var openURL
-    let our_pubkey: String
-    let invoice: Invoice
-    @State var showing_select_wallet: Bool = false
-    @State var copied = false
-    
-    var CopyButton: some View {
-        Button {
-            copied = true
-            DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
-                copied = false
-            }
-            UIImpactFeedbackGenerator(style: .medium).impactOccurred()
-            UIPasteboard.general.string = invoice.string
-        } label: {
-            if !copied {
-                Image(systemName: "doc.on.clipboard")
-                    .foregroundColor(.gray)
-            } else {
-                Image(systemName: "checkmark.circle")
-                    .foregroundColor(Color("DamusGreen"))
-            }
-        }
-    }
-    
-    var PayButton: some View {
-        Button {
-            if should_show_wallet_selector(our_pubkey) {
-                showing_select_wallet = true
-            } else {
-                open_with_wallet(wallet: get_default_wallet(our_pubkey).model, invoice: invoice.string)
-            }
-        } label: {
-            RoundedRectangle(cornerRadius: 20, style: .circular)
-                .foregroundColor(colorScheme == .light ? .black : .white)
-                .overlay {
-                    Text("Pay", comment: "Button to pay a Lightning invoice.")
-                        .fontWeight(.medium)
-                        .foregroundColor(colorScheme == .light ? .white : .black)
-                }
-        }
-        .onTapGesture {
-            // Temporary solution so that the "pay" button can be clicked (Yes we need an empty tap gesture)
-            print("pay button tap")
-        }
-    }
-    
-    var body: some View {
-        ZStack {
-            RoundedRectangle(cornerRadius: 10)
-                .foregroundColor(.secondary.opacity(0.1))
-            
-            VStack(alignment: .leading, spacing: 12) {
-                HStack {
-                    Label("", systemImage: "bolt.fill")
-                        .foregroundColor(.orange)
-                    Text("Lightning Invoice", comment: "Indicates that the view is for paying a Lightning invoice.")
-                    Spacer()
-                    CopyButton
-                }
-                Divider()
-                Text(invoice.description_string)
-                Text(invoice.amount.amount_sats_str())
-                    .font(.title)
-                PayButton
-                    .frame(height: 50)
-                    .zIndex(10.0)
-            }
-            .padding(30)
-        }
-        .sheet(isPresented: $showing_select_wallet, onDismiss: {showing_select_wallet = false}) {
-            SelectWalletView(showingSelectWallet: $showing_select_wallet, our_pubkey: our_pubkey, invoice: invoice.string)
-        }
-    }
-}
-
 func open_with_wallet(wallet: Wallet.Model, invoice: String) {
     if let url = URL(string: "\(wallet.link)\(invoice)"), UIApplication.shared.canOpenURL(url) {
         UIApplication.shared.open(url)
@@ -106,12 +28,68 @@ func open_with_wallet(wallet: Wallet.Model, invoice: String) {
     }
 }
 
+struct InvoiceView: View {
+    @Environment(\.colorScheme) var colorScheme
+    @Environment(\.openURL) private var openURL
+    
+    let invoice: Invoice
+    @State var showing_select_wallet: Bool = false
+    @ObservedObject var user_settings = UserSettingsStore()
+    
+    var PayButton: some View {
+        Button {
+            if user_settings.show_wallet_selector {
+                showing_select_wallet = true
+            } else {
+                open_with_wallet(wallet: user_settings.default_wallet.model, invoice: invoice.string)
+            }
+        } label: {
+            RoundedRectangle(cornerRadius: 20)
+                .foregroundColor(colorScheme == .light ? .black : .white)
+                .overlay {
+                    Text("Pay", comment: "Button to pay a Lightning invoice.")
+                        .fontWeight(.medium)
+                        .foregroundColor(colorScheme == .light ? .white : .black)
+                }
+        }
+        //.buttonStyle(.bordered)
+        .onTapGesture {
+            // Temporary solution so that the "pay" button can be clicked (Yes we need an empty tap gesture)
+        }
+    }
+    
+    var body: some View {
+        ZStack {
+            RoundedRectangle(cornerRadius: 10)
+                .foregroundColor(.secondary.opacity(0.1))
+            
+            VStack(alignment: .leading, spacing: 12) {
+                HStack {
+                    Label("", systemImage: "bolt.fill")
+                        .foregroundColor(.orange)
+                    Text("Lightning Invoice", comment: "Indicates that the view is for paying a Lightning invoice.")
+                }
+                Divider()
+                Text(invoice.description)
+                Text(invoice.amount.amount_sats_str())
+                    .font(.title)
+                PayButton
+                    .frame(height: 50)
+                    .zIndex(10.0)
+            }
+            .padding(30)
+        }
+        .sheet(isPresented: $showing_select_wallet, onDismiss: {showing_select_wallet = false}) {
+            SelectWalletView(showingSelectWallet: $showing_select_wallet, invoice: invoice.string).environmentObject(user_settings)
+        }
+    }
+}
 
-let test_invoice = Invoice(description: .description("this is a description"), amount: .specific(10000), string: "lnbc100n1p357sl0sp5t9n56wdztun39lgdqlr30xqwksg3k69q4q2rkr52aplujw0esn0qpp5mrqgljk62z20q4nvgr6lzcyn6fhylzccwdvu4k77apg3zmrkujjqdpzw35xjueqd9ejqcfqv3jhxcmjd9c8g6t0dcxqyjw5qcqpjrzjqt56h4gvp5yx36u2uzqa6qwcsk3e2duunfxppzj9vhypc3wfe2wswz607uqq3xqqqsqqqqqqqqqqqlqqyg9qyysgqagx5h20aeulj3gdwx3kxs8u9f4mcakdkwuakasamm9562ffyr9en8yg20lg0ygnr9zpwp68524kmda0t5xp2wytex35pu8hapyjajxqpsql29r", expiry: 604800, payment_hash: Data(), created_at: 1666139119)
+let test_invoice = Invoice(description: "this is a description", amount: .specific(10000), string: "lnbc100n1p357sl0sp5t9n56wdztun39lgdqlr30xqwksg3k69q4q2rkr52aplujw0esn0qpp5mrqgljk62z20q4nvgr6lzcyn6fhylzccwdvu4k77apg3zmrkujjqdpzw35xjueqd9ejqcfqv3jhxcmjd9c8g6t0dcxqyjw5qcqpjrzjqt56h4gvp5yx36u2uzqa6qwcsk3e2duunfxppzj9vhypc3wfe2wswz607uqq3xqqqsqqqqqqqqqqqlqqyg9qyysgqagx5h20aeulj3gdwx3kxs8u9f4mcakdkwuakasamm9562ffyr9en8yg20lg0ygnr9zpwp68524kmda0t5xp2wytex35pu8hapyjajxqpsql29r", expiry: 604800, payment_hash: Data(), created_at: 1666139119)
 
 struct InvoiceView_Previews: PreviewProvider {
     static var previews: some View {
-        InvoiceView(our_pubkey: "", invoice: test_invoice)
-            .frame(width: 300, height: 200)
+        InvoiceView(invoice: test_invoice)
+            .frame(width: 200, height: 200)
     }
 }

damus/Components/InvoicesView.swift

@@ -8,7 +8,6 @@
 import SwiftUI
 
 struct InvoicesView: View {
-    let our_pubkey: String
     var invoices: [Invoice]
     
     @State var open_sheet: Bool = false
@@ -17,7 +16,7 @@ struct InvoicesView: View {
     var body: some View {
         TabView {
             ForEach(invoices, id: \.string) { invoice in
-                InvoiceView(our_pubkey: our_pubkey, invoice: invoice)
+                InvoiceView(invoice: invoice)
                 .tabItem {
                     Text(invoice.string)
                 }
@@ -31,7 +30,7 @@ struct InvoicesView: View {
 
 struct InvoicesView_Previews: PreviewProvider {
     static var previews: some View {
-        InvoicesView(our_pubkey: "", invoices: [Invoice.init(description: .description("description"), amount: .specific(10000), string: "invstr", expiry: 100000, payment_hash: Data(), created_at: 1000000)])
+        InvoicesView(invoices: [Invoice.init(description: "description", amount: .specific(10000), string: "invstr", expiry: 100000, payment_hash: Data(), created_at: 1000000)])
             .frame(width: 300)
     }
 }

damus/Components/Reposted.swift

@@ -15,10 +15,12 @@ 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)
         }
     }

damus/Components/SelectableText.swift

@@ -1,100 +0,0 @@
-//
-//  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)
-    }
-}

damus/Components/TranslateView.swift

@@ -1,145 +0,0 @@
-//
-//  TranslateButton.swift
-//  damus
-//
-//  Created by William Casarin on 2023-02-02.
-//
-
-import SwiftUI
-import NaturalLanguage
-
-struct TranslateView: View {
-    let damus_state: DamusState
-    let event: NostrEvent
-    
-    @State var checkingTranslationStatus: Bool = false
-    @State var currentLanguage: String = "en"
-    @State var noteLanguage: String? = nil
-    @State var translated_note: String? = nil
-    @State var show_translated_note: Bool = false
-    @State var translated_artifacts: NoteArtifacts? = nil
-    
-    var TranslateButton: some View {
-        Button(NSLocalizedString("Translate Note into your language", comment: "Button to translate note from different language.")) {
-            show_translated_note = true
-        }
-        .translate_button_style()
-    }
-    
-    func Translated(lang: String, artifacts: NoteArtifacts) -> some View {
-        return Group {
-            Button(NSLocalizedString("Translated from \(lang)", comment: "Button to indicate that the note has been translated from a different language.")) {
-                show_translated_note = false
-            }
-            .translate_button_style()
-            
-            SelectableText(attributedString: artifacts.content)
-        }
-    }
-    
-    func CheckingStatus(lang: String) -> some View {
-        return Button(NSLocalizedString("Translating from \(lang)...", comment: "Button to indicate that the note is in the process of being translated from a different language.")) {
-            show_translated_note = false
-        }
-        .translate_button_style()
-    }
-    
-    func MainContent(note_lang: String) -> some View {
-        return Group {
-            let languageName = Locale.current.localizedString(forLanguageCode: note_lang)
-            if let lang = languageName, show_translated_note {
-                if checkingTranslationStatus {
-                    CheckingStatus(lang: lang)
-                } else if let artifacts = translated_artifacts {
-                    Translated(lang: lang, artifacts: artifacts)
-                }
-            } else {
-                TranslateButton
-            }
-        }
-    }
-    
-    var body: some View {
-        Group {
-            if let note_lang = noteLanguage, noteLanguage != currentLanguage {
-                MainContent(note_lang: note_lang)
-            } else {
-                Text("")
-            }
-        }
-        .task {
-            guard noteLanguage == nil && !checkingTranslationStatus && damus_state.settings.can_translate(damus_state.pubkey) else {
-                return
-            }
-            
-            checkingTranslationStatus = true
-
-            if #available(iOS 16, *) {
-                currentLanguage = Locale.current.language.languageCode?.identifier ?? "en"
-            } else {
-                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
-                }
-            }
-            
-            guard let note_lang = noteLanguage else {
-                noteLanguage = currentLanguage
-                translated_note = nil
-                checkingTranslationStatus = false
-                return
-            }
-            
-            if note_lang != currentLanguage {
-                do {
-                    // If the note language is different from our language, 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)
-
-                    if originalContent == translated_note {
-                        // If the translation is the same as the original, don't bother showing it.
-                        noteLanguage = currentLanguage
-                        translated_note = nil
-                    }
-                } catch {
-                    // If for whatever reason we're not able to figure out the language of the note, or translate the note, fail gracefully and do not retry. It's not the end of the world. Don't want to take down someone's translation server with an accidental denial of service attack.
-                    noteLanguage = currentLanguage
-                    translated_note = nil
-                }
-            }
-
-            if let translated = translated_note {
-                // Render translated note.
-                let translatedBlocks = event.get_blocks(content: translated)
-                translated_artifacts = render_blocks(blocks: translatedBlocks, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey)
-            }
-
-            checkingTranslationStatus = false
-        
-        }
-    }
-}
-
-struct TranslateView_Previews: PreviewProvider {
-    static var previews: some View {
-        let ds = test_damus_state()
-        TranslateView(damus_state: ds, event: test_event)
-    }
-}

damus/Components/UserView.swift

@@ -12,7 +12,11 @@ struct UserView: View {
     let pubkey: String
     
     var body: some View {
-        NavigationLink(destination: ProfileView(damus_state: damus_state, pubkey: pubkey)) {
+        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) {
             ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles)
         
             VStack(alignment: .leading) {

damus/Components/ZapButton.swift

@@ -1,194 +0,0 @@
-//
-//  ZapButton.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-17.
-//
-
-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
-    let lnurl: String
-    
-    @ObservedObject var bar: ActionBarModel
-    
-    @State var zapping: Bool = false
-    @State var invoice: String = ""
-    @State var slider_value: Double = 0.0
-    @State var slider_visible: Bool = false
-    @State var showing_select_wallet: Bool = false
-    @State var showing_zap_customizer: Bool = false
-    @State var is_charging: Bool = false
-    
-    var zap_img: String {
-        if bar.zapped {
-            return "bolt.fill"
-        }
-        
-        if !zapping {
-            return "bolt"
-        }
-        
-        return "bolt.horizontal.fill"
-    }
-    
-    var zap_color: Color? {
-        if bar.zapped {
-            return Color.orange
-        }
-        
-        if is_charging {
-            return Color.yellow
-        }
-        
-        if !zapping {
-            return nil
-        }
-        
-        return Color.yellow
-    }
-    
-    var body: some View {
-        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"))
-
-            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
-        }
-    }
-}
-
-
-struct ZapButton_Previews: PreviewProvider {
-    static var previews: some View {
-        let bar = ActionBarModel(likes: 0, boosts: 0, zaps: 10, zap_total: 15623414, our_like: nil, our_boost: nil, our_zap: nil)
-        ZapButton(damus_state: test_damus_state(), event: test_event, lnurl: "lnurl", bar: bar)
-    }
-}
-
-
-
-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
-}

damus/ContentView.swift

@@ -7,12 +7,16 @@
 
 import SwiftUI
 import Starscream
+import Kingfisher
 
 var BOOTSTRAP_RELAYS = [
     "wss://relay.damus.io",
     "wss://eden.nostr.land",
-    "wss://nostr.wine",
-    "wss://nos.lol",
+    "wss://nostr.fmt.wiz.biz",
+    "wss://relay.nostr.bg",
+    "wss://nostr.oxtr.dev",
+    "wss://relay.snort.social",
+    "wss://brb.io",
 ]
 
 struct TimestampedProfile {
@@ -24,16 +28,12 @@ enum Sheets: Identifiable {
     case post
     case report(ReportTarget)
     case reply(NostrEvent)
-    case event(NostrEvent)
-    case filter
 
     var id: String {
         switch self {
         case .report: return "report"
         case .post: return "post"
         case .reply(let ev): return "reply-" + ev.id
-        case .event(let ev): return "event-" + ev.id
-        case .filter: return "filter"
         }
     }
 }
@@ -73,12 +73,11 @@ struct ContentView: View {
     @State var damus_state: DamusState? = nil
     @State var selected_timeline: Timeline? = .home
     @State var is_thread_open: Bool = false
-    @State var is_deleted_account: Bool = false
     @State var is_profile_open: Bool = false
     @State var event: NostrEvent? = nil
     @State var active_profile: String? = nil
     @State var active_search: NostrFilter? = nil
-    @State var active_event: NostrEvent? = nil
+    @State var active_event_id: String? = nil
     @State var profile_open: Bool = false
     @State var thread_open: Bool = false
     @State var search_open: Bool = false
@@ -86,11 +85,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()
-    
+    @StateObject var user_settings = UserSettingsStore()
+
     // connect retry timer
     let timer = Timer.publish(every: 4, on: .main, in: .common).autoconnect()
 
@@ -112,7 +111,7 @@ struct ContentView: View {
                 .tabViewStyle(.page(indexDisplayMode: .never))
                 
                 if privkey != nil {
-                    PostButtonContainer(is_left_handed: damus_state?.settings.left_handed ?? false) {
+                    PostButtonContainer(userSettings: user_settings) {
                         self.active_sheet = .post
                     }
                 }
@@ -120,10 +119,9 @@ struct ContentView: View {
         }
         .safeAreaInset(edge: .top, spacing: 0) {
             VStack(spacing: 0) {
-                CustomPicker(selection: $filter_state, content: {
-                    Text("Posts", comment: "Label for filter for seeing only posts (instead of posts and replies).").tag(FilterState.posts)
-                    Text("Posts & Replies", comment: "Label for filter for seeing posts and replies (instead of only posts).").tag(FilterState.posts_and_replies)
-                })
+                FiltersView
+                    //.frame(maxWidth: 275)
+                    .padding()
                 Divider()
                     .frame(height: 1)
             }
@@ -134,34 +132,18 @@ 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)
             }
         }
     }
     
-    func popToRoot() {
-        profile_open = false
-        thread_open = false
-        search_open = false
-        isSideBarOpened = false
-    }
-    
-    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: "")
+    var FiltersView: some View {
+        VStack{
+            Picker(NSLocalizedString("Filter State", comment: "Filter state for seeing either only posts, or posts & replies."), selection: $filter_state) {
+                Text("Posts", comment: "Label for filter for seeing only posts (instead of posts and replies).").tag(FilterState.posts)
+                Text("Posts & Replies", comment: "Label for filter for seeing posts and replies (instead of only posts).").tag(FilterState.posts_and_replies)
+            }
+            .pickerStyle(.segmented)
         }
     }
     
@@ -170,30 +152,22 @@ struct ContentView: View {
             NavigationLink(destination: MaybeProfileView, isActive: $profile_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: MaybeThreadView, isActive: $thread_open) {
+                EmptyView()
             }
             NavigationLink(destination: MaybeSearchView, isActive: $search_open) {
                 EmptyView()
             }
             switch selected_timeline {
             case .search:
-                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!))
-                }
+                SearchHomeView(damus_state: damus_state!, model: SearchHomeModel(damus_state: damus_state!))
                 
             case .home:
                 PostingTimelineView
                 
             case .notifications:
-                NotificationsView(state: damus, notifications: home.notifications)
+                TimelineView(events: $home.notifications, loading: $home.loading, damus: damus, show_friend_icon: true, filter: { _ in true })
+                    .navigationTitle(NSLocalizedString("Notifications", comment: "Navigation title for notifications."))
                 
             case .dms:
                 DirectMessagesView(damus_state: damus_state!)
@@ -203,31 +177,46 @@ struct ContentView: View {
                 EmptyView()
             }
         }
-        .navigationBarTitle(timeline_name(selected_timeline), displayMode: .inline)
+        .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)
         .toolbar {
             ToolbarItem(placement: .principal) {
-                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)
-                    }
+                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.")
                 }
             }
         }
+        .ignoresSafeArea(.keyboard)
     }
     
     var MaybeSearchView: some View {
         Group {
             if let search = self.active_search {
-                SearchView(appstate: damus_state!, search: SearchModel(contacts: damus_state!.contacts, pool: damus_state!.pool, search: search))
+                SearchView(appstate: damus_state!, search: SearchModel(pool: damus_state!.pool, search: search))
+            } else {
+                EmptyView()
+            }
+        }
+    }
+    
+    var MaybeThreadView: some View {
+        Group {
+            if let evid = self.active_event_id {
+                BuildThreadV2View(damus: damus_state!, event_id: evid)
             } else {
                 EmptyView()
             }
@@ -264,61 +253,48 @@ struct ContentView: View {
         VStack(alignment: .leading, spacing: 0) {
             if let damus = self.damus_state {
                 NavigationView {
-                    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)
+                    ZStack {
+                        VStack {
+                            MainContent(damus: damus)
+                                .toolbar() {
+                                    ToolbarItem(placement: .navigationBarLeading) {
+                                        Button {
+                                            isSideBarOpened.toggle()
+                                        } label: {
+                                            ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles)
+                                        }
                                     }
-                                    .disabled(isSideBarOpened)
-                                }
-                                
-                                ToolbarItem(placement: .navigationBarTrailing) {
-                                    HStack(alignment: .center) {
-                                        if home.signal.signal != home.signal.max_signal {
-                                            NavigationLink(destination: RelayConfigView(state: damus_state!)) {
+                                    
+                                    ToolbarItem(placement: .navigationBarTrailing) {
+                                        HStack(alignment: .center) {
+                                            if home.signal.signal != home.signal.max_signal {
                                                 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(NSLocalizedString("Filter", comment: "Button label text for filtering relay servers."), systemImage: "line.3.horizontal.decrease")
-                                                    .foregroundColor(.gray)
-                                                    //.contentShape(Rectangle())
-                                            }
+
                                         }
                                     }
                                 }
-                            }
+
+                        }
+                        
+                        Color.clear
+                        .overlay(
+                            SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened)
+                        )
                     }
-                    .tabViewStyle(.page(indexDisplayMode: .never))
-                    .overlay(
-                        SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
-                    )
+                    .navigationBarHidden(isSideBarOpened ? true: false) // Would prefer a different way of doing this.
                 }
                 .navigationViewStyle(.stack)
             
                 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()
+            //KingfisherManager.shared.cache.clearDiskCache()
             setup_notifications()
         }
         .sheet(item: $active_sheet) { item in
@@ -329,17 +305,6 @@ 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:
-                EventDetailView()
-            case .filter:
-                let timeline = selected_timeline ?? .home
-                if #available(iOS 16.0, *) {
-                    RelayFilterView(state: damus_state!, timeline: timeline)
-                        .presentationDetents([.height(550)])
-                        .presentationDragIndicator(.visible)
-                } else {
-                    RelayFilterView(state: damus_state!, timeline: timeline)
-                }
             }
         }
         .onOpenURL { url in
@@ -353,11 +318,7 @@ struct ContentView: View {
                     active_profile = ref.ref_id
                     profile_open = true
                 } else if ref.key == "e" {
-                    find_event(state: damus_state!, evid: ref.ref_id, search_type: .event, find_from: nil) { ev in
-                        if let ev {
-                            active_event = ev
-                        }
-                    }
+                    active_event_id = ref.ref_id
                     thread_open = true
                 }
             case .filter(let filt):
@@ -369,7 +330,12 @@ struct ContentView: View {
             
         }
         .onReceive(handle_notify(.boost)) { notif in
-            current_boost = (notif.object as? NostrEvent)
+            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))
         }
         .onReceive(handle_notify(.open_thread)) { obj in
             //let ev = obj.object as! NostrEvent
@@ -382,9 +348,6 @@ struct ContentView: View {
         }
         .onReceive(handle_notify(.like)) { like in
         }
-        .onReceive(handle_notify(.deleted_account)) { notif in
-            self.is_deleted_account = true
-        }
         .onReceive(handle_notify(.report)) { notif in
             let target = notif.object as! ReportTarget
             self.active_sheet = .report(target)
@@ -457,8 +420,6 @@ struct ContentView: View {
             let post_res = obj.object as! NostrPostResult
             switch post_res {
             case .post(let post):
-                //let post = tup.0
-                //let to_relays = tup.1
                 print("post \(post.content)")
                 let new_ev = post_to_event(post: post, privkey: privkey, pubkey: pubkey)
                 self.damus_state?.pool.send(.event(new_ev))
@@ -473,20 +434,14 @@ struct ContentView: View {
         .onReceive(handle_notify(.new_mutes)) { notif in
             home.filter_muted()
         }
-        .alert(NSLocalizedString("Deleted Account", comment: "Alert message to indicate this is a deleted account"), isPresented: $is_deleted_account) {
-            Button(NSLocalizedString("Logout", comment: "Button to close the alert that informs that the current account has been deleted.")) {
-                is_deleted_account = false
-                notify(.logout, ())
-            }
-        }
-        .alert(NSLocalizedString("User blocked", comment: "Alert message to indicate the user has been blocked"), isPresented: $user_blocked_confirm, actions: {
+        .alert(NSLocalizedString("User blocked", comment: "Alert message to indicate "), isPresented: $user_blocked_confirm, actions: {
             Button(NSLocalizedString("Thanks!", comment: "Button to close out of alert that informs that the action to block a user was successful.")) {
                 user_blocked_confirm = false
             }
         }, message: {
             if let pubkey = self.blocking {
                 let profile = damus_state!.profiles.lookup(id: pubkey)
-                let name = Profile.displayName(profile: profile, pubkey: pubkey).username
+                let name = Profile.displayName(profile: profile, pubkey: pubkey)
                 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,26 +509,15 @@ struct ContentView: View {
         }, message: {
             if let pubkey = blocking {
                 let profile = damus_state?.profiles.lookup(id: pubkey)
-                let name = Profile.displayName(profile: profile, pubkey: pubkey).username
+                let name = Profile.displayName(profile: profile, pubkey: pubkey)
                 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) {
-        self.popToRoot()
         NotificationCenter.default.post(name: .switched_timeline, object: timeline)
         
         if timeline == self.selected_timeline {
@@ -599,35 +543,21 @@ struct ContentView: View {
 
     func connect() {
         let pool = RelayPool()
-        let metadatas = RelayMetadatas()
-        let relay_filters = RelayFilters(our_pubkey: pubkey)
         
-        let new_relay_filters = load_relay_filters(pubkey) == nil
         for relay in BOOTSTRAP_RELAYS {
-            if let url = URL(string: relay) {
-                add_new_relay(relay_filters: relay_filters, metadatas: metadatas, pool: pool, url: url, info: .rw, new_relay_filters: new_relay_filters)
-            }
+            add_relay(pool, relay)
         }
         
         pool.register_handler(sub_id: sub_id, handler: home.handle_event)
 
-        self.damus_state = DamusState(pool: pool,
-                                      keypair: keypair,
-                                      likes: EventCounter(our_pubkey: pubkey),
-                                      boosts: EventCounter(our_pubkey: pubkey),
-                                      contacts: Contacts(our_pubkey: pubkey),
-                                      tips: TipCounter(our_pubkey: pubkey),
-                                      profiles: Profiles(),
-                                      dms: home.dms,
-                                      previews: PreviewCache(),
-                                      zaps: Zaps(our_pubkey: pubkey),
-                                      lnurls: LNUrls(),
-                                      settings: UserSettingsStore(),
-                                      relay_filters: relay_filters,
-                                      relay_metadata: metadatas,
-                                      drafts: Drafts(),
-                                      events: EventCache(),
-                                      bookmarks: BookmarksManager(pubkey: pubkey)
+        self.damus_state = DamusState(pool: pool, keypair: keypair,
+                                likes: EventCounter(our_pubkey: pubkey),
+                                boosts: EventCounter(our_pubkey: pubkey),
+                                contacts: Contacts(our_pubkey: pubkey),
+                                tips: TipCounter(our_pubkey: pubkey),
+                                profiles: Profiles(),
+                                dms: home.dms,
+                                previews: PreviewCache()
         )
         home.damus_state = self.damus_state!
         
@@ -776,68 +706,3 @@ 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"
-    }
-}

damus/Info.plist

@@ -14,16 +14,6 @@
 				<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>
@@ -34,6 +24,7 @@
 		<string>zeusln</string>
 		<string>zebedee</string>
 		<string>lightning</string>
+		<string>squarecash</string>
 		<string>phoenix</string>
 		<string>lnlink</string>
 		<string>strike</string>

damus/Models/ActionBarModel.swift

@@ -11,43 +11,30 @@ import Foundation
 class ActionBarModel: ObservableObject {
     @Published var our_like: NostrEvent?
     @Published var our_boost: NostrEvent?
-    @Published var our_zap: Zap?
+    @Published var our_tip: NostrEvent?
     @Published var likes: Int
     @Published var boosts: Int
-    @Published var zaps: Int
-    @Published var zap_total: Int64
+    @Published var tips: Int64
     
     static func empty() -> ActionBarModel {
-        return ActionBarModel(likes: 0, boosts: 0, zaps: 0, zap_total: 0, our_like: nil, our_boost: nil, our_zap: nil)
+        return ActionBarModel(likes: 0, boosts: 0, tips: 0, our_like: nil, our_boost: nil, our_tip: nil)
     }
     
-    init(likes: Int, boosts: Int, zaps: Int, zap_total: Int64, our_like: NostrEvent?, our_boost: NostrEvent?, our_zap: Zap?) {
+    init(likes: Int, boosts: Int, tips: Int64, our_like: NostrEvent?, our_boost: NostrEvent?, our_tip: NostrEvent?) {
         self.likes = likes
         self.boosts = boosts
-        self.zaps = zaps
-        self.zap_total = zap_total
+        self.tips = tips
         self.our_like = our_like
         self.our_boost = our_boost
-        self.our_zap = our_zap
-    }
-    
-    func update(damus: DamusState, evid: String) {
-        self.likes = damus.likes.counts[evid] ?? 0
-        self.boosts = damus.boosts.counts[evid] ?? 0
-        self.zaps = damus.zaps.event_counts[evid] ?? 0
-        self.zap_total = damus.zaps.event_totals[evid] ?? 0
-        self.our_like = damus.likes.our_events[evid]
-        self.our_boost = damus.boosts.our_events[evid]
-        self.our_zap = damus.zaps.our_zaps[evid]?.first
-        self.objectWillChange.send()
+        self.our_tip = our_tip
     }
     
     var is_empty: Bool {
-        return likes == 0 && boosts == 0 && zaps == 0
+        return likes == 0 && boosts == 0 && tips == 0
     }
     
-    var zapped: Bool {
-        return our_zap != nil
+    var tipped: Bool {
+        return our_tip != nil
     }
     
     var liked: Bool {

damus/Models/BookmarksManager.swift

@@ -1,71 +0,0 @@
-//
-//  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 = []
-    }
-}

damus/Models/DamusState.swift

@@ -18,24 +18,17 @@ struct DamusState {
     let profiles: Profiles
     let dms: DirectMessagesModel
     let previews: PreviewCache
-    let zaps: Zaps
-    let lnurls: LNUrls
-    let settings: UserSettingsStore
-    let relay_filters: RelayFilters
-    let relay_metadata: RelayMetadatas
-    let drafts: Drafts
-    let events: EventCache
-    let bookmarks: BookmarksManager
     
     var pubkey: String {
         return keypair.pubkey
     }
-    
+
     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(), events: EventCache(), bookmarks: BookmarksManager(pubkey: ""))
+        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())
     }
 }

damus/Models/DeepLPlan.swift

@@ -1,35 +0,0 @@
-//
-//  DeepLPlan.swift
-//  damus
-//
-//  Created by Terry Yiu on 2/3/23.
-//
-
-import Foundation
-
-enum DeepLPlan: String, CaseIterable, Identifiable {
-    var id: String { self.rawValue }
-
-    struct Model: Identifiable, Hashable {
-        var id: String { self.tag }
-        var tag: String
-        var displayName: String
-        var url: String
-    }
-
-    case free
-    case pro
-
-    var model: Model {
-        switch self {
-        case .free:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("Free", comment: "Dropdown option for selecting Free plan for DeepL translation service."), url: "https://api-free.deepl.com")
-        case .pro:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("Pro", comment: "Dropdown option for selecting Pro plan for DeepL translation service."), url: "https://api.deepl.com")
-        }
-    }
-
-    static var allModels: [Model] {
-        return Self.allCases.map { $0.model }
-    }
-}

damus/Models/DirectMessageModel.swift

@@ -13,8 +13,6 @@ class DirectMessageModel: ObservableObject {
             is_request = determine_is_request()
         }
     }
-
-    @Published var draft: String
     
     var is_request: Bool
     var our_pubkey: String
@@ -33,13 +31,11 @@ class DirectMessageModel: ObservableObject {
         self.events = events
         self.is_request = false
         self.our_pubkey = our_pubkey
-        self.draft = ""
     }
     
     init(our_pubkey: String) {
         self.events = []
         self.is_request = false
         self.our_pubkey = our_pubkey
-        self.draft = ""
     }
 }

damus/Models/DraftsModel.swift

@@ -1,13 +0,0 @@
-//
-//  DraftsModel.swift
-//  damus
-//
-//  Created by Terry Yiu on 2/12/23.
-//
-
-import Foundation
-
-class Drafts: ObservableObject {
-    @Published var post: NSMutableAttributedString = NSMutableAttributedString(string: "")
-    @Published var replies: [NostrEvent: NSMutableAttributedString] = [:]
-}

damus/Models/EventsModel.swift

@@ -9,63 +9,9 @@ import Foundation
 
 
 class EventsModel: ObservableObject {
-    let state: DamusState
-    let target: String
-    let kind: NostrKind
-    let sub_id = UUID().uuidString
-    let profiles_id = UUID().uuidString
-    
+    var has_event: Set<String> = Set()
     @Published var events: [NostrEvent] = []
     
-    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)
-        }
+    init() {
     }
 }

damus/Models/FollowersModel.swift

@@ -51,7 +51,11 @@ class FollowersModel: ObservableObject {
         if has_contact.contains(ev.pubkey) {
             return
         }
-        process_contact_event(state: damus_state, ev: ev)
+        process_contact_event(
+            pool: damus_state.pool,
+            contacts: damus_state.contacts,
+            pubkey: damus_state.pubkey, ev: ev
+        )
         contacts?.append(ev.pubkey)
         has_contact.insert(ev.pubkey)
     }
@@ -82,7 +86,7 @@ class FollowersModel: ObservableObject {
             if ev.known_kind == .contacts {
                 handle_contact_event(ev)
             } else if ev.known_kind == .metadata {
-                process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
+                process_metadata_event(profiles: damus_state.profiles, ev: ev)
             }
             
         case .notice(let msg):

damus/Models/FollowingModel.swift

@@ -60,7 +60,7 @@ class FollowingModel {
             switch nev {
             case .event(_, let ev):
                 if ev.kind == 0 {
-                    process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
+                    process_metadata_event(profiles: damus_state.profiles, ev: ev)
                 }
             case .notice(let msg):
                 print("followingmodel notice: \(msg)")

damus/Models/HomeModel.swift

@@ -38,9 +38,6 @@ 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
@@ -50,33 +47,25 @@ class HomeModel: ObservableObject {
     let profiles_subid = UUID().description
 
     @Published var new_events: NewEventsBits = NewEventsBits()
-    @Published var notifications = NotificationsModel()
+    @Published var notifications: [NostrEvent] = []
     @Published var dms: DirectMessagesModel
-    @Published var events = EventHolder()
+    @Published var events: [NostrEvent] = []
     @Published var loading: Bool = false
     @Published var signal: SignalModel = SignalModel()
 
     init() {
         self.damus_state = DamusState.empty
-        self.dms = DirectMessagesModel(our_pubkey: "")
+        self.dms = DirectMessagesModel(our_pubkey: damus_state.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) {
@@ -123,69 +112,9 @@ class HomeModel: ObservableObject {
             handle_channel_create(ev)
         case .channel_meta:
             handle_channel_meta(ev)
-        case .zap:
-            handle_zap_event(ev)
-        case .zap_request:
-            break
         }
     }
     
-    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_keypair.pubkey else {
-            return
-        }
-        
-        if !notifications.insert_zap(zap) {
-            return
-        }
-
-        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_keypair: our_keypair, zapper: local_zapper)
-            return
-        }
-        
-        guard let profile = damus_state.profiles.lookup(id: ptag) else {
-            return
-        }
-        
-        guard let lnurl = profile.lnurl else {
-            return
-        }
-        
-        Task {
-            guard let zapper = await fetch_zapper_from_lnurl(lnurl) else {
-                return
-            }
-            
-            DispatchQueue.main.async {
-                self.damus_state.profiles.zappers[ptag] = zapper
-                self.handle_zap_event_with_zapper(ev, our_keypair: our_keypair, zapper: zapper)
-            }
-        }
-        
-    }
-    
     func handle_channel_create(_ ev: NostrEvent) {
         guard ev.is_valid else {
             return
@@ -198,9 +127,9 @@ class HomeModel: ObservableObject {
     }
     
     func filter_muted() {
-        events.filter { !damus_state.contacts.is_muted($0.pubkey) }
+        self.events = events.filter { !damus_state.contacts.is_muted($0.pubkey) }
         self.dms.dms = dms.dms.filter { !damus_state.contacts.is_muted($0.0) }
-        notifications.filter { !damus_state.contacts.is_muted($0.pubkey) }
+        self.notifications = notifications.filter { !damus_state.contacts.is_muted($0.pubkey) }
     }
     
     func handle_delete_event(_ ev: NostrEvent) {
@@ -212,7 +141,7 @@ class HomeModel: ObservableObject {
     }
 
     func handle_contact_event(sub_id: String, relay_id: String, ev: NostrEvent) {
-        process_contact_event(state: self.damus_state, ev: ev)
+        process_contact_event(pool: damus_state.pool, contacts: damus_state.contacts, pubkey: damus_state.pubkey, ev: ev)
 
         if sub_id == init_subid {
             pool.send(.unsubscribe(init_subid), to: [relay_id])
@@ -232,7 +161,7 @@ class HomeModel: ObservableObject {
             guard inner_ev.is_valid else {
                 return
             }
-           
+
             if inner_ev.is_textlike {
                 handle_text_event(sub_id: sub_id, ev)
             }
@@ -248,7 +177,6 @@ class HomeModel: ObservableObject {
         case .success(let n):
             let boosted = Counted(event: ev, id: e, total: n)
             notify(.boosted, boosted)
-            notify(.update_stats, e)
         }
     }
 
@@ -258,14 +186,14 @@ 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)
         }
     }
 
@@ -306,7 +234,7 @@ class HomeModel: ObservableObject {
             switch ev {
             case .event(let sub_id, let ev):
                 // globally handle likes
-                let always_process = sub_id == notifications_subid || sub_id == contacts_subid || sub_id == home_subid || sub_id == dms_subid || sub_id == init_subid || ev.known_kind == .like || ev.known_kind == .boost || ev.known_kind == .zap || ev.known_kind == .contacts || ev.known_kind == .metadata
+                let always_process = sub_id == notifications_subid || sub_id == contacts_subid || sub_id == home_subid || sub_id == dms_subid || sub_id == init_subid || ev.known_kind == .like || ev.known_kind == .contacts || ev.known_kind == .metadata
                 if !always_process {
                     // TODO: other views like threads might have their own sub ids, so ignore those events... or should we?
                     return
@@ -320,11 +248,10 @@ class HomeModel: ObservableObject {
             case .eose(let sub_id):
                 
                 if sub_id == dms_subid {
-                    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)
+                    let dms = dms.dms.flatMap { $0.1.events }
+                    load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: dms, damus_state: damus_state)
                 } else if sub_id == notifications_subid {
-                    load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, load: .from_keys(notifications.uniq_pubkeys()), damus_state: damus_state)
+                    load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: notifications, damus_state: damus_state)
                 }
                 
                 self.loading = false
@@ -377,6 +304,7 @@ class HomeModel: ObservableObject {
         // TODO: separate likes?
         var home_filter = NostrFilter.filter_kinds([
             NostrKind.text.rawValue,
+            NostrKind.chat.rawValue,
             NostrKind.like.rawValue,
             NostrKind.boost.rawValue,
         ])
@@ -386,12 +314,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 = 500
+        notifications_filter.limit = 100
 
         var home_filters = [home_filter]
         var notifications_filters = [notifications_filter]
@@ -444,7 +372,7 @@ class HomeModel: ObservableObject {
     }
     
     func handle_metadata_event(_ ev: NostrEvent) {
-        process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
+        process_metadata_event(profiles: damus_state.profiles, ev: ev)
     }
 
     func get_last_event_of_kind(relay_id: String, kind: Int) -> NostrEvent? {
@@ -457,82 +385,46 @@ 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
         }
         
-        guard should_show_event(contacts: damus_state.contacts, ev: ev) else {
+        if !insert_uniq_sorted_event(events: &notifications, new_ev: ev, cmp: { $0.created_at > $1.created_at }) {
             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)
     }
-
-    @discardableResult
-    func handle_last_event(ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) -> Bool {
+    
+    func handle_last_event(ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) {
         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) {
-        if events.insert(ev) {
+    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 {
             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 {
+        if should_hide_event(contacts: damus_state.contacts, ev: ev) {
             return
         }
-        
-        damus_state.events.insert(ev)
 
         if sub_id == home_subid {
-            insert_home_event(ev)
+            let _ = insert_home_event(ev)
         } else if sub_id == notifications_subid {
             handle_notification(ev: ev)
         }
     }
-    
+
     func handle_dm(_ ev: NostrEvent) {
-        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 = []
+        if let notifs = handle_incoming_dm(prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, ev: ev) {
+            self.new_events = notifs
         }
     }
 }
@@ -638,17 +530,10 @@ func print_filters(relay_id: String?, filters groups: [[NostrFilter]]) {
     print("-----")
 }
 
-func process_metadata_event(our_pubkey: String, profiles: Profiles, ev: NostrEvent) {
+func process_metadata_event(profiles: Profiles, ev: NostrEvent) {
     guard let profile: Profile = decode_data(Data(ev.content.utf8)) else {
         return
     }
-    
-    if our_pubkey == ev.pubkey && (profile.deleted ?? false) {
-        DispatchQueue.main.async {
-            notify(.deleted_account, ())
-        }
-        return
-    }
 
     var old_nip05: String? = nil
     if let mprof = profiles.lookup_with_timestamp(id: ev.pubkey) {
@@ -678,14 +563,14 @@ func process_metadata_event(our_pubkey: String, profiles: Profiles, ev: NostrEve
     
     // load pfps asap
     let picture = tprof.profile.picture ?? robohash(ev.pubkey)
-    if URL(string: picture) != nil {
+    if let _ = URL(string: picture) {
         DispatchQueue.main.async {
             notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
         }
     }
     
     let banner = tprof.profile.banner ?? ""
-    if URL(string: banner) != nil {
+    if let _ = URL(string: banner) {
         DispatchQueue.main.async {
             notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
         }
@@ -698,31 +583,31 @@ func robohash(_ pk: String) -> String {
     return "https://robohash.org/" + pk
 }
 
-func load_our_stuff(state: DamusState, ev: NostrEvent) {
-    guard ev.pubkey == state.pubkey else {
+func load_our_stuff(pool: RelayPool, contacts: Contacts, pubkey: String, ev: NostrEvent) {
+    guard ev.pubkey == pubkey else {
         return
     }
     
     // only use new stuff
-    if let current_ev = state.contacts.event {
+    if let current_ev = contacts.event {
         guard ev.created_at > current_ev.created_at else {
             return
         }
     }
     
-    let m_old_ev = state.contacts.event
-    state.contacts.event = ev
+    let m_old_ev = contacts.event
+    contacts.event = ev
 
-    load_our_contacts(contacts: state.contacts, our_pubkey: state.pubkey, m_old_ev: m_old_ev, ev: ev)
-    load_our_relays(state: state, m_old_ev: m_old_ev, ev: ev)
+    load_our_contacts(contacts: contacts, our_pubkey: pubkey, m_old_ev: m_old_ev, ev: ev)
+    load_our_relays(contacts: contacts, our_pubkey: pubkey, pool: pool, m_old_ev: m_old_ev, ev: ev)
 }
 
-func process_contact_event(state: DamusState, ev: NostrEvent) {
-    load_our_stuff(state: state, ev: ev)
-    add_contact_if_friend(contacts: state.contacts, ev: ev)
+func process_contact_event(pool: RelayPool, contacts: Contacts, pubkey: String, ev: NostrEvent) {
+    load_our_stuff(pool: pool, contacts: contacts, pubkey: pubkey, ev: ev)
+    add_contact_if_friend(contacts: contacts, ev: ev)
 }
 
-func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
+func load_our_relays(contacts: Contacts, our_pubkey: String, pool: RelayPool, m_old_ev: NostrEvent?, ev: NostrEvent) {
     let bootstrap_dict: [String: RelayInfo] = [:]
     let old_decoded = m_old_ev.flatMap { decode_json_relays($0.content) } ?? BOOTSTRAP_RELAYS.reduce(into: bootstrap_dict) { (d, r) in
         d[r] = .rw
@@ -746,15 +631,14 @@ func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
     
     let diff = old.symmetricDifference(new)
     
-    let new_relay_filters = load_relay_filters(state.pubkey) == nil
     for d in diff {
         changed = true
         if new.contains(d) {
             if let url = URL(string: d) {
-                add_new_relay(relay_filters: state.relay_filters, metadatas: state.relay_metadata, pool: state.pool, url: url, info: decoded[d] ?? .rw, new_relay_filters: new_relay_filters)
+                try? pool.add_relay(url, info: decoded[d] ?? .rw)
             }
         } else {
-            state.pool.remove_relay(d)
+            pool.remove_relay(d)
         }
     }
     
@@ -763,61 +647,9 @@ func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
     }
 }
 
-func add_new_relay(relay_filters: RelayFilters, metadatas: RelayMetadatas, pool: RelayPool, url: URL, info: RelayInfo, new_relay_filters: Bool) {
-    try? pool.add_relay(url, info: info)
-    
-    let relay_id = url.absoluteString
-    guard metadatas.lookup(relay_id: relay_id) == nil else {
-        return
-    }
-    
-    Task.detached(priority: .background) {
-        guard let meta = try? await fetch_relay_metadata(relay_id: relay_id) else {
-            return
-        }
-        
-        DispatchQueue.main.async {
-            metadatas.insert(relay_id: relay_id, metadata: meta)
-            
-            // if this is the first time adding filters, we should filter non-paid relays
-            if new_relay_filters && !meta.is_paid {
-                relay_filters.insert(timeline: .search, relay_id: relay_id)
-            }
-        }
-    }
-}
-
-func fetch_relay_metadata(relay_id: String) async throws -> RelayMetadata? {
-    var urlString = relay_id.replacingOccurrences(of: "wss://", with: "https://")
-    urlString = urlString.replacingOccurrences(of: "ws://", with: "http://")
-    
-    guard let url = URL(string: urlString) else {
-        return nil
-    }
-    
-    var request = URLRequest(url: url)
-    request.setValue("application/nostr+json", forHTTPHeaderField: "Accept")
-    
-    var res: (Data, URLResponse)? = nil
-    
-    res = try await URLSession.shared.data(for: request)
-    
-    guard let data = res?.0 else {
-        return nil
-    }
-    
-    let nip11 = try JSONDecoder().decode(RelayMetadata.self, from: data)
-    return nip11
-}
-
-func process_relay_metadata() {
-}
-
-@discardableResult
-func handle_incoming_dm(ev: NostrEvent, our_pubkey: String, dms: DirectMessagesModel, prev_events: NewEventsBits) -> (Bool, NewEventsBits?) {
+func handle_incoming_dm(prev_events: NewEventsBits, dms: DirectMessagesModel, our_pubkey: String, ev: NostrEvent) -> NewEventsBits? {
     var inserted = false
     var found = false
-    
     let ours = ev.pubkey == our_pubkey
     var i = 0
 
@@ -844,34 +676,15 @@ func handle_incoming_dm(ev: NostrEvent, our_pubkey: String, dms: DirectMessagesM
     }
 
     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
         }
@@ -908,23 +721,9 @@ func event_has_our_pubkey(_ ev: NostrEvent, our_pubkey: String) -> Bool {
 }
 
 
-func should_show_event(contacts: Contacts, ev: NostrEvent) -> Bool {
+func should_hide_event(contacts: Contacts, ev: NostrEvent) -> Bool {
     if contacts.is_muted(ev.pubkey) {
-        return false
+        return true
     }
-    return ev.should_show_event
+    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()
-}
-

damus/Models/ImageUploadModel.swift

@@ -1,28 +0,0 @@
-//
-//  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)
-        }
-    }
-}

damus/Models/KFImageModel.swift

@@ -0,0 +1,114 @@
+//
+//  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)
+    }
+}

damus/Models/LibreTranslateServer.swift

@@ -1,41 +0,0 @@
-//
-//  LibreTranslateServer.swift
-//  damus
-//
-//  Created by Terry Yiu on 1/21/23.
-//
-
-import Foundation
-
-enum LibreTranslateServer: String, CaseIterable, Identifiable {
-    var id: String { self.rawValue }
-
-    struct Model: Identifiable, Hashable {
-        var id: String { self.tag }
-        var tag: String
-        var displayName: String
-        var url: String?
-    }
-
-    case argosopentech
-    case terraprint
-    case vern
-    case custom
-
-    var model: Model {
-        switch self {
-        case .argosopentech:
-            return .init(tag: self.rawValue, displayName: "translate.argosopentech.com", url: "https://translate.argosopentech.com")
-        case .terraprint:
-            return .init(tag: self.rawValue, displayName: "translate.terraprint.co", url: "https://translate.terraprint.co")
-        case .vern:
-            return .init(tag: self.rawValue, displayName: "lt.vern.cc", url: "https://lt.vern.cc")
-        case .custom:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("Custom", comment: "Dropdown option for selecting a custom translation server."), url: nil)
-        }
-    }
-
-    static var allModels: [Model] {
-        return Self.allCases.map { $0.model }
-    }
-}

damus/Models/LikeCounter.swift

@@ -7,10 +7,6 @@
 
 import Foundation
 
-enum CountResult {
-    case already_counted
-    case success(Int)
-}
 
 class EventCounter {
     var counts: [String: Int] = [:]
@@ -18,6 +14,11 @@ class EventCounter {
     var our_events: [String: NostrEvent] = [:]
     var our_pubkey: String
     
+    enum CountResult {
+        case already_counted
+        case success(Int)
+    }
+    
     init (our_pubkey: String) {
         self.our_pubkey = our_pubkey
     }

damus/Models/Mentions.swift

@@ -32,30 +32,13 @@ struct IdBlock: Identifiable {
     let block: Block
 }
 
-typealias Invoice = LightningInvoice<Amount>
-typealias ZapInvoice = LightningInvoice<Int64>
-
-enum InvoiceDescription {
-    case description(String)
-    case description_hash(Data)
-}
-
-struct LightningInvoice<T> {
-    let description: InvoiceDescription
-    let amount: T
+struct Invoice {
+    let description: String
+    let amount: Amount
     let string: String
     let expiry: UInt64
     let payment_hash: Data
     let created_at: UInt64
-    
-    var description_string: String {
-        switch description {
-        case .description(let string):
-            return string
-        case .description_hash:
-            return ""
-        }
-    }
 }
 
 enum Block {
@@ -206,78 +189,20 @@ enum Amount: Equatable {
         case .any:
             return NSLocalizedString("Any", comment: "Any amount of sats")
         case .specific(let amt):
-            return format_msats(amt)
+            let numberFormatter = NumberFormatter()
+            numberFormatter.numberStyle = .decimal
+            numberFormatter.minimumFractionDigits = 0
+            numberFormatter.maximumFractionDigits = 3
+            numberFormatter.roundingMode = .down
+
+            let sats = NSNumber(value: (Double(amt) / 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)
         }
     }
 }
 
-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
-    formatter.positiveSuffix = "m"
-    formatter.positivePrefix = ""
-    formatter.minimumFractionDigits = 0
-    formatter.maximumFractionDigits = 3
-    formatter.roundingMode = .down
-    formatter.roundingIncrement = 0.1
-    formatter.multiplier = 1
-    
-    let sats = NSNumber(value: (Double(msats) / 1000.0))
-    
-    if msats >= 1_000_000*1000 {
-        formatter.positiveSuffix = "m"
-        formatter.multiplier = 0.000001
-    } else if msats >= 1000*1000 {
-        formatter.positiveSuffix = "k"
-        formatter.multiplier = 0.001
-    } else {
-        return sats.stringValue
-    }
-    
-    return formatter.string(from: sats) ?? sats.stringValue
-}
-
-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
-
-    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? {
     guard let invstr = strblock_to_string(b.invstr) else {
         return nil
@@ -287,8 +212,9 @@ func convert_invoice_block(_ b: invoice_block) -> Block? {
         return nil
     }
     
-    guard let description = convert_invoice_description(b11: b11) else {
-        return nil
+    var description = ""
+    if b11.description != nil {
+        description = String(cString: b11.description)
     }
     
     let amount: Amount = maybe_pointee(b11.msat).map { .specific(Int64($0.millisatoshis)) } ?? .any
@@ -299,18 +225,6 @@ func convert_invoice_block(_ b: invoice_block) -> Block? {
     return .invoice(Invoice(description: description, amount: amount, string: invstr, expiry: b11.expiry, payment_hash: payment_hash, created_at: created_at))
 }
 
-func convert_invoice_description(b11: bolt11) -> InvoiceDescription? {
-    if let desc = b11.description {
-        return .description(String(cString: desc))
-    }
-    
-    if var deschash = maybe_pointee(b11.description_hash) {
-        return .description_hash(Data(bytes: &deschash, count: 32))
-    }
-    
-    return nil
-}
-
 func convert_mention_block(ind: Int32, tags: [[String]]) -> Block?
 {
     let ind = Int(ind)

damus/Models/Notifications/EventGroup.swift

@@ -1,32 +0,0 @@
-//
-//  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)
-    }
-}

damus/Models/Notifications/ZapGroup.swift

@@ -1,59 +0,0 @@
-//
-//  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
-    }
-}
-

damus/Models/NotificationsModel.swift

@@ -1,320 +0,0 @@
-//
-//  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
-    }
-}

damus/Models/ProfileModel.swift

@@ -8,38 +8,18 @@
 import Foundation
 
 class ProfileModel: ObservableObject, Equatable {
-    var events: EventHolder = EventHolder()
+    @Published var events: [NostrEvent] = []
     @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
     
-    func follows(pubkey: String) -> Bool {
-        guard let contacts = self.contacts else {
-            return false
-        }
-        
-        for tag in contacts.tags {
-            guard tag.count >= 2 && tag[0] == "p" else {
-                continue
-            }
-            
-            if tag[1] == pubkey {
-                return true
-            }
-        }
-        
-        return false
-    }
-    
     func get_follow_target() -> FollowTarget {
         if let contacts = contacts {
             return .contact(contacts)
@@ -90,7 +70,7 @@ class ProfileModel: ObservableObject, Equatable {
     }
     
     func handle_profile_contact_event(_ ev: NostrEvent) {
-        process_contact_event(state: damus, ev: ev)
+        process_contact_event(pool: damus.pool, contacts: damus.contacts, pubkey: damus.pubkey, ev: ev)
         
         // only use new stuff
         if let current_ev = self.contacts {
@@ -113,13 +93,11 @@ class ProfileModel: ObservableObject, Equatable {
             return
         }
         if ev.is_textlike || ev.known_kind == .boost {
-            if self.events.insert(ev) {
-                self.objectWillChange.send()
-            }
+            let _ = insert_uniq_sorted_event(events: &self.events, new_ev: ev, cmp: { $0.created_at > $1.created_at})
         } else if ev.known_kind == .contacts {
             handle_profile_contact_event(ev)
         } else if ev.known_kind == .metadata {
-            process_metadata_event(our_pubkey: damus.pubkey, profiles: damus.profiles, ev: ev)
+            process_metadata_event(profiles: damus.profiles, ev: ev)
         }
         seen_event.insert(ev.id)
     }
@@ -129,16 +107,15 @@ 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 ev):
+            case .event(let sid, let ev):
+                if sid != self.sub_id && sid != self.prof_subid {
+                    return
+                }
                 add_event(ev)
             case .notice(let notice):
                 notify(.notice, notice)
             case .eose:
-                progress += 1
                 break
             }
         }

damus/Models/ReactionsModel.swift

@@ -8,9 +8,71 @@
 import Foundation
 
 
-final class ReactionsModel: EventsModel {
+class ReactionsModel: ObservableObject {
+    let state: DamusState
+    let target: String
+    let sub_id: String
+    let profiles_id: String
     
-    init(state: DamusState, target: String) {
-        super.init(state: state, target: target, kind: .like)
+    @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
+        }
     }
 }

damus/Models/ReplyMap.swift

@@ -8,25 +8,12 @@
 import Foundation
 
 class ReplyMap {
-    var replies: [String: Set<String>] = [:]
+    var replies: [String: String] = [:]
     
-    func lookup(_ id: String) -> Set<String>? {
+    func lookup(_ id: String) -> String? {
         return replies[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
+    func add(id: String, reply_id: String) {
+        replies[id] = reply_id
     }
 }

damus/Models/RepostsModel.swift

@@ -7,9 +7,71 @@
 
 import Foundation
 
-final class RepostsModel: EventsModel {
-    
-    init(state: DamusState, target: String) {
-        super.init(state: state, target: target, kind: .boost)
+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
+        }
     }
 }

damus/Models/Search/SearchResultsModel.swift

@@ -1,12 +0,0 @@
-//
-//  SearchResultsModel.swift
-//  damus
-//
-//  Created by William Casarin on 2023-03-03.
-//
-
-import Foundation
-
-
-class SearchResultsModel: ObservableObject {
-}

damus/Models/SearchHomeModel.swift

@@ -10,7 +10,7 @@ import Foundation
 
 /// The data model for the SearchHome view, typically something global-like
 class SearchHomeModel: ObservableObject {
-    var events: EventHolder = EventHolder()
+    @Published var events: [NostrEvent] = []
     @Published var loading: Bool = false
 
     var seen_pubkey: Set<String> = Set()
@@ -31,14 +31,12 @@ class SearchHomeModel: ObservableObject {
     }
     
     func filter_muted() {
-        events.filter { should_show_event(contacts: damus_state.contacts, ev: $0) }
-        self.objectWillChange.send()
+        events = events.filter { !should_hide_event(contacts: damus_state.contacts, ev: $0) }
     }
     
     func subscribe() {
         loading = true
-        let to_relays = determine_to_relays(pool: damus_state.pool, filters: damus_state.relay_filters)
-        damus_state.pool.subscribe(sub_id: base_subid, filters: [get_base_filter()], handler: handle_event, to: to_relays)
+        damus_state.pool.subscribe(sub_id: base_subid, filters: [get_base_filter()], handler: handle_event)
     }
 
     func unsubscribe(to: String? = nil) {
@@ -56,14 +54,14 @@ class SearchHomeModel: ObservableObject {
             guard sub_id == self.base_subid || sub_id == self.profiles_subid else {
                 return
             }
-            if ev.is_textlike && should_show_event(contacts: damus_state.contacts, ev: ev) && !ev.is_reply(nil) {
+            if ev.is_textlike && !should_hide_event(contacts: damus_state.contacts, ev: ev) && !ev.is_reply(nil) {
                 if seen_pubkey.contains(ev.pubkey) {
                     return
                 }
                 seen_pubkey.insert(ev.pubkey)
                 
-                if self.events.insert(ev) {
-                    self.objectWillChange.send()
+                let _ = insert_uniq_sorted_event(events: &events, new_ev: ev) {
+                    $0.created_at > $1.created_at
                 }
             }
         case .notice(let msg):
@@ -76,7 +74,7 @@ class SearchHomeModel: ObservableObject {
                 // global events are not realtime
                 unsubscribe(to: relay_id)
                 
-                load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, load: .from_events(events.all_events), damus_state: damus_state)
+                load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: events, damus_state: damus_state)
             }
             
             
@@ -98,31 +96,8 @@ 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>()
     
-    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] {
+func find_profiles_to_fetch(profiles: Profiles, events: [NostrEvent]) -> [String] {
     var pubkeys = Set<String>()
     
     for ev in events {
@@ -136,14 +111,9 @@ func find_profiles_to_fetch_from_events(profiles: Profiles, events: [NostrEvent]
     return Array(pubkeys)
 }
 
-enum PubkeysToLoad {
-    case from_events([NostrEvent])
-    case from_keys([String])
-}
-
-func load_profiles(profiles_subid: String, relay_id: String, load: PubkeysToLoad, damus_state: DamusState) {
+func load_profiles(profiles_subid: String, relay_id: String, events: [NostrEvent], damus_state: DamusState) {
     var filter = NostrFilter.filter_profiles
-    let authors = find_profiles_to_fetch(profiles: damus_state.profiles, load: load)
+    let authors = find_profiles_to_fetch(profiles: damus_state.profiles, events: events)
     filter.authors = authors
     
     guard !authors.isEmpty else {
@@ -159,7 +129,7 @@ func load_profiles(profiles_subid: String, relay_id: String, load: PubkeysToLoad
             }
             
             if ev.known_kind == .metadata {
-                process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
+                process_metadata_event(profiles: damus_state.profiles, ev: ev)
             }
             
         }

damus/Models/SearchModel.swift

@@ -9,27 +9,20 @@ import Foundation
 
 
 class SearchModel: ObservableObject {
-    var events: EventHolder = EventHolder()
+    @Published var events: [NostrEvent] = []
     @Published var loading: Bool = false
     @Published var channel_name: String? = nil
     
     let pool: RelayPool
     var search: NostrFilter
-    let contacts: Contacts
     let sub_id = UUID().description
     let limit: UInt32 = 500
     
-    init(contacts: Contacts, pool: RelayPool, search: NostrFilter) {
-        self.contacts = contacts
+    init(pool: RelayPool, search: NostrFilter) {
         self.pool = pool
         self.search = search
     }
     
-    func filter_muted()  {
-        self.events.filter { should_show_event(contacts: contacts, ev: $0) }
-        self.objectWillChange.send()
-    }
-    
     func subscribe() {
         // since 1 month
         search.limit = self.limit
@@ -54,11 +47,7 @@ class SearchModel: ObservableObject {
             return
         }
         
-        guard should_show_event(contacts: contacts, ev: ev) else {
-            return
-        }
-        
-        if self.events.insert(ev) {
+        if insert_uniq_sorted_event(events: &self.events, new_ev: ev, cmp: { $0.created_at > $1.created_at } ) {
             objectWillChange.send()
         }
     }
@@ -99,21 +88,6 @@ func event_matches_hashtag(_ ev: NostrEvent, hashtags: [String]) -> Bool {
     return false
 }
 
-func tag_is_hashtag(_ tag: [String]) -> Bool {
-    // "hashtag" is deprecated, will remove in the future
-    return tag.count >= 2 && (tag[0] == "hashtag" || tag[0] == "t")
-}
-
-func has_hashtag(_ tags: [[String]], hashtag: String) -> Bool {
-    for tag in tags {
-        if tag_is_hashtag(tag) && tag[1] == hashtag {
-            return true
-        }
-    }
-    
-    return false
-}
-
 func event_matches_filter(_ ev: NostrEvent, filter: NostrFilter) -> Bool {
     if let hashtags = filter.hashtag {
         return event_matches_hashtag(ev, hashtags: hashtags)

damus/Models/ThreadModel.swift

@@ -30,120 +30,184 @@ enum InitialEvent {
 
 /// manages the lifetime of a thread
 class ThreadModel: ObservableObject {
-    @Published var event: NostrEvent
-    var event_map: Set<NostrEvent>
-    
+    @Published var initial_event: InitialEvent
+    @Published var events: [NostrEvent] = []
+    @Published var event_map: [String: Int] = [:]
     @Published var loading: Bool = false
 
     var replies: ReplyMap = ReplyMap()
     
-    init(event: NostrEvent, damus_state: DamusState) {
-        self.damus_state = damus_state
-        self.event_map = Set()
-        self.event = event
-        add_event(event, privkey: nil)
+    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
+        }
     }
     
     let damus_state: DamusState
     
     let profiles_subid = UUID().description
-    let base_subid = UUID().description
-    let meta_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)
+    }
     
-    var subids: [String] {
-        return [profiles_subid, base_subid, meta_subid]
+    init(event: NostrEvent, damus_state: DamusState) {
+        self.damus_state = damus_state
+        self.initial_event = .event(event)
     }
     
     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)
-        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)")
+        print("unsubscribing from thread \(initial_event.id) with sub_id \(base_subid)")
     }
     
-    @discardableResult
-    func set_active_event(_ ev: NostrEvent, privkey: String?) -> Bool {
-        self.event = ev
-        add_event(ev, privkey: privkey)
+    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
+        }
         
-        //self.objectWillChange.send()
-        return false
+        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)
+            }
+        }
     }
     
     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])
 
-        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
-            }
+        // 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 base_filters = [event_filter, ref_events]
-        let meta_filters = [meta_events]
 
-        print("subscribing to thread \(event.id) with sub_id \(base_subid)")
+        //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)
         loading = true
-        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)
+        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
     }
     
     func add_event(_ ev: NostrEvent, privkey: String?) {
-        if event_map.contains(ev) {
+        guard ev.should_show_event else {
             return
         }
         
-        let the_ev = damus_state.events.upsert(ev)
-        damus_state.events.add_replies(ev: the_ev)
+        if event_map[ev.id] != nil {
+            return
+        }
         
-        event_map.insert(ev)
-        objectWillChange.send()
+        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)
     }
     
     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 subids.contains(sid) else {
+            guard sid == base_subid || sid == profiles_subid else {
                 return
             }
             
             if ev.known_kind == .metadata {
-                process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
+                process_metadata_event(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, let sub_id, subids.contains(sub_id) else {
+        guard done && (sub_id == base_subid || sub_id == profiles_subid) else {
             return
         }
         
-        if event_map.contains(event) {
+        if (events.contains { ev in ev.id == initial_event.id }) {
             loading = false
         }
         
         if sub_id == self.base_subid {
-            load_profiles(profiles_subid: self.profiles_subid, relay_id: relay_id, load: .from_events(Array(event_map)), damus_state: damus_state)
+            load_profiles(profiles_subid: self.profiles_subid, relay_id: relay_id, events: events, damus_state: damus_state)
         }
     }
 

damus/Models/TranslationService.swift

@@ -1,37 +0,0 @@
-//
-//  TranslationService.swift
-//  damus
-//
-//  Created by Terry Yiu on 2/3/23.
-//
-
-import Foundation
-
-enum TranslationService: String, CaseIterable, Identifiable {
-    var id: String { self.rawValue }
-
-    struct Model: Identifiable, Hashable {
-        var id: String { self.tag }
-        var tag: String
-        var displayName: String
-    }
-
-    case none
-    case libretranslate
-    case deepl
-
-    var model: Model {
-        switch self {
-        case .none:
-            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:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("DeepL (Proprietary, Higher Accuracy)", comment: "Dropdown option for selecting DeepL as the translation service."))
-        }
-    }
-
-    static var allModels: [Model] {
-        return Self.allCases.map { $0.model }
-    }
-}

damus/Models/UserSettingsStore.swift

@@ -6,90 +6,6 @@
 //
 
 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
-}
-
-func pk_setting_key(_ pubkey: String, key: String) -> String {
-    return "\(pubkey)_\(key)"
-}
-
-func default_zap_setting_key(pubkey: String) -> String {
-    return pk_setting_key(pubkey, key: "default_zap_amount")
-}
-
-func set_default_zap_amount(pubkey: String, amount: Int) {
-    let key = default_zap_setting_key(pubkey: pubkey)
-    UserDefaults.standard.setValue(amount, forKey: key)
-}
-
-func get_default_zap_amount(pubkey: String) -> Int? {
-    let key = default_zap_setting_key(pubkey: pubkey)
-    let amt = UserDefaults.standard.integer(forKey: key)
-    if amt == 0 {
-        return nil
-    }
-    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"),
-       let default_wallet = Wallet(rawValue: defaultWalletName)
-    {
-        return default_wallet
-    } else {
-        return .system_default_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
-    }
-
-    return TranslationService(rawValue: translation_service)
-}
-
-private func get_deepl_plan(_ pubkey: String) -> DeepLPlan? {
-    guard let server_name = UserDefaults.standard.string(forKey: "deepl_plan") else {
-        return nil
-    }
-
-    return DeepLPlan(rawValue: server_name)
-}
-
-private func get_libretranslate_server(_ pubkey: String) -> LibreTranslateServer? {
-    guard let server_name = UserDefaults.standard.string(forKey: "libretranslate_server") else {
-        return nil
-    }
-    
-    return LibreTranslateServer(rawValue: server_name)
-}
-
-private func get_libretranslate_url(_ pubkey: String, server: LibreTranslateServer) -> String? {
-    if let url = server.model.url {
-        return url
-    }
-    
-    return UserDefaults.standard.object(forKey: "libretranslate_url") as? String
-}
 
 class UserSettingsStore: ObservableObject {
     @Published var default_wallet: Wallet {
@@ -97,12 +13,6 @@ 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 {
@@ -115,178 +25,17 @@ 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 translation_service: TranslationService {
-        didSet {
-            UserDefaults.standard.set(translation_service.rawValue, forKey: "translation_service")
-        }
-    }
-
-    @Published var deepl_plan: DeepLPlan {
-        didSet {
-            UserDefaults.standard.set(deepl_plan.rawValue, forKey: "deepl_plan")
-        }
-    }
-
-    @Published var deepl_api_key: String {
-        didSet {
-            do {
-                if deepl_api_key == "" {
-                    try clearDeepLApiKey()
-                } else {
-                    try saveDeepLApiKey(deepl_api_key)
-                }
-            } catch {
-                // No-op.
-            }
-        }
-    }
-
-    @Published var libretranslate_server: LibreTranslateServer {
-        didSet {
-            if oldValue == libretranslate_server {
-                return
-            }
-
-            UserDefaults.standard.set(libretranslate_server.rawValue, forKey: "libretranslate_server")
-
-            libretranslate_api_key = ""
-
-            if libretranslate_server == .custom {
-                libretranslate_url = ""
-            } else {
-                libretranslate_url = libretranslate_server.model.url!
-            }
-        }
-    }
-
-    @Published var libretranslate_url: String {
-        didSet {
-            UserDefaults.standard.set(libretranslate_url, forKey: "libretranslate_url")
-        }
-    }
-
-    @Published var libretranslate_api_key: String {
-        didSet {
-            do {
-                if libretranslate_api_key == "" {
-                    try clearLibreTranslateApiKey()
-                } else {
-                    try saveLibreTranslateApiKey(libretranslate_api_key)
-                }
-            } catch {
-                // No-op.
-            }
-        }
-    }
-    
-    @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)
+        if let defaultWalletName = UserDefaults.standard.string(forKey: "default_wallet"),
+           let default_wallet = Wallet(rawValue: defaultWalletName)
+        {
+            self.default_wallet = default_wallet
+        } else {
+            default_wallet = .system_default_wallet
+        }
+        show_wallet_selector = UserDefaults.standard.object(forKey: "show_wallet_selector") as? Bool ?? true
 
         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()
-
-        // Note from @tyiu:
-        // Default translation service is disabled by default for now until we gain some confidence that it is working well in production.
-        // Instead of throwing all Damus users onto feature immediately, allow for discovery of feature organically.
-        // Also, we are connecting to servers listed as mirrors on the official LibreTranslate GitHub README that do not require API keys.
-        // However, we have not asked them for permission to use, so we're trying to be good neighbors for now.
-        // Opportunity: spin up dedicated trusted LibreTranslate server that requires an API key for any access (or higher rate limit access).
-        if let translation_service = get_translation_service(pubkey) {
-            self.translation_service = translation_service
-        } else {
-            self.translation_service = .none
-        }
-
-        if let libretranslate_server = get_libretranslate_server(pubkey) {
-            self.libretranslate_server = libretranslate_server
-            self.libretranslate_url = get_libretranslate_url(pubkey, server: libretranslate_server) ?? ""
-        } else {
-            // Choose a random server to distribute load.
-            libretranslate_server = .allCases.filter { $0 != .custom }.randomElement()!
-            libretranslate_url = ""
-        }
-            
-        do {
-            libretranslate_api_key = try Vault.getPrivateKey(keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
-        } catch {
-            libretranslate_api_key = ""
-        }
-
-        if let deepl_plan = get_deepl_plan(pubkey) {
-            self.deepl_plan = deepl_plan
-        } else {
-            self.deepl_plan = .free
-        }
-
-        do {
-            deepl_api_key = try Vault.getPrivateKey(keychainConfiguration: DamusDeepLKeychainConfiguration())
-        } catch {
-            deepl_api_key = ""
-        }
-    }
-
-    private func saveLibreTranslateApiKey(_ apiKey: String) throws {
-        try Vault.savePrivateKey(apiKey, keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
-    }
-
-    private func clearLibreTranslateApiKey() throws {
-        try Vault.deletePrivateKey(keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
-    }
-
-    private func saveDeepLApiKey(_ apiKey: String) throws {
-        try Vault.savePrivateKey(apiKey, keychainConfiguration: DamusDeepLKeychainConfiguration())
-    }
-
-    private func clearDeepLApiKey() throws {
-        try Vault.deletePrivateKey(keychainConfiguration: DamusDeepLKeychainConfiguration())
-    }
-
-    func can_translate(_ pubkey: String) -> Bool {
-        switch translation_service {
-        case .none:
-            return false
-        case .libretranslate:
-            return URLComponents(string: libretranslate_url) != nil
-        case .deepl:
-            return deepl_api_key != ""
-        }
     }
 }
-
-struct DamusLibreTranslateKeychainConfiguration: KeychainConfiguration {
-    var serviceName = "damus"
-    var accessGroup: String? = nil
-    var accountName = "libretranslate_apikey"
-}
-
-struct DamusDeepLKeychainConfiguration: KeychainConfiguration {
-    var serviceName = "damus"
-    var accessGroup: String? = nil
-    var accountName = "deepl_apikey"
-}

damus/Models/Wallet.swift

@@ -45,7 +45,7 @@ enum Wallet: String, CaseIterable, Identifiable {
             return .init(index: 0, tag: "strike", displayName: NSLocalizedString("Strike", comment: "Dropdown option label for Lightning wallet, Strike."), link: "strike:",
                          appStoreLink: "https://apps.apple.com/us/app/strike-bitcoin-payments/id1488724463", image: "strike")
         case .cashapp:
-            return .init(index: 1, tag: "cashapp", displayName: NSLocalizedString("Cash App", comment: "Dropdown option label for Lightning wallet, Cash App."), link: "https://cash.app/launch/lightning/",
+            return .init(index: 1, tag: "cashapp", displayName: NSLocalizedString("Cash App", comment: "Dropdown option label for Lightning wallet, Cash App."), link: "squarecash://",
                          appStoreLink: "https://apps.apple.com/us/app/cash-app/id711923939", image: "cashapp")
         case .muun:
             return .init(index: 2, tag: "muun", displayName: NSLocalizedString("Muun", comment: "Dropdown option label for Lightning wallet, Muun."), link: "muun:", appStoreLink: "https://apps.apple.com/us/app/muun-wallet/id1482037683", image: "muun")
@@ -53,7 +53,7 @@ enum Wallet: String, CaseIterable, Identifiable {
             return .init(index: 3, tag: "bluewallet", displayName: NSLocalizedString("Blue Wallet", comment: "Dropdown option label for Lightning wallet, Blue Wallet."), link: "bluewallet:lightning:",
                          appStoreLink: "https://apps.apple.com/us/app/bluewallet-bitcoin-wallet/id1376878040", image: "bluewallet")
         case .walletofsatoshi:
-            return .init(index: 4, tag: "walletofsatoshi", displayName: NSLocalizedString("Wallet of Satoshi", comment: "Dropdown option label for Lightning wallet, Wallet of Satoshi."), link:  "walletofsatoshi:lightning:",
+            return .init(index: 4, tag: "walletofsatoshi", displayName: NSLocalizedString("Wallet Of Satoshi", comment: "Dropdown option label for Lightning wallet, Wallet Of Satoshi."), link:  "walletofsatoshi:lightning:",
                          appStoreLink: "https://apps.apple.com/us/app/wallet-of-satoshi/id1438599608", image: "walletofsatoshi")
         case .zebedee:
             return .init(index: 5, tag: "zebedee", displayName: NSLocalizedString("Zebedee", comment: "Dropdown option label for Lightning wallet, Zebedee."), link: "zebedee:lightning:",

damus/Models/ZapsModel.swift

@@ -1,83 +0,0 @@
-//
-//  ZapsModel.swift
-//  damus
-//
-//  Created by William Casarin on 2023-02-10.
-//
-
-import Foundation
-
-class ZapsModel: ObservableObject {
-    let state: DamusState
-    let target: ZapTarget
-    var zaps: [Zap]
-    
-    let zaps_subid = UUID().description
-    let profiles_subid = UUID().description
-    
-    init(state: DamusState, target: ZapTarget) {
-        self.state = state
-        self.target = target
-        self.zaps = []
-    }
-    
-    func subscribe() {
-        var filter = NostrFilter.filter_kinds([9735])
-        switch target {
-        case .profile(let profile_id):
-            filter.pubkeys = [profile_id]
-        case .note(let note_target):
-            filter.referenced_ids = [note_target.note_id]
-        }
-        state.pool.subscribe(sub_id: zaps_subid, filters: [filter], handler: handle_event)
-    }
-    
-    func unsubscribe() {
-        state.pool.unsubscribe(sub_id: zaps_subid)
-    }
-    
-    func handle_event(relay_id: String, conn_ev: NostrConnectionEvent) {
-        guard case .nostr_event(let resp) = conn_ev else {
-            return
-        }
-        
-        guard resp.subid == zaps_subid else {
-            return
-        }
-        
-        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
-            }
-            
-            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()
-                }
-            }
-        }
-        
-        
-        
-    }
-}

damus/Nostr/Nostr.swift

@@ -24,22 +24,18 @@ struct Profile: Codable {
     }
     
     private func str(_ str: String) -> String? {
-        return get_val(str)
-    }
-    
-    private func get_val<T>(_ v: String) -> T? {
-        guard let val = self.value[v] else{
+        guard let val = self.value[str] else{
             return nil
         }
         
-        guard let s = val.value as? T else {
+        guard let s = val.value as? String else {
             return nil
         }
         
         return s
     }
     
-    private mutating func set_val<T>(_ key: String, _ val: T?) {
+    private mutating func set_str(_ key: String, _ val: String?) {
         if val == nil {
             self.value.removeValue(forKey: key)
             return
@@ -48,15 +44,6 @@ struct Profile: Codable {
         self.value[key] = AnyCodable.init(val)
     }
     
-    private mutating func set_str(_ key: String, _ val: String?) {
-        set_val(key, val)
-    }
-    
-    var deleted: Bool? {
-        get { return get_val("deleted"); }
-        set(s) { set_val("deleted", s) }
-    }
-    
     var display_name: String? {
         get { return str("display_name"); }
         set(s) { set_str("display_name", s) }
@@ -102,7 +89,7 @@ struct Profile: Codable {
     }
     
     var lnurl: String? {
-        guard let addr = lud16 ?? lud06 else {
+        guard let addr = lud06 ?? lud16 else {
             return nil;
         }
         
@@ -110,10 +97,6 @@ struct Profile: Codable {
             return lnaddress_to_lnurl(addr);
         }
         
-        if !addr.lowercased().hasPrefix("lnurl") {
-            return nil
-        }
-        
         return addr;
     }
     
@@ -126,10 +109,6 @@ struct Profile: Codable {
         return make_ln_url(self.lnurl)
     }
     
-    init() {
-        self.value = [:]
-    }
-    
     init(from decoder: Decoder) throws {
         let container = try decoder.singleValueContainer()
         self.value = try container.decode([String: AnyCodable].self)
@@ -140,8 +119,9 @@ struct Profile: Codable {
         try container.encode(value)
     }
     
-    static func displayName(profile: Profile?, pubkey: String) -> DisplayName {
-        return parse_display_name(profile: profile, pubkey: pubkey)
+    static func displayName(profile: Profile?, pubkey: String) -> String {
+        let pk = bech32_nopre_pubkey(pubkey) ?? pubkey
+        return profile?.name ?? abbrev_pubkey(pk)
     }
 }
 

damus/Nostr/NostrEvent.swift

@@ -11,8 +11,6 @@ import secp256k1
 import secp256k1_implementation
 import CryptoKit
 
-
-
 enum ValidationResult: Decodable {
     case ok
     case bad_id
@@ -81,7 +79,7 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
     }
     
     var too_big: Bool {
-        return self.content.count > 16000
+        return self.content.count > 32000
     }
     
     var should_show_event: Bool {
@@ -105,15 +103,11 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
         if let bs = _blocks {
             return bs
         }
-        let blocks = get_blocks(content: self.get_content(privkey))
+        let blocks = parse_mentions(content: self.get_content(privkey), tags: self.tags)
         self._blocks = blocks
         return blocks
     }
 
-    func get_blocks(content: String) -> [Block] {
-        return parse_mentions(content: content, tags: self.tags)
-    }
-
     lazy var inner_event: NostrEvent? = {
         // don't try to deserialize an inner event if we know there won't be one
         if self.known_kind == .boost {
@@ -157,7 +151,7 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
             pubkey = refkey.ref_id
         }
 
-        let dec = decrypt_dm(key, pubkey: pubkey, content: self.content, encoding: .base64)
+        let dec = decrypt_dm(key, pubkey: pubkey, content: self.content)
         self.decrypted_content = dec
 
         return dec
@@ -168,9 +162,6 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
             return decrypted(privkey: privkey) ?? "*failed to decrypt content*"
         }
         
-        return content
-        
-        /*
         switch validity {
         case .ok:
             return content
@@ -179,7 +170,6 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
         case .bad_sig:
             return content + "\n\n*WARNING: invalid signature, could be forged!*"
         }
-         */
     }
 
     var description: String {
@@ -215,16 +205,6 @@ 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
@@ -292,8 +272,8 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
         return (self.flags & 1) != 0
     }
 
-    init(id: String = "", content: String, pubkey: String, kind: Int = 1, tags: [[String]] = [], createdAt: Int64 = Int64(Date().timeIntervalSince1970)) {
-        self.id = id
+    init(content: String, pubkey: String, kind: Int = 1, tags: [[String]] = [], createdAt: Int64 = Int64(Date().timeIntervalSince1970)) {
+        self.id = ""
         self.sig = ""
 
         self.content = content
@@ -302,6 +282,20 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
         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]] = []) {
+        self.id = id
+        self.sig = ""
+
+        self.content = content
+        self.pubkey = pubkey
+        self.kind = kind
+        self.tags = tags
+        self.created_at = Int64(Date().timeIntervalSince1970)
+    }
 
     init(from: NostrEvent, content: String? = nil) {
         self.id = from.id
@@ -370,14 +364,9 @@ func decode_nostr_event(txt: String) -> NostrResponse? {
 
 func encode_json<T: Encodable>(_ val: T) -> String? {
     let encoder = JSONEncoder()
-    encoder.outputFormatting = .withoutEscapingSlashes
     return (try? encoder.encode(val)).map { String(decoding: $0, as: UTF8.self) }
 }
 
-func decode_nostr_event_json(json: String) -> NostrEvent? {
-    return decode_json(json)
-}
-
 func decode_json<T: Decodable>(_ val: String) -> T? {
     return try? JSONDecoder().decode(T.self, from: Data(val.utf8))
 }
@@ -578,127 +567,6 @@ func make_like_event(pubkey: String, privkey: String, liked: NostrEvent) -> Nost
     return ev
 }
 
-func zap_target_to_tags(_ target: ZapTarget) -> [[String]] {
-    switch target {
-    case .profile(let pk):
-        return [["p", pk]]
-    case .note(let note_target):
-        return [["e", note_target.note_id], ["p", note_target.author]]
-    }
-}
-
-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)
-    
-    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: kp.privkey, ev: ev)
-    return ev
-}
-
 func gather_reply_ids(our_pubkey: String, from: NostrEvent) -> [ReferencedId] {
     var ids = get_referenced_ids(tags: from.tags, key: "e").first.map { [$0] } ?? []
 
@@ -725,14 +593,14 @@ func event_to_json(ev: NostrEvent) -> String {
     return str
 }
 
-func decrypt_dm(_ privkey: String?, pubkey: String, content: String, encoding: EncEncoding) -> String? {
+func decrypt_dm(_ privkey: String?, pubkey: String, content: String) -> 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 = (encoding == .base64 ? decode_dm_base64(content) : decode_dm_bech32(content)) else {
+    guard let dat = decode_dm_base64(content) else {
         return nil
     }
     guard let dat = aes_decrypt(data: dat.content, iv: dat.iv, shared_sec: shared_sec) else {
@@ -741,13 +609,6 @@ func decrypt_dm(_ privkey: String?, pubkey: String, content: String, encoding: E
     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 {
@@ -793,39 +654,6 @@ 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)
@@ -990,7 +818,7 @@ func first_eref_mention(ev: NostrEvent, privkey: String?) -> Mention? {
 extension [ReferencedId] {
     var pRefs: [ReferencedId] {
         get {
-            Set(self).filter { ref in
+            self.filter { ref in
                 ref.key == "p"
             }
         }

damus/Nostr/NostrFilter.swift

@@ -37,17 +37,13 @@ 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.map { $0.lowercased() })
+        return NostrFilter(ids: nil, kinds: nil, referenced_ids: nil, pubkeys: nil, since: nil, until: nil, authors: nil, hashtag: htags)
     }
 
     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])
     }

damus/Nostr/NostrKind.swift

@@ -20,6 +20,4 @@ enum NostrKind: Int {
     case channel_meta = 41
     case chat = 42
     case list = 30000
-    case zap = 9735
-    case zap_request = 9734
 }

damus/Nostr/NostrLink.swift

@@ -127,9 +127,6 @@ 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 {
@@ -140,7 +137,7 @@ func decode_nostr_uri(_ s: String) -> NostrLink? {
         }
     
     if tag_is_hashtag(parts) {
-        return .filter(NostrFilter.filter_hashtag([parts[1]]))
+        return .filter(NostrFilter.filter_hashtag([parts[1].lowercased()]))
     }
     
     if let rid = tag_to_refid(parts) {

damus/Nostr/Profiles.swift

@@ -12,20 +12,11 @@ import UIKit
 class Profiles {
     var profiles: [String: TimestampedProfile] = [:]
     var validated: [String: NIP05] = [:]
-    var zappers: [String: String] = [:]
     
     func is_validated(_ pk: String) -> NIP05? {
         return validated[pk]
     }
     
-    func lookup_zapper(pubkey: String) -> String? {
-        if let zapper = zappers[pubkey] {
-            return zapper
-        }
-        
-        return nil
-    }
-    
     func add(id: String, profile: TimestampedProfile) {
         profiles[id] = profile
     }

damus/Nostr/ProofOfWork.swift

@@ -72,7 +72,7 @@ func char_to_hex(_ c: UInt8) -> UInt8?
     return nil;
 }
 
-@discardableResult
+
 func hex_decode(_ str: String) -> [UInt8]?
 {
     if str.count == 0 {

damus/Nostr/Relay.swift

@@ -7,16 +7,16 @@
 
 import Foundation
 
-public struct RelayInfo: Codable {
+struct RelayInfo: Codable {
     let read: Bool
     let write: Bool
 
     static let rw = RelayInfo(read: true, write: true)
 }
 
-public struct RelayDescriptor: Codable {
-    public let url: URL
-    public let info: RelayInfo
+struct RelayDescriptor: Codable {
+    let url: URL
+    let info: RelayInfo
 }
 
 enum RelayFlags: Int {
@@ -24,30 +24,6 @@ enum RelayFlags: Int {
     case broken = 1
 }
 
-struct Limitations: Codable {
-    let payment_required: Bool?
-    
-    static var empty: Limitations {
-        Limitations(payment_required: nil)
-    }
-}
-
-struct RelayMetadata: Codable {
-    let name: String?
-    let description: String?
-    let pubkey: String?
-    let contact: String?
-    let supported_nips: [Int]?
-    let software: String?
-    let version: String?
-    let limitation: Limitations?
-    let payments_url: String?
-    
-    var is_paid: Bool {
-        return limitation?.payment_required ?? false
-    }
-}
-
 class Relay: Identifiable {
     let descriptor: RelayDescriptor
     let connection: RelayConnection

damus/Nostr/RelayConnection.swift

@@ -13,41 +13,42 @@ enum NostrConnectionEvent {
     case nostr_event(NostrResponse)
 }
 
-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
+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
 
     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 isConnected {
-            isReconnecting = true
-            disconnect()
+        if self.isConnected {
+            self.isReconnecting = true
+            self.disconnect()
         } else {
             // we're already disconnected, so just connect
-            connect(force: true)
+            self.connect(force: true)
         }
     }
     
-    func connect(force: Bool = false) {
-        if !force && (isConnected || isConnecting) {
+    func connect(force: Bool = false){
+        if !force && (self.isConnected || self.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()
@@ -67,9 +68,7 @@ final class RelayConnection: WebSocketDelegate {
 
         socket.write(string: req)
     }
-    
-    // MARK: - WebSocketDelegate
-    
+
     func didReceive(event: WebSocketEvent, client: WebSocket) {
         switch event {
         case .connected:
@@ -84,25 +83,15 @@ final class RelayConnection: WebSocketDelegate {
                 self.connect()
             }
 
-        case .cancelled, .error:
+        case .cancelled: fallthrough
+        case .error:
             self.isConnecting = false
             self.isConnected = false
 
         case .text(let txt):
-            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
-                }
+            if let ev = decode_nostr_event(txt: txt) {
+                handleEvent(.nostr_event(ev))
+                return
             }
 
             print("decode failed for \(txt)")
@@ -114,6 +103,7 @@ final class RelayConnection: WebSocketDelegate {
 
         handleEvent(.ws_event(event))
     }
+
 }
 
 func make_nostr_req(_ req: NostrRequest) -> String? {
@@ -128,16 +118,17 @@ func make_nostr_req(_ req: NostrRequest) -> String? {
 }
 
 func make_nostr_push_event(ev: NostrEvent) -> String? {
-    guard let event = encode_json(ev) else {
-        return nil
-    }
+    let encoder = JSONEncoder()
+    encoder.outputFormatting = .withoutEscapingSlashes
+    let event_data = try! encoder.encode(ev)
+    let event = String(decoding: event_data, as: UTF8.self)
     let encoded = "[\"EVENT\",\(event)]"
     print(encoded)
     return encoded
 }
 
 func make_nostr_unsubscribe_req(_ sub_id: String) -> String? {
-    "[\"CLOSE\",\"\(sub_id)\"]"
+    return "[\"CLOSE\",\"\(sub_id)\"]"
 }
 
 func make_nostr_subscription_req(_ filters: [NostrFilter], sub_id: String) -> String? {
@@ -154,3 +145,10 @@ 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)
+}
+