Replace deprecated Data.withUnsafeMutableBytes call

.github/workflows/run-tests.yaml

@@ -1,31 +0,0 @@
-name: Run Test Suite 
-run-name: Testing ${{ github.ref }} by @${{ github.actor }}
-
-on:
-  push:
-    branches:
-      - "master"
-  pull_request:
-    branches:
-      - "*"
-
-
-jobs:
-  run_tests:
-    runs-on: macos-12
-    strategy:
-      matrix:
-        include:
-          - xcode: "14.2"
-            ios: "16.2"
-    
-    name: Test iOS (${{ matrix.ios }})
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Select Xcode
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: ${{ matrix.xcode }}
-      - name: Run Tests 
-        run: xcodebuild test -scheme damus -project damus.xcodeproj -destination 'platform=iOS Simulator,name=iPhone 14,OS=${{ matrix.ios }}' | xcpretty && exit ${PIPESTATUS[0]}

CHANGELOG.md

@@ -1,548 +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)
-- Add QRCode view for sharing your pubkey (ericholguin)
-- Added nostr: uri handling (William Casarin)
-
-### Changed
-
-- Remove markdown link support from posts (Joel Klabo)
-
-
-### Fixed
-
-- Fixed crash on some SVG profile pictures (OlegAba)
-- Localization fixes
-- Don't allow blocking yourself (Terry)
-- Hide muted users from global (William Casarin)
-- Fixed profiles sometimes not loading from other clients (William Casarin)
-- Fixed bug where `spam` was always the report type (William Casarin)
-
-
-
-[1.0.0-12]: https://github.com/damus-io/damus/releases/tag/v1.0.0-12
-
-## [1.0.0-11] - 2023-01-25
-
-### 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)
-- Added ability to block users (William Casarin)
-- Added a way to report content (William Casarin)
-- Stretchable profile cover header (Swift)
-
-
-### Changed
-
-- Bump pfp/banner animated fize size limit to 5MiB/20MiB (William Casarin)
-- Updated default boostrap relays (Ricardo Arturo Cabral Mejía)
-
-
-### Fixed
-
-- allow ws:// relays again (Steven Briscoe)
-
-
-
-[1.0.0-11]: https://github.com/damus-io/damus/releases/tag/v1.0.0-11
-
-
-## [1.0.0-8] - 2023-01-22
-
-### Added
-
-- 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)
-- Add DM Message Requests (William Casarin)
-
-
-### Fixed
-
-- Fix commands and emojis getting included in hashtags (William Casarin)
-- Fix duplicate post buttons when swiping tabs (Thomas Rademaker)
-- Show embedded note references (William Casarin)
-
-
-[1.0.0-8]: https://github.com/damus-io/damus/releases/tag/v1.0.0-8
-
-
-## [1.0.0-7] - 2023-01-20
-
-### Added
-
-- Drastically improved image viewer (OlegAba)
-- Added pinch to zoom on images (Swift)
-- Add Latin American Spanish translations (Nicolás Valencia)
-- Added SVG profile picture support (OlegAba)
-
-
-### Changed
-
-- Makes both name and username clickable in sidebar to go to profile (Zach Hendel)
-- Clicking pfp in sidebar opens profile as well (radixrat)
-- Don't blur images if your friend boosted it (ericholguin)
-
-
-### Fixed
-
-- Fix ... when too many likes/reposts (Joel Klabo)
-- Don't show report alert if logged in as a pubkey (Swift)
-- Fix padding issue at top of home timeline (Ben Weeks)
-- Fix absurdly large sidebar on Mac/iPad (John Bethancourt)
-- Fix tab views moving after selecting from search result (OlegAba)
-- Make follow/unfollow button a consistent width (OlegAba)
-- Don't add events to notifications from buggy relays (William Casarin)
-- Fixed some crashes with large images (OlegAba)
-- Fix DM sorting on incoming messages (William Casarin)
-- Fix text getting truncated next to link previews (William Casarin)
-
-
-[1.0.0-7]: https://github.com/damus-io/damus/releases/tag/v1.0.0-7
-
-
-## [1.0.0-6] - 2023-01-13
-
-### Added
-
-- Profile banner images (Jason Jōb)
-- Added Reactions View (William Casarin)
-- Left hand option for post button (Jonathan Milligan)
-- Damus icon at the top (Ben Weeks)
-- Make purple badges on profile page tappable (Joel Klabo)
-
-
-### Changed
-
-- Make Shaka button purple when liked (Joel Klabo)
-- Move counts to right side like Birdsite (Joel Klabo)
-- Use custom icon for shaka button (Joel Klabo)
-- Renamed boost to repost (William Casarin)
-- Removed nip05 domain from boosts/reposts (William Casarin)
-- Make DMs only take up 80% of screen width (Jonathan Milligan)
-- Hide Recommended Relays Section if Empty (Joel Klabo)
-
-
-### Fixed
-
-- Fixed shaka moving when you press it (Joel Klabo)
-- Fixed issue with relays not keeping in sync when adding (Fredrik Olofsson)
-
-
-
-[1.0.0-6]: https://github.com/damus-io/damus/releases/tag/v1.0.0-6
-
-
-## [1.0.0-5] - 2023-01-06
-
-### Added
-
-- Added share button to profile (William Casarin)
-- Added universal link sharing of notes (William Casarin)
-- Added clear cache button to wipe pfp/image cache (OlegAba)
-- Allow Adding Relay Without wss:// Prefix (Joel Klabo)
-- Allow Saving Images to Library (Joel Klabo)
-
-
-### Changed
-
-- Added damus gradient to post button (Ben Weeks)
-- Center the Post Button (Thomas)
-- Switch yellow nip05 check to gray (William Casarin)
-- Switch from bluecheck to purplecheck (William Casarin)
-
-
-### Fixed
-
-- Add system background color to profile pics (OlegAba)
-- High res color pubkey on profile page (William Casarin)
-- Don't spin forever if we're temporarily disconnected (William Casarin)
-- Fixed a few issues with avatars not animating (OlegAba)
-- Scroll to bottom when new DM received (Aidan O'Loan)
-- Make reply view scrollable (Joel Klabo)
-- Hide profile edit button when logged in with pubkey (Swift)
-
-
-[1.0.0-5]: https://github.com/damus-io/damus/releases/tag/v1.0.0-5
-
-## [1.0.0-4] - 2023-01-04
-
-### Added
-
-- Added NIP05 Verification (William Casarin)
-- Downscale images if they are unreasonably large (OlegAba)
-
-
-### Changed
-
-- Revert to old style ln/dm buttons (William Casarin)
-
-
-### Fixed
-
-- Fix ascii shrug guy (Lionello Lunesu)
-- Fix navigation popping in threads (William Casarin)
-
-
-[1.0.0-4]: https://github.com/damus-io/damus/releases/tag/v1.0.0-4
-
-## [1.0.0-2] - 2023-01-03
-
-### Added
-
-- Cache link previews (William Casarin)
-- Added brb.io to recommended relay list (William Casarin)
-- Add Blixt Wallet to Wallet Selector (Benjamin Hakes)
-- Add River Wallet to Wallet Selector (Benjamin Hakes)
-
-
-### Changed
-
-- Added muted shaka images instead of thumbs up (CutClout)
-- Updated profile page look and feel (Ben Weeks)
-- Filter replies from global feed (Nitesh Balusu)
-- Show non-image links inline (William Casarin)
-- Add swipe gesture to switch between tabs (Thomas Rademaker)
-- Parse links in profiles (Lionello Lunesu) (Lio李歐)
-
-
-### Fixed
-
-- Fix detection of email addresses in profiles (Lionello Lunesu)
-- Fix padding on search results view (OlegAba)
-- Fix home view moving after selecting from search result (OlegAba)
-- Fix bug where boost event is loaded in the thread instead of the boosted event (William Casarin)
-- Hide edit button on profile page when no private key (Swift)
-- Fixed follows and relays getting out of sync on profile pages (William Casarin)
-
-
-
-[1.0.0-2]: https://github.com/damus-io/damus/releases/tag/v1.0.0-2
 ## [1.0.0] - 2023-01-01
 
 ### Added
 
-- Parse links in profiles (Lionello Lunesu)
+- Parse links in profiles (William Casarin)
 - Added Breez wallet to wallet selector (Lee Salminen)
 - Added Bitcoin Beach wallet to wallet selector (Lee Salminen)
 - Added ability to copy relay urls (Matt Ward)

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
@@ -57,8 +56,8 @@ damus implements the following [Nostr Implementation Possibilities][nips]
 - Formatting Notes (may not format as intended in other web clients)
   - Italics: 1 asterisk `*italic*`
   - Bold: 2 asterisk `**bold**`
-  - Strikethrough: 1 tildes `~strikethrough~`
-  - Code: 1 back-tick `` `code` ``
+  - Strikethrough: 2 tildes `~~strikethrough~~`
+  - Code: 1 back-tick ``code``
 
 #### 💬 Encrypted DMs (chat app, bottom navigation)
 - Tap the chat icon and you'll notice there's nothing to see at first. Go to a user profile and tap the 💬 chat icon next to the follow button to begin a DM
@@ -92,23 +91,15 @@ damus implements the following [Nostr Implementation Possibilities][nips]
 
 ## Contributing
 
-Contributors welcome!
-
-### Code
-
-[Email patches][git-send-email] to jb55@jb55.com are preferred, but I accept PRs on GitHub as well.
+Contributors welcome! [Email patches][git-send-email] to jb55@jb55.com are preferred, but I accept PRs on github as well.
 
 [git-send-email]: http://git-send-email.io
 
-### Translations
+## git log bot
 
-Translators welcome! Join the [Transifex][transifex] project.
+npub1fjtdwclt9lspjy8huu3qklr7eklp5uq90u6yh8mec290pqxraccqlufnas
 
-All user-facing strings must have a comment in order to provide context to translators. If a SwiftUI component has a `comment` parameter, use that. Otherwise, wrap your string with `NSLocalizedString` with the `comment` field populated.
-
-[transifex]: https://explore.transifex.com/damus/damus-ios/
-
-### Awards
+### Awards 
 
 There may be nostr badges awarded for contributors in the future... :)
 
@@ -116,7 +107,3 @@ First contributors:
 
 1. @randymcmillan
 2. @jcarucci27
-
-### git log bot
-
-npub1fjtdwclt9lspjy8huu3qklr7eklp5uq90u6yh8mec290pqxraccqlufnas

damus-c/damus.c

@@ -22,14 +22,6 @@ static inline int is_whitespace(char c) {
     return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r';
 }
 
-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;
@@ -37,33 +29,16 @@ static void make_cursor(struct cursor *c, const u8 *content, size_t len)
     c->p = content;
 }
 
-static int consume_until_boundary(struct cursor *cur) {
-    char c;
-    
-    while (cur->p < cur->end) {
-        c = *cur->p;
-        
-        if (is_boundary(c))
-            return 1;
-        
-        cur->p++;
-    }
-    
-    return 1;
-}
-
 static int consume_until_whitespace(struct cursor *cur, int or_end) {
     char c;
-    bool consumedAtLeastOne = false;
     
     while (cur->p < cur->end) {
         c = *cur->p;
         
         if (is_whitespace(c))
-            return consumedAtLeastOne;
+            return 1;
         
         cur->p++;
-        consumedAtLeastOne = true;
     }
     
     return or_end;
@@ -170,7 +145,7 @@ static int parse_hashtag(struct cursor *cur, struct block *block) {
         return 0;
     }
     
-    consume_until_boundary(cur);
+    consume_until_whitespace(cur, 1);
     
     block->type = BLOCK_HASHTAG;
     block->block.str.start = (const char*)(start + 1);
@@ -225,9 +200,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"
       }
     },
     {
@@ -17,6 +17,15 @@
         "revision" : "40b4b38b3b1c83f7088c76189a742870e0ca06a9"
       }
     },
+    {
+      "identity" : "shimmer",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/joshuajhomann/Shimmer",
+      "state" : {
+        "branch" : "master",
+        "revision" : "2fde687b3f1d9c5409c53da095d3686361e41343"
+      }
+    },
     {
       "identity" : "starscream",
       "kind" : "remoteSourceControl",

damus.xcodeproj/xcshareddata/xcschemes/damus.xcscheme

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1420"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-               BuildableName = "damus.app"
-               BlueprintName = "damus"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEF227F7A08200C66700"
-               BuildableName = "damusTests.xctest"
-               BlueprintName = "damusTests"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CE6DEFC27F7A08200C66700"
-               BuildableName = "damusUITests.xctest"
-               BlueprintName = "damusUITests"
-               ReferencedContainer = "container:damus.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-            BuildableName = "damus.app"
-            BlueprintName = "damus"
-            ReferencedContainer = "container:damus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4CE6DEE227F7A08100C66700"
-            BuildableName = "damus.app"
-            BlueprintName = "damus"
-            ReferencedContainer = "container:damus.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

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

@@ -1,15 +1,6 @@
 {
   "colors" : [
     {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xC5",
-          "green" : "0x43",
-          "red" : "0xCC"
-        }
-      },
       "idiom" : "universal"
     }
   ],

damus/Assets.xcassets/Colors/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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

@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x00",
-          "green" : "0x00",
-          "red" : "0x00"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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

@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0x4D",
-          "red" : "0x4B"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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

@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x1E",
-          "green" : "0x1C",
-          "red" : "0x1C"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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

@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x4F",
-          "green" : "0xC3",
-          "red" : "0x66"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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

@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xF4",
-          "green" : "0xEE",
-          "red" : "0xEE"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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

@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x5F",
-          "green" : "0x5F",
-          "red" : "0x5F"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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

@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xC5",
-          "green" : "0x43",
-          "red" : "0xCC"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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

@@ -1,20 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0xFF",
-          "red" : "0xFF"
-        }
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/Profile/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "profile-banner.jpeg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "blixt-wallet.png",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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/damus-home.imageset/Contents.json

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

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

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "river.png",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

damus/Assets.xcassets/shaka-full.imageset/Contents.json

@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "shaka-full.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}

damus/Assets.xcassets/shaka-full.imageset/shaka-full.pdf

@@ -1,88 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 0.000000 -0.073975 cm
-1.000000 1.000000 1.000000 scn
-1.295334 8.661732 m
-3.613694 8.367855 l
-4.475733 8.733568 5.268113 9.771931 5.474915 10.327032 c
-6.083156 11.959681 5.507567 14.604573 5.474915 15.061715 c
-5.448792 15.427428 6.008246 15.693006 6.291239 15.780080 c
-7.571236 15.858447 8.508359 14.876789 8.642253 13.984165 c
-8.740212 13.331103 8.576948 11.752880 8.381030 10.849482 c
-8.979668 10.936556 10.980525 10.901726 11.868687 10.849482 c
-12.756847 10.797236 13.474895 10.196423 14.193260 9.412750 c
-14.767952 8.237244 13.953805 7.725680 13.474895 7.616838 c
-13.834077 7.257654 l
-14.781013 5.918882 13.649043 5.178749 13.115711 5.004600 c
-13.474895 4.743376 l
-14.487136 3.763786 13.246323 2.751544 13.017752 2.882155 c
-11.058574 3.176033 l
-15.499378 1.673996 l
-16.054478 0.400530 15.074889 0.073999 14.781013 0.073999 c
-8.576947 1.673996 l
-6.291239 1.673996 5.311650 1.869914 4.299407 2.163791 c
-4.157911 2.131138 3.659409 1.987464 2.797370 1.673996 c
-1.935332 1.360527 1.219143 2.087601 0.968804 2.490320 c
--0.285071 4.083785 -0.467927 7.257655 1.295334 8.661732 c
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  1149
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 15.666626 15.710510 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000001239 00000 n
-0000001262 00000 n
-0000001435 00000 n
-0000001509 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-1568
-%%EOF

damus/Assets.xcassets/shaka-line.imageset/Contents.json

@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "shaka-line.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}

damus/Assets.xcassets/shaka-line.imageset/shaka-line.pdf

@@ -1,323 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 0.474731 -0.563965 cm
-1.000000 1.000000 1.000000 scn
-3.613694 9.332577 m
-3.553993 8.861599 l
-3.637261 8.851044 3.721838 8.862753 3.799107 8.895533 c
-3.613694 9.332577 l
-h
-1.295334 9.626453 m
-1.355035 10.097433 l
-1.227973 10.113539 1.099794 10.077623 0.999601 9.997839 c
-1.295334 9.626453 l
-h
-0.968804 3.455042 m
-1.372000 3.705677 l
-1.362764 3.720535 1.352713 3.734872 1.341894 3.748621 c
-0.968804 3.455042 l
-h
-4.299407 3.128512 m
-4.431771 3.584435 l
-4.353942 3.607030 4.271623 3.609325 4.192656 3.591103 c
-4.299407 3.128512 l
-h
-8.576947 2.638718 m
-8.695503 3.098424 l
-8.656776 3.108411 8.616942 3.113465 8.576947 3.113465 c
-8.576947 2.638718 l
-h
-14.781013 1.038721 m
-14.662457 0.579016 l
-14.701184 0.569027 14.741018 0.563974 14.781013 0.563974 c
-14.781013 1.038721 l
-h
-15.499378 2.638718 m
-15.934578 2.828420 l
-15.881091 2.951125 15.778289 3.045548 15.651489 3.088437 c
-15.499378 2.638718 l
-h
-11.058574 4.140755 m
-11.128998 4.610250 l
-10.885809 4.646729 10.655017 4.491467 10.597156 4.252461 c
-10.539293 4.013455 10.673516 3.769826 10.906463 3.691035 c
-11.058574 4.140755 l
-h
-13.017752 3.846877 m
-13.253292 4.259073 l
-13.202273 4.288227 13.146286 4.307655 13.088176 4.316372 c
-13.017752 3.846877 l
-h
-13.474895 5.708097 m
-13.805044 6.049252 l
-13.789093 6.064689 13.772079 6.078987 13.754128 6.092043 c
-13.474895 5.708097 l
-h
-13.115711 5.969321 m
-12.968349 6.420619 l
-12.798800 6.365256 12.674588 6.219535 12.646772 6.043359 c
-12.618958 5.867183 12.692234 5.690281 12.836478 5.585376 c
-13.115711 5.969321 l
-h
-13.834077 8.222376 m
-14.221668 8.496526 l
-14.206144 8.518474 14.188784 8.539063 14.169774 8.558073 c
-13.834077 8.222376 l
-h
-13.474895 8.581559 m
-13.369680 9.044500 l
-13.201114 9.006190 13.066693 8.879284 13.018762 8.713197 c
-12.970830 8.547110 13.016963 8.368095 13.139197 8.245862 c
-13.474895 8.581559 l
-h
-14.193260 10.377472 m
-14.619765 10.585986 l
-14.599768 10.626891 14.573989 10.664707 14.543221 10.698271 c
-14.193260 10.377472 l
-h
-8.381030 11.814203 m
-7.917068 11.914822 l
-7.884080 11.762714 7.927746 11.604099 8.033934 11.490305 c
-8.140121 11.376513 8.295343 11.321997 8.449365 11.344399 c
-8.381030 11.814203 l
-h
-8.642253 14.948887 m
-9.111748 15.019311 l
-8.642253 14.948887 l
-h
-6.291239 16.744801 m
-6.262227 17.218662 l
-6.224693 17.216364 6.187564 17.209614 6.151623 17.198555 c
-6.291239 16.744801 l
-h
-5.474915 16.026436 m
-5.948456 16.060261 l
-5.474915 16.026436 l
-h
-5.474915 11.291754 m
-5.030037 11.457493 l
-5.474915 11.291754 l
-h
-3.673396 9.803555 m
-1.355035 10.097433 l
-1.235632 9.155476 l
-3.553993 8.861599 l
-3.673396 9.803555 l
-h
-0.999601 9.997839 m
--0.029049 9.178730 -0.454726 7.875908 -0.474048 6.619066 c
--0.493367 5.362488 -0.110331 4.058727 0.595713 3.161463 c
-1.341894 3.748621 l
-0.794064 4.444821 0.458734 5.524729 0.475334 6.604470 c
-0.491930 7.683949 0.856455 8.670100 1.591066 9.255068 c
-0.999601 9.997839 l
-h
-0.565608 3.204407 m
-0.721970 2.952868 1.013515 2.611341 1.407507 2.372385 c
-1.811404 2.127421 2.357187 1.973489 2.959612 2.192553 c
-2.635129 3.084882 l
-2.375515 2.990478 2.132184 3.043347 1.899893 3.184233 c
-1.657696 3.331126 1.465977 3.554496 1.372000 3.705677 c
-0.565608 3.204407 l
-h
-2.959612 2.192553 m
-3.816493 2.504146 4.293336 2.639887 4.406158 2.665923 c
-4.192656 3.591103 l
-4.022485 3.551832 3.502325 3.400227 2.635129 3.084882 c
-2.959612 2.192553 l
-h
-4.167043 2.672591 m
-5.229115 2.364247 6.254152 2.163970 8.576947 2.163970 c
-8.576947 3.113465 l
-6.328326 3.113465 5.394184 3.305025 4.431771 3.584435 c
-4.167043 2.672591 l
-h
-8.458392 2.179011 m
-14.662457 0.579016 l
-14.899569 1.498427 l
-8.695503 3.098424 l
-8.458392 2.179011 l
-h
-14.781013 0.563974 m
-15.036198 0.563974 15.495326 0.684875 15.814721 1.047266 c
-16.180891 1.462728 16.264221 2.072176 15.934578 2.828420 c
-15.064179 2.449016 l
-15.289635 1.931793 15.160722 1.741243 15.102402 1.675073 c
-15.055794 1.622190 14.990156 1.579316 14.916806 1.549556 c
-14.881134 1.535082 14.847747 1.525430 14.820526 1.519657 c
-14.791491 1.513498 14.777695 1.513469 14.781013 1.513469 c
-14.781013 0.563974 l
-h
-15.651489 3.088437 m
-11.210685 4.590474 l
-10.906463 3.691035 l
-15.347267 2.188998 l
-15.651489 3.088437 l
-h
-10.988150 3.671260 m
-12.947328 3.377382 l
-13.088176 4.316372 l
-11.128998 4.610250 l
-10.988150 3.671260 l
-h
-12.782211 3.434681 m
-12.991495 3.315090 13.204453 3.370091 13.288217 3.396689 c
-13.400116 3.432221 13.506123 3.490767 13.598186 3.554502 c
-13.783985 3.683133 13.977411 3.877748 14.120350 4.119644 c
-14.264680 4.363894 14.369576 4.678114 14.335162 5.031647 c
-14.300108 5.391746 14.125634 5.739002 13.805044 6.049252 c
-13.144745 5.366943 l
-13.330275 5.187398 13.380290 5.040778 13.390134 4.939653 c
-13.400617 4.831963 13.370820 4.717613 13.302905 4.602680 c
-13.233600 4.485394 13.137231 4.390213 13.057724 4.335170 c
-13.017135 4.307070 12.996612 4.300308 13.000857 4.301657 c
-13.003194 4.302399 13.024761 4.309311 13.061064 4.310122 c
-13.095938 4.310902 13.170414 4.306433 13.253292 4.259073 c
-12.782211 3.434681 l
-h
-13.754128 6.092043 m
-13.394944 6.353267 l
-12.836478 5.585376 l
-13.195662 5.324152 l
-13.754128 6.092043 l
-h
-13.263074 5.518023 m
-13.593105 5.625790 14.123367 5.907292 14.433812 6.409482 c
-14.595931 6.671733 14.696482 6.993351 14.669847 7.364054 c
-14.643518 7.730516 14.495621 8.109214 14.221668 8.496526 c
-13.446486 7.948226 l
-13.646002 7.666152 13.711709 7.450294 13.722795 7.296009 c
-13.733575 7.145966 13.695351 7.020646 13.626177 6.908748 c
-13.474038 6.662641 13.171650 6.487002 12.968349 6.420619 c
-13.263074 5.518023 l
-h
-14.169774 8.558073 m
-13.810592 8.917255 l
-13.139197 8.245862 l
-13.498380 7.886679 l
-14.169774 8.558073 l
-h
-13.580109 8.118617 m
-13.896242 8.190466 14.344993 8.395787 14.624650 8.816864 c
-14.929440 9.275781 14.963785 9.882310 14.619765 10.585986 c
-13.766754 10.168959 l
-13.997427 9.697128 13.912044 9.460121 13.833706 9.342171 c
-13.730235 9.186377 13.532457 9.081495 13.369680 9.044500 c
-13.580109 8.118617 l
-h
-14.543221 10.698271 m
-13.820906 11.486253 12.989320 12.223852 11.896564 12.288132 c
-11.840808 11.340275 l
-12.524374 11.300065 13.128883 10.836036 13.843298 10.056674 c
-14.543221 10.698271 l
-h
-11.896564 12.288132 m
-11.441970 12.314873 10.711069 12.336796 10.019300 12.341186 c
-9.341933 12.345484 8.654247 12.333687 8.312695 12.284006 c
-8.449365 11.344399 l
-8.706450 11.381794 9.318512 11.396118 10.013274 11.391710 c
-10.693633 11.387392 11.407242 11.365778 11.840808 11.340275 c
-11.896564 12.288132 l
-h
-8.844993 11.713585 m
-8.948084 12.188952 9.040332 12.829445 9.094679 13.432834 c
-9.147870 14.023395 9.169946 14.631327 9.111748 15.019311 c
-8.172758 14.878462 l
-8.212520 14.613384 8.201942 14.105675 8.149012 13.518009 c
-8.097237 12.943172 8.009893 12.342852 7.917068 11.914822 c
-8.844993 11.713585 l
-h
-9.111748 15.019311 m
-8.944062 16.137217 7.805658 17.313158 6.262227 17.218662 c
-6.320251 16.270941 l
-7.336813 16.333179 8.072657 15.545805 8.172758 14.878462 c
-9.111748 15.019311 l
-h
-6.151623 17.198555 m
-5.976391 17.144638 5.715709 17.036982 5.490986 16.876261 c
-5.292936 16.734617 4.969444 16.439627 5.001374 15.992612 c
-5.948456 16.060261 l
-5.951383 16.019283 5.934667 15.999795 5.943361 16.012491 c
-5.954769 16.029152 5.984430 16.061831 6.043331 16.103956 c
-6.162553 16.189222 6.323094 16.257891 6.430855 16.291048 c
-6.151623 17.198555 l
-h
-5.001374 15.992612 m
-5.011176 15.855374 5.059216 15.566318 5.104405 15.255149 c
-5.152757 14.922197 5.207128 14.509316 5.241940 14.062993 c
-5.312967 13.152368 5.295928 12.171200 5.030037 11.457493 c
-5.919792 11.126015 l
-6.262142 12.044956 6.261431 13.202559 6.188560 14.136827 c
-6.151423 14.612950 6.093790 15.049047 6.044043 15.391605 c
-5.991133 15.755945 5.954979 15.968927 5.948456 16.060261 c
-5.001374 15.992612 l
-h
-5.030037 11.457493 m
-4.953650 11.252455 4.742510 10.903708 4.434547 10.555828 c
-4.127778 10.209298 3.769400 9.914337 3.428282 9.769621 c
-3.799107 8.895533 l
-4.320028 9.116529 4.788858 9.523607 5.145489 9.926461 c
-5.500926 10.327968 5.789377 10.775953 5.919792 11.126015 c
-5.030037 11.457493 l
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  7995
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 16.615845 16.660034 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000008085 00000 n
-0000008108 00000 n
-0000008281 00000 n
-0000008355 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-8414
-%%EOF

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/Highlight.swift

@@ -1,39 +0,0 @@
-//
-//  Highlight.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-23.
-//
-
-import Foundation
-import SwiftUI
-
-
-enum Highlight {
-    case none
-    case main
-    case reply
-    case custom(Color, Float)
-
-    var is_main: Bool {
-        if case .main = self {
-            return true
-        }
-        return false
-    }
-
-    var is_none: Bool {
-        if case .none = self {
-            return true
-        }
-        return false
-    }
-
-    var is_replied_to: Bool {
-        switch self {
-        case .reply: return true
-        default: return false
-        }
-    }
-}
-

damus/Components/ImageCarousel.swift

@@ -12,14 +12,14 @@ import Kingfisher
 struct ShareSheet: UIViewControllerRepresentable {
     typealias Callback = (_ activityType: UIActivity.ActivityType?, _ completed: Bool, _ returnedItems: [Any]?, _ error: Error?) -> Void
     
-    let activityItems: [URL?]
+    let activityItems: [URL]
     let callback: Callback? = nil
     let applicationActivities: [UIActivity]? = nil
     let excludedActivityTypes: [UIActivity.ActivityType]? = nil
     
     func makeUIViewController(context: Context) -> UIActivityViewController {
         let controller = UIActivityViewController(
-            activityItems: activityItems as [Any],
+            activityItems: activityItems,
             applicationActivities: applicationActivities)
         controller.excludedActivityTypes = excludedActivityTypes
         controller.completionWithItemsHandler = callback
@@ -31,7 +31,86 @@ 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("Copy Image URL", systemImage: "doc.on.doc")
+            }
+            if let someImage = image {
+                Button {
+                    UIPasteboard.general.image = someImage
+                } label: {
+                    Label("Copy Image", systemImage: "photo.on.rectangle")
+                }
+            }
+            Button {
+                showShareSheet = true
+            } label: {
+                Label("Share", systemImage: "square.and.arrow.up")
+            }
+        }
+    }
+}
 
+struct ImageViewer: View {
+    let urls: [URL]
+    
+    private struct ImageHandler: ImageModifier {
+        @Binding var handler: UIImage?
+        
+        func modify(_ image: UIImage) -> UIImage {
+            handler = image
+            return image
+        }
+    }
+
+    @State private var image: UIImage?
+    @State private var showShareSheet = false
+    
+    func onShared(completed: Bool) -> Void {
+        if (completed) {
+            showShareSheet = false
+        }
+    }
+    
+    var body: some View {
+        TabView {
+            ForEach(urls, id: \.absoluteString) { url in
+                VStack{
+                    Text(url.lastPathComponent)
+                    
+                    KFAnimatedImage(url)
+                        .configure { view in
+                            view.framePreloadCount = 3
+                        }
+                        .cacheOriginalImage()
+                        .imageModifier(ImageHandler(handler: $image))
+                        .loadDiskFileSynchronously()
+                        .scaleFactor(UIScreen.main.scale)
+                        .fade(duration: 0.1)
+                        .aspectRatio(contentMode: .fit)
+                        .tabItem {
+                            Text(url.absoluteString)
+                        }
+                        .id(url.absoluteString)
+                        .modifier(ImageContextMenuModifier(url: url, image: image, showShareSheet: $showShareSheet))
+                        .sheet(isPresented: $showShareSheet) {
+                            ShareSheet(activityItems: [url])
+                        }
+
+                }
+            }
+        }
+        .tabViewStyle(PageTabViewStyle())
+    }
+}
 
 struct ImageCarousel: View {
     var urls: [URL]
@@ -46,29 +125,31 @@ struct ImageCarousel: View {
                     .foregroundColor(Color.clear)
                     .overlay {
                         KFAnimatedImage(url)
-                            .imageContext(.note)
-                            .cancelOnDisappear(true)
                             .configure { view in
                                 view.framePreloadCount = 3
                             }
-                            .aspectRatio(contentMode: .fill)
-                            //.cornerRadius(10)
+                            .cacheOriginalImage()
+                            .loadDiskFileSynchronously()
+                            .scaleFactor(UIScreen.main.scale)
+                            .fade(duration: 0.1)
+                            .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("Copy Image") {
+                                    UIPasteboard.general.string = url.absoluteString
+                                }
+                            }
                     }
             }
         }
-        .fullScreenCover(isPresented: $open_sheet) {
-            ImageView(urls: urls)
+        .cornerRadius(10)
+        .sheet(isPresented: $open_sheet) {
+            ImageViewer(urls: urls)
         }
-        .frame(height: 350)
+        .frame(height: 200)
         .onTapGesture {
             open_sheet = true
         }
@@ -78,6 +159,6 @@ struct ImageCarousel: View {
 
 struct ImageCarousel_Previews: PreviewProvider {
     static var previews: some View {
-        ImageCarousel(urls: [URL(string: "https://jb55.com/red-me.jpg")!,URL(string: "https://jb55.com/red-me.jpg")!])
+        ImageCarousel(urls: [URL(string: "https://jb55.com/red-me.jpg")!])
     }
 }

damus/Components/InvoiceView.swift

@@ -7,52 +7,43 @@
 
 import SwiftUI
 
+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)
+    } else {
+        if let url = URL(string: wallet.appStoreLink), UIApplication.shared.canOpenURL(url) {
+            UIApplication.shared.open(url)
+        }
+    }
+}
+
 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"))
-            }
-        }
-    }
+    @ObservedObject var user_settings = UserSettingsStore()
     
     var PayButton: some View {
         Button {
-            if should_show_wallet_selector(our_pubkey) {
+            if user_settings.show_wallet_selector {
                 showing_select_wallet = true
             } else {
-                open_with_wallet(wallet: get_default_wallet(our_pubkey).model, invoice: invoice.string)
+                open_with_wallet(wallet: user_settings.default_wallet.model, invoice: invoice.string)
             }
         } label: {
-            RoundedRectangle(cornerRadius: 20, style: .circular)
+            RoundedRectangle(cornerRadius: 20)
                 .foregroundColor(colorScheme == .light ? .black : .white)
                 .overlay {
-                    Text("Pay", comment: "Button to pay a Lightning invoice.")
+                    Text("Pay")
                         .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)
-            print("pay button tap")
         }
     }
     
@@ -65,12 +56,10 @@ struct InvoiceView: View {
                 HStack {
                     Label("", systemImage: "bolt.fill")
                         .foregroundColor(.orange)
-                    Text("Lightning Invoice", comment: "Indicates that the view is for paying a Lightning invoice.")
-                    Spacer()
-                    CopyButton
+                    Text("Lightning Invoice")
                 }
                 Divider()
-                Text(invoice.description_string)
+                Text(invoice.description)
                 Text(invoice.amount.amount_sats_str())
                     .font(.title)
                 PayButton
@@ -80,38 +69,16 @@ struct InvoiceView: View {
             .padding(30)
         }
         .sheet(isPresented: $showing_select_wallet, onDismiss: {showing_select_wallet = false}) {
-            SelectWalletView(showingSelectWallet: $showing_select_wallet, our_pubkey: our_pubkey, invoice: invoice.string)
+            SelectWalletView(showingSelectWallet: $showing_select_wallet, invoice: invoice.string).environmentObject(user_settings)
         }
     }
 }
 
-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)
-    } else {
-        guard let store_link = wallet.appStoreLink else {
-            // TODO: do something here if we don't have an appstore link
-            return
-        }
-        
-        guard let url = URL(string: store_link) else {
-            return
-        }
-        
-        guard UIApplication.shared.canOpenURL(url) else {
-            return
-        }
-        
-        UIApplication.shared.open(url)
-    }
-}
-
-
-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/NIP05Badge.swift

@@ -1,65 +0,0 @@
-//
-//  NIP05Badge.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-11.
-//
-
-import SwiftUI
-
-struct NIP05Badge: View {
-    let nip05: NIP05
-    let pubkey: String
-    let contacts: Contacts
-    let show_domain: Bool
-    let clickable: Bool
-    
-    @Environment(\.openURL) var openURL
-    
-    init (nip05: NIP05, pubkey: String, contacts: Contacts, show_domain: Bool, clickable: Bool) {
-        self.nip05 = nip05
-        self.pubkey = pubkey
-        self.contacts = contacts
-        self.show_domain = show_domain
-        self.clickable = clickable
-    }
-    
-    var nip05_color: Color {
-       return get_nip05_color(pubkey: pubkey, contacts: contacts)
-    }
-    
-    var body: some View {
-        HStack(spacing: 2) {
-            Image(systemName: "checkmark.seal.fill")
-                .font(.footnote)
-                .foregroundColor(nip05_color)
-            if show_domain {
-                if clickable {
-                    Text(nip05.host)
-                        .foregroundColor(nip05_color)
-                        .onTapGesture {
-                            if let nip5url = nip05.siteUrl {
-                                openURL(nip5url)
-                            }
-                        }
-                } else {
-                    Text(nip05.host)
-                        .foregroundColor(nip05_color)
-                }
-            }
-        }
-
-    }
-}
-
-func get_nip05_color(pubkey: String, contacts: Contacts) -> Color {
-    return contacts.is_friend_or_self(pubkey) ? .accentColor : .gray
-}
-
-struct NIP05Badge_Previews: PreviewProvider {
-    static var previews: some View {
-        let test_state = test_damus_state()
-        NIP05Badge(nip05: NIP05(username: "jb55", host: "jb55.com"), pubkey: test_state.pubkey, contacts: test_state.contacts, show_domain: true, clickable: false)
-    }
-}
-

damus/Components/Reposted.swift

@@ -1,32 +0,0 @@
-//
-//  Reposted.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-11.
-//
-
-import SwiftUI
-
-struct Reposted: View {
-    let damus: DamusState
-    let pubkey: String
-    let profile: Profile?
-    
-    var body: some View {
-        HStack(alignment: .center) {
-            Image(systemName: "arrow.2.squarepath")
-                .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).")
-                .foregroundColor(Color.gray)
-        }
-    }
-}
-
-struct Reposted_Previews: PreviewProvider {
-    static var previews: some View {
-        let test_state = test_damus_state()
-        Reposted(damus: test_state, pubkey: test_state.pubkey, profile: make_test_profile())
-    }
-}

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/TextFieldAlert.swift

@@ -20,7 +20,7 @@ struct TextFieldAlert<Presenting>: View where Presenting: View {
                     .disabled(isShowing)
                 VStack {
                     Text(self.title)
-                    TextField(NSLocalizedString("Relay", comment: "Text field for relay server. Used for testing purposes."), text: self.$text)
+                    TextField("Relay", text: self.$text)
                     Divider()
                     HStack {
                         Button(action: {
@@ -28,7 +28,7 @@ struct TextFieldAlert<Presenting>: View where Presenting: View {
                                 self.isShowing.toggle()
                             }
                         }) {
-                            Text("Dismiss", comment: "Button to dismiss a text field alert.")
+                            Text("Dismiss")
                         }
                     }
                 }

damus/Components/TranslateView.swift

@@ -1,140 +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
-
-    let preferredLanguages = Set(Locale.preferredLanguages.map { localeToLanguage($0) })
-    
-    var TranslateButton: some View {
-        Button(NSLocalizedString("Translate Note", 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"
-            }
-
-            noteLanguage = event.note_language(damus_state.keypair.privkey) ?? currentLanguage
-            
-            guard let note_lang = noteLanguage else {
-                noteLanguage = currentLanguage
-                translated_note = nil
-                checkingTranslationStatus = false
-                return
-            }
-            
-            if !preferredLanguages.contains(note_lang) {
-                do {
-                    // If the note language is different from our preferred languages, send a translation request.
-                    let translator = Translator(damus_state.settings)
-                    let originalContent = event.get_content(damus_state.keypair.privkey)
-                    translated_note = try await translator.translate(originalContent, from: note_lang, to: currentLanguage)
-
-                    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
-
-            show_translated_note = damus_state.settings.auto_translate
-        }
-    }
-}
-
-extension View {
-    func translate_button_style() -> some View {
-        return self
-            .font(.footnote)
-            .contentShape(Rectangle())
-            .padding([.top, .bottom], 10)
-    }
-}
-
-struct TranslateView_Previews: PreviewProvider {
-    static var previews: some View {
-        let ds = test_damus_state()
-        TranslateView(damus_state: ds, event: test_event)
-    }
-}

damus/Components/UserView.swift

@@ -1,38 +0,0 @@
-//
-//  UserView.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-25.
-//
-
-import SwiftUI
-
-struct UserView: View {
-    let damus_state: DamusState
-    let pubkey: String
-    
-    var body: some View {
-        NavigationLink(destination: ProfileView(damus_state: damus_state, pubkey: pubkey)) {
-            ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles)
-        
-            VStack(alignment: .leading) {
-                let profile = damus_state.profiles.lookup(id: pubkey)
-                ProfileName(pubkey: pubkey, profile: profile, damus: damus_state, show_friend_confirmed: false, show_nip5_domain: false)
-                if let about = profile?.about {
-                    Text(about)
-                        .lineLimit(3)
-                        .font(.footnote)
-                }
-            }
-            
-            Spacer()
-        }
-        .buttonStyle(PlainButtonStyle())
-    }
-}
-
-struct UserView_Previews: PreviewProvider {
-    static var previews: some View {
-        UserView(damus_state: test_damus_state(), pubkey: "pk")
-    }
-}

damus/Components/WebsiteLink.swift

@@ -1,38 +0,0 @@
-//
-//  WebsiteLink.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-22.
-//
-
-import SwiftUI
-
-struct WebsiteLink: View {
-    let url: URL
-    @Environment(\.openURL) var openURL
-
-    var body: some View {
-        HStack {
-            Image(systemName: "link")
-                .foregroundColor(.gray)
-                .font(.footnote)
-            
-            Button(action: {
-                openURL(url)
-            }, label: {
-                Text(link_text)
-                    .font(.footnote)
-            })
-        }
-    }
-    
-    var link_text: String {
-        url.host ?? url.absoluteString
-    }
-}
-
-struct WebsiteLink_Previews: PreviewProvider {
-    static var previews: some View {
-        WebsiteLink(url: URL(string: "https://jb55.com")!)
-    }
-}

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/Components/ZoomableScrollView.swift

@@ -1,152 +0,0 @@
-//
-//  ZoomableScrollView.swift
-//  damus
-//
-//  Created by Oleg Abalonski on 1/25/23.
-//
-
-import SwiftUI
-
-struct ZoomableScrollView<Content: View>: UIViewRepresentable {
-    
-    private var content: Content
-
-    init(@ViewBuilder content: () -> Content) {
-        self.content = content()
-    }
-
-    func makeUIView(context: Context) -> UIScrollView {
-        let scrollView = GesturedScrollView()
-        scrollView.delegate = context.coordinator
-        scrollView.maximumZoomScale = 20
-        scrollView.minimumZoomScale = 1
-        scrollView.bouncesZoom = true
-        scrollView.showsVerticalScrollIndicator = false
-        scrollView.showsHorizontalScrollIndicator = false
-
-        let hostedView = context.coordinator.hostingController.view!
-        hostedView.translatesAutoresizingMaskIntoConstraints = true
-        hostedView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        hostedView.frame = scrollView.bounds
-        hostedView.backgroundColor = .clear
-        scrollView.addSubview(hostedView)
-
-        return scrollView
-    }
-
-    func makeCoordinator() -> Coordinator {
-        return Coordinator(hostingController: UIHostingController(rootView: self.content, ignoreSafeArea: true))
-    }
-
-    func updateUIView(_ uiView: UIScrollView, context: Context) {
-        context.coordinator.hostingController.rootView = self.content
-        assert(context.coordinator.hostingController.view.superview == uiView)
-    }
-
-    class Coordinator: NSObject, UIScrollViewDelegate {
-        var hostingController: UIHostingController<Content>
-
-        init(hostingController: UIHostingController<Content>) {
-            self.hostingController = hostingController
-        }
-
-        func viewForZooming(in scrollView: UIScrollView) -> UIView? {
-            return hostingController.view
-        }
-        
-        func scrollViewDidZoom(_ scrollView: UIScrollView) {
-            let viewSize = hostingController.view.frame.size
-            guard let imageSize = scrollView.subviews[0].subviews.last?.frame.size else { return }
-            
-            if scrollView.zoomScale > 1 {
-
-                let ratioW = viewSize.width / imageSize.width
-                let ratioH = viewSize.height / imageSize.height
-
-                let ratio = ratioW < ratioH ? ratioW:ratioH
-
-                let newWidth = imageSize.width * ratio
-                let newHeight = imageSize.height * ratio
-
-                let left = 0.5 * (newWidth * scrollView.zoomScale > viewSize.width ? (newWidth - viewSize.width) : (scrollView.frame.width - scrollView.contentSize.width))
-                let top = 0.5 * (newHeight * scrollView.zoomScale > viewSize.height ? (newHeight - viewSize.height) : (scrollView.frame.height - scrollView.contentSize.height))
-
-                scrollView.contentInset = UIEdgeInsets(top: top, left: left, bottom: top, right: left)
-            } else {
-                scrollView.contentInset = .zero
-            }
-        }
-    }
-}
-
-fileprivate class GesturedScrollView: UIScrollView, UIGestureRecognizerDelegate {
-    
-    let doubleTapGesture: UITapGestureRecognizer
-    
-    override init(frame: CGRect) {
-        doubleTapGesture = UITapGestureRecognizer()
-        super.init(frame: frame)
-        doubleTapGesture.addTarget(self, action: #selector(handleDoubleTap))
-        doubleTapGesture.numberOfTapsRequired = 2
-        addGestureRecognizer(doubleTapGesture)
-        doubleTapGesture.delegate = self
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    @objc func handleDoubleTap(_ gesture: UITapGestureRecognizer) {
-        if self.zoomScale == 1 {
-            let pointInView = gesture.location(in: self.subviews.first)
-            let newZoomScale = self.maximumZoomScale / 4.0
-            let scrollViewSize = self.bounds.size
-            let width = scrollViewSize.width / newZoomScale
-            let height = scrollViewSize.height / newZoomScale
-            let originX = pointInView.x - (width / 2.0)
-            let originY = pointInView.y - (height / 2.0)
-            let zoomRect = CGRect(x: originX, y: originY, width: width, height: height)
-            self.zoom(to: zoomRect, animated: true)
-        } else {
-            self.setZoomScale(self.minimumZoomScale, animated: true)
-        }
-    }
-    
-    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-        return gestureRecognizer == doubleTapGesture
-    }
-}
-
-fileprivate extension UIHostingController {
-    
-    convenience init(rootView: Content, ignoreSafeArea: Bool) {
-        self.init(rootView: rootView)
-        
-        if ignoreSafeArea {
-            disableSafeArea()
-        }
-    }
-    
-    func disableSafeArea() {
-        guard let viewClass = object_getClass(view) else { return }
-        
-        let viewSubclassName = String(cString: class_getName(viewClass)).appending("_IgnoreSafeArea")
-        if let viewSubclass = NSClassFromString(viewSubclassName) {
-            object_setClass(view, viewSubclass)
-        }
-        else {
-            guard let viewClassNameUtf8 = (viewSubclassName as NSString).utf8String else { return }
-            guard let viewSubclass = objc_allocateClassPair(viewClass, viewClassNameUtf8, 0) else { return }
-            
-            if let method = class_getInstanceMethod(UIView.self, #selector(getter: UIView.safeAreaInsets)) {
-                let safeAreaInsets: @convention(block) (AnyObject) -> UIEdgeInsets = { _ in
-                    return .zero
-                }
-                class_addMethod(viewSubclass, #selector(getter: UIView.safeAreaInsets), imp_implementationWithBlock(safeAreaInsets), method_getTypeEncoding(method))
-            }
-            
-            objc_registerClassPair(viewSubclass)
-            object_setClass(view, viewSubclass)
-        }
-    }
-}

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-relay.wlvs.space",
+    "wss://nostr.fmt.wiz.biz",
+    "wss://relay.nostr.bg",
+    "wss://nostr.oxtr.dev",
+    "wss://nostr.v0l.io",
+    "wss://nostr-2.zebedee.cloud",
 ]
 
 struct TimestampedProfile {
@@ -22,18 +26,12 @@ struct TimestampedProfile {
 
 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"
         }
     }
 }
@@ -46,15 +44,6 @@ enum ThreadState {
 enum FilterState : Int {
     case posts_and_replies = 1
     case posts = 0
-    
-    func filter(ev: NostrEvent) -> Bool {
-        switch self {
-        case .posts:
-            return !ev.is_reply(nil)
-        case .posts_and_replies:
-            return true
-        }
-    }
 }
 
 struct ContentView: View {
@@ -73,24 +62,18 @@ 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
-    @State var blocking: String? = nil
-    @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()
 
@@ -99,31 +82,23 @@ struct ContentView: View {
     @Environment(\.colorScheme) var colorScheme
 
     var PostingTimelineView: some View {
-        VStack {
+        VStack{
             ZStack {
-                TabView(selection: $filter_state) {
-                    contentTimelineView(filter: FilterState.posts.filter)
-                        .tag(FilterState.posts)
-                        .id(FilterState.posts)
-                    contentTimelineView(filter: FilterState.posts_and_replies.filter)
-                        .tag(FilterState.posts_and_replies)
-                        .id(FilterState.posts_and_replies)
+                if let damus = self.damus_state {
+                    TimelineView(events: $home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter_event)
                 }
-                .tabViewStyle(.page(indexDisplayMode: .never))
-                
                 if privkey != nil {
-                    PostButtonContainer(is_left_handed: damus_state?.settings.left_handed ?? false) {
+                    PostButtonContainer {
                         self.active_sheet = .post
                     }
                 }
-            }
+            }.ignoresSafeArea(.keyboard, edges: .bottom)
         }
-        .safeAreaInset(edge: .top, spacing: 0) {
+        .safeAreaInset(edge: .top) {
             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)
             }
@@ -131,38 +106,22 @@ 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)
+    var FiltersView: some View {
+        VStack{
+            Picker("Filter State", selection: $filter_state) {
+                Text("Posts").tag(FilterState.posts)
+                Text("Posts & Replies").tag(FilterState.posts_and_replies)
             }
+            .pickerStyle(.segmented)
         }
     }
     
-    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: "")
+    func filter_event(_ ev: NostrEvent) -> Bool {
+        if self.filter_state == .posts {
+            return !ev.is_reply(nil)
         }
+        
+        return true
     }
     
     func MainContent(damus: DamusState) -> some View {
@@ -170,30 +129,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("Notifications")
                 
             case .dms:
                 DirectMessagesView(damus_state: damus_state!)
@@ -203,31 +154,23 @@ struct ContentView: View {
                 EmptyView()
             }
         }
-        .navigationBarTitle(timeline_name(selected_timeline), 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)
-                    }
-                }
-            }
-        }
+        .navigationBarTitle(selected_timeline == .home ?  "Home" : "Global", displayMode: .inline)
     }
     
     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()
             }
@@ -245,101 +188,63 @@ struct ContentView: View {
             }
         }
     }
-    
-    func MaybeReportView(target: ReportTarget) -> some View {
-        Group {
-            if let ds = damus_state {
-                if let sec = ds.keypair.privkey {
-                    ReportView(pool: ds.pool, target: target, privkey: sec)
-                } else {
-                    EmptyView()
-                }
-            } else {
-                EmptyView()
-            }
-        }
-    }
-    
+
     var body: some 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)
+                    MainContent(damus: damus)
+                        .toolbar {
+                            ToolbarItem(placement: .navigationBarLeading) {
+                                let profile_model = ProfileModel(pubkey: damus_state!.pubkey, damus: damus_state!)
+                                let followers_model = FollowersModel(damus_state: damus_state!, target: damus_state!.pubkey)
+                                let prof_dest = ProfileView(damus_state: damus_state!, profile: profile_model, followers: followers_model)
+
+                                NavigationLink(destination: prof_dest) {
+                                    /// Verify that the user has a profile picture, if not display a generic SF Symbol
+                                    /// (Resolves an in-app error where ``Robohash`` pictures are not generated so the button dissapears
+                                    if let picture = damus_state?.profiles.lookup(id: pubkey)?.picture {
+                                        ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles, picture: picture)
+                                    } else {
+                                        Image(systemName: "person.fill")
                                     }
-                                    .disabled(isSideBarOpened)
                                 }
-                                
-                                ToolbarItem(placement: .navigationBarTrailing) {
-                                    HStack(alignment: .center) {
-                                        if home.signal.signal != home.signal.max_signal {
-                                            NavigationLink(destination: RelayConfigView(state: damus_state!)) {
-                                                Text("\(home.signal.signal)/\(home.signal.max_signal)", comment: "Fraction of how many of the user's relay servers that are operational.")
-                                                    .font(.callout)
-                                                    .foregroundColor(.gray)
-                                            }
-                                        }
-                                        
-                                        // maybe expand this to other timelines in the future
-                                        if selected_timeline == .search {
-                                            Button(action: {
-                                                //isFilterVisible.toggle()
-                                                self.active_sheet = .filter
-                                            }) {
-                                                // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease...,  line.3.horizontail.decrease
-                                                Label(NSLocalizedString("Filter", comment: "Button label text for filtering relay servers."), systemImage: "line.3.horizontal.decrease")
-                                                    .foregroundColor(.gray)
-                                                    //.contentShape(Rectangle())
-                                            }
-                                        }
+                                .buttonStyle(PlainButtonStyle())
+                            }
+
+                            ToolbarItem(placement: .navigationBarTrailing) {
+                                HStack(alignment: .center) {
+                                    if home.signal.signal != home.signal.max_signal {
+                                        Text("\(home.signal.signal)/\(home.signal.max_signal)")
+                                            .font(.callout)
+                                            .foregroundColor(.gray)
                                     }
+
+                                    NavigationLink(destination: ConfigView(state: damus_state!).environmentObject(user_settings)) {
+                                        Label("", systemImage: "gear")
+                                    }
+                                    .buttonStyle(PlainButtonStyle())
                                 }
                             }
-                    }
-                    .tabViewStyle(.page(indexDisplayMode: .never))
-                    .overlay(
-                        SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
-                    )
+                        }
                 }
                 .navigationViewStyle(.stack)
-            
-                TabBar(new_events: $home.new_events, selected: $selected_timeline, isSidebarVisible: $isSideBarOpened, action: switch_timeline)
-                    .padding([.bottom], 8)
-                    .background(Color(uiColor: .systemBackground).ignoresSafeArea())
             }
+
+            TabBar(new_events: $home.new_events, selected: $selected_timeline, action: switch_timeline)
+                .padding([.bottom], 8)
         }
-        .ignoresSafeArea(.keyboard)
         .onAppear() {
             self.connect()
+            //KingfisherManager.shared.cache.clearDiskCache()
             setup_notifications()
         }
         .sheet(item: $active_sheet) { item in
             switch item {
-            case .report(let target):
-                MaybeReportView(target: target)
             case .post:
-                PostView(replying_to: nil, references: [], damus_state: damus_state!)
+                PostView(replying_to: nil, references: [])
             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 +258,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 +270,13 @@ 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,18 +289,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)
-        }
-        .onReceive(handle_notify(.block)) { notif in
-            let pubkey = notif.object as! String
-            self.blocking = pubkey
-            self.confirm_block = true
-        }
         .onReceive(handle_notify(.broadcast_event)) { obj in
             let ev = obj.object as! NostrEvent
             self.damus_state?.pool.send(.event(ev))
@@ -411,10 +306,10 @@ struct ContentView: View {
             let pk = target.pubkey
             
             if let ev = unfollow_user(pool: damus.pool,
-                                      our_contacts: damus.contacts.event,
-                                      pubkey: damus.pubkey,
-                                      privkey: privkey,
-                                      unfollow: pk) {
+                             our_contacts: damus.contacts.event,
+                             pubkey: damus.pubkey,
+                             privkey: privkey,
+                             unfollow: pk) {
                 notify(.unfollowed, pk)
                 
                 damus.contacts.event = ev
@@ -433,10 +328,10 @@ struct ContentView: View {
             }
             
             if let ev = follow_user(pool: damus.pool,
-                                    our_contacts: damus.contacts.event,
-                                    pubkey: damus.pubkey,
-                                    privkey: privkey,
-                                    follow: ReferencedId(ref_id: fnotify.pubkey, relay_id: nil, key: "p")) {
+                           our_contacts: damus.contacts.event,
+                           pubkey: damus.pubkey,
+                           privkey: privkey,
+                           follow: ReferencedId(ref_id: fnotify.pubkey, relay_id: nil, key: "p")) {
                 notify(.followed, fnotify.pubkey)
                 
                 damus_state?.contacts.event = ev
@@ -457,8 +352,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))
@@ -470,110 +363,9 @@ struct ContentView: View {
         .onReceive(timer) { n in
             self.damus_state?.pool.connect_to_disconnected()
         }
-        .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: {
-            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
-                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.")
-            }
-        })
-        .alert(NSLocalizedString("Create new mutelist", comment: "Title of alert prompting the user to create a new mutelist."), isPresented: $confirm_overwrite_mutelist, actions: {
-            Button(NSLocalizedString("Cancel", comment: "Button to cancel out of alert that creates a new mutelist.")) {
-                confirm_overwrite_mutelist = false
-                confirm_block = false
-            }
-
-            Button(NSLocalizedString("Yes, Overwrite", comment: "Text of button that confirms to overwrite the existing mutelist.")) {
-                guard let ds = damus_state else {
-                    return
-                }
-                
-                guard let keypair = ds.keypair.to_full() else {
-                    return
-                }
-                
-                guard let pubkey = blocking else {
-                    return
-                }
-                
-                guard let mutelist = create_or_update_mutelist(keypair: keypair, mprev: nil, to_add: pubkey) else {
-                    return
-                }
-                
-                damus_state?.contacts.set_mutelist(mutelist)
-                ds.pool.send(.event(mutelist))
-
-                confirm_overwrite_mutelist = false
-                confirm_block = false
-                user_blocked_confirm = true
-            }
-        }, message: {
-            Text("No block list found, create a new one? This will overwrite any previous block lists.", comment: "Alert message prompt that asks if the user wants to create a new block list, overwriting previous block lists.")
-        })
-        .alert(NSLocalizedString("Block User", comment: "Title of alert for blocking a user."), isPresented: $confirm_block, actions: {
-            Button(NSLocalizedString("Cancel", comment: "Alert button to cancel out of alert for blocking a user."), role: .cancel) {
-                confirm_block = false
-            }
-            Button(NSLocalizedString("Block", comment: "Alert button to block a user."), role: .destructive) {
-                guard let ds = damus_state else {
-                    return
-                }
-
-                if ds.contacts.mutelist == nil {
-                    confirm_overwrite_mutelist = true
-                } else {
-                    guard let keypair = ds.keypair.to_full() else {
-                        return
-                    }
-                    guard let pubkey = blocking else {
-                        return
-                    }
-
-                    guard let ev = create_or_update_mutelist(keypair: keypair, mprev: ds.contacts.mutelist, to_add: pubkey) else {
-                        return
-                    }
-                    damus_state?.contacts.set_mutelist(ev)
-                    ds.pool.send(.event(ev))
-                }
-            }
-        }, message: {
-            if let pubkey = blocking {
-                let profile = damus_state?.profiles.lookup(id: pubkey)
-                let name = Profile.displayName(profile: profile, pubkey: pubkey).username
-                Text("Block \(name)?", comment: "Alert message prompt to ask if a user should be blocked.")
-            } else {
-                Text("Could not find user to block...", comment: "Alert message to indicate that the blocked user could not be found.")
-            }
-        })
-        .alert(NSLocalizedString("Repost", comment: "Title of alert for confirming to repost a post."), isPresented: $current_boost.mappedToBool()) {
-            Button(NSLocalizedString("Cancel", comment: "Button to cancel out of reposting a post.")) {
-                current_boost = nil
-            }
-            Button(NSLocalizedString("Repost", comment: "Button to confirm reposting a post.")) {
-                self.damus_state?.pool.send(.event(current_boost!))
-            }
-        } message: {
-            Text("Are you sure you want to repost this?", comment: "Alert message to ask if user wants to repost a post.")
-        }
     }
     
     func switch_timeline(_ timeline: Timeline) {
-        self.popToRoot()
         NotificationCenter.default.post(name: .switched_timeline, object: timeline)
         
         if timeline == self.selected_timeline {
@@ -599,35 +391,20 @@ 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(),
+                                tips: TipCounter(our_pubkey: pubkey),
+                                profiles: Profiles(),
+                                dms: home.dms
         )
         home.damus_state = self.damus_state!
         
@@ -643,6 +420,7 @@ struct ContentView_Previews: PreviewProvider {
     }
 }
 
+
 func get_since_time(last_event: NostrEvent?) -> Int64? {
     if let last_event = last_event {
         return last_event.created_at - 60 * 10
@@ -776,68 +554,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,32 +14,21 @@
 				<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>
-		<string>river</string>
 		<string>bitcoinbeach</string>
 		<string>breez</string>
 		<string>muun</string>
 		<string>zeusln</string>
 		<string>zebedee</string>
 		<string>lightning</string>
+		<string>squarecash</string>
 		<string>phoenix</string>
 		<string>lnlink</string>
 		<string>strike</string>
 		<string>bluewallet</string>
 		<string>walletofsatoshi</string>
-		<string>blixtwallet</string>
 	</array>
 	<key>NSAppTransportSecurity</key>
 	<dict>

damus/Models/ActionBarModel.swift

@@ -11,43 +11,22 @@ 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)
-    }
-    
-    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
+        self.our_tip = our_tip
     }
     
-    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()
-    }
-    
-    var is_empty: Bool {
-        return likes == 0 && boosts == 0 && zaps == 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/Contacts.swift

@@ -11,50 +11,7 @@ import Foundation
 class Contacts {
     private var friends: Set<String> = Set()
     private var friend_of_friends: Set<String> = Set()
-    private var muted: Set<String> = Set()
-    
-    let our_pubkey: String
     var event: NostrEvent?
-    var mutelist: NostrEvent?
-    
-    init(our_pubkey: String) {
-        self.our_pubkey = our_pubkey
-    }
-    
-    func is_muted(_ pk: String) -> Bool {
-        return muted.contains(pk)
-    }
-    
-    func set_mutelist(_ ev: NostrEvent) {
-        let oldlist = self.mutelist
-        self.mutelist = ev
-        
-        let old = Set(oldlist?.referenced_pubkeys.map({ $0.ref_id }) ?? [])
-        let new = Set(ev.referenced_pubkeys.map({ $0.ref_id }))
-        let diff = old.symmetricDifference(new)
-        
-        var new_mutes = Array<String>()
-        var new_unmutes = Array<String>()
-        
-        for d in diff {
-            if new.contains(d) {
-                new_mutes.append(d)
-            } else {
-                new_unmutes.append(d)
-            }
-        }
-        
-        // TODO: set local mutelist here
-        self.muted = Set(ev.referenced_pubkeys.map({ $0.ref_id }))
-        
-        if new_mutes.count > 0 {
-            notify(.new_mutes, new_mutes)
-        }
-        
-        if new_unmutes.count > 0 {
-            notify(.new_unmutes, new_unmutes)
-        }
-    }
     
     func get_friendosphere() -> [String] {
         var fs = get_friend_list()
@@ -99,10 +56,6 @@ class Contacts {
         return friends.contains(pubkey)
     }
     
-    func is_friend_or_self(_ pubkey: String) -> Bool {
-        return pubkey == our_pubkey || is_friend(pubkey)
-    }
-    
     func follow_state(_ pubkey: String) -> FollowState {
         return is_friend(pubkey) ? .follows : .unfollows
     }

damus/Models/DamusState.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import LinkPresentation
 
 struct DamusState {
     let pool: RelayPool
@@ -17,25 +16,12 @@ struct DamusState {
     let tips: TipCounter
     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(), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel())
     }
 }

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

@@ -8,38 +8,13 @@
 import Foundation
 
 class DirectMessageModel: ObservableObject {
-    @Published var events: [NostrEvent] {
-        didSet {
-            is_request = determine_is_request()
-        }
-    }
-
-    @Published var draft: String
+    @Published var events: [NostrEvent]
     
-    var is_request: Bool
-    var our_pubkey: String
-    
-    func determine_is_request() -> Bool {
-        for event in events {
-            if event.pubkey == our_pubkey {
-                return false
-            }
-        }
-        
-        return true
-    }
-    
-    init(events: [NostrEvent], our_pubkey: String) {
+    init(events: [NostrEvent]) {
         self.events = events
-        self.is_request = false
-        self.our_pubkey = our_pubkey
-        self.draft = ""
     }
     
-    init(our_pubkey: String) {
+    init() {
         self.events = []
-        self.is_request = false
-        self.our_pubkey = our_pubkey
-        self.draft = ""
     }
 }

damus/Models/DirectMessagesModel.swift

@@ -10,26 +10,13 @@ import Foundation
 class DirectMessagesModel: ObservableObject {
     @Published var dms: [(String, DirectMessageModel)] = []
     @Published var loading: Bool = false
-    let our_pubkey: String
-    
-    init(our_pubkey: String) {
-        self.our_pubkey = our_pubkey
-    }
-    
-    var message_requests: [(String, DirectMessageModel)] {
-        return dms.filter { dm in dm.1.is_request }
-    }
-    
-    var friend_dms: [(String, DirectMessageModel)] {
-        return dms.filter { dm in !dm.1.is_request }
-    }
     
     func lookup_or_create(_ pubkey: String) -> DirectMessageModel {
         if let dm = lookup(pubkey) {
             return dm
         }
         
-        let new = DirectMessageModel(our_pubkey: our_pubkey)
+        let new = DirectMessageModel()
         dms.append((pubkey, new))
         return new
     }

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

@@ -18,11 +18,11 @@ class FollowersModel: ObservableObject {
     let sub_id: String = UUID().description
     let profiles_id: String = UUID().description
     
-    var count: Int? {
+    var count_display: String {
         guard let contacts = self.contacts else {
-            return nil
+            return "?"
         }
-        return contacts.count
+        return "\(contacts.count)";
     }
     
     init(damus_state: DamusState, target: String) {
@@ -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)
     }
@@ -69,30 +73,31 @@ class FollowersModel: ObservableObject {
     }
     
     func handle_event(relay_id: String, ev: NostrConnectionEvent) {
-        guard case .nostr_event(let nev) = ev else {
-            return
-        }
-        
-        switch nev {
-        case .event(let sub_id, let ev):
-            guard sub_id == self.sub_id || sub_id == self.profiles_id else {
-                return
-            }
-            
-            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)
-            }
-            
-        case .notice(let msg):
-            print("followingmodel notice: \(msg)")
-            
-        case .eose(let sub_id):
-            if sub_id == self.sub_id {
-                load_profiles(relay_id: relay_id)
-            } else if sub_id == self.profiles_id {
-                damus_state.pool.unsubscribe(sub_id: profiles_id, to: [relay_id])
+        switch ev {
+        case .ws_event:
+            break
+        case .nostr_event(let nev):
+            switch nev {
+            case .event(let sub_id, let ev):
+                guard sub_id == self.sub_id || sub_id == self.profiles_id else {
+                    return
+                }
+                
+                if ev.known_kind == .contacts {
+                    handle_contact_event(ev)
+                } else if ev.known_kind == .metadata {
+                    process_metadata_event(profiles: damus_state.profiles, ev: ev)
+                }
+                
+            case .notice(let msg):
+                print("followingmodel notice: \(msg)")
+                
+            case .eose(let sub_id):
+                if sub_id == self.sub_id {
+                    load_profiles(relay_id: relay_id)
+                } else if sub_id == self.profiles_id {
+                    damus_state.pool.unsubscribe(sub_id: profiles_id, to: [relay_id])
+                }
             }
         }
     }

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,23 @@ class HomeModel: ObservableObject {
     let profiles_subid = UUID().description
 
     @Published var new_events: NewEventsBits = NewEventsBits()
-    @Published var notifications = NotificationsModel()
-    @Published var dms: DirectMessagesModel
-    @Published var events = EventHolder()
+    @Published var notifications: [NostrEvent] = []
+    @Published var dms: DirectMessagesModel = DirectMessagesModel()
+    @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: "")
     }
-    
+
     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) {
@@ -109,8 +96,6 @@ class HomeModel: ObservableObject {
             handle_contact_event(sub_id: sub_id, relay_id: relay_id, ev: ev)
         case .metadata:
             handle_metadata_event(ev)
-        case .list:
-            handle_list_event(ev)
         case .boost:
             handle_boost_event(sub_id: sub_id, ev)
         case .like:
@@ -123,69 +108,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
@@ -197,12 +122,6 @@ class HomeModel: ObservableObject {
     func handle_channel_meta(_ ev: NostrEvent) {
     }
     
-    func filter_muted() {
-        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) }
-    }
-    
     func handle_delete_event(_ ev: NostrEvent) {
         guard ev.is_valid else {
             return
@@ -212,7 +131,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 +151,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 +167,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 +176,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 +224,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 +238,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
@@ -355,11 +272,7 @@ class HomeModel: ObservableObject {
         
         var our_contacts_filter = NostrFilter.filter_kinds([3, 0])
         our_contacts_filter.authors = [damus_state.pubkey]
-        
-        var our_blocklist_filter = NostrFilter.filter_kinds([30000])
-        our_blocklist_filter.parameter = ["mute"]
-        our_blocklist_filter.authors = [damus_state.pubkey]
-        
+
         var dms_filter = NostrFilter.filter_kinds([
             NostrKind.dm.rawValue,
         ])
@@ -377,6 +290,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,16 +300,16 @@ 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]
-        var contacts_filters = [contacts_filter, our_contacts_filter, our_blocklist_filter]
+        var contacts_filters = [contacts_filter, our_contacts_filter]
         var dms_filters = [dms_filter, our_dms_filter]
 
         let last_of_kind = relay_id.flatMap { last_event_of_kind[$0] } ?? [:]
@@ -419,32 +333,9 @@ class HomeModel: ObservableObject {
             pool.send(.subscribe(.init(filters: dms_filters, sub_id: dms_subid)))
         }
     }
-    
-    func handle_list_event(_ ev: NostrEvent) {
-        // we only care about our lists
-        guard ev.pubkey == damus_state.pubkey else {
-            return
-        }
-        
-        if let mutelist = damus_state.contacts.mutelist {
-            if ev.created_at <= mutelist.created_at {
-                return
-            }
-        }
-        
-        guard let name = get_referenced_ids(tags: ev.tags, key: "d").first else {
-            return
-        }
-        
-        guard name.ref_id == "mute" else {
-            return
-        }
-        
-        damus_state.contacts.set_mutelist(ev)
-    }
-    
+
     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? {
@@ -456,83 +347,93 @@ class HomeModel: ObservableObject {
         return m[kind]
     }
 
+    func handle_last_event(ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) {
+        let last_ev = get_last_event(timeline)
+
+        if last_ev == nil || last_ev!.created_at < ev.created_at {
+            save_last_event(ev, timeline: timeline)
+            if shouldNotify {
+                new_events = NewEventsBits(prev: new_events, setting: timeline)
+            }
+        }
+    }
+
     func handle_notification(ev: NostrEvent) {
-        // don't show notifications from ourselves
-        guard ev.pubkey != damus_state.pubkey else {
+        if !insert_uniq_sorted_event(events: &notifications, new_ev: ev, cmp: { $0.created_at > $1.created_at }) {
             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 {
-            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 {
-        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 should_hide_event(_ ev: NostrEvent) -> Bool {
+        return !ev.should_show_event
     }
 
     func handle_text_event(sub_id: String, _ ev: NostrEvent) {
-        guard should_show_event(contacts: damus_state.contacts, ev: ev) else {
+        if should_hide_event(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
+
+        var inserted = false
+        var found = false
+        let ours = ev.pubkey == self.damus_state.pubkey
+        var i = 0
+
+        var the_pk = ev.pubkey
+        if ours {
+            if let ref_pk = ev.referenced_pubkeys.first {
+                the_pk = ref_pk.ref_id
+            } else {
+                // self dm!?
+                print("TODO: handle self dm?")
             }
-            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
+
+        for (pk, _) in dms.dms {
+            if pk == the_pk {
+                found = true
+                inserted = insert_uniq_sorted_event(events: &(dms.dms[i].1.events), new_ev: ev) {
+                    $0.created_at < $1.created_at
+                }
+
+                break
+            }
+            i += 1
+        }
+
+        if !found {
+            inserted = true
+            let model = DirectMessageModel(events: [ev])
+            dms.dms.append((the_pk, model))
+        }
+
+        if inserted {
+            handle_last_event(ev: ev, timeline: .dms, shouldNotify: !ours)
+
+            dms.dms = dms.dms.sorted { a, b in
+                if a.1.events.count > 0 && b.1.events.count > 0 {
+                    return a.1.events.last!.created_at > b.1.events.last!.created_at
+                }
+                return false
             }
-            self.incoming_dms = []
         }
     }
 }
@@ -638,21 +539,12 @@ 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) {
-        old_nip05 = mprof.profile.nip05
         if mprof.timestamp > ev.created_at {
             // skip if we already have an newer profile
             return
@@ -662,30 +554,9 @@ func process_metadata_event(our_pubkey: String, profiles: Profiles, ev: NostrEve
     let tprof = TimestampedProfile(profile: profile, timestamp: ev.created_at)
     profiles.add(id: ev.pubkey, profile: tprof)
     
-    if let nip05 = profile.nip05, old_nip05 != profile.nip05 {
-        Task.detached(priority: .background) {
-            let validated = await validate_nip05(pubkey: ev.pubkey, nip05_str: nip05)
-            if validated != nil {
-                print("validated nip05 for '\(nip05)'")
-            }
-            
-            DispatchQueue.main.async {
-                profiles.validated[ev.pubkey] = validated
-                notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
-            }
-        }
-    }
-    
     // load pfps asap
     let picture = tprof.profile.picture ?? robohash(ev.pubkey)
-    if URL(string: picture) != nil {
-        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: picture) {
         DispatchQueue.main.async {
             notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
         }
@@ -698,31 +569,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 +617,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,168 +633,4 @@ 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?) {
-    var inserted = false
-    var found = false
-    
-    let ours = ev.pubkey == our_pubkey
-    var i = 0
-
-    var the_pk = ev.pubkey
-    if ours {
-        if let ref_pk = ev.referenced_pubkeys.first {
-            the_pk = ref_pk.ref_id
-        } else {
-            // self dm!?
-            print("TODO: handle self dm?")
-        }
-    }
-
-    for (pk, _) in dms.dms {
-        if pk == the_pk {
-            found = true
-            inserted = insert_uniq_sorted_event(events: &(dms.dms[i].1.events), new_ev: ev) {
-                $0.created_at < $1.created_at
-            }
-
-            break
-        }
-        i += 1
-    }
-
-    if !found {
-        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 {
-        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
-        }
-    }
-    
-    return new_events
-}
-
-
-/// A helper to determine if we need to notify the user of new events
-func handle_last_events(new_events: NewEventsBits, ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) -> NewEventsBits? {
-    let last_ev = get_last_event(timeline)
-
-    if last_ev == nil || last_ev!.created_at < ev.created_at {
-        save_last_event(ev, timeline: timeline)
-        if shouldNotify {
-            return NewEventsBits(prev: new_events, setting: timeline)
-        }
-    }
-    
-    return nil
-}
-
-
-/// Sometimes we get garbage in our notifications. Ensure we have our pubkey on this event
-func event_has_our_pubkey(_ ev: NostrEvent, our_pubkey: String) -> Bool {
-    for tag in ev.tags {
-        if tag.count >= 2 && tag[0] == "p" && tag[1] == our_pubkey {
-            return true
-        }
-    }
-    
-    return false
-}
-
-
-func should_show_event(contacts: Contacts, ev: NostrEvent) -> Bool {
-    if contacts.is_muted(ev.pubkey) {
-        return false
-    }
-    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/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 {
@@ -94,14 +77,6 @@ enum Block {
         return nil
     }
     
-    var is_note_mention: Bool {
-        guard case .mention(let mention) = self else {
-            return false
-        }
-        
-        return mention.type == .event
-    }
-    
     var is_mention: Bool {
         if case .mention = self {
             return true
@@ -212,80 +187,16 @@ enum Amount: Equatable {
     func amount_sats_str() -> String {
         switch self {
         case .any:
-            return NSLocalizedString("Any", comment: "Any amount of sats")
+            return "Any"
         case .specific(let amt):
-            return format_msats(amt)
+            if amt < 1000 {
+                return "\(Double(amt) / 1000.0) sats"
+            }
+            return "\(amt / 1000) sats"
         }
     }
 }
 
-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
@@ -295,8 +206,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
@@ -307,18 +219,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/MutelistModel.swift

@@ -1,18 +0,0 @@
-//
-//  ListModel.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-25.
-//
-
-import Foundation
-
-
-/*
- class MutelistModel: ObservableObject {
- let contacts: Contacts
- 
- @Published var users: [String]
- 
- }
- */

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)
@@ -81,7 +61,7 @@ class ProfileModel: ObservableObject, Equatable {
         profile_filter.authors = [pubkey]
         
         text_filter.authors = [pubkey]
-        text_filter.limit = 500
+        text_filter.limit = 1000
         
         print("subscribing to profile \(pubkey) with sub_id \(sub_id)")
         print_filters(relay_id: "profile", filters: [[text_filter], [profile_filter]])
@@ -90,18 +70,12 @@ class ProfileModel: ObservableObject, Equatable {
     }
     
     func handle_profile_contact_event(_ ev: NostrEvent) {
-        process_contact_event(state: damus, ev: ev)
-        
-        // only use new stuff
-        if let current_ev = self.contacts {
-            guard ev.created_at > current_ev.created_at else {
-                return
-            }
-        }
-        
         self.contacts = ev
         self.following = count_pubkeys(ev.tags)
         self.relays = decode_json_relays(ev.content)
+        if damus.contacts.is_friend(ev.pubkey) {
+            self.damus.contacts.add_friend_contact(ev)
+        }
     }
     
     func add_event(_ ev: NostrEvent) {
@@ -113,13 +87,9 @@ 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)
         }
         seen_event.insert(ev.id)
     }
@@ -129,16 +99,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

@@ -1,16 +0,0 @@
-//
-//  LikesModel.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-11.
-//
-
-import Foundation
-
-
-final class ReactionsModel: EventsModel {
-    
-    init(state: DamusState, target: String) {
-        super.init(state: state, target: target, kind: .like)
-    }
-}

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/Report.swift

@@ -1,59 +0,0 @@
-//
-//  Report.swift
-//  damus
-//
-//  Created by William Casarin on 2023-01-24.
-//
-
-import Foundation
-
-enum ReportType: String {
-    case explicit
-    case illegal
-    case spam
-    case impersonation
-}
-
-struct ReportNoteTarget {
-    let pubkey: String
-    let note_id: String
-}
-
-enum ReportTarget {
-    case user(String)
-    case note(ReportNoteTarget)
-}
-
-struct Report {
-    let type: ReportType
-    let target: ReportTarget
-    let message: String
-}
-
-func create_report_tags(target: ReportTarget, type: ReportType) -> [[String]] {
-    var tags: [[String]]
-    switch target {
-    case .user(let pubkey):
-        tags = [["p", pubkey]]
-    case .note(let notet):
-        tags = [["e", notet.note_id], ["p", notet.pubkey]]
-    }
-    
-    tags.append(["report", type.rawValue])
-    return tags
-}
-
-func create_report_event(privkey: String, report: Report) -> NostrEvent? {
-    guard let pubkey = privkey_to_pubkey(privkey: privkey) else {
-        return nil
-    }
-    
-    let kind = 1984
-    let tags = create_report_tags(target: report.target, type: report.type)
-    let ev = NostrEvent(content: report.message, pubkey: pubkey, kind: kind, tags: tags)
-    
-    ev.id = calculate_event_id(ev: ev)
-    ev.sig = sign_event(privkey: privkey, ev: ev)
-    
-    return ev
-}

damus/Models/RepostsModel.swift

@@ -1,15 +0,0 @@
-//
-//  RepostsModel.swift
-//  damus
-//
-//  Created by Terry Yiu on 1/22/23.
-//
-
-import Foundation
-
-final class RepostsModel: EventsModel {
-    
-    init(state: DamusState, target: String) {
-        super.init(state: state, target: target, kind: .boost)
-    }
-}

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()
@@ -30,15 +30,9 @@ class SearchHomeModel: ObservableObject {
         return filter
     }
     
-    func filter_muted() {
-        events.filter { should_show_event(contacts: damus_state.contacts, ev: $0) }
-        self.objectWillChange.send()
-    }
-    
     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) {
@@ -47,40 +41,40 @@ class SearchHomeModel: ObservableObject {
     }
     
     func handle_event(relay_id: String, conn_ev: NostrConnectionEvent) {
-        guard case .nostr_event(let event) = conn_ev else {
-            return
-        }
-        
-        switch event {
-        case .event(let sub_id, let ev):
-            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 seen_pubkey.contains(ev.pubkey) {
+        switch conn_ev {
+        case .ws_event:
+            break
+        case .nostr_event(let event):
+            switch event {
+            case .event(let sub_id, let ev):
+                guard sub_id == self.base_subid || sub_id == self.profiles_subid else {
                     return
                 }
-                seen_pubkey.insert(ev.pubkey)
-                
-                if self.events.insert(ev) {
-                    self.objectWillChange.send()
+                if ev.is_textlike && ev.should_show_event {
+                    if seen_pubkey.contains(ev.pubkey) {
+                        return
+                    }
+                    seen_pubkey.insert(ev.pubkey)
+                    let _ = insert_uniq_sorted_event(events: &events, new_ev: ev) {
+                        $0.created_at > $1.created_at
+                    }
                 }
-            }
-        case .notice(let msg):
-            print("search home notice: \(msg)")
-        case .eose(let sub_id):
-            loading = false
-            
-            if sub_id == self.base_subid {
-                // Make sure we unsubscribe after we've fetched the global events
-                // global events are not realtime
-                unsubscribe(to: relay_id)
+            case .notice(let msg):
+                print("search home notice: \(msg)")
+            case .eose(let sub_id):
+                loading = false
                 
-                load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, load: .from_events(events.all_events), damus_state: damus_state)
+                if sub_id == self.base_subid {
+                    // Make sure we unsubscribe after we've fetched the global events
+                    // global events are not realtime
+                    unsubscribe(to: relay_id)
+                    
+                    load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, events: events, damus_state: damus_state)
+                }
+                
+                
+                break
             }
-            
-            
-            break
         }
     }
 }
@@ -98,31 +92,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,40 +107,32 @@ 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 {
-        return
-    }
-    
-    print("loading \(authors.count) profiles from \(relay_id)")
-    
-    damus_state.pool.subscribe_to(sub_id: profiles_subid, filters: [filter], to: [relay_id]) { sub_id, conn_ev in
-        let (sid, done) = handle_subid_event(pool: damus_state.pool, relay_id: relay_id, ev: conn_ev) { sub_id, ev in
-            guard sub_id == profiles_subid else {
+    if !authors.isEmpty {
+        print("loading \(authors.count) profiles from \(relay_id)")
+        damus_state.pool.subscribe_to(sub_id: profiles_subid, filters: [filter], to: [relay_id]) { sub_id, conn_ev in
+            let (sid, done) = handle_subid_event(pool: damus_state.pool, relay_id: relay_id, ev: conn_ev) { sub_id, ev in
+                guard sub_id == profiles_subid else {
+                    return
+                }
+                
+                if ev.known_kind == .metadata {
+                    process_metadata_event(profiles: damus_state.profiles, ev: ev)
+                }
+                
+            }
+            
+            guard done && sid == profiles_subid else {
                 return
             }
-            
-            if ev.known_kind == .metadata {
-                process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
-            }
-            
+                
+            print("done loading \(authors.count) profiles from \(relay_id)")
+            damus_state.pool.unsubscribe(sub_id: profiles_subid, to: [relay_id])
         }
-        
-        guard done && sid == profiles_subid else {
-            return
-        }
-            
-        print("done loading \(authors.count) profiles from \(relay_id)")
-        damus_state.pool.unsubscribe(sub_id: profiles_subid, to: [relay_id])
     }
 }
 

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 {
@@ -110,197 +20,13 @@ class UserSettingsStore: ObservableObject {
         }
     }
 
-    @Published var left_handed: Bool {
-        didSet {
-            UserDefaults.standard.set(left_handed, forKey: "left_handed")
-        }
-    }
-    
-    @Published var always_show_images: Bool {
-        didSet {
-            UserDefaults.standard.set(always_show_images, forKey: "always_show_images")
-        }
-    }
-
-    @Published var zap_vibration: Bool {
-        didSet {
-            UserDefaults.standard.set(zap_vibration, forKey: "zap_vibration")
-        }
-    }
-
-    @Published var auto_translate: Bool {
-        didSet {
-            UserDefaults.standard.set(auto_translate, forKey: "auto_translate")
-        }
-    }
-
-    @Published var show_only_preferred_languages: Bool {
-        didSet {
-            UserDefaults.standard.set(show_only_preferred_languages, forKey: "show_only_preferred_languages")
-        }
-    }
-
-    @Published var translation_service: TranslationService {
-        didSet {
-            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)
-
-        left_handed = UserDefaults.standard.object(forKey: "left_handed") as? Bool ?? false
-        zap_vibration = UserDefaults.standard.object(forKey: "zap_vibration") as? Bool ?? false
-        disable_animation = should_disable_image_animation()
-        auto_translate = UserDefaults.standard.object(forKey: "auto_translate") as? Bool ?? false
-        show_only_preferred_languages = UserDefaults.standard.object(forKey: "show_only_preferred_languages") as? Bool ?? false
-
-        // Note from @tyiu:
-        // Default translation service is disabled by default for now until we gain some confidence that it is working well in production.
-        // 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
+        if let defaultWalletName = UserDefaults.standard.string(forKey: "default_wallet"),
+           let default_wallet = Wallet(rawValue: defaultWalletName) {
+            self.default_wallet = default_wallet
         } 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 != ""
+            self.default_wallet = .system_default_wallet
         }
+        self.show_wallet_selector = UserDefaults.standard.object(forKey: "show_wallet_selector") as? Bool ?? true
     }
 }
-
-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

@@ -16,7 +16,7 @@ enum Wallet: String, CaseIterable, Identifiable {
         var tag: String
         var displayName : String
         var link : String
-        var appStoreLink : String?
+        var appStoreLink : String
         var image: String
     }
     
@@ -33,53 +33,44 @@ enum Wallet: String, CaseIterable, Identifiable {
     case phoenix
     case breez
     case bitcoinbeach
-    case blixtwallet
-    case river
     
     var model: Model {
         switch self {
         case .system_default_wallet:
-            return .init(index: -1, tag: "systemdefaultwallet", displayName: NSLocalizedString("Local default", comment: "Dropdown option label for system default for Lightning wallet."),
+            return .init(index: -1, tag: "systemdefaultwallet", displayName: "Local default",
                          link: "lightning:", appStoreLink: "lightning:", image: "")
         case .strike:
-            return .init(index: 0, tag: "strike", displayName: NSLocalizedString("Strike", comment: "Dropdown option label for Lightning wallet, Strike."), link: "strike:",
+            return .init(index: 0, tag: "strike", displayName: "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: "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")
+            return .init(index: 2, tag: "muun", displayName: "Muun", link: "muun:", appStoreLink: "https://apps.apple.com/us/app/muun-wallet/id1482037683", image: "muun")
         case .bluewallet:
-            return .init(index: 3, tag: "bluewallet", displayName: NSLocalizedString("Blue Wallet", comment: "Dropdown option label for Lightning wallet, Blue Wallet."), link: "bluewallet:lightning:",
+            return .init(index: 3, tag: "bluewallet", displayName: "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: "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:",
+            return .init(index: 5, tag: "zebedee", displayName: "Zebedee", link: "zebedee:lightning:",
                          appStoreLink: "https://apps.apple.com/us/app/zebedee-wallet/id1484394401", image: "zebedee")
         case .zeusln:
-            return .init(index: 6, tag: "zeusln", displayName: NSLocalizedString("Zeus LN", comment: "Dropdown option label for Lightning wallet, Zeus LN."), link: "zeusln:lightning:",
+            return .init(index: 6, tag: "zeusln", displayName: "Zeus LN", link: "zeusln:lightning:",
                          appStoreLink: "https://apps.apple.com/us/app/zeus-ln/id1456038895", image: "zeusln")
         case .lnlink:
-            return .init(index: 7, tag: "lnlink", displayName: NSLocalizedString("LNLink", comment: "Dropdown option label for Lightning wallet, LNLink."), link: "lnlink:lightning:",
+            return .init(index: 7, tag: "lnlink", displayName: "LNLink", link: "lnlink:lightning:",
                          appStoreLink: "https://testflight.apple.com/join/aNY4yuuZ", image: "lnlink")
         case .phoenix:
-            return .init(index: 8, tag: "phoenix", displayName: NSLocalizedString("Phoenix", comment: "Dropdown option label for Lightning wallet, Phoenix."), link: "phoenix://",
+            return .init(index: 8, tag: "phoenix", displayName: "Phoenix", link: "phoenix://",
                          appStoreLink: "https://apps.apple.com/us/app/phoenix-wallet/id1544097028", image: "phoenix")
         case .breez:
-            return .init(index: 9, tag: "breez", displayName: NSLocalizedString("Breez", comment: "Dropdown option label for Lightning wallet, Breez."), link: "breez:",
+            return .init(index: 9, tag: "breez", displayName: "Breez", link: "breez:",
                          appStoreLink: "https://apps.apple.com/us/app/breez-lightning-client-pos/id1463604142", image: "breez")
         case .bitcoinbeach:
-            return .init(index: 10, tag: "bitcoinbeach", displayName: NSLocalizedString("Bitcoin Beach", comment: "Dropdown option label for Lightning wallet, Bitcoin Beach."), link: "bitcoinbeach://",
+            return .init(index: 10, tag: "bitcoinbeach", displayName: "Bitcoin Beach", link: "bitcoinbeach://",
                          appStoreLink: "https://apps.apple.com/sv/app/bitcoin-beach-wallet/id1531383905", image: "bbw")
-        case .blixtwallet:
-            return .init(index: 11, tag: "blixtwallet", displayName: NSLocalizedString("Blixt Wallet", comment: "Dropdown option label for Lightning wallet, Blixt Wallet"), link: "blixtwallet:lightning:",
-                         appStoreLink: "https://testflight.apple.com/join/EXvGhRzS", image: "blixt-wallet")
-        case .river:
-            return .init(index: 12, tag: "river", displayName: NSLocalizedString("River", comment: "Dropdown option label for Lightning wallet, River"), link: "river://",
-                         appStoreLink: "https://apps.apple.com/us/app/river-buy-mine-bitcoin/id1536176542", image: "river")
-            
         }
     }
     

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/Modifiers/SwipeToDismiss.swift

@@ -1,39 +0,0 @@
-//
-//  SwipeToDismiss.swift
-//  damus
-//
-//  Created by Joel Klabo on 1/18/23.
-//
-
-import SwiftUI
-
-struct SwipeToDismissModifier: ViewModifier {
-    let minDistance: CGFloat?
-    var onDismiss: () -> Void
-    @State private var offset: CGSize = .zero
-    @GestureState private var viewOffset: CGSize = .zero
-
-    func body(content: Content) -> some View {
-        content
-            .offset(y: viewOffset.height)
-            .animation(.interactiveSpring(), value: viewOffset)
-            .simultaneousGesture(
-                DragGesture(minimumDistance: minDistance ?? 10)
-                    .updating($viewOffset, body: { value, gestureState, transaction in
-                        gestureState = CGSize(width: value.location.x - value.startLocation.x, height: value.location.y - value.startLocation.y)
-                    })
-                    .onChanged { gesture in
-                        if gesture.translation.width < 50 {
-                            offset = gesture.translation
-                        }
-                    }
-                    .onEnded { _ in
-                        if abs(offset.height) > 100 {
-                            onDismiss()
-                        } else {
-                            offset = .zero
-                        }
-                    }
-            )
-    }
-}

damus/Nostr/Nostr.swift

@@ -8,101 +8,57 @@
 import Foundation
 
 struct Profile: Codable {
-    var value: [String: AnyCodable]
+    var value: [String: String]
     
-    init (name: String?, display_name: String?, about: String?, picture: String?, banner: String?, website: String?, lud06: String?, lud16: String?, nip05: String?) {
+    init (name: String?, display_name: String?, about: String?, picture: String?, website: String?, lud06: String?, lud16: String?, nip05: String?) {
         self.value = [:]
         self.name = name
         self.display_name = display_name
         self.about = about
         self.picture = picture
-        self.banner = banner
         self.website = website
         self.lud06 = lud06
         self.lud16 = lud16
         self.nip05 = nip05
     }
     
-    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{
-            return nil
-        }
-        
-        guard let s = val.value as? T else {
-            return nil
-        }
-        
-        return s
-    }
-    
-    private mutating func set_val<T>(_ key: String, _ val: T?) {
-        if val == nil {
-            self.value.removeValue(forKey: key)
-            return
-        }
-        
-        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) }
+        get { return value["display_name"]; }
+        set(s) { value["display_name"] = s }
     }
     
     var name: String? {
-        get { return str("name"); }
-        set(s) { set_str("name", s) }
+        get { return value["name"]; }
+        set(s) { value["name"] = s }
     }
     
     var about: String? {
-        get { return str("about"); }
-        set(s) { set_str("about", s) }
+        get { return value["about"]; }
+        set(s) { value["about"] = s }
     }
     
     var picture: String? {
-        get { return str("picture"); }
-        set(s) { set_str("picture", s) }
-    }
-    
-    var banner: String? {
-        get { return str("banner"); }
-        set(s) { set_str("banner", s) }
+        get { return value["picture"]; }
+        set(s) { value["picture"] = s }
     }
     
     var website: String? {
-        get { return str("website"); }
-        set(s) { set_str("website", s) }
+        get { return value["website"]; }
+        set(s) { value["website"] = s }
     }
     
     var lud06: String? {
-        get { return str("lud06"); }
-        set(s) { set_str("lud06", s) }
+        get { return value["lud06"]; }
+        set(s) { value["lud06"] = s }
     }
     
     var lud16: String? {
-        get { return str("lud16"); }
-        set(s) { set_str("lud16", s) }
-    }
-    
-    var website_url: URL? {
-        return self.website.flatMap { URL(string: $0) }
+        get { return value["lud16"]; }
+        set(s) { value["lud16"] = s }
     }
     
     var lnurl: String? {
-        guard let addr = lud16 ?? lud06 else {
+        guard let addr = lud06 ?? lud16 else {
             return nil;
         }
         
@@ -110,29 +66,21 @@ struct Profile: Codable {
             return lnaddress_to_lnurl(addr);
         }
         
-        if !addr.lowercased().hasPrefix("lnurl") {
-            return nil
-        }
-        
         return addr;
     }
     
     var nip05: String? {
-        get { return str("nip05"); }
-        set(s) { set_str("nip05", s) }
+        get { return value["nip05"]; }
+        set(s) { value["nip05"] = s }
     }
     
     var lightning_uri: URL? {
         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)
+        self.value = try container.decode([String: String].self)
     }
     
     func encode(to encoder: Encoder) throws {
@@ -140,14 +88,32 @@ 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)
     }
 }
 
-func make_test_profile() -> Profile {
-    return Profile(name: "jb55", display_name: "Will", about: "Its a me", picture: "https://cdn.jb55.com/img/red-me.jpg", banner: "https://pbs.twimg.com/profile_banners/9918032/1531711830/600x200",  website: "jb55.com", lud06: "jb55@jb55.com", lud16: nil, nip05: "jb55@jb55.com")
+/*
+struct Profile: Decodable {
+    let name: String?
+    let display_name: String?
+    let about: String?
+    let picture: String?
+    let website: String?
+    let nip05: String?
+    let lud06: String?
+    let lud16: String?
+    
+    var lightning_uri: URL? {
+        return make_ln_url(self.lud06) ?? make_ln_url(self.lud16)
+    }
+    
+    static func displayName(profile: Profile?, pubkey: String) -> String {
+        return profile?.name ?? abbrev_pubkey(pubkey)
+    }
 }
+ */
 
 func make_ln_url(_ str: String?) -> URL? {
     return str.flatMap { URL(string: "lightning:" + $0) }

damus/Nostr/NostrEvent.swift

@@ -10,9 +10,6 @@ import CommonCrypto
 import secp256k1
 import secp256k1_implementation
 import CryptoKit
-import NaturalLanguage
-
-
 
 enum ValidationResult: Decodable {
     case ok
@@ -30,7 +27,7 @@ struct KeyEvent {
     let relay_url: String
 }
 
-struct ReferencedId: Identifiable, Hashable, Equatable {
+struct ReferencedId: Identifiable, Hashable {
     let ref_id: String
     let relay_id: String?
     let key: String
@@ -82,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 {
@@ -106,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 {
@@ -158,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
@@ -169,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
@@ -180,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 {
@@ -216,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
@@ -260,25 +239,6 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
         return event_is_reply(self, privkey: privkey)
     }
 
-    func note_language(_ privkey: String?) -> String? {
-        // Rely on Apple's NLLanguageRecognizer to tell us which language it thinks the note is in
-        // and filter on only the text portions of the content as URLs and hashtags confuse the language recognizer.
-        let originalBlocks = blocks(privkey)
-        let originalOnlyText = originalBlocks.compactMap { $0.is_text }.joined(separator: " ")
-
-        // Only accept language recognition hypothesis if there's at least a 50% probability that it's accurate.
-        let languageRecognizer = NLLanguageRecognizer()
-        languageRecognizer.processString(originalOnlyText)
-
-        guard let locale = languageRecognizer.languageHypotheses(withMaximum: 1).first(where: { $0.value >= 0.5 })?.key.rawValue else {
-            return nil
-        }
-
-        // Remove the variant component and just take the language part as translation services typically only supports the variant-less language.
-        // Moreover, speakers of one variant can generally understand other variants.
-        return localeToLanguage(locale)
-    }
-
     public var referenced_ids: [ReferencedId] {
         return get_referenced_ids(key: "e")
     }
@@ -312,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
@@ -322,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
@@ -390,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))
 }
@@ -477,13 +446,11 @@ func hex_encode(_ data: Data) -> String {
 
 
 func random_bytes(count: Int) -> Data {
-    var bytes = [Int8](repeating: 0, count: count)
-    guard
-        SecRandomCopyBytes(kSecRandomDefault, bytes.count, &bytes) == errSecSuccess
-    else {
-        fatalError("can't copy secure random data")
+    var data = Data(count: count)
+    _ = data.withUnsafeMutableBytes { mutableBytes in
+        SecRandomCopyBytes(kSecRandomDefault, count, mutableBytes.baseAddress!)
     }
-    return Data(bytes: bytes, count: count)
+    return data
 }
 
 func refid_to_tag(_ ref: ReferencedId) -> [String] {
@@ -598,127 +565,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] } ?? []
 
@@ -745,14 +591,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 {
@@ -761,13 +607,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 {
@@ -813,39 +652,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)
@@ -964,15 +770,6 @@ func validate_event(ev: NostrEvent) -> ValidationResult {
     return ok ? .ok : .bad_sig
 }
 
-func last_etag(tags: [[String]]) -> String? {
-    var e: String? = nil
-    for tag in tags {
-        if tag.count >= 2 && tag[0] == "e" {
-            e = tag[1]
-        }
-    }
-    return e
-}
 
 func inner_event_or_self(ev: NostrEvent) -> NostrEvent {
     guard let inner_ev = ev.inner_event else {
@@ -981,46 +778,3 @@ func inner_event_or_self(ev: NostrEvent) -> NostrEvent {
     
     return inner_ev
 }
-
-func first_eref_mention(ev: NostrEvent, privkey: String?) -> Mention? {
-    let blocks = ev.blocks(privkey).filter { block in
-        guard case .mention(let mention) = block else {
-            return false
-        }
-        
-        guard case .event = mention.type else {
-            return false
-        }
-        
-        if mention.ref.key != "e" {
-            return false
-        }
-        
-        return true
-    }
-    
-    /// MARK: - Preview
-    if let firstBlock = blocks.first, case .mention(let mention) = firstBlock, mention.ref.key == "e" {
-        return mention
-    }
-    
-    return nil
-}
-
-extension [ReferencedId] {
-    var pRefs: [ReferencedId] {
-        get {
-            Set(self).filter { ref in
-                ref.key == "p"
-            }
-        }
-    }
-    
-    var eRefs: [ReferencedId] {
-        get {
-            self.filter { ref in
-                ref.key == "e"
-            }
-        }
-    }
-}