Replace LibreTranslate detect server call with Apple's Natural Language library

Changelog-Fixed: Fix hidden profile action sheet when clicking ...

.github/workflows/run-tests.yaml

@@ -0,0 +1,31 @@
+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,3 +1,198 @@
+## [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
@@ -320,3 +515,4 @@
 [0.1.2]: https://github.com/damus-io/damus/releases/tag/v0.1.2
 
 
+

README.md

@@ -25,7 +25,7 @@ damus implements the following [Nostr Implementation Possibilities][nips]
 ## Getting Started on Damus 
 
 ### Damus iOS
-1) Get the Damus app on Testflight: https://testflight.apple.com/join/CLwjLxWl
+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 "+". 
@@ -57,7 +57,7 @@ damus implements the following [Nostr Implementation Possibilities][nips]
   - Italics: 1 asterisk `*italic*`
   - Bold: 2 asterisk `**bold**`
   - Strikethrough: 1 tildes `~strikethrough~`
-  - Code: 1 back-tick ``code``
+  - 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
@@ -91,15 +91,41 @@ damus implements the following [Nostr Implementation Possibilities][nips]
 
 ## Contributing
 
-Contributors welcome! [Email patches][git-send-email] to jb55@jb55.com are preferred, but I accept PRs on github as well.
+Contributors welcome!
+
+### Code
+
+[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
 
-## git log bot
+### Translations
 
-npub1fjtdwclt9lspjy8huu3qklr7eklp5uq90u6yh8mec290pqxraccqlufnas
+Translators welcome! Join the [Transifex][transifex] project.
 
-### Awards 
+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/
+
+#### Export Source Translations
+
+If user-facing strings have been added or changed, please export them for translation as part of your pull request or commit by running:
+
+```zsh
+./devtools/export-source-translation.sh
+```
+
+This command will export source translations to `translations/en-US.xcloc/Localized Contents/en-US.xliff`, which the Transifex integration will read from the `master` branch and allow translators to translate those strings.
+
+#### Import Translations
+
+Once 100% of strings have been translated for a given locale, Transifex will open up a pull request with the `translations/<locale>.xliff` file changed. Currently, it must be manually imported into the project before merging the pull request by running:
+
+```zsh
+./devtools/import-translation.sh <locale_code_in_snake_case>
+```
+
+### Awards
 
 There may be nostr badges awarded for contributors in the future... :)
 
@@ -107,3 +133,7 @@ First contributors:
 
 1. @randymcmillan
 2. @jcarucci27
+
+### git log bot
+
+npub1fjtdwclt9lspjy8huu3qklr7eklp5uq90u6yh8mec290pqxraccqlufnas

damus Localizations/en.xcloc/Localized Contents/en.xliff

@@ -1,839 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
-  <file original="damus/en.lproj/InfoPlist.strings" source-language="en" target-language="en" datatype="plaintext">
-    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/>
-    </header>
-    <body>
-      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
-        <source>Damus</source>
-        <target>Damus</target>
-        <note>Bundle display name</note>
-      </trans-unit>
-      <trans-unit id="CFBundleName" xml:space="preserve">
-        <source>damus</source>
-        <target>damus</target>
-        <note>Bundle name</note>
-      </trans-unit>
-      <trans-unit id="NSPhotoLibraryAddUsageDescription" xml:space="preserve">
-        <source>"Granting Damus access to your photo library allows you to save photos.</source>
-        <target>"Granting Damus access to your photo library allows you to save photos.</target>
-        <note>Privacy - Photo Library Additions Usage Description</note>
-      </trans-unit>
-    </body>
-  </file>
-  <file original="damus/en.lproj/Localizable.strings" source-language="en" target-language="en" datatype="plaintext">
-    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/>
-    </header>
-    <body>
-      <trans-unit id="   " xml:space="preserve">
-        <source>   </source>
-        <target>   </target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%@" xml:space="preserve">
-        <source>%@</source>
-        <target>%@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%@ following" xml:space="preserve">
-        <source>%@ following</source>
-        <target>%@ following</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%@'s Followers" xml:space="preserve">
-        <source>%@'s Followers</source>
-        <target>%@'s Followers</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction." xml:space="preserve">
-        <source>%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.</source>
-        <target>%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs" xml:space="preserve">
-        <source>%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs</source>
-        <target>%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet." xml:space="preserve">
-        <source>%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet.</source>
-        <target>%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld" xml:space="preserve">
-        <source>%lld</source>
-        <target>%lld</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld/%lld" xml:space="preserve">
-        <source>%lld/%lld</source>
-        <target>%lld/%lld</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="&amp;nbsp;" xml:space="preserve">
-        <source>&amp;nbsp;</source>
-        <target>&amp;nbsp;</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="'%@' at '%@' will be used for verification" xml:space="preserve">
-        <source>'%1$@' at '%2$@' will be used for verification</source>
-        <target>'%1$@' at '%2$@' will be used for verification</target>
-        <note>Description of how the nip05 identifier would be used for verification.</note>
-      </trans-unit>
-      <trans-unit id="'%@' is an invalid nip05 identifier. It should look like an email." xml:space="preserve">
-        <source>'%@' is an invalid nip05 identifier. It should look like an email.</source>
-        <target>'%@' is an invalid nip05 identifier. It should look like an email.</target>
-        <note>Description of why the nip05 identifier is invalid.</note>
-      </trans-unit>
-      <trans-unit id="&lt; e &gt;" xml:space="preserve">
-        <source>&lt; e &gt;</source>
-        <target>&lt; e &gt;</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="@" xml:space="preserve">
-        <source>@</source>
-        <target>@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="About" xml:space="preserve">
-        <source>About</source>
-        <target>About</target>
-        <note>Label to prompt for about text entry for user to describe about themself.</note>
-      </trans-unit>
-      <trans-unit id="About Me" xml:space="preserve">
-        <source>About Me</source>
-        <target>About Me</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Absolute Boss" xml:space="preserve">
-        <source>Absolute Boss</source>
-        <target>Absolute Boss</target>
-        <note>Placeholder text for About Me description.</note>
-      </trans-unit>
-      <trans-unit id="Account ID" xml:space="preserve">
-        <source>Account ID</source>
-        <target>Account ID</target>
-        <note>Label to indicate the public ID of the account.</note>
-      </trans-unit>
-      <trans-unit id="Add" xml:space="preserve">
-        <source>Add</source>
-        <target>Add</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Add Relay" xml:space="preserve">
-        <source>Add Relay</source>
-        <target>Add Relay</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Are you sure you want to boost this post?" xml:space="preserve">
-        <source>Are you sure you want to boost this post?</source>
-        <target>Are you sure you want to boost this post?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus." xml:space="preserve">
-        <source>Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus.</source>
-        <target>Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Bitcoin Beach" xml:space="preserve">
-        <source>Bitcoin Beach</source>
-        <target>Bitcoin Beach</target>
-        <note>Dropdown option label for Lightning wallet, Bitcoin Beach.</note>
-      </trans-unit>
-      <trans-unit id="Bitcoin Lightning Tips" xml:space="preserve">
-        <source>Bitcoin Lightning Tips</source>
-        <target>Bitcoin Lightning Tips</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Blixt Wallet" xml:space="preserve">
-        <source>Blixt Wallet</source>
-        <target>Blixt Wallet</target>
-        <note>Dropdown option label for Lightning wallet, Blixt Wallet</note>
-      </trans-unit>
-      <trans-unit id="Blue Wallet" xml:space="preserve">
-        <source>Blue Wallet</source>
-        <target>Blue Wallet</target>
-        <note>Dropdown option label for Lightning wallet, Blue Wallet.</note>
-      </trans-unit>
-      <trans-unit id="Boost" xml:space="preserve">
-        <source>Boost</source>
-        <target>Boost</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Boosted" xml:space="preserve">
-        <source>Boosted</source>
-        <target>Boosted</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Breez" xml:space="preserve">
-        <source>Breez</source>
-        <target>Breez</target>
-        <note>Dropdown option label for Lightning wallet, Breez.</note>
-      </trans-unit>
-      <trans-unit id="Broadcast" xml:space="preserve">
-        <source>Broadcast</source>
-        <target>Broadcast</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Cancel" xml:space="preserve">
-        <source>Cancel</source>
-        <target>Cancel</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Cash App" xml:space="preserve">
-        <source>Cash App</source>
-        <target>Cash App</target>
-        <note>Dropdown option label for Lightning wallet, Cash App.</note>
-      </trans-unit>
-      <trans-unit id="Clear" xml:space="preserve">
-        <source>Clear</source>
-        <target>Clear</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Clear Cache" xml:space="preserve">
-        <source>Clear Cache</source>
-        <target>Clear Cache</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copied" xml:space="preserve">
-        <source>Copied</source>
-        <target>Copied</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy" xml:space="preserve">
-        <source>Copy</source>
-        <target>Copy</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy Account ID" xml:space="preserve">
-        <source>Copy Account ID</source>
-        <target>Copy Account ID</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy Image" xml:space="preserve">
-        <source>Copy Image</source>
-        <target>Copy Image</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy Image URL" xml:space="preserve">
-        <source>Copy Image URL</source>
-        <target>Copy Image URL</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy LNUrl" xml:space="preserve">
-        <source>Copy LNUrl</source>
-        <target>Copy LNUrl</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy Note ID" xml:space="preserve">
-        <source>Copy Note ID</source>
-        <target>Copy Note ID</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy Note JSON" xml:space="preserve">
-        <source>Copy Note JSON</source>
-        <target>Copy Note JSON</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy Text" xml:space="preserve">
-        <source>Copy Text</source>
-        <target>Copy Text</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy User ID" xml:space="preserve">
-        <source>Copy User ID</source>
-        <target>Copy User ID</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy invoice" xml:space="preserve">
-        <source>Copy invoice</source>
-        <target>Copy invoice</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Create" xml:space="preserve">
-        <source>Create</source>
-        <target>Create</target>
-        <note>Button to create account.</note>
-      </trans-unit>
-      <trans-unit id="Create Account" xml:space="preserve">
-        <source>Create Account</source>
-        <target>Create Account</target>
-        <note>Button to create an account.</note>
-      </trans-unit>
-      <trans-unit id="Creator(s) of Bitcoin. Absolute legend." xml:space="preserve">
-        <source>Creator(s) of Bitcoin. Absolute legend.</source>
-        <target>Creator(s) of Bitcoin. Absolute legend.</target>
-        <note>Example description about Bitcoin creator(s), Satoshi Nakamoto.</note>
-      </trans-unit>
-      <trans-unit id="DM" xml:space="preserve">
-        <source>DM</source>
-        <target>DM</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Damus" xml:space="preserve">
-        <source>Damus</source>
-        <target>Damus</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Default Wallet" xml:space="preserve">
-        <source>Default Wallet</source>
-        <target>Default Wallet</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Delete" xml:space="preserve">
-        <source>Delete</source>
-        <target>Delete</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Dismiss" xml:space="preserve">
-        <source>Dismiss</source>
-        <target>Dismiss</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Display Name" xml:space="preserve">
-        <source>Display Name</source>
-        <target>Display Name</target>
-        <note>Label to prompt display name entry.</note>
-      </trans-unit>
-      <trans-unit id="Done" xml:space="preserve">
-        <source>Done</source>
-        <target>Done</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Earn Money" xml:space="preserve">
-        <source>Earn Money</source>
-        <target>Earn Money</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Edit" xml:space="preserve">
-        <source>Edit</source>
-        <target>Edit</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Edit Profile" xml:space="preserve">
-        <source>Edit Profile</source>
-        <target>Edit Profile</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Encrypted" xml:space="preserve">
-        <source>Encrypted</source>
-        <target>Encrypted</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Encrypted DMs" xml:space="preserve">
-        <source>Encrypted DMs</source>
-        <target>Encrypted DMs</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Enter your account key to login:" xml:space="preserve">
-        <source>Enter your account key to login:</source>
-        <target>Enter your account key to login:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Error: %@" xml:space="preserve">
-        <source>Error: %@</source>
-        <target>Error: %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Filter State" xml:space="preserve">
-        <source>Filter State</source>
-        <target>Filter State</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Follow" xml:space="preserve">
-        <source>Follow</source>
-        <target>Follow</target>
-        <note>Button to follow a user.</note>
-      </trans-unit>
-      <trans-unit id="Followers" xml:space="preserve">
-        <source>Followers</source>
-        <target>Followers</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Following" xml:space="preserve">
-        <source>Following</source>
-        <target>Following</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Following..." xml:space="preserve">
-        <source>Following...</source>
-        <target>Following...</target>
-        <note>Label to indicate that the user is in the process of following another user.</note>
-      </trans-unit>
-      <trans-unit id="Follows" xml:space="preserve">
-        <source>Follows</source>
-        <target>Follows</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Global" xml:space="preserve">
-        <source>Global</source>
-        <target>Global</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Goto post %@" xml:space="preserve">
-        <source>Goto post %@</source>
-        <target>Goto post %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Goto profile %@" xml:space="preserve">
-        <source>Goto profile %@</source>
-        <target>Goto profile %@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Home" xml:space="preserve">
-        <source>Home</source>
-        <target>Home</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="LNLink" xml:space="preserve">
-        <source>LNLink</source>
-        <target>LNLink</target>
-        <note>Dropdown option label for Lightning wallet, LNLink.</note>
-      </trans-unit>
-      <trans-unit id="Let's go!" xml:space="preserve">
-        <source>Let's go!</source>
-        <target>Let's go!</target>
-        <note>Button to complete account creation and start using the app.</note>
-      </trans-unit>
-      <trans-unit id="Lightning Address or LNURL" xml:space="preserve">
-        <source>Lightning Address or LNURL</source>
-        <target>Lightning Address or LNURL</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Lightning Invoice" xml:space="preserve">
-        <source>Lightning Invoice</source>
-        <target>Lightning Invoice</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Local default" xml:space="preserve">
-        <source>Local default</source>
-        <target>Local default</target>
-        <note>Dropdown option label for system default for Lightning wallet.</note>
-      </trans-unit>
-      <trans-unit id="Login" xml:space="preserve">
-        <source>Login</source>
-        <target>Login</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Logout" xml:space="preserve">
-        <source>Logout</source>
-        <target>Logout</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Make sure your nsec account key is saved before you logout or you will lose access to this account" xml:space="preserve">
-        <source>Make sure your nsec account key is saved before you logout or you will lose access to this account</source>
-        <target>Make sure your nsec account key is saved before you logout or you will lose access to this account</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Muun" xml:space="preserve">
-        <source>Muun</source>
-        <target>Muun</target>
-        <note>Dropdown option label for Lightning wallet, Muun.</note>
-      </trans-unit>
-      <trans-unit id="NIP-05 Verification" xml:space="preserve">
-        <source>NIP-05 Verification</source>
-        <target>NIP-05 Verification</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Nothing to see here. Check back later!" xml:space="preserve">
-        <source>Nothing to see here. Check back later!</source>
-        <target>Nothing to see here. Check back later!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Notifications" xml:space="preserve">
-        <source>Notifications</source>
-        <target>Notifications</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Pay" xml:space="preserve">
-        <source>Pay</source>
-        <target>Pay</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Pay the lightning invoice" xml:space="preserve">
-        <source>Pay the lightning invoice</source>
-        <target>Pay the lightning invoice</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Phoenix" xml:space="preserve">
-        <source>Phoenix</source>
-        <target>Phoenix</target>
-        <note>Dropdown option label for Lightning wallet, Phoenix.</note>
-      </trans-unit>
-      <trans-unit id="Post" xml:space="preserve">
-        <source>Post</source>
-        <target>Post</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Posts" xml:space="preserve">
-        <source>Posts</source>
-        <target>Posts</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Posts &amp; Replies" xml:space="preserve">
-        <source>Posts &amp; Replies</source>
-        <target>Posts &amp; Replies</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Private" xml:space="preserve">
-        <source>Private</source>
-        <target>Private</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Private Key" xml:space="preserve">
-        <source>Private Key</source>
-        <target>Private Key</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="PrivateKey" xml:space="preserve">
-        <source>PrivateKey</source>
-        <target>PrivateKey</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile Picture" xml:space="preserve">
-        <source>Profile Picture</source>
-        <target>Profile Picture</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Public Account ID" xml:space="preserve">
-        <source>Public Account ID</source>
-        <target>Public Account ID</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Public Key" xml:space="preserve">
-        <source>Public Key</source>
-        <target>Public Key</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Public Key?" xml:space="preserve">
-        <source>Public Key?</source>
-        <target>Public Key?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Public key" xml:space="preserve">
-        <source>Public key</source>
-        <target>Public key</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Recommended Relays" xml:space="preserve">
-        <source>Recommended Relays</source>
-        <target>Recommended Relays</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Relay" xml:space="preserve">
-        <source>Relay</source>
-        <target>Relay</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Relays" xml:space="preserve">
-        <source>Relays</source>
-        <target>Relays</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Reply to self" xml:space="preserve">
-        <source>Reply to self</source>
-        <target>Reply to self</target>
-        <note>Label to indicate that the user is replying to themself.</note>
-      </trans-unit>
-      <trans-unit id="Replying to %@ &amp; %@" xml:space="preserve">
-        <source>Replying to %1$@ &amp; %2$@</source>
-        <target>Replying to %1$@ &amp; %2$@</target>
-        <note>Label to indicate that the user is replying to 2 users.</note>
-      </trans-unit>
-      <trans-unit id="Replying to:" xml:space="preserve">
-        <source>Replying to:</source>
-        <target>Replying to:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Reset" xml:space="preserve">
-        <source>Reset</source>
-        <target>Reset</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="River" xml:space="preserve">
-        <source>River</source>
-        <target>River</target>
-        <note>Dropdown option label for Lightning wallet, River</note>
-      </trans-unit>
-      <trans-unit id="Satoshi Nakamoto" xml:space="preserve">
-        <source>Satoshi Nakamoto</source>
-        <target>Satoshi Nakamoto</target>
-        <note>Name of Bitcoin creator(s).</note>
-      </trans-unit>
-      <trans-unit id="Save" xml:space="preserve">
-        <source>Save</source>
-        <target>Save</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Save Image" xml:space="preserve">
-        <source>Save Image</source>
-        <target>Save Image</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Search hashtag: #%@" xml:space="preserve">
-        <source>Search hashtag: #%@</source>
-        <target>Search hashtag: #%@</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Search..." xml:space="preserve">
-        <source>Search...</source>
-        <target>Search...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Secret Account Login Key" xml:space="preserve">
-        <source>Secret Account Login Key</source>
-        <target>Secret Account Login Key</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Select a lightning wallet" xml:space="preserve">
-        <source>Select a lightning wallet</source>
-        <target>Select a lightning wallet</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Select default wallet" xml:space="preserve">
-        <source>Select default wallet</source>
-        <target>Select default wallet</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Send a message to start the conversation..." xml:space="preserve">
-        <source>Send a message to start the conversation...</source>
-        <target>Send a message to start the conversation...</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Settings" xml:space="preserve">
-        <source>Settings</source>
-        <target>Settings</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Share" xml:space="preserve">
-        <source>Share</source>
-        <target>Share</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Show" xml:space="preserve">
-        <source>Show</source>
-        <target>Show</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Show wallet selector" xml:space="preserve">
-        <source>Show wallet selector</source>
-        <target>Show wallet selector</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Strike" xml:space="preserve">
-        <source>Strike</source>
-        <target>Strike</target>
-        <note>Dropdown option label for Lightning wallet, Strike.</note>
-      </trans-unit>
-      <trans-unit id="This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective." xml:space="preserve">
-        <source>This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective.</source>
-        <target>This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is an old-style nostr key. We're not sure if it's a pubkey or private key. Please toggle the button below if this a public key." xml:space="preserve">
-        <source>This is an old-style nostr key. We're not sure if it's a pubkey or private key. Please toggle the button below if this a public key.</source>
-        <target>This is an old-style nostr key. We're not sure if it's a pubkey or private key. Please toggle the button below if this a public key.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your account ID, you can give this to your friends so that they can follow you. Click to copy." xml:space="preserve">
-        <source>This is your account ID, you can give this to your friends so that they can follow you. Click to copy.</source>
-        <target>This is your account ID, you can give this to your friends so that they can follow you. Click to copy.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" xml:space="preserve">
-        <source>This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!</source>
-        <target>This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Thread" xml:space="preserve">
-        <source>Thread</source>
-        <target>Thread</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Type your post here..." xml:space="preserve">
-        <source>Type your post here...</source>
-        <target>Type your post here...</target>
-        <note>Text box prompt to ask user to type their post.</note>
-      </trans-unit>
-      <trans-unit id="Unfollow" xml:space="preserve">
-        <source>Unfollow</source>
-        <target>Unfollow</target>
-        <note>Button to unfollow a user.</note>
-      </trans-unit>
-      <trans-unit id="Unfollowing" xml:space="preserve">
-        <source>Unfollowing</source>
-        <target>Unfollowing</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unfollowing..." xml:space="preserve">
-        <source>Unfollowing...</source>
-        <target>Unfollowing...</target>
-        <note>Label to indicate that the user is in the process of unfollowing another user.</note>
-      </trans-unit>
-      <trans-unit id="Unfollows" xml:space="preserve">
-        <source>Unfollows</source>
-        <target>Unfollows</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
-        <target>Username</target>
-        <note>Label to prompt username entry.</note>
-      </trans-unit>
-      <trans-unit id="Wallet Of Satoshi" xml:space="preserve">
-        <source>Wallet Of Satoshi</source>
-        <target>Wallet Of Satoshi</target>
-        <note>Dropdown option label for Lightning wallet, Wallet Of Satoshi.</note>
-      </trans-unit>
-      <trans-unit id="Wallet Selector" xml:space="preserve">
-        <source>Wallet Selector</source>
-        <target>Wallet Selector</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Website" xml:space="preserve">
-        <source>Website</source>
-        <target>Website</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Welcome to the social network %@ control." xml:space="preserve">
-        <source>Welcome to the social network %@ control.</source>
-        <target>Welcome to the social network %@ control.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Welcome, %@!" xml:space="preserve">
-        <source>Welcome, %@!</source>
-        <target>Welcome, %@!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Your Name" xml:space="preserve">
-        <source>Your Name</source>
-        <target>Your Name</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Zebedee" xml:space="preserve">
-        <source>Zebedee</source>
-        <target>Zebedee</target>
-        <note>Dropdown option label for Lightning wallet, Zebedee.</note>
-      </trans-unit>
-      <trans-unit id="Zeus LN" xml:space="preserve">
-        <source>Zeus LN</source>
-        <target>Zeus LN</target>
-        <note>Dropdown option label for Lightning wallet, Zeus LN.</note>
-      </trans-unit>
-      <trans-unit id="https://example.com/pic.jpg" xml:space="preserve">
-        <source>https://example.com/pic.jpg</source>
-        <target>https://example.com/pic.jpg</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="https://jb55.com" xml:space="preserve">
-        <source>https://jb55.com</source>
-        <target>https://jb55.com</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="jb55@jb55.com" xml:space="preserve">
-        <source>jb55@jb55.com</source>
-        <target>jb55@jb55.com</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="none" xml:space="preserve">
-        <source>none</source>
-        <target>none</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="now" xml:space="preserve">
-        <source>now</source>
-        <target>now</target>
-        <note>String indicating that a given timestamp just occurred</note>
-      </trans-unit>
-      <trans-unit id="optional" xml:space="preserve">
-        <source>optional</source>
-        <target>optional</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="replying_to_one_and_others" translate="no" xml:space="preserve">
-        <source>replying_to_one_and_others</source>
-        <target>replying_to_one_and_others</target>
-        <note>Label to indicate that the user is replying to 1 user and others. (Key in .stringsdict)</note>
-      </trans-unit>
-      <trans-unit id="replying_to_two_and_others" translate="no" xml:space="preserve">
-        <source>replying_to_two_and_others</source>
-        <target>replying_to_two_and_others</target>
-        <note>Label to indicate that the user is replying to 2 users and others. (Key in .stringsdict)</note>
-      </trans-unit>
-      <trans-unit id="satoshi" xml:space="preserve">
-        <source>satoshi</source>
-        <target>satoshi</target>
-        <note>Example username of Bitcoin creator(s), Satoshi Nakamoto.</note>
-      </trans-unit>
-      <trans-unit id="wss://some.relay.com" xml:space="preserve">
-        <source>wss://some.relay.com</source>
-        <target>wss://some.relay.com</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="you" xml:space="preserve">
-        <source>you</source>
-        <target>you</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="··· %lld other notes ···" xml:space="preserve">
-        <source>··· %lld other notes ···</source>
-        <target>··· %lld other notes ···</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="🤙" xml:space="preserve">
-        <source>🤙</source>
-        <target>🤙</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-    </body>
-  </file>
-  <file original="damus/en.lproj/Localizable.stringsdict" source-language="en" target-language="en" datatype="plaintext">
-    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/>
-    </header>
-    <body>
-      <trans-unit id="/replying_to_one_and_others:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>Replying to %@%#@others@</source>
-        <target>Replying to %@%#@others@</target>
-        <note>Label to indicate that the user is replying to 1 user and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_one_and_others:dict/others:dict/one:dict/:string" xml:space="preserve">
-        <source> &amp; 1 other</source>
-        <target> &amp; 1 other</target>
-        <note>Label to indicate that the user is replying to 1 user and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_one_and_others:dict/others:dict/other:dict/:string" xml:space="preserve">
-        <source> &amp; %d others</source>
-        <target> &amp; %d others</target>
-        <note>Label to indicate that the user is replying to 1 user and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_one_and_others:dict/others:dict/zero:dict/:string" xml:space="preserve">
-        <source/>
-        <target/>
-        <note>Label to indicate that the user is replying to 1 user and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_two_and_others:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>Replying to %@, %@%#@others@</source>
-        <target>Replying to %@, %@%#@others@</target>
-        <note>Label to indicate that the user is replying to 2 users and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_two_and_others:dict/others:dict/one:dict/:string" xml:space="preserve">
-        <source> &amp; 1 other</source>
-        <target> &amp; 1 other</target>
-        <note>Label to indicate that the user is replying to 2 users and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_two_and_others:dict/others:dict/other:dict/:string" xml:space="preserve">
-        <source> &amp; %d others</source>
-        <target> &amp; %d others</target>
-        <note>Label to indicate that the user is replying to 2 users and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_two_and_others:dict/others:dict/zero:dict/:string" xml:space="preserve">
-        <source/>
-        <target/>
-        <note>Label to indicate that the user is replying to 2 users and others.</note>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

damus Localizations/en.xcloc/Source Contents/damus/en.lproj/Localizable.stringsdict

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>replying_to_one_and_others</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>Replying to %@%#@others@</string>
-		<key>others</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string></string>
-			<key>one</key>
-			<string> &amp; 1 other</string>
-			<key>other</key>
-			<string> &amp; %d others</string>
-		</dict>
-	</dict>
-	<key>replying_to_two_and_others</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>Replying to %@, %@%#@others@</string>
-		<key>others</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string></string>
-			<key>one</key>
-			<string> &amp; 1 other</string>
-			<key>other</key>
-			<string> &amp; %d others</string>
-		</dict>
-	</dict>
-</dict>
-</plist>

damus Localizations/es.xcloc/Localized Contents/es.xliff

@@ -1,676 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
-  <file original="damus/en.lproj/InfoPlist.strings" datatype="plaintext" source-language="en" target-language="es">
-    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/>
-    </header>
-    <body>
-      <trans-unit id="CFBundleDisplayName" xml:space="preserve">
-        <source>Damus</source>
-        <note>Bundle display name</note>
-      </trans-unit>
-      <trans-unit id="CFBundleName" xml:space="preserve">
-        <source>damus</source>
-        <note>Bundle name</note>
-      </trans-unit>
-      <trans-unit id="NSPhotoLibraryAddUsageDescription" xml:space="preserve">
-        <source>"Granting Damus access to your photo library allows you to save photos.</source>
-        <note>Privacy - Photo Library Additions Usage Description</note>
-      </trans-unit>
-    </body>
-  </file>
-  <file original="damus/en.lproj/Localizable.strings" source-language="en" target-language="es" datatype="plaintext">
-    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/>
-    </header>
-    <body>
-      <trans-unit id="   " xml:space="preserve">
-        <source>   </source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%@" xml:space="preserve">
-        <source>%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%@ following" xml:space="preserve">
-        <source>%@ following</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%@'s Followers" xml:space="preserve">
-        <source>%@'s Followers</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction." xml:space="preserve">
-        <source>%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs" xml:space="preserve">
-        <source>%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet." xml:space="preserve">
-        <source>%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld" xml:space="preserve">
-        <source>%lld</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld/%lld" xml:space="preserve">
-        <source>%lld/%lld</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="&amp;nbsp;" xml:space="preserve">
-        <source>&amp;nbsp;</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="'%@' at '%@' will be used for verification" xml:space="preserve">
-        <source>'%1$@' at '%2$@' will be used for verification</source>
-        <note>Description of how the nip05 identifier would be used for verification.</note>
-      </trans-unit>
-      <trans-unit id="'%@' is an invalid nip05 identifier. It should look like an email." xml:space="preserve">
-        <source>'%@' is an invalid nip05 identifier. It should look like an email.</source>
-        <note>Description of why the nip05 identifier is invalid.</note>
-      </trans-unit>
-      <trans-unit id="&lt; e &gt;" xml:space="preserve">
-        <source>&lt; e &gt;</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="@" xml:space="preserve">
-        <source>@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="About" xml:space="preserve">
-        <source>About</source>
-        <note>Label to prompt for about text entry for user to describe about themself.</note>
-      </trans-unit>
-      <trans-unit id="About Me" xml:space="preserve">
-        <source>About Me</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Absolute Boss" xml:space="preserve">
-        <source>Absolute Boss</source>
-        <note>Placeholder text for About Me description.</note>
-      </trans-unit>
-      <trans-unit id="Account ID" xml:space="preserve">
-        <source>Account ID</source>
-        <note>Label to indicate the public ID of the account.</note>
-      </trans-unit>
-      <trans-unit id="Add" xml:space="preserve">
-        <source>Add</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Add Relay" xml:space="preserve">
-        <source>Add Relay</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Are you sure you want to boost this post?" xml:space="preserve">
-        <source>Are you sure you want to boost this post?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus." xml:space="preserve">
-        <source>Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Bitcoin Beach" xml:space="preserve">
-        <source>Bitcoin Beach</source>
-        <note>Dropdown option label for Lightning wallet, Bitcoin Beach.</note>
-      </trans-unit>
-      <trans-unit id="Bitcoin Lightning Tips" xml:space="preserve">
-        <source>Bitcoin Lightning Tips</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Blixt Wallet" xml:space="preserve">
-        <source>Blixt Wallet</source>
-        <note>Dropdown option label for Lightning wallet, Blixt Wallet</note>
-      </trans-unit>
-      <trans-unit id="Blue Wallet" xml:space="preserve">
-        <source>Blue Wallet</source>
-        <note>Dropdown option label for Lightning wallet, Blue Wallet.</note>
-      </trans-unit>
-      <trans-unit id="Boost" xml:space="preserve">
-        <source>Boost</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Boosted" xml:space="preserve">
-        <source>Boosted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Breez" xml:space="preserve">
-        <source>Breez</source>
-        <note>Dropdown option label for Lightning wallet, Breez.</note>
-      </trans-unit>
-      <trans-unit id="Broadcast" xml:space="preserve">
-        <source>Broadcast</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Cancel" xml:space="preserve">
-        <source>Cancel</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Cash App" xml:space="preserve">
-        <source>Cash App</source>
-        <note>Dropdown option label for Lightning wallet, Cash App.</note>
-      </trans-unit>
-      <trans-unit id="Clear" xml:space="preserve">
-        <source>Clear</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Clear Cache" xml:space="preserve">
-        <source>Clear Cache</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copied" xml:space="preserve">
-        <source>Copied</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy" xml:space="preserve">
-        <source>Copy</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy Account ID" xml:space="preserve">
-        <source>Copy Account ID</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy Image" xml:space="preserve">
-        <source>Copy Image</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy Image URL" xml:space="preserve">
-        <source>Copy Image URL</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy LNUrl" xml:space="preserve">
-        <source>Copy LNUrl</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy Note ID" xml:space="preserve">
-        <source>Copy Note ID</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy Note JSON" xml:space="preserve">
-        <source>Copy Note JSON</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy Text" xml:space="preserve">
-        <source>Copy Text</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy User ID" xml:space="preserve">
-        <source>Copy User ID</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Copy invoice" xml:space="preserve">
-        <source>Copy invoice</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Create" xml:space="preserve">
-        <source>Create</source>
-        <note>Button to create account.</note>
-      </trans-unit>
-      <trans-unit id="Create Account" xml:space="preserve">
-        <source>Create Account</source>
-        <note>Button to create an account.</note>
-      </trans-unit>
-      <trans-unit id="Creator(s) of Bitcoin. Absolute legend." xml:space="preserve">
-        <source>Creator(s) of Bitcoin. Absolute legend.</source>
-        <note>Example description about Bitcoin creator(s), Satoshi Nakamoto.</note>
-      </trans-unit>
-      <trans-unit id="DM" xml:space="preserve">
-        <source>DM</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Damus" xml:space="preserve">
-        <source>Damus</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Default Wallet" xml:space="preserve">
-        <source>Default Wallet</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Delete" xml:space="preserve">
-        <source>Delete</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Dismiss" xml:space="preserve">
-        <source>Dismiss</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Display Name" xml:space="preserve">
-        <source>Display Name</source>
-        <note>Label to prompt display name entry.</note>
-      </trans-unit>
-      <trans-unit id="Done" xml:space="preserve">
-        <source>Done</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Earn Money" xml:space="preserve">
-        <source>Earn Money</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Edit" xml:space="preserve">
-        <source>Edit</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Edit Profile" xml:space="preserve">
-        <source>Edit Profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Encrypted" xml:space="preserve">
-        <source>Encrypted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Encrypted DMs" xml:space="preserve">
-        <source>Encrypted DMs</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Enter your account key to login:" xml:space="preserve">
-        <source>Enter your account key to login:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Error: %@" xml:space="preserve">
-        <source>Error: %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Filter State" xml:space="preserve">
-        <source>Filter State</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Follow" xml:space="preserve">
-        <source>Follow</source>
-        <note>Button to follow a user.</note>
-      </trans-unit>
-      <trans-unit id="Followers" xml:space="preserve">
-        <source>Followers</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Following" xml:space="preserve">
-        <source>Following</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Following..." xml:space="preserve">
-        <source>Following...</source>
-        <note>Label to indicate that the user is in the process of following another user.</note>
-      </trans-unit>
-      <trans-unit id="Follows" xml:space="preserve">
-        <source>Follows</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Global" xml:space="preserve">
-        <source>Global</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Goto post %@" xml:space="preserve">
-        <source>Goto post %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Goto profile %@" xml:space="preserve">
-        <source>Goto profile %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Home" xml:space="preserve">
-        <source>Home</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="LNLink" xml:space="preserve">
-        <source>LNLink</source>
-        <note>Dropdown option label for Lightning wallet, LNLink.</note>
-      </trans-unit>
-      <trans-unit id="Let's go!" xml:space="preserve">
-        <source>Let's go!</source>
-        <note>Button to complete account creation and start using the app.</note>
-      </trans-unit>
-      <trans-unit id="Lightning Address or LNURL" xml:space="preserve">
-        <source>Lightning Address or LNURL</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Lightning Invoice" xml:space="preserve">
-        <source>Lightning Invoice</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Local default" xml:space="preserve">
-        <source>Local default</source>
-        <note>Dropdown option label for system default for Lightning wallet.</note>
-      </trans-unit>
-      <trans-unit id="Login" xml:space="preserve">
-        <source>Login</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Logout" xml:space="preserve">
-        <source>Logout</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Make sure your nsec account key is saved before you logout or you will lose access to this account" xml:space="preserve">
-        <source>Make sure your nsec account key is saved before you logout or you will lose access to this account</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Muun" xml:space="preserve">
-        <source>Muun</source>
-        <note>Dropdown option label for Lightning wallet, Muun.</note>
-      </trans-unit>
-      <trans-unit id="NIP-05 Verification" xml:space="preserve">
-        <source>NIP-05 Verification</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Nothing to see here. Check back later!" xml:space="preserve">
-        <source>Nothing to see here. Check back later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Notifications" xml:space="preserve">
-        <source>Notifications</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Pay" xml:space="preserve">
-        <source>Pay</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Pay the lightning invoice" xml:space="preserve">
-        <source>Pay the lightning invoice</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Phoenix" xml:space="preserve">
-        <source>Phoenix</source>
-        <note>Dropdown option label for Lightning wallet, Phoenix.</note>
-      </trans-unit>
-      <trans-unit id="Post" xml:space="preserve">
-        <source>Post</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Posts" xml:space="preserve">
-        <source>Posts</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Posts &amp; Replies" xml:space="preserve">
-        <source>Posts &amp; Replies</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Private" xml:space="preserve">
-        <source>Private</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Private Key" xml:space="preserve">
-        <source>Private Key</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="PrivateKey" xml:space="preserve">
-        <source>PrivateKey</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile Picture" xml:space="preserve">
-        <source>Profile Picture</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Public Account ID" xml:space="preserve">
-        <source>Public Account ID</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Public Key" xml:space="preserve">
-        <source>Public Key</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Public Key?" xml:space="preserve">
-        <source>Public Key?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Public key" xml:space="preserve">
-        <source>Public key</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Recommended Relays" xml:space="preserve">
-        <source>Recommended Relays</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Relay" xml:space="preserve">
-        <source>Relay</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Relays" xml:space="preserve">
-        <source>Relays</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Reply to self" xml:space="preserve">
-        <source>Reply to self</source>
-        <note>Label to indicate that the user is replying to themself.</note>
-      </trans-unit>
-      <trans-unit id="Replying to %@ &amp; %@" xml:space="preserve">
-        <source>Replying to %1$@ &amp; %2$@</source>
-        <note>Label to indicate that the user is replying to 2 users.</note>
-      </trans-unit>
-      <trans-unit id="Replying to:" xml:space="preserve">
-        <source>Replying to:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Reset" xml:space="preserve">
-        <source>Reset</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="River" xml:space="preserve">
-        <source>River</source>
-        <note>Dropdown option label for Lightning wallet, River</note>
-      </trans-unit>
-      <trans-unit id="Satoshi Nakamoto" xml:space="preserve">
-        <source>Satoshi Nakamoto</source>
-        <note>Name of Bitcoin creator(s).</note>
-      </trans-unit>
-      <trans-unit id="Save" xml:space="preserve">
-        <source>Save</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Save Image" xml:space="preserve">
-        <source>Save Image</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Search hashtag: #%@" xml:space="preserve">
-        <source>Search hashtag: #%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Search..." xml:space="preserve">
-        <source>Search...</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Secret Account Login Key" xml:space="preserve">
-        <source>Secret Account Login Key</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Select a lightning wallet" xml:space="preserve">
-        <source>Select a lightning wallet</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Select default wallet" xml:space="preserve">
-        <source>Select default wallet</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Send a message to start the conversation..." xml:space="preserve">
-        <source>Send a message to start the conversation...</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Settings" xml:space="preserve">
-        <source>Settings</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Share" xml:space="preserve">
-        <source>Share</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Show" xml:space="preserve">
-        <source>Show</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Show wallet selector" xml:space="preserve">
-        <source>Show wallet selector</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Strike" xml:space="preserve">
-        <source>Strike</source>
-        <note>Dropdown option label for Lightning wallet, Strike.</note>
-      </trans-unit>
-      <trans-unit id="This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective." xml:space="preserve">
-        <source>This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is an old-style nostr key. We're not sure if it's a pubkey or private key. Please toggle the button below if this a public key." xml:space="preserve">
-        <source>This is an old-style nostr key. We're not sure if it's a pubkey or private key. Please toggle the button below if this a public key.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your account ID, you can give this to your friends so that they can follow you. Click to copy." xml:space="preserve">
-        <source>This is your account ID, you can give this to your friends so that they can follow you. Click to copy.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" xml:space="preserve">
-        <source>This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Thread" xml:space="preserve">
-        <source>Thread</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Type your post here..." xml:space="preserve">
-        <source>Type your post here...</source>
-        <note>Text box prompt to ask user to type their post.</note>
-      </trans-unit>
-      <trans-unit id="Unfollow" xml:space="preserve">
-        <source>Unfollow</source>
-        <note>Button to unfollow a user.</note>
-      </trans-unit>
-      <trans-unit id="Unfollowing" xml:space="preserve">
-        <source>Unfollowing</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unfollowing..." xml:space="preserve">
-        <source>Unfollowing...</source>
-        <note>Label to indicate that the user is in the process of unfollowing another user.</note>
-      </trans-unit>
-      <trans-unit id="Unfollows" xml:space="preserve">
-        <source>Unfollows</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
-        <note>Label to prompt username entry.</note>
-      </trans-unit>
-      <trans-unit id="Wallet Of Satoshi" xml:space="preserve">
-        <source>Wallet Of Satoshi</source>
-        <note>Dropdown option label for Lightning wallet, Wallet Of Satoshi.</note>
-      </trans-unit>
-      <trans-unit id="Wallet Selector" xml:space="preserve">
-        <source>Wallet Selector</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Website" xml:space="preserve">
-        <source>Website</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Welcome to the social network %@ control." xml:space="preserve">
-        <source>Welcome to the social network %@ control.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Welcome, %@!" xml:space="preserve">
-        <source>Welcome, %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Your Name" xml:space="preserve">
-        <source>Your Name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Zebedee" xml:space="preserve">
-        <source>Zebedee</source>
-        <note>Dropdown option label for Lightning wallet, Zebedee.</note>
-      </trans-unit>
-      <trans-unit id="Zeus LN" xml:space="preserve">
-        <source>Zeus LN</source>
-        <note>Dropdown option label for Lightning wallet, Zeus LN.</note>
-      </trans-unit>
-      <trans-unit id="https://example.com/pic.jpg" xml:space="preserve">
-        <source>https://example.com/pic.jpg</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="https://jb55.com" xml:space="preserve">
-        <source>https://jb55.com</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="jb55@jb55.com" xml:space="preserve">
-        <source>jb55@jb55.com</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="none" xml:space="preserve">
-        <source>none</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="now" xml:space="preserve">
-        <source>now</source>
-        <note>String indicating that a given timestamp just occurred</note>
-      </trans-unit>
-      <trans-unit id="optional" xml:space="preserve">
-        <source>optional</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="replying_to_one_and_others" translate="no" xml:space="preserve">
-        <source>replying_to_one_and_others</source>
-        <note>Label to indicate that the user is replying to 1 user and others. (Key in .stringsdict)</note>
-      </trans-unit>
-      <trans-unit id="replying_to_two_and_others" translate="no" xml:space="preserve">
-        <source>replying_to_two_and_others</source>
-        <note>Label to indicate that the user is replying to 2 users and others. (Key in .stringsdict)</note>
-      </trans-unit>
-      <trans-unit id="satoshi" xml:space="preserve">
-        <source>satoshi</source>
-        <note>Example username of Bitcoin creator(s), Satoshi Nakamoto.</note>
-      </trans-unit>
-      <trans-unit id="wss://some.relay.com" xml:space="preserve">
-        <source>wss://some.relay.com</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="you" xml:space="preserve">
-        <source>you</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="··· %lld other notes ···" xml:space="preserve">
-        <source>··· %lld other notes ···</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="🤙" xml:space="preserve">
-        <source>🤙</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-    </body>
-  </file>
-  <file original="damus/en.lproj/Localizable.stringsdict" source-language="en" target-language="es" datatype="plaintext">
-    <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/>
-    </header>
-    <body>
-      <trans-unit id="/replying_to_one_and_others:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>Replying to %@%#@others@</source>
-        <note>Label to indicate that the user is replying to 1 user and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_one_and_others:dict/others:dict/one:dict/:string" xml:space="preserve">
-        <source> &amp; 1 other</source>
-        <note>Label to indicate that the user is replying to 1 user and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_one_and_others:dict/others:dict/other:dict/:string" xml:space="preserve">
-        <source> &amp; %d others</source>
-        <note>Label to indicate that the user is replying to 1 user and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_one_and_others:dict/others:dict/zero:dict/:string" xml:space="preserve">
-        <source/>
-        <note>Label to indicate that the user is replying to 1 user and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_two_and_others:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve">
-        <source>Replying to %@, %@%#@others@</source>
-        <note>Label to indicate that the user is replying to 2 users and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_two_and_others:dict/others:dict/one:dict/:string" xml:space="preserve">
-        <source> &amp; 1 other</source>
-        <note>Label to indicate that the user is replying to 2 users and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_two_and_others:dict/others:dict/other:dict/:string" xml:space="preserve">
-        <source> &amp; %d others</source>
-        <note>Label to indicate that the user is replying to 2 users and others.</note>
-      </trans-unit>
-      <trans-unit id="/replying_to_two_and_others:dict/others:dict/zero:dict/:string" xml:space="preserve">
-        <source/>
-        <note>Label to indicate that the user is replying to 2 users and others.</note>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>

damus Localizations/es.xcloc/Source Contents/damus/en.lproj/Localizable.stringsdict

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>replying_to_one_and_others</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>Replying to %@%#@others@</string>
-		<key>others</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string></string>
-			<key>one</key>
-			<string> &amp; 1 other</string>
-			<key>other</key>
-			<string> &amp; %d others</string>
-		</dict>
-	</dict>
-	<key>replying_to_two_and_others</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>Replying to %@, %@%#@others@</string>
-		<key>others</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string></string>
-			<key>one</key>
-			<string> &amp; 1 other</string>
-			<key>other</key>
-			<string> &amp; %d others</string>
-		</dict>
-	</dict>
-</dict>
-</plist>

damus Localizations/es.xcloc/contents.json

@@ -1,12 +0,0 @@
-{
-  "developmentRegion" : "en",
-  "project" : "damus.xcodeproj",
-  "targetLocale" : "es",
-  "toolInfo" : {
-    "toolBuildNumber" : "14C18",
-    "toolID" : "com.apple.dt.xcode",
-    "toolName" : "Xcode",
-    "toolVersion" : "14.2"
-  },
-  "version" : "1.0"
-}

damus-c/damus.c

@@ -22,6 +22,10 @@ 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 void make_cursor(struct cursor *c, const u8 *content, size_t len)
 {
     c->start = content;
@@ -29,18 +33,35 @@ static void make_cursor(struct cursor *c, const u8 *content, size_t len)
     c->p = content;
 }
 
-static int consume_until_whitespace(struct cursor *cur, int or_end) {
+static int consume_until_boundary(struct cursor *cur) {
     char c;
     
     while (cur->p < cur->end) {
         c = *cur->p;
         
-        if (is_whitespace(c))
+        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) && consumedAtLeastOne)
+            return 1;
+        
+        cur->p++;
+        consumedAtLeastOne = true;
+    }
+    
     return or_end;
 }
 
@@ -145,7 +166,7 @@ static int parse_hashtag(struct cursor *cur, struct block *block) {
         return 0;
     }
     
-    consume_until_whitespace(cur, 1);
+    consume_until_boundary(cur);
     
     block->type = BLOCK_HASHTAG;
     block->block.str.start = (const char*)(start + 1);

damus.xcodeproj/project.pbxproj

@@ -12,9 +12,13 @@
 		3169CAED294FCCFC00EE4006 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3169CAEC294FCCFC00EE4006 /* Constants.swift */; };
 		31D2E847295218AF006D67F8 /* Shimmer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31D2E846295218AF006D67F8 /* Shimmer.swift */; };
 		3A4325A82961E11400BFCD9D /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 3A4325AA2961E11400BFCD9D /* Localizable.stringsdict */; };
-		3AB18056296375CA00FD1BD8 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3AB18052296375CA00FD1BD8 /* InfoPlist.strings */; };
-		3AB18057296375CA00FD1BD8 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3AB18054296375CA00FD1BD8 /* Localizable.strings */; };
+		3AA247FD297E3CFF0090C62D /* RepostsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA247FC297E3CFF0090C62D /* RepostsModel.swift */; };
+		3AA247FF297E3D900090C62D /* RepostsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA247FE297E3D900090C62D /* RepostsView.swift */; };
+		3AA24802297E3DC20090C62D /* RepostView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA24801297E3DC20090C62D /* RepostView.swift */; };
+		3ACB685C297633BC00C46468 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3ACB685A297633BC00C46468 /* InfoPlist.strings */; };
+		3ACB685F297633BC00C46468 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3ACB685D297633BC00C46468 /* Localizable.strings */; };
 		3ACBCB78295FE5C70037388A /* TimeAgoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ACBCB77295FE5C70037388A /* TimeAgoTests.swift */; };
+		3AE45AF6297BB2E700C1D842 /* LibreTranslateServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */; };
 		4C06670128FC7C5900038D2A /* RelayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C06670028FC7C5900038D2A /* RelayView.swift */; };
 		4C06670428FC7EC500038D2A /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 4C06670328FC7EC500038D2A /* Kingfisher */; };
 		4C06670628FCB08600038D2A /* ImageCarousel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C06670528FCB08600038D2A /* ImageCarousel.swift */; };
@@ -113,11 +117,29 @@
 		4C987B57283FD07F0042CE38 /* FollowersModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C987B56283FD07F0042CE38 /* FollowersModel.swift */; };
 		4C99737B28C92A9200E53835 /* ChatroomMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C99737A28C92A9200E53835 /* ChatroomMetadata.swift */; };
 		4CA2EFA0280E37AC0044ACD8 /* TimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */; };
+		4CAAD8AD298851D000060CEA /* AccountDeletion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CAAD8AC298851D000060CEA /* AccountDeletion.swift */; };
+		4CAAD8B029888AD200060CEA /* RelayConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */; };
 		4CACA9D5280C31E100D9BBE8 /* ReplyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */; };
 		4CACA9DC280C38C000D9BBE8 /* Profiles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CACA9DB280C38C000D9BBE8 /* Profiles.swift */; };
 		4CB55EF3295E5D59007FD187 /* RecommendedRelayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB55EF2295E5D59007FD187 /* RecommendedRelayView.swift */; };
 		4CB55EF5295E679D007FD187 /* UserRelaysView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB55EF4295E679D007FD187 /* UserRelaysView.swift */; };
 		4CB8838629656C8B00DC99E7 /* NIP05.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838529656C8B00DC99E7 /* NIP05.swift */; };
+		4CB88389296AF99A00DC99E7 /* EventDetailBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB88388296AF99A00DC99E7 /* EventDetailBar.swift */; };
+		4CB8838B296F6E1E00DC99E7 /* NIP05Badge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838A296F6E1E00DC99E7 /* NIP05Badge.swift */; };
+		4CB8838D296F710400DC99E7 /* Reposted.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838C296F710400DC99E7 /* Reposted.swift */; };
+		4CB8838F296F781C00DC99E7 /* ReactionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8838E296F781C00DC99E7 /* ReactionsView.swift */; };
+		4CB88393296F798300DC99E7 /* ReactionsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB88392296F798300DC99E7 /* ReactionsModel.swift */; };
+		4CB88396296F7F8B00DC99E7 /* ReactionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB88395296F7F8B00DC99E7 /* ReactionView.swift */; };
+		4CB8839A297322D200DC99E7 /* DMTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB88399297322D200DC99E7 /* DMTests.swift */; };
+		4CBCA930297DB57F00EC6B2F /* WebsiteLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */; };
+		4CC7AAEB297F0AEC00430951 /* BuilderEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAEA297F0AEC00430951 /* BuilderEventView.swift */; };
+		4CC7AAED297F0B9E00430951 /* Highlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAEC297F0B9E00430951 /* Highlight.swift */; };
+		4CC7AAF0297F11C700430951 /* SelectedEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAEF297F11C700430951 /* SelectedEventView.swift */; };
+		4CC7AAF2297F129C00430951 /* EmbeddedEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF1297F129C00430951 /* EmbeddedEventView.swift */; };
+		4CC7AAF4297F18B400430951 /* ReplyDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF3297F18B400430951 /* ReplyDescription.swift */; };
+		4CC7AAF6297F1A6A00430951 /* EventBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF5297F1A6A00430951 /* EventBody.swift */; };
+		4CC7AAF8297F1CEE00430951 /* EventProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF7297F1CEE00430951 /* EventProfile.swift */; };
+		4CC7AAFA297F64AC00430951 /* EventMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF9297F64AC00430951 /* EventMenu.swift */; };
 		4CD7641B28A1641400B6928F /* EndBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD7641A28A1641400B6928F /* EndBlock.swift */; };
 		4CE4F8CD281352B30009DFBB /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F8CC281352B30009DFBB /* Notifications.swift */; };
 		4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */; };
@@ -139,14 +161,38 @@
 		4CEE2AF7280B2DEA00AB5EEF /* ProfileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEE2AF6280B2DEA00AB5EEF /* ProfileName.swift */; };
 		4CEE2AF9280B2EAC00AB5EEF /* PowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEE2AF8280B2EAC00AB5EEF /* PowView.swift */; };
 		4CEE2B02280B39E800AB5EEF /* EventActionBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEE2B01280B39E800AB5EEF /* EventActionBar.swift */; };
+		4CF0ABD42980996B00D66079 /* Report.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABD32980996B00D66079 /* Report.swift */; };
+		4CF0ABD629817F5B00D66079 /* ReportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABD529817F5B00D66079 /* ReportView.swift */; };
+		4CF0ABD82981980C00D66079 /* Lists.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABD72981980C00D66079 /* Lists.swift */; };
+		4CF0ABDC2981A19E00D66079 /* ListTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABDB2981A19E00D66079 /* ListTests.swift */; };
+		4CF0ABDE2981A69500D66079 /* MutelistModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABDD2981A69500D66079 /* MutelistModel.swift */; };
+		4CF0ABE12981A83900D66079 /* MutelistView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABE02981A83900D66079 /* MutelistView.swift */; };
+		4CF0ABE32981BC7D00D66079 /* UserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABE22981BC7D00D66079 /* UserView.swift */; };
+		4CF0ABE52981EE0C00D66079 /* EULAView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABE42981EE0C00D66079 /* EULAView.swift */; };
+		4CF0ABE7298444FD00D66079 /* MutedEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABE6298444FC00D66079 /* MutedEventView.swift */; };
+		4CF0ABE929844AF100D66079 /* AnyCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABE829844AF100D66079 /* AnyCodable.swift */; };
+		4CF0ABEC29844B4700D66079 /* AnyDecodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABEB29844B4700D66079 /* AnyDecodable.swift */; };
+		4CF0ABEE29844B5500D66079 /* AnyEncodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABED29844B5500D66079 /* AnyEncodable.swift */; };
+		4CF0ABF029857E9200D66079 /* Bech32Object.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABEF29857E9200D66079 /* Bech32Object.swift */; };
+		4CF0ABF62985CD5500D66079 /* UserSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABF52985CD5500D66079 /* UserSearch.swift */; };
 		4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FE60CDC295E1C5E00105A1F /* Wallet.swift */; };
+		5C513FBA297F72980072348F /* CustomPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FB9297F72980072348F /* CustomPicker.swift */; };
+		5C513FCC2984ACA60072348F /* QRCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FCB2984ACA60072348F /* QRCodeView.swift */; };
+		6439E014296790CF0020672B /* ProfileZoomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6439E013296790CF0020672B /* ProfileZoomView.swift */; };
+		647D9A8D2968520300A295DE /* SideMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647D9A8C2968520300A295DE /* SideMenuView.swift */; };
 		64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64FBD06E296255C400D9D3B2 /* Theme.swift */; };
 		6C7DE41F2955169800E66263 /* Vault in Frameworks */ = {isa = PBXBuildFile; productRef = 6C7DE41E2955169800E66263 /* Vault */; };
+		7C45AE71297353390031D7BC /* KFImageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C45AE70297353390031D7BC /* KFImageModel.swift */; };
+		7C60CAEF298471A1009C80D6 /* CoreSVG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C60CAEE298471A1009C80D6 /* CoreSVG.swift */; };
+		7C902AE32981D55B002AB16E /* ZoomableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */; };
+		9609F058296E220800069BF3 /* BannerImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9609F057296E220800069BF3 /* BannerImageView.swift */; };
 		BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA693073295D649800ADDB87 /* UserSettingsStore.swift */; };
 		BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */; };
 		DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */; };
 		E990020F2955F837003BBC5A /* EditMetadataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E990020E2955F837003BBC5A /* EditMetadataView.swift */; };
 		E9E4ED0B295867B900DD7078 /* ThreadV2View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */; };
+		F7F0BA25297892BD009531F3 /* SwipeToDismiss.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */; };
+		F7F0BA272978E54D009531F3 /* ParicipantsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA262978E54D009531F3 /* ParicipantsView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -171,11 +217,39 @@
 		3169CAE5294E69C000EE4006 /* EmptyTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyTimelineView.swift; sourceTree = "<group>"; };
 		3169CAEC294FCCFC00EE4006 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Constants.swift; path = damus/Util/Constants.swift; sourceTree = SOURCE_ROOT; };
 		31D2E846295218AF006D67F8 /* Shimmer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shimmer.swift; sourceTree = "<group>"; };
-		3A4325A92961E11400BFCD9D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		3AB1803D29636FB100FD1BD8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = es; path = es.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		3AB18058296377E500FD1BD8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		3AB18059296377E700FD1BD8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3A185A04297F2C3800F4BDC0 /* lv-LV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "lv-LV"; path = "lv-LV.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3A185A05297F2C3800F4BDC0 /* lv-LV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "lv-LV"; path = "lv-LV.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3A185A06297F2C3800F4BDC0 /* lv-LV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "lv-LV"; path = "lv-LV.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3A2B8B0A296A8982009CC16D /* en-US */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "en-US"; path = "en-US.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3A4F3320297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-FR"; path = "fr-FR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3A4F3321297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-FR"; path = "fr-FR.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3A4F3322297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "fr-FR"; path = "fr-FR.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3A5C4575296A879E0032D398 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "es-419"; path = "es-419.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3A5EA10F297CCF6C00569477 /* de-AT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "de-AT"; path = "de-AT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3A5EA110297CCF6C00569477 /* de-AT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "de-AT"; path = "de-AT.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3A5EA111297CCF6C00569477 /* de-AT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "de-AT"; path = "de-AT.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3A929C20297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "it-IT"; path = "it-IT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3A929C21297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "it-IT"; path = "it-IT.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3A929C22297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "it-IT"; path = "it-IT.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3A93342929884CA600D6A8F3 /* pl-PL */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pl-PL"; path = "pl-PL.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3A93342A29884CA600D6A8F3 /* pl-PL */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pl-PL"; path = "pl-PL.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3A93342B29884CA600D6A8F3 /* pl-PL */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "pl-PL"; path = "pl-PL.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3AA247FC297E3CFF0090C62D /* RepostsModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RepostsModel.swift; sourceTree = "<group>"; };
+		3AA247FE297E3D900090C62D /* RepostsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostsView.swift; sourceTree = "<group>"; };
+		3AA24801297E3DC20090C62D /* RepostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostView.swift; sourceTree = "<group>"; };
+		3AB5B86A2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3AB5B86B2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3AB5B86C2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = de; path = de.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		3ACB685B297633BC00C46468 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3ACB685E297633BC00C46468 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3ACBCB77295FE5C70037388A /* TimeAgoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeAgoTests.swift; sourceTree = "<group>"; };
+		3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibreTranslateServer.swift; sourceTree = "<group>"; };
+		3AEB8003297CCEA800713A25 /* tr-TR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "tr-TR"; path = "tr-TR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3AEB8004297CCEA800713A25 /* tr-TR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "tr-TR"; path = "tr-TR.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3AEB8005297CCEA900713A25 /* tr-TR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "tr-TR"; path = "tr-TR.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3AF6336829884C6B0005672A /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3AF6336929884C6B0005672A /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3AF6336A29884C6B0005672A /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "pt-PT"; path = "pt-PT.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		4C06670028FC7C5900038D2A /* RelayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayView.swift; sourceTree = "<group>"; };
 		4C06670528FCB08600038D2A /* ImageCarousel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCarousel.swift; sourceTree = "<group>"; };
 		4C06670828FDE64700038D2A /* damus-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "damus-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -306,11 +380,29 @@
 		4C987B56283FD07F0042CE38 /* FollowersModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowersModel.swift; sourceTree = "<group>"; };
 		4C99737A28C92A9200E53835 /* ChatroomMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatroomMetadata.swift; sourceTree = "<group>"; };
 		4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineView.swift; sourceTree = "<group>"; };
+		4CAAD8AC298851D000060CEA /* AccountDeletion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountDeletion.swift; sourceTree = "<group>"; };
+		4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayConfigView.swift; sourceTree = "<group>"; };
 		4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyView.swift; sourceTree = "<group>"; };
 		4CACA9DB280C38C000D9BBE8 /* Profiles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Profiles.swift; sourceTree = "<group>"; };
 		4CB55EF2295E5D59007FD187 /* RecommendedRelayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendedRelayView.swift; sourceTree = "<group>"; };
 		4CB55EF4295E679D007FD187 /* UserRelaysView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserRelaysView.swift; sourceTree = "<group>"; };
 		4CB8838529656C8B00DC99E7 /* NIP05.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIP05.swift; sourceTree = "<group>"; };
+		4CB88388296AF99A00DC99E7 /* EventDetailBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventDetailBar.swift; sourceTree = "<group>"; };
+		4CB8838A296F6E1E00DC99E7 /* NIP05Badge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIP05Badge.swift; sourceTree = "<group>"; };
+		4CB8838C296F710400DC99E7 /* Reposted.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Reposted.swift; sourceTree = "<group>"; };
+		4CB8838E296F781C00DC99E7 /* ReactionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactionsView.swift; sourceTree = "<group>"; };
+		4CB88392296F798300DC99E7 /* ReactionsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactionsModel.swift; sourceTree = "<group>"; };
+		4CB88395296F7F8B00DC99E7 /* ReactionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactionView.swift; sourceTree = "<group>"; };
+		4CB88399297322D200DC99E7 /* DMTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DMTests.swift; sourceTree = "<group>"; };
+		4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebsiteLink.swift; sourceTree = "<group>"; };
+		4CC7AAEA297F0AEC00430951 /* BuilderEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuilderEventView.swift; sourceTree = "<group>"; };
+		4CC7AAEC297F0B9E00430951 /* Highlight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Highlight.swift; sourceTree = "<group>"; };
+		4CC7AAEF297F11C700430951 /* SelectedEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectedEventView.swift; sourceTree = "<group>"; };
+		4CC7AAF1297F129C00430951 /* EmbeddedEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmbeddedEventView.swift; sourceTree = "<group>"; };
+		4CC7AAF3297F18B400430951 /* ReplyDescription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyDescription.swift; sourceTree = "<group>"; };
+		4CC7AAF5297F1A6A00430951 /* EventBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventBody.swift; sourceTree = "<group>"; };
+		4CC7AAF7297F1CEE00430951 /* EventProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventProfile.swift; sourceTree = "<group>"; };
+		4CC7AAF9297F64AC00430951 /* EventMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventMenu.swift; sourceTree = "<group>"; };
 		4CD7641A28A1641400B6928F /* EndBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndBlock.swift; sourceTree = "<group>"; };
 		4CE4F8CC281352B30009DFBB /* Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = "<group>"; };
 		4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigView.swift; sourceTree = "<group>"; };
@@ -335,13 +427,37 @@
 		4CEE2AF6280B2DEA00AB5EEF /* ProfileName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileName.swift; sourceTree = "<group>"; };
 		4CEE2AF8280B2EAC00AB5EEF /* PowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PowView.swift; sourceTree = "<group>"; };
 		4CEE2B01280B39E800AB5EEF /* EventActionBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventActionBar.swift; sourceTree = "<group>"; };
+		4CF0ABD32980996B00D66079 /* Report.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Report.swift; sourceTree = "<group>"; };
+		4CF0ABD529817F5B00D66079 /* ReportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportView.swift; sourceTree = "<group>"; };
+		4CF0ABD72981980C00D66079 /* Lists.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Lists.swift; sourceTree = "<group>"; };
+		4CF0ABDB2981A19E00D66079 /* ListTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListTests.swift; sourceTree = "<group>"; };
+		4CF0ABDD2981A69500D66079 /* MutelistModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutelistModel.swift; sourceTree = "<group>"; };
+		4CF0ABE02981A83900D66079 /* MutelistView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutelistView.swift; sourceTree = "<group>"; };
+		4CF0ABE22981BC7D00D66079 /* UserView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserView.swift; sourceTree = "<group>"; };
+		4CF0ABE42981EE0C00D66079 /* EULAView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EULAView.swift; sourceTree = "<group>"; };
+		4CF0ABE6298444FC00D66079 /* MutedEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutedEventView.swift; sourceTree = "<group>"; };
+		4CF0ABE829844AF100D66079 /* AnyCodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyCodable.swift; sourceTree = "<group>"; };
+		4CF0ABEB29844B4700D66079 /* AnyDecodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyDecodable.swift; sourceTree = "<group>"; };
+		4CF0ABED29844B5500D66079 /* AnyEncodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyEncodable.swift; sourceTree = "<group>"; };
+		4CF0ABEF29857E9200D66079 /* Bech32Object.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bech32Object.swift; sourceTree = "<group>"; };
+		4CF0ABF52985CD5500D66079 /* UserSearch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSearch.swift; sourceTree = "<group>"; };
 		4FE60CDC295E1C5E00105A1F /* Wallet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Wallet.swift; sourceTree = "<group>"; };
+		5C513FB9297F72980072348F /* CustomPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomPicker.swift; sourceTree = "<group>"; };
+		5C513FCB2984ACA60072348F /* QRCodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeView.swift; sourceTree = "<group>"; };
+		6439E013296790CF0020672B /* ProfileZoomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileZoomView.swift; sourceTree = "<group>"; };
+		647D9A8C2968520300A295DE /* SideMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuView.swift; sourceTree = "<group>"; };
 		64FBD06E296255C400D9D3B2 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
+		7C45AE70297353390031D7BC /* KFImageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KFImageModel.swift; sourceTree = "<group>"; };
+		7C60CAEE298471A1009C80D6 /* CoreSVG.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreSVG.swift; sourceTree = "<group>"; };
+		7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZoomableScrollView.swift; sourceTree = "<group>"; };
+		9609F057296E220800069BF3 /* BannerImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BannerImageView.swift; sourceTree = "<group>"; };
 		BA693073295D649800ADDB87 /* UserSettingsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSettingsStore.swift; sourceTree = "<group>"; };
 		BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectWalletView.swift; sourceTree = "<group>"; };
 		DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkdownTests.swift; sourceTree = "<group>"; };
 		E990020E2955F837003BBC5A /* EditMetadataView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditMetadataView.swift; sourceTree = "<group>"; };
 		E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadV2View.swift; sourceTree = "<group>"; };
+		F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwipeToDismiss.swift; sourceTree = "<group>"; };
+		F7F0BA262978E54D009531F3 /* ParicipantsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParicipantsView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -381,6 +497,14 @@
 			path = "Empty Views";
 			sourceTree = "<group>";
 		};
+		3AA24800297E3DAE0090C62D /* Reposts */ = {
+			isa = PBXGroup;
+			children = (
+				3AA24801297E3DC20090C62D /* RepostView.swift */,
+			);
+			path = Reposts;
+			sourceTree = "<group>";
+		};
 		4C06670728FDE62900038D2A /* damus-c */ = {
 			isa = PBXGroup;
 			children = (
@@ -438,6 +562,7 @@
 		4C0A3F8D280F63FF000448DE /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				3AA247FC297E3CFF0090C62D /* RepostsModel.swift */,
 				4C0A3F8E280F640A000448DE /* ThreadModel.swift */,
 				4C0A3F92280F66F5000448DE /* ReplyMap.swift */,
 				4C3BEFD12819DB9B00B3DE84 /* ProfileModel.swift */,
@@ -467,6 +592,11 @@
 				4C99737A28C92A9200E53835 /* ChatroomMetadata.swift */,
 				BA693073295D649800ADDB87 /* UserSettingsStore.swift */,
 				4FE60CDC295E1C5E00105A1F /* Wallet.swift */,
+				4CB88392296F798300DC99E7 /* ReactionsModel.swift */,
+				7C45AE70297353390031D7BC /* KFImageModel.swift */,
+				4CF0ABD32980996B00D66079 /* Report.swift */,
+				4CF0ABDD2981A69500D66079 /* MutelistModel.swift */,
+				3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -474,6 +604,13 @@
 		4C75EFA227FA576C0006080F /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				4CAAD8AE29888A9B00060CEA /* Relays */,
+				4CF0ABF42985CD4200D66079 /* Posting */,
+				4CF0ABDF2981A83000D66079 /* Muting */,
+				4CC7AAEE297F11B300430951 /* Events */,
+				3AA24800297E3DAE0090C62D /* Reposts */,
+				4CB88394296F7F8100DC99E7 /* Reactions */,
+				4CB88387296AF97C00DC99E7 /* ActionBar */,
 				4CE4F9E228528C5200C00DD9 /* AddRelayView.swift */,
 				4C363A8728236948006E126D /* BlocksView.swift */,
 				4C285C8128385570008A31F1 /* CarouselView.swift */,
@@ -486,13 +623,11 @@
 				4C216F33286F5ACD00040376 /* DMView.swift */,
 				E990020E2955F837003BBC5A /* EditMetadataView.swift */,
 				3169CAE4294E699400EE4006 /* Empty Views */,
-				4CEE2B01280B39E800AB5EEF /* EventActionBar.swift */,
-				4CEE2AF0280B216B00AB5EEF /* EventDetailView.swift */,
 				4C75EFB82804A2740006080F /* EventView.swift */,
+				4CEE2AF0280B216B00AB5EEF /* EventDetailView.swift */,
 				4C3AC79E2833115300E1F516 /* FollowButtonView.swift */,
 				4C3AC79C2833036D00E1F516 /* FollowingView.swift */,
 				4C90BD17283A9EE5008EE7EF /* LoginView.swift */,
-				4C3AC7A42836987600E1F516 /* MainTabView.swift */,
 				4C363A8928236B57006E126D /* MentionView.swift */,
 				4C363A8D28236FE4006E126D /* NoteContentView.swift */,
 				4C75EFAC28049CFB0006080F /* PostButton.swift */,
@@ -502,11 +637,11 @@
 				4C285C892838B985008A31F1 /* ProfilePictureSelector.swift */,
 				4CEE2AF2280B25C500AB5EEF /* ProfilePicView.swift */,
 				4C8682862814DE470026224F /* ProfileView.swift */,
+				4C3AC7A42836987600E1F516 /* MainTabView.swift */,
 				4C363A8B28236B92006E126D /* PubkeyView.swift */,
-				4CB55EF2295E5D59007FD187 /* RecommendedRelayView.swift */,
-				4C06670028FC7C5900038D2A /* RelayView.swift */,
 				4C0A3F94280F6C78000448DE /* ReplyQuoteView.swift */,
 				4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */,
+				F7F0BA262978E54D009531F3 /* ParicipantsView.swift */,
 				4C285C8D28399BFD008A31F1 /* SaveKeysView.swift */,
 				4C3AC7A628369BA200E1F516 /* SearchHomeView.swift */,
 				4C5C7E69284EDE2E00A22DF5 /* SearchResultsView.swift */,
@@ -517,6 +652,14 @@
 				4C0A3F96280F8E02000448DE /* ThreadView.swift */,
 				4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */,
 				4CB55EF4295E679D007FD187 /* UserRelaysView.swift */,
+				647D9A8C2968520300A295DE /* SideMenuView.swift */,
+				9609F057296E220800069BF3 /* BannerImageView.swift */,
+				4CB8838E296F781C00DC99E7 /* ReactionsView.swift */,
+				6439E013296790CF0020672B /* ProfileZoomView.swift */,
+				4CF0ABD529817F5B00D66079 /* ReportView.swift */,
+				4CF0ABE42981EE0C00D66079 /* EULAView.swift */,
+				3AA247FE297E3D900090C62D /* RepostsView.swift */,
+				5C513FCB2984ACA60072348F /* QRCodeView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -544,6 +687,7 @@
 		4C7FF7D628233637009601DB /* Util */ = {
 			isa = PBXGroup;
 			children = (
+				4CF0ABEA29844B2F00D66079 /* AnyCodable */,
 				4C3A1D322960DB0500558C0F /* Markdown.swift */,
 				4CEE2AF4280B29E600AB5EEF /* TimeAgo.swift */,
 				4CE4F8CC281352B30009DFBB /* Notifications.swift */,
@@ -558,10 +702,56 @@
 				4C3A1D3629637E0500558C0F /* PreviewCache.swift */,
 				64FBD06E296255C400D9D3B2 /* Theme.swift */,
 				4CB8838529656C8B00DC99E7 /* NIP05.swift */,
+				4CF0ABD72981980C00D66079 /* Lists.swift */,
+				4CF0ABEF29857E9200D66079 /* Bech32Object.swift */,
+				7C60CAEE298471A1009C80D6 /* CoreSVG.swift */,
+				4CAAD8AC298851D000060CEA /* AccountDeletion.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
 		};
+		4CAAD8AE29888A9B00060CEA /* Relays */ = {
+			isa = PBXGroup;
+			children = (
+				4CB55EF2295E5D59007FD187 /* RecommendedRelayView.swift */,
+				4C06670028FC7C5900038D2A /* RelayView.swift */,
+				4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */,
+			);
+			path = Relays;
+			sourceTree = "<group>";
+		};
+		4CB88387296AF97C00DC99E7 /* ActionBar */ = {
+			isa = PBXGroup;
+			children = (
+				4CEE2B01280B39E800AB5EEF /* EventActionBar.swift */,
+				4CB88388296AF99A00DC99E7 /* EventDetailBar.swift */,
+			);
+			path = ActionBar;
+			sourceTree = "<group>";
+		};
+		4CB88394296F7F8100DC99E7 /* Reactions */ = {
+			isa = PBXGroup;
+			children = (
+				4CB88395296F7F8B00DC99E7 /* ReactionView.swift */,
+			);
+			path = Reactions;
+			sourceTree = "<group>";
+		};
+		4CC7AAEE297F11B300430951 /* Events */ = {
+			isa = PBXGroup;
+			children = (
+				4CC7AAEF297F11C700430951 /* SelectedEventView.swift */,
+				4CC7AAF1297F129C00430951 /* EmbeddedEventView.swift */,
+				4CC7AAF3297F18B400430951 /* ReplyDescription.swift */,
+				4CC7AAF5297F1A6A00430951 /* EventBody.swift */,
+				4CC7AAEA297F0AEC00430951 /* BuilderEventView.swift */,
+				4CC7AAF7297F1CEE00430951 /* EventProfile.swift */,
+				4CC7AAF9297F64AC00430951 /* EventMenu.swift */,
+				4CF0ABE6298444FC00D66079 /* MutedEventView.swift */,
+			);
+			path = Events;
+			sourceTree = "<group>";
+		};
 		4CE4F9DF285287A000C00DD9 /* Components */ = {
 			isa = PBXGroup;
 			children = (
@@ -571,6 +761,13 @@
 				4C06670528FCB08600038D2A /* ImageCarousel.swift */,
 				4C3EA67C28FFBBA200C48A62 /* InvoicesView.swift */,
 				4C3EA67E28FFC01D00C48A62 /* InvoiceView.swift */,
+				4CB8838A296F6E1E00DC99E7 /* NIP05Badge.swift */,
+				4CB8838C296F710400DC99E7 /* Reposted.swift */,
+				4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */,
+				4CC7AAEC297F0B9E00430951 /* Highlight.swift */,
+				5C513FB9297F72980072348F /* CustomPicker.swift */,
+				4CF0ABE22981BC7D00D66079 /* UserView.swift */,
+				7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -600,19 +797,20 @@
 		4CE6DEE527F7A08100C66700 /* damus */ = {
 			isa = PBXGroup;
 			children = (
+				F7F0BA23297892AE009531F3 /* Modifiers */,
 				4C4A3A5A288A1B2200453788 /* damus.entitlements */,
 				4CE4F9DF285287A000C00DD9 /* Components */,
 				4C7FF7D628233637009601DB /* Util */,
 				4C0A3F8D280F63FF000448DE /* Models */,
 				4C75EFAB28049CC80006080F /* Nostr */,
 				4C75EFA72804823E0006080F /* Info.plist */,
+				3ACB685D297633BC00C46468 /* Localizable.strings */,
+				3ACB685A297633BC00C46468 /* InfoPlist.strings */,
 				4C75EFA227FA576C0006080F /* Views */,
 				4CE6DEE627F7A08100C66700 /* damusApp.swift */,
 				4CE6DEE827F7A08100C66700 /* ContentView.swift */,
 				4CE6DEEA27F7A08200C66700 /* Assets.xcassets */,
 				4CE6DEEC27F7A08200C66700 /* Preview Content */,
-				3AB18052296375CA00FD1BD8 /* InfoPlist.strings */,
-				3AB18054296375CA00FD1BD8 /* Localizable.strings */,
 				3A4325AA2961E11400BFCD9D /* Localizable.stringsdict */,
 			);
 			path = damus;
@@ -636,6 +834,8 @@
 				4CE6DEF727F7A08200C66700 /* damusTests.swift */,
 				4C3EA67A28FF7B3900C48A62 /* InvoiceTests.swift */,
 				3ACBCB77295FE5C70037388A /* TimeAgoTests.swift */,
+				4CB88399297322D200DC99E7 /* DMTests.swift */,
+				4CF0ABDB2981A19E00D66079 /* ListTests.swift */,
 			);
 			path = damusTests;
 			sourceTree = "<group>";
@@ -657,6 +857,40 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		4CF0ABDF2981A83000D66079 /* Muting */ = {
+			isa = PBXGroup;
+			children = (
+				4CF0ABE02981A83900D66079 /* MutelistView.swift */,
+			);
+			path = Muting;
+			sourceTree = "<group>";
+		};
+		4CF0ABEA29844B2F00D66079 /* AnyCodable */ = {
+			isa = PBXGroup;
+			children = (
+				4CF0ABE829844AF100D66079 /* AnyCodable.swift */,
+				4CF0ABEB29844B4700D66079 /* AnyDecodable.swift */,
+				4CF0ABED29844B5500D66079 /* AnyEncodable.swift */,
+			);
+			path = AnyCodable;
+			sourceTree = "<group>";
+		};
+		4CF0ABF42985CD4200D66079 /* Posting */ = {
+			isa = PBXGroup;
+			children = (
+				4CF0ABF52985CD5500D66079 /* UserSearch.swift */,
+			);
+			path = Posting;
+			sourceTree = "<group>";
+		};
+		F7F0BA23297892AE009531F3 /* Modifiers */ = {
+			isa = PBXGroup;
+			children = (
+				F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */,
+			);
+			path = Modifiers;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -745,19 +979,26 @@
 			};
 			buildConfigurationList = 4CE6DEDE27F7A08100C66700 /* Build configuration list for PBXProject "damus" */;
 			compatibilityVersion = "Xcode 13.0";
-			developmentRegion = en;
+			developmentRegion = "en-US";
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				en,
-				es,
 				Base,
+				"es-419",
+				"en-US",
+				"de-AT",
+				"tr-TR",
+				"fr-FR",
+				"lv-LV",
+				"it-IT",
+				de,
+				"pt-PT",
+				"pl-PL",
 			);
 			mainGroup = 4CE6DEDA27F7A08100C66700;
 			packageReferences = (
 				4CE6DF1027F7A2B300C66700 /* XCRemoteSwiftPackageReference "Starscream" */,
 				4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1" */,
 				4C06670228FC7EC500038D2A /* XCRemoteSwiftPackageReference "Kingfisher" */,
-				3169CAE9294FCABA00EE4006 /* XCRemoteSwiftPackageReference "Shimmer" */,
 				6C7DE41D2955169800E66263 /* XCRemoteSwiftPackageReference "Vault" */,
 			);
 			productRefGroup = 4CE6DEE427F7A08100C66700 /* Products */;
@@ -776,9 +1017,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3AB18057296375CA00FD1BD8 /* Localizable.strings in Resources */,
+				3ACB685F297633BC00C46468 /* Localizable.strings in Resources */,
 				4CE6DEEE27F7A08200C66700 /* Preview Assets.xcassets in Resources */,
-				3AB18056296375CA00FD1BD8 /* InfoPlist.strings in Resources */,
+				3ACB685C297633BC00C46468 /* InfoPlist.strings in Resources */,
 				4CE6DEEB27F7A08200C66700 /* Assets.xcassets in Resources */,
 				3A4325A82961E11400BFCD9D /* Localizable.stringsdict in Resources */,
 			);
@@ -812,32 +1053,44 @@
 				4C216F34286F5ACD00040376 /* DMView.swift in Sources */,
 				4C3EA64428FF558100C48A62 /* sha256.c in Sources */,
 				4CE4F9E1285287B800C00DD9 /* TextFieldAlert.swift in Sources */,
+				4CF0ABF62985CD5500D66079 /* UserSearch.swift in Sources */,
 				4C363AA828297703006E126D /* InsertSort.swift in Sources */,
 				4C285C86283892E7008A31F1 /* CreateAccountModel.swift in Sources */,
 				4C64987C286D03E000EAE2B3 /* DirectMessagesView.swift in Sources */,
+				7C902AE32981D55B002AB16E /* ZoomableScrollView.swift in Sources */,
 				4C363A8C28236B92006E126D /* PubkeyView.swift in Sources */,
 				4C5C7E68284ED36500A22DF5 /* SearchHomeModel.swift in Sources */,
 				4C75EFB728049D990006080F /* RelayPool.swift in Sources */,
+				4CF0ABEE29844B5500D66079 /* AnyEncodable.swift in Sources */,
+				4CB8838D296F710400DC99E7 /* Reposted.swift in Sources */,
 				4C3EA67728FF7A9800C48A62 /* talstr.c in Sources */,
 				4CE6DEE927F7A08100C66700 /* ContentView.swift in Sources */,
 				4CEE2AF5280B29E600AB5EEF /* TimeAgo.swift in Sources */,
 				4C75EFAD28049CFB0006080F /* PostButton.swift in Sources */,
 				4CB55EF5295E679D007FD187 /* UserRelaysView.swift in Sources */,
 				4C363AA228296A7E006E126D /* SearchView.swift in Sources */,
+				4CC7AAED297F0B9E00430951 /* Highlight.swift in Sources */,
 				4C285C8A2838B985008A31F1 /* ProfilePictureSelector.swift in Sources */,
 				4C75EFB92804A2740006080F /* EventView.swift in Sources */,
+				3AA247FD297E3CFF0090C62D /* RepostsModel.swift in Sources */,
 				4C7FF7D52823313F009601DB /* Mentions.swift in Sources */,
 				4C633350283D40E500B1C9C3 /* HomeModel.swift in Sources */,
 				4C987B57283FD07F0042CE38 /* FollowersModel.swift in Sources */,
 				4C363A9028247A1D006E126D /* NostrLink.swift in Sources */,
 				4C0A3F8C280F5FCA000448DE /* ChatroomView.swift in Sources */,
 				4C477C9E282C3A4800033AA3 /* TipCounter.swift in Sources */,
+				647D9A8D2968520300A295DE /* SideMenuView.swift in Sources */,
+				F7F0BA272978E54D009531F3 /* ParicipantsView.swift in Sources */,
 				4C0A3F91280F6528000448DE /* ChatView.swift in Sources */,
+				4CF0ABE32981BC7D00D66079 /* UserView.swift in Sources */,
+				4CF0ABF029857E9200D66079 /* Bech32Object.swift in Sources */,
 				4C216F362870A9A700040376 /* InputDismissKeyboard.swift in Sources */,
 				4C216F382871EDE300040376 /* DirectMessageModel.swift in Sources */,
 				4C75EFA627FF87A20006080F /* Nostr.swift in Sources */,
 				4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */,
 				4C285C8E28399BFE008A31F1 /* SaveKeysView.swift in Sources */,
+				F7F0BA25297892BD009531F3 /* SwipeToDismiss.swift in Sources */,
+				4CB8838F296F781C00DC99E7 /* ReactionsView.swift in Sources */,
 				4C649844285A952100EAE2B3 /* LocalUserConfig.swift in Sources */,
 				4C75EFB328049D640006080F /* NostrEvent.swift in Sources */,
 				4CA2EFA0280E37AC0044ACD8 /* TimelineView.swift in Sources */,
@@ -846,22 +1099,31 @@
 				4C363A9A28283854006E126D /* Reply.swift in Sources */,
 				BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */,
 				4C90BD18283A9EE5008EE7EF /* LoginView.swift in Sources */,
+				4CB8838B296F6E1E00DC99E7 /* NIP05Badge.swift in Sources */,
 				4C3EA66828FF5F9900C48A62 /* hex.c in Sources */,
 				E9E4ED0B295867B900DD7078 /* ThreadV2View.swift in Sources */,
 				4C3BEFDC281DCE6100B3DE84 /* Liked.swift in Sources */,
+				4CF0ABE7298444FD00D66079 /* MutedEventView.swift in Sources */,
+				4CF0ABE12981A83900D66079 /* MutelistView.swift in Sources */,
 				4C75EFB128049D510006080F /* NostrResponse.swift in Sources */,
 				4CEE2AF7280B2DEA00AB5EEF /* ProfileName.swift in Sources */,
+				4CC7AAEB297F0AEC00430951 /* BuilderEventView.swift in Sources */,
 				31D2E847295218AF006D67F8 /* Shimmer.swift in Sources */,
 				4C285C8228385570008A31F1 /* CarouselView.swift in Sources */,
 				4C3EA67F28FFC01D00C48A62 /* InvoiceView.swift in Sources */,
 				4CEE2B02280B39E800AB5EEF /* EventActionBar.swift in Sources */,
 				4C3BEFE0281DE1ED00B3DE84 /* DamusState.swift in Sources */,
+				7C45AE71297353390031D7BC /* KFImageModel.swift in Sources */,
+				4CF0ABE929844AF100D66079 /* AnyCodable.swift in Sources */,
 				4C0A3F8F280F640A000448DE /* ThreadModel.swift in Sources */,
+				4CC7AAF2297F129C00430951 /* EmbeddedEventView.swift in Sources */,
 				4C3AC79F2833115300E1F516 /* FollowButtonView.swift in Sources */,
 				4C3BEFD22819DB9B00B3DE84 /* ProfileModel.swift in Sources */,
 				4C0A3F93280F66F5000448DE /* ReplyMap.swift in Sources */,
 				BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */,
 				3169CAE6294E69C000EE4006 /* EmptyTimelineView.swift in Sources */,
+				4CC7AAF0297F11C700430951 /* SelectedEventView.swift in Sources */,
+				4CC7AAF8297F1CEE00430951 /* EventProfile.swift in Sources */,
 				64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */,
 				4C3EA64928FF597700C48A62 /* bech32.c in Sources */,
 				4C90BD162839DB54008EE7EF /* NostrMetadata.swift in Sources */,
@@ -872,8 +1134,10 @@
 				4C285C8C28398BC7008A31F1 /* Keys.swift in Sources */,
 				4CACA9DC280C38C000D9BBE8 /* Profiles.swift in Sources */,
 				4C633352283D419F00B1C9C3 /* SignalModel.swift in Sources */,
+				9609F058296E220800069BF3 /* BannerImageView.swift in Sources */,
 				4C363A94282704FA006E126D /* Post.swift in Sources */,
 				4C216F32286E388800040376 /* DMChatView.swift in Sources */,
+				4CAAD8AD298851D000060CEA /* AccountDeletion.swift in Sources */,
 				4C3EA67928FF7ABF00C48A62 /* list.c in Sources */,
 				4C64987E286D082C00EAE2B3 /* DirectMessagesModel.swift in Sources */,
 				4C363A8828236948006E126D /* BlocksView.swift in Sources */,
@@ -881,18 +1145,30 @@
 				4C75EFAF28049D350006080F /* NostrFilter.swift in Sources */,
 				4C3EA64C28FF59AC00C48A62 /* bech32_util.c in Sources */,
 				4C363A9C282838B9006E126D /* EventRef.swift in Sources */,
+				3AA24802297E3DC20090C62D /* RepostView.swift in Sources */,
 				4CD7641B28A1641400B6928F /* EndBlock.swift in Sources */,
 				4C3EA66528FF5F6800C48A62 /* mem.c in Sources */,
+				4CF0ABE52981EE0C00D66079 /* EULAView.swift in Sources */,
+				4CBCA930297DB57F00EC6B2F /* WebsiteLink.swift in Sources */,
+				4CAAD8B029888AD200060CEA /* RelayConfigView.swift in Sources */,
 				4C3EA64128FF553900C48A62 /* hash_u5.c in Sources */,
+				5C513FCC2984ACA60072348F /* QRCodeView.swift in Sources */,
 				4C3EA64F28FF59F200C48A62 /* tal.c in Sources */,
+				4CB88393296F798300DC99E7 /* ReactionsModel.swift in Sources */,
+				4CB88396296F7F8B00DC99E7 /* ReactionView.swift in Sources */,
 				4C8682872814DE470026224F /* ProfileView.swift in Sources */,
 				4C5F9114283D694D0052CD1C /* FollowTarget.swift in Sources */,
+				4CF0ABD629817F5B00D66079 /* ReportView.swift in Sources */,
 				4CB8838629656C8B00DC99E7 /* NIP05.swift in Sources */,
+				4CF0ABD82981980C00D66079 /* Lists.swift in Sources */,
 				4C5C7E6A284EDE2E00A22DF5 /* SearchResultsView.swift in Sources */,
+				7C60CAEF298471A1009C80D6 /* CoreSVG.swift in Sources */,
+				6439E014296790CF0020672B /* ProfileZoomView.swift in Sources */,
 				4CE6DF1627F8DEBF00C66700 /* RelayConnection.swift in Sources */,
 				4C3BEFD6281D995700B3DE84 /* ActionBarModel.swift in Sources */,
 				4C363AA428296DEE006E126D /* SearchModel.swift in Sources */,
 				4CEE2AF3280B25C500AB5EEF /* ProfilePicView.swift in Sources */,
+				4CC7AAF6297F1A6A00430951 /* EventBody.swift in Sources */,
 				4CEE2AF9280B2EAC00AB5EEF /* PowView.swift in Sources */,
 				3165648B295B70D500C64604 /* LinkView.swift in Sources */,
 				4C3BEFD42819DE8F00B3DE84 /* NostrKind.swift in Sources */,
@@ -907,23 +1183,32 @@
 				4C363A922825FCF2006E126D /* ProfileUpdate.swift in Sources */,
 				4C0A3F95280F6C78000448DE /* ReplyQuoteView.swift in Sources */,
 				4C3BEFDA281DCA1400B3DE84 /* LikeCounter.swift in Sources */,
+				4CB88389296AF99A00DC99E7 /* EventDetailBar.swift in Sources */,
+				4CF0ABDE2981A69500D66079 /* MutelistModel.swift in Sources */,
 				4C3AC79B28306D7B00E1F516 /* Contacts.swift in Sources */,
 				4C3EA63D28FF52D600C48A62 /* bolt11.c in Sources */,
 				4CB55EF3295E5D59007FD187 /* RecommendedRelayView.swift in Sources */,
+				4CF0ABEC29844B4700D66079 /* AnyDecodable.swift in Sources */,
 				4C5F9118283D88E40052CD1C /* FollowingModel.swift in Sources */,
 				4C3EA67D28FFBBA300C48A62 /* InvoicesView.swift in Sources */,
 				4C363A8E28236FE4006E126D /* NoteContentView.swift in Sources */,
 				4C90BD1A283AA67F008EE7EF /* Bech32.swift in Sources */,
 				E990020F2955F837003BBC5A /* EditMetadataView.swift in Sources */,
+				5C513FBA297F72980072348F /* CustomPicker.swift in Sources */,
 				4CACA9D5280C31E100D9BBE8 /* ReplyView.swift in Sources */,
 				4C3A1D332960DB0500558C0F /* Markdown.swift in Sources */,
+				4CF0ABD42980996B00D66079 /* Report.swift in Sources */,
 				4C0A3F97280F8E02000448DE /* ThreadView.swift in Sources */,
 				4C06670B28FDE64700038D2A /* damus.c in Sources */,
 				4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */,
+				3AA247FF297E3D900090C62D /* RepostsView.swift in Sources */,
+				3AE45AF6297BB2E700C1D842 /* LibreTranslateServer.swift in Sources */,
 				4C99737B28C92A9200E53835 /* ChatroomMetadata.swift in Sources */,
+				4CC7AAF4297F18B400430951 /* ReplyDescription.swift in Sources */,
 				4C75EFA427FA577B0006080F /* PostView.swift in Sources */,
 				4C75EFB528049D790006080F /* Relay.swift in Sources */,
 				4CEE2AF1280B216B00AB5EEF /* EventDetailView.swift in Sources */,
+				4CC7AAFA297F64AC00430951 /* EventMenu.swift in Sources */,
 				4C75EFBB2804A34C0006080F /* ProofOfWork.swift in Sources */,
 				4C3AC7A52836987600E1F516 /* MainTabView.swift in Sources */,
 				3169CAED294FCCFC00EE4006 /* Constants.swift in Sources */,
@@ -938,9 +1223,11 @@
 				DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */,
 				4C3EA67B28FF7B3900C48A62 /* InvoiceTests.swift in Sources */,
 				4C363A9E2828A822006E126D /* ReplyTests.swift in Sources */,
+				4CB8839A297322D200DC99E7 /* DMTests.swift in Sources */,
 				4C363AA02828A8DD006E126D /* LikeTests.swift in Sources */,
 				4C90BD1C283AC38E008EE7EF /* Bech32Tests.swift in Sources */,
 				4CE6DEF827F7A08200C66700 /* damusTests.swift in Sources */,
+				4CF0ABDC2981A19E00D66079 /* ListTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -972,24 +1259,48 @@
 		3A4325AA2961E11400BFCD9D /* Localizable.stringsdict */ = {
 			isa = PBXVariantGroup;
 			children = (
-				3A4325A92961E11400BFCD9D /* en */,
-				3AB1803D29636FB100FD1BD8 /* es */,
+				3A5C4575296A879E0032D398 /* es-419 */,
+				3A2B8B0A296A8982009CC16D /* en-US */,
+				3A5EA111297CCF6C00569477 /* de-AT */,
+				3AEB8005297CCEA900713A25 /* tr-TR */,
+				3A4F3322297CCFEE004B5F72 /* fr-FR */,
+				3A185A06297F2C3800F4BDC0 /* lv-LV */,
+				3A929C22297F2CF80090925E /* it-IT */,
+				3AB5B86C2986D8A3006599D2 /* de */,
+				3AF6336A29884C6B0005672A /* pt-PT */,
+				3A93342B29884CA600D6A8F3 /* pl-PL */,
 			);
 			name = Localizable.stringsdict;
 			sourceTree = "<group>";
 		};
-		3AB18052296375CA00FD1BD8 /* InfoPlist.strings */ = {
+		3ACB685A297633BC00C46468 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				3AB18058296377E500FD1BD8 /* es */,
+				3ACB685B297633BC00C46468 /* es-419 */,
+				3A5EA10F297CCF6C00569477 /* de-AT */,
+				3AEB8003297CCEA800713A25 /* tr-TR */,
+				3A4F3320297CCFEE004B5F72 /* fr-FR */,
+				3A185A04297F2C3800F4BDC0 /* lv-LV */,
+				3A929C20297F2CF80090925E /* it-IT */,
+				3AB5B86A2986D8A3006599D2 /* de */,
+				3AF6336829884C6B0005672A /* pt-PT */,
+				3A93342929884CA600D6A8F3 /* pl-PL */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		3AB18054296375CA00FD1BD8 /* Localizable.strings */ = {
+		3ACB685D297633BC00C46468 /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				3AB18059296377E700FD1BD8 /* es */,
+				3ACB685E297633BC00C46468 /* es-419 */,
+				3A5EA110297CCF6C00569477 /* de-AT */,
+				3AEB8004297CCEA800713A25 /* tr-TR */,
+				3A4F3321297CCFEE004B5F72 /* fr-FR */,
+				3A185A05297F2C3800F4BDC0 /* lv-LV */,
+				3A929C21297F2CF80090925E /* it-IT */,
+				3AB5B86B2986D8A3006599D2 /* de */,
+				3AF6336929884C6B0005672A /* pt-PT */,
+				3A93342A29884CA600D6A8F3 /* pl-PL */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1055,6 +1366,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = Debug;
@@ -1110,6 +1422,7 @@
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1123,7 +1436,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -1131,6 +1444,7 @@
 				INFOPLIST_FILE = damus/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Damus;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Granting Damus access to your photos allows you to save images.";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -1163,7 +1477,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -1171,6 +1485,7 @@
 				INFOPLIST_FILE = damus/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Damus;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Granting Damus access to your photos allows you to save images.";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -1312,14 +1627,6 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		3169CAE9294FCABA00EE4006 /* XCRemoteSwiftPackageReference "Shimmer" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/joshuajhomann/Shimmer";
-			requirement = {
-				branch = master;
-				kind = branch;
-			};
-		};
 		4C06670228FC7EC500038D2A /* XCRemoteSwiftPackageReference "Kingfisher" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/onevcat/Kingfisher";

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

@@ -17,15 +17,6 @@
         "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

@@ -0,0 +1,98 @@
+<?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/damus-home.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "nostr-hello-outline-black.png",
+      "filename" : "damus-home@1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "nostr-hello-outline-black@2x.png",
+      "filename" : "damus-home@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "nostr-hello-outline-black@3x.png",
+      "filename" : "damus-home@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

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

@@ -0,0 +1,88 @@
+%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

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

@@ -0,0 +1,323 @@
+%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/Components/CustomPicker.swift

@@ -0,0 +1,60 @@
+//
+//  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)
+            }
+        }
+    }
+    
+    func textColor() -> Color {
+        colorScheme == .light ? Color("DamusBlack") : Color("DamusWhite")
+    }
+}

damus/Components/Highlight.swift

@@ -0,0 +1,39 @@
+//
+//  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,
+            activityItems: activityItems as [Any],
             applicationActivities: applicationActivities)
         controller.excludedActivityTypes = excludedActivityTypes
         controller.completionWithItemsHandler = callback
@@ -32,7 +32,7 @@ struct ShareSheet: UIViewControllerRepresentable {
 }
 
 struct ImageContextMenuModifier: ViewModifier {
-    let url: URL
+    let url: URL?
     let image: UIImage?
     @Binding var showShareSheet: Bool
     
@@ -41,31 +41,44 @@ struct ImageContextMenuModifier: ViewModifier {
             Button {
                 UIPasteboard.general.url = url
             } label: {
-                Label("Copy Image URL", systemImage: "doc.on.doc")
+                Label(NSLocalizedString("Copy Image URL", comment: "Context menu option to copy the URL of an image into clipboard."), systemImage: "doc.on.doc")
             }
             if let someImage = image {
                 Button {
                     UIPasteboard.general.image = someImage
                 } label: {
-                    Label("Copy Image", systemImage: "photo.on.rectangle")
+                    Label(NSLocalizedString("Copy Image", comment: "Context menu option to copy an image into clipboard."), systemImage: "photo.on.rectangle")
                 }
                 Button {
                     UIImageWriteToSavedPhotosAlbum(someImage, nil, nil, nil)
                 } label: {
-                    Label("Save Image", systemImage: "square.and.arrow.down")
+                    Label(NSLocalizedString("Save Image", comment: "Context menu option to save an image."), systemImage: "square.and.arrow.down")
                 }
             }
             Button {
                 showShareSheet = true
             } label: {
-                Label("Share", systemImage: "square.and.arrow.up")
+                Label(NSLocalizedString("Share", comment: "Button to share an image."), systemImage: "square.and.arrow.up")
             }
         }
     }
 }
 
-struct ImageViewer: View {
-    let urls: [URL]
+private struct ImageContainerView: View {
+    
+    @ObservedObject var imageModel: KFImageModel
+    
+    @State private var image: UIImage?
+    @State private var showShareSheet = false
+    
+    init(url: URL?) {
+        self.imageModel = KFImageModel(
+            url: url,
+            fallbackUrl: nil,
+            maxByteSize: 2000000, // 2 MB
+            downsampleSize: CGSize(width: 400, height: 400)
+        )
+    }
     
     private struct ImageHandler: ImageModifier {
         @Binding var handler: UIImage?
@@ -75,45 +88,131 @@ struct ImageViewer: View {
             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 {
+        
+        KFAnimatedImage(imageModel.url)
+            .callbackQueue(.dispatch(.global(qos: .background)))
+            .processingQueue(.dispatch(.global(qos: .background)))
+            .cacheOriginalImage()
+            .configure { view in
+                view.framePreloadCount = 1
+            }
+            .scaleFactor(UIScreen.main.scale)
+            .loadDiskFileSynchronously()
+            .fade(duration: 0.1)
+            .imageModifier(ImageHandler(handler: $image))
+            .onFailure { _ in
+                imageModel.downloadFailed()
+            }
+            .id(imageModel.refreshID)
+            .clipped()
+            .modifier(ImageContextMenuModifier(url: imageModel.url, image: image, showShareSheet: $showShareSheet))
+            .sheet(isPresented: $showShareSheet) {
+                ShareSheet(activityItems: [imageModel.url])
+            }
+        
+        // TODO: Update ImageCarousel with serializer and processor
+        // .serialize(by: imageModel.serializer)
+        // .setProcessor(imageModel.processor)
+    }
+}
+
+struct ImageView: View {
+    
+    let urls: [URL?]
+    
+    @Environment(\.presentationMode) var presentationMode
+    
+    @State private var selectedIndex = 0
+    @State var showMenu = true
+    
+    var safeAreaInsets: UIEdgeInsets? {
+        return UIApplication
+                .shared
+                .connectedScenes
+                .flatMap { ($0 as? UIWindowScene)?.windows ?? [] }
+                .first { $0.isKeyWindow }?.safeAreaInsets
+    }
+    
+    var navBarView: some View {
+        VStack {
+            HStack {
+                Text(urls[selectedIndex]?.lastPathComponent ?? "")
+                    .bold()
+                
+                Spacer()
+                
+                Button(action: {
+                    presentationMode.wrappedValue.dismiss()
+                }, label: {
+                    Image(systemName: "xmark")
+                })
+            }
+            .padding()
+            
+            Divider()
+                .ignoresSafeArea()
         }
+        .background(.regularMaterial)
+    }
+    
+    var tabViewIndicator: some View {
+        HStack(spacing: 10) {
+            ForEach(urls.indices, id: \.self) { index in
+                Capsule()
+                    .fill(index == selectedIndex ? Color(UIColor.label) : Color.secondary)
+                    .frame(width: 7, height: 7)
+            }
+        }
+        .padding()
+        .background(.regularMaterial)
+        .clipShape(Capsule())
     }
     
     var body: some View {
-        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])
-                        }
-
+        ZStack {
+            Color(.systemBackground)
+                .ignoresSafeArea()
+            
+            TabView(selection: $selectedIndex) {
+                ForEach(urls.indices, id: \.self) { index in
+                    ZoomableScrollView {
+                        ImageContainerView(url: urls[index])
+                            .aspectRatio(contentMode: .fit)
+                            .padding(.top, safeAreaInsets?.top)
+                            .padding(.bottom, safeAreaInsets?.bottom)
+                    }
+                    .modifier(SwipeToDismissModifier(minDistance: 50, onDismiss: {
+                        presentationMode.wrappedValue.dismiss()
+                    }))
+                    .ignoresSafeArea()
+                    .tag(index)
                 }
             }
+            .ignoresSafeArea()
+            .tabViewStyle(PageTabViewStyle(indexDisplayMode: .never))
+            .gesture(TapGesture(count: 2).onEnded {
+                // Prevents menu from hiding on double tap
+            })
+            .gesture(TapGesture(count: 1).onEnded {
+                showMenu.toggle()
+            })
+            .overlay(
+                VStack {
+                    if showMenu {
+                        navBarView
+                        Spacer()
+                        
+                        if (urls.count > 1) {
+                            tabViewIndicator
+                        }
+                    }
+                }
+                .animation(.easeInOut, value: showMenu)
+                .padding(.bottom, safeAreaInsets?.bottom)
+            )
         }
-        .tabViewStyle(PageTabViewStyle())
     }
 }
 
@@ -130,20 +229,22 @@ struct ImageCarousel: View {
                     .foregroundColor(Color.clear)
                     .overlay {
                         KFAnimatedImage(url)
-                            .configure { view in
-                                view.framePreloadCount = 3
-                            }
+                            .callbackQueue(.dispatch(.global(qos: .background)))
+                            .processingQueue(.dispatch(.global(qos: .background)))
                             .cacheOriginalImage()
                             .loadDiskFileSynchronously()
                             .scaleFactor(UIScreen.main.scale)
                             .fade(duration: 0.1)
+                            .configure { view in
+                                view.framePreloadCount = 3
+                            }
                             .aspectRatio(contentMode: .fit)
                             .tabItem {
                                 Text(url.absoluteString)
                             }
                             .id(url.absoluteString)
                             .contextMenu {
-                                Button("Copy Image") {
+                                Button(NSLocalizedString("Copy Image", comment: "Context menu option to copy an image to clipboard.")) {
                                     UIPasteboard.general.string = url.absoluteString
                                 }
                             }
@@ -151,8 +252,8 @@ struct ImageCarousel: View {
             }
         }
         .cornerRadius(10)
-        .sheet(isPresented: $open_sheet) {
-            ImageViewer(urls: urls)
+        .fullScreenCover(isPresented: $open_sheet) {
+            ImageView(urls: urls)
         }
         .frame(height: 200)
         .onTapGesture {
@@ -164,6 +265,6 @@ struct ImageCarousel: View {
 
 struct ImageCarousel_Previews: PreviewProvider {
     static var previews: some View {
-        ImageCarousel(urls: [URL(string: "https://jb55.com/red-me.jpg")!])
+        ImageCarousel(urls: [URL(string: "https://jb55.com/red-me.jpg")!,URL(string: "https://jb55.com/red-me.jpg")!])
     }
 }

damus/Components/InvoiceView.swift

@@ -34,7 +34,7 @@ struct InvoiceView: View {
     
     let invoice: Invoice
     @State var showing_select_wallet: Bool = false
-    @ObservedObject var user_settings = UserSettingsStore()
+    @EnvironmentObject var user_settings: UserSettingsStore
     
     var PayButton: some View {
         Button {
@@ -47,7 +47,7 @@ struct InvoiceView: View {
             RoundedRectangle(cornerRadius: 20)
                 .foregroundColor(colorScheme == .light ? .black : .white)
                 .overlay {
-                    Text("Pay")
+                    Text("Pay", comment: "Button to pay a Lightning invoice.")
                         .fontWeight(.medium)
                         .foregroundColor(colorScheme == .light ? .white : .black)
                 }
@@ -67,7 +67,7 @@ struct InvoiceView: View {
                 HStack {
                     Label("", systemImage: "bolt.fill")
                         .foregroundColor(.orange)
-                    Text("Lightning Invoice")
+                    Text("Lightning Invoice", comment: "Indicates that the view is for paying a Lightning invoice.")
                 }
                 Divider()
                 Text(invoice.description)

damus/Components/NIP05Badge.swift

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

@@ -0,0 +1,34 @@
+//
+//  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")
+                .font(.footnote)
+                .foregroundColor(Color.gray)
+            ProfileName(pubkey: pubkey, profile: profile, damus: damus, show_friend_confirmed: true, show_nip5_domain: false)
+                    .foregroundColor(Color.gray)
+            Text("Reposted", comment: "Text indicating that the post was reposted (i.e. re-shared).")
+                .font(.footnote)
+                .foregroundColor(Color.gray)
+        }
+    }
+}
+
+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/TextFieldAlert.swift

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

damus/Components/UserView.swift

@@ -0,0 +1,42 @@
+//
+//  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 {
+        let pmodel = ProfileModel(pubkey: pubkey, damus: damus_state)
+        let followers = FollowersModel(damus_state: damus_state, target: pubkey)
+        let pv = ProfileView(damus_state: damus_state, profile: pmodel, followers: followers)
+        
+        NavigationLink(destination: pv) {
+            ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles)
+        
+            VStack(alignment: .leading) {
+                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

@@ -0,0 +1,38 @@
+//
+//  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/ZoomableScrollView.swift

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

@@ -11,11 +11,11 @@ import Kingfisher
 
 var BOOTSTRAP_RELAYS = [
     "wss://relay.damus.io",
-    "wss://nostr-relay.wlvs.space",
-    "wss://nostr.fmt.wiz.biz",
-    "wss://relay.nostr.bg",
-    "wss://nostr.oxtr.dev",
-    "wss://nostr.v0l.io",
+    "wss://eden.nostr.land",
+    "wss://relay.snort.social",
+    "wss://nostr.orangepill.dev",
+    "wss://nos.lol",
+    "wss://relay.current.fyi",
     "wss://brb.io",
 ]
 
@@ -26,10 +26,12 @@ struct TimestampedProfile {
 
 enum Sheets: Identifiable {
     case post
+    case report(ReportTarget)
     case reply(NostrEvent)
 
     var id: String {
         switch self {
+        case .report: return "report"
         case .post: return "post"
         case .reply(let ev): return "reply-" + ev.id
         }
@@ -45,10 +47,10 @@ enum FilterState : Int {
     case posts_and_replies = 1
     case posts = 0
     
-    func filter(privkey: String?, ev: NostrEvent) -> Bool {
+    func filter(ev: NostrEvent) -> Bool {
         switch self {
         case .posts:
-            return !ev.is_reply(privkey)
+            return !ev.is_reply(nil)
         case .posts_and_replies:
             return true
         }
@@ -71,6 +73,7 @@ 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
@@ -79,7 +82,12 @@ struct ContentView: View {
     @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 filter_state : FilterState = .posts_and_replies
+    @State private var isSideBarOpened = false
     @StateObject var home: HomeModel = HomeModel()
     @StateObject var user_settings = UserSettingsStore()
 
@@ -92,25 +100,35 @@ struct ContentView: View {
 
     var PostingTimelineView: some View {
         VStack {
-            TabView(selection: $filter_state) {
-                contentTimelineView(filter: posts_filter_event)
-                    .tag(FilterState.posts)
-                contentTimelineView(filter: posts_and_replies_filter_event)
-                    .tag(FilterState.posts_and_replies)
+            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)
+                }
+                .tabViewStyle(.page(indexDisplayMode: .never))
+                
+                if privkey != nil {
+                    PostButtonContainer(userSettings: user_settings) {
+                        self.active_sheet = .post
+                    }
+                }
             }
-            .tabViewStyle(.page(indexDisplayMode: .never))
         }
-        .safeAreaInset(edge: .top) {
+        .safeAreaInset(edge: .top, spacing: 0) {
             VStack(spacing: 0) {
-                FiltersView
-                    //.frame(maxWidth: 275)
-                    .padding()
+                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)
+                })
                 Divider()
                     .frame(height: 1)
             }
             .background(colorScheme == .dark ? Color.black : Color.white)
         }
-        .ignoresSafeArea(.keyboard)
     }
     
     func contentTimelineView(filter: (@escaping (NostrEvent) -> Bool)) -> some View {
@@ -118,29 +136,6 @@ struct ContentView: View {
             if let damus = self.damus_state {
                 TimelineView(events: $home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter)
             }
-            if privkey != nil {
-                PostButtonContainer {
-                    self.active_sheet = .post
-                }
-            }
-        }
-    }
-    
-    func posts_and_replies_filter_event(_ ev: NostrEvent) -> Bool {
-        return true
-    }
-    
-    func posts_filter_event(_ ev: NostrEvent) -> Bool {
-        return !ev.is_reply(nil)
-    }
-    
-    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)
         }
     }
     
@@ -164,7 +159,7 @@ struct ContentView: View {
                 
             case .notifications:
                 TimelineView(events: $home.notifications, loading: $home.loading, damus: damus, show_friend_icon: true, filter: { _ in true })
-                    .navigationTitle("Notifications")
+                    .navigationTitle(NSLocalizedString("Notifications", comment: "Navigation title for notifications."))
                 
             case .dms:
                 DirectMessagesView(damus_state: damus_state!)
@@ -174,7 +169,30 @@ struct ContentView: View {
                 EmptyView()
             }
         }
-        .navigationBarTitle(selected_timeline == .home ?  "Home" : "Global", displayMode: .inline)
+        .navigationBarTitle(selected_timeline == .home ?  NSLocalizedString("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.") : NSLocalizedString("Global", comment: "Navigation bar title for Global view where posts from all connected relay servers appear."), displayMode: .inline)
+        .toolbar {
+            ToolbarItem(placement: .principal) {
+                switch selected_timeline {
+                case .home:
+                    Image("damus-home")
+                    .resizable()
+                    .frame(width:30,height:30)
+                    .shadow(color: Color("DamusPurple"), radius: 2)
+                case .dms:
+                    Text("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.")
+                        .bold()
+                case .notifications:
+                    Text("Notifications", comment: "Toolbar label for Notifications view.")
+                        .bold()
+                case .search:
+                    Text("Global", comment: "Toolbar label for Global view where posts from all connected relay servers appear.")
+                        .bold()
+                case .none:
+                    Text("", comment: "Toolbar label for unknown views. This label would be displayed only if a new timeline view is added but a toolbar label was not explicitly assigned to it yet.")
+                }
+            }
+        }
+        .ignoresSafeArea(.keyboard)
     }
     
     var MaybeSearchView: some View {
@@ -208,52 +226,65 @@ 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 {
-                    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)
+                    ZStack {
+                        VStack {
+                            MainContent(damus: damus)
+                                .toolbar() {
+                                    ToolbarItem(placement: .navigationBarLeading) {
+                                        Button {
+                                            isSideBarOpened.toggle()
+                                        } label: {
+                                            ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles)
+                                        }
+                                    }
+                                    
+                                    ToolbarItem(placement: .navigationBarTrailing) {
+                                        HStack(alignment: .center) {
+                                            if home.signal.signal != home.signal.max_signal {
+                                                Text("\(home.signal.signal)/\(home.signal.max_signal)", comment: "Fraction of how many of the user's relay servers that are operational.")
+                                                    .font(.callout)
+                                                    .foregroundColor(.gray)
+                                            }
 
-                                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")
+                                        }
                                     }
                                 }
-                                .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())
-                                }
-                            }
                         }
+                        
+                        Color.clear
+                        .overlay(
+                            SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened)
+                        )
+                    }
+                    .navigationBarHidden(isSideBarOpened ? true: false) // Would prefer a different way of doing this.
                 }
                 .navigationViewStyle(.stack)
+            
+                TabBar(new_events: $home.new_events, selected: $selected_timeline, isSidebarVisible: $isSideBarOpened, action: switch_timeline)
+                    .padding([.bottom], 8)
             }
-
-            TabBar(new_events: $home.new_events, selected: $selected_timeline, action: switch_timeline)
-                .padding([.bottom], 8)
         }
+        .environmentObject(user_settings)
         .onAppear() {
             self.connect()
             //KingfisherManager.shared.cache.clearDiskCache()
@@ -261,8 +292,10 @@ struct ContentView: View {
         }
         .sheet(item: $active_sheet) { item in
             switch item {
+            case .report(let target):
+                MaybeReportView(target: target)
             case .post:
-                PostView(replying_to: nil, references: [])
+                PostView(replying_to: nil, references: [], damus_state: damus_state!)
             case .reply(let event):
                 ReplyView(replying_to: event, damus: damus_state!)
             }
@@ -293,7 +326,6 @@ struct ContentView: View {
             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))
@@ -309,6 +341,18 @@ 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))
@@ -326,10 +370,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
@@ -348,10 +392,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
@@ -383,6 +427,96 @@ 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)
+                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)
+                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.")
+            }
+        })
     }
     
     func switch_timeline(_ timeline: Timeline) {
@@ -441,7 +575,6 @@ 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

damus/Info.plist

@@ -15,8 +15,6 @@
 			</array>
 		</dict>
 	</array>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>&quot;Granting Damus access to your photo library allows you to save photos.</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>river</string>

damus/Models/ActionBarModel.swift

@@ -16,6 +16,10 @@ class ActionBarModel: ObservableObject {
     @Published var boosts: Int
     @Published var tips: Int64
     
+    static func empty() -> ActionBarModel {
+        return ActionBarModel(likes: 0, boosts: 0, tips: 0, our_like: nil, our_boost: nil, our_tip: nil)
+    }
+    
     init(likes: Int, boosts: Int, tips: Int64, our_like: NostrEvent?, our_boost: NostrEvent?, our_tip: NostrEvent?) {
         self.likes = likes
         self.boosts = boosts
@@ -25,6 +29,10 @@ class ActionBarModel: ObservableObject {
         self.our_tip = our_tip
     }
     
+    var is_empty: Bool {
+        return likes == 0 && boosts == 0 && tips == 0
+    }
+    
     var tipped: Bool {
         return our_tip != nil
     }

damus/Models/Contacts.swift

@@ -11,13 +11,51 @@ 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()
         fs.append(contentsOf: get_friend_of_friend_list())

damus/Models/DamusState.swift

@@ -23,7 +23,12 @@ struct DamusState {
         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(), previews: PreviewCache())
+        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(our_pubkey: ""), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel(our_pubkey: ""), previews: PreviewCache())
     }
 }

damus/Models/DirectMessageModel.swift

@@ -8,13 +8,34 @@
 import Foundation
 
 class DirectMessageModel: ObservableObject {
-    @Published var events: [NostrEvent]
-    
-    init(events: [NostrEvent]) {
-        self.events = events
+    @Published var events: [NostrEvent] {
+        didSet {
+            is_request = determine_is_request()
+        }
     }
     
-    init() {
+    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) {
+        self.events = events
+        self.is_request = false
+        self.our_pubkey = our_pubkey
+    }
+    
+    init(our_pubkey: String) {
         self.events = []
+        self.is_request = false
+        self.our_pubkey = our_pubkey
     }
 }

damus/Models/DirectMessagesModel.swift

@@ -10,13 +10,26 @@ 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()
+        let new = DirectMessageModel(our_pubkey: our_pubkey)
         dms.append((pubkey, new))
         return new
     }

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_display: String {
+    var count: Int? {
         guard let contacts = self.contacts else {
-            return "?"
+            return nil
         }
-        return "\(contacts.count)";
+        return contacts.count
     }
     
     init(damus_state: DamusState, target: String) {
@@ -73,31 +73,30 @@ class FollowersModel: ObservableObject {
     }
     
     func handle_event(relay_id: String, ev: NostrConnectionEvent) {
-        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])
-                }
+        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])
             }
         }
     }

damus/Models/FollowingModel.swift

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

damus/Models/HomeModel.swift

@@ -48,17 +48,19 @@ class HomeModel: ObservableObject {
 
     @Published var new_events: NewEventsBits = NewEventsBits()
     @Published var notifications: [NostrEvent] = []
-    @Published var dms: DirectMessagesModel = DirectMessagesModel()
+    @Published var dms: 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: damus_state.pubkey)
     }
 
     init(damus_state: DamusState) {
         self.damus_state = damus_state
+        self.dms = DirectMessagesModel(our_pubkey: damus_state.pubkey)
     }
 
     var pool: RelayPool {
@@ -96,6 +98,8 @@ 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:
@@ -122,6 +126,12 @@ class HomeModel: ObservableObject {
     func handle_channel_meta(_ ev: NostrEvent) {
     }
     
+    func filter_muted() {
+        self.events = events.filter { !damus_state.contacts.is_muted($0.pubkey) }
+        self.dms.dms = dms.dms.filter { !damus_state.contacts.is_muted($0.0) }
+        self.notifications = notifications.filter { !damus_state.contacts.is_muted($0.pubkey) }
+    }
+    
     func handle_delete_event(_ ev: NostrEvent) {
         guard ev.is_valid else {
             return
@@ -272,7 +282,11 @@ 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,
         ])
@@ -309,7 +323,7 @@ class HomeModel: ObservableObject {
 
         var home_filters = [home_filter]
         var notifications_filters = [notifications_filter]
-        var contacts_filters = [contacts_filter, our_contacts_filter]
+        var contacts_filters = [contacts_filter, our_contacts_filter, our_blocklist_filter]
         var dms_filters = [dms_filter, our_dms_filter]
 
         let last_of_kind = relay_id.flatMap { last_event_of_kind[$0] } ?? [:]
@@ -333,9 +347,32 @@ 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(profiles: damus_state.profiles, ev: ev)
+        process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
     }
 
     func get_last_event_of_kind(relay_id: String, kind: Int) -> NostrEvent? {
@@ -347,24 +384,23 @@ 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) {
+        guard event_has_our_pubkey(ev, our_pubkey: self.damus_state.pubkey) else {
+            return
+        }
+        
         if !insert_uniq_sorted_event(events: &notifications, new_ev: ev, cmp: { $0.created_at > $1.created_at }) {
             return
         }
 
         handle_last_event(ev: ev, timeline: .notifications)
     }
+    
+    func handle_last_event(ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) {
+        if let new_bits = handle_last_events(new_events: self.new_events, ev: ev, timeline: timeline, shouldNotify: shouldNotify) {
+            new_events = new_bits
+        }
+    }
 
     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 })
@@ -374,12 +410,8 @@ class HomeModel: ObservableObject {
         return ok
     }
 
-    func should_hide_event(_ ev: NostrEvent) -> Bool {
-        return !ev.should_show_event
-    }
-
     func handle_text_event(sub_id: String, _ ev: NostrEvent) {
-        if should_hide_event(ev) {
+        if should_hide_event(contacts: damus_state.contacts, ev: ev) {
             return
         }
 
@@ -391,49 +423,8 @@ class HomeModel: ObservableObject {
     }
 
     func handle_dm(_ ev: NostrEvent) {
-
-        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?")
-            }
-        }
-
-        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
-            }
+        if let notifs = handle_incoming_dm(prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, ev: ev) {
+            self.new_events = notifs
         }
     }
 }
@@ -539,10 +530,17 @@ func print_filters(relay_id: String?, filters groups: [[NostrFilter]]) {
     print("-----")
 }
 
-func process_metadata_event(profiles: Profiles, ev: NostrEvent) {
+func process_metadata_event(our_pubkey: String, 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) {
@@ -578,6 +576,13 @@ func process_metadata_event(profiles: Profiles, ev: NostrEvent) {
         }
     }
     
+    let banner = tprof.profile.banner ?? ""
+    if let _ = URL(string: banner) {
+        DispatchQueue.main.async {
+            notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
+        }
+    }
+    
     notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
 }
 
@@ -649,4 +654,83 @@ func load_our_relays(contacts: Contacts, our_pubkey: String, pool: RelayPool, m_
     }
 }
 
+func handle_incoming_dm(prev_events: NewEventsBits, dms: DirectMessagesModel, our_pubkey: String, ev: NostrEvent) -> NewEventsBits? {
+    var inserted = false
+    var found = false
+    let ours = ev.pubkey == our_pubkey
+    var i = 0
 
+    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 {
+        inserted = true
+        let model = DirectMessageModel(events: [ev], our_pubkey: our_pubkey)
+        dms.dms.append((the_pk, model))
+    }
+
+    var new_events: NewEventsBits? = nil
+    if inserted {
+        new_events = handle_last_events(new_events: prev_events, ev: ev, timeline: .dms, shouldNotify: !ours)
+
+        dms.dms = dms.dms.filter({ $0.1.events.count > 0 }).sorted { a, b in
+            return a.1.events.last!.created_at > b.1.events.last!.created_at
+        }
+    }
+    
+    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_hide_event(contacts: Contacts, ev: NostrEvent) -> Bool {
+    if contacts.is_muted(ev.pubkey) {
+        return true
+    }
+    return !ev.should_show_event
+}

damus/Models/KFImageModel.swift

@@ -0,0 +1,114 @@
+//
+//  KFImageModel.swift
+//  damus
+//
+//  Created by Oleg Abalonski on 1/11/23.
+//
+
+import UIKit
+import Kingfisher
+
+class KFImageModel: ObservableObject {
+    
+    let url: URL?
+    let fallbackUrl: URL?
+    let processor: ImageProcessor
+    let serializer: CacheSerializer
+    
+    @Published var refreshID = ""
+    
+    init(url: URL?, fallbackUrl: URL?, maxByteSize: Int, downsampleSize: CGSize) {
+        self.url = url
+        self.fallbackUrl = fallbackUrl
+        self.processor = CustomImageProcessor(maxSize: maxByteSize, downsampleSize: downsampleSize)
+        self.serializer = CustomCacheSerializer(maxSize: maxByteSize, downsampleSize: downsampleSize)
+    }
+    
+    func refresh() -> Void {
+        DispatchQueue.main.async {
+            self.refreshID = UUID().uuidString
+        }
+    }
+    
+    func cache(_ image: UIImage, forKey key: String) -> Void {
+        KingfisherManager.shared.cache.store(image, forKey: key, processorIdentifier: processor.identifier) { _ in
+            self.refresh()
+        }
+    }
+    
+    func downloadFailed() -> Void {
+        guard let url = url, let fallbackUrl = fallbackUrl else { return }
+        
+        DispatchQueue.global(qos: .background).async {
+            KingfisherManager.shared.downloader.downloadImage(with: fallbackUrl) { result in
+                
+                var fallbackImage: UIImage {
+                    switch result {
+                    case .success(let imageLoadingResult):
+                        return imageLoadingResult.image
+                    case .failure(let error):
+                        print(error)
+                        return UIImage()
+                    }
+                }
+                
+                self.cache(fallbackImage, forKey: url.absoluteString)
+            }
+        }
+    }
+}
+
+struct CustomImageProcessor: ImageProcessor {
+    
+    let maxSize: Int
+    let downsampleSize: CGSize
+    
+    let identifier = "com.damus.customimageprocessor"
+    
+    func process(item: ImageProcessItem, options: KingfisherParsedOptionsInfo) -> KFCrossPlatformImage? {
+        
+        switch item {
+        case .image(_):
+            // This case will never run
+            return DefaultImageProcessor.default.process(item: item, options: options)
+        case .data(let data):
+            
+            // Handle large image size
+            if data.count > maxSize {
+                return KingfisherWrapper.downsampledImage(data: data, to: downsampleSize, scale: options.scaleFactor)
+            }
+            
+            // Handle SVG image
+            if let dataString = String(data: data, encoding: .utf8),
+                let svg = SVG(dataString) {
+                
+                    let render = UIGraphicsImageRenderer(size: svg.size)
+                    let image = render.image { context in
+                        svg.draw(in: context.cgContext)
+                    }
+
+                    return image.kf.scaled(to: options.scaleFactor)
+            }
+            
+            return DefaultImageProcessor.default.process(item: item, options: options)
+        }
+    }
+}
+
+struct CustomCacheSerializer: CacheSerializer {
+    
+    let maxSize: Int
+    let downsampleSize: CGSize
+
+    func data(with image: Kingfisher.KFCrossPlatformImage, original: Data?) -> Data? {
+        return DefaultCacheSerializer.default.data(with: image, original: original)
+    }
+
+    func image(with data: Data, options: Kingfisher.KingfisherParsedOptionsInfo) -> Kingfisher.KFCrossPlatformImage? {
+        if data.count > maxSize {
+            return KingfisherWrapper.downsampledImage(data: data, to: downsampleSize, scale: options.scaleFactor)
+        }
+
+        return DefaultCacheSerializer.default.image(with: data, options: options)
+    }
+}

damus/Models/LibreTranslateServer.swift

@@ -0,0 +1,44 @@
+//
+//  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 none
+    case argosopentech
+    case terraprint
+    case vern
+    case custom
+
+    var model: Model {
+        switch self {
+        case .none:
+            return .init(tag: self.rawValue, displayName: NSLocalizedString("None", comment: "Dropdown option for selecting no translation server."), url: nil)
+        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/Mentions.swift

@@ -187,12 +187,18 @@ enum Amount: Equatable {
     func amount_sats_str() -> String {
         switch self {
         case .any:
-            return "Any"
+            return NSLocalizedString("Any", comment: "Any amount of sats")
         case .specific(let amt):
-            if amt < 1000 {
-                return "\(Double(amt) / 1000.0) sats"
-            }
-            return "\(amt / 1000) sats"
+            let numberFormatter = NumberFormatter()
+            numberFormatter.numberStyle = .decimal
+            numberFormatter.minimumFractionDigits = 0
+            numberFormatter.maximumFractionDigits = 3
+            numberFormatter.roundingMode = .down
+
+            let sats = NSNumber(value: (Double(amt) / 1000.0))
+            let formattedSats = numberFormatter.string(from: sats) ?? sats.stringValue
+
+            return String(format: NSLocalizedString("sats_count", comment: "Amount of sats."), sats.decimalValue as NSDecimalNumber, formattedSats)
         }
     }
 }

damus/Models/MutelistModel.swift

@@ -0,0 +1,18 @@
+//
+//  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/ProfileModel.swift

@@ -97,7 +97,7 @@ class ProfileModel: ObservableObject, Equatable {
         } else if ev.known_kind == .contacts {
             handle_profile_contact_event(ev)
         } else if ev.known_kind == .metadata {
-            process_metadata_event(profiles: damus.profiles, ev: ev)
+            process_metadata_event(our_pubkey: damus.pubkey, profiles: damus.profiles, ev: ev)
         }
         seen_event.insert(ev.id)
     }

damus/Models/ReactionsModel.swift

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

damus/Models/Report.swift

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

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

damus/Models/SearchHomeModel.swift

@@ -30,6 +30,10 @@ class SearchHomeModel: ObservableObject {
         return filter
     }
     
+    func filter_muted() {
+        events = events.filter { !should_hide_event(contacts: damus_state.contacts, ev: $0) }
+    }
+    
     func subscribe() {
         loading = true
         damus_state.pool.subscribe(sub_id: base_subid, filters: [get_base_filter()], handler: handle_event)
@@ -50,7 +54,7 @@ class SearchHomeModel: ObservableObject {
             guard sub_id == self.base_subid || sub_id == self.profiles_subid else {
                 return
             }
-            if ev.is_textlike && ev.should_show_event && !ev.is_reply(nil) {
+            if ev.is_textlike && !should_hide_event(contacts: damus_state.contacts, ev: ev) && !ev.is_reply(nil) {
                 if seen_pubkey.contains(ev.pubkey) {
                     return
                 }
@@ -125,7 +129,7 @@ func load_profiles(profiles_subid: String, relay_id: String, events: [NostrEvent
             }
             
             if ev.known_kind == .metadata {
-                process_metadata_event(profiles: damus_state.profiles, ev: ev)
+                process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
             }
             
         }

damus/Models/ThreadModel.swift

@@ -190,7 +190,7 @@ class ThreadModel: ObservableObject {
             }
             
             if ev.known_kind == .metadata {
-                process_metadata_event(profiles: damus_state.profiles, ev: ev)
+                process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
             } else if ev.is_textlike {
                 self.add_event(ev, privkey: self.damus_state.keypair.privkey)
             } else if ev.known_kind == .channel_meta || ev.known_kind == .channel_create {

damus/Models/UserSettingsStore.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Vault
 
 class UserSettingsStore: ObservableObject {
     @Published var default_wallet: Wallet {
@@ -20,13 +21,95 @@ class UserSettingsStore: ObservableObject {
         }
     }
 
+    @Published var left_handed: Bool {
+        didSet {
+            UserDefaults.standard.set(left_handed, forKey: "left_handed")
+        }
+    }
+
+    @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_server == .none {
+                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.
+            }
+        }
+    }
+
     init() {
         if let defaultWalletName = UserDefaults.standard.string(forKey: "default_wallet"),
-           let default_wallet = Wallet(rawValue: defaultWalletName) {
+           let default_wallet = Wallet(rawValue: defaultWalletName)
+        {
             self.default_wallet = default_wallet
         } else {
-            self.default_wallet = .system_default_wallet
+            default_wallet = .system_default_wallet
         }
-        self.show_wallet_selector = UserDefaults.standard.object(forKey: "show_wallet_selector") as? Bool ?? true
+        show_wallet_selector = UserDefaults.standard.object(forKey: "show_wallet_selector") as? Bool ?? true
+
+        left_handed = UserDefaults.standard.object(forKey: "left_handed") as? Bool ?? false
+
+        if let translationServerName = UserDefaults.standard.string(forKey: "libretranslate_server"),
+           let translationServer = LibreTranslateServer(rawValue: translationServerName) {
+            self.libretranslate_server = translationServer
+            libretranslate_url = translationServer.model.url ?? UserDefaults.standard.object(forKey: "libretranslate_url") as? String ?? ""
+        } else {
+            // Note from @tyiu:
+            // Default server 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).
+            libretranslate_server = .none
+            libretranslate_url = ""
+        }
+
+        do {
+            libretranslate_api_key = try Vault.getPrivateKey(keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
+        } catch {
+            libretranslate_api_key = ""
+        }
+    }
+
+    func saveLibreTranslateApiKey(_ apiKey: String) throws {
+        try Vault.savePrivateKey(apiKey, keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
+    }
+
+    func clearLibreTranslateApiKey() throws {
+        try Vault.deletePrivateKey(keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
     }
 }
+
+struct DamusLibreTranslateKeychainConfiguration: KeychainConfiguration {
+    var serviceName = "damus"
+    var accessGroup: String? = nil
+    var accountName = "libretranslate_apikey"
+}

damus/Models/Wallet.swift

@@ -53,7 +53,7 @@ enum Wallet: String, CaseIterable, Identifiable {
             return .init(index: 3, tag: "bluewallet", displayName: NSLocalizedString("Blue Wallet", comment: "Dropdown option label for Lightning wallet, Blue Wallet."), link: "bluewallet:lightning:",
                          appStoreLink: "https://apps.apple.com/us/app/bluewallet-bitcoin-wallet/id1376878040", image: "bluewallet")
         case .walletofsatoshi:
-            return .init(index: 4, tag: "walletofsatoshi", displayName: NSLocalizedString("Wallet Of Satoshi", comment: "Dropdown option label for Lightning wallet, Wallet Of Satoshi."), link:  "walletofsatoshi:lightning:",
+            return .init(index: 4, tag: "walletofsatoshi", displayName: NSLocalizedString("Wallet of Satoshi", comment: "Dropdown option label for Lightning wallet, Wallet of Satoshi."), link:  "walletofsatoshi:lightning:",
                          appStoreLink: "https://apps.apple.com/us/app/wallet-of-satoshi/id1438599608", image: "walletofsatoshi")
         case .zebedee:
             return .init(index: 5, tag: "zebedee", displayName: NSLocalizedString("Zebedee", comment: "Dropdown option label for Lightning wallet, Zebedee."), link: "zebedee:lightning:",
@@ -75,7 +75,7 @@ enum Wallet: String, CaseIterable, Identifiable {
                          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: nil, image: "blixt-wallet")
+                         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/Modifiers/SwipeToDismiss.swift

@@ -0,0 +1,39 @@
+//
+//  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,53 +8,97 @@
 import Foundation
 
 struct Profile: Codable {
-    var value: [String: String]
+    var value: [String: AnyCodable]
     
-    init (name: String?, display_name: String?, about: String?, picture: String?, website: String?, lud06: String?, lud16: String?, nip05: String?) {
+    init (name: String?, display_name: String?, about: String?, picture: String?, banner: 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 value["display_name"]; }
-        set(s) { value["display_name"] = s }
+        get { return str("display_name"); }
+        set(s) { set_str("display_name", s) }
     }
     
     var name: String? {
-        get { return value["name"]; }
-        set(s) { value["name"] = s }
+        get { return str("name"); }
+        set(s) { set_str("name", s) }
     }
     
     var about: String? {
-        get { return value["about"]; }
-        set(s) { value["about"] = s }
+        get { return str("about"); }
+        set(s) { set_str("about", s) }
     }
     
     var picture: String? {
-        get { return value["picture"]; }
-        set(s) { value["picture"] = s }
+        get { return str("picture"); }
+        set(s) { set_str("picture", s) }
+    }
+    
+    var banner: String? {
+        get { return str("banner"); }
+        set(s) { set_str("banner", s) }
     }
     
     var website: String? {
-        get { return value["website"]; }
-        set(s) { value["website"] = s }
+        get { return str("website"); }
+        set(s) { set_str("website", s) }
     }
     
     var lud06: String? {
-        get { return value["lud06"]; }
-        set(s) { value["lud06"] = s }
+        get { return str("lud06"); }
+        set(s) { set_str("lud06", s) }
     }
     
     var lud16: String? {
-        get { return value["lud16"]; }
-        set(s) { value["lud16"] = s }
+        get { return str("lud16"); }
+        set(s) { set_str("lud16", s) }
+    }
+    
+    var website_url: URL? {
+        return self.website.flatMap { URL(string: $0) }
     }
     
     var lnurl: String? {
@@ -70,17 +114,21 @@ struct Profile: Codable {
     }
     
     var nip05: String? {
-        get { return value["nip05"]; }
-        set(s) { value["nip05"] = s }
+        get { return str("nip05"); }
+        set(s) { set_str("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: String].self)
+        self.value = try container.decode([String: AnyCodable].self)
     }
     
     func encode(to encoder: Encoder) throws {
@@ -94,26 +142,9 @@ struct Profile: Codable {
     }
 }
 
-/*
-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_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")
 }
- */
 
 func make_ln_url(_ str: String?) -> URL? {
     return str.flatMap { URL(string: "lightning:" + $0) }

damus/Nostr/NostrEvent.swift

@@ -27,7 +27,7 @@ struct KeyEvent {
     let relay_url: String
 }
 
-struct ReferencedId: Identifiable, Hashable {
+struct ReferencedId: Identifiable, Hashable, Equatable {
     let ref_id: String
     let relay_id: String?
     let key: String
@@ -103,11 +103,15 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
         if let bs = _blocks {
             return bs
         }
-        let blocks = parse_mentions(content: self.get_content(privkey), tags: self.tags)
+        let blocks = get_blocks(content: self.get_content(privkey))
         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 {
@@ -772,6 +776,15 @@ 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 {
@@ -780,3 +793,46 @@ 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 {
+            self.filter { ref in
+                ref.key == "p"
+            }
+        }
+    }
+    
+    var eRefs: [ReferencedId] {
+        get {
+            self.filter { ref in
+                ref.key == "e"
+            }
+        }
+    }
+}

damus/Nostr/NostrFilter.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-struct NostrFilter: Codable {
+struct NostrFilter: Codable, Equatable {
     var ids: [String]?
     var kinds: [Int]?
     var referenced_ids: [String]?
@@ -17,6 +17,7 @@ struct NostrFilter: Codable {
     var limit: UInt32?
     var authors: [String]?
     var hashtag: [String]? = nil
+    var parameter: [String]? = nil
 
     private enum CodingKeys : String, CodingKey {
         case ids
@@ -24,6 +25,7 @@ struct NostrFilter: Codable {
         case referenced_ids = "#e"
         case pubkeys = "#p"
         case hashtag = "#t"
+        case parameter = "#d"
         case since
         case until
         case authors

damus/Nostr/NostrKind.swift

@@ -19,4 +19,5 @@ enum NostrKind: Int {
     case channel_create = 40
     case channel_meta = 41
     case chat = 42
+    case list = 30000
 }

damus/Nostr/NostrLink.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 
-enum NostrLink {
+enum NostrLink: Equatable {
     case ref(ReferencedId)
     case filter(NostrFilter)
 }
@@ -101,6 +101,24 @@ func decode_universal_link(_ s: String) -> NostrLink? {
     return nil
 }
 
+func decode_nostr_bech32_uri(_ s: String) -> NostrLink? {
+    guard let obj = Bech32Object.parse(s) else {
+        return nil
+    }
+    
+    switch obj {
+    case .nsec(let privkey):
+        guard let pubkey = privkey_to_pubkey(privkey: privkey) else {
+            return nil
+        }
+        return .ref(ReferencedId(ref_id: pubkey, relay_id: nil, key: "p"))
+    case .npub(let pubkey):
+        return .ref(ReferencedId(ref_id: pubkey, relay_id: nil, key: "p"))
+    case .note(let id):
+        return .ref(ReferencedId(ref_id: id, relay_id: nil, key: "e"))
+    }
+}
+
 func decode_nostr_uri(_ s: String) -> NostrLink? {
     if s.starts(with: "https://damus.io/") {
         return decode_universal_link(s)
@@ -122,5 +140,15 @@ func decode_nostr_uri(_ s: String) -> NostrLink? {
         return .filter(NostrFilter.filter_hashtag([parts[1].lowercased()]))
     }
     
-    return tag_to_refid(parts).map { .ref($0) }
+    if let rid = tag_to_refid(parts) {
+        return .ref(rid)
+    }
+    
+    guard parts.count == 1 else {
+        return nil
+    }
+    
+    let part = parts[0]
+    
+    return decode_nostr_bech32_uri(part)
 }

damus/Nostr/NostrMetadata.swift

@@ -15,10 +15,11 @@ struct NostrMetadata: Codable {
     let website: String?
     let nip05: String?
     let picture: String?
+    let banner: String?
     let lud06: String?
     let lud16: String?
 }
 
 func create_account_to_metadata(_ model: CreateAccountModel) -> NostrMetadata {
-    return NostrMetadata(display_name: model.real_name, name: model.nick_name, about: model.about, website: nil, nip05: nil, picture: nil, lud06: nil, lud16: nil)
+    return NostrMetadata(display_name: model.real_name, name: model.nick_name, about: model.about, website: nil, nip05: nil, picture: nil, banner: nil, lud06: nil, lud16: nil)
 }

damus/Util/AccountDeletion.swift

@@ -0,0 +1,22 @@
+//
+//  AccountDeletion.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-30.
+//
+
+import Foundation
+
+
+func created_deleted_account_profile(keypair: FullKeypair) -> NostrEvent {
+    var profile = Profile()
+    profile.deleted = true
+    profile.about = "account deleted"
+    profile.name = "nobody"
+    
+    let content = encode_json(profile)!
+    let ev = NostrEvent(content: content, pubkey: keypair.pubkey, kind: 0)
+    ev.id = calculate_event_id(ev: ev)
+    ev.sig = sign_event(privkey: keypair.privkey, ev: ev)
+    return ev
+}

damus/Util/AnyCodable/AnyCodable.swift

@@ -0,0 +1,147 @@
+import Foundation
+/**
+ A type-erased `Codable` value.
+
+ The `AnyCodable` type forwards encoding and decoding responsibilities
+ to an underlying value, hiding its specific underlying type.
+
+ You can encode or decode mixed-type values in dictionaries
+ and other collections that require `Encodable` or `Decodable` conformance
+ by declaring their contained type to be `AnyCodable`.
+
+ - SeeAlso: `AnyEncodable`
+ - SeeAlso: `AnyDecodable`
+ */
+@frozen public struct AnyCodable: Codable {
+    public let value: Any
+
+    public init<T>(_ value: T?) {
+        self.value = value ?? ()
+    }
+}
+
+extension AnyCodable: _AnyEncodable, _AnyDecodable {}
+
+extension AnyCodable: Equatable {
+    public static func == (lhs: AnyCodable, rhs: AnyCodable) -> Bool {
+        switch (lhs.value, rhs.value) {
+        case is (Void, Void):
+            return true
+        case let (lhs as Bool, rhs as Bool):
+            return lhs == rhs
+        case let (lhs as Int, rhs as Int):
+            return lhs == rhs
+        case let (lhs as Int8, rhs as Int8):
+            return lhs == rhs
+        case let (lhs as Int16, rhs as Int16):
+            return lhs == rhs
+        case let (lhs as Int32, rhs as Int32):
+            return lhs == rhs
+        case let (lhs as Int64, rhs as Int64):
+            return lhs == rhs
+        case let (lhs as UInt, rhs as UInt):
+            return lhs == rhs
+        case let (lhs as UInt8, rhs as UInt8):
+            return lhs == rhs
+        case let (lhs as UInt16, rhs as UInt16):
+            return lhs == rhs
+        case let (lhs as UInt32, rhs as UInt32):
+            return lhs == rhs
+        case let (lhs as UInt64, rhs as UInt64):
+            return lhs == rhs
+        case let (lhs as Float, rhs as Float):
+            return lhs == rhs
+        case let (lhs as Double, rhs as Double):
+            return lhs == rhs
+        case let (lhs as String, rhs as String):
+            return lhs == rhs
+        case let (lhs as [String: AnyCodable], rhs as [String: AnyCodable]):
+            return lhs == rhs
+        case let (lhs as [AnyCodable], rhs as [AnyCodable]):
+            return lhs == rhs
+        case let (lhs as [String: Any], rhs as [String: Any]):
+            return NSDictionary(dictionary: lhs) == NSDictionary(dictionary: rhs)
+        case let (lhs as [Any], rhs as [Any]):
+            return NSArray(array: lhs) == NSArray(array: rhs)
+        case is (NSNull, NSNull):
+            return true
+        default:
+            return false
+        }
+    }
+}
+
+extension AnyCodable: CustomStringConvertible {
+    public var description: String {
+        switch value {
+        case is Void:
+            return String(describing: nil as Any?)
+        case let value as CustomStringConvertible:
+            return value.description
+        default:
+            return String(describing: value)
+        }
+    }
+}
+
+extension AnyCodable: CustomDebugStringConvertible {
+    public var debugDescription: String {
+        switch value {
+        case let value as CustomDebugStringConvertible:
+            return "AnyCodable(\(value.debugDescription))"
+        default:
+            return "AnyCodable(\(description))"
+        }
+    }
+}
+
+extension AnyCodable: ExpressibleByNilLiteral {}
+extension AnyCodable: ExpressibleByBooleanLiteral {}
+extension AnyCodable: ExpressibleByIntegerLiteral {}
+extension AnyCodable: ExpressibleByFloatLiteral {}
+extension AnyCodable: ExpressibleByStringLiteral {}
+extension AnyCodable: ExpressibleByStringInterpolation {}
+extension AnyCodable: ExpressibleByArrayLiteral {}
+extension AnyCodable: ExpressibleByDictionaryLiteral {}
+
+
+extension AnyCodable: Hashable {
+    public func hash(into hasher: inout Hasher) {
+        switch value {
+        case let value as Bool:
+            hasher.combine(value)
+        case let value as Int:
+            hasher.combine(value)
+        case let value as Int8:
+            hasher.combine(value)
+        case let value as Int16:
+            hasher.combine(value)
+        case let value as Int32:
+            hasher.combine(value)
+        case let value as Int64:
+            hasher.combine(value)
+        case let value as UInt:
+            hasher.combine(value)
+        case let value as UInt8:
+            hasher.combine(value)
+        case let value as UInt16:
+            hasher.combine(value)
+        case let value as UInt32:
+            hasher.combine(value)
+        case let value as UInt64:
+            hasher.combine(value)
+        case let value as Float:
+            hasher.combine(value)
+        case let value as Double:
+            hasher.combine(value)
+        case let value as String:
+            hasher.combine(value)
+        case let value as [String: AnyCodable]:
+            hasher.combine(value)
+        case let value as [AnyCodable]:
+            hasher.combine(value)
+        default:
+            break
+        }
+    }
+}

damus/Util/AnyCodable/AnyDecodable.swift

@@ -0,0 +1,188 @@
+#if canImport(Foundation)
+import Foundation
+#endif
+
+/**
+ A type-erased `Decodable` value.
+
+ The `AnyDecodable` type forwards decoding responsibilities
+ to an underlying value, hiding its specific underlying type.
+
+ You can decode mixed-type values in dictionaries
+ and other collections that require `Decodable` conformance
+ by declaring their contained type to be `AnyDecodable`:
+
+     let json = """
+     {
+         "boolean": true,
+         "integer": 42,
+         "double": 3.141592653589793,
+         "string": "string",
+         "array": [1, 2, 3],
+         "nested": {
+             "a": "alpha",
+             "b": "bravo",
+             "c": "charlie"
+         },
+         "null": null
+     }
+     """.data(using: .utf8)!
+
+     let decoder = JSONDecoder()
+     let dictionary = try! decoder.decode([String: AnyDecodable].self, from: json)
+ */
+@frozen public struct AnyDecodable: Decodable {
+    public let value: Any
+
+    public init<T>(_ value: T?) {
+        self.value = value ?? ()
+    }
+}
+
+@usableFromInline
+protocol _AnyDecodable {
+    var value: Any { get }
+    init<T>(_ value: T?)
+}
+
+extension AnyDecodable: _AnyDecodable {}
+
+extension _AnyDecodable {
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+
+        if container.decodeNil() {
+            #if canImport(Foundation)
+                self.init(NSNull())
+            #else
+                self.init(Optional<Self>.none)
+            #endif
+        } else if let bool = try? container.decode(Bool.self) {
+            self.init(bool)
+        } else if let int = try? container.decode(Int.self) {
+            self.init(int)
+        } else if let uint = try? container.decode(UInt.self) {
+            self.init(uint)
+        } else if let double = try? container.decode(Double.self) {
+            self.init(double)
+        } else if let string = try? container.decode(String.self) {
+            self.init(string)
+        } else if let array = try? container.decode([AnyDecodable].self) {
+            self.init(array.map { $0.value })
+        } else if let dictionary = try? container.decode([String: AnyDecodable].self) {
+            self.init(dictionary.mapValues { $0.value })
+        } else {
+            throw DecodingError.dataCorruptedError(in: container, debugDescription: "AnyDecodable value cannot be decoded")
+        }
+    }
+}
+
+extension AnyDecodable: Equatable {
+    public static func == (lhs: AnyDecodable, rhs: AnyDecodable) -> Bool {
+        switch (lhs.value, rhs.value) {
+#if canImport(Foundation)
+        case is (NSNull, NSNull), is (Void, Void):
+            return true
+#endif
+        case let (lhs as Bool, rhs as Bool):
+            return lhs == rhs
+        case let (lhs as Int, rhs as Int):
+            return lhs == rhs
+        case let (lhs as Int8, rhs as Int8):
+            return lhs == rhs
+        case let (lhs as Int16, rhs as Int16):
+            return lhs == rhs
+        case let (lhs as Int32, rhs as Int32):
+            return lhs == rhs
+        case let (lhs as Int64, rhs as Int64):
+            return lhs == rhs
+        case let (lhs as UInt, rhs as UInt):
+            return lhs == rhs
+        case let (lhs as UInt8, rhs as UInt8):
+            return lhs == rhs
+        case let (lhs as UInt16, rhs as UInt16):
+            return lhs == rhs
+        case let (lhs as UInt32, rhs as UInt32):
+            return lhs == rhs
+        case let (lhs as UInt64, rhs as UInt64):
+            return lhs == rhs
+        case let (lhs as Float, rhs as Float):
+            return lhs == rhs
+        case let (lhs as Double, rhs as Double):
+            return lhs == rhs
+        case let (lhs as String, rhs as String):
+            return lhs == rhs
+        case let (lhs as [String: AnyDecodable], rhs as [String: AnyDecodable]):
+            return lhs == rhs
+        case let (lhs as [AnyDecodable], rhs as [AnyDecodable]):
+            return lhs == rhs
+        default:
+            return false
+        }
+    }
+}
+
+extension AnyDecodable: CustomStringConvertible {
+    public var description: String {
+        switch value {
+        case is Void:
+            return String(describing: nil as Any?)
+        case let value as CustomStringConvertible:
+            return value.description
+        default:
+            return String(describing: value)
+        }
+    }
+}
+
+extension AnyDecodable: CustomDebugStringConvertible {
+    public var debugDescription: String {
+        switch value {
+        case let value as CustomDebugStringConvertible:
+            return "AnyDecodable(\(value.debugDescription))"
+        default:
+            return "AnyDecodable(\(description))"
+        }
+    }
+}
+
+extension AnyDecodable: Hashable {
+    public func hash(into hasher: inout Hasher) {
+        switch value {
+        case let value as Bool:
+            hasher.combine(value)
+        case let value as Int:
+            hasher.combine(value)
+        case let value as Int8:
+            hasher.combine(value)
+        case let value as Int16:
+            hasher.combine(value)
+        case let value as Int32:
+            hasher.combine(value)
+        case let value as Int64:
+            hasher.combine(value)
+        case let value as UInt:
+            hasher.combine(value)
+        case let value as UInt8:
+            hasher.combine(value)
+        case let value as UInt16:
+            hasher.combine(value)
+        case let value as UInt32:
+            hasher.combine(value)
+        case let value as UInt64:
+            hasher.combine(value)
+        case let value as Float:
+            hasher.combine(value)
+        case let value as Double:
+            hasher.combine(value)
+        case let value as String:
+            hasher.combine(value)
+        case let value as [String: AnyDecodable]:
+            hasher.combine(value)
+        case let value as [AnyDecodable]:
+            hasher.combine(value)
+        default:
+            break
+        }
+    }
+}

damus/Util/AnyCodable/AnyEncodable.swift

@@ -0,0 +1,291 @@
+#if canImport(Foundation)
+import Foundation
+#endif
+
+/**
+ A type-erased `Encodable` value.
+
+ The `AnyEncodable` type forwards encoding responsibilities
+ to an underlying value, hiding its specific underlying type.
+
+ You can encode mixed-type values in dictionaries
+ and other collections that require `Encodable` conformance
+ by declaring their contained type to be `AnyEncodable`:
+
+     let dictionary: [String: AnyEncodable] = [
+         "boolean": true,
+         "integer": 42,
+         "double": 3.141592653589793,
+         "string": "string",
+         "array": [1, 2, 3],
+         "nested": [
+             "a": "alpha",
+             "b": "bravo",
+             "c": "charlie"
+         ],
+         "null": nil
+     ]
+
+     let encoder = JSONEncoder()
+     let json = try! encoder.encode(dictionary)
+ */
+@frozen public struct AnyEncodable: Encodable {
+    public let value: Any
+
+    public init<T>(_ value: T?) {
+        self.value = value ?? ()
+    }
+}
+
+@usableFromInline
+protocol _AnyEncodable {
+    var value: Any { get }
+    init<T>(_ value: T?)
+}
+
+extension AnyEncodable: _AnyEncodable {}
+
+// MARK: - Encodable
+
+extension _AnyEncodable {
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+
+        switch value {
+        #if canImport(Foundation)
+        case is NSNull:
+            try container.encodeNil()
+        #endif
+        case is Void:
+            try container.encodeNil()
+        case let bool as Bool:
+            try container.encode(bool)
+        case let int as Int:
+            try container.encode(int)
+        case let int8 as Int8:
+            try container.encode(int8)
+        case let int16 as Int16:
+            try container.encode(int16)
+        case let int32 as Int32:
+            try container.encode(int32)
+        case let int64 as Int64:
+            try container.encode(int64)
+        case let uint as UInt:
+            try container.encode(uint)
+        case let uint8 as UInt8:
+            try container.encode(uint8)
+        case let uint16 as UInt16:
+            try container.encode(uint16)
+        case let uint32 as UInt32:
+            try container.encode(uint32)
+        case let uint64 as UInt64:
+            try container.encode(uint64)
+        case let float as Float:
+            try container.encode(float)
+        case let double as Double:
+            try container.encode(double)
+        case let string as String:
+            try container.encode(string)
+        #if canImport(Foundation)
+        case let number as NSNumber:
+            try encode(nsnumber: number, into: &container)
+        case let date as Date:
+            try container.encode(date)
+        case let url as URL:
+            try container.encode(url)
+        #endif
+        case let array as [Any?]:
+            try container.encode(array.map { AnyEncodable($0) })
+        case let dictionary as [String: Any?]:
+            try container.encode(dictionary.mapValues { AnyEncodable($0) })
+        case let encodable as Encodable:
+            try encodable.encode(to: encoder)
+        default:
+            let context = EncodingError.Context(codingPath: container.codingPath, debugDescription: "AnyEncodable value cannot be encoded")
+            throw EncodingError.invalidValue(value, context)
+        }
+    }
+
+    #if canImport(Foundation)
+    private func encode(nsnumber: NSNumber, into container: inout SingleValueEncodingContainer) throws {
+        switch Character(Unicode.Scalar(UInt8(nsnumber.objCType.pointee)))  {
+        case "B":
+            try container.encode(nsnumber.boolValue)
+        case "c":
+            try container.encode(nsnumber.int8Value)
+        case "s":
+            try container.encode(nsnumber.int16Value)
+        case "i", "l":
+            try container.encode(nsnumber.int32Value)
+        case "q":
+            try container.encode(nsnumber.int64Value)
+        case "C":
+            try container.encode(nsnumber.uint8Value)
+        case "S":
+            try container.encode(nsnumber.uint16Value)
+        case "I", "L":
+            try container.encode(nsnumber.uint32Value)
+        case "Q":
+            try container.encode(nsnumber.uint64Value)
+        case "f":
+            try container.encode(nsnumber.floatValue)
+        case "d":
+            try container.encode(nsnumber.doubleValue)
+        default:
+            let context = EncodingError.Context(codingPath: container.codingPath, debugDescription: "NSNumber cannot be encoded because its type is not handled")
+            throw EncodingError.invalidValue(nsnumber, context)
+        }
+    }
+    #endif
+}
+
+extension AnyEncodable: Equatable {
+    public static func == (lhs: AnyEncodable, rhs: AnyEncodable) -> Bool {
+        switch (lhs.value, rhs.value) {
+        case is (Void, Void):
+            return true
+        case let (lhs as Bool, rhs as Bool):
+            return lhs == rhs
+        case let (lhs as Int, rhs as Int):
+            return lhs == rhs
+        case let (lhs as Int8, rhs as Int8):
+            return lhs == rhs
+        case let (lhs as Int16, rhs as Int16):
+            return lhs == rhs
+        case let (lhs as Int32, rhs as Int32):
+            return lhs == rhs
+        case let (lhs as Int64, rhs as Int64):
+            return lhs == rhs
+        case let (lhs as UInt, rhs as UInt):
+            return lhs == rhs
+        case let (lhs as UInt8, rhs as UInt8):
+            return lhs == rhs
+        case let (lhs as UInt16, rhs as UInt16):
+            return lhs == rhs
+        case let (lhs as UInt32, rhs as UInt32):
+            return lhs == rhs
+        case let (lhs as UInt64, rhs as UInt64):
+            return lhs == rhs
+        case let (lhs as Float, rhs as Float):
+            return lhs == rhs
+        case let (lhs as Double, rhs as Double):
+            return lhs == rhs
+        case let (lhs as String, rhs as String):
+            return lhs == rhs
+        case let (lhs as [String: AnyEncodable], rhs as [String: AnyEncodable]):
+            return lhs == rhs
+        case let (lhs as [AnyEncodable], rhs as [AnyEncodable]):
+            return lhs == rhs
+        default:
+            return false
+        }
+    }
+}
+
+extension AnyEncodable: CustomStringConvertible {
+    public var description: String {
+        switch value {
+        case is Void:
+            return String(describing: nil as Any?)
+        case let value as CustomStringConvertible:
+            return value.description
+        default:
+            return String(describing: value)
+        }
+    }
+}
+
+extension AnyEncodable: CustomDebugStringConvertible {
+    public var debugDescription: String {
+        switch value {
+        case let value as CustomDebugStringConvertible:
+            return "AnyEncodable(\(value.debugDescription))"
+        default:
+            return "AnyEncodable(\(description))"
+        }
+    }
+}
+
+extension AnyEncodable: ExpressibleByNilLiteral {}
+extension AnyEncodable: ExpressibleByBooleanLiteral {}
+extension AnyEncodable: ExpressibleByIntegerLiteral {}
+extension AnyEncodable: ExpressibleByFloatLiteral {}
+extension AnyEncodable: ExpressibleByStringLiteral {}
+extension AnyEncodable: ExpressibleByStringInterpolation {}
+extension AnyEncodable: ExpressibleByArrayLiteral {}
+extension AnyEncodable: ExpressibleByDictionaryLiteral {}
+
+extension _AnyEncodable {
+    public init(nilLiteral _: ()) {
+        self.init(nil as Any?)
+    }
+
+    public init(booleanLiteral value: Bool) {
+        self.init(value)
+    }
+
+    public init(integerLiteral value: Int) {
+        self.init(value)
+    }
+
+    public init(floatLiteral value: Double) {
+        self.init(value)
+    }
+
+    public init(extendedGraphemeClusterLiteral value: String) {
+        self.init(value)
+    }
+
+    public init(stringLiteral value: String) {
+        self.init(value)
+    }
+
+    public init(arrayLiteral elements: Any...) {
+        self.init(elements)
+    }
+
+    public init(dictionaryLiteral elements: (AnyHashable, Any)...) {
+        self.init([AnyHashable: Any](elements, uniquingKeysWith: { first, _ in first }))
+    }
+}
+
+extension AnyEncodable: Hashable {
+    public func hash(into hasher: inout Hasher) {
+        switch value {
+        case let value as Bool:
+            hasher.combine(value)
+        case let value as Int:
+            hasher.combine(value)
+        case let value as Int8:
+            hasher.combine(value)
+        case let value as Int16:
+            hasher.combine(value)
+        case let value as Int32:
+            hasher.combine(value)
+        case let value as Int64:
+            hasher.combine(value)
+        case let value as UInt:
+            hasher.combine(value)
+        case let value as UInt8:
+            hasher.combine(value)
+        case let value as UInt16:
+            hasher.combine(value)
+        case let value as UInt32:
+            hasher.combine(value)
+        case let value as UInt64:
+            hasher.combine(value)
+        case let value as Float:
+            hasher.combine(value)
+        case let value as Double:
+            hasher.combine(value)
+        case let value as String:
+            hasher.combine(value)
+        case let value as [String: AnyEncodable]:
+            hasher.combine(value)
+        case let value as [AnyEncodable]:
+            hasher.combine(value)
+        default:
+            break
+        }
+    }
+}

damus/Util/Bech32Object.swift

@@ -0,0 +1,31 @@
+//
+//  Bech32Object.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-28.
+//
+
+import Foundation
+
+
+enum Bech32Object {
+    case nsec(String)
+    case npub(String)
+    case note(String)
+    
+    static func parse(_ str: String) -> Bech32Object? {
+        guard let decoded = try? bech32_decode(str) else {
+            return nil
+        }
+        
+        if decoded.hrp == "npub" {
+            return .npub(hex_encode(decoded.data))
+        } else if decoded.hrp == "nsec" {
+            return .nsec(hex_encode(decoded.data))
+        } else if decoded.hrp == "note" {
+            return .note(hex_encode(decoded.data))
+        }
+        
+        return nil
+    }
+}

damus/Util/CoreSVG.swift

@@ -0,0 +1,101 @@
+//
+//  CoreSVG.swift
+//  damus
+//
+//  Created by Oleg Abalonski on 1/27/23.
+//  Ref: https://gist.github.com/ollieatkinson/eb87a82fcb5500d5561fed8b0900a9f7
+
+import Darwin
+import Foundation
+import UIKit
+
+@objc
+class CGSVGDocument: NSObject { }
+
+var CGSVGDocumentRetain: (@convention(c) (CGSVGDocument?) -> Unmanaged<CGSVGDocument>?) = load("CGSVGDocumentRetain")
+var CGSVGDocumentRelease: (@convention(c) (CGSVGDocument?) -> Void) = load("CGSVGDocumentRelease")
+var CGSVGDocumentCreateFromData: (@convention(c) (CFData?, CFDictionary?) -> Unmanaged<CGSVGDocument>?) = load("CGSVGDocumentCreateFromData")
+var CGContextDrawSVGDocument: (@convention(c) (CGContext?, CGSVGDocument?) -> Void) = load("CGContextDrawSVGDocument")
+var CGSVGDocumentGetCanvasSize: (@convention(c) (CGSVGDocument?) -> CGSize) = load("CGSVGDocumentGetCanvasSize")
+
+typealias ImageWithCGSVGDocument = @convention(c) (AnyObject, Selector, CGSVGDocument) -> UIImage
+var ImageWithCGSVGDocumentSEL: Selector = NSSelectorFromString("_imageWithCGSVGDocument:")
+
+let CoreSVG = dlopen("/System/Library/PrivateFrameworks/CoreSVG.framework/CoreSVG", RTLD_NOW)
+
+func load<T>(_ name: String) -> T {
+    unsafeBitCast(dlsym(CoreSVG, name), to: T.self)
+}
+
+public class SVG {
+    
+    deinit { CGSVGDocumentRelease(document) }
+    
+    let document: CGSVGDocument
+
+    public convenience init?(_ value: String) {
+        guard let data = value.data(using: .utf8) else { return nil }
+        self.init(data)
+    }
+    
+    public init?(_ data: Data) {
+        guard let document = CGSVGDocumentCreateFromData(data as CFData, nil)?.takeUnretainedValue() else { return nil }
+        guard CGSVGDocumentGetCanvasSize(document) != .zero else { return nil }
+        self.document = document
+    }
+    
+    public var size: CGSize {
+        CGSVGDocumentGetCanvasSize(document)
+    }
+    
+    public func image() -> UIImage? {
+        let ImageWithCGSVGDocument = unsafeBitCast(UIImage.self.method(for: ImageWithCGSVGDocumentSEL), to: ImageWithCGSVGDocument.self)
+        let image = ImageWithCGSVGDocument(UIImage.self, ImageWithCGSVGDocumentSEL, document)
+        return image
+    }
+    
+    public func draw(in context: CGContext) {
+        draw(in: context, size: size)
+    }
+    
+    public func draw(in context: CGContext, size target: CGSize) {
+
+        var target = target
+        
+        let ratio = (
+            x: target.width / size.width,
+            y: target.height / size.height
+        )
+        
+        let rect = (
+            document: CGRect(origin: .zero, size: size), ()
+        )
+
+        let scale: (x: CGFloat, y: CGFloat)
+        
+        if target.width <= 0 {
+            scale = (ratio.y, ratio.y)
+            target.width = size.width * scale.x
+        } else if target.height <= 0 {
+            scale = (ratio.x, ratio.x)
+            target.width = size.width * scale.y
+        } else {
+            let min = min(ratio.x, ratio.y)
+            scale = (min, min)
+            target.width = size.width * scale.x
+            target.height = size.height * scale.y
+        }
+
+        let transform = (
+            scale: CGAffineTransform(scaleX: scale.x, y: scale.y),
+            aspect: CGAffineTransform(translationX: (target.width / scale.x - rect.document.width) / 2, y: (target.height / scale.y - rect.document.height) / 2)
+        )
+        
+        context.translateBy(x: 0, y: target.height)
+        context.scaleBy(x: 1, y: -1)
+        context.concatenate(transform.scale)
+        context.concatenate(transform.aspect)
+        
+        CGContextDrawSVGDocument(context, document)
+    }
+}

damus/Util/Keys.swift

@@ -12,12 +12,25 @@ import Vault
 let PUBKEY_HRP = "npub"
 let PRIVKEY_HRP = "nsec"
 
+struct FullKeypair {
+    let pubkey: String
+    let privkey: String
+}
+
 struct Keypair {
     let pubkey: String
     let privkey: String?
     let pubkey_bech32: String
     let privkey_bech32: String?
     
+    func to_full() -> FullKeypair? {
+        guard let privkey = self.privkey else {
+            return nil
+        }
+        
+        return FullKeypair(pubkey: pubkey, privkey: privkey)
+    }
+    
     init(pubkey: String, privkey: String?) {
         self.pubkey = pubkey
         self.privkey = privkey

damus/Util/Lists.swift

@@ -0,0 +1,91 @@
+//
+//  Mute.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-25.
+//
+
+import Foundation
+
+func create_or_update_mutelist(keypair: FullKeypair, mprev: NostrEvent?, to_add: String) -> NostrEvent? {
+    return create_or_update_list_event(keypair: keypair, mprev: mprev, to_add: to_add, list_name: "mute", list_type: "p")
+}
+
+func remove_from_mutelist(keypair: FullKeypair, prev: NostrEvent, to_remove: String) -> NostrEvent? {
+    return remove_from_list_event(keypair: keypair, prev: prev, to_remove: to_remove, tag_type: "p")
+}
+
+func create_or_update_list_event(keypair: FullKeypair, mprev: NostrEvent?, to_add: String, list_name: String, list_type: String) -> NostrEvent? {
+    let pubkey = keypair.pubkey
+    
+    if let prev = mprev {
+        if let okprev = ensure_list_name(list: prev, name: list_name), prev.pubkey == keypair.pubkey {
+            return add_to_list_event(keypair: keypair, prev: okprev, to_add: to_add, tag_type: list_type)
+        }
+    }
+    
+    let tags = [["d", list_name], [list_type, to_add]]
+    let ev = NostrEvent(content: "", pubkey: pubkey, kind: 30000, tags: tags)
+    
+    ev.tags = tags
+    ev.id = calculate_event_id(ev: ev)
+    ev.sig = sign_event(privkey: keypair.privkey, ev: ev)
+    
+    return ev
+}
+
+func remove_from_list_event(keypair: FullKeypair, prev: NostrEvent, to_remove: String, tag_type: String) -> NostrEvent? {
+    var exists = false
+    for tag in prev.tags {
+        if tag.count >= 2 && tag[0] == tag_type && tag[1] == to_remove {
+            exists = true
+        }
+    }
+    
+    // make sure we actually have the pubkey to remove
+    guard exists else {
+        return nil
+    }
+    
+    let new_tags = prev.tags.filter { tag in
+        !(tag.count >= 2 && tag[0] == tag_type && tag[1] == to_remove)
+    }
+        
+    let ev = NostrEvent(content: prev.content, pubkey: keypair.pubkey, kind: 30000, tags: new_tags)
+    ev.id = calculate_event_id(ev: ev)
+    ev.sig = sign_event(privkey: keypair.privkey, ev: ev)
+    
+    return ev
+}
+
+func add_to_list_event(keypair: FullKeypair, prev: NostrEvent, to_add: String, tag_type: String) -> NostrEvent? {
+    for tag in prev.tags {
+        // we are already muting this user
+        if tag.count >= 2 && tag[0] == tag_type && tag[1] == to_add {
+            return nil
+        }
+    }
+    
+    let new = NostrEvent(content: prev.content, pubkey: keypair.pubkey, kind: 30000, tags: prev.tags)
+    new.tags.append([tag_type, to_add])
+    new.id = calculate_event_id(ev: new)
+    new.sig = sign_event(privkey: keypair.privkey, ev: new)
+    
+    return new
+}
+
+func ensure_list_name(list: NostrEvent, name: String) -> NostrEvent? {
+    for tag in list.tags {
+        if tag.count >= 2 && tag[0] == "d" {
+            if tag[1] != name {
+                return nil
+            } else {
+                return list
+            }
+        }
+    }
+    
+    list.tags.insert(["d", name], at: 0)
+    
+    return list
+}

damus/Util/NIP05.swift

@@ -15,6 +15,10 @@ struct NIP05 {
         URL(string: "https://\(host)/.well-known/nostr.json?name=\(username)")
     }
     
+    var siteUrl: URL? {
+        URL(string: "https://\(host)")
+    }
+    
     static func parse(_ nip05: String) -> NIP05? {
         let parts = nip05.split(separator: "@")
         guard parts.count == 2 else {

damus/Util/Notifications.swift

@@ -11,150 +11,93 @@ extension Notification.Name {
     static var thread_focus: Notification.Name {
         return Notification.Name("thread focus")
     }
-}
-
-extension Notification.Name {
     static var relays_changed: Notification.Name {
         return Notification.Name("relays_changed")
     }
-}
-
-extension Notification.Name {
     static var select_event: Notification.Name {
         return Notification.Name("select_event")
     }
-}
-
-extension Notification.Name {
     static var select_quote: Notification.Name {
         return Notification.Name("select quote")
     }
-}
-
-extension Notification.Name {
     static var reply: Notification.Name {
         return Notification.Name("reply")
     }
-}
-
-extension Notification.Name {
     static var profile_updated: Notification.Name {
         return Notification.Name("profile_updated")
     }
-}
-
-extension Notification.Name {
     static var switched_timeline: Notification.Name {
         return Notification.Name("switched_timeline")
     }
-}
-
-extension Notification.Name {
     static var liked: Notification.Name {
         return Notification.Name("liked")
     }
-}
-
-extension Notification.Name {
     static var open_profile: Notification.Name {
         return Notification.Name("open_profile")
     }
-}
-
-extension Notification.Name {
     static var scroll_to_top: Notification.Name {
         return Notification.Name("scroll_to_to")
     }
-}
-
-extension Notification.Name {
     static var broadcast_event: Notification.Name {
         return Notification.Name("broadcast event")
     }
-}
-
-extension Notification.Name {
     static var open_thread: Notification.Name {
         return Notification.Name("open thread")
     }
-}
-
-extension Notification.Name {
     static var notice: Notification.Name {
         return Notification.Name("notice")
     }
-}
-
-extension Notification.Name {
     static var like: Notification.Name {
         return Notification.Name("like note")
     }
-}
-
-extension Notification.Name {
     static var delete: Notification.Name {
         return Notification.Name("delete note")
     }
-}
-
-extension Notification.Name {
     static var post: Notification.Name {
         return Notification.Name("send post")
     }
-}
-
-extension Notification.Name {
     static var boost: Notification.Name {
         return Notification.Name("boost")
     }
-}
-
-extension Notification.Name {
     static var boosted: Notification.Name {
         return Notification.Name("boosted")
     }
-}
-
-extension Notification.Name {
     static var follow: Notification.Name {
         return Notification.Name("follow")
     }
-}
-
-extension Notification.Name {
     static var unfollow: Notification.Name {
         return Notification.Name("unfollow")
     }
-}
-
-extension Notification.Name {
     static var login: Notification.Name {
         return Notification.Name("login")
     }
-}
-
-extension Notification.Name {
     static var logout: Notification.Name {
         return Notification.Name("logout")
     }
-}
-
-extension Notification.Name {
     static var followed: Notification.Name {
         return Notification.Name("followed")
     }
-}
-
-extension Notification.Name {
     static var chatroom_meta: Notification.Name {
         return Notification.Name("chatroom_meta")
     }
-}
-
-extension Notification.Name {
     static var unfollowed: Notification.Name {
         return Notification.Name("unfollowed")
     }
+    static var report: Notification.Name {
+        return Notification.Name("report")
+    }
+    static var block: Notification.Name {
+        return Notification.Name("block")
+    }
+    static var new_mutes: Notification.Name {
+        return Notification.Name("new_mutes")
+    }
+    static var new_unmutes: Notification.Name {
+        return Notification.Name("new_unmutes")
+    }
+    static var deleted_account: Notification.Name {
+        return Notification.Name("deleted_account")
+    }
 }
 
 func handle_notify(_ name: Notification.Name) -> NotificationCenter.Publisher {

damus/Views/ActionBar/EventActionBar.swift

@@ -29,41 +29,28 @@ struct EventActionBar: View {
     
     var body: some View {
         HStack {
-            /*
-            EventActionButton(img: "square.and.arrow.up") {
-                print("share")
-            }
-
-            Spacer()
-            
-             */
             if damus_state.keypair.privkey != nil {
                 EventActionButton(img: "bubble.left", col: nil) {
                     notify(.reply, event)
                 }
-                .frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
             }
-            
-            HStack(alignment: .bottom) {
-                Text("\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
-                    .font(.footnote.weight(.medium))
-                    .foregroundColor(bar.boosted ? Color.green : Color.gray)
+            Spacer()
+            ZStack {
                 
                 EventActionButton(img: "arrow.2.squarepath", col: bar.boosted ? Color.green : nil) {
                     if bar.boosted {
                         notify(.delete, bar.our_boost)
-                    } else {
+                    } else if damus_state.is_privkey_user {
                         self.confirm_boost = true
                     }
                 }
-            }
-            .frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
-
-            HStack(alignment: .bottom) {
-                Text("\(bar.likes > 0 ? "\(bar.likes)" : "")")
+                Text("\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
+                    .offset(x: 18)
                     .font(.footnote.weight(.medium))
-                    .foregroundColor(bar.liked ? Color.orange : Color.gray)
-                    
+                    .foregroundColor(bar.boosted ? Color.green : Color.gray)
+            }
+            Spacer()
+            ZStack {
                 LikeButton(liked: bar.liked) {
                     if bar.liked {
                         notify(.delete, bar.our_like)
@@ -71,29 +58,16 @@ struct EventActionBar: View {
                         send_like()
                     }
                 }
+                Text("\(bar.likes > 0 ? "\(bar.likes)" : "")")
+                    .offset(x: 22)
+                    .font(.footnote.weight(.medium))
+                    .foregroundColor(bar.liked ? Color.accentColor : Color.gray)
+                
             }
-            .frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
-
+            Spacer()
             EventActionButton(img: "square.and.arrow.up", col: Color.gray) {
                 show_share_sheet = true
             }
-            .frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
-            
-            /*
-            HStack(alignment: .bottom) {
-                Text("\(bar.tips > 0 ? "\(bar.tips)" : "")")
-                    .font(.footnote)
-                    .foregroundColor(bar.tipped ? Color.orange : Color.gray)
-                
-                EventActionButton(img: bar.tipped ? "bitcoinsign.circle.fill" : "bitcoinsign.circle", col: bar.tipped ? Color.orange : nil) {
-                    if bar.tipped {
-                        //notify(.delete, bar.our_tip)
-                    } else {
-                        //notify(.boost, event)
-                    }
-                }
-            }
-             */
         }
         .sheet(isPresented: $show_share_sheet) {
             if let note_id = bech32_note_id(event.id) {
@@ -102,15 +76,15 @@ struct EventActionBar: View {
                 }
             }
         }
-        .alert("Boost", isPresented: $confirm_boost) {
-            Button("Cancel") {
+        .alert(NSLocalizedString("Repost", comment: "Title of alert for confirming to repost a post."), isPresented: $confirm_boost) {
+            Button(NSLocalizedString("Cancel", comment: "Button to cancel out of reposting a post.")) {
                 confirm_boost = false
             }
-            Button("Boost") {
+            Button(NSLocalizedString("Repost", comment: "Button to confirm reposting a post.")) {
                 send_boost()
             }
         } message: {
-            Text("Are you sure you want to boost this post?")
+            Text("Are you sure you want to repost this?", comment: "Alert message to ask if user wants to repost a post.")
         }
         .onReceive(handle_notify(.liked)) { n in
             let liked = n.object as! Counted
@@ -154,7 +128,7 @@ struct EventActionBar: View {
 
 func EventActionButton(img: String, col: Color?, action: @escaping () -> ()) -> some View {
     Button(action: action) {
-        Label(" ", systemImage: img)
+        Label(NSLocalizedString("\u{00A0}", comment: "Non-breaking space character to fill in blank space next to event action button icons."), systemImage: img)
             .font(.footnote.weight(.medium))
             .foregroundColor(col == nil ? Color.gray : col!)
     }
@@ -168,13 +142,8 @@ struct LikeButton: View {
     
     var body: some View {
         Button(action: action) {
-            if liked {
-                Text("🤙")
-            } else {
-                Image("shaka")
-                    .renderingMode(.template)
-                    .foregroundColor(.gray)
-            }
+            Image(liked ? "shaka-full" : "shaka-line")
+                .foregroundColor(liked ? .accentColor : .gray)
         }
     }
 }
@@ -184,8 +153,22 @@ struct EventActionBar_Previews: PreviewProvider {
     static var previews: some View {
         let pk = "pubkey"
         let ds = test_damus_state()
-        let bar = ActionBarModel(likes: 0, boosts: 0, tips: 0, our_like: nil, our_boost: nil, our_tip: nil)
         let ev = NostrEvent(content: "hi", pubkey: pk)
-        EventActionBar(damus_state: ds, event: ev, bar: bar)
+        
+        let bar = ActionBarModel(likes: 0, boosts: 0, tips: 0, our_like: nil, our_boost: nil, our_tip: nil)
+        let likedbar = ActionBarModel(likes: 10, boosts: 10, tips: 0, our_like: nil, our_boost: nil, our_tip: nil)
+        let likedbar_ours = ActionBarModel(likes: 100, boosts: 100, tips: 0, our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: nil, our_tip: nil)
+        let maxed_bar = ActionBarModel(likes: 999, boosts: 999, tips: 0, our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: NostrEvent(id: "", content: "", pubkey: ""), our_tip: nil)
+        
+        VStack(spacing: 50) {
+            EventActionBar(damus_state: ds, event: ev, bar: bar)
+            
+            EventActionBar(damus_state: ds, event: ev, bar: likedbar)
+            
+            EventActionBar(damus_state: ds, event: ev, bar: likedbar_ours)
+            
+            EventActionBar(damus_state: ds, event: ev, bar: maxed_bar)
+        }
+        .padding(20)
     }
 }

damus/Views/ActionBar/EventDetailBar.swift

@@ -0,0 +1,42 @@
+//
+//  EventDetailBar.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-08.
+//
+
+import SwiftUI
+
+struct EventDetailBar: View {
+    let state: DamusState
+    let target: String
+    @StateObject var bar: ActionBarModel
+    
+    var body: some View {
+        HStack {
+            if bar.boosts > 0 {
+                NavigationLink(destination: RepostsView(damus_state: state, model: RepostsModel(state: state, target: target))) {
+                    Text("\(Text("\(bar.boosts)", comment: "Number of reposts.").font(.body.bold())) \(Text(String(format: NSLocalizedString("reposts_count", comment: "Part of a larger sentence to describe how many reposts there are."), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.")
+                }
+                .buttonStyle(PlainButtonStyle())
+            }
+
+            if bar.likes > 0 {
+                NavigationLink(destination: ReactionsView(damus_state: state, model: ReactionsModel(state: state, target: target))) {
+                    Text("\(Text("\(bar.likes)", comment: "Number of reactions on a post.").font(.body.bold())) \(Text(String(format: NSLocalizedString("reactions_count", comment: "Part of a larger sentence to describe how many reactions there are on a post."), bar.likes)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many reactions there are on a post. In source English, the first variable is the number of reactions, and the second variable is 'Reaction' or 'Reactions'.")
+                }
+                .buttonStyle(PlainButtonStyle())
+            }
+            
+            if bar.tips > 0 {
+                Text("\(Text("\(bar.tips)", comment: "Number of tip payments on a post.").font(.body.bold())) \(Text(String(format: NSLocalizedString("tips_count", comment: "Part of a larger sentence to describe how many tip payments there are on a post."), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many tip payments there are on a post. In source English, the first variable is the number of tip payments, and the second variable is 'Tip' or 'Tips'.")
+            }
+        }
+    }
+}
+
+struct EventDetailBar_Previews: PreviewProvider {
+    static var previews: some View {
+        EventDetailBar(state: test_damus_state(), target: "", bar: ActionBarModel.empty())
+    }
+}

damus/Views/AddRelayView.swift

@@ -16,10 +16,10 @@ struct AddRelayView: View {
     var body: some View {
         VStack(alignment: .leading) {
             Form {
-                Section("Add Relay") {
+                Section(NSLocalizedString("Add Relay", comment: "Label for section for adding a relay server.")) {
                     ZStack(alignment: .leading) {
                         HStack{
-                            TextField("wss://some.relay.com", text: $relay)
+                            TextField(NSLocalizedString("wss://some.relay.com", comment: "Placeholder example for relay server address."), text: $relay)
                                 .padding(2)
                                 .padding(.leading, 25)
                                 .autocorrectionDisabled(true)
@@ -47,7 +47,7 @@ struct AddRelayView: View {
             
             VStack {
                 HStack {
-                    Button("Cancel") {
+                    Button(NSLocalizedString("Cancel", comment: "Button to cancel out of view adding user inputted relay.")) {
                         show_add_relay = false
                         action(nil)
                     }
@@ -55,7 +55,7 @@ struct AddRelayView: View {
                     
                     Spacer()
                     
-                    Button("Add") {
+                    Button(NSLocalizedString("Add", comment: "Button to confirm adding user inputted relay.")) {
                         show_add_relay = false
                         action(relay)
                         relay = ""

damus/Views/BannerImageView.swift

@@ -0,0 +1,99 @@
+//
+//  BannerImageView.swift
+//  damus
+//
+//  Created by Jason Jōb on 2023-01-10.
+//
+
+import SwiftUI
+import Kingfisher
+
+struct InnerBannerImageView: View {
+    
+    let defaultImage = UIImage(named: "profile-banner") ?? UIImage()
+    
+    @ObservedObject var imageModel: KFImageModel
+    
+    init(url: URL?) {
+        self.imageModel = KFImageModel(
+            url: url,
+            fallbackUrl: nil,
+            maxByteSize: 20_971_520, // 20 MiB
+            downsampleSize: CGSize(width: 750, height: 250)
+        )
+    }
+
+    var body: some View {
+        ZStack {
+            Color(uiColor: .systemBackground)
+            
+            if (imageModel.url != nil) {
+                KFAnimatedImage(imageModel.url)
+                    .callbackQueue(.dispatch(.global(qos: .background)))
+                    .processingQueue(.dispatch(.global(qos: .background)))
+                    .serialize(by: imageModel.serializer)
+                    .setProcessor(imageModel.processor)
+                    .configure { view in
+                        view.framePreloadCount = 1
+                    }
+                    .placeholder { _ in
+                        Color(uiColor: .secondarySystemBackground)
+                    }
+                    .scaleFactor(UIScreen.main.scale)
+                    .loadDiskFileSynchronously()
+                    .fade(duration: 0.1)
+                    .onFailureImage(defaultImage)
+                    .id(imageModel.refreshID)
+            } else {
+                Image(uiImage: defaultImage).resizable()
+            }
+        }
+    }
+}
+
+struct BannerImageView: View {
+    let pubkey: String
+    let profiles: Profiles
+    
+    @State var banner: String?
+    
+    init (pubkey: String, profiles: Profiles, banner: String? = nil) {
+        self.pubkey = pubkey
+        self.profiles = profiles
+        self._banner = State(initialValue: banner)
+    }
+    
+    var body: some View {
+        InnerBannerImageView(url: get_banner_url(banner: banner, pubkey: pubkey, profiles: profiles))
+            .onReceive(handle_notify(.profile_updated)) { notif in
+                let updated = notif.object as! ProfileUpdate
+
+                guard updated.pubkey == self.pubkey else {
+                    return
+                }
+                
+                if let bannerImage = updated.profile.banner {
+                    self.banner = bannerImage
+                }
+            }
+    }
+}
+
+func get_banner_url(banner: String?, pubkey: String, profiles: Profiles) -> URL? {
+    let bannerUrlString = banner ?? profiles.lookup(id: pubkey)?.banner ?? ""
+    if let url = URL(string: bannerUrlString) {
+        return url
+    }
+    return nil
+}
+
+struct BannerImageView_Previews: PreviewProvider {
+    static let pubkey = "ca48854ac6555fed8e439ebb4fa2d928410e0eef13fa41164ec45aaaa132d846"
+    
+    static var previews: some View {
+        BannerImageView(
+            pubkey: pubkey,
+            profiles: make_preview_profiles(pubkey))
+    }
+}
+

damus/Views/CarouselView.swift

@@ -15,13 +15,13 @@ struct CarouselItem: Identifiable {
 }
 
 let carousel_items = [
-    CarouselItem(image: Image("digital-nomad"), text: Text("Welcome to the social network \(Text("you").italic()) control.")),
+    CarouselItem(image: Image("digital-nomad"), text: Text("Welcome to the social network \(Text("you", comment: "You, in this context, is the person who controls their own social network. You is used in the context of a larger sentence that welcomes the reader to the social network that they control themself.").italic()) control.", comment: "Welcoming message to the reader. The variable is 'you', the reader.")),
     CarouselItem(image: Image("encrypted-message"),
-                 text: Text("\(Text("Encrypted").bold()). End-to-End encrypted private messaging. Keep Big Tech out of your DMs")),
+                 text: Text("\(Text("Encrypted", comment: "Heading indicating that this application keeps private messaging end-to-end encrypted.").bold()). End-to-End encrypted private messaging. Keep Big Tech out of your DMs", comment: "Explanation of what is done to keep private data encrypted. There is a heading that precedes this explanation which is a variable to this string.")),
     CarouselItem(image: Image("undercover"),
-                 text: Text("\(Text("Private").bold()). Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.")),
+                 text: Text("\(Text("Private", comment: "Heading indicating that this application keeps personally identifiable information private. A sentence describing what is done to keep data private comes after this heading.").bold()). Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.", comment: "Explanation of what is done to keep personally identifiable information private. There is a heading that precedes this explanation which is a variable to this string.")),
     CarouselItem(image: Image("bitcoin-p2p"),
-                 text: Text("\(Text("Earn Money").bold()). Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet."))
+                 text: Text("\(Text("Earn Money", comment: "Heading indicating that this application allows users to earn money.").bold()). Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet.", comment: "Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string."))
 ]
 
 struct CarouselView: View {

damus/Views/ChatroomView.swift

@@ -24,7 +24,7 @@ struct ChatroomView: View {
                                  next_ev: ind == count-1 ? nil : thread.events[ind+1],
                                  damus_state: damus
                         )
-                        .event_context_menu(ev, privkey: damus.keypair.privkey)
+                        .event_context_menu(ev, keypair: damus.keypair, target_pubkey: ev.pubkey)
                         .onTapGesture {
                             if thread.initial_event.id == ev.id {
                                 //dismiss()

damus/Views/ConfigView.swift

@@ -5,30 +5,29 @@
 //  Created by William Casarin on 2022-06-09.
 //
 import AVFoundation
-import SwiftUI
 import Kingfisher
+import SwiftUI
 
 struct ConfigView: View {
     let state: DamusState
     @Environment(\.dismiss) var dismiss
-    @State var show_add_relay: Bool = false
     @State var confirm_logout: Bool = false
-    @State var new_relay: String = ""
+    @State var confirm_delete_account: Bool = false
     @State var show_privkey: Bool = false
+    @State var show_libretranslate_api_key: Bool = false
     @State var privkey: String
     @State var privkey_copied: Bool = false
     @State var pubkey_copied: Bool = false
-    @State var relays: [RelayDescriptor]
+    @State var delete_text: String = ""
     @EnvironmentObject var user_settings: UserSettingsStore
-    
+
     let generator = UIImpactFeedbackGenerator(style: .light)
-    
+
     init(state: DamusState) {
         self.state = state
         _privkey = State(initialValue: self.state.keypair.privkey_bech32 ?? "")
-        _relays = State(initialValue: state.pool.descriptors)
     }
-    
+
     // TODO: (jb55) could be more general but not gonna worry about it atm
     func CopyButton(is_pk: Bool) -> some View {
         return Button(action: {
@@ -41,71 +40,40 @@ struct ConfigView: View {
             Image(systemName: copied ? "checkmark.circle" : "doc.on.doc")
         }
     }
-    
-    var recommended: [RelayDescriptor] {
-        let rs: [RelayDescriptor] = []
-        return BOOTSTRAP_RELAYS.reduce(into: rs) { (xs, x) in
-            if let _ = state.pool.get_relay(x) {
-            } else {
-                xs.append(RelayDescriptor(url: URL(string: x)!, info: .rw))
-            }
-        }
-    }
-    
+
     var body: some View {
         ZStack(alignment: .leading) {
             Form {
-                Section {
-                    List(Array(relays), id: \.url) { relay in
-                        RelayView(state: state, relay: relay.url.absoluteString)
-                    }
-                } header: {
-                    HStack {
-                        Text("Relays")
-                        Spacer()
-                        Button(action: { show_add_relay = true }) {
-                            Image(systemName: "plus")
-                                .foregroundColor(.accentColor)
-                        }
-                    }
-                }
-                
-                Section("Recommended Relays") {
-                    List(recommended, id: \.url) { r in
-                        RecommendedRelayView(damus: state, relay: r.url.absoluteString)
-                    }
-                }
-                
-                Section("Public Account ID") {
+                Section(NSLocalizedString("Public Account ID", comment: "Section title for the user's public account ID.")) {
                     HStack {
                         Text(state.keypair.pubkey_bech32)
-                        
+
                         CopyButton(is_pk: true)
                     }
                     .clipShape(RoundedRectangle(cornerRadius: 5))
                 }
-                
+
                 if let sec = state.keypair.privkey_bech32 {
-                    Section("Secret Account Login Key") {
+                    Section(NSLocalizedString("Secret Account Login Key", comment: "Section title for user's secret account login key.")) {
                         HStack {
                             if show_privkey == false {
-                                SecureField("PrivateKey", text: $privkey)
+                                SecureField(NSLocalizedString("Private Key", comment: "Title of the secure field that holds the user's private key."), text: $privkey)
                                     .disabled(true)
                             } else {
                                 Text(sec)
                                     .clipShape(RoundedRectangle(cornerRadius: 5))
                             }
-                            
+
                             CopyButton(is_pk: false)
                         }
-                        
-                        Toggle("Show", isOn: $show_privkey)
+
+                        Toggle(NSLocalizedString("Show", comment: "Toggle to show or hide user's secret account login key."), isOn: $show_privkey)
                     }
                 }
-                
-                Section("Wallet Selector") {
-                    Toggle("Show wallet selector", isOn: $user_settings.show_wallet_selector).toggleStyle(.switch)
-                    Picker("Select default wallet",
+
+                Section(NSLocalizedString("Wallet Selector", comment: "Section title for selection of wallet.")) {
+                    Toggle(NSLocalizedString("Show wallet selector", comment: "Toggle to show or hide selection of wallet."), isOn: $user_settings.show_wallet_selector).toggleStyle(.switch)
+                    Picker(NSLocalizedString("Select default wallet", comment: "Prompt selection of user's default wallet"),
                            selection: $user_settings.default_wallet) {
                         ForEach(Wallet.allCases, id: \.self) { wallet in
                             Text(wallet.model.displayName)
@@ -113,79 +81,96 @@ struct ConfigView: View {
                         }
                     }
                 }
-                
-                Section("Clear Cache") {
-                    Button("Clear") {
+
+                Section(NSLocalizedString("LibreTranslate Translations", comment: "Section title for selecting the server that hosts the LibreTranslate machine translation API.")) {
+                    Picker(NSLocalizedString("Server", comment: "Prompt selection of LibreTranslate server to perform machine translations on notes"), selection: $user_settings.libretranslate_server) {
+                        ForEach(LibreTranslateServer.allCases, id: \.self) { server in
+                            Text(server.model.displayName)
+                                .tag(server.model.tag)
+                        }
+                    }
+
+                    if user_settings.libretranslate_server != .none {
+                        TextField(NSLocalizedString("URL", comment: "Example URL to LibreTranslate server"), text: $user_settings.libretranslate_url)
+                            .disableAutocorrection(true)
+                            .disabled(user_settings.libretranslate_server != .custom)
+                            .autocapitalization(UITextAutocapitalizationType.none)
+                        HStack {
+                            if show_libretranslate_api_key {
+                                TextField(NSLocalizedString("API Key (optional)", comment: "Example URL to LibreTranslate server"), text: $user_settings.libretranslate_api_key)
+                                    .disableAutocorrection(true)
+                                    .autocapitalization(UITextAutocapitalizationType.none)
+                                Button(NSLocalizedString("Hide API Key", comment: "Button to hide the LibreTranslate server API key.")) {
+                                    show_libretranslate_api_key = false
+                                }
+                            } else {
+                                SecureField(NSLocalizedString("API Key (optional)", comment: "Example URL to LibreTranslate server"), text: $user_settings.libretranslate_api_key)
+                                    .disableAutocorrection(true)
+                                    .autocapitalization(UITextAutocapitalizationType.none)
+                                Button(NSLocalizedString("Show API Key", comment: "Button to hide the LibreTranslate server API key.")) {
+                                    show_libretranslate_api_key = true
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Section(NSLocalizedString("Left Handed", comment: "Moves the post button to the left side of the screen")) {
+                    Toggle(NSLocalizedString("Left Handed", comment: "Moves the post button to the left side of the screen"), isOn: $user_settings.left_handed)
+                        .toggleStyle(.switch)
+                }
+
+                Section(NSLocalizedString("Clear Cache", comment: "Section title for clearing cached data.")) {
+                    Button(NSLocalizedString("Clear", comment: "Button for clearing cached data.")) {
                         KingfisherManager.shared.cache.clearMemoryCache()
                         KingfisherManager.shared.cache.clearDiskCache()
                         KingfisherManager.shared.cache.cleanExpiredDiskCache()
                     }
                 }
-                
-                Section("Reset") {
-                    Button("Logout") {
-                        confirm_logout = true
+
+                if state.is_privkey_user {
+                    Section(NSLocalizedString("Delete", comment: "Section title for deleting the user")) {
+                        Button(NSLocalizedString("Delete Account", comment: "Button to delete the user's account."), role: .destructive) {
+                            confirm_delete_account = true
+                        }
                     }
                 }
             }
         }
-        .navigationTitle("Settings")
+        .navigationTitle(NSLocalizedString("Settings", comment: "Navigation title for Settings view."))
         .navigationBarTitleDisplayMode(.large)
-        .alert("Logout", isPresented: $confirm_logout) {
-            Button("Cancel") {
+        .alert(NSLocalizedString("Delete Account", comment: "Alert for deleting the users account."), isPresented: $confirm_delete_account) {
+            TextField("Type DELETE to delete", text: $delete_text)
+            Button(NSLocalizedString("Cancel", comment: "Cancel deleting the user."), role: .cancel) {
+                confirm_delete_account = false
+            }
+            Button(NSLocalizedString("Delete", comment: "Button for deleting the users account."), role: .destructive) {
+                guard let full_kp = state.keypair.to_full() else {
+                    return
+                }
+                
+                guard delete_text == "DELETE" else {
+                    return
+                }
+                
+                let ev = created_deleted_account_profile(keypair: full_kp)
+                state.pool.send(.event(ev))
+                notify(.logout, ())
+            }
+        }
+        .alert(NSLocalizedString("Logout", comment: "Alert for logging out the user."), isPresented: $confirm_logout) {
+            Button(NSLocalizedString("Cancel", comment: "Cancel out of logging out the user."), role: .cancel) {
                 confirm_logout = false
             }
-            Button("Logout") {
+            Button(NSLocalizedString("Logout", comment: "Button for logging out the user."), role: .destructive) {
                 notify(.logout, ())
             }
         } message: {
-            Text("Make sure your nsec account key is saved before you logout or you will lose access to this account")
-        }
-        .sheet(isPresented: $show_add_relay) {
-            AddRelayView(show_add_relay: $show_add_relay, relay: $new_relay) { m_relay in
-                guard var relay = m_relay else {
-                    return
-                }
-                
-                if relay.starts(with: "wss://") == false {
-                    relay = "wss://" + relay
-                }
-                
-                guard let url = URL(string: relay) else {
-                    return
-                }
-                                
-                guard let ev = state.contacts.event else {
-                    return
-                }
-                
-                guard let privkey = state.keypair.privkey else {
-                    return
-                }
-                
-                let info = RelayInfo.rw
-                
-                guard (try? state.pool.add_relay(url, info: info)) != nil else {
-                    return
-                }
-                
-                state.pool.connect(to: [relay])
-                
-                guard let new_ev = add_relay(ev: ev, privkey: privkey, current_relays: state.pool.descriptors, relay: relay, info: info) else {
-                    return
-                }
-                
-                process_contact_event(pool: state.pool, contacts: state.contacts, pubkey: state.pubkey, ev: ev)
-                
-                state.pool.send(.event(new_ev))
-            }
+                Text("Make sure your nsec account key is saved before you logout or you will lose access to this account", comment: "Reminder message in alert to get customer to verify that their private security account key is saved saved before logging out.")
         }
         .onReceive(handle_notify(.switched_timeline)) { _ in
             dismiss()
         }
-        .onReceive(handle_notify(.relays_changed)) { _ in
-            self.relays = state.pool.descriptors
-        }
     }
 }
 

damus/Views/CreateAccountView.swift

@@ -11,6 +11,7 @@ struct CreateAccountView: View {
     @StateObject var account: CreateAccountModel = CreateAccountModel()
     @State var is_light: Bool = false
     @State var is_done: Bool = false
+    @State var reading_eula: Bool = false
     
     func SignupForm<FormContent: View>(@ViewBuilder content: () -> FormContent) -> some View {
         return VStack(alignment: .leading, spacing: 10.0, content: content)
@@ -35,14 +36,14 @@ struct CreateAccountView: View {
                 
                 HStack(alignment: .top) {
                     VStack {
-                        Text("   ")
+                        Text("   ", comment: "Blank space to separate profile picture from profile editor form.")
                             .foregroundColor(.white)
                     }
                     VStack {
                         SignupForm {
                             FormLabel(NSLocalizedString("Username", comment: "Label to prompt username entry."))
                             HStack(spacing: 0.0) {
-                                Text("@")
+                                Text("@", comment: "Prefix character to username.")
                                     .foregroundColor(.white)
                                     .padding(.leading, -25.0)
                                 
@@ -75,6 +76,7 @@ struct CreateAccountView: View {
                 NavigationLink(destination: SaveKeysView(account: account), isActive: $is_done) {
                     EmptyView()
                 }
+                
                 DamusWhiteButton(NSLocalizedString("Create", comment: "Button to create account.")) {
                     self.is_done = true
                 }
@@ -151,7 +153,7 @@ func FormLabel(_ title: String, optional: Bool = false) -> some View {
                 .bold()
                 .foregroundColor(.white)
         if optional {
-            Text("optional")
+            Text("optional", comment: "Label indicating that a form input is optional.")
                 .font(.callout)
                 .foregroundColor(.white.opacity(0.5))
         }

damus/Views/DMChatView.swift

@@ -19,7 +19,7 @@ struct DMChatView: View {
                 VStack(alignment: .leading) {
                     ForEach(Array(zip(dms.events, dms.events.indices)), id: \.0.id) { (ev, ind) in
                         DMView(event: dms.events[ind], damus_state: damus_state)
-                            .event_context_menu(ev, privkey: damus_state.keypair.privkey)
+                            .event_context_menu(ev, keypair: damus_state.keypair, target_pubkey: ev.pubkey)
                     }
                     EndBlock(height: 80)
                 }
@@ -63,6 +63,8 @@ struct DMChatView: View {
             )
             .padding(16)
             .foregroundColor(Color.primary)
+            .frame(minHeight: 70, maxHeight: 150, alignment: .bottom)
+            .fixedSize(horizontal: false, vertical: true)
     }
 
     @Environment(\.colorScheme) var colorScheme
@@ -97,22 +99,15 @@ struct DMChatView: View {
                     }
                 }
             }
-        }
-        .frame(height: 50 + 20 * CGFloat(text_lines))
-    }
+            .fixedSize(horizontal: false, vertical: true)
+            .frame(minHeight: 70, maxHeight: 150, alignment: .bottom)
 
-    var text_lines: Int {
-        var lines = 1
-        for c in message {
-            if lines > 4 {
-                return lines
-            }
-            if c.isNewline {
-                lines += 1
-            }
+            Text(message).opacity(0).padding(.all, 8)
+                .fixedSize(horizontal: false, vertical: true)
+                .frame(minHeight: 70, maxHeight: 150, alignment: .bottom)
         }
-
-        return lines
+        .fixedSize(horizontal: false, vertical: true)
+        .frame(minHeight: 70, maxHeight: 150, alignment: .bottom)
     }
 
     func send_message() {
@@ -142,14 +137,15 @@ struct DMChatView: View {
 
                 Footer
             }
-            Text("Send a message to start the conversation...")
-            .lineLimit(nil)
-            .multilineTextAlignment(.center)
-            .padding(.horizontal, 40)
-            .opacity(((dms.events.count == 0) ? 1.0 : 0.0))
-            .foregroundColor(.gray)
+
+            Text("Send a message to start the conversation...", comment: "Text prompt for user to send a message to the other user.")
+                .lineLimit(nil)
+                .multilineTextAlignment(.center)
+                .padding(.horizontal, 40)
+                .opacity(((dms.events.count == 0) ? 1.0 : 0.0))
+                .foregroundColor(.gray)
         }
-        .navigationTitle("DM")
+        .navigationTitle(NSLocalizedString("DMs", comment: "Navigation title for DMs view, where DM is the English abbreviation for Direct Message."))
         .toolbar { Header }
     }
 }
@@ -158,7 +154,7 @@ struct DMChatView_Previews: PreviewProvider {
     static var previews: some View {
         let ev = NostrEvent(content: "hi", pubkey: "pubkey", kind: 1, tags: [])
 
-        let model = DirectMessageModel(events: [ev])
+        let model = DirectMessageModel(events: [ev], our_pubkey: "pubkey")
 
         DMChatView(damus_state: test_damus_state(), pubkey: "pubkey")
             .environmentObject(model)
@@ -166,7 +162,7 @@ struct DMChatView_Previews: PreviewProvider {
 }
 
 
-func create_dm(_ message: String, to_pk: String, tags: [[String]], keypair: Keypair) -> NostrEvent?
+func create_dm(_ message: String, to_pk: String, tags: [[String]], keypair: Keypair, created_at: Int64? = nil) -> NostrEvent?
 {
     guard let privkey = keypair.privkey else {
         return nil
@@ -181,7 +177,9 @@ func create_dm(_ message: String, to_pk: String, tags: [[String]], keypair: Keyp
         return nil
     }
     let enc_content = encode_dm_base64(content: enc_message.bytes, iv: iv)
-    let ev = NostrEvent(content: enc_content, pubkey: keypair.pubkey, kind: 4, tags: tags)
+    let created = created_at ?? Int64(Date().timeIntervalSince1970)
+    let ev = NostrEvent(content: enc_content, pubkey: keypair.pubkey, kind: 4, tags: tags, createdAt: created)
+    
     ev.calculate_id()
     ev.sign(privkey: privkey)
     return ev

damus/Views/DMView.swift

@@ -10,25 +10,28 @@ import SwiftUI
 struct DMView: View {
     let event: NostrEvent
     let damus_state: DamusState
-    
+
     var is_ours: Bool {
         event.pubkey == damus_state.pubkey
     }
-    
+
     var body: some View {
         HStack {
             if is_ours {
-                Spacer()
+                Spacer(minLength: UIScreen.main.bounds.width * 0.2)
             }
-            
+
             let should_show_img = should_show_images(contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
-            
+
             NoteContentView(privkey: damus_state.keypair.privkey, event: event, profiles: damus_state.profiles, previews: damus_state.previews, show_images: should_show_img, artifacts: .just_content(event.get_content(damus_state.keypair.privkey)), size: .normal)
                 .foregroundColor(is_ours ? Color.white : Color.primary)
                 .padding(10)
                 .background(is_ours ? Color.accentColor : Color.secondary.opacity(0.15))
                 .cornerRadius(8.0)
                 .tint(is_ours ? Color.white : Color.accentColor)
+            if !is_ours {
+                Spacer(minLength: UIScreen.main.bounds.width * 0.2)
+            }
         }
     }
 }

damus/Views/DirectMessagesView.swift

@@ -7,15 +7,26 @@
 
 import SwiftUI
 
+enum DMType: Hashable {
+    case rando
+    case friend
+}
+
 struct DirectMessagesView: View {
     let damus_state: DamusState
     
+    @State var dm_type: DMType = .friend
     @State var open_dm: Bool = false
     @State var pubkey: String = ""
-    @State var active_model: DirectMessageModel = DirectMessageModel()
     @EnvironmentObject var model: DirectMessagesModel
+    @State var active_model: DirectMessageModel
     
-    var MainContent: some View {
+    init(damus_state: DamusState) {
+        self.damus_state = damus_state
+        self._active_model = State(initialValue: DirectMessageModel(our_pubkey: damus_state.pubkey))
+    }
+    
+    func MainContent(requests: Bool) -> some View {
         ScrollView {
             let chat = DMChatView(damus_state: damus_state, pubkey: pubkey)
                 .environmentObject(active_model)
@@ -26,20 +37,19 @@ struct DirectMessagesView: View {
                 if model.dms.isEmpty, !model.loading {
                     EmptyTimelineView()
                 } else {
-                    ForEach(model.dms, id: \.0) { tup in
+                    let dms = requests ? model.message_requests : model.friend_dms
+                    ForEach(dms, id: \.0) { tup in
                         MaybeEvent(tup)
                     }
                 }
             }
-            .padding(.horizontal)
-            .padding(.top)
         }
     }
     
     func MaybeEvent(_ tup: (String, DirectMessageModel)) -> some View {
         Group {
             if let ev = tup.1.events.last {
-                EventView(damus: damus_state, event: ev, pubkey: tup.0, show_friend_icon: true)
+                EventView(damus: damus_state, event: ev, pubkey: tup.0)
                     .onTapGesture {
                         pubkey = tup.0
                         active_model = tup.1
@@ -52,8 +62,28 @@ struct DirectMessagesView: View {
     }
     
     var body: some View {
-        MainContent
-            .navigationTitle("Encrypted DMs")
+        VStack(spacing: 0) {
+            CustomPicker(selection: $dm_type, content: {
+                Text("DMs", comment: "Picker option for DM selector for seeing only DMs that have been responded to. DM is the English abbreviation for Direct Message.")
+                    .tag(DMType.friend)
+                Text("Requests", comment: "Picker option for DM selector for seeing only message requests (DMs that someone else sent the user which has not been responded to yet). DM is the English abbreviation for Direct Message.")
+                    .tag(DMType.rando)
+            })
+            
+            Divider()
+                .frame(height: 1)
+            
+            TabView(selection: $dm_type) {
+                MainContent(requests: false)
+                    .tag(DMType.friend)
+                
+                MainContent(requests: true)
+                    .tag(DMType.rando)
+            }
+            .tabViewStyle(.page(indexDisplayMode: .never))
+        }
+        .padding(.horizontal)
+        .navigationTitle(NSLocalizedString("DMs", comment: "Navigation title for view of DMs, where DM is an English abbreviation for Direct Message."))
     }
 }
 
@@ -63,8 +93,9 @@ struct DirectMessagesView_Previews: PreviewProvider {
                                pubkey: "pubkey",
                                kind: 4,
                                tags: [])
-        let model = DirectMessageModel(events: [ev])
-        DirectMessagesView(damus_state: test_damus_state())
+        let ds = test_damus_state()
+        let model = DirectMessageModel(events: [ev], our_pubkey: ds.pubkey)
+        DirectMessagesView(damus_state: ds)
             .environmentObject(model)
     }
 }

damus/Views/EULAView.swift

@@ -0,0 +1,103 @@
+//
+//  EULAView.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-25.
+//
+
+import SwiftUI
+
+struct EULAView: View {
+    var state: SetupState?
+    @Environment(\.dismiss) var dismiss
+    @State var accepted = false
+
+    var body: some View {
+        ZStack {
+            DamusGradient()
+            
+            ScrollView {
+                Text("EULA", comment: "Label indicating that the below text is the EULA, an acronym for End User License Agreement.")
+                    .font(.title.bold())
+                    .foregroundColor(.white)
+                
+                Text(Markdown.parse(content: """
+End User License Agreement
+
+## Introduction
+
+This End User License Agreement ("EULA") is a legal agreement between you and Damus Nostr Inc. for the use of our mobile application Damus. By installing, accessing, or using our application, you agree to be bound by the terms and conditions of this EULA.
+
+## Prohibited Content and Conduct
+
+You agree not to use our application to create, upload, post, send, or store any content that:
+
+* Is illegal, infringing, or fraudulent
+* Is defamatory, libelous, or threatening
+* Is pornographic, obscene, or offensive
+* Is discriminatory or promotes hate speech
+* Is harmful to minors
+* Is intended to harass or bully others
+* Is intended to impersonate others
+
+## You also agree not to engage in any conduct that:
+
+* Harasses or bullies others
+* Impersonates others
+* Is intended to intimidate or threaten others
+* Is intended to promote or incite violence
+
+## Consequences of Violation
+
+Any violation of this EULA, including the prohibited content and conduct outlined above, may result in the termination of your access to our application.
+
+## Disclaimer of Warranties and Limitation of Liability
+
+Our application is provided "as is" and "as available" without warranty of any kind, either express or implied, including but not limited to the implied warranties of merchantability and fitness for a particular purpose. We do not guarantee that our application will be uninterrupted or error-free. In no event shall Damus Nostr Inc. be liable for any damages whatsoever, including but not limited to direct, indirect, special, incidental, or consequential damages, arising out of or in connection with the use or inability to use our application.
+
+## Changes to EULA
+
+We reserve the right to update or modify this EULA at any time and without prior notice. Your continued use of our application following any changes to this EULA will be deemed to be your acceptance of such changes.
+
+## Contact Information
+
+If you have any questions about this EULA, please contact us at damus@jb55.com
+
+## Acceptance of Terms
+
+By using our Application, you signify your acceptance of this EULA. If you do not agree to this EULA, you may not use our Application.
+
+"""))
+                .padding()
+                
+                if state == .create_account {
+                    NavigationLink(destination: CreateAccountView(), isActive: $accepted) {
+                        EmptyView()
+                    }
+                } else {
+                    NavigationLink(destination: LoginView(), isActive: $accepted) {
+                        EmptyView()
+                    }
+                }
+                DamusWhiteButton(NSLocalizedString("Accept", comment: "Button to accept the end user license agreement before being allowed into the app.")) {
+                    accepted = true
+                }
+
+                DamusWhiteButton(NSLocalizedString("Reject", comment: "Button to reject the end user license agreement, which disallows the user from being let into the app.")) {
+                    dismiss()
+                }
+            }
+            .padding()
+        }
+        .navigationBarTitleDisplayMode(.inline)
+        .navigationBarBackButtonHidden(true)
+        .navigationBarItems(leading: BackNav())
+        .foregroundColor(.white)
+    }
+}
+
+struct EULAView_Previews: PreviewProvider {
+    static var previews: some View {
+        EULAView()
+    }
+}

damus/Views/EditMetadataView.swift

@@ -8,6 +8,7 @@
 import SwiftUI
 
 let PPM_SIZE: CGFloat = 80.0
+let BANNER_HEIGHT: CGFloat = 150.0;
 
 func isHttpsUrl(_ string: String) -> Bool {
     let urlRegEx = "^https://.*$"
@@ -56,12 +57,14 @@ struct EditMetadataView: View {
     @State var display_name: String
     @State var about: String
     @State var picture: String
+    @State var banner: String
     @State var nip05: String
     @State var name: String
     @State var ln: String
     @State var website: String
     
     @Environment(\.dismiss) var dismiss
+    @Environment(\.colorScheme) var colorScheme
     
     init (damus_state: DamusState) {
         self.damus_state = damus_state
@@ -72,10 +75,15 @@ struct EditMetadataView: View {
         _about = State(initialValue: data?.about ?? "")
         _website = State(initialValue: data?.website ?? "")
         _picture = State(initialValue: data?.picture ?? "")
+        _banner = State(initialValue: data?.banner ?? "")
         _nip05 = State(initialValue: data?.nip05 ?? "")
         _ln = State(initialValue: data?.lud16 ?? data?.lud06 ?? "")
     }
     
+    func imageBorderColor() -> Color {
+            colorScheme == .light ? Color("DamusWhite") : Color("DamusBlack")
+        }
+    
     func save() {
         let metadata = NostrMetadata(
             display_name: display_name,
@@ -84,6 +92,7 @@ struct EditMetadataView: View {
             website: website,
             nip05: nip05.isEmpty ? nil : nip05,
             picture: picture.isEmpty ? nil : picture,
+            banner: banner.isEmpty ? nil : banner,
             lud06: ln.contains("@") ? nil : ln,
             lud16: ln.contains("@") ? ln : nil
         );
@@ -99,40 +108,65 @@ struct EditMetadataView: View {
         return NIP05.parse(nip05)
     }
     
+    var TopSection: some View {
+        ZStack(alignment: .top) {
+            GeometryReader { geo in
+                BannerImageView(pubkey: damus_state.pubkey, profiles: damus_state.profiles)
+                    .aspectRatio(contentMode: .fill)
+                    .frame(width: geo.size.width, height: BANNER_HEIGHT)
+                    .clipped()
+            }.frame(height: BANNER_HEIGHT)
+            VStack(alignment: .leading) {
+                let pfp_size: CGFloat = 90.0
+
+                HStack(alignment: .center) {
+                    ProfilePicView(pubkey: damus_state.pubkey, size: pfp_size, highlight: .custom(imageBorderColor(), 4.0), profiles: damus_state.profiles)
+                        .offset(y: -(pfp_size/2.0)) // Increase if set a frame
+
+                   Spacer()
+                }.padding(.bottom,-(pfp_size/2.0))
+            }
+            .padding(.horizontal,18)
+            .padding(.top,BANNER_HEIGHT)
+        }
+    }
+    
     var body: some View {
         VStack(alignment: .leading) {
-            HStack {
-                Spacer()
-                InnerProfilePicView(url: URL(string: picture), pubkey: damus_state.pubkey, size: PPM_SIZE, highlight: .none)
-                Spacer()
-            }
+            TopSection
             Form {
-                Section("Your Name") {
+                Section(NSLocalizedString("Your Name", comment: "Label for Your Name section of user profile form.")) {
                     TextField("Satoshi Nakamoto", text: $display_name)
                         .autocorrectionDisabled(true)
                         .textInputAutocapitalization(.never)
                 }
                 
-                Section("Username") {
+                Section(NSLocalizedString("Username", comment: "Label for Username section of user profile form.")) {
                     TextField("satoshi", text: $name)
                         .autocorrectionDisabled(true)
                         .textInputAutocapitalization(.never)
 
                 }
                 
-                Section ("Profile Picture") {
-                    TextField("https://example.com/pic.jpg", text: $picture)
+                Section (NSLocalizedString("Profile Picture", comment: "Label for Profile Picture section of user profile form.")) {
+                    TextField(NSLocalizedString("https://example.com/pic.jpg", comment: "Placeholder example text for profile picture URL."), text: $picture)
                         .autocorrectionDisabled(true)
                         .textInputAutocapitalization(.never)
                 }
                 
-                Section("Website") {
-                    TextField("https://jb55.com", text: $website)
+                Section (NSLocalizedString("Banner Image", comment: "Label for Banner Image section of user profile form.")) {
+                                    TextField(NSLocalizedString("https://example.com/pic.jpg", comment: "Placeholder example text for profile picture URL."), text: $banner)
+                                        .autocorrectionDisabled(true)
+                                        .textInputAutocapitalization(.never)
+                                }
+                
+                Section(NSLocalizedString("Website", comment: "Label for Website section of user profile form.")) {
+                    TextField(NSLocalizedString("https://jb55.com", comment: "Placeholder example text for website URL for user profile."), text: $website)
                         .autocorrectionDisabled(true)
                         .textInputAutocapitalization(.never)
                 }
                 
-                Section("About Me") {
+                Section(NSLocalizedString("About Me", comment: "Label for About Me section of user profile form.")) {
                     let placeholder = NSLocalizedString("Absolute Boss", comment: "Placeholder text for About Me description.")
                     ZStack(alignment: .topLeading) {
                         TextEditor(text: $about)
@@ -146,33 +180,33 @@ struct EditMetadataView: View {
                     }
                 }
                 
-                Section("Bitcoin Lightning Tips") {
-                    TextField("Lightning Address or LNURL", text: $ln)
+                Section(NSLocalizedString("Bitcoin Lightning Tips", comment: "Label for Bitcoin Lightning Tips section of user profile form.")) {
+                    TextField(NSLocalizedString("Lightning Address or LNURL", comment: "Placeholder text for entry of Lightning Address or LNURL."), text: $ln)
                         .autocorrectionDisabled(true)
                         .textInputAutocapitalization(.never)
                 }
                                 
                 Section(content: {
-                    TextField("jb55@jb55.com", text: $nip05)
+                    TextField(NSLocalizedString("jb55@jb55.com", comment: "Placeholder example text for identifier used for NIP-05 verification."), text: $nip05)
                         .autocorrectionDisabled(true)
                         .textInputAutocapitalization(.never)
                 }, header: {
-                    Text("NIP-05 Verification")
+                    Text("NIP-05 Verification", comment: "Label for NIP-05 Verification section of user profile form.")
                 }, footer: {
                     if let parts = nip05_parts {
-                        Text(String(format: NSLocalizedString("'%@' at '%@' will be used for verification", comment: "Description of how the nip05 identifier would be used for verification."), parts.username, parts.host))
+                        Text("'\(parts.username)' at '\(parts.host)' will be used for verification", comment: "Description of how the nip05 identifier would be used for verification.")
                     } else {
-                            Text(String(format: NSLocalizedString("'%@' is an invalid nip05 identifier. It should look like an email.", comment: "Description of why the nip05 identifier is invalid."), nip05))
+                        Text("'\(nip05)' is an invalid NIP-05 identifier. It should look like an email.", comment: "Description of why the nip05 identifier is invalid.")
                     }
                 })
 
-                Button("Save") {
+                Button(NSLocalizedString("Save", comment: "Button for saving profile.")) {
                     save()
                     dismiss()
                 }
             }
         }
-        .navigationTitle("Edit Profile")
+        .ignoresSafeArea()
     }
 }
 

damus/Views/Empty Views/EmptyTimelineView.swift

@@ -13,7 +13,7 @@ struct EmptyTimelineView: View {
             Image(systemName: "tray.fill")
                 .font(.system(size: 35))
                 .padding()
-            Text("Nothing to see here. Check back later!")
+            Text("Nothing to see here. Check back later!", comment: "Indicates that there are no notes in the timeline to view.")
                 .multilineTextAlignment(.center)
                 .font(.callout.weight(.medium))
         }

damus/Views/EventDetailView.swift

@@ -59,7 +59,7 @@ struct EventDetailView: View {
         Group {
             switch cev {
             case .collapsed(let c):
-                Text("··· \(c.count) other notes ···")
+                Text(String(format: NSLocalizedString("collapsed_event_view_other_notes", comment: "Text to indicate that the thread was collapsed and that there are other notes to view if tapped."), c.count))
                     .padding([.top,.bottom], 8)
                     .font(.footnote)
                     .foregroundColor(.gray)
@@ -71,8 +71,8 @@ struct EventDetailView: View {
                         }
                         toggle_thread_view()
                     }
-            case .event(let ev, let highlight):
-                EventView(event: ev, highlight: highlight, has_action_bar: true, damus: damus, show_friend_icon: true)
+            case .event(let ev, _):
+                EventView(damus: damus, event: ev, has_action_bar: true)
                     .onTapGesture {
                         if thread.initial_event.id == ev.id {
                             toggle_thread_view()
@@ -114,7 +114,7 @@ struct EventDetailView: View {
                 scroll_after_load(thread: thread, proxy: proxy)
             }
         }
-        .navigationBarTitle("Thread")
+        .navigationBarTitle(NSLocalizedString("Thread", comment: "Navigation bar title for note thread."))
 
     }
     

damus/Views/EventView.swift

@@ -8,38 +8,9 @@
 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
-        }
-    }
-}
-
 enum EventViewKind {
     case small
     case normal
-    case big
     case selected
 }
 
@@ -49,117 +20,40 @@ func eventviewsize_to_font(_ size: EventViewKind) -> Font {
         return .body
     case .normal:
         return .body
-    case .big:
-        return .headline
     case .selected:
         return .custom("selected", size: 21.0)
     }
 }
 
-struct BuilderEventView: View {
-    let damus: DamusState
-    let event_id: String
-    @State var event: NostrEvent?
-    @State var subscription_uuid: String = UUID().description
-    
-    func unsubscribe() {
-        damus.pool.unsubscribe(sub_id: subscription_uuid)
-    }
-    
-    func subscribe(filters: [NostrFilter]) {
-        damus.pool.register_handler(sub_id: subscription_uuid, handler: handle_event)
-        damus.pool.send(.subscribe(.init(filters: filters, sub_id: subscription_uuid)))
-    }
-    
-    func handle_event(relay_id: String, ev: NostrConnectionEvent) {
-        guard case .nostr_event(let nostr_response) = ev else {
-            return
-        }
-        
-        guard case .event(let id, let nostr_event) = nostr_response else {
-            return
-        }
-        
-        // Is current event
-        if id == subscription_uuid {
-            if event != nil {
-                return
-            }
-            
-            event = nostr_event
-            
-            unsubscribe()
-        }
-    }
-    
-    func load() {
-        subscribe(filters: [
-            NostrFilter(
-                ids: [self.event_id],
-                limit: 1
-            )
-        ])
-    }
-    
-    var body: some View {
-        VStack {
-            if let event = event {
-                let ev = event.inner_event ?? event
-                NavigationLink(destination: BuildThreadV2View(damus: damus, event_id: ev.id)) {
-                    EventView(damus: damus, event: event, show_friend_icon: true, size: .small)
-                }.buttonStyle(.plain)
-            } else {
-                ProgressView().padding()
-            }
-        }
-        .frame(minWidth: 0, maxWidth: .infinity)
-        .border(Color.gray.opacity(0.2), width: 1)
-        .cornerRadius(2)
-        .onAppear {
-            self.load()
-        }
-    }
-}
+
 
 struct EventView: View {
     let event: NostrEvent
-    let highlight: Highlight
     let has_action_bar: Bool
     let damus: DamusState
     let pubkey: String
-    let show_friend_icon: Bool
-    let size: EventViewKind
 
     @EnvironmentObject var action_bar: ActionBarModel
 
-    init(event: NostrEvent, highlight: Highlight, has_action_bar: Bool, damus: DamusState, show_friend_icon: Bool, size: EventViewKind = .normal) {
+    init(damus: DamusState, event: NostrEvent, has_action_bar: Bool) {
         self.event = event
-        self.highlight = highlight
         self.has_action_bar = has_action_bar
         self.damus = damus
         self.pubkey = event.pubkey
-        self.show_friend_icon = show_friend_icon
-        self.size = size
     }
 
-    init(damus: DamusState, event: NostrEvent, show_friend_icon: Bool, size: EventViewKind = .normal) {
+    init(damus: DamusState, event: NostrEvent) {
         self.event = event
-        self.highlight = .none
         self.has_action_bar = false
         self.damus = damus
         self.pubkey = event.pubkey
-        self.show_friend_icon = show_friend_icon
-        self.size = size
     }
 
-    init(damus: DamusState, event: NostrEvent, pubkey: String, show_friend_icon: Bool, size: EventViewKind = .normal, embedded: Bool = false) {
+    init(damus: DamusState, event: NostrEvent, pubkey: String) {
         self.event = event
-        self.highlight = .none
         self.has_action_bar = false
         self.damus = damus
         self.pubkey = pubkey
-        self.show_friend_icon = show_friend_icon
-        self.size = size
     }
 
     var body: some View {
@@ -172,20 +66,10 @@ struct EventView: View {
                     let booster_profile = ProfileView(damus_state: damus, profile: prof_model, followers: follow_model)
                     
                     NavigationLink(destination: booster_profile) {
-                        HStack {
-                            Image(systemName: "arrow.2.squarepath")
-                                .font(.footnote.weight(.bold))
-                                .foregroundColor(Color.gray)
-                            ProfileName(pubkey: event.pubkey, profile: prof, damus: damus, show_friend_confirmed: true)
-                                    .font(.footnote.weight(.bold))
-                                    .foregroundColor(Color.gray)
-                            Text("Boosted")
-                                .font(.footnote.weight(.bold))
-                                .foregroundColor(Color.gray)
-                        }
+                        Reposted(damus: damus, pubkey: event.pubkey, profile: prof)
                     }
                     .buttonStyle(PlainButtonStyle())
-                    TextEvent(inner_ev, pubkey: inner_ev.pubkey)
+                    TextEvent(inner_ev, pubkey: inner_ev.pubkey, booster_pubkey: event.pubkey)
                         .padding([.top], 1)
                 }
             } else {
@@ -195,73 +79,44 @@ struct EventView: View {
         }
     }
 
-    func TextEvent(_ event: NostrEvent, pubkey: String) -> some View {
-        let content = event.get_content(damus.keypair.privkey)
-        
+    func TextEvent(_ event: NostrEvent, pubkey: String, booster_pubkey: String? = nil) -> some View {
         return HStack(alignment: .top) {
             let profile = damus.profiles.lookup(id: pubkey)
-            
-            if size != .selected {
-                VStack {
-                    let pmodel = ProfileModel(pubkey: pubkey, damus: damus)
-                    let pv = ProfileView(damus_state: damus, profile: pmodel, followers: FollowersModel(damus_state: damus, target: pubkey))
-                    
-                    NavigationLink(destination: pv) {
-                        ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: highlight, profiles: damus.profiles)
-                    }
-                    
-                    Spacer()
+        
+            VStack {
+                let pmodel = ProfileModel(pubkey: pubkey, damus: damus)
+                let pv = ProfileView(damus_state: damus, profile: pmodel, followers: FollowersModel(damus_state: damus, target: pubkey))
+                
+                NavigationLink(destination: pv) {
+                    ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus.profiles)
                 }
+                
+                Spacer()
             }
 
             VStack(alignment: .leading) {
                 HStack(alignment: .center) {
-                    if size == .selected {
-                        VStack {
-                            let pmodel = ProfileModel(pubkey: pubkey, damus: damus)
-                            let pv = ProfileView(damus_state: damus, profile: pmodel, followers: FollowersModel(damus_state: damus, target: pubkey))
-                            
-                            NavigationLink(destination: pv) {
-                                ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: highlight, profiles: damus.profiles)
-                            }
-                        }
-                    }
+                    EventProfileName(pubkey: pubkey, profile: profile, damus: damus, show_friend_confirmed: true, size: .normal)
                     
-                    EventProfileName(pubkey: pubkey, profile: profile, damus: damus, show_friend_confirmed: show_friend_icon, size: size)
-                    if size != .selected {
-                        Text("\(format_relative_time(event.created_at))")
-                            .font(eventviewsize_to_font(size))
-                            .foregroundColor(.gray)
-                    }
-                }
-                
-                if event.is_reply(damus.keypair.privkey) {
-                    Text("\(reply_desc(profiles: damus.profiles, event: event))")
-                        .font(.footnote)
+                    Text("\(format_relative_time(event.created_at))")
                         .foregroundColor(.gray)
-                        .frame(maxWidth: .infinity, alignment: .leading)
+                    
+                    Spacer()
                 }
-
-                let should_show_img = should_show_images(contacts: damus.contacts, ev: event, our_pubkey: damus.pubkey)
                 
-                NoteContentView(privkey: damus.keypair.privkey, event: event, profiles: damus.profiles, previews: damus.previews, show_images: should_show_img, artifacts: .just_content(content), size: self.size)
-                    .frame(maxWidth: .infinity, alignment: .leading)
+                EventBody(damus_state: damus, event: event, size: .normal)
+                
+                if let mention = first_eref_mention(ev: event, privkey: damus.keypair.privkey) {
+                    BuilderEventView(damus: damus, event_id: mention.ref.id)
+                }
                 
                 if has_action_bar {
-                    if size == .selected {
-                        Text("\(format_date(event.created_at))")
-                            .padding(.top, 10)
-                            .font(.footnote)
-                            .foregroundColor(.gray)
-                        
-                        Divider()
-                            .padding([.bottom], 4)
-                    } else {
-                        Rectangle().frame(height: 2).opacity(0)
-                    }
+                    Rectangle().frame(height: 2).opacity(0)
                     
                     let bar = make_actionbar_model(ev: event, damus: damus)
+                    
                     EventActionBar(damus_state: damus, event: event, bar: bar)
+                        .padding([.top], 4)
                 }
 
                 Divider()
@@ -274,18 +129,21 @@ struct EventView: View {
         .id(event.id)
         .frame(maxWidth: .infinity, minHeight: PFP_SIZE)
         .padding([.bottom], 2)
-        .event_context_menu(event, privkey: damus.keypair.privkey)
+        .event_context_menu(event, keypair: damus.keypair, target_pubkey: pubkey)
     }
 }
 
 // blame the porn bots for this code
-func should_show_images(contacts: Contacts, ev: NostrEvent, our_pubkey: String) -> Bool {
+func should_show_images(contacts: Contacts, ev: NostrEvent, our_pubkey: String, booster_pubkey: String? = nil) -> Bool {
     if ev.pubkey == our_pubkey {
         return true
     }
     if contacts.is_in_friendosphere(ev.pubkey) {
         return true
     }
+    if let boost_key = booster_pubkey, contacts.is_in_friendosphere(boost_key) {
+        return true
+    }
     return false
 }
 
@@ -308,42 +166,14 @@ extension View {
             Button {
                     UIPasteboard.general.string = bech32_pubkey
             } label: {
-                Label("Copy Account ID", systemImage: "doc.on.doc")
+                Label(NSLocalizedString("Copy Account ID", comment: "Context menu option for copying the ID of the account that created the note."), systemImage: "doc.on.doc")
             }
         }
     }
     
-    func event_context_menu(_ event: NostrEvent, privkey: String?) -> some View {
+    func event_context_menu(_ event: NostrEvent, keypair: Keypair, target_pubkey: String) -> some View {
         return self.contextMenu {
-            Button {
-                UIPasteboard.general.string = event.get_content(privkey)
-            } label: {
-                Label("Copy Text", systemImage: "doc.on.doc")
-            }
-
-            Button {
-                UIPasteboard.general.string = bech32_pubkey(event.pubkey) ?? event.pubkey
-            } label: {
-                Label("Copy User ID", systemImage: "tag")
-            }
-
-            Button {
-                UIPasteboard.general.string = bech32_note_id(event.id) ?? event.id
-            } label: {
-                Label("Copy Note ID", systemImage: "tag")
-            }
-
-            Button {
-                UIPasteboard.general.string = event_to_json(ev: event)
-            } label: {
-                Label("Copy Note JSON", systemImage: "note")
-            }
-
-            Button {
-                NotificationCenter.default.post(name: .broadcast_event, object: event)
-            } label: {
-                Label("Broadcast", systemImage: "globe")
-            }
+            EventMenuContext(event: event, keypair: keypair, target_pubkey: target_pubkey)
         }
 
     }
@@ -363,33 +193,6 @@ func format_date(_ created_at: Int64) -> String {
 }
 
 
-func reply_desc(profiles: Profiles, event: NostrEvent) -> String {
-    let desc = make_reply_description(event.tags)
-    let pubkeys = desc.pubkeys
-    let n = desc.others
-
-    if desc.pubkeys.count == 0 {
-        return NSLocalizedString("Reply to self", comment: "Label to indicate that the user is replying to themself.")
-    }
-
-    let names: [String] = pubkeys.map {
-        let prof = profiles.lookup(id: $0)
-        return Profile.displayName(profile: prof, pubkey: $0)
-    }
-
-    if names.count == 2 {
-        if n > 2 {
-            let othersCount = n - pubkeys.count
-            return String(format: NSLocalizedString("replying_to_two_and_others", comment: "Label to indicate that the user is replying to 2 users and others."), names[0], names[1], othersCount)
-        }
-        return String(format: NSLocalizedString("Replying to %@ & %@", comment: "Label to indicate that the user is replying to 2 users."), names[0], names[1])
-    }
-
-    let othersCount = n - pubkeys.count
-    return String(format: NSLocalizedString("replying_to_one_and_others", comment: "Label to indicate that the user is replying to 1 user and others."), names[0], othersCount)
-}
-
-
 
 func make_actionbar_model(ev: NostrEvent, damus: DamusState) -> ActionBarModel {
     let likes = damus.likes.counts[ev.id]
@@ -412,22 +215,25 @@ func make_actionbar_model(ev: NostrEvent, damus: DamusState) -> ActionBarModel {
 struct EventView_Previews: PreviewProvider {
     static var previews: some View {
         VStack {
+            /*
             EventView(damus: test_damus_state(), event: NostrEvent(content: "hello there https://jb55.com/s/Oct12-150217.png https://jb55.com/red-me.jb55 cool", pubkey: "pk"), show_friend_icon: true, size: .small)
             EventView(damus: test_damus_state(), event: NostrEvent(content: "hello there https://jb55.com/s/Oct12-150217.png https://jb55.com/red-me.jb55 cool", pubkey: "pk"), show_friend_icon: true, size: .normal)
             EventView(damus: test_damus_state(), event: NostrEvent(content: "hello there https://jb55.com/s/Oct12-150217.png https://jb55.com/red-me.jb55 cool", pubkey: "pk"), show_friend_icon: true, size: .big)
             
+             */
             EventView(
-                event: NostrEvent(
-                    content: "hello there https://jb55.com/s/Oct12-150217.png https://jb55.com/red-me.jb55 cool",
-                    pubkey: "pk",
-                    createdAt: Int64(Date().timeIntervalSince1970 - 100)
-                ),
-                highlight: .none,
-                has_action_bar: true,
                 damus: test_damus_state(),
-                show_friend_icon: true,
-                size: .selected
+                event: test_event,
+                has_action_bar: true
             )
         }
+        .padding()
     }
 }
+
+let test_event =
+        NostrEvent(
+            content: "hello there https://jb55.com/s/Oct12-150217.png https://jb55.com/red-me.jpg cool",
+            pubkey: "pk",
+            createdAt: Int64(Date().timeIntervalSince1970 - 100)
+        )

damus/Views/Events/BuilderEventView.swift

@@ -0,0 +1,81 @@
+//
+//  BuilderEventView.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-23.
+//
+
+import SwiftUI
+
+struct BuilderEventView: View {
+    let damus: DamusState
+    let event_id: String
+    @State var event: NostrEvent?
+    @State var subscription_uuid: String = UUID().description
+    
+    func unsubscribe() {
+        damus.pool.unsubscribe(sub_id: subscription_uuid)
+    }
+    
+    func subscribe(filters: [NostrFilter]) {
+        damus.pool.register_handler(sub_id: subscription_uuid, handler: handle_event)
+        damus.pool.send(.subscribe(.init(filters: filters, sub_id: subscription_uuid)))
+    }
+    
+    func handle_event(relay_id: String, ev: NostrConnectionEvent) {
+        guard case .nostr_event(let nostr_response) = ev else {
+            return
+        }
+        
+        guard case .event(let id, let nostr_event) = nostr_response else {
+            return
+        }
+        
+        // Is current event
+        if id == subscription_uuid {
+            if event != nil {
+                return
+            }
+            
+            event = nostr_event
+            
+            unsubscribe()
+        }
+    }
+    
+    func load() {
+        subscribe(filters: [
+            NostrFilter(
+                ids: [self.event_id],
+                limit: 1
+            )
+        ])
+    }
+    
+    var body: some View {
+        VStack {
+            if let event = event {
+                let ev = event.inner_event ?? event
+                NavigationLink(destination: BuildThreadV2View(damus: damus, event_id: ev.id)) {
+                    EmbeddedEventView(damus_state: damus, event: event)
+                        .padding(8)
+                }.buttonStyle(.plain)
+            } else {
+                ProgressView().padding()
+            }
+        }
+        .frame(minWidth: 0, maxWidth: .infinity)
+        .cornerRadius(8)
+        .border(Color.gray.opacity(0.2), width: 1)
+        .onAppear {
+            self.load()
+        }
+    }
+}
+
+struct BuilderEventView_Previews: PreviewProvider {
+    static var previews: some View {
+        BuilderEventView(damus: test_damus_state(), event_id: "536bee9e83c818e3b82c101935128ae27a0d4290039aaf253efe5f09232c1962")
+    }
+}
+

damus/Views/Events/EmbeddedEventView.swift

@@ -0,0 +1,35 @@
+//
+//  EmbeddedEventView.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-23.
+//
+
+import SwiftUI
+
+struct EmbeddedEventView: View {
+    let damus_state: DamusState
+    let event: NostrEvent
+    
+    var pubkey: String {
+        event.pubkey
+    }
+    
+    var body: some View {
+        VStack(alignment: .leading) {
+            let profile = damus_state.profiles.lookup(id: pubkey)
+            
+            EventProfile(damus_state: damus_state, pubkey: pubkey, profile: profile, size: .small)
+            
+            EventBody(damus_state: damus_state, event: event, size: .small)
+        }
+        .event_context_menu(event, keypair: damus_state.keypair, target_pubkey: pubkey)
+    }
+}
+
+struct EmbeddedEventView_Previews: PreviewProvider {
+    static var previews: some View {
+        EmbeddedEventView(damus_state: test_damus_state(), event: test_event)
+            .padding()
+    }
+}

damus/Views/Events/EventBody.swift

@@ -0,0 +1,35 @@
+//
+//  EventBody.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-23.
+//
+
+import SwiftUI
+
+struct EventBody: View {
+    let damus_state: DamusState
+    let event: NostrEvent
+    let size: EventViewKind
+    
+    var content: String {
+        event.get_content(damus_state.keypair.privkey)
+    }
+    
+    var body: some View {
+        if event_is_reply(event, privkey: damus_state.keypair.privkey) {
+            ReplyDescription(event: event, profiles: damus_state.profiles)
+        }
+
+        let should_show_img = should_show_images(contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey, booster_pubkey: nil)
+        
+        NoteContentView(privkey: damus_state.keypair.privkey, event: event, profiles: damus_state.profiles, previews: damus_state.previews, show_images: should_show_img, artifacts: .just_content(content), size: size)
+            .frame(maxWidth: .infinity, alignment: .leading)
+    }
+}
+
+struct EventBody_Previews: PreviewProvider {
+    static var previews: some View {
+        EventBody(damus_state: test_damus_state(), event: test_event, size: .normal)
+    }
+}

damus/Views/Events/EventMenu.swift

@@ -0,0 +1,102 @@
+//
+//  EventMenu.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-23.
+//
+
+import SwiftUI
+
+struct EventMenuContext: View {
+    let event: NostrEvent
+    let keypair: Keypair
+    let target_pubkey: String
+    
+    var body: some View {
+    
+        Button {
+            UIPasteboard.general.string = event.get_content(keypair.privkey)
+        } label: {
+            Label(NSLocalizedString("Copy Text", comment: "Context menu option for copying the text from an note."), systemImage: "doc.on.doc")
+        }
+
+        Button {
+            UIPasteboard.general.string = bech32_pubkey(target_pubkey)
+        } label: {
+            Label(NSLocalizedString("Copy User Pubkey", comment: "Context menu option for copying the ID of the user who created the note."), systemImage: "person")
+        }
+
+        Button {
+            UIPasteboard.general.string = bech32_note_id(event.id) ?? event.id
+        } label: {
+            Label(NSLocalizedString("Copy Note ID", comment: "Context menu option for copying the ID of the note."), systemImage: "note.text")
+        }
+
+        Button {
+            UIPasteboard.general.string = event_to_json(ev: event)
+        } label: {
+            Label(NSLocalizedString("Copy Note JSON", comment: "Context menu option for copying the JSON text from the note."), systemImage: "square.on.square")
+        }
+
+        Button {
+            NotificationCenter.default.post(name: .broadcast_event, object: event)
+        } label: {
+            Label(NSLocalizedString("Broadcast", comment: "Context menu option for broadcasting the user's note to all of the user's connected relay servers."), systemImage: "globe")
+        }
+
+        // Only allow reporting if logged in with private key and the currently viewed profile is not the logged in profile.
+        if keypair.pubkey != target_pubkey && keypair.privkey != nil {
+            Button(role: .destructive) {
+                let target: ReportTarget = .note(ReportNoteTarget(pubkey: target_pubkey, note_id: event.id))
+                notify(.report, target)
+            } label: {
+                Label(NSLocalizedString("Report", comment: "Context menu option for reporting content."), systemImage: "exclamationmark.bubble")
+            }
+
+            Button(role: .destructive) {
+                notify(.block, target_pubkey)
+            } label: {
+                Label(NSLocalizedString("Block", comment: "Context menu option for blocking users."), systemImage: "exclamationmark.octagon")
+            }
+        }
+    }
+}
+
+/*
+struct EventMenu: UIViewRepresentable {
+    
+    typealias UIViewType = UIButton
+
+    let saveAction = UIAction(title: "") { action in }
+    let saveMenu = UIMenu(title: "", children: [
+        UIAction(title: "First Menu Item", image: UIImage(systemName: "nameOfSFSymbol")) { action in
+            //code action for menu item
+        },
+        UIAction(title: "First Menu Item", image: UIImage(systemName: "nameOfSFSymbol")) { action in
+            //code action for menu item
+        },
+        UIAction(title: "First Menu Item", image: UIImage(systemName: "nameOfSFSymbol")) { action in
+            //code action for menu item
+        },
+    ])
+
+    func makeUIView(context: Context) -> UIButton {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 20, height: 20))
+        button.showsMenuAsPrimaryAction = true
+        button.menu = saveMenu
+        
+        return button
+    }
+    
+    func updateUIView(_ uiView: UIButton, context: Context) {
+        uiView.setImage(UIImage(systemName: "plus"), for: .normal)
+    }
+}
+
+struct EventMenu_Previews: PreviewProvider {
+    static var previews: some View {
+        EventMenu(event: test_event, privkey: nil, pubkey: test_event.pubkey)
+    }
+}
+
+*/

damus/Views/Events/EventProfile.swift

@@ -0,0 +1,51 @@
+//
+//  EventProfile.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-23.
+//
+
+import SwiftUI
+
+func eventview_pfp_size(_ size: EventViewKind) -> CGFloat {
+    switch size {
+    case .small:
+        return PFP_SIZE * 0.5
+    case .normal:
+        return PFP_SIZE
+    case .selected:
+        return PFP_SIZE
+    }
+}
+
+struct EventProfile: View {
+    let damus_state: DamusState
+    let pubkey: String
+    let profile: Profile?
+    let size: EventViewKind
+    
+    var pfp_size: CGFloat {
+        eventview_pfp_size(size)
+    }
+    
+    var body: some View {
+        HStack(alignment: .center) {
+            VStack {
+                let pmodel = ProfileModel(pubkey: pubkey, damus: damus_state)
+                let pv = ProfileView(damus_state: damus_state, profile: pmodel, followers: FollowersModel(damus_state: damus_state, target: pubkey))
+                
+                NavigationLink(destination: pv) {
+                    ProfilePicView(pubkey: pubkey, size: pfp_size, highlight: .none, profiles: damus_state.profiles)
+                }
+            }
+            
+            EventProfileName(pubkey: pubkey, profile: profile, damus: damus_state, show_friend_confirmed: true, size: size)
+        }
+    }
+}
+
+struct EventProfile_Previews: PreviewProvider {
+    static var previews: some View {
+        EventProfile(damus_state: test_damus_state(), pubkey: "pk", profile: nil, size: .normal)
+    }
+}

damus/Views/Events/MutedEventView.swift

@@ -0,0 +1,112 @@
+//
+//  MutedEventView.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-27.
+//
+
+import SwiftUI
+
+struct MutedEventView: View {
+    let damus_state: DamusState
+    let event: NostrEvent
+    let scroller: ScrollViewProxy?
+    
+    let selected: Bool
+    @Binding var nav_target: String?
+    @Binding var navigating: Bool
+    @State var shown: Bool
+    @Environment(\.colorScheme) var colorScheme
+    
+    init(damus_state: DamusState, event: NostrEvent, scroller: ScrollViewProxy?, nav_target: Binding<String?>, navigating: Binding<Bool>, selected: Bool) {
+        self.damus_state = damus_state
+        self.event = event
+        self.scroller = scroller
+        self.selected = selected
+        self._nav_target = nav_target
+        self._navigating = navigating
+        self._shown = State(initialValue: !should_hide_event(contacts: damus_state.contacts, ev: event))
+    }
+    
+    var should_mute: Bool {
+        return should_hide_event(contacts: damus_state.contacts, ev: event)
+    }
+    
+    var FillColor: Color {
+        colorScheme == .light ? Color("DamusLightGrey") : Color("DamusDarkGrey")
+    }
+    
+    var MutedBox: some View {
+        ZStack {
+            RoundedRectangle(cornerRadius: 20)
+                .foregroundColor(FillColor)
+            
+            HStack {
+                Text("Post from a user you've blocked", comment: "Text to indicate that what is being shown is a post from a user who has been blocked.")
+                Spacer()
+                Button(shown ? NSLocalizedString("Hide", comment: "Button to hide a post from a user who has been blocked.") : NSLocalizedString("Show", comment: "Button to show a post from a user who has been blocked.")) {
+                    shown.toggle()
+                }
+            }
+            .padding(10)
+        }
+    }
+    
+    var Event: some View {
+        Group {
+            if selected {
+                SelectedEventView(damus: damus_state, event: event)
+            } else {
+                EventView(damus: damus_state, event: event, has_action_bar: true)
+                    .onTapGesture {
+                        nav_target = event.id
+                        navigating = true
+                    }
+                    .onAppear {
+                        // TODO: find another solution to prevent layout shifting and layout blocking on large responses
+                        scroller?.scrollTo("main", anchor: .bottom)
+                    }
+            }
+        }
+    }
+    
+    var body: some View {
+        Group {
+            if should_mute {
+                MutedBox
+            }
+            if shown {
+                Event
+            }
+        }
+        .onReceive(handle_notify(.new_mutes)) { notif in
+            guard let mutes = notif.object as? [String] else {
+                return
+            }
+            
+            if mutes.contains(event.pubkey) {
+                shown = false
+            }
+        }
+        .onReceive(handle_notify(.new_unmutes)) { notif in
+            guard let unmutes = notif.object as? [String] else {
+                return
+            }
+            
+            if unmutes.contains(event.pubkey) {
+                shown = true
+            }
+        }
+    }
+}
+
+struct MutedEventView_Previews: PreviewProvider {
+    @State static var nav_target: String? = nil
+    @State static var navigating: Bool = false
+    
+    static var previews: some View {
+        
+        MutedEventView(damus_state: test_damus_state(), event: test_event, scroller: nil, nav_target: $nav_target, navigating: $navigating, selected: false)
+            .frame(width: .infinity, height: 50)
+    }
+}

damus/Views/Events/ReplyDescription.swift

@@ -0,0 +1,55 @@
+//
+//  ReplyDescription.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-23.
+//
+
+import SwiftUI
+
+// jb55 - TODO: this could be a lot better
+struct ReplyDescription: View {
+    let event: NostrEvent
+    let profiles: Profiles
+    
+    var body: some View {
+        Text("\(reply_desc(profiles: profiles, event: event))")
+            .font(.footnote)
+            .foregroundColor(.gray)
+            .frame(maxWidth: .infinity, alignment: .leading)
+    }
+}
+
+struct ReplyDescription_Previews: PreviewProvider {
+    static var previews: some View {
+        ReplyDescription(event: test_event, profiles: test_damus_state().profiles)
+    }
+}
+
+func reply_desc(profiles: Profiles, event: NostrEvent) -> String {
+    let desc = make_reply_description(event.tags)
+    let pubkeys = desc.pubkeys
+    let n = desc.others
+
+    if desc.pubkeys.count == 0 {
+        return NSLocalizedString("Reply to self", comment: "Label to indicate that the user is replying to themself.")
+    }
+
+    let names: [String] = pubkeys.map {
+        let prof = profiles.lookup(id: $0)
+        return Profile.displayName(profile: prof, pubkey: $0)
+    }
+
+    if names.count == 2 {
+        if n > 2 {
+            let othersCount = n - pubkeys.count
+            return String(format: NSLocalizedString("replying_to_two_and_others", comment: "Label to indicate that the user is replying to 2 users and others."), names[0], names[1], othersCount)
+        }
+        return String(format: NSLocalizedString("Replying to %@ & %@", comment: "Label to indicate that the user is replying to 2 users."), names[0], names[1])
+    }
+
+    let othersCount = n - pubkeys.count
+    return String(format: NSLocalizedString("replying_to_one_and_others", comment: "Label to indicate that the user is replying to 1 user and others."), names[0], othersCount)
+}
+
+

damus/Views/Events/SelectedEventView.swift

@@ -0,0 +1,62 @@
+//
+//  SelectedEventView.swift
+//  damus
+//
+//  Created by William Casarin on 2023-01-23.
+//
+
+import SwiftUI
+
+struct SelectedEventView: View {
+    let damus: DamusState
+    let event: NostrEvent
+    
+    var pubkey: String {
+        event.pubkey
+    }
+    
+    var body: some View {
+        HStack(alignment: .top) {
+            let profile = damus.profiles.lookup(id: pubkey)
+
+            VStack(alignment: .leading) {
+                EventProfile(damus_state: damus, pubkey: pubkey, profile: profile, size: .normal)
+                EventBody(damus_state: damus, event: event, size: .selected)
+                
+                if let mention = first_eref_mention(ev: event, privkey: damus.keypair.privkey) {
+                    BuilderEventView(damus: damus, event_id: mention.ref.id)
+                }
+                
+                Text("\(format_date(event.created_at))")
+                    .padding(.top, 10)
+                    .font(.footnote)
+                    .foregroundColor(.gray)
+                
+                Divider()
+                    .padding([.bottom], 4)
+                
+                let bar = make_actionbar_model(ev: event, damus: damus)
+                
+                if !bar.is_empty {
+                    EventDetailBar(state: damus, target: event.id, bar: bar)
+                    Divider()
+                }
+                
+                EventActionBar(damus_state: damus, event: event, bar: bar)
+                    .padding([.top], 4)
+
+                Divider()
+                    .padding([.top], 4)
+            }
+            .padding([.leading], 2)
+            .event_context_menu(event, keypair: damus.keypair, target_pubkey: event.pubkey)
+        }
+    }
+}
+
+struct SelectedEventView_Previews: PreviewProvider {
+    static var previews: some View {
+        SelectedEventView(damus: test_damus_state(), event: test_event)
+            .padding()
+    }
+}

damus/Views/FollowButtonView.swift

@@ -19,8 +19,7 @@ struct FollowButtonView: View {
             follow_state = perform_follow_btn_action(follow_state, target: target)
         } label: {
             Text(follow_btn_txt(follow_state))
-                .frame(height: 30)
-                .padding(.horizontal, 25)
+                .frame(width: 105, height: 30)
                 //.padding(.vertical, 10)
                 .font(.caption.weight(.bold))
                 .foregroundColor(follow_state == .unfollows ? filledTextColor() : borderColor())
@@ -70,16 +69,16 @@ struct FollowButtonPreviews: View {
     let target: FollowTarget = .pubkey("")
     var body: some View {
         VStack {
-            Text("Unfollows")
+            Text("Unfollows", comment: "Text to indicate that the button next to it is in a state that will unfollow a profile when tapped.")
             FollowButtonView(target: target, follow_state: .unfollows)
             
-            Text("Following")
+            Text("Following", comment: "Text to indicate that the button next to it is in a state that indicates that it is in the process of following a profile.")
             FollowButtonView(target: target, follow_state: .following)
             
-            Text("Follows")
+            Text("Follows", comment: "Text to indicate that button next to it is in a state that will follow a profile when tapped.")
             FollowButtonView(target: target, follow_state: .follows)
             
-            Text("Unfollowing")
+            Text("Unfollowing", comment: "Text to indicate that the button next to it is in  a state that indicates that it is in the process of unfollowing a profile.")
             FollowButtonView(target: target, follow_state: .unfollowing)
         }
     }

damus/Views/FollowingView.swift

@@ -15,26 +15,7 @@ struct FollowUserView: View {
 
     var body: some View {
         HStack {
-            let pmodel = ProfileModel(pubkey: target.pubkey, damus: damus_state)
-            let followers = FollowersModel(damus_state: damus_state, target: target.pubkey)
-            let pv = ProfileView(damus_state: damus_state, profile: pmodel, followers: followers)
-            
-            NavigationLink(destination: pv) {
-                ProfilePicView(pubkey: target.pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles)
-            
-                VStack(alignment: .leading) {
-                    let profile = damus_state.profiles.lookup(id: target.pubkey)
-                    ProfileName(pubkey: target.pubkey, profile: profile, damus: damus_state, show_friend_confirmed: false)
-                    if let about = profile?.about {
-                        Text(FollowUserView.markdown.process(about))
-                            .lineLimit(3)
-                            .font(.footnote)
-                    }
-                }
-                
-                Spacer()
-            }
-            .buttonStyle(PlainButtonStyle())
+            UserView(damus_state: damus_state, pubkey: target.pubkey)
             
             FollowButtonView(target: target, follow_state: damus_state.contacts.follow_state(target.pubkey))
         }
@@ -57,7 +38,7 @@ struct FollowersView: View {
             }
             .padding()
         }
-        .navigationBarTitle("\(Profile.displayName(profile: profile, pubkey: whos))'s Followers")
+        .navigationBarTitle(NSLocalizedString("\(Profile.displayName(profile: profile, pubkey: whos))'s Followers", comment: "Navigation bar title for view that shows who is following a user."))
         .onAppear {
             followers.subscribe()
         }
@@ -91,7 +72,7 @@ struct FollowingView: View {
         .onDisappear {
             following.unsubscribe()
         }
-        .navigationBarTitle("\(who) following")
+        .navigationBarTitle(NSLocalizedString("\(who) following", comment: "Navigation bar title for view that shows who a user is following."))
     }
 }