WIP translations CI

.github/workflows/export-translations.yaml

@@ -0,0 +1,24 @@
+name: Export Source Translations
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  export-source-translations:
+    name: Update translations branch
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Run export script
+        run: |
+          sh devtools/export-source-translation.sh
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Update Translations 🤖
+          branch: translations
+          create_branch: true
+          push_options: '--force'
+        if: env.GIT_DIFF

.rgignore

@@ -1,2 +0,0 @@
-translations/
-*.lproj/

CHANGELOG.md

@@ -1,373 +1,3 @@
-## [1.4.3-1] - 2023-04-15
-
-### Added
-
-- Add deep links for local notifications (Swift + Will)
-- Add thread muting (Terry Yiu)
-- Preview media uploads when posting (Swift)
-- Add QR Code in profiles (ericholguin)
-
-
-### Changed
-
-- Ask permission before uploading media (Swift)
-- Show DM message in local notification (William Casarin)
-
-
-### Fixed
-
-- Fix tap area when mentioning users (OlegAba)
-- Fix invalid DM author notifications (William Casarin)
-- Fix relay signal indicator, properly show how many relays you are connected to (William Casarin)
-
-
-[1.4.3-1]: https://github.com/damus-io/damus/releases/tag/v1.4.3-1
-
-## [1.4.2-2] - 2023-04-12
-
-### Added
-
-- Include #btc in custom #bitcoin hashtag (William Casarin)
-- Make notification dots configurable (William Casarin)
-
-
-### Changed
-
-- Display follows in most recent to oldest (Luis Cabrera)
-
-### Fixed
-
-- Fix hitches caused by syncronous loading of cached images (William Casarin)
-- Fix tabs sometimes not switching (William Casarin)
-
-
-[1.4.2-2]: https://github.com/damus-io/damus/releases/tag/v1.4.2-2
-
-## [1.4.1-8] - 2023-04-10
-
-### Added
-
-- Add support for nostr: bech32 urls in posts and DMs (NIP19) (Bartholomew Joyce)
-
-### Fixed
-
-- Don't leak mentions in DMs (William Casarin)
-- Fix tap area when mentioning users (OlegAba)
-
-[1.4.1-8]: https://github.com/damus-io/damus/releases/tag/v1.4.1-8
-## [1.4.1-7] - 2023-04-07
-
-### Added
-
-- Add #zap and #zapathon custom hashtags (William Casarin)
-- Add custom #plebchain icon (William Casarin)
-
-
-### Changed
-
-- Add validation to prevent whitespaces be inputted on NIP-05 input field (Terry Yiu)
-- Change reply color from blue to purple. Blue is banned from Damus. (William Casarin)
-
-
-### Fixed
-
-- Fix padding in post view (OlegAba)
-- Show most recently bookmarked notes at the top (Bryan Montz)
-
-
-[1.4.1-7]: https://github.com/damus-io/damus/releases/tag/v1.4.1-7
-
-## [1.4.1-6] - 2023-04-06
-
-### Added
-
-- Custom hashtags for #bitcoin, #nostr and #coffeechain (William Casarin)
-
-### Changed
-
-- Disable translations in DMs by default (William Casarin)
-
-### Fixed
-
-- Don't show Translating... if we're not actually translating (William Casarin)
-
-
-[1.4.1-6]: https://github.com/damus-io/damus/releases/tag/v1.4.1-6
-
-## [1.4.1-4] - 2023-04-06
-
-### Added
-
-- Cache translations (William Casarin)
-
-### Fixed
-
-- Fix translation text popping (William Casarin)
-- Fix broken auto-translations (William Casarin)
-- Fix extraneous padding on some image posts (William Casarin)
-- Fix crash in relay list view (William Casarin)
-
-[1.4.1-4]: https://github.com/damus-io/damus/releases/tag/v1.4.1-4
-
-## [1.4.1-3] - 2023-04-05
-
-### Added
-
-- Added text truncation settings (William Casarin)
-
-### Changed
-
-- Rename block to mute (William Casarin)
-
-### Fixed
-
-- Reduce chopping of images (mainvolume)
-- Fix some notification settings not saving (William Casarin)
-- Fix broken camera uploads (again) (Joel Klabo)
-
-
-[1.4.1-3]: https://github.com/damus-io/damus/releases/tag/v1.4.1-3
-
-## [1.4.1-2] - 2023-04-04
-
-### Added
-
-- Reply counts (William Casarin)
-- Add option to only show notification from people you follow (Swift)
-- Added local notifications for other events (Swift)
-- Show a custom view when tagged user isn't found (ericholguin)
-- Show referenced notes in DMs (William Casarin)
-
-
-### Changed
-
-- Show full bleed images on selected events in threads (William Casarin)
-- Improvement to square image displaying (mainvolume)
-
-
-### Fixed
-
-- Fix broken website links that have missing https:// prefixes (William Casarin)
-- Get around CCP bootstrap relay banning by caching user's relays as their bootstrap relays (William Casarin)
-
-
-[1.4.1-2]: https://github.com/damus-io/damus/releases/tag/v1.4.1-2
-
-## [1.4.1] - 2023-04-03
-
-### Added
-
-- Profile Picture Upload (Joel Klabo)
-- Enable offline posting (William Casarin)
-- Add auto-translation caching to ruduce api usage (Terry Yiu)
-- Added support for gif uploads (Swift)
-- Add a Divider in the Follows List for Large Screens (Joel Klabo)
-- Upload Photos and Videos from Camera (Joel Klabo)
-- Added ability to lookup users by nip05 identifiers (William Casarin)
-
-### Changed
-
-- Only truncate timeline text if enabled in settings (William Casarin)
-- Make mentions wide in notifications like in timeline (William Casarin)
-- Broadcast events you are replying to (William Casarin)
-- Broadcast now also broadcasts event user's profile (William Casarin)
-- Improved look of reply view (ericholguin)
-- Remove gradient in some places for visibility (ericholguin)
-
-
-### Fixed
-
-- Fix cropped images (mainvolume)
-- Truncate long text in notification items (William Casarin)
-- Restore missing reply description on selected events (William Casarin)
-- Show sent DMs immediately (William Casarin)
-- Fixed size of translated text (William Casarin)
-- Fix crash when reposting (William Casarin)
-- Fix unclickable image dismiss button (OlegAba)
-
-
-[1.4.1]: https://github.com/damus-io/damus/releases/tag/v1.4.1
-## [1.4.0] - 2023-03-27
-
-### Added
-
-- Local zap notifications (Swift)
-- Add support for video uploads (Swift)
-- Auto Translation (Terry Yiu)
-- Portuguese (Brazil) translations (Andressa Munturo)
-- Spanish (Spain) translations (Max Pleb)
-- Vietnamese translations (ShiryoRyo)
-
-
-### Fixed
-
-- Fixed small notification hit boxes (Terry Yiu)
-
-[1.4.0]: https://github.com/damus-io/damus/releases/tag/v1.4.0
-
-## [1.3.0-7] - 2023-03-24
-
-- New experimental timeline view
-
-[1.3.0-7]: https://github.com/damus-io/damus/releases/tag/v1.3.0-7
-
-## [1.3.0-6] - 2023-03-21
-
-### Fixed
-
-- Fix bug where nostr: links and QRs stopped working (William Casarin)
-
-
-[1.3.0-6]: https://github.com/damus-io/damus/releases/tag/v1.3.0-6
-
-## [1.3.0-5] - 2023-03-20
-
-### Added
-
-- Add Time Ago to DM View (Joel Klabo)
-
-
-### Fixed
-
-- Fixed internal links opening in other nostr clients (William Casarin)
-- Remove authentication for copying npub (Swift)
-
-
-[1.3.0-5]: https://github.com/damus-io/damus/releases/tag/v1.3.0-5
-
-## [1.3.0-4] - 2023-03-17
-
-### Changed
-
-- It's much easier to tag users in replies and posts (William Casarin)
-
-
-### Fixed
-
-- Fix bug where small black text appears during image upload (William Casarin)
-
-
-[1.3.0-4]: https://github.com/damus-io/damus/releases/tag/v1.3.0-4
-
-## [1.3.0-3] - 2023-03-17
-
-### Fixed
-
-- Fix image upload url delay after progress bar disappears (William Casarin)
-- Fix issue where damus stops trying to reconnect (William Casarin)
-
-[1.3.0-3]: https://github.com/damus-io/damus/releases/tag/v1.3.0-3
-
-## [1.3.0-2] - 2023-03-16
-
-### Added
-
-- Add image uploader (Swift)
-- Add option to always show images (never blur) (William Casarin)
-- Canadian French (Pierre - synoptic_okubo)
-- Hungarian translations (Zoltan)
-- Korean translations (sogoagain)
-- Swedish translations (Pextar)
-
-
-### Changed
-
-- Fixed embedded note popping (William Casarin)
-- Bump notification limit from 100 to 500 (William Casarin)
-
-
-### Fixed
-
-- Fix zap button preventing scrolling (William Casarin)
-
-
-[1.3.0-2]: https://github.com/damus-io/damus/releases/tag/v1.3.0-2
-
-## [1.3.0] - 2023-03-15
-
-### Added
-
-- Extend user tagging search to all local profiles (William Casarin)
-- Vibrate when a zap is received (Swift)
-- New and Improved Share sheet (ericholguin)
-- Bulgarian translations (elsat)
-- Persian translations (Mahdi Taghizadeh)
-- Ukrainian translations (Valeriia Khudiakova, Tony B)
-
-
-### Changed
-
-- Reduce battery usage by using exp backoff on connections (Bryan Montz)
-- Don't show both realname and username if they are the same (William Casarin)
-- Show error on invalid lightning tip address (Swift)
-- Make DM Content More Visible (Joel Klabo)
-- Remove spaces from hashtag searches (gladiusKatana)
-
-
-### Fixed
-
-- Show @ mentions for users with display_names and no username (William Casarin)
-- Make user search case insensitive (William Casarin)
-- Fix repost button sometimes not working (OlegAba)
-- Don't show follows you for your own profile (benthecarman)
-- Fix json appearing in profile searches (gladiusKatana)
-- Fix unexpected font size when posting (Bryan Montz)
-- Fix keyboard sticking issues (OlegAba)
-- Fixed tab bar background color on macOS (Joel Klabo)
-- Fix some links getting interpreted as images (gladiusKatana)
-
-
-[1.3.0]: https://github.com/damus-io/damus/releases/tag/v1.3.0
-
-## [1.2.0-4] - 2023-03-05
-
-### Added
-
-- Add ellipsis button to notes (ericholguin)
-
-
-### Changed
-
-- Immediately search for events and profiles (William Casarin)
-- Use long-press for custom zaps (William Casarin)
-- Make shaka animation smoother (Swift)
-
-
-### Fixed
-
-- Fixed hit detection bugs on profile page (OlegAba)
-- Fix disappearing text on Thread view (Bryan Montz)
-- Render links in notification summaries (Joel Klabo)
-- Don't show notifications from ourselves (William Casarin)
-- Fix issue where navbar back button would show the wrong text (Jack Chakany)
-- Fix case sensitivity when searching hashtags (randymcmillan)
-- Fix issue where opening reposts shows json (William Casarin)
-
-
-[1.2.0-4]: https://github.com/damus-io/damus/releases/tag/v1.2.0-4
-
-## [1.2.0-3] - 2023-03-04
-
-### Added
-
-- Add additional info to recommended relay view (ericholguin)
-- Add shaka animation (Swift)
-- Add option to disable image animation (OlegAba)
-- Add additional warning when deleting account (ericholguin)
-- Threads now load instantly and are cached (William Casarin)
-
-
-### Fixed
-
-- Wrap long profile display names (OlegAba)
-- Fixed weird scaling on profile pictures (OlegAba)
-- Fixed width of copy pubkey on profile page (Joel Klabo)
-- Make damus purple use more consistent in mentions (Joel Klabo)
-
-
-
-[1.2.0-3]: https://github.com/damus-io/damus/releases/tag/v1.2.0-3
-
 ## [1.1.0-10] - 2023-03-01
 
 ### Added
@@ -391,8 +21,6 @@
 - Customized zaps (William Casarin)
 - Add new Notifications View (William Casarin)
 - Bookmarking (Joel Klabo)
-- Chinese, Traditional (Hong Kong) translations (rasputin)
-- Chinese, Traditional (Taiwan) translations (rasputin)
 
 ### Changed
 
@@ -418,9 +46,6 @@
 - Added the ability to select text on posts (OlegAba)
 - Added Posts or Post & Replies selector to Profile (ericholguin)
 - Improved profile navbar (OlegAba)
-- Czech translations (Martin Gabrhel)
-- Indonesian translations (johnybergzy)
-- Russian translations (Tony B)
 
 
 ### Changed
@@ -469,6 +94,7 @@
 ### Added
 
 - Relay Filtering (William Casarin)
+- Japanese translations (Terry Yiu)
 - Add password autofill on account login and creation (Terry Yiu)
 - Show if relay is paid (William Casarin)
 - Add "Follows You" indicator on profile (William Casarin)
@@ -481,10 +107,6 @@
 - Copy invoice button (Joel Klabo)
 - Receive Lightning Zaps (William Casarin)
 - Allow text selection in bio (Suhail Saqan)
-- Chinese, Simplified (China mainland) translations (haolong, rasputin)
-- Dutch translations (Heimen Stoffels - Vistaus)
-- Greek translations (milicode)
-- Japanese translations (akiomik, foxytanuki, Guetsu Ren - Nighthaven, h3y6e, middlingphys)
 
 
 ### Changed
@@ -519,7 +141,6 @@
 - LibreTranslate note translations (Terry Yiu)
 - Added support for account deletion (William Casarin)
 - User tagging and autocompletion in posts (Swift)
-- Polish translations (pysiak)
 
 
 ### Changed
@@ -542,8 +163,7 @@
 
 ### Added
 
-- Arabic translations (Barodane)
+- Added Arabic and Portuguese translations (Barodane, Antonio Chagas)
-- Portuguese translations (Antonio Chagas)
 - Add QRCode view for sharing your pubkey (ericholguin)
 - Added nostr: uri handling (William Casarin)
 
@@ -570,8 +190,7 @@
 ### Added
 
 - Reposts view (Terry Yiu)
-- Italian translations (Nicolò Carcagnì)
+- Translations for it_IT, it_CH, fr_FR, de_DE, de_AT and lv_LV (Nicolò Carcagnì, Solobalbo, Gregor, Peter Gerstbach, SYX)
-- Latvian translations (SYX)
 - Added ability to block users (William Casarin)
 - Added a way to report content (William Casarin)
 - Stretchable profile cover header (Swift)
@@ -598,9 +217,7 @@
 
 - Show website on profiles (William Casarin)
 - Add the ability to choose participants when replying (Joel Klabo)
-- German translations (Gregor, Peter Gerstbach)
+- Translations for de_AT, de_DE, tr_TR, fr_FR (Gregor, Peter Gerstbach, Taylan Benli, Solobalbo)
-- Turkish translations (Taylan Benli)
-- French (France) translations (Solobalbo)
 - Add DM Message Requests (William Casarin)
 
 
@@ -1033,3 +650,4 @@
 
 [0.1.2]: https://github.com/damus-io/damus/releases/tag/v0.1.2
 
+

damus-c/bech32.c

@@ -91,12 +91,13 @@ int bech32_encode(char *output, const char *hrp, const uint8_t *data, size_t dat
     return 1;
 }
 
-bech32_encoding bech32_decode_len(char* hrp, uint8_t *data, size_t *data_len, const char *input, size_t input_len) {
+bech32_encoding bech32_decode(char* hrp, uint8_t *data, size_t *data_len, const char *input, size_t max_input_len) {
     uint32_t chk = 1;
     size_t i;
+    size_t input_len = strlen(input);
     size_t hrp_len;
     int have_lower = 0, have_upper = 0;
-    if (input_len < 8) {
+    if (input_len < 8 || input_len > max_input_len) {
         return BECH32_ENCODING_NONE;
     }
     *data_len = 0;
@@ -153,14 +154,6 @@ bech32_encoding bech32_decode_len(char* hrp, uint8_t *data, size_t *data_len, co
     }
 }
 
-bech32_encoding bech32_decode(char* hrp, uint8_t *data, size_t *data_len, const char *input, size_t max_input_len) {
-    size_t len = strlen(input);
-    if (len > max_input_len) {
-        return BECH32_ENCODING_NONE;
-    }
-    return bech32_decode_len(hrp, data, data_len, input, len);
-}
-
 int bech32_convert_bits(uint8_t* out, size_t* outlen, int outbits, const uint8_t* in, size_t inlen, int inbits, int pad) {
     uint32_t val = 0;
     int bits = 0;

damus-c/bech32.h

@@ -118,14 +118,6 @@ bech32_encoding bech32_decode(
     size_t max_input_len
 );
 
-bech32_encoding bech32_decode_len(
-    char *hrp,
-    uint8_t *data,
-    size_t *data_len,
-    const char *input,
-    size_t input_len
-);
-
 /* Helper from bech32: translates inbits-bit bytes to outbits-bit bytes.
  * @outlen is incremented as bytes are added.
  * @pad is true if we're to pad, otherwise truncate last byte if necessary

damus-c/block.h

@@ -1,56 +0,0 @@
-//
-//  block.h
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#ifndef block_h
-#define block_h
-
-#include "nostr_bech32.h"
-#include "str_block.h"
-
-#define MAX_BLOCKS 1024
-
-enum block_type {
-    BLOCK_HASHTAG = 1,
-    BLOCK_TEXT = 2,
-    BLOCK_MENTION_INDEX = 3,
-    BLOCK_MENTION_BECH32 = 4,
-    BLOCK_URL = 5,
-    BLOCK_INVOICE = 6,
-};
-
-
-typedef struct invoice_block {
-    struct str_block invstr;
-    union {
-        struct bolt11 *bolt11;
-    };
-} invoice_block_t;
-
-typedef struct mention_bech32_block {
-    struct str_block str;
-    struct nostr_bech32 bech32;
-} mention_bech32_block_t;
-
-typedef struct block {
-    enum block_type type;
-    union {
-        struct str_block str;
-        struct invoice_block invoice;
-        struct mention_bech32_block mention_bech32;
-        int mention_index;
-    } block;
-} block_t;
-
-typedef struct blocks {
-    int num_blocks;
-    struct block *blocks;
-} blocks_t;
-
-void blocks_init(struct blocks *blocks);
-void blocks_free(struct blocks *blocks);
-
-#endif /* block_h */

damus-c/cursor.h

@@ -1,171 +0,0 @@
-//
-//  cursor.h
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#ifndef cursor_h
-#define cursor_h
-
-#include <ctype.h>
-#include <string.h>
-
-typedef unsigned char u8;
-
-struct cursor {
-    const u8 *p;
-    const u8 *start;
-    const u8 *end;
-};
-
-static inline int is_whitespace(char c) {
-    return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r';
-}
-
-static inline int is_boundary(char c) {
-    return !isalnum(c);
-}
-
-static inline int is_invalid_url_ending(char c) {
-    return c == '!' || c == '?' || c == ')' || c == '.' || c == ',' || c == ';';
-}
-
-static inline int is_alphanumeric(char c) {
-    return (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9');
-}
-
-static inline void make_cursor(struct cursor *c, const u8 *content, size_t len)
-{
-    c->start = content;
-    c->end = content + len;
-    c->p = content;
-}
-
-static inline int consume_until_boundary(struct cursor *cur) {
-    char c;
-    
-    while (cur->p < cur->end) {
-        c = *cur->p;
-        
-        if (is_boundary(c))
-            return 1;
-        
-        cur->p++;
-    }
-    
-    return 1;
-}
-
-static inline int consume_until_whitespace(struct cursor *cur, int or_end) {
-    char c;
-    int consumedAtLeastOne = 0;
-    
-    while (cur->p < cur->end) {
-        c = *cur->p;
-        
-        if (is_whitespace(c))
-            return consumedAtLeastOne;
-        
-        cur->p++;
-        consumedAtLeastOne = 1;
-    }
-    
-    return or_end;
-}
-
-static inline int consume_until_non_alphanumeric(struct cursor *cur, int or_end) {
-    char c;
-    int consumedAtLeastOne = 0;
-
-    while (cur->p < cur->end) {
-        c = *cur->p;
-
-        if (!is_alphanumeric(c))
-            return consumedAtLeastOne;
-
-        cur->p++;
-        consumedAtLeastOne = 1;
-    }
-
-    return or_end;
-}
-
-static inline int parse_char(struct cursor *cur, char c) {
-    if (cur->p >= cur->end)
-        return 0;
-        
-    if (*cur->p == c) {
-        cur->p++;
-        return 1;
-    }
-    
-    return 0;
-}
-
-static inline int peek_char(struct cursor *cur, int ind) {
-    if ((cur->p + ind < cur->start) || (cur->p + ind >= cur->end))
-        return -1;
-    
-    return *(cur->p + ind);
-}
-
-static int parse_digit(struct cursor *cur, int *digit) {
-    int c;
-    if ((c = peek_char(cur, 0)) == -1)
-        return 0;
-    
-    c -= '0';
-    
-    if (c >= 0 && c <= 9) {
-        *digit = c;
-        cur->p++;
-        return 1;
-    }
-    return 0;
-}
-
-
-static inline int pull_byte(struct cursor *cur, u8 *byte) {
-    if (cur->p >= cur->end)
-        return 0;
-        
-    *byte = *cur->p;
-    cur->p++;
-    return 1;
-}
-
-static inline int pull_bytes(struct cursor *cur, int count, const u8 **bytes) {
-    if (cur->p + count > cur->end)
-        return 0;
-    
-    *bytes = cur->p;
-    cur->p += count;
-    return 1;
-}
-
-static inline int parse_str(struct cursor *cur, const char *str) {
-    int i;
-    char c, cs;
-    unsigned long len;
-    
-    len = strlen(str);
-    
-    if (cur->p + len >= cur->end)
-        return 0;
-    
-    for (i = 0; i < len; i++) {
-        c = tolower(cur->p[i]);
-        cs = tolower(str[i]);
-        
-        if (c != cs)
-            return 0;
-    }
-    
-    cur->p += len;
-    
-    return 1;
-}
-
-
-#endif /* cursor_h */

damus-c/damus.c

@@ -6,13 +6,127 @@
 //
 
 #include "damus.h"
-#include "cursor.h"
 #include "bolt11.h"
-#include "bech32.h"
 #include <stdlib.h>
 #include <string.h>
 
-static int parse_mention_index(struct cursor *cur, struct block *block) {
+typedef unsigned char u8;
+
+struct cursor {
+    const u8 *p;
+    const u8 *start;
+    const u8 *end;
+};
+
+static inline int is_whitespace(char c) {
+    return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r';
+}
+
+static inline int is_boundary(char c) {
+    return !isalnum(c);
+}
+
+static inline int is_invalid_url_ending(char c) {
+    return c == '!' || c == '?' || c == ')' || c == '.' || c == ',' || c == ';';
+}
+
+static void make_cursor(struct cursor *c, const u8 *content, size_t len)
+{
+    c->start = content;
+    c->end = content + len;
+    c->p = content;
+}
+
+static int consume_until_boundary(struct cursor *cur) {
+    char c;
+    
+    while (cur->p < cur->end) {
+        c = *cur->p;
+        
+        if (is_boundary(c))
+            return 1;
+        
+        cur->p++;
+    }
+    
+    return 1;
+}
+
+static int consume_until_whitespace(struct cursor *cur, int or_end) {
+    char c;
+    bool consumedAtLeastOne = false;
+    
+    while (cur->p < cur->end) {
+        c = *cur->p;
+        
+        if (is_whitespace(c))
+            return consumedAtLeastOne;
+        
+        cur->p++;
+        consumedAtLeastOne = true;
+    }
+    
+    return or_end;
+}
+
+static int parse_char(struct cursor *cur, char c) {
+    if (cur->p >= cur->end)
+        return 0;
+        
+    if (*cur->p == c) {
+        cur->p++;
+        return 1;
+    }
+    
+    return 0;
+}
+
+static inline int peek_char(struct cursor *cur, int ind) {
+    if ((cur->p + ind < cur->start) || (cur->p + ind >= cur->end))
+        return -1;
+    
+    return *(cur->p + ind);
+}
+
+static int parse_digit(struct cursor *cur, int *digit) {
+    int c;
+    if ((c = peek_char(cur, 0)) == -1)
+        return 0;
+    
+    c -= '0';
+    
+    if (c >= 0 && c <= 9) {
+        *digit = c;
+        cur->p++;
+        return 1;
+    }
+    return 0;
+}
+
+static int parse_str(struct cursor *cur, const char *str) {
+    int i;
+    char c, cs;
+    unsigned long len;
+    
+    len = strlen(str);
+    
+    if (cur->p + len >= cur->end)
+        return 0;
+    
+    for (i = 0; i < len; i++) {
+        c = tolower(cur->p[i]);
+        cs = tolower(str[i]);
+        
+        if (c != cs)
+            return 0;
+    }
+    
+    cur->p += len;
+    
+    return 1;
+}
+
+static int parse_mention(struct cursor *cur, struct block *block) {
     int d1, d2, d3, ind;
     const u8 *start = cur->p;
     
@@ -37,8 +151,8 @@ static int parse_mention_index(struct cursor *cur, struct block *block) {
         return 0;
     }
     
-    block->type = BLOCK_MENTION_INDEX;
+    block->type = BLOCK_MENTION;
-    block->block.mention_index = ind;
+    block->block.mention = ind;
     
     return 1;
 }
@@ -160,27 +274,6 @@ static int parse_invoice(struct cursor *cur, struct block *block) {
     return 1;
 }
 
-
-static int parse_mention_bech32(struct cursor *cur, struct block *block) {
-    const u8 *start = cur->p;
-    
-    if (!parse_str(cur, "nostr:"))
-        return 0;
-    
-    block->block.str.start = (const char *)cur->p;
-    
-    if (!parse_nostr_bech32(cur, &block->block.mention_bech32.bech32)) {
-        cur->p = start;
-        return 0;
-    }
-    
-    block->block.str.end = (const char *)cur->p;
-    
-    block->type = BLOCK_MENTION_BECH32;
-
-    return 1;
-}
-
 static int add_text_then_block(struct cursor *cur, struct blocks *blocks, struct block block, const u8 **start, const u8 *pre_mention)
 {
     if (!add_text_block(blocks, *start, pre_mention))
@@ -210,7 +303,7 @@ int damus_parse_content(struct blocks *blocks, const char *content) {
         
         pre_mention = cur.p;
         if (cp == -1 || is_whitespace(cp)) {
-            if (c == '#' && (parse_mention_index(&cur, &block) || parse_hashtag(&cur, &block))) {
+            if (c == '#' && (parse_mention(&cur, &block) || parse_hashtag(&cur, &block))) {
                 if (!add_text_then_block(&cur, blocks, block, &start, pre_mention))
                     return 0;
                 continue;
@@ -222,10 +315,6 @@ int damus_parse_content(struct blocks *blocks, const char *content) {
                 if (!add_text_then_block(&cur, blocks, block, &start, pre_mention))
                     return 0;
                 continue;
-            } else if (c == 'n' && parse_mention_bech32(&cur, &block)) {
-                if (!add_text_then_block(&cur, blocks, block, &start, pre_mention))
-                    return 0;
-                continue;
             }
         }
         
@@ -246,17 +335,8 @@ void blocks_init(struct blocks *blocks) {
 }
 
 void blocks_free(struct blocks *blocks) {
-    if (!blocks->blocks) {
+    if (blocks->blocks) {
-        return;
+        free(blocks->blocks);
+        blocks->num_blocks = 0;
     }
-    
-    for (int i = 0; i < blocks->num_blocks; ++i) {
-        if (blocks->blocks[i].type == BLOCK_MENTION_BECH32) {
-            free(blocks->blocks[i].block.mention_bech32.bech32.buffer);
-            blocks->blocks[i].block.mention_bech32.bech32.buffer = NULL;
-        }
-    }
-
-    free(blocks->blocks);
-    blocks->num_blocks = 0;
 }

damus-c/damus.h

@@ -9,10 +9,45 @@
 #define damus_h
 
 #include <stdio.h>
-#include "nostr_bech32.h"
-#include "block.h"
-typedef unsigned char u8;
 
+#define MAX_BLOCKS 1024
+
+enum block_type {
+    BLOCK_HASHTAG = 1,
+    BLOCK_TEXT = 2,
+    BLOCK_MENTION = 3,
+    BLOCK_URL = 4,
+    BLOCK_INVOICE = 5,
+};
+
+typedef struct str_block {
+    const char *start;
+    const char *end;
+} str_block_t;
+
+typedef struct invoice_block {
+    struct str_block invstr;
+    union {
+        struct bolt11 *bolt11;
+    };
+} invoice_block_t;
+
+typedef struct block {
+    enum block_type type;
+    union {
+        struct str_block str;
+        struct invoice_block invoice;
+        int mention;
+    } block;
+} block_t;
+
+typedef struct blocks {
+    int num_blocks;
+    struct block *blocks;
+} blocks_t;
+
+void blocks_init(struct blocks *blocks);
+void blocks_free(struct blocks *blocks);
 int damus_parse_content(struct blocks *blocks, const char *content);
 
 #endif /* damus_h */

damus-c/nostr_bech32.c

@@ -1,295 +0,0 @@
-//
-//  nostr_bech32.c
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#include "nostr_bech32.h"
-#include <stdlib.h>
-#include "cursor.h"
-#include "bech32.h"
-
-#define MAX_TLVS 16
-
-#define TLV_SPECIAL 0
-#define TLV_RELAY 1
-#define TLV_AUTHOR 2
-#define TLV_KIND 3
-#define TLV_KNOWN_TLVS 4
-
-struct nostr_tlv {
-    u8 type;
-    u8 len;
-    const u8 *value;
-};
-
-struct nostr_tlvs {
-    struct nostr_tlv tlvs[MAX_TLVS];
-    int num_tlvs;
-};
-
-static int parse_nostr_tlv(struct cursor *cur, struct nostr_tlv *tlv) {
-    // get the tlv tag
-    if (!pull_byte(cur, &tlv->type))
-        return 0;
-    
-    // unknown, fail!
-    if (tlv->type >= TLV_KNOWN_TLVS)
-        return 0;
-    
-    // get the length
-    if (!pull_byte(cur, &tlv->len))
-        return 0;
-    
-    // is the reported length greater then our buffer? if so fail
-    if (cur->p + tlv->len > cur->end)
-        return 0;
-    
-    tlv->value = cur->p;
-    cur->p += tlv->len;
-    
-    return 1;
-}
-
-static int parse_nostr_tlvs(struct cursor *cur, struct nostr_tlvs *tlvs) {
-    int i;
-    tlvs->num_tlvs = 0;
-    
-    for (i = 0; i < MAX_TLVS; i++) {
-        if (parse_nostr_tlv(cur, &tlvs->tlvs[i])) {
-            tlvs->num_tlvs++;
-        } else {
-            break;
-        }
-    }
-    
-    if (tlvs->num_tlvs == 0)
-        return 0;
-    
-    return 1;
-}
-
-static int find_tlv(struct nostr_tlvs *tlvs, u8 type, struct nostr_tlv **tlv) {
-    *tlv = NULL;
-    
-    for (int i = 0; i < tlvs->num_tlvs; i++) {
-        if (tlvs->tlvs[i].type == type) {
-            *tlv = &tlvs->tlvs[i];
-            return 1;
-        }
-    }
-    
-    return 0;
-}
-
-static int parse_nostr_bech32_type(const char *prefix, enum nostr_bech32_type *type) {
-    // Parse type
-    if (strcmp(prefix, "note") == 0) {
-        *type = NOSTR_BECH32_NOTE;
-        return 1;
-    } else if (strcmp(prefix, "npub") == 0) {
-        *type = NOSTR_BECH32_NPUB;
-        return 1;
-    } else if (strcmp(prefix, "nprofile") == 0) {
-        *type = NOSTR_BECH32_NPROFILE;
-        return 1;
-    } else if (strcmp(prefix, "nevent") == 0) {
-        *type = NOSTR_BECH32_NEVENT;
-        return 1;
-    } else if (strcmp(prefix, "nrelay") == 0) {
-        *type = NOSTR_BECH32_NRELAY;
-        return 1;
-    } else if (strcmp(prefix, "naddr") == 0) {
-        *type = NOSTR_BECH32_NADDR;
-        return 1;
-    }
-    
-    return 0;
-}
-
-static int parse_nostr_bech32_note(struct cursor *cur, struct bech32_note *note) {
-    return pull_bytes(cur, 32, &note->event_id);
-}
-
-static int parse_nostr_bech32_npub(struct cursor *cur, struct bech32_npub *npub) {
-    return pull_bytes(cur, 32, &npub->pubkey);
-}
-
-static int tlvs_to_relays(struct nostr_tlvs *tlvs, struct relays *relays) {
-    struct nostr_tlv *tlv;
-    struct str_block *str;
-    
-    relays->num_relays = 0;
-    
-    for (int i = 0; i < tlvs->num_tlvs; i++) {
-        tlv = &tlvs->tlvs[i];
-        if (tlv->type != TLV_RELAY)
-            continue;
-        
-        if (relays->num_relays + 1 > MAX_RELAYS)
-            break;
-        
-        str = &relays->relays[relays->num_relays++];
-        str->start = (const char*)tlv->value;
-        str->end = (const char*)(tlv->value + tlv->len);
-    }
-    
-    return 1;
-}
-
-static int parse_nostr_bech32_nevent(struct cursor *cur, struct bech32_nevent *nevent) {
-    struct nostr_tlvs tlvs;
-    struct nostr_tlv *tlv;
-    
-    if (!parse_nostr_tlvs(cur, &tlvs))
-        return 0;
-    
-    if (!find_tlv(&tlvs, TLV_SPECIAL, &tlv))
-        return 0;
-    
-    if (tlv->len != 32)
-        return 0;
-    
-    nevent->event_id = tlv->value;
-    
-    if (find_tlv(&tlvs, TLV_AUTHOR, &tlv)) {
-        nevent->pubkey = tlv->value;
-    } else {
-        nevent->pubkey = NULL;
-    }
-    
-    return tlvs_to_relays(&tlvs, &nevent->relays);
-}
-
-static int parse_nostr_bech32_naddr(struct cursor *cur, struct bech32_naddr *naddr) {
-    struct nostr_tlvs tlvs;
-    struct nostr_tlv *tlv;
-    
-    if (!parse_nostr_tlvs(cur, &tlvs))
-        return 0;
-    
-    if (!find_tlv(&tlvs, TLV_SPECIAL, &tlv))
-        return 0;
-    
-    naddr->identifier.start = (const char*)tlv->value;
-    naddr->identifier.end = (const char*)tlv->value + tlv->len;
-    
-    if (!find_tlv(&tlvs, TLV_AUTHOR, &tlv))
-        return 0;
-    
-    naddr->pubkey = tlv->value;
-    
-    return tlvs_to_relays(&tlvs, &naddr->relays);
-}
-
-static int parse_nostr_bech32_nprofile(struct cursor *cur, struct bech32_nprofile *nprofile) {
-    struct nostr_tlvs tlvs;
-    struct nostr_tlv *tlv;
-    
-    if (!parse_nostr_tlvs(cur, &tlvs))
-        return 0;
-    
-    if (!find_tlv(&tlvs, TLV_SPECIAL, &tlv))
-        return 0;
-    
-    if (tlv->len != 32)
-        return 0;
-    
-    nprofile->pubkey = tlv->value;
-    
-    return tlvs_to_relays(&tlvs, &nprofile->relays);
-}
-
-static int parse_nostr_bech32_nrelay(struct cursor *cur, struct bech32_nrelay *nrelay) {
-    struct nostr_tlvs tlvs;
-    struct nostr_tlv *tlv;
-    
-    if (!parse_nostr_tlvs(cur, &tlvs))
-        return 0;
-    
-    if (!find_tlv(&tlvs, TLV_SPECIAL, &tlv))
-        return 0;
-    
-    nrelay->relay.start = (const char*)tlv->value;
-    nrelay->relay.end = (const char*)tlv->value + tlv->len;
-    
-    return 1;
-}
-
-int parse_nostr_bech32(struct cursor *cur, struct nostr_bech32 *obj) {
-    const u8 *start, *end;
-    
-    start = cur->p;
-    
-    if (!consume_until_non_alphanumeric(cur, 1)) {
-        cur->p = start;
-        return 0;
-    }
-    
-    end = cur->p;
-    
-    size_t data_len;
-    size_t input_len = end - start;
-    if (input_len < 10 || input_len > 10000) {
-        return 0;
-    }
-    
-    obj->buffer = malloc(input_len * 2);
-    if (!obj->buffer)
-        return 0;
-    
-    u8 data[input_len];
-    char prefix[input_len];
-    
-    if (bech32_decode_len(prefix, data, &data_len, (const char*)start, input_len) == BECH32_ENCODING_NONE) {
-        cur->p = start;
-        return 0;
-    }
-    
-    obj->buflen = 0;
-    if (!bech32_convert_bits(obj->buffer, &obj->buflen, 8, data, data_len, 5, 0)) {
-        goto fail;
-    }
-    
-    if (!parse_nostr_bech32_type(prefix, &obj->type)) {
-        goto fail;
-    }
-    
-    struct cursor bcur;
-    make_cursor(&bcur, obj->buffer, obj->buflen);
-    
-    switch (obj->type) {
-        case NOSTR_BECH32_NOTE:
-            if (!parse_nostr_bech32_note(&bcur, &obj->data.note))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NPUB:
-            if (!parse_nostr_bech32_npub(&bcur, &obj->data.npub))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NEVENT:
-            if (!parse_nostr_bech32_nevent(&bcur, &obj->data.nevent))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NADDR:
-            if (!parse_nostr_bech32_naddr(&bcur, &obj->data.naddr))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NPROFILE:
-            if (!parse_nostr_bech32_nprofile(&bcur, &obj->data.nprofile))
-                goto fail;
-            break;
-        case NOSTR_BECH32_NRELAY:
-            if (!parse_nostr_bech32_nrelay(&bcur, &obj->data.nrelay))
-                goto fail;
-            break;
-    }
-    
-    return 1;
-
-fail:
-    free(obj->buffer);
-    cur->p = start;
-    return 0;
-}

damus-c/nostr_bech32.h

@@ -1,78 +0,0 @@
-//
-//  nostr_bech32.h
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#ifndef nostr_bech32_h
-#define nostr_bech32_h
-
-#include <stdio.h>
-#include "str_block.h"
-#include "cursor.h"
-typedef unsigned char u8;
-#define MAX_RELAYS 10
-
-struct relays {
-    struct str_block relays[MAX_RELAYS];
-    int num_relays;
-};
-
-enum nostr_bech32_type {
-    NOSTR_BECH32_NOTE = 1,
-    NOSTR_BECH32_NPUB = 2,
-    NOSTR_BECH32_NPROFILE = 3,
-    NOSTR_BECH32_NEVENT = 4,
-    NOSTR_BECH32_NRELAY = 5,
-    NOSTR_BECH32_NADDR = 6,
-};
-
-struct bech32_note {
-    const u8 *event_id;
-};
-
-struct bech32_npub {
-    const u8 *pubkey;
-};
-
-struct bech32_nevent {
-    struct relays relays;
-    const u8 *event_id;
-    const u8 *pubkey; // optional
-};
-
-struct bech32_nprofile {
-    struct relays relays;
-    const u8 *pubkey;
-};
-
-struct bech32_naddr {
-    struct relays relays;
-    struct str_block identifier;
-    const u8 *pubkey;
-};
-
-struct bech32_nrelay {
-    struct str_block relay;
-};
-
-typedef struct nostr_bech32 {
-    enum nostr_bech32_type type;
-    u8 *buffer; // holds strings and tlv stuff
-    size_t buflen;
-    
-    union {
-        struct bech32_note note;
-        struct bech32_npub npub;
-        struct bech32_nevent nevent;
-        struct bech32_nprofile nprofile;
-        struct bech32_naddr naddr;
-        struct bech32_nrelay nrelay;
-    } data;
-} nostr_bech32_t;
-
-
-int parse_nostr_bech32(struct cursor *cur, struct nostr_bech32 *obj);
-
-#endif /* nostr_bech32_h */

damus-c/str_block.h

@@ -1,16 +0,0 @@
-//
-//  str_block.h
-//  damus
-//
-//  Created by William Casarin on 2023-04-09.
-//
-
-#ifndef str_block_h
-#define str_block_h
-
-typedef struct str_block {
-    const char *start;
-    const char *end;
-} str_block_t;
-
-#endif /* str_block_h */

damus.xcodeproj/project.pbxproj

@@ -17,7 +17,6 @@
 		3A3040F329A91366008A0F29 /* ProfileViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040F229A91366008A0F29 /* ProfileViewTests.swift */; };
 		3A30410129AB12AA008A0F29 /* EventGroupViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A30410029AB12AA008A0F29 /* EventGroupViewTests.swift */; };
 		3A4325A82961E11400BFCD9D /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 3A4325AA2961E11400BFCD9D /* Localizable.stringsdict */; };
-		3A48E7B029DFBE9D006E787E /* MutedThreadsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A48E7AF29DFBE9D006E787E /* MutedThreadsManager.swift */; };
 		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 */; };
@@ -38,13 +37,6 @@
 		4C0A3F8F280F640A000448DE /* ThreadModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F8E280F640A000448DE /* ThreadModel.swift */; };
 		4C0A3F91280F6528000448DE /* ChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F90280F6528000448DE /* ChatView.swift */; };
 		4C0A3F93280F66F5000448DE /* ReplyMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F92280F66F5000448DE /* ReplyMap.swift */; };
-		4C1A9A1A29DCA17E00516EAC /* ReplyCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1A9A1929DCA17E00516EAC /* ReplyCounter.swift */; };
-		4C1A9A1D29DDCF9B00516EAC /* NotificationSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1A9A1C29DDCF9B00516EAC /* NotificationSettingsView.swift */; };
-		4C1A9A1F29DDD24B00516EAC /* AppearanceSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1A9A1E29DDD24B00516EAC /* AppearanceSettingsView.swift */; };
-		4C1A9A2129DDD3E100516EAC /* KeySettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1A9A2029DDD3E100516EAC /* KeySettingsView.swift */; };
-		4C1A9A2329DDDB8100516EAC /* IconLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1A9A2229DDDB8100516EAC /* IconLabel.swift */; };
-		4C1A9A2529DDDF2600516EAC /* ZapSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1A9A2429DDDF2600516EAC /* ZapSettingsView.swift */; };
-		4C1A9A2729DDE31900516EAC /* TranslationSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1A9A2629DDE31900516EAC /* TranslationSettingsView.swift */; };
 		4C216F32286E388800040376 /* DMChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C216F31286E388800040376 /* DMChatView.swift */; };
 		4C216F34286F5ACD00040376 /* DMView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C216F33286F5ACD00040376 /* DMView.swift */; };
 		4C216F362870A9A700040376 /* InputDismissKeyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C216F352870A9A700040376 /* InputDismissKeyboard.swift */; };
@@ -137,20 +129,12 @@
 		4C75EFBB2804A34C0006080F /* ProofOfWork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C75EFBA2804A34C0006080F /* ProofOfWork.swift */; };
 		4C7FF7D52823313F009601DB /* Mentions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C7FF7D42823313F009601DB /* Mentions.swift */; };
 		4C8682872814DE470026224F /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8682862814DE470026224F /* ProfileView.swift */; };
-		4C8D00C829DF791C0036AF10 /* CompatibleAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8D00C729DF791C0036AF10 /* CompatibleAttribute.swift */; };
-		4C8D00CA29DF80350036AF10 /* TruncatedText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8D00C929DF80350036AF10 /* TruncatedText.swift */; };
-		4C8D00CC29DF92DF0036AF10 /* Hashtags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8D00CB29DF92DF0036AF10 /* Hashtags.swift */; };
-		4C8D00CF29E38B950036AF10 /* nostr_bech32.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C8D00CE29E38B950036AF10 /* nostr_bech32.c */; };
-		4C8D00D429E3C5D40036AF10 /* NIP19Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8D00D329E3C5D40036AF10 /* NIP19Tests.swift */; };
-		4C8EC52529D1FA6C0085D9A8 /* DamusColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8EC52429D1FA6C0085D9A8 /* DamusColors.swift */; };
 		4C90BD162839DB54008EE7EF /* NostrMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C90BD152839DB54008EE7EF /* NostrMetadata.swift */; };
 		4C90BD18283A9EE5008EE7EF /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C90BD17283A9EE5008EE7EF /* LoginView.swift */; };
 		4C90BD1A283AA67F008EE7EF /* Bech32.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C90BD19283AA67F008EE7EF /* Bech32.swift */; };
 		4C90BD1C283AC38E008EE7EF /* Bech32Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C90BD1B283AC38E008EE7EF /* Bech32Tests.swift */; };
 		4C987B57283FD07F0042CE38 /* FollowersModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C987B56283FD07F0042CE38 /* FollowersModel.swift */; };
 		4C99737B28C92A9200E53835 /* ChatroomMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C99737A28C92A9200E53835 /* ChatroomMetadata.swift */; };
-		4C9BB83129C0ED4F00FC4E37 /* DisplayName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9BB83029C0ED4F00FC4E37 /* DisplayName.swift */; };
-		4C9BB83429C12D9900FC4E37 /* EventProfileName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9BB83329C12D9900FC4E37 /* EventProfileName.swift */; };
 		4C9F18E229AA9B6C008C55EC /* CustomizeZapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9F18E129AA9B6C008C55EC /* CustomizeZapView.swift */; };
 		4C9F18E429ABDE6D008C55EC /* MaybeAnonPfpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9F18E329ABDE6D008C55EC /* MaybeAnonPfpView.swift */; };
 		4CA2EFA0280E37AC0044ACD8 /* TimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */; };
@@ -177,7 +161,6 @@
 		4CB9D4A72992D02B00A9A7E4 /* ProfileNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB9D4A62992D02B00A9A7E4 /* ProfileNameView.swift */; };
 		4CB9D4A92992D2F400A9A7E4 /* FollowsYou.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB9D4A82992D2F400A9A7E4 /* FollowsYou.swift */; };
 		4CBCA930297DB57F00EC6B2F /* WebsiteLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */; };
-		4CC6193A29DC777C006A86D1 /* RelayBootstrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6193929DC777C006A86D1 /* RelayBootstrap.swift */; };
 		4CC7AAE7297EFA7B00430951 /* Zap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAE6297EFA7B00430951 /* Zap.swift */; };
 		4CC7AAEB297F0AEC00430951 /* BuilderEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAEA297F0AEC00430951 /* BuilderEventView.swift */; };
 		4CC7AAED297F0B9E00430951 /* Highlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAEC297F0B9E00430951 /* Highlight.swift */; };
@@ -187,19 +170,10 @@
 		4CC7AAF6297F1A6A00430951 /* EventBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF5297F1A6A00430951 /* EventBody.swift */; };
 		4CC7AAF8297F1CEE00430951 /* EventProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF7297F1CEE00430951 /* EventProfile.swift */; };
 		4CC7AAFA297F64AC00430951 /* EventMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAF9297F64AC00430951 /* EventMenu.swift */; };
-		4CCEB7A929B29DD50078AA28 /* SearchResultsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CCEB7A829B29DD50078AA28 /* SearchResultsModel.swift */; };
-		4CCEB7AE29B53D260078AA28 /* SearchingEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CCEB7AD29B53D260078AA28 /* SearchingEventView.swift */; };
-		4CCEB7B029B5415A0078AA28 /* SearchingProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CCEB7AF29B5415A0078AA28 /* SearchingProfileView.swift */; };
-		4CD348EF29C3659D00497EB2 /* ImageUploadModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD348EE29C3659D00497EB2 /* ImageUploadModel.swift */; };
 		4CD7641B28A1641400B6928F /* EndBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD7641A28A1641400B6928F /* EndBlock.swift */; };
-		4CDA128A29E9D10C0006FA5A /* SignalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CDA128929E9D10C0006FA5A /* SignalView.swift */; };
-		4CDA128C29EB19C40006FA5A /* LocalNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CDA128B29EB19C40006FA5A /* LocalNotification.swift */; };
 		4CE0E2AF29A2E82100DB4CA2 /* EventHolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE0E2AE29A2E82100DB4CA2 /* EventHolder.swift */; };
 		4CE0E2B229A3DF6900DB4CA2 /* LoadMoreButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE0E2B129A3DF6900DB4CA2 /* LoadMoreButton.swift */; };
 		4CE0E2B629A3ED5500DB4CA2 /* InnerTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE0E2B529A3ED5500DB4CA2 /* InnerTimelineView.swift */; };
-		4CE4F0F229D4FCFA005914DB /* DebouncedOnChange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F0F129D4FCFA005914DB /* DebouncedOnChange.swift */; };
-		4CE4F0F429D779B5005914DB /* PostBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F0F329D779B5005914DB /* PostBox.swift */; };
-		4CE4F0F829DB7399005914DB /* ThiccDivider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F0F729DB7399005914DB /* ThiccDivider.swift */; };
 		4CE4F8CD281352B30009DFBB /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F8CC281352B30009DFBB /* Notifications.swift */; };
 		4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */; };
 		4CE4F9E1285287B800C00DD9 /* TextFieldAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F9E0285287B800C00DD9 /* TextFieldAlert.swift */; };
@@ -242,41 +216,30 @@
 		4CF0ABEE29844B5500D66079 /* AnyEncodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABED29844B5500D66079 /* AnyEncodable.swift */; };
 		4CF0ABF029857E9200D66079 /* Bech32Object.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABEF29857E9200D66079 /* Bech32Object.swift */; };
 		4CF0ABF62985CD5500D66079 /* UserSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF0ABF52985CD5500D66079 /* UserSearch.swift */; };
-		4CFF8F6329CC9AD7008DB934 /* ImageContextMenuModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF8F6229CC9AD7008DB934 /* ImageContextMenuModifier.swift */; };
-		4CFF8F6729CC9E3A008DB934 /* ImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF8F6629CC9E3A008DB934 /* ImageView.swift */; };
-		4CFF8F6929CC9ED1008DB934 /* ImageContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF8F6829CC9ED1008DB934 /* ImageContainerView.swift */; };
-		4CFF8F6B29CD0079008DB934 /* RepostedEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF8F6A29CD0079008DB934 /* RepostedEvent.swift */; };
-		4CFF8F6D29CD022E008DB934 /* WideEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF8F6C29CD022E008DB934 /* WideEventView.swift */; };
 		4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FE60CDC295E1C5E00105A1F /* Wallet.swift */; };
 		50A50A8D29A09E1C00C01BE7 /* RequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A50A8C29A09E1C00C01BE7 /* RequestTests.swift */; };
-		5C42E78C29DB76D90086AAC1 /* EmptyUserSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C42E78B29DB76D90086AAC1 /* EmptyUserSearchView.swift */; };
 		5C513FBA297F72980072348F /* CustomPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FB9297F72980072348F /* CustomPicker.swift */; };
 		5C513FCC2984ACA60072348F /* QRCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FCB2984ACA60072348F /* QRCodeView.swift */; };
-		5CF72FC229B9142F00124A13 /* ShareAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF72FC129B9142F00124A13 /* ShareAction.swift */; };
+		6439E014296790CF0020672B /* ProfileZoomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6439E013296790CF0020672B /* ProfileZoomView.swift */; };
-		6439E014296790CF0020672B /* ProfilePicImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6439E013296790CF0020672B /* ProfilePicImageView.swift */; };
 		643EA5C8296B764E005081BB /* RelayFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 643EA5C7296B764E005081BB /* RelayFilterView.swift */; };
 		647D9A8D2968520300A295DE /* SideMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647D9A8C2968520300A295DE /* SideMenuView.swift */; };
 		64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64FBD06E296255C400D9D3B2 /* Theme.swift */; };
 		6C7DE41F2955169800E66263 /* Vault in Frameworks */ = {isa = PBXBuildFile; productRef = 6C7DE41E2955169800E66263 /* Vault */; };
-		7C0F392F29B57CAF0039859C /* Binding+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C0F392E29B57CAF0039859C /* Binding+.swift */; };
 		7C60CAEF298471A1009C80D6 /* CoreSVG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C60CAEE298471A1009C80D6 /* CoreSVG.swift */; };
 		7C902AE32981D55B002AB16E /* ZoomableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */; };
 		7C95CAEE299DCEF1009DCB67 /* KFOptionSetter+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */; };
 		7CFF6317299FEFE5005D382A /* SelectableText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CFF6316299FEFE5005D382A /* SelectableText.swift */; };
 		9609F058296E220800069BF3 /* BannerImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9609F057296E220800069BF3 /* BannerImageView.swift */; };
 		9C83F89329A937B900136C08 /* TextViewWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C83F89229A937B900136C08 /* TextViewWrapper.swift */; };
-		9CA876E229A00CEA0003B9A3 /* AttachMediaUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CA876E129A00CE90003B9A3 /* AttachMediaUtility.swift */; };
 		BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA693073295D649800ADDB87 /* UserSettingsStore.swift */; };
 		BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */; };
 		DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */; };
 		E990020F2955F837003BBC5A /* EditMetadataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E990020E2955F837003BBC5A /* EditMetadataView.swift */; };
-		E9E4ED0B295867B900DD7078 /* ThreadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E4ED0A295867B900DD7078 /* ThreadView.swift */; };
+		E9E4ED0B295867B900DD7078 /* ThreadV2View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */; };
-		F757933A29D7AECD007DEAC1 /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = F757933929D7AECD007DEAC1 /* ImagePicker.swift */; };
 		F75BA12D29A1855400E10810 /* BookmarksManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75BA12C29A1855400E10810 /* BookmarksManager.swift */; };
 		F75BA12F29A18EF500E10810 /* BookmarksView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75BA12E29A18EF500E10810 /* BookmarksView.swift */; };
 		F7908E92298B0F0700AB113A /* RelayDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7908E91298B0F0700AB113A /* RelayDetailView.swift */; };
 		F7908E97298B1FDF00AB113A /* NIPURLBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7908E96298B1FDF00AB113A /* NIPURLBuilder.swift */; };
-		F79C7FAD29D5E9620000F946 /* EditProfilePictureControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = F79C7FAC29D5E9620000F946 /* EditProfilePictureControl.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 */
@@ -322,16 +285,12 @@
 		3A3040FE29A91F31008A0F29 /* zh-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-TW"; path = "zh-TW.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A3040FF29AB02D1008A0F29 /* en-US */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-US"; path = "en-US.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A30410029AB12AA008A0F29 /* EventGroupViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventGroupViewTests.swift; sourceTree = "<group>"; };
-		3A325AC429C9E0B8002BE7ED /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
-		3A325AC529C9E0B8002BE7ED /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		3A325AC629C9E0B8002BE7ED /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = vi; path = vi.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		3A325AC729C9E0CF002BE7ED /* es-ES */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-ES"; path = "es-ES.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		3A325AC829C9E0CF002BE7ED /* es-ES */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-ES"; path = "es-ES.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		3A325AC929C9E0CF002BE7ED /* es-ES */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "es-ES"; path = "es-ES.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A41E559299D52BE001FA465 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3A41E55A299D52BE001FA465 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3A41E55B299D52BE001FA465 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = id; path = id.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		3A48E7AF29DFBE9D006E787E /* MutedThreadsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutedThreadsManager.swift; 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>"; };
 		3A5CAE1D298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-CN"; path = "zh-CN.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A5CAE1E298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-CN"; path = "zh-CN.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -339,9 +298,6 @@
 		3A66D927299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3A66D928299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3A66D929299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ja; path = ja.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		3A821C3E29E819D500B4BCA7 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
-		3A821C3F29E819D500B4BCA7 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		3A821C4029E819D500B4BCA7 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = fr; path = fr.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		3A827A18299FC69D00C4D171 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3A827A19299FC69D00C4D171 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3A827A1A299FC69D00C4D171 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ru; path = ru.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
@@ -361,12 +317,6 @@
 		3AA247FE297E3D900090C62D /* RepostsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostsView.swift; sourceTree = "<group>"; };
 		3AA24801297E3DC20090C62D /* RepostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostView.swift; sourceTree = "<group>"; };
 		3AA59D1C2999B0400061C48E /* DraftsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraftsModel.swift; sourceTree = "<group>"; };
-		3AA5E70229B682A5002701ED /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
-		3AA5E70329B682AD002701ED /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		3AA5E70429B682B3002701ED /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = uk; path = uk.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		3AA5E70529B9E83E002701ED /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		3AA5E70629B9E844002701ED /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = "<group>"; };
-		3AA5E70729B9E84A002701ED /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = bg; path = bg.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		3AAA95C9298DF87B00F3D526 /* TranslationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslationService.swift; sourceTree = "<group>"; };
 		3AAA95CB298E07E900F3D526 /* DeepLPlan.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeepLPlan.swift; sourceTree = "<group>"; };
 		3AB5B86A2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -376,24 +326,9 @@
 		3AC524EE298C000B00693EBF /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3AC524EF298C000B00693EBF /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3AC524F0298C000B00693EBF /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ar; path = ar.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		3AC59CA729CDDB78007E04A6 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		3AC59CA829CDDB78007E04A6 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		3AC59CA929CDDB78007E04A6 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "pt-BR"; path = "pt-BR.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>"; };
-		3AD14EB529C40F38009D2D9C /* hu-HU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "hu-HU"; path = "hu-HU.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
-		3AD14EB629C40F38009D2D9C /* hu-HU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hu-HU"; path = "hu-HU.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		3AD14EB729C40F38009D2D9C /* hu-HU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "hu-HU"; path = "hu-HU.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		3AD14EB829C40F3F009D2D9C /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "sv-SE"; path = "sv-SE.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
-		3AD14EB929C40F3F009D2D9C /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sv-SE"; path = "sv-SE.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		3AD14EBA29C40F3F009D2D9C /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sv-SE"; path = "sv-SE.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		3AD5662B29BD2F5300BF77C5 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		3AD5662C29BD2F5300BF77C5 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = fa; path = fa.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		3AD5662D29BD2F5300BF77C5 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/Localizable.strings; sourceTree = "<group>"; };
-		3AD5663129C0DA4B00BF77C5 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = "<group>"; };
-		3AD5663229C0DA4B00BF77C5 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ko; path = ko.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		3AD5663329C0DA4B00BF77C5 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibreTranslateServer.swift; sourceTree = "<group>"; };
 		3AEB8003297CCEA800713A25 /* tr-TR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "tr-TR"; path = "tr-TR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3AEB8004297CCEA800713A25 /* tr-TR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "tr-TR"; path = "tr-TR.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -412,13 +347,6 @@
 		4C0A3F8E280F640A000448DE /* ThreadModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadModel.swift; sourceTree = "<group>"; };
 		4C0A3F90280F6528000448DE /* ChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatView.swift; sourceTree = "<group>"; };
 		4C0A3F92280F66F5000448DE /* ReplyMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyMap.swift; sourceTree = "<group>"; };
-		4C1A9A1929DCA17E00516EAC /* ReplyCounter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyCounter.swift; sourceTree = "<group>"; };
-		4C1A9A1C29DDCF9B00516EAC /* NotificationSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSettingsView.swift; sourceTree = "<group>"; };
-		4C1A9A1E29DDD24B00516EAC /* AppearanceSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearanceSettingsView.swift; sourceTree = "<group>"; };
-		4C1A9A2029DDD3E100516EAC /* KeySettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeySettingsView.swift; sourceTree = "<group>"; };
-		4C1A9A2229DDDB8100516EAC /* IconLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconLabel.swift; sourceTree = "<group>"; };
-		4C1A9A2429DDDF2600516EAC /* ZapSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapSettingsView.swift; sourceTree = "<group>"; };
-		4C1A9A2629DDE31900516EAC /* TranslationSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslationSettingsView.swift; sourceTree = "<group>"; };
 		4C216F31286E388800040376 /* DMChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DMChatView.swift; sourceTree = "<group>"; };
 		4C216F33286F5ACD00040376 /* DMView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DMView.swift; sourceTree = "<group>"; };
 		4C216F352870A9A700040376 /* InputDismissKeyboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputDismissKeyboard.swift; sourceTree = "<group>"; };
@@ -541,24 +469,12 @@
 		4C75EFBA2804A34C0006080F /* ProofOfWork.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProofOfWork.swift; sourceTree = "<group>"; };
 		4C7FF7D42823313F009601DB /* Mentions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mentions.swift; sourceTree = "<group>"; };
 		4C8682862814DE470026224F /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = "<group>"; };
-		4C8D00C729DF791C0036AF10 /* CompatibleAttribute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompatibleAttribute.swift; sourceTree = "<group>"; };
-		4C8D00C929DF80350036AF10 /* TruncatedText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TruncatedText.swift; sourceTree = "<group>"; };
-		4C8D00CB29DF92DF0036AF10 /* Hashtags.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Hashtags.swift; sourceTree = "<group>"; };
-		4C8D00CD29E38B950036AF10 /* nostr_bech32.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = nostr_bech32.h; sourceTree = "<group>"; };
-		4C8D00CE29E38B950036AF10 /* nostr_bech32.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = nostr_bech32.c; sourceTree = "<group>"; };
-		4C8D00D029E38E4C0036AF10 /* cursor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cursor.h; sourceTree = "<group>"; };
-		4C8D00D129E397AD0036AF10 /* block.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = block.h; sourceTree = "<group>"; };
-		4C8D00D229E3C19F0036AF10 /* str_block.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = str_block.h; sourceTree = "<group>"; };
-		4C8D00D329E3C5D40036AF10 /* NIP19Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIP19Tests.swift; sourceTree = "<group>"; };
-		4C8EC52429D1FA6C0085D9A8 /* DamusColors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusColors.swift; sourceTree = "<group>"; };
 		4C90BD152839DB54008EE7EF /* NostrMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NostrMetadata.swift; sourceTree = "<group>"; };
 		4C90BD17283A9EE5008EE7EF /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = "<group>"; };
 		4C90BD19283AA67F008EE7EF /* Bech32.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bech32.swift; sourceTree = "<group>"; };
 		4C90BD1B283AC38E008EE7EF /* Bech32Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bech32Tests.swift; sourceTree = "<group>"; };
 		4C987B56283FD07F0042CE38 /* FollowersModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowersModel.swift; sourceTree = "<group>"; };
 		4C99737A28C92A9200E53835 /* ChatroomMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatroomMetadata.swift; sourceTree = "<group>"; };
-		4C9BB83029C0ED4F00FC4E37 /* DisplayName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayName.swift; sourceTree = "<group>"; };
-		4C9BB83329C12D9900FC4E37 /* EventProfileName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventProfileName.swift; sourceTree = "<group>"; };
 		4C9F18E129AA9B6C008C55EC /* CustomizeZapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomizeZapView.swift; sourceTree = "<group>"; };
 		4C9F18E329ABDE6D008C55EC /* MaybeAnonPfpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MaybeAnonPfpView.swift; sourceTree = "<group>"; };
 		4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineView.swift; sourceTree = "<group>"; };
@@ -585,7 +501,6 @@
 		4CB9D4A62992D02B00A9A7E4 /* ProfileNameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileNameView.swift; sourceTree = "<group>"; };
 		4CB9D4A82992D2F400A9A7E4 /* FollowsYou.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowsYou.swift; sourceTree = "<group>"; };
 		4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebsiteLink.swift; sourceTree = "<group>"; };
-		4CC6193929DC777C006A86D1 /* RelayBootstrap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayBootstrap.swift; sourceTree = "<group>"; };
 		4CC7AAE6297EFA7B00430951 /* Zap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Zap.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>"; };
@@ -595,19 +510,10 @@
 		4CC7AAF5297F1A6A00430951 /* EventBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventBody.swift; sourceTree = "<group>"; };
 		4CC7AAF7297F1CEE00430951 /* EventProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventProfile.swift; sourceTree = "<group>"; };
 		4CC7AAF9297F64AC00430951 /* EventMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventMenu.swift; sourceTree = "<group>"; };
-		4CCEB7A829B29DD50078AA28 /* SearchResultsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultsModel.swift; sourceTree = "<group>"; };
-		4CCEB7AD29B53D260078AA28 /* SearchingEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchingEventView.swift; sourceTree = "<group>"; };
-		4CCEB7AF29B5415A0078AA28 /* SearchingProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchingProfileView.swift; sourceTree = "<group>"; };
-		4CD348EE29C3659D00497EB2 /* ImageUploadModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageUploadModel.swift; sourceTree = "<group>"; };
 		4CD7641A28A1641400B6928F /* EndBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndBlock.swift; sourceTree = "<group>"; };
-		4CDA128929E9D10C0006FA5A /* SignalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignalView.swift; sourceTree = "<group>"; };
-		4CDA128B29EB19C40006FA5A /* LocalNotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalNotification.swift; sourceTree = "<group>"; };
 		4CE0E2AE29A2E82100DB4CA2 /* EventHolder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventHolder.swift; sourceTree = "<group>"; };
 		4CE0E2B129A3DF6900DB4CA2 /* LoadMoreButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadMoreButton.swift; sourceTree = "<group>"; };
 		4CE0E2B529A3ED5500DB4CA2 /* InnerTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InnerTimelineView.swift; sourceTree = "<group>"; };
-		4CE4F0F129D4FCFA005914DB /* DebouncedOnChange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebouncedOnChange.swift; sourceTree = "<group>"; };
-		4CE4F0F329D779B5005914DB /* PostBox.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PostBox.swift; sourceTree = "<group>"; };
-		4CE4F0F729DB7399005914DB /* ThiccDivider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThiccDivider.swift; sourceTree = "<group>"; };
 		4CE4F8CC281352B30009DFBB /* Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = "<group>"; };
 		4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigView.swift; sourceTree = "<group>"; };
 		4CE4F9E0285287B800C00DD9 /* TextFieldAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldAlert.swift; sourceTree = "<group>"; };
@@ -653,40 +559,29 @@
 		4CF0ABED29844B5500D66079 /* AnyEncodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyEncodable.swift; sourceTree = "<group>"; };
 		4CF0ABEF29857E9200D66079 /* Bech32Object.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bech32Object.swift; sourceTree = "<group>"; };
 		4CF0ABF52985CD5500D66079 /* UserSearch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSearch.swift; sourceTree = "<group>"; };
-		4CFF8F6229CC9AD7008DB934 /* ImageContextMenuModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageContextMenuModifier.swift; sourceTree = "<group>"; };
-		4CFF8F6629CC9E3A008DB934 /* ImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageView.swift; sourceTree = "<group>"; };
-		4CFF8F6829CC9ED1008DB934 /* ImageContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageContainerView.swift; sourceTree = "<group>"; };
-		4CFF8F6A29CD0079008DB934 /* RepostedEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostedEvent.swift; sourceTree = "<group>"; };
-		4CFF8F6C29CD022E008DB934 /* WideEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WideEventView.swift; sourceTree = "<group>"; };
 		4FE60CDC295E1C5E00105A1F /* Wallet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Wallet.swift; sourceTree = "<group>"; };
 		50A50A8C29A09E1C00C01BE7 /* RequestTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestTests.swift; sourceTree = "<group>"; };
-		5C42E78B29DB76D90086AAC1 /* EmptyUserSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyUserSearchView.swift; sourceTree = "<group>"; };
 		5C513FB9297F72980072348F /* CustomPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomPicker.swift; sourceTree = "<group>"; };
 		5C513FCB2984ACA60072348F /* QRCodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeView.swift; sourceTree = "<group>"; };
-		5CF72FC129B9142F00124A13 /* ShareAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareAction.swift; sourceTree = "<group>"; };
+		6439E013296790CF0020672B /* ProfileZoomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileZoomView.swift; sourceTree = "<group>"; };
-		6439E013296790CF0020672B /* ProfilePicImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfilePicImageView.swift; sourceTree = "<group>"; };
 		643EA5C7296B764E005081BB /* RelayFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayFilterView.swift; sourceTree = "<group>"; };
 		647D9A8C2968520300A295DE /* SideMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuView.swift; sourceTree = "<group>"; };
 		64FBD06E296255C400D9D3B2 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
-		7C0F392E29B57CAF0039859C /* Binding+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Binding+.swift"; sourceTree = "<group>"; };
 		7C60CAEE298471A1009C80D6 /* CoreSVG.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreSVG.swift; sourceTree = "<group>"; };
 		7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZoomableScrollView.swift; sourceTree = "<group>"; };
 		7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KFOptionSetter+.swift"; sourceTree = "<group>"; };
 		7CFF6316299FEFE5005D382A /* SelectableText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableText.swift; sourceTree = "<group>"; };
 		9609F057296E220800069BF3 /* BannerImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BannerImageView.swift; sourceTree = "<group>"; };
 		9C83F89229A937B900136C08 /* TextViewWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextViewWrapper.swift; sourceTree = "<group>"; };
-		9CA876E129A00CE90003B9A3 /* AttachMediaUtility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachMediaUtility.swift; sourceTree = "<group>"; };
 		BA693073295D649800ADDB87 /* UserSettingsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSettingsStore.swift; sourceTree = "<group>"; };
 		BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectWalletView.swift; sourceTree = "<group>"; };
 		DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkdownTests.swift; sourceTree = "<group>"; };
 		E990020E2955F837003BBC5A /* EditMetadataView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditMetadataView.swift; sourceTree = "<group>"; };
-		E9E4ED0A295867B900DD7078 /* ThreadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadView.swift; sourceTree = "<group>"; };
+		E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadV2View.swift; sourceTree = "<group>"; };
-		F757933929D7AECD007DEAC1 /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
 		F75BA12C29A1855400E10810 /* BookmarksManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksManager.swift; sourceTree = "<group>"; };
 		F75BA12E29A18EF500E10810 /* BookmarksView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksView.swift; sourceTree = "<group>"; };
 		F7908E91298B0F0700AB113A /* RelayDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayDetailView.swift; sourceTree = "<group>"; };
 		F7908E96298B1FDF00AB113A /* NIPURLBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIPURLBuilder.swift; sourceTree = "<group>"; };
-		F79C7FAC29D5E9620000F946 /* EditProfilePictureControl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditProfilePictureControl.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 */
@@ -724,7 +619,6 @@
 			isa = PBXGroup;
 			children = (
 				3169CAE5294E69C000EE4006 /* EmptyTimelineView.swift */,
-				5C42E78B29DB76D90086AAC1 /* EmptyUserSearchView.swift */,
 			);
 			path = "Empty Views";
 			sourceTree = "<group>";
@@ -733,7 +627,6 @@
 			isa = PBXGroup;
 			children = (
 				3AA24801297E3DC20090C62D /* RepostView.swift */,
-				4CFF8F6A29CD0079008DB934 /* RepostedEvent.swift */,
 			);
 			path = Reposts;
 			sourceTree = "<group>";
@@ -788,11 +681,6 @@
 				4C3EA67428FF7A5A00C48A62 /* take.c */,
 				4C3EA67628FF7A9800C48A62 /* talstr.c */,
 				4C3EA67828FF7ABF00C48A62 /* list.c */,
-				4C8D00CD29E38B950036AF10 /* nostr_bech32.h */,
-				4C8D00CE29E38B950036AF10 /* nostr_bech32.c */,
-				4C8D00D029E38E4C0036AF10 /* cursor.h */,
-				4C8D00D129E397AD0036AF10 /* block.h */,
-				4C8D00D229E3C19F0036AF10 /* str_block.h */,
 			);
 			path = "damus-c";
 			sourceTree = "<group>";
@@ -800,7 +688,6 @@
 		4C0A3F8D280F63FF000448DE /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				4CCEB7A729B29DC90078AA28 /* Search */,
 				4C54AA0829A55416003E4487 /* Notifications */,
 				3AA247FC297E3CFF0090C62D /* RepostsModel.swift */,
 				4C0A3F8E280F640A000448DE /* ThreadModel.swift */,
@@ -842,24 +729,10 @@
 				4CE8795A2996C47A00F758CC /* ZapsModel.swift */,
 				3AA59D1C2999B0400061C48E /* DraftsModel.swift */,
 				4C54AA0629A540BA003E4487 /* NotificationsModel.swift */,
-				4CD348EE29C3659D00497EB2 /* ImageUploadModel.swift */,
-				3A48E7AF29DFBE9D006E787E /* MutedThreadsManager.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
 		};
-		4C1A9A1B29DDCF8B00516EAC /* Settings */ = {
-			isa = PBXGroup;
-			children = (
-				4C1A9A1C29DDCF9B00516EAC /* NotificationSettingsView.swift */,
-				4C1A9A1E29DDD24B00516EAC /* AppearanceSettingsView.swift */,
-				4C1A9A2029DDD3E100516EAC /* KeySettingsView.swift */,
-				4C1A9A2429DDDF2600516EAC /* ZapSettingsView.swift */,
-				4C1A9A2629DDE31900516EAC /* TranslationSettingsView.swift */,
-			);
-			path = Settings;
-			sourceTree = "<group>";
-		};
 		4C30AC7029A5676F00E2BD5A /* Notifications */ = {
 			isa = PBXGroup;
 			children = (
@@ -883,9 +756,6 @@
 		4C75EFA227FA576C0006080F /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				4C1A9A1B29DDCF8B00516EAC /* Settings */,
-				4CFF8F6129CC9A80008DB934 /* Images */,
-				4CCEB7AC29B53D180078AA28 /* Search */,
 				4C30AC7029A5676F00E2BD5A /* Notifications */,
 				4CE0E2B029A3DF4700DB4CA2 /* Timeline */,
 				4CE879562996C44A00F758CC /* Zaps */,
@@ -919,10 +789,12 @@
 				4C363A8D28236FE4006E126D /* NoteContentView.swift */,
 				4C75EFAC28049CFB0006080F /* PostButton.swift */,
 				4C75EFA327FA577B0006080F /* PostView.swift */,
-				9CA876E129A00CE90003B9A3 /* AttachMediaUtility.swift */,
-				F757933929D7AECD007DEAC1 /* ImagePicker.swift */,
 				9C83F89229A937B900136C08 /* TextViewWrapper.swift */,
 				4CEE2AF8280B2EAC00AB5EEF /* PowView.swift */,
+				4CEE2AF6280B2DEA00AB5EEF /* ProfileName.swift */,
+				4C285C892838B985008A31F1 /* ProfilePictureSelector.swift */,
+				4CEE2AF2280B25C500AB5EEF /* ProfilePicView.swift */,
+				4C8682862814DE470026224F /* ProfileView.swift */,
 				4C3AC7A42836987600E1F516 /* MainTabView.swift */,
 				4C363A8B28236B92006E126D /* PubkeyView.swift */,
 				4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */,
@@ -933,12 +805,13 @@
 				4C363AA128296A7E006E126D /* SearchView.swift */,
 				BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */,
 				4C3AC7A02835A81400E1F516 /* SetupView.swift */,
-				E9E4ED0A295867B900DD7078 /* ThreadView.swift */,
+				E9E4ED0A295867B900DD7078 /* ThreadV2View.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 */,
@@ -971,8 +844,6 @@
 		4C7FF7D628233637009601DB /* Util */ = {
 			isa = PBXGroup;
 			children = (
-				4CE4F0F329D779B5005914DB /* PostBox.swift */,
-				7C0F392D29B57C8F0039859C /* Extensions */,
 				4CE879492995B58700F758CC /* Relays */,
 				4CF0ABEA29844B2F00D66079 /* AnyCodable */,
 				4CC7AAE6297EFA7B00430951 /* Zap.swift */,
@@ -1000,15 +871,10 @@
 				4CB883B5297730E400DC99E7 /* LNUrls.swift */,
 				3AB72AB8298ECF30004BB58C /* Translator.swift */,
 				4C2CDDF6299D4A5E00879FD5 /* Debouncer.swift */,
+				7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */,
 				4CE0E2AE29A2E82100DB4CA2 /* EventHolder.swift */,
 				3A3040F029A8FF97008A0F29 /* LocalizationUtil.swift */,
 				4C30AC7729A577AB00E2BD5A /* EventCache.swift */,
-				4C9BB83029C0ED4F00FC4E37 /* DisplayName.swift */,
-				4CE4F0F129D4FCFA005914DB /* DebouncedOnChange.swift */,
-				4C1A9A1929DCA17E00516EAC /* ReplyCounter.swift */,
-				4C8D00C729DF791C0036AF10 /* CompatibleAttribute.swift */,
-				4C8D00CB29DF92DF0036AF10 /* Hashtags.swift */,
-				4CDA128B29EB19C40006FA5A /* LocalNotification.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -1024,7 +890,6 @@
 				4CE8794D2996B16A00F758CC /* RelayToggle.swift */,
 				4CE8794F2996B2BD00F758CC /* RelayStatus.swift */,
 				4CE879512996B68900F758CC /* RelayType.swift */,
-				4CDA128929E9D10C0006FA5A /* SignalView.swift */,
 			);
 			path = Relays;
 			sourceTree = "<group>";
@@ -1034,7 +899,6 @@
 			children = (
 				4CEE2B01280B39E800AB5EEF /* EventActionBar.swift */,
 				4CB88388296AF99A00DC99E7 /* EventDetailBar.swift */,
-				5CF72FC129B9142F00124A13 /* ShareAction.swift */,
 			);
 			path = ActionBar;
 			sourceTree = "<group>";
@@ -1050,15 +914,9 @@
 		4CB9D4A52992D01900A9A7E4 /* Profile */ = {
 			isa = PBXGroup;
 			children = (
-				4CEE2AF6280B2DEA00AB5EEF /* ProfileName.swift */,
-				4C285C892838B985008A31F1 /* ProfilePictureSelector.swift */,
-				F79C7FAC29D5E9620000F946 /* EditProfilePictureControl.swift */,
-				4CEE2AF2280B25C500AB5EEF /* ProfilePicView.swift */,
-				4C8682862814DE470026224F /* ProfileView.swift */,
 				4CB9D4A62992D02B00A9A7E4 /* ProfileNameView.swift */,
 				4CB9D4A82992D2F400A9A7E4 /* FollowsYou.swift */,
 				4C9F18E329ABDE6D008C55EC /* MaybeAnonPfpView.swift */,
-				4C9BB83329C12D9900FC4E37 /* EventProfileName.swift */,
 			);
 			path = Profile;
 			sourceTree = "<group>";
@@ -1076,28 +934,10 @@
 				4CF0ABE6298444FC00D66079 /* MutedEventView.swift */,
 				4C3D52B5298DB4E6001C5831 /* ZapEvent.swift */,
 				4C3D52B7298DB5C6001C5831 /* TextEvent.swift */,
-				4CFF8F6C29CD022E008DB934 /* WideEventView.swift */,
 			);
 			path = Events;
 			sourceTree = "<group>";
 		};
-		4CCEB7A729B29DC90078AA28 /* Search */ = {
-			isa = PBXGroup;
-			children = (
-				4CCEB7A829B29DD50078AA28 /* SearchResultsModel.swift */,
-			);
-			path = Search;
-			sourceTree = "<group>";
-		};
-		4CCEB7AC29B53D180078AA28 /* Search */ = {
-			isa = PBXGroup;
-			children = (
-				4CCEB7AD29B53D260078AA28 /* SearchingEventView.swift */,
-				4CCEB7AF29B5415A0078AA28 /* SearchingProfileView.swift */,
-			);
-			path = Search;
-			sourceTree = "<group>";
-		};
 		4CE0E2B029A3DF4700DB4CA2 /* Timeline */ = {
 			isa = PBXGroup;
 			children = (
@@ -1126,10 +966,6 @@
 				4CB883AF297705DD00DC99E7 /* ZapButton.swift */,
 				4C42812B298C848200DBF26F /* TranslateView.swift */,
 				7CFF6316299FEFE5005D382A /* SelectableText.swift */,
-				4C8EC52429D1FA6C0085D9A8 /* DamusColors.swift */,
-				4CE4F0F729DB7399005914DB /* ThiccDivider.swift */,
-				4C1A9A2229DDDB8100516EAC /* IconLabel.swift */,
-				4C8D00C929DF80350036AF10 /* TruncatedText.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -1205,7 +1041,6 @@
 				3A3040EE29A8FEE9008A0F29 /* EventDetailBarTests.swift */,
 				3A3040F229A91366008A0F29 /* ProfileViewTests.swift */,
 				3A30410029AB12AA008A0F29 /* EventGroupViewTests.swift */,
-				4C8D00D329E3C5D40036AF10 /* NIP19Tests.swift */,
 			);
 			path = damusTests;
 			sourceTree = "<group>";
@@ -1224,7 +1059,6 @@
 			children = (
 				4CE8794729941DA700F758CC /* RelayFilters.swift */,
 				4CE8794B2995B59E00F758CC /* RelayMetadatas.swift */,
-				4CC6193929DC777C006A86D1 /* RelayBootstrap.swift */,
 			);
 			path = Relays;
 			sourceTree = "<group>";
@@ -1280,26 +1114,6 @@
 			path = Posting;
 			sourceTree = "<group>";
 		};
-		4CFF8F6129CC9A80008DB934 /* Images */ = {
-			isa = PBXGroup;
-			children = (
-				4CFF8F6229CC9AD7008DB934 /* ImageContextMenuModifier.swift */,
-				4CFF8F6629CC9E3A008DB934 /* ImageView.swift */,
-				6439E013296790CF0020672B /* ProfilePicImageView.swift */,
-				4CFF8F6829CC9ED1008DB934 /* ImageContainerView.swift */,
-			);
-			path = Images;
-			sourceTree = "<group>";
-		};
-		7C0F392D29B57C8F0039859C /* Extensions */ = {
-			isa = PBXGroup;
-			children = (
-				7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */,
-				7C0F392E29B57CAF0039859C /* Binding+.swift */,
-			);
-			path = Extensions;
-			sourceTree = "<group>";
-		};
 		F7F0BA23297892AE009531F3 /* Modifiers */ = {
 			isa = PBXGroup;
 			children = (
@@ -1400,32 +1214,23 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				Base,
-				ar,
-				bg,
-				cs,
-				de,
-				"el-GR",
-				"en-US",
 				"es-419",
-				"es-ES",
+				"en-US",
-				fa,
-				fr,
-				"hu-HU",
-				id,
-				"it-IT",
-				ja,
-				ko,
-				"lv-LV",
-				nl,
-				"pl-PL",
-				"pt-BR",
-				"pt-PT",
-				ru,
-				"sv-SE",
 				"tr-TR",
-				uk,
+				"fr-FR",
-				vi,
+				"lv-LV",
+				"it-IT",
+				de,
+				"pt-PT",
+				"pl-PL",
+				ar,
+				nl,
 				"zh-CN",
+				"el-GR",
+				ja,
+				id,
+				cs,
+				ru,
 				"zh-HK",
 				"zh-TW",
 			);
@@ -1482,7 +1287,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				4C3AC79D2833036D00E1F516 /* FollowingView.swift in Sources */,
-				5CF72FC229B9142F00124A13 /* ShareAction.swift in Sources */,
 				4C363A8A28236B57006E126D /* MentionView.swift in Sources */,
 				4CE4F8CD281352B30009DFBB /* Notifications.swift in Sources */,
 				4C30AC7829A577AB00E2BD5A /* EventCache.swift in Sources */,
@@ -1497,14 +1301,11 @@
 				7C902AE32981D55B002AB16E /* ZoomableScrollView.swift in Sources */,
 				4CE8794C2995B59E00F758CC /* RelayMetadatas.swift in Sources */,
 				4C363A8C28236B92006E126D /* PubkeyView.swift in Sources */,
-				4CDA128A29E9D10C0006FA5A /* SignalView.swift in Sources */,
 				4C5C7E68284ED36500A22DF5 /* SearchHomeModel.swift in Sources */,
 				4C54AA0C29A5543C003E4487 /* ZapGroup.swift in Sources */,
 				4C75EFB728049D990006080F /* RelayPool.swift in Sources */,
-				F757933A29D7AECD007DEAC1 /* ImagePicker.swift in Sources */,
 				4CF0ABEE29844B5500D66079 /* AnyEncodable.swift in Sources */,
 				4CB8838D296F710400DC99E7 /* Reposted.swift in Sources */,
-				4CCEB7A929B29DD50078AA28 /* SearchResultsModel.swift in Sources */,
 				4C3EA67728FF7A9800C48A62 /* talstr.c in Sources */,
 				4CE6DEE927F7A08100C66700 /* ContentView.swift in Sources */,
 				4CEE2AF5280B29E600AB5EEF /* TimeAgo.swift in Sources */,
@@ -1512,11 +1313,9 @@
 				4CB55EF5295E679D007FD187 /* UserRelaysView.swift in Sources */,
 				4C363AA228296A7E006E126D /* SearchView.swift in Sources */,
 				4CC7AAED297F0B9E00430951 /* Highlight.swift in Sources */,
-				4CC6193A29DC777C006A86D1 /* RelayBootstrap.swift in Sources */,
 				4C285C8A2838B985008A31F1 /* ProfilePictureSelector.swift in Sources */,
 				4C9F18E429ABDE6D008C55EC /* MaybeAnonPfpView.swift in Sources */,
 				4C75EFB92804A2740006080F /* EventView.swift in Sources */,
-				4C8D00C829DF791C0036AF10 /* CompatibleAttribute.swift in Sources */,
 				3AA247FD297E3CFF0090C62D /* RepostsModel.swift in Sources */,
 				F75BA12F29A18EF500E10810 /* BookmarksView.swift in Sources */,
 				4CB883B6297730E400DC99E7 /* LNUrls.swift in Sources */,
@@ -1541,11 +1340,8 @@
 				4C75EFA627FF87A20006080F /* Nostr.swift in Sources */,
 				4CB883A62975F83C00DC99E7 /* LNUrlPayRequest.swift in Sources */,
 				4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */,
-				3A48E7B029DFBE9D006E787E /* MutedThreadsManager.swift in Sources */,
 				4C285C8E28399BFE008A31F1 /* SaveKeysView.swift in Sources */,
 				F7F0BA25297892BD009531F3 /* SwipeToDismiss.swift in Sources */,
-				4C8D00CA29DF80350036AF10 /* TruncatedText.swift in Sources */,
-				4C9BB83429C12D9900FC4E37 /* EventProfileName.swift in Sources */,
 				4CB8838F296F781C00DC99E7 /* ReactionsView.swift in Sources */,
 				4C649844285A952100EAE2B3 /* LocalUserConfig.swift in Sources */,
 				4C75EFB328049D640006080F /* NostrEvent.swift in Sources */,
@@ -1556,12 +1352,10 @@
 				4CE4F9E328528C5200C00DD9 /* AddRelayView.swift in Sources */,
 				4C363A9A28283854006E126D /* Reply.swift in Sources */,
 				BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */,
-				4CFF8F6729CC9E3A008DB934 /* ImageView.swift in Sources */,
 				4C90BD18283A9EE5008EE7EF /* LoginView.swift in Sources */,
 				4CB8838B296F6E1E00DC99E7 /* NIP05Badge.swift in Sources */,
 				4C3EA66828FF5F9900C48A62 /* hex.c in Sources */,
-				E9E4ED0B295867B900DD7078 /* ThreadView.swift in Sources */,
+				E9E4ED0B295867B900DD7078 /* ThreadV2View.swift in Sources */,
-				4CD348EF29C3659D00497EB2 /* ImageUploadModel.swift in Sources */,
 				4C3BEFDC281DCE6100B3DE84 /* Liked.swift in Sources */,
 				4CF0ABE7298444FD00D66079 /* MutedEventView.swift in Sources */,
 				9C83F89329A937B900136C08 /* TextViewWrapper.swift in Sources */,
@@ -1579,7 +1373,6 @@
 				4CE8794829941DA700F758CC /* RelayFilters.swift in Sources */,
 				4CEE2B02280B39E800AB5EEF /* EventActionBar.swift in Sources */,
 				4C3BEFE0281DE1ED00B3DE84 /* DamusState.swift in Sources */,
-				4CCEB7AE29B53D260078AA28 /* SearchingEventView.swift in Sources */,
 				4CF0ABE929844AF100D66079 /* AnyCodable.swift in Sources */,
 				4C0A3F8F280F640A000448DE /* ThreadModel.swift in Sources */,
 				4CC7AAF2297F129C00430951 /* EmbeddedEventView.swift in Sources */,
@@ -1588,13 +1381,11 @@
 				4C3BEFD22819DB9B00B3DE84 /* ProfileModel.swift in Sources */,
 				4C0A3F93280F66F5000448DE /* ReplyMap.swift in Sources */,
 				7C95CAEE299DCEF1009DCB67 /* KFOptionSetter+.swift in Sources */,
-				4CCEB7B029B5415A0078AA28 /* SearchingProfileView.swift in Sources */,
 				BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */,
 				3169CAE6294E69C000EE4006 /* EmptyTimelineView.swift in Sources */,
 				4CC7AAF0297F11C700430951 /* SelectedEventView.swift in Sources */,
 				4CC7AAF8297F1CEE00430951 /* EventProfile.swift in Sources */,
 				64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */,
-				4C1A9A2329DDDB8100516EAC /* IconLabel.swift in Sources */,
 				4C3EA64928FF597700C48A62 /* bech32.c in Sources */,
 				4CE879522996B68900F758CC /* RelayType.swift in Sources */,
 				4C90BD162839DB54008EE7EF /* NostrMetadata.swift in Sources */,
@@ -1608,21 +1399,16 @@
 				4CE879582996C45300F758CC /* ZapsView.swift in Sources */,
 				4C30AC7429A5680900E2BD5A /* EventGroupView.swift in Sources */,
 				4C633352283D419F00B1C9C3 /* SignalModel.swift in Sources */,
-				4CFF8F6D29CD022E008DB934 /* WideEventView.swift in Sources */,
 				9609F058296E220800069BF3 /* BannerImageView.swift in Sources */,
 				4C363A94282704FA006E126D /* Post.swift in Sources */,
 				4C216F32286E388800040376 /* DMChatView.swift in Sources */,
 				4CAAD8AD298851D000060CEA /* AccountDeletion.swift in Sources */,
-				4CFF8F6329CC9AD7008DB934 /* ImageContextMenuModifier.swift in Sources */,
 				4C54AA0A29A55429003E4487 /* EventGroup.swift in Sources */,
 				4C3EA67928FF7ABF00C48A62 /* list.c in Sources */,
 				4C64987E286D082C00EAE2B3 /* DirectMessagesModel.swift in Sources */,
-				9CA876E229A00CEA0003B9A3 /* AttachMediaUtility.swift in Sources */,
-				4CE4F0F829DB7399005914DB /* ThiccDivider.swift in Sources */,
 				4CE0E2B629A3ED5500DB4CA2 /* InnerTimelineView.swift in Sources */,
 				4C363A8828236948006E126D /* BlocksView.swift in Sources */,
 				4C06670628FCB08600038D2A /* ImageCarousel.swift in Sources */,
-				F79C7FAD29D5E9620000F946 /* EditProfilePictureControl.swift in Sources */,
 				4C9F18E229AA9B6C008C55EC /* CustomizeZapView.swift in Sources */,
 				4C75EFAF28049D350006080F /* NostrFilter.swift in Sources */,
 				4C3EA64C28FF59AC00C48A62 /* bech32_util.c in Sources */,
@@ -1638,30 +1424,23 @@
 				5C513FCC2984ACA60072348F /* QRCodeView.swift in Sources */,
 				4C3EA64F28FF59F200C48A62 /* tal.c in Sources */,
 				4CB88393296F798300DC99E7 /* ReactionsModel.swift in Sources */,
-				5C42E78C29DB76D90086AAC1 /* EmptyUserSearchView.swift in Sources */,
 				4CB88396296F7F8B00DC99E7 /* ReactionView.swift in Sources */,
-				4CFF8F6B29CD0079008DB934 /* RepostedEvent.swift in Sources */,
 				4C8682872814DE470026224F /* ProfileView.swift in Sources */,
 				4C5F9114283D694D0052CD1C /* FollowTarget.swift in Sources */,
 				4CF0ABD629817F5B00D66079 /* ReportView.swift in Sources */,
-				4C1A9A2729DDE31900516EAC /* TranslationSettingsView.swift in Sources */,
 				4CB8838629656C8B00DC99E7 /* NIP05.swift in Sources */,
 				4CF0ABD82981980C00D66079 /* Lists.swift in Sources */,
 				4C30AC8029A6A53F00E2BD5A /* ProfilePicturesView.swift in Sources */,
-				4C8EC52529D1FA6C0085D9A8 /* DamusColors.swift in Sources */,
 				4C5C7E6A284EDE2E00A22DF5 /* SearchResultsView.swift in Sources */,
 				7C60CAEF298471A1009C80D6 /* CoreSVG.swift in Sources */,
-				6439E014296790CF0020672B /* ProfilePicImageView.swift in Sources */,
+				6439E014296790CF0020672B /* ProfileZoomView.swift in Sources */,
 				4CE6DF1627F8DEBF00C66700 /* RelayConnection.swift in Sources */,
-				4CDA128C29EB19C40006FA5A /* LocalNotification.swift in Sources */,
 				4C3BEFD6281D995700B3DE84 /* ActionBarModel.swift in Sources */,
 				4C363AA428296DEE006E126D /* SearchModel.swift in Sources */,
-				4C8D00CC29DF92DF0036AF10 /* Hashtags.swift in Sources */,
 				4CEE2AF3280B25C500AB5EEF /* ProfilePicView.swift in Sources */,
 				4CC7AAF6297F1A6A00430951 /* EventBody.swift in Sources */,
 				4CEE2AF9280B2EAC00AB5EEF /* PowView.swift in Sources */,
 				3165648B295B70D500C64604 /* LinkView.swift in Sources */,
-				4C8D00CF29E38B950036AF10 /* nostr_bech32.c in Sources */,
 				4C3BEFD42819DE8F00B3DE84 /* NostrKind.swift in Sources */,
 				4C3EA66028FF5E7700C48A62 /* node_id.c in Sources */,
 				4CE6DEE727F7A08100C66700 /* damusApp.swift in Sources */,
@@ -1680,15 +1459,11 @@
 				4CE8794E2996B16A00F758CC /* RelayToggle.swift in Sources */,
 				4C3AC79B28306D7B00E1F516 /* Contacts.swift in Sources */,
 				4C3EA63D28FF52D600C48A62 /* bolt11.c in Sources */,
-				4C9BB83129C0ED4F00FC4E37 /* DisplayName.swift in Sources */,
 				7CFF6317299FEFE5005D382A /* SelectableText.swift in Sources */,
-				4CFF8F6929CC9ED1008DB934 /* ImageContainerView.swift in Sources */,
 				4C54AA0729A540BA003E4487 /* NotificationsModel.swift in Sources */,
 				4CB55EF3295E5D59007FD187 /* RecommendedRelayView.swift in Sources */,
-				4CE4F0F229D4FCFA005914DB /* DebouncedOnChange.swift in Sources */,
 				4CF0ABEC29844B4700D66079 /* AnyDecodable.swift in Sources */,
 				4C5F9118283D88E40052CD1C /* FollowingModel.swift in Sources */,
-				4C1A9A1A29DCA17E00516EAC /* ReplyCounter.swift in Sources */,
 				643EA5C8296B764E005081BB /* RelayFilterView.swift in Sources */,
 				4C3EA67D28FFBBA300C48A62 /* InvoicesView.swift in Sources */,
 				4C363A8E28236FE4006E126D /* NoteContentView.swift in Sources */,
@@ -1701,7 +1476,6 @@
 				4CE879552996BAB900F758CC /* RelayPaidDetail.swift in Sources */,
 				4CF0ABD42980996B00D66079 /* Report.swift in Sources */,
 				4C06670B28FDE64700038D2A /* damus.c in Sources */,
-				4C1A9A2529DDDF2600516EAC /* ZapSettingsView.swift in Sources */,
 				4C2CDDF7299D4A5E00879FD5 /* Debouncer.swift in Sources */,
 				3AAA95CC298E07E900F3D526 /* DeepLPlan.swift in Sources */,
 				4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */,
@@ -1712,19 +1486,14 @@
 				4CC7AAF4297F18B400430951 /* ReplyDescription.swift in Sources */,
 				4C75EFA427FA577B0006080F /* PostView.swift in Sources */,
 				4C30AC7229A5677A00E2BD5A /* NotificationsView.swift in Sources */,
-				4C1A9A2129DDD3E100516EAC /* KeySettingsView.swift in Sources */,
-				4C1A9A1D29DDCF9B00516EAC /* NotificationSettingsView.swift in Sources */,
 				4C75EFB528049D790006080F /* Relay.swift in Sources */,
 				4CEE2AF1280B216B00AB5EEF /* EventDetailView.swift in Sources */,
 				4CC7AAFA297F64AC00430951 /* EventMenu.swift in Sources */,
 				4C75EFBB2804A34C0006080F /* ProofOfWork.swift in Sources */,
 				4C3AC7A52836987600E1F516 /* MainTabView.swift in Sources */,
-				7C0F392F29B57CAF0039859C /* Binding+.swift in Sources */,
-				4C1A9A1F29DDD24B00516EAC /* AppearanceSettingsView.swift in Sources */,
 				3AA59D1D2999B0400061C48E /* DraftsModel.swift in Sources */,
 				3169CAED294FCCFC00EE4006 /* Constants.swift in Sources */,
 				4CB9D4A72992D02B00A9A7E4 /* ProfileNameView.swift in Sources */,
-				4CE4F0F429D779B5005914DB /* PostBox.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1733,7 +1502,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				3A3040ED29A5CB86008A0F29 /* ReplyDescriptionTests.swift in Sources */,
-				4C8D00D429E3C5D40036AF10 /* NIP19Tests.swift in Sources */,
 				3A30410129AB12AA008A0F29 /* EventGroupViewTests.swift in Sources */,
 				3ACBCB78295FE5C70037388A /* TimeAgoTests.swift in Sources */,
 				DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */,
@@ -1783,6 +1551,7 @@
 				3A5C4575296A879E0032D398 /* es-419 */,
 				3A2B8B0A296A8982009CC16D /* en-US */,
 				3AEB8005297CCEA900713A25 /* tr-TR */,
+				3A4F3322297CCFEE004B5F72 /* fr-FR */,
 				3A185A06297F2C3800F4BDC0 /* lv-LV */,
 				3A929C22297F2CF80090925E /* it-IT */,
 				3AB5B86C2986D8A3006599D2 /* de */,
@@ -1798,16 +1567,6 @@
 				3A827A1A299FC69D00C4D171 /* ru */,
 				3A3040FB29A91F03008A0F29 /* zh-HK */,
 				3A3040FD29A91F31008A0F29 /* zh-TW */,
-				3AA5E70429B682B3002701ED /* uk */,
-				3AA5E70729B9E84A002701ED /* bg */,
-				3AD5662C29BD2F5300BF77C5 /* fa */,
-				3AD5663229C0DA4B00BF77C5 /* ko */,
-				3AD14EB529C40F38009D2D9C /* hu-HU */,
-				3AD14EB829C40F3F009D2D9C /* sv-SE */,
-				3A325AC629C9E0B8002BE7ED /* vi */,
-				3A325AC929C9E0CF002BE7ED /* es-ES */,
-				3AC59CA929CDDB78007E04A6 /* pt-BR */,
-				3A821C4029E819D500B4BCA7 /* fr */,
 			);
 			name = Localizable.stringsdict;
 			sourceTree = "<group>";
@@ -1817,6 +1576,7 @@
 			children = (
 				3ACB685B297633BC00C46468 /* es-419 */,
 				3AEB8003297CCEA800713A25 /* tr-TR */,
+				3A4F3320297CCFEE004B5F72 /* fr-FR */,
 				3A185A04297F2C3800F4BDC0 /* lv-LV */,
 				3A929C20297F2CF80090925E /* it-IT */,
 				3AB5B86A2986D8A3006599D2 /* de */,
@@ -1832,16 +1592,6 @@
 				3A827A18299FC69D00C4D171 /* ru */,
 				3A3040F929A91ED6008A0F29 /* zh-HK */,
 				3A3040FC29A91F31008A0F29 /* zh-TW */,
-				3AA5E70329B682AD002701ED /* uk */,
-				3AA5E70529B9E83E002701ED /* bg */,
-				3AD5662B29BD2F5300BF77C5 /* fa */,
-				3AD5663329C0DA4B00BF77C5 /* ko */,
-				3AD14EB629C40F38009D2D9C /* hu-HU */,
-				3AD14EB929C40F3F009D2D9C /* sv-SE */,
-				3A325AC529C9E0B8002BE7ED /* vi */,
-				3A325AC829C9E0CF002BE7ED /* es-ES */,
-				3AC59CA829CDDB78007E04A6 /* pt-BR */,
-				3A821C3F29E819D500B4BCA7 /* fr */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -1851,6 +1601,7 @@
 			children = (
 				3ACB685E297633BC00C46468 /* es-419 */,
 				3AEB8004297CCEA800713A25 /* tr-TR */,
+				3A4F3321297CCFEE004B5F72 /* fr-FR */,
 				3A185A05297F2C3800F4BDC0 /* lv-LV */,
 				3A929C21297F2CF80090925E /* it-IT */,
 				3AB5B86B2986D8A3006599D2 /* de */,
@@ -1867,16 +1618,6 @@
 				3A3040FA29A91EFC008A0F29 /* zh-HK */,
 				3A3040FE29A91F31008A0F29 /* zh-TW */,
 				3A3040FF29AB02D1008A0F29 /* en-US */,
-				3AA5E70229B682A5002701ED /* uk */,
-				3AA5E70629B9E844002701ED /* bg */,
-				3AD5662D29BD2F5300BF77C5 /* fa */,
-				3AD5663129C0DA4B00BF77C5 /* ko */,
-				3AD14EB729C40F38009D2D9C /* hu-HU */,
-				3AD14EBA29C40F3F009D2D9C /* sv-SE */,
-				3A325AC429C9E0B8002BE7ED /* vi */,
-				3A325AC729C9E0CF002BE7ED /* es-ES */,
-				3AC59CA729CDDB78007E04A6 /* pt-BR */,
-				3A821C3E29E819D500B4BCA7 /* fr */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -2012,7 +1753,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -2020,9 +1761,7 @@
 				INFOPLIST_FILE = damus/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Damus;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
-				INFOPLIST_KEY_NSCameraUsageDescription = "Damus needs access to your camera if you want to upload photos from it";
 				INFOPLIST_KEY_NSFaceIDUsageDescription = "Local authentication to access private key";
-				INFOPLIST_KEY_NSMicrophoneUsageDescription = "Damus needs access to your microphone if you want to upload recorded videos from it";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Granting Damus access to your photos allows you to save images.";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -2037,12 +1776,9 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.4.3;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = YES;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "damus-c/damus-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -2059,7 +1795,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -2067,9 +1803,7 @@
 				INFOPLIST_FILE = damus/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Damus;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
-				INFOPLIST_KEY_NSCameraUsageDescription = "Damus needs access to your camera if you want to upload photos from it";
 				INFOPLIST_KEY_NSFaceIDUsageDescription = "Local authentication to access private key";
-				INFOPLIST_KEY_NSMicrophoneUsageDescription = "Damus needs access to your microphone if you want to upload recorded videos from it";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Granting Damus access to your photos allows you to save images.";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -2084,12 +1818,9 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.4.3;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = YES;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "damus-c/damus-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

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

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

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

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

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

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

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

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

damus/Assets.xcassets/Hashtags/Contents.json

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

damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/Contents.json

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

damus/Assets.xcassets/Hashtags/bitcoin-hashtag.imageset/bitcoin-hashtag.svg

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="12.843903"
-   height="17"
-   viewBox="0 0 12.843902 16.999999"
-   version="1.1"
-   id="svg2"
-   sodipodi:docname="bitcoin-hashtag.svg"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="namedview2"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="31.12"
-     inkscape:cx="4.2577121"
-     inkscape:cy="7.535347"
-     inkscape:window-width="1526"
-     inkscape:window-height="957"
-     inkscape:window-x="1637"
-     inkscape:window-y="10"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <g
-     id="surface1"
-     transform="matrix(0.94507527,0,0,0.94507527,-4.5943665,-3.2875042)">
-    <path
-       style="fill:#f59119;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40637"
-       d="M 18.388175,10.742602 C 18.668352,8.874761 17.240002,7.8694225 15.295251,7.193703 L 15.927019,4.6611305 14.383304,4.2765743 13.768015,6.7432244 C 13.361486,6.644338 12.943967,6.545453 12.531944,6.4520613 L 13.152726,3.9689298 11.609011,3.584375 10.977241,6.1169476 C 10.642129,6.0400371 10.312509,5.9686201 9.988384,5.886215 L 9.993834,5.880715 7.8623408,5.3478364 7.4558114,6.9959316 c 0,0 1.1426793,0.2636953 1.1207046,0.2801765 0.6207823,0.1538223 0.7361485,0.5658464 0.714174,0.8954659 l -0.7196673,2.889659 c 0.043949,0.01099 0.098885,0.02747 0.1648089,0.04944 L 8.5710227,11.072223 7.5601911,15.11555 c -0.076912,0.192277 -0.26919,0.477948 -0.7031873,0.368073 0.010984,0.02198 -1.1261994,-0.280174 -1.1261994,-0.280174 l -0.7636164,1.76346 2.0106754,0.505417 c 0.3735682,0.0934 0.7361485,0.186784 1.0987301,0.280176 l -0.6427568,2.565534 1.5437155,0.384556 0.6317701,-2.538067 c 0.4230107,0.115364 0.8295407,0.219746 1.2305777,0.318632 l -0.63177,2.527079 1.543716,0.384557 0.637263,-2.560042 c 2.631459,0.499922 4.614667,0.296656 5.444208,-2.082094 0.670226,-1.917284 -0.03296,-3.021507 -1.417363,-3.741176 1.010832,-0.236227 1.768957,-0.895465 1.972221,-2.268877 z m -3.526922,4.944286 c -0.477949,1.917283 -3.702721,0.884477 -4.752008,0.620782 l 0.851514,-3.395075 c 1.043795,0.2582 4.394922,0.774604 3.900494,2.774293 z M 15.3392,10.715134 c -0.433999,1.74698 -3.120394,0.857008 -3.993884,0.642757 l 0.769111,-3.081939 c 0.87349,0.219746 3.675252,0.620784 3.224773,2.439182 z m 0,0"
-       id="path2" />
-  </g>
-</svg>

damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/Contents.json

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

damus/Assets.xcassets/Hashtags/coffee-hashtag.imageset/coffee.svg

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
-
-<svg
-   version="1.1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 13.999999 18"
-   enable-background="new 0 0 1000 1000"
-   xml:space="preserve"
-   id="svg4"
-   sodipodi:docname="coffee.svg"
-   width="14"
-   height="18"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs4" /><sodipodi:namedview
-   id="namedview4"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   showgrid="false"
-   inkscape:zoom="10.680141"
-   inkscape:cx="-17.181421"
-   inkscape:cy="4.07298"
-   inkscape:window-width="1368"
-   inkscape:window-height="947"
-   inkscape:window-x="1764"
-   inkscape:window-y="58"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="svg4" />
-<metadata
-   id="metadata1"> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
-<g
-   id="g4"
-   transform="matrix(0.01779387,0,0,0.01779387,-1.8340539,0.04465199)"><g
-     transform="matrix(0.1,0,0,-0.1,0,511)"
-     id="g3"><path
-       d="m 4302.6,4870.6 c 149.5,-177.8 240.5,-319.3 347.6,-545.6 119.2,-254.6 169.7,-448.6 183.9,-699.2 22.2,-462.7 -137.4,-778 -539.5,-1060.9 -474.9,-335.4 -685,-739.6 -687,-1315.5 0,-260.7 38.4,-501.1 115.2,-739.6 50.5,-149.5 56.6,-159.6 60.6,-97 18.2,234.4 56.6,476.9 101,626.4 121.2,422.3 305.1,622.4 885.1,959.8 424.3,248.5 575.9,487 575.9,905.3 -2,501.1 -359.7,1295.3 -798.2,1768.1 -82.8,88.9 -198,202.1 -256.6,250.6 l -105.1,86.9 z"
-       id="path1"
-       style="fill:#be5f00;fill-opacity:1" /><path
-       d="m 5981.8,3577.3 c 272.8,-369.8 309.2,-846.7 90.9,-1192.2 -147.5,-232.4 -373.8,-406.2 -822.4,-638.5 -592,-303.1 -854.7,-683 -854.7,-1232.6 0,-276.8 14.2,-343.5 72.7,-343.5 38.4,0 48.5,16.2 68.7,111.1 34.4,167.7 135.4,349.6 262.7,476.9 147.5,145.5 349.6,244.5 838.6,412.2 503.2,171.8 725.4,280.9 846.7,416.3 210.1,232.4 276.8,535.5 202.1,903.2 -76.8,373.8 -216.2,618.3 -537.5,943.7 -155.7,155.6 -214.3,206.1 -167.8,143.4 z"
-       id="path2"
-       style="fill:#be5f00;fill-opacity:1" /><path
-       d="M 2748.7,592.8 C 2158.7,507.9 1732.3,352.3 1542.4,156.3 1415.1,25 1409,-11.4 1427.2,-445.8 c 34.3,-832.5 181.9,-1729.7 462.7,-2829 153.6,-600.1 309.2,-1113.4 351.6,-1159.9 56.6,-62.6 272.8,-157.6 476.9,-210.1 668.8,-173.8 2172.2,-196 2960.3,-42.4 357.7,68.7 604.2,163.7 731.5,278.9 68.7,60.6 84.9,92.9 107.1,198 64.7,335.4 56.6,319.3 131.3,319.3 107.1,0 438.5,92.9 602.2,167.7 220.3,103.1 363.7,202.1 567.8,398.1 470.8,452.6 759.8,1149.8 761.8,1840.8 0,398.1 -72.7,614.3 -274.8,818.4 -220.3,222.3 -466.8,309.2 -937.6,325.4 l -309.2,12.1 14.2,218.2 14.2,218.2 -56.6,52.5 C 6866.9,314 6274.9,499.9 5696.9,582.7 L 5614,594.8 5533.2,457.4 5450.4,322 5565.6,305.8 c 588,-84.9 868.9,-159.6 978,-256.6 56.6,-50.5 60.6,-62.6 44.5,-113.2 -80.8,-226.3 -1000.2,-371.8 -2329.8,-371.8 -1220.5,0 -2097.5,123.3 -2295.5,321.3 -52.5,54.5 -56.6,66.7 -36.4,111.1 48.5,107.1 341.5,206.1 822.4,276.8 143.5,20.2 301.1,38.4 349.6,38.4 46.5,0 84.9,4 84.9,8.1 0,8.1 -175.8,295 -185.9,305.1 -4.2,2.1 -115.3,-12 -248.7,-32.2 z m 4797.1,-1614.5 c 153.6,-26.3 272.8,-82.8 317.2,-153.6 56.6,-84.9 60.6,-400.1 8.1,-652.7 -111.1,-545.6 -404.1,-996.2 -788.1,-1220.5 -139.4,-80.8 -333.4,-151.5 -355.6,-129.3 -8.1,8.1 18.2,216.2 58.6,462.7 78.8,482.9 159.6,1073 202.1,1450.8 l 24.2,232.4 70.7,12.1 c 115.3,20.3 325.4,20.3 462.8,-1.9 z"
-       id="path3"
-       style="fill:#be5f00;fill-opacity:1" /></g></g>
-</svg>

damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/Contents.json

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

damus/Assets.xcassets/Hashtags/nostr-hashtag.imageset/nostr-hashtag.svg

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.0"
-   width="18pt"
-   height="18.199053pt"
-   viewBox="0 0 18 18.199053"
-   preserveAspectRatio="xMidYMid"
-   id="svg1"
-   sodipodi:docname="nostr-hashtag.svg"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="pt"
-     showgrid="false"
-     inkscape:zoom="5.4017383"
-     inkscape:cx="50.354161"
-     inkscape:cy="-13.514168"
-     inkscape:window-width="1497"
-     inkscape:window-height="866"
-     inkscape:window-x="1747"
-     inkscape:window-y="96"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1" />
-  <metadata
-     id="metadata1">
-Created by potrace 1.15, written by Peter Selinger 2001-2017
-</metadata>
-  <g
-     transform="matrix(0.00138509,0,0,-0.00138509,0.3,17.927982)"
-     fill="#000000"
-     stroke="none"
-     id="g1">
-    <path
-       d="m 11315,12756 c -49,-23 -135,-71 -190,-106 -128,-81 -170,-100 -222,-100 -37,0 -43,-3 -43,-22 0,-11 12,-36 26,-55 l 26,-34 -20,-37 c -128,-248 -171,-359 -212,-547 -56,-262 -43,-645 36,-1045 48,-244 104,-451 234,-865 158,-503 280,-942 320,-1145 27,-140 60,-448 60,-559 0,-164 -39,-366 -92,-478 -57,-123 -176,-222 -286,-239 -49,-8 -50,-23 -5,-38 18,-6 34,-14 38,-18 13,-13 -25,-66 -97,-134 -121,-115 -267,-174 -432,-174 -200,0 -327,87 -732,507 -233,240 -541,529 -604,567 -31,18 -32,18 -27,0 3,-11 9,-36 13,-56 8,-49 -5,-49 -65,1 -75,62 -168,118 -250,150 -134,51 -214,63 -481,70 l -245,6 -65,41 c -100,63 -125,68 -295,66 -186,-3 -262,7 -484,64 -279,71 -341,67 -780,-61 -334,-97 -442,-118 -761,-150 -200,-19 -365,-19 -496,1 -58,9 -107,14 -111,11 -3,-4 6,-22 21,-41 l 27,-35 -23,-5 c -13,-3 -61,-8 -106,-11 -113,-9 -157,-26 -219,-87 -50,-49 -54,-51 -140,-64 -60,-10 -108,-25 -153,-48 -304,-157 -331,-166 -471,-166 -48,0 -120,7 -160,15 -40,9 -74,13 -78,10 -3,-3 0,-20 7,-37 6,-18 10,-34 7,-36 -2,-3 -24,0 -47,7 -24,6 -103,16 -176,23 -163,15 -350,1 -521,-40 l -114,-26 51,-23 c 53,-23 76,-50 66,-77 -3,-8 -51,-38 -105,-66 -251,-129 -515,-384 -727,-703 -110,-166 -208,-325 -217,-355 -6,-21 -5,-22 34,-16 36,6 41,4 41,-12 0,-11 -15,-45 -34,-76 -46,-75 -76,-161 -127,-359 -78,-307 -137,-444 -243,-569 -38,-44 -51,-67 -43,-72 7,-4 40,-8 75,-8 37,0 62,-4 62,-11 0,-6 -12,-26 -27,-45 -32,-43 -24,-53 48,-60 108,-11 103,-6 95,-82 -4,-37 -11,-128 -15,-202 -5,-74 -16,-164 -26,-200 -22,-85 -75,-190 -136,-269 -27,-35 -49,-67 -49,-72 0,-4 17,-11 38,-14 20,-3 49,-8 64,-10 64,-10 285,31 408,76 101,37 249,117 348,188 54,38 110,75 126,80 15,6 70,11 123,11 267,0 582,98 766,239 34,26 72,53 83,59 25,13 31,8 58,-46 21,-40 38,-32 57,26 30,93 97,200 141,223 25,14 38,3 98,-86 27,-38 73,-95 104,-125 31,-30 56,-63 56,-75 0,-11 -20,-60 -45,-110 -42,-84 -81,-202 -70,-213 3,-3 27,16 54,41 50,47 81,59 81,34 0,-8 -10,-49 -21,-93 -26,-97 -32,-275 -10,-313 l 14,-25 36,41 c 42,48 118,88 251,131 102,33 185,47 345,57 55,4 159,13 230,21 292,34 285,35 368,-56 66,-72 122,-115 170,-130 20,-6 37,-15 37,-19 0,-12 -22,-35 -75,-77 -27,-21 -151,-133 -275,-248 -424,-394 -462,-415 -864,-486 -65,-12 -145,-29 -177,-39 -191,-60 -348,-213 -554,-541 -103,-165 -162,-241 -292,-383 -176,-190 -332,-333 -778,-711 -497,-422 -750,-737 -895,-1113 -64,-165 -104,-203 -216,-203 -38,0 -94,7 -124,15 -74,20 -244,20 -301,0 -27,-10 -61,-33 -87,-62 -41,-45 -43,-46 -89,-39 -25,3 -67,18 -92,33 C 457,781 369,812 175,813 49,814 0,786 0,713 0,669 31,628 122,557 204,491 254,434 469,153 527,77 549,57 597,33 652,7 662,5 780,6 c 69,0 150,6 180,14 30,7 132,32 225,56 281,72 308,76 511,84 181,6 195,8 247,34 76,37 137,107 231,267 230,392 287,481 394,626 219,293 469,581 756,869 284,284 368,342 641,439 164,59 295,123 410,199 101,68 257,219 295,286 14,24 56,76 93,116 100,106 177,142 437,203 165,40 229,62 390,133 191,85 220,94 460,143 118,24 239,49 267,56 29,7 56,10 59,6 4,-3 15,-50 26,-104 14,-73 21,-159 25,-331 6,-265 -3,-385 -47,-605 -50,-247 -105,-393 -222,-592 -59,-98 -74,-167 -58,-256 23,-126 61,-177 174,-232 95,-47 169,-52 357,-28 125,16 244,22 505,26 667,12 1011,-35 1799,-241 277,-73 308,-86 376,-161 72,-79 113,-170 175,-388 19,-66 42,-130 50,-143 42,-63 155,-112 261,-112 109,0 124,57 54,206 -48,102 -53,149 -17,165 31,15 73,-5 102,-48 12,-18 45,-87 75,-153 57,-132 106,-197 173,-233 35,-18 56,-21 136,-20 73,2 110,-3 159,-19 89,-29 333,-32 403,-5 114,44 140,145 60,231 -23,24 -112,72 -272,143 -71,32 -199,124 -250,179 -71,78 -111,140 -224,343 -132,236 -172,297 -262,391 -58,61 -94,89 -148,115 -113,56 -85,53 -866,85 -223,9 -616,36 -656,45 -11,2 -86,12 -165,20 -179,20 -595,95 -712,130 -145,42 -319,139 -371,208 -32,42 -53,102 -67,187 -22,144 48,316 261,640 125,190 193,317 230,428 31,95 60,282 60,392 0,76 4,102 16,114 20,20 25,18 192,-102 73,-52 168,-114 210,-137 83,-47 132,-82 132,-95 0,-4 -14,-17 -32,-28 l -32,-21 29,-11 c 108,-41 305,-52 707,-39 186,6 345,9 353,5 8,-3 15,-15 15,-27 0,-20 3,-21 54,-15 110,13 266,81 426,187 89,58 99,63 170,69 161,14 229,78 523,495 88,124 143,185 169,185 2,0 2,-27 0,-60 -2,-33 0,-60 5,-60 23,0 140,145 212,263 117,192 165,317 271,712 106,394 111,410 135,410 15,0 22,-10 29,-40 13,-53 12,-52 42,-24 40,36 103,133 154,234 25,50 50,90 55,90 6,0 11,-17 13,-37 2,-21 7,-38 12,-38 19,0 93,101 139,190 29,56 87,206 140,363 50,147 114,318 142,380 132,288 199,526 246,867 25,190 25,756 0,975 -23,195 -53,379 -78,485 -46,194 -152,515 -233,706 -130,306 -218,564 -260,764 -48,228 -48,572 1,770 31,128 82,204 166,246 64,33 118,83 187,174 120,158 184,199 503,321 250,96 347,153 347,204 0,41 -42,57 -174,68 -112,9 -385,70 -439,99 -10,5 -27,29 -37,54 -23,53 -99,137 -159,176 -56,35 -72,36 -40,1 24,-26 23,-26 -13,3 -21,16 -42,41 -47,56 -9,26 -14,28 -60,28 -50,0 -101,16 -101,32 0,4 -42,8 -92,7 -88,0 -98,-3 -183,-43 z m 550,-126 c 10,-11 16,-20 13,-20 -3,0 -13,9 -23,20 -10,11 -16,20 -13,20 3,0 13,-9 23,-20 z"
-       id="path1"
-       style="fill:#cc43c5;fill-opacity:1" />
-  </g>
-</svg>

damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/Contents.json

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

damus/Assets.xcassets/Hashtags/plebchain-hashtag.imageset/plebchain.svg

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="0 0 21.315096 18"
-   width="21.315096"
-   height="18"
-   version="1.1"
-   id="svg21"
-   sodipodi:docname="plebchain.svg"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs21" />
-  <sodipodi:namedview
-     id="namedview21"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="19.666667"
-     inkscape:cx="12.762712"
-     inkscape:cy="12.991525"
-     inkscape:window-width="1418"
-     inkscape:window-height="883"
-     inkscape:window-x="1745"
-     inkscape:window-y="10"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg21" />
-  <path
-     d="M 18.625339,11.886754 C 17.668676,9.87076 15.553749,8.748431 12.298294,7.531368 12.258627,7.5164347 11.514296,7.2747022 10.649566,6.9942364 9.6532356,6.6713042 8.5682391,6.7520372 7.6316422,7.220569 L 5.7999816,8.136166 13.616623,17.9338 h 4.316652 l 0.703264,-1.662727 c 0.593598,-1.401862 0.641198,-3.009057 -0.0112,-4.384319 z"
-     id="path5"
-     style="fill:#bf26ed;fill-opacity:1;stroke-width:0.466665" />
-  <path
-     d="M 16.627546,5.1089093 C 16.710146,4.5484447 16.797412,3.95578 16.838479,3.6790475 17.083011,2.0219197 15.937348,0.48005806 14.28022,0.23552546 12.623092,-0.00900704 11.081231,1.1366559 10.836698,2.7937838 c -0.0406,0.2762657 -0.128333,0.8689305 -0.210932,1.4298619 -0.282799,0.058333 -0.513332,0.2851324 -0.558132,0.5870648 -0.0658,0.441465 0.084,1.0145298 0.370999,1.2072625 0.09707,1.4303286 1.118596,2.778524 2.547992,2.989457 1.429395,0.210933 2.796257,-0.785398 3.302589,-2.1265932 0.330399,-0.1021996 0.639331,-0.6071313 0.703731,-1.0490632 0.0434,-0.302399 -0.111533,-0.5856647 -0.365399,-0.7228643 z"
-     id="path10"
-     style="fill:#bf26ed;fill-opacity:1;stroke-width:0.466665" />
-  <path
-     d="m 21.193864,14.872477 c -0.0392,-0.501665 -0.310799,-0.956663 -0.684131,-1.294529 l -1.900727,-1.723394 c 0,0 0.172666,0.346732 0.332732,1.276796 L 15.53415,11.550288 c -0.878731,-0.405999 -1.835861,-0.616465 -2.804191,-0.616465 h -0.807331 c -0.87733,0 -1.681394,-0.553464 -1.9338602,-1.393928 C 9.8926348,9.220696 9.819835,8.832897 9.7904351,8.363432 V 8.362965 C 10.503966,7.7651672 10.944031,6.8285703 10.968765,5.8700401 11.247364,5.6651742 11.372897,5.0865094 11.28843,4.648311 11.230564,4.3482453 10.990698,4.1317127 10.706032,4.0850462 10.599632,3.5283147 10.487633,2.93985 10.435366,2.6654509 10.121301,1.0199896 8.5327726,-0.05940684 6.8873113,0.25419216 5.2418501,0.56779106 4.1624536,2.1567859 4.4760526,3.8022471 4.5283191,4.0766462 4.6407854,4.665111 4.7467184,5.2218423 4.4989192,5.3697751 4.355653,5.6595742 4.4125861,5.9596399 4.4956525,6.3983051 4.8255848,6.8901701 5.159717,6.9779032 5.2950499,7.2952355 5.4798493,7.5892345 5.7015152,7.8510336 L 5.7999816,8.136166 5.2171168,11.699621 3.2925898,12.11822 C 3.041524,12.177953 2.8109914,12.278752 2.6061254,12.411752 1.8342613,12.912484 1.5458622,13.865414 1.7731282,14.725478 1.8309946,14.943877 2.8833245,17.9338 2.8833245,17.9338 H 15.133284 l 0.408332,-1.691661 3.480855,0.605265 c 1.184397,0.211399 2.267993,-0.748064 2.171393,-1.974927 z"
-     id="path16"
-     style="fill:#f59119;fill-opacity:1;stroke-width:0.466665" />
-  <path
-     d="m 12.589026,15.06801 -2.251659,-0.776531 c 0,0 0.96693,-0.1106 0.95853,-0.625798 -4.67e-4,-0.03687 -0.01213,-0.240332 -0.307999,-0.210932 -0.0812,0.0079 -0.734064,0.07327 -1.1927962,0.118999 -0.3028657,0.03033 -0.6015314,0.09007 -0.8927304,0.178733 l -0.1591328,0.04853 -3.5256551,-2.101393 c 0,0 0,0 0.3495322,-0.763464 C 6.1779803,9.600561 5.8004482,8.136166 5.8004482,8.136166 L 1.324663,10.373825 C 0.63539857,10.718224 0.2,11.422889 0.2,12.193819 c 0,0.939397 0.64306455,1.756528 1.5558615,1.977727 l 6.4357789,1.371062 2.5834586,0.955731 c 0.167999,0.0532 0.329932,0.0602 0.517065,0.0033 0.187599,-0.05693 0.246399,-0.09847 0.337398,-0.165199 0.2464,-0.180133 0.706065,-0.536665 1.037864,-0.795664 0.170799,-0.133933 0.125533,-0.402266 -0.0784,-0.472732 z"
-     id="path21"
-     style="fill:#bf26ed;fill-opacity:1;stroke-width:0.466665" />
-</svg>

damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/Contents.json

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

damus/Assets.xcassets/Hashtags/zap-hashtag.imageset/zapathon.svg

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="11.106925"
-   height="18"
-   viewBox="0 0 2.9387073 4.7624999"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.3-dev (77bc73e, 2022-05-18)"
-   sodipodi:docname="zapathon.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="16"
-     inkscape:cx="16.96875"
-     inkscape:cy="9.96875"
-     inkscape:window-width="1406"
-     inkscape:window-height="767"
-     inkscape:window-x="1741"
-     inkscape:window-y="214"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs1" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-10.993855,-8.058313)">
-    <g
-       transform="matrix(0.01604881,0,0,-0.01604881,10.573102,13.422443)"
-       id="g10"
-       inkscape:label="Bolt"
-       style="display:inline">
-      <path
-         id="path14"
-         style="fill:#c98f19;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1"
-         d="m 94.833712,155.13322 -8.129016,18.00903 -55.167069,-3.59001 18.868958,-24.19503 44.825648,2.77303 z m 83.691438,80.98476 -8.89814,-11.93085 -11.755,-16.519 -1.505,-2.114 -43.191,-60.691 L 63.081111,74.14633 79.705774,38.853232 C 121.34411,95.870625 162.2814,153.39008 203.27601,210.87013 Z m -22.57414,11.14115 12.32197,61.15287 -21.22997,22.33399 -17.432,-69.53486 -7.0256,-30.70796 27.52164,-9.9823 5.84396,26.73826"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-      <path
-         id="path16"
-         style="fill:#fadf05;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1"
-         d="m 178.78514,236.43412 -5.679,-0.377 -8.065,-0.533 -5.9,-0.389 -33.394,-2.212 6.162,29.388 6.223,29.667 8.95029,38.92409 -54.426393,-75.90909 -61.5969,-86.55 44.1332,2.921 8.9137,0.589 -6.1723,-29.396 -0.9867,-4.71 -1.5106,-7.209 -11.7273,-55.917704 16.3074,22.9175 37.169603,52.234204 43.189,60.693 1.505,2.113 16.907,23.756 h -0.002"
-         sodipodi:nodetypes="cccccccccccccccccccccc" />
-    </g>
-  </g>
-</svg>

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

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

damus/Assets.xcassets/bitcoin-logo.imageset/bitcoin-logo.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20px" height="20px" viewBox="0 0 20 20" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(96.862745%,57.647059%,10.196078%);fill-opacity:1;" d="M 19.699219 12.417969 C 18.363281 17.777344 12.9375 21.035156 7.582031 19.699219 C 2.226562 18.363281 -1.035156 12.9375 0.300781 7.582031 C 1.636719 2.222656 7.0625 -1.035156 12.417969 0.300781 C 17.773438 1.632812 21.035156 7.0625 19.699219 12.417969 Z M 19.699219 12.417969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 14.410156 8.574219 C 14.609375 7.246094 13.59375 6.53125 12.210938 6.050781 L 12.660156 4.25 L 11.5625 3.976562 L 11.125 5.730469 C 10.835938 5.660156 10.539062 5.589844 10.246094 5.523438 L 10.6875 3.757812 L 9.589844 3.484375 L 9.140625 5.285156 C 8.902344 5.230469 8.667969 5.179688 8.4375 5.121094 L 8.441406 5.117188 L 6.925781 4.738281 L 6.636719 5.910156 C 6.636719 5.910156 7.449219 6.097656 7.433594 6.109375 C 7.875 6.21875 7.957031 6.511719 7.941406 6.746094 L 7.429688 8.800781 C 7.460938 8.808594 7.5 8.820312 7.546875 8.835938 L 7.429688 8.808594 L 6.710938 11.683594 C 6.65625 11.820312 6.519531 12.023438 6.210938 11.945312 C 6.21875 11.960938 5.410156 11.746094 5.410156 11.746094 L 4.867188 13 L 6.296875 13.359375 C 6.5625 13.425781 6.820312 13.492188 7.078125 13.558594 L 6.621094 15.382812 L 7.71875 15.65625 L 8.167969 13.851562 C 8.46875 13.933594 8.757812 14.007812 9.042969 14.078125 L 8.59375 15.875 L 9.691406 16.148438 L 10.144531 14.328125 C 12.015625 14.683594 13.425781 14.539062 14.015625 12.847656 C 14.492188 11.484375 13.992188 10.699219 13.007812 10.1875 C 13.726562 10.019531 14.265625 9.550781 14.410156 8.574219 Z M 11.902344 12.089844 C 11.5625 13.453125 9.269531 12.71875 8.523438 12.53125 L 9.128906 10.117188 C 9.871094 10.300781 12.253906 10.667969 11.902344 12.089844 Z M 12.242188 8.554688 C 11.933594 9.796875 10.023438 9.164062 9.402344 9.011719 L 9.949219 6.820312 C 10.570312 6.976562 12.5625 7.261719 12.242188 8.554688 Z M 12.242188 8.554688 "/>
-</g>
-</svg>

damus/Components/CustomPicker.swift

@@ -8,8 +8,8 @@
 import SwiftUI
 
 let RECTANGLE_GRADIENT = LinearGradient(gradient: Gradient(colors: [
-    DamusColors.purple,
+    Color("DamusPurple"),
-    DamusColors.blue
+    Color("DamusBlue")
 ]), startPoint: .leading, endPoint: .trailing)
 
 struct CustomPicker<SelectionValue: Hashable, Content: View>: View {
@@ -52,10 +52,9 @@ struct CustomPicker<SelectionValue: Hashable, Content: View>: View {
                 .accentColor(tag == selection ? textColor() : .gray)
             }
         }
-        .background(Color(UIColor.systemBackground))
     }
     
     func textColor() -> Color {
-        colorScheme == .light ? DamusColors.black : DamusColors.white
+        colorScheme == .light ? Color("DamusBlack") : Color("DamusWhite")
     }
 }

damus/Components/DamusColors.swift

@@ -1,25 +0,0 @@
-//
-//  DamusColors.swift
-//  damus
-//
-//  Created by William Casarin on 2023-03-27.
-//
-
-import Foundation
-import SwiftUI
-
-class DamusColors {
-    static let adaptableGrey = Color("DamusAdaptableGrey")
-    static let white = Color("DamusWhite")
-    static let black = Color("DamusBlack")
-    static let brown = Color("DamusBrown")
-    static let yellow = Color("DamusYellow")
-    static let lightGrey = Color("DamusLightGrey")
-    static let mediumGrey = Color("DamusMediumGrey")
-    static let darkGrey = Color("DamusDarkGrey")
-    static let green = Color("DamusGreen")
-    static let purple = Color("DamusPurple")
-    static let deepPurple = Color("DamusDeepPurple")
-    static let blue = Color("DamusBlue")
-}
-

damus/Components/IconLabel.swift

@@ -1,44 +0,0 @@
-//
-//  IconLabel.swift
-//  damus
-//
-//  Created by William Casarin on 2023-04-05.
-//
-
-import SwiftUI
-import UIKit
-
-struct IconLabel: View {
-    let text: String
-    let img_name: String
-    let img_color: Color
-    
-    init(_ text: String, img_name: String, color: Color) {
-        self.text = text
-        self.img_name = img_name
-        self.img_color = color
-    }
-    
-    var body: some View {
-        HStack(spacing: 0) {
-            Image(systemName: img_name)
-                .foregroundColor(img_color)
-                .frame(width: 20)
-                .padding([.trailing], 20)
-            Text(text)
-        }
-    }}
-
-struct IconLabel_Previews: PreviewProvider {
-    static var previews: some View {
-        Form {
-            Section {
-                IconLabel(NSLocalizedString("Keys", comment: "Settings section for managing keys"), img_name: "key.fill", color: .orange)
-            
-                IconLabel(NSLocalizedString("Local Notifications", comment: "Section header for damus local notifications user configuration"), img_name: "bell.fill", color: .blue)
-            
-                IconLabel(NSLocalizedString("Appearance", comment: "Section header for text and appearance settings"), img_name: "textformat", color: .red)
-            }
-        }
-    }
-}

damus/Components/ImageCarousel.swift

@@ -31,43 +31,166 @@ struct ShareSheet: UIViewControllerRepresentable {
     }
 }
 
-
+struct ImageContextMenuModifier: ViewModifier {
-enum ImageShape {
+    let url: URL?
-    case square
+    let image: UIImage?
-    case landscape
+    @Binding var showShareSheet: Bool
-    case portrait
+    
-    case unknown
+    func body(content: Content) -> some View {
+        return content.contextMenu {
+            Button {
+                UIPasteboard.general.url = url
+            } label: {
+                Label(NSLocalizedString("Copy Image URL", comment: "Context menu option to copy the URL of an image into clipboard."), systemImage: "doc.on.doc")
+            }
+            if let someImage = image {
+                Button {
+                    UIPasteboard.general.image = someImage
+                } label: {
+                    Label(NSLocalizedString("Copy Image", comment: "Context menu option to copy an image into clipboard."), systemImage: "photo.on.rectangle")
+                }
+                Button {
+                    UIImageWriteToSavedPhotosAlbum(someImage, nil, nil, nil)
+                } label: {
+                    Label(NSLocalizedString("Save Image", comment: "Context menu option to save an image."), systemImage: "square.and.arrow.down")
+                }
+            }
+            Button {
+                showShareSheet = true
+            } label: {
+                Label(NSLocalizedString("Share", comment: "Button to share an image."), systemImage: "square.and.arrow.up")
+            }
+        }
+    }
 }
 
+private struct ImageContainerView: View {
+    
+    let url: URL?
+    
+    @State private var image: UIImage?
+    @State private var showShareSheet = false
+    
+    private struct ImageHandler: ImageModifier {
+        @Binding var handler: UIImage?
+        
+        func modify(_ image: UIImage) -> UIImage {
+            handler = image
+            return image
+        }
+    }
+    
+    var body: some View {
+        
+        KFAnimatedImage(url)
+            .imageContext(.note)
+            .configure { view in
+                view.framePreloadCount = 3
+            }
+            .imageModifier(ImageHandler(handler: $image))
+            .clipped()
+            .modifier(ImageContextMenuModifier(url: url, image: image, showShareSheet: $showShareSheet))
+            .sheet(isPresented: $showShareSheet) {
+                ShareSheet(activityItems: [url])
+            }
+    }
+}
+
+struct ImageView: View {
+    
+    let urls: [URL?]
+    
+    @Environment(\.presentationMode) var presentationMode
+    
+    @State private var selectedIndex = 0
+    @State var showMenu = true
+    
+    var navBarView: some View {
+        VStack {
+            HStack {
+                Text(urls[selectedIndex]?.lastPathComponent ?? "")
+                    .bold()
+                
+                Spacer()
+                
+                Button(action: {
+                    presentationMode.wrappedValue.dismiss()
+                }, label: {
+                    Image(systemName: "xmark")
+                })
+            }
+            .padding()
+            
+            Divider()
+                .ignoresSafeArea()
+        }
+        .background(.regularMaterial)
+    }
+    
+    var tabViewIndicator: some View {
+        HStack(spacing: 10) {
+            ForEach(urls.indices, id: \.self) { index in
+                Capsule()
+                    .fill(index == selectedIndex ? Color(UIColor.label) : Color.secondary)
+                    .frame(width: 7, height: 7)
+            }
+        }
+        .padding()
+        .background(.regularMaterial)
+        .clipShape(Capsule())
+    }
+    
+    var body: some View {
+        ZStack {
+            Color(.systemBackground)
+                .ignoresSafeArea()
+            
+            TabView(selection: $selectedIndex) {
+                ForEach(urls.indices, id: \.self) { index in
+                    ZoomableScrollView {
+                        ImageContainerView(url: urls[index])
+                            .aspectRatio(contentMode: .fit)
+                            .padding(.top, Theme.safeAreaInsets?.top)
+                            .padding(.bottom, Theme.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, Theme.safeAreaInsets?.bottom)
+            )
+        }
+    }
+}
 
 struct ImageCarousel: View {
     var urls: [URL]
     
-    let evid: String
+    @State var open_sheet: Bool = false
-    let previews: PreviewCache
+    @State var current_url: URL? = nil
-    
-    @State private var open_sheet: Bool = false
-    @State private var current_url: URL? = nil
-    @State private var image_fill: ImageFill? = nil
-    @State private var fillHeight: CGFloat = 350
-    @State private var maxHeight: CGFloat = UIScreen.main.bounds.height * 0.85
-    
-    init(previews: PreviewCache, evid: String, urls: [URL]) {
-        _open_sheet = State(initialValue: false)
-        _current_url = State(initialValue: nil)
-        _image_fill = State(initialValue: previews.lookup_image_meta(evid))
-        self.urls = urls
-        self.evid = evid
-        self.previews = previews
-    }
-    
-    var filling: Bool {
-        image_fill?.filling == true
-    }
-    
-    var height: CGFloat {
-        image_fill?.height ?? 0
-    }
     
     var body: some View {
         TabView {
@@ -75,32 +198,31 @@ struct ImageCarousel: View {
                 Rectangle()
                     .foregroundColor(Color.clear)
                     .overlay {
-                        GeometryReader { geo in
+                        KFAnimatedImage(url)
-                            KFAnimatedImage(url)
+                            .imageContext(.note)
-                                .callbackQueue(.dispatch(.global(qos:.background)))
+                            .cancelOnDisappear(true)
-                                .backgroundDecode(true)
+                            .configure { view in
-                                .imageContext(.note)
+                                view.framePreloadCount = 3
-                                .cancelOnDisappear(true)
+                            }
-                                .configure { view in
+                            .aspectRatio(contentMode: .fit)
-                                    view.framePreloadCount = 3
+                            .cornerRadius(10)
+                            .tabItem {
+                                Text(url.absoluteString)
+                            }
+                            .id(url.absoluteString)
+                            .contextMenu {
+                                Button(NSLocalizedString("Copy Image", comment: "Context menu option to copy an image to clipboard.")) {
+                                    UIPasteboard.general.string = url.absoluteString
                                 }
-                                .imageFill(for: geo.size, max: maxHeight, fill: fillHeight) { fill in
+                            }
-                                    previews.cache_image_meta(evid: evid, image_fill: fill)
-                                    image_fill = fill
-                                }
-                                .aspectRatio(contentMode: filling ? .fill : .fit)
-                                .tabItem {
-                                    Text(url.absoluteString)
-                                }
-                                .id(url.absoluteString)
-                        }
                     }
             }
         }
         .fullScreenCover(isPresented: $open_sheet) {
             ImageView(urls: urls)
         }
-        .frame(height: height)
+        .frame(height: 200)
+        .clipped()
         .onTapGesture {
             open_sheet = true
         }
@@ -108,71 +230,8 @@ struct ImageCarousel: View {
     }
 }
 
-// MARK: - Image Modifier
-extension KFOptionSetter {
-    /// Sets a block to get image size
-    ///
-    /// - Parameter block: The block which is used to read the image object.
-    /// - Returns: `Self` value after read size
-    public func imageFill(for size: CGSize, max: CGFloat, fill: CGFloat, block: @escaping (ImageFill) throws -> Void) -> Self {
-        let modifier = AnyImageModifier { image -> KFCrossPlatformImage in
-            let img_size = image.size
-            let geo_size = size
-            let fill = ImageFill.calculate_image_fill(geo_size: geo_size,
-                                                      img_size: img_size,
-                                                      maxHeight: max,
-                                                      fillHeight: fill)
-            DispatchQueue.main.async { [block, fill] in
-                try? block(fill)
-            }
-            return image
-        }
-        options.imageModifier = modifier
-        return self
-    }
-}
-
-
-public struct ImageFill {
-    let filling: Bool?
-    let height: CGFloat
-        
-    
-    static func determine_image_shape(_ size: CGSize) -> ImageShape {
-        guard size.height > 0 else {
-            return .unknown
-        }
-        let imageRatio = size.width / size.height
-        switch imageRatio {
-            case 1.0: return .square
-            case ..<1.0: return .portrait
-            case 1.0...: return .landscape
-            default: return .unknown
-        }
-    }
-    
-    static func calculate_image_fill(geo_size: CGSize, img_size: CGSize, maxHeight: CGFloat, fillHeight: CGFloat) -> ImageFill {
-        let shape = determine_image_shape(img_size)
-
-        let xfactor = geo_size.width / img_size.width
-        let scaled = img_size.height * xfactor
-        // calculate scaled image height
-        // set scale factor and constrain images to minimum 150
-        // and animations to scaled factor for dynamic size adjustment
-        switch shape {
-        case .portrait, .landscape:
-            let filling = scaled > maxHeight
-            let height = filling ? fillHeight : scaled
-            return ImageFill(filling: filling, height: height)
-        case .square, .unknown:
-            return ImageFill(filling: nil, height: scaled)
-        }
-    }
-}
-
 struct ImageCarousel_Previews: PreviewProvider {
     static var previews: some View {
-        ImageCarousel(previews: test_damus_state().previews, evid: "evid", urls: [URL(string: "https://jb55.com/red-me.jpg")!,URL(string: "https://jb55.com/red-me.jpg")!])
+        ImageCarousel(urls: [URL(string: "https://jb55.com/red-me.jpg")!,URL(string: "https://jb55.com/red-me.jpg")!])
     }
 }
-

damus/Components/InvoiceView.swift

@@ -29,7 +29,7 @@ struct InvoiceView: View {
                     .foregroundColor(.gray)
             } else {
                 Image(systemName: "checkmark.circle")
-                    .foregroundColor(DamusColors.green)
+                    .foregroundColor(Color("DamusGreen"))
             }
         }
     }

damus/Components/NIP05Badge.swift

@@ -24,33 +24,19 @@ struct NIP05Badge: View {
         self.clickable = clickable
     }
     
-    var nip05_color: Bool {
+    var nip05_color: Color {
-       return use_nip05_color(pubkey: pubkey, contacts: contacts)
+       return get_nip05_color(pubkey: pubkey, contacts: contacts)
-    }
-    
-    var Seal: some View {
-        Group {
-            if nip05_color {
-                LINEAR_GRADIENT
-                    .mask(Image(systemName: "checkmark.seal.fill")
-                        .resizable()
-                    ).frame(width: 14, height: 14)
-            } else {
-                Image(systemName: "checkmark.seal.fill")
-                    .font(.footnote)
-                    .foregroundColor(.gray)
-            }
-        }
     }
     
     var body: some View {
         HStack(spacing: 2) {
-            Seal
+            Image(systemName: "checkmark.seal.fill")
-            
+                .font(.footnote)
+                .foregroundColor(nip05_color)
             if show_domain {
                 if clickable {
                     Text(nip05.host)
-                        .nip05_colorized(gradient: nip05_color)
+                        .foregroundColor(nip05_color)
                         .onTapGesture {
                             if let nip5url = nip05.siteUrl {
                                 openURL(nip5url)
@@ -58,7 +44,7 @@ struct NIP05Badge: View {
                         }
                 } else {
                     Text(nip05.host)
-                        .foregroundColor(.gray)
+                        .foregroundColor(nip05_color)
                 }
             }
         }
@@ -66,19 +52,8 @@ struct NIP05Badge: View {
     }
 }
 
-extension View {
+func get_nip05_color(pubkey: String, contacts: Contacts) -> Color {
-    func nip05_colorized(gradient: Bool) -> some View {
+    return contacts.is_friend_or_self(pubkey) ? .accentColor : .gray
-        if gradient {
-            return AnyView(self.foregroundStyle(LINEAR_GRADIENT))
-        } else {
-            return AnyView(self.foregroundColor(.gray))
-        }
-        
-    }
-}
-
-func use_nip05_color(pubkey: String, contacts: Contacts) -> Bool {
-    return contacts.is_friend_or_self(pubkey) ? true : false
 }
 
 struct NIP05Badge_Previews: PreviewProvider {

damus/Components/Reposted.swift

@@ -15,10 +15,12 @@ struct Reposted: View {
     var body: some View {
         HStack(alignment: .center) {
             Image(systemName: "arrow.2.squarepath")
+                .font(.footnote)
                 .foregroundColor(Color.gray)
             ProfileName(pubkey: pubkey, profile: profile, damus: damus, show_friend_confirmed: true, show_nip5_domain: false)
                     .foregroundColor(Color.gray)
             Text("Reposted", comment: "Text indicating that the post was reposted (i.e. re-shared).")
+                .font(.footnote)
                 .foregroundColor(Color.gray)
         }
     }

damus/Components/SelectableText.swift

@@ -15,18 +15,15 @@ struct SelectableText: View {
     @State private var selectedTextHeight: CGFloat = .zero
     @State private var selectedTextWidth: CGFloat = .zero
     
-    let size: EventViewKind
-    
     var body: some View {
         GeometryReader { geo in
             TextViewRepresentable(
                 attributedString: attributedString,
                 textColor: UIColor.label,
-                font: eventviewsize_to_uifont(size),
+                font: UIFont.preferredFont(forTextStyle: .title2),
                 fixedWidth: selectedTextWidth,
                 height: $selectedTextHeight
             )
-            .padding([.leading, .trailing], -1.0)
             .onAppear {
                 self.selectedTextWidth = geo.size.width
             }
@@ -52,11 +49,8 @@ struct SelectableText: View {
         view.isEditable = false
         view.dataDetectorTypes = .all
         view.isSelectable = true
-        view.backgroundColor = .clear
         view.textContainer.lineFragmentPadding = 0
         view.textContainerInset = .zero
-        view.textContainerInset.left = 1.0
-        view.textContainerInset.right = 1.0
         return view
     }
 

damus/Components/ThiccDivider.swift

@@ -1,22 +0,0 @@
-//
-//  ThiccDivider.swift
-//  damus
-//
-//  Created by William Casarin on 2023-04-03.
-//
-
-import SwiftUI
-
-struct ThiccDivider: View {
-    var body: some View {
-        Rectangle()
-            .frame(height: 4)
-            .foregroundColor(DamusColors.adaptableGrey)
-    }
-}
-
-struct ThiccDivider_Previews: PreviewProvider {
-    static var previews: some View {
-        ThiccDivider()
-    }
-}

damus/Components/TranslateView.swift

@@ -8,184 +8,138 @@
 import SwiftUI
 import NaturalLanguage
 
-
-struct Translated: Equatable {
-    let artifacts: NoteArtifacts
-    let language: String
-}
-
-enum TranslateStatus: Equatable {
-    case havent_tried
-    case trying
-    case translating
-    case translated(Translated)
-    case not_needed
-}
-
 struct TranslateView: View {
     let damus_state: DamusState
     let event: NostrEvent
-    let size: EventViewKind
-    let currentLanguage: String
     
-    @State var translated: TranslateStatus
+    @State var checkingTranslationStatus: Bool = false
-    
+    @State var currentLanguage: String = "en"
-    init(damus_state: DamusState, event: NostrEvent, size: EventViewKind) {
+    @State var noteLanguage: String? = nil
-        self.damus_state = damus_state
+    @State var translated_note: String? = nil
-        self.event = event
+    @State var show_translated_note: Bool = false
-        self.size = size
+    @State var translated_artifacts: NoteArtifacts? = nil
-        
-        if #available(iOS 16, *) {
-            self.currentLanguage = Locale.current.language.languageCode?.identifier ?? "en"
-        } else {
-            self.currentLanguage = Locale.current.languageCode ?? "en"
-        }
-
-        if damus_state.pubkey == event.pubkey && damus_state.is_privkey_user {
-            // Do not translate self-authored notes if logged in with a private key
-            // as we can assume the user can understand their own notes.
-            // The detected language prediction could be incorrect and not in the list of preferred languages.
-            // Offering a translation in this case is definitely incorrect so let's avoid it altogether.
-            self._translated = State(initialValue: .not_needed)
-        } else if let cached = damus_state.events.lookup_translated_artifacts(evid: event.id) {
-            self._translated = State(initialValue: cached)
-        } else {
-            let initval: TranslateStatus = self.damus_state.settings.auto_translate ? .trying : .havent_tried
-            self._translated = State(initialValue: initval)
-        }
-    }
-    
-    let preferredLanguages = Set(Locale.preferredLanguages.map { localeToLanguage($0) })
     
     var TranslateButton: some View {
         Button(NSLocalizedString("Translate Note", comment: "Button to translate note from different language.")) {
-            self.translated = .trying
+            show_translated_note = true
         }
         .translate_button_style()
     }
     
-    func TranslatedView(lang: String?, artifacts: NoteArtifacts) -> some View {
+    func Translated(lang: String, artifacts: NoteArtifacts) -> some View {
-        return VStack(alignment: .leading) {
+        return Group {
-            Text(String(format: NSLocalizedString("Translated from %@", comment: "Button to indicate that the note has been translated from a different language."), lang ?? "ja"))
+            Button(NSLocalizedString("Translated from \(lang)", comment: "Button to indicate that the note has been translated from a different language.")) {
-                .foregroundColor(.gray)
+                show_translated_note = false
-                .font(.footnote)
-                .padding([.top, .bottom], 10)
-            
-            if self.size == .selected {
-                SelectableText(attributedString: artifacts.content.attributed, size: self.size)
-            } else {
-                artifacts.content.text
-                    .font(eventviewsize_to_font(self.size))
             }
+            .translate_button_style()
+            
+            SelectableText(attributedString: artifacts.content)
         }
     }
     
-    func failed_attempt() {
+    func CheckingStatus(lang: String) -> some View {
-        DispatchQueue.main.async {
+        return Button(NSLocalizedString("Translating from \(lang)...", comment: "Button to indicate that the note is in the process of being translated from a different language.")) {
-            self.translated = .not_needed
+            show_translated_note = false
-            damus_state.events.store_translation_artifacts(evid: event.id, translated: .not_needed)
         }
+        .translate_button_style()
     }
     
-    func attempt_translation() async {
+    func MainContent(note_lang: String) -> some View {
-        guard case .trying = translated else {
+        return Group {
-            return
+            let languageName = Locale.current.localizedString(forLanguageCode: note_lang)
-        }
+            if let lang = languageName, show_translated_note {
-        
+                if checkingTranslationStatus {
-        guard damus_state.settings.can_translate(damus_state.pubkey) else {
+                    CheckingStatus(lang: lang)
-            return
+                } else if let artifacts = translated_artifacts {
-        }
+                    Translated(lang: lang, artifacts: artifacts)
-        
+                }
-        let note_lang = event.note_language(damus_state.keypair.privkey) ?? currentLanguage
+            } else {
-        
+                TranslateButton
-        // Don't translate if its in our preferred languages
+            }
-        guard !preferredLanguages.contains(note_lang) else {
-            failed_attempt()
-            return
-        }
-        
-        DispatchQueue.main.async {
-            self.translated = .translating
-        }
-        
-        // If the note language is different from our preferred languages, send a translation request.
-        let translator = Translator(damus_state.settings)
-        let originalContent = event.get_content(damus_state.keypair.privkey)
-        let translated_note = try? await translator.translate(originalContent, from: note_lang, to: currentLanguage)
-        
-        guard let translated_note else {
-            // if its the same, give up and don't retry
-            failed_attempt()
-            return
-        }
-        
-        guard originalContent != translated_note else {
-            // if its the same, give up and don't retry
-            failed_attempt()
-            return
-        }
-
-        // Render translated note
-        let translated_blocks = event.get_blocks(content: translated_note)
-        let artifacts = render_blocks(blocks: translated_blocks, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey)
-        
-        // and cache it
-        DispatchQueue.main.async {
-            self.translated = .translated(Translated(artifacts: artifacts, language: note_lang))
-            damus_state.events.store_translation_artifacts(evid: event.id, translated: self.translated)
         }
     }
     
     var body: some View {
         Group {
-            switch translated {
+            if let note_lang = noteLanguage, noteLanguage != currentLanguage {
-            case .havent_tried:
+                MainContent(note_lang: note_lang)
-                if damus_state.settings.auto_translate {
+            } else {
-                    Text("")
-                } else {
-                    TranslateButton
-                }
-            case .trying:
                 Text("")
-            case .translating:
-                Text("Translating...", comment: "Text to display when waiting for the translation of a note to finish processing before showing it.")
-                    .foregroundColor(.gray)
-                    .font(.footnote)
-                    .padding([.top, .bottom], 10)
-            case .translated(let translated):
-                let languageName = Locale.current.localizedString(forLanguageCode: translated.language)
-                TranslatedView(lang: languageName, artifacts: translated.artifacts)
-            case .not_needed:
-                Text("")
-            }
-        }
-        .onChange(of: translated) { val in
-            guard case .trying = translated else {
-                return
-            }
-            
-            Task {
-                await attempt_translation()
             }
         }
         .task {
-            await attempt_translation()
+            guard noteLanguage == nil && !checkingTranslationStatus && damus_state.settings.can_translate(damus_state.pubkey) else {
-        }
+                return
-    }
+            }
-}
+            
+            checkingTranslationStatus = true
 
-extension View {
+            if #available(iOS 16, *) {
-    func translate_button_style() -> some View {
+                currentLanguage = Locale.current.language.languageCode?.identifier ?? "en"
-        return self
+            } else {
-            .font(.footnote)
+                currentLanguage = Locale.current.languageCode ?? "en"
-            .contentShape(Rectangle())
+            }
-            .padding([.top, .bottom], 10)
+
+            // Rely on Apple's NLLanguageRecognizer to tell us which language it thinks the note is in
+            // and filter on only the text portions of the content as URLs and hashtags confuse the language recognizer.
+            let originalBlocks = event.blocks(damus_state.keypair.privkey)
+            let originalOnlyText = originalBlocks.compactMap { $0.is_text }.joined(separator: " ")
+
+            // Only accept language recognition hypothesis if there's at least a 50% probability that it's accurate.
+            let languageRecognizer = NLLanguageRecognizer()
+            languageRecognizer.processString(originalOnlyText)
+            noteLanguage = languageRecognizer.languageHypotheses(withMaximum: 1).first(where: { $0.value >= 0.5 })?.key.rawValue ?? currentLanguage
+
+            if let lang = noteLanguage, noteLanguage != currentLanguage {
+                // If the detected dominant language is a variant, remove the variant component and just take the language part as translation services typically only supports the variant-less language.
+                if #available(iOS 16, *) {
+                    noteLanguage = Locale.LanguageCode(stringLiteral: lang).identifier(.alpha2)
+                } else {
+                    noteLanguage = NSLocale(localeIdentifier: lang).languageCode
+                }
+            }
+            
+            guard let note_lang = noteLanguage else {
+                noteLanguage = currentLanguage
+                translated_note = nil
+                checkingTranslationStatus = false
+                return
+            }
+            
+            if note_lang != currentLanguage {
+                do {
+                    // If the note language is different from our language, send a translation request.
+                    let translator = Translator(damus_state.settings)
+                    let originalContent = event.get_content(damus_state.keypair.privkey)
+                    translated_note = try await translator.translate(originalContent, from: note_lang, to: currentLanguage)
+
+                    if originalContent == translated_note {
+                        // If the translation is the same as the original, don't bother showing it.
+                        noteLanguage = currentLanguage
+                        translated_note = nil
+                    }
+                } catch {
+                    // If for whatever reason we're not able to figure out the language of the note, or translate the note, fail gracefully and do not retry. It's not the end of the world. Don't want to take down someone's translation server with an accidental denial of service attack.
+                    noteLanguage = currentLanguage
+                    translated_note = nil
+                }
+            }
+
+            if let translated = translated_note {
+                // Render translated note.
+                let translatedBlocks = event.get_blocks(content: translated)
+                translated_artifacts = render_blocks(blocks: translatedBlocks, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey)
+            }
+
+            checkingTranslationStatus = false
+        
+        }
     }
 }
 
 struct TranslateView_Previews: PreviewProvider {
     static var previews: some View {
         let ds = test_damus_state()
-        TranslateView(damus_state: ds, event: test_event, size: .normal)
+        TranslateView(damus_state: ds, event: test_event)
     }
 }

damus/Components/TruncatedText.swift

@@ -1,53 +0,0 @@
-//
-//  TruncatedText.swift
-//  damus
-//
-//  Created by William Casarin on 2023-04-06.
-//
-
-import SwiftUI
-
-struct TruncatedText: View {
-    let text: CompatibleText
-    let maxChars: Int = 280
-    
-    var body: some View {
-        let truncatedAttributedString: AttributedString? = getTruncatedString()
-        
-        if let truncatedAttributedString {
-            Text(truncatedAttributedString)
-                .fixedSize(horizontal: false, vertical: true)
-        } else {
-            text.text
-                .fixedSize(horizontal: false, vertical: true)
-        }
-        
-        if truncatedAttributedString != nil {
-            Spacer()
-            Button(NSLocalizedString("Show more", comment: "Button to show entire note.")) { }
-                .allowsHitTesting(false)
-        }
-    }
-    
-    func getTruncatedString() -> AttributedString? {
-        let nsAttributedString = NSAttributedString(text.attributed)
-        if nsAttributedString.length < maxChars { return nil }
-        
-        let range = NSRange(location: 0, length: maxChars)
-        let truncatedAttributedString = nsAttributedString.attributedSubstring(from: range)
-        
-        return AttributedString(truncatedAttributedString) + "..."
-    }
-}
-
-struct TruncatedText_Previews: PreviewProvider {
-    static var previews: some View {
-        VStack(spacing: 100) {
-            TruncatedText(text: CompatibleText(stringLiteral: "hello\nthere\none\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\neleven"))
-                .frame(width: 200, height: 200)
-            
-            TruncatedText(text: CompatibleText(stringLiteral: "hello\nthere\none\ntwo\nthree\nfour"))
-                .frame(width: 200, height: 200)
-        }
-    }
-}

damus/Components/UserView.swift

@@ -7,51 +7,27 @@
 
 import SwiftUI
 
-struct UserViewRow: View {
-    let damus_state: DamusState
-    let pubkey: String
-    
-    @State var navigating: Bool = false
-    
-    var body: some View {
-        let dest = ProfileView(damus_state: damus_state, pubkey: pubkey)
-        
-        UserView(damus_state: damus_state, pubkey: pubkey)
-            .contentShape(Rectangle())
-            .background(
-                NavigationLink(destination: dest, isActive: $navigating) {
-                    EmptyView()
-                }
-            )
-            .onTapGesture {
-                navigating = true
-            }
-    }
-}
-
 struct UserView: View {
     let damus_state: DamusState
     let pubkey: String
     
     var body: some View {
+        NavigationLink(destination: ProfileView(damus_state: damus_state, pubkey: pubkey)) {
+            ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles)
         
-        VStack {
+            VStack(alignment: .leading) {
-            HStack {
+                let profile = damus_state.profiles.lookup(id: pubkey)
-                ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles)
+                ProfileName(pubkey: pubkey, profile: profile, damus: damus_state, show_friend_confirmed: false, show_nip5_domain: false)
-            
+                if let about = profile?.about {
-                VStack(alignment: .leading) {
+                    Text(about)
-                    let profile = damus_state.profiles.lookup(id: pubkey)
+                        .lineLimit(3)
-                    ProfileName(pubkey: pubkey, profile: profile, damus: damus_state, show_friend_confirmed: false, show_nip5_domain: false)
+                        .font(.footnote)
-                    if let about = profile?.about {
-                        Text(about)
-                            .lineLimit(3)
-                            .font(.footnote)
-                    }
                 }
-                
-                Spacer()
             }
+            
+            Spacer()
         }
+        .buttonStyle(PlainButtonStyle())
     }
 }
 

damus/Components/WebsiteLink.swift

@@ -22,7 +22,6 @@ struct WebsiteLink: View {
             }, label: {
                 Text(link_text)
                     .font(.footnote)
-                    .foregroundColor(.accentColor)
             })
         }
     }

damus/Components/ZapButton.swift

@@ -68,28 +68,24 @@ struct ZapButton: View {
     
     var body: some View {
         HStack(spacing: 4) {
-            Button(action: {
+            Image(systemName: zap_img)
-            }, label: {
+                .foregroundColor(zap_color == nil ? Color.gray : zap_color!)
-                Image(systemName: zap_img)
+                .font(.footnote.weight(.medium))
-                    .foregroundColor(zap_color == nil ? Color.gray : zap_color!)
+                .onTapGesture {
-                    .font(.footnote.weight(.medium))
+                    if bar.zapped {
-            })
+                        //notify(.delete, bar.our_tip)
-            .simultaneousGesture(LongPressGesture().onEnded {_  in
+                    } else if !zapping {
-                guard !zapping else {
+                        self.showing_zap_customizer = true
-                    return
+                        //send_zap(damus_state: damus_state, event: event, lnurl: lnurl, is_custom: false)
+                        //self.zapping = true
+                    }
                 }
-                
+                .onLongPressGesture(minimumDuration: 0, pressing: { is_charing in
-                self.showing_zap_customizer = true
+                    self.is_charging = is_charging
-            })
+                }, perform: {
-            .highPriorityGesture(TapGesture().onEnded {_  in
+                    self.showing_zap_customizer = true
-                guard !zapping else {
+                })
-                    return
+                .accessibilityLabel(NSLocalizedString("Zap", comment: "Accessibility label for zap button"))
-                }
-                
-                send_zap(damus_state: damus_state, event: event, lnurl: lnurl, is_custom: false, comment: nil, amount_sats: nil, zap_type: ZapType.pub)
-                self.zapping = true
-            })
-            .accessibilityLabel(NSLocalizedString("Zap", comment: "Accessibility label for zap button"))
 
             if bar.zap_total > 0 {
                 Text(verbatim: format_msats_abbrev(bar.zap_total))
@@ -134,7 +130,7 @@ struct ZapButton: View {
 
 struct ZapButton_Previews: PreviewProvider {
     static var previews: some View {
-        let bar = ActionBarModel(likes: 0, boosts: 0, zaps: 10, zap_total: 15623414, replies: 2, our_like: nil, our_boost: nil, our_zap: nil, our_reply: nil)
+        let bar = ActionBarModel(likes: 0, boosts: 0, zaps: 10, zap_total: 15623414, our_like: nil, our_boost: nil, our_zap: nil)
         ZapButton(damus_state: test_damus_state(), event: test_event, lnurl: "lnurl", bar: bar)
     }
 }

damus/ContentView.swift

@@ -8,10 +8,19 @@
 import SwiftUI
 import Starscream
 
+var BOOTSTRAP_RELAYS = [
+    "wss://relay.damus.io",
+    "wss://eden.nostr.land",
+    "wss://relay.snort.social",
+    "wss://offchain.pub",
+    "wss://nos.lol",
+    "wss://relay.current.fyi",
+    "wss://brb.io",
+]
+
 struct TimestampedProfile {
     let profile: Profile
     let timestamp: Int64
-    let event: NostrEvent
 }
 
 enum Sheets: Identifiable {
@@ -66,20 +75,20 @@ struct ContentView: View {
     @State var active_sheet: Sheets? = nil
     @State var damus_state: DamusState? = nil
     @State var selected_timeline: Timeline? = .home
+    @State var is_thread_open: Bool = false
     @State var is_deleted_account: Bool = false
     @State var is_profile_open: Bool = false
     @State var event: NostrEvent? = nil
     @State var active_profile: String? = nil
     @State var active_search: NostrFilter? = nil
-    @State var active_event: NostrEvent? = nil
+    @State var active_event_id: String? = nil
     @State var profile_open: Bool = false
     @State var thread_open: Bool = false
     @State var search_open: Bool = false
-    @State var muting: String? = nil
+    @State var blocking: String? = nil
-    @State var confirm_mute: Bool = false
+    @State var confirm_block: Bool = false
-    @State var user_muted_confirm: Bool = false
+    @State var user_blocked_confirm: Bool = false
     @State var confirm_overwrite_mutelist: Bool = false
-    @State var current_boost: NostrEvent? = nil
     @State var filter_state : FilterState = .posts_and_replies
     @State private var isSideBarOpened = false
     @StateObject var home: HomeModel = HomeModel()
@@ -90,19 +99,11 @@ struct ContentView: View {
     let sub_id = UUID().description
     
     @Environment(\.colorScheme) var colorScheme
-    
+
-    var mystery: some View {
-        Text("Are you lost?", comment: "Text asking the user if they are lost in the app.")
-        .id("what")
-    }
-    
     var PostingTimelineView: some View {
         VStack {
             ZStack {
                 TabView(selection: $filter_state) {
-                    // This is needed or else there is a bug when switching from the 3rd or 2nd tab to first. no idea why.
-                    mystery
-                    
                     contentTimelineView(filter: FilterState.posts.filter)
                         .tag(FilterState.posts)
                         .id(FilterState.posts)
@@ -146,10 +147,28 @@ struct ContentView: View {
         search_open = false
         isSideBarOpened = false
     }
-    
+
-    var timelineNavItem: Text {
+    var timelineNavItem: some View {
-        return Text(timeline_name(selected_timeline))
+        VStack {
-            .bold()
+            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("Universe 🛸", comment: "Toolbar label for the universal view where posts from all connected relay servers appear.")
+                    .bold()
+            case .none:
+                Text(verbatim: "")
+            }
+        }
     }
     
     func MainContent(damus: DamusState) -> some View {
@@ -157,57 +176,41 @@ struct ContentView: View {
             NavigationLink(destination: MaybeProfileView, isActive: $profile_open) {
                 EmptyView()
             }
-            if let active_event {
+            NavigationLink(destination: MaybeThreadView, isActive: $thread_open) {
-                let thread = ThreadModel(event: active_event, damus_state: damus_state!)
+                EmptyView()
-                NavigationLink(destination: ThreadView(state: damus_state!, thread: thread), isActive: $thread_open) {
-                    EmptyView()
-                }
             }
             NavigationLink(destination: MaybeSearchView, isActive: $search_open) {
                 EmptyView()
             }
             switch selected_timeline {
             case .search:
-                if #available(iOS 16.0, *) {
+                SearchHomeView(damus_state: damus_state!, model: SearchHomeModel(damus_state: damus_state!))
-                    SearchHomeView(damus_state: damus_state!, model: SearchHomeModel(damus_state: damus_state!))
-                        .scrollDismissesKeyboard(.immediately)
-                } else {
-                    // Fallback on earlier versions
-                    SearchHomeView(damus_state: damus_state!, model: SearchHomeModel(damus_state: damus_state!))
-                }
                 
             case .home:
                 PostingTimelineView
                 
             case .notifications:
-                NotificationsView(state: damus, notifications: home.notifications)
+                VStack(spacing: 0) {
-                
+                    Divider()
+                    NotificationsView(state: damus, notifications: home.notifications)
+                }
             case .dms:
-                DirectMessagesView(damus_state: damus_state!, model: damus_state!.dms)
+                DirectMessagesView(damus_state: damus_state!)
+                    .environmentObject(home.dms)
             
             case .none:
                 EmptyView()
             }
         }
-        .navigationBarTitle(timeline_name(selected_timeline), displayMode: .inline)
+        .navigationBarTitle(selected_timeline == .home ?  NSLocalizedString("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.") : NSLocalizedString("Universe 🛸", comment: "Navigation bar title for universal view where posts from all connected relay servers appear."), displayMode: .inline)
         .toolbar {
             ToolbarItem(placement: .principal) {
-                VStack {
+                timelineNavItem
-                    if selected_timeline == .home {
+                    .opacity(isSideBarOpened ? 0 : 1)
-                        Image("damus-home")
+                    .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
-                            .resizable()
-                            .frame(width:30,height:30)
-                            .shadow(color: DamusColors.purple, radius: 2)
-                            .opacity(isSideBarOpened ? 0 : 1)
-                            .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
-                    } else {
-                        timelineNavItem
-                            .opacity(isSideBarOpened ? 0 : 1)
-                            .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
-                    }
-                }
             }
         }
+        .ignoresSafeArea(.keyboard)
     }
     
     var MaybeSearchView: some View {
@@ -220,6 +223,16 @@ struct ContentView: View {
         }
     }
     
+    var MaybeThreadView: some View {
+        Group {
+            if let evid = self.active_event_id {
+                BuildThreadV2View(damus: damus_state!, event_id: evid)
+            } else {
+                EmptyView()
+            }
+        }
+    }
+    
     var MaybeProfileView: some View {
         Group {
             if let pk = self.active_profile {
@@ -234,9 +247,9 @@ struct ContentView: View {
     
     func MaybeReportView(target: ReportTarget) -> some View {
         Group {
-            if let damus_state {
+            if let ds = damus_state {
-                if let sec = damus_state.keypair.privkey {
+                if let sec = ds.keypair.privkey {
-                    ReportView(postbox: damus_state.postbox, target: target, privkey: sec)
+                    ReportView(pool: ds.pool, target: target, privkey: sec)
                 } else {
                     EmptyView()
                 }
@@ -246,62 +259,63 @@ struct ContentView: View {
         }
     }
     
-    func open_event(ev: NostrEvent) {
-        self.active_event = ev
-        self.thread_open = true
-    }
-    
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
             if let damus = self.damus_state {
                 NavigationView {
-                    TabView { // Prevents navbar appearance change on scroll
+                    ZStack {
-                        MainContent(damus: damus)
+                        TabView { // Prevents navbar appearance change on scroll
-                            .toolbar() {
+                            MainContent(damus: damus)
-                                ToolbarItem(placement: .navigationBarLeading) {
+                                .toolbar() {
-                                    Button {
+                                    ToolbarItem(placement: .navigationBarLeading) {
-                                        isSideBarOpened.toggle()
+                                        Button {
-                                    } label: {
+                                            isSideBarOpened.toggle()
-                                        ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles)
+                                        } label: {
-                                            .opacity(isSideBarOpened ? 0 : 1)
+                                            ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles)
-                                            .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
+                                                .opacity(isSideBarOpened ? 0 : 1)
+                                                .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
+                                        }
+                                        .disabled(isSideBarOpened)
                                     }
-                                    .disabled(isSideBarOpened)
+                                    
-                                }
+                                    ToolbarItem(placement: .navigationBarTrailing) {
-                                
+                                        HStack(alignment: .center) {
-                                ToolbarItem(placement: .navigationBarTrailing) {
+                                            if home.signal.signal != home.signal.max_signal {
-                                    HStack(alignment: .center) {
+                                                NavigationLink(destination: RelayConfigView(state: damus_state!)) {
-                                        SignalView(state: damus_state!, signal: home.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)
-                                        // maybe expand this to other timelines in the future
+                                                        .foregroundColor(.gray)
-                                        if selected_timeline == .search {
+                                                }
-                                            Button(action: {
+                                            }
-                                                //isFilterVisible.toggle()
+                                            
-                                                self.active_sheet = .filter
+                                            // maybe expand this to other timelines in the future
-                                            }) {
+                                            if selected_timeline == .search {
-                                                // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease...,  line.3.horizontail.decrease
+                                                Button(action: {
-                                                Label(NSLocalizedString("Filter", comment: "Button label text for filtering relay servers."), systemImage: "line.3.horizontal.decrease")
+                                                    //isFilterVisible.toggle()
-                                                    .foregroundColor(.gray)
+                                                    self.active_sheet = .filter
-                                                    //.contentShape(Rectangle())
+                                                }) {
+                                                    // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease...,  line.3.horizontail.decrease
+                                                    Label(NSLocalizedString("Filter", comment: "Button label text for filtering relay servers."), systemImage: "line.3.horizontal.decrease")
+                                                        .foregroundColor(.gray)
+                                                        //.contentShape(Rectangle())
+                                                }
                                             }
                                         }
                                     }
                                 }
-                            }
+                        }
+                        .tabViewStyle(.page(indexDisplayMode: .never))
                     }
-                    .tabViewStyle(.page(indexDisplayMode: .never))
                     .overlay(
                         SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
                     )
                 }
                 .navigationViewStyle(.stack)
             
-                TabBar(new_events: $home.new_events, selected: $selected_timeline, settings: damus.settings, action: switch_timeline)
+                TabBar(new_events: $home.new_events, selected: $selected_timeline, isSidebarVisible: $isSideBarOpened, action: switch_timeline)
                     .padding([.bottom], 8)
-                    .background(Color(uiColor: .systemBackground).ignoresSafeArea())
             }
         }
-        .ignoresSafeArea(.keyboard)
         .onAppear() {
             self.connect()
             setup_notifications()
@@ -311,9 +325,9 @@ struct ContentView: View {
             case .report(let target):
                 MaybeReportView(target: target)
             case .post:
-                PostView(replying_to: nil, damus_state: damus_state!)
+                PostView(replying_to: nil, references: [], damus_state: damus_state!)
             case .reply(let event):
-                PostView(replying_to: event, damus_state: damus_state!)
+                ReplyView(replying_to: event, damus: damus_state!)
             case .event:
                 EventDetailView()
             case .filter:
@@ -338,11 +352,8 @@ struct ContentView: View {
                     active_profile = ref.ref_id
                     profile_open = true
                 } else if ref.key == "e" {
-                    find_event(state: damus_state!, evid: ref.ref_id, search_type: .event, find_from: nil) { ev in
+                    active_event_id = ref.ref_id
-                        if let ev {
+                    thread_open = true
-                            open_event(ev: ev)
-                        }
-                    }
                 }
             case .filter(let filt):
                 active_search = filt
@@ -353,7 +364,17 @@ struct ContentView: View {
             
         }
         .onReceive(handle_notify(.boost)) { notif in
-            current_boost = (notif.object as? NostrEvent)
+            guard let privkey = self.privkey else {
+                return
+            }
+            let ev = notif.object as! NostrEvent
+            let boost = make_boost_event(pubkey: pubkey, privkey: privkey, boosted: ev)
+            self.damus_state?.pool.send(.event(boost))
+        }
+        .onReceive(handle_notify(.open_thread)) { obj in
+            //let ev = obj.object as! NostrEvent
+            //thread.set_active_event(ev)
+            //is_thread_open = true
         }
         .onReceive(handle_notify(.reply)) { notif in
             let ev = notif.object as! NostrEvent
@@ -368,20 +389,14 @@ struct ContentView: View {
             let target = notif.object as! ReportTarget
             self.active_sheet = .report(target)
         }
-        .onReceive(handle_notify(.mute)) { notif in
+        .onReceive(handle_notify(.block)) { notif in
             let pubkey = notif.object as! String
-            self.muting = pubkey
+            self.blocking = pubkey
-            self.confirm_mute = true
+            self.confirm_block = true
         }
         .onReceive(handle_notify(.broadcast_event)) { obj in
             let ev = obj.object as! NostrEvent
-            guard let ds = self.damus_state else {
+            self.damus_state?.pool.send(.event(ev))
-                return
-            }
-            ds.postbox.send(ev)
-            if let profile = ds.profiles.profiles[ev.pubkey] {
-                ds.postbox.send(profile.event)
-            }
         }
         .onReceive(handle_notify(.unfollow)) { notif in
             guard let privkey = self.privkey else {
@@ -395,7 +410,7 @@ struct ContentView: View {
             let target = notif.object as! FollowTarget
             let pk = target.pubkey
             
-            if let ev = unfollow_user(postbox: damus.postbox,
+            if let ev = unfollow_user(pool: damus.pool,
                                       our_contacts: damus.contacts.event,
                                       pubkey: damus.pubkey,
                                       privkey: privkey,
@@ -446,16 +461,7 @@ struct ContentView: View {
                 //let to_relays = tup.1
                 print("post \(post.content)")
                 let new_ev = post_to_event(post: post, privkey: privkey, pubkey: pubkey)
-                guard let ds = self.damus_state else {
+                self.damus_state?.pool.send(.event(new_ev))
-                    return
-                }
-                ds.postbox.send(new_ev)
-                for eref in new_ev.referenced_ids.prefix(3) {
-                    // also broadcast at most 3 referenced events
-                    if let ev = ds.events.lookup(eref.ref_id) {
-                        ds.postbox.send(ev)
-                    }
-                }
             case .cancel:
                 active_sheet = nil
                 print("post cancelled")
@@ -467,58 +473,29 @@ struct ContentView: View {
         .onReceive(handle_notify(.new_mutes)) { notif in
             home.filter_muted()
         }
-        .onReceive(handle_notify(.mute_thread)) { notif in
-            home.filter_muted()
-        }
-        .onReceive(handle_notify(.unmute_thread)) { notif in
-            home.filter_muted()
-        }
-        .onReceive(handle_notify(.local_notification)) { notif in
-            let local = notif.object as! LossyLocalNotification
-            
-            guard let damus_state else {
-                return
-            }
-            
-            guard let target = damus_state.events.lookup(local.event_id) else {
-                return
-            }
-            
-            switch local.type {
-            case .dm:
-                selected_timeline = .dms
-                damus_state.dms.open_dm_by_pk(target.pubkey)
-                
-            case .like: fallthrough
-            case .zap: fallthrough
-            case .mention: fallthrough
-            case .repost:
-                open_event(ev: target)
-            }
-        }
         .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 muted", comment: "Alert message to indicate the user has been muted"), isPresented: $user_muted_confirm, actions: {
+        .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 muted a user was successful.")) {
+            Button(NSLocalizedString("Thanks!", comment: "Button to close out of alert that informs that the action to block a user was successful.")) {
-                user_muted_confirm = false
+                user_blocked_confirm = false
             }
         }, message: {
-            if let pubkey = self.muting {
+            if let pubkey = self.blocking {
                 let profile = damus_state!.profiles.lookup(id: pubkey)
-                let name = Profile.displayName(profile: profile, pubkey: pubkey).username
+                let name = Profile.displayName(profile: profile, pubkey: pubkey)
-                Text("\(name) has been muted", comment: "Alert message that informs a user was muted.")
+                Text("\(name) has been blocked", comment: "Alert message that informs a user was blocked.")
             } else {
-                Text("User has been muted", comment: "Alert message that informs a user was d.")
+                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_mute = false
+                confirm_block = false
             }
 
             Button(NSLocalizedString("Yes, Overwrite", comment: "Text of button that confirms to overwrite the existing mutelist.")) {
@@ -530,7 +507,7 @@ struct ContentView: View {
                     return
                 }
                 
-                guard let pubkey = muting else {
+                guard let pubkey = blocking else {
                     return
                 }
                 
@@ -539,20 +516,20 @@ struct ContentView: View {
                 }
                 
                 damus_state?.contacts.set_mutelist(mutelist)
-                ds.postbox.send(mutelist)
+                ds.pool.send(.event(mutelist))
 
                 confirm_overwrite_mutelist = false
-                confirm_mute = false
+                confirm_block = false
-                user_muted_confirm = true
+                user_blocked_confirm = true
             }
         }, message: {
-            Text("No mute list found, create a new one? This will overwrite any previous mute lists.", comment: "Alert message prompt that asks if the user wants to create a new mute list, overwriting previous mute lists.")
+            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("Mute User", comment: "Title of alert for muting a user."), isPresented: $confirm_mute, actions: {
+        .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 muting a user."), role: .cancel) {
+            Button(NSLocalizedString("Cancel", comment: "Alert button to cancel out of alert for blocking a user."), role: .cancel) {
-                confirm_mute = false
+                confirm_block = false
             }
-            Button(NSLocalizedString("Mute", comment: "Alert button to mute a user."), role: .destructive) {
+            Button(NSLocalizedString("Block", comment: "Alert button to block a user."), role: .destructive) {
                 guard let ds = damus_state else {
                     return
                 }
@@ -563,7 +540,7 @@ struct ContentView: View {
                     guard let keypair = ds.keypair.to_full() else {
                         return
                     }
-                    guard let pubkey = muting else {
+                    guard let pubkey = blocking else {
                         return
                     }
 
@@ -571,35 +548,21 @@ struct ContentView: View {
                         return
                     }
                     damus_state?.contacts.set_mutelist(ev)
-                    ds.postbox.send(ev)
+                    ds.pool.send(.event(ev))
                 }
             }
         }, message: {
-            if let pubkey = muting {
+            if let pubkey = blocking {
                 let profile = damus_state?.profiles.lookup(id: pubkey)
-                let name = Profile.displayName(profile: profile, pubkey: pubkey).username
+                let name = Profile.displayName(profile: profile, pubkey: pubkey)
-                Text("Mute \(name)?", comment: "Alert message prompt to ask if a user should be muted.")
+                Text("Block \(name)?", comment: "Alert message prompt to ask if a user should be blocked.")
             } else {
-                Text("Could not find user to mute...", comment: "Alert message to indicate that the muted user could not be found.")
+                Text("Could not find user to block...", comment: "Alert message to indicate that the blocked user could not be found.")
             }
         })
-        .alert(NSLocalizedString("Repost", comment: "Title of alert for confirming to repost a post."), isPresented: $current_boost.mappedToBool()) {
-            Button(NSLocalizedString("Cancel", comment: "Button to cancel out of reposting a post.")) {
-                current_boost = nil
-            }
-            Button(NSLocalizedString("Repost", comment: "Button to confirm reposting a post.")) {
-                if let current_boost {
-                    self.damus_state?.postbox.send(current_boost)
-                }
-            }
-        } message: {
-            Text("Are you sure you want to repost this?", comment: "Alert message to ask if user wants to repost a post.")
-        }
     }
     
     func switch_timeline(_ timeline: Timeline) {
-        self.isSideBarOpened = false
-        
         self.popToRoot()
         NotificationCenter.default.post(name: .switched_timeline, object: timeline)
         
@@ -628,10 +591,9 @@ struct ContentView: View {
         let pool = RelayPool()
         let metadatas = RelayMetadatas()
         let relay_filters = RelayFilters(our_pubkey: pubkey)
-        let bootstrap_relays = load_bootstrap_relays(pubkey: pubkey)
         
         let new_relay_filters = load_relay_filters(pubkey) == nil
-        for relay in bootstrap_relays {
+        for relay in BOOTSTRAP_RELAYS {
             if let url = URL(string: relay) {
                 add_new_relay(relay_filters: relay_filters, metadatas: metadatas, pool: pool, url: url, info: .rw, new_relay_filters: new_relay_filters)
             }
@@ -654,12 +616,7 @@ struct ContentView: View {
                                       relay_filters: relay_filters,
                                       relay_metadata: metadatas,
                                       drafts: Drafts(),
-                                      events: EventCache(),
+                                      events: EventCache()
-                                      bookmarks: BookmarksManager(pubkey: pubkey),
-                                      postbox: PostBox(pool: pool),
-                                      bootstrap_relays: bootstrap_relays,
-                                      replies: ReplyCounter(our_pubkey: pubkey),
-                                      muted_threads: MutedThreadsManager(keypair: keypair)
         )
         home.damus_state = self.damus_state!
         
@@ -808,69 +765,3 @@ func setup_notifications() {
     }
 }
 
-func find_event(state: DamusState, evid: String, search_type: SearchType, find_from: [String]?, callback: @escaping (NostrEvent?) -> ()) {
-    if let ev = state.events.lookup(evid) {
-        callback(ev)
-        return
-    }
-    
-    let subid = UUID().description
-    
-    var has_event = false
-    
-    var filter = search_type == .event ? NostrFilter.filter_ids([ evid ]) : NostrFilter.filter_authors([ evid ])
-    
-    if search_type == .profile {
-        filter.kinds = [0]
-    }
-    
-    filter.limit = 1
-    var attempts = 0
-    
-    state.pool.subscribe_to(sub_id: subid, filters: [filter], to: find_from) { relay_id, res  in
-        guard case .nostr_event(let ev) = res else {
-            return
-        }
-        
-        guard ev.subid == subid else {
-            return
-        }
-        
-        switch ev {
-        case .ok:
-            break
-        case .event(_, let ev):
-            has_event = true
-            callback(ev)
-            state.pool.unsubscribe(sub_id: subid)
-        case .eose:
-            if !has_event {
-                attempts += 1
-                if attempts == state.pool.descriptors.count / 2 {
-                    callback(nil)
-                }
-                state.pool.unsubscribe(sub_id: subid, to: [relay_id])
-            }
-        case .notice(_):
-            break
-        }
-
-    }
-}
-
-
-func timeline_name(_ timeline: Timeline?) -> String {
-    guard let timeline else {
-        return ""
-    }
-    switch timeline {
-    case .home:
-        return NSLocalizedString("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.")
-    case .notifications:
-        return NSLocalizedString("Notifications", comment: "Toolbar label for Notifications view.")
-    case .search:
-        return NSLocalizedString("Universe 🛸", comment: "Toolbar label for the universal view where posts from all connected relay servers appear.")
-    case .dms:
-        return NSLocalizedString("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.")
-    }
-}

damus/Info.plist

@@ -14,16 +14,6 @@
 				<string>nostr</string>
 			</array>
 		</dict>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-			<key>CFBundleURLName</key>
-			<string>io.damus</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>damus</string>
-			</array>
-		</dict>
 	</array>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
@@ -46,9 +36,5 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
-	<key>NSCameraUsageDescription</key>
-	<string>Damus needs access to your camera if you want to upload photos from it</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>Damus needs access to your microphone if you want to upload recorded videos from it</string>
 </dict>
 </plist>

damus/Models/ActionBarModel.swift

@@ -11,40 +11,34 @@ import Foundation
 class ActionBarModel: ObservableObject {
     @Published var our_like: NostrEvent?
     @Published var our_boost: NostrEvent?
-    @Published var our_reply: NostrEvent?
     @Published var our_zap: Zap?
     @Published var likes: Int
     @Published var boosts: Int
     @Published var zaps: Int
     @Published var zap_total: Int64
-    @Published var replies: Int
     
     static func empty() -> ActionBarModel {
-        return ActionBarModel(likes: 0, boosts: 0, zaps: 0, zap_total: 0, replies: 0, our_like: nil, our_boost: nil, our_zap: nil, our_reply: nil)
+        return ActionBarModel(likes: 0, boosts: 0, zaps: 0, zap_total: 0, our_like: nil, our_boost: nil, our_zap: nil)
     }
     
-    init(likes: Int, boosts: Int, zaps: Int, zap_total: Int64, replies: Int, our_like: NostrEvent?, our_boost: NostrEvent?, our_zap: Zap?, our_reply: NostrEvent?) {
+    init(likes: Int, boosts: Int, zaps: Int, zap_total: Int64, our_like: NostrEvent?, our_boost: NostrEvent?, our_zap: Zap?) {
         self.likes = likes
         self.boosts = boosts
         self.zaps = zaps
-        self.replies = replies
         self.zap_total = zap_total
         self.our_like = our_like
         self.our_boost = our_boost
         self.our_zap = our_zap
-        self.our_reply = our_reply
     }
     
     func update(damus: DamusState, evid: String) {
         self.likes = damus.likes.counts[evid] ?? 0
         self.boosts = damus.boosts.counts[evid] ?? 0
         self.zaps = damus.zaps.event_counts[evid] ?? 0
-        self.replies = damus.replies.get_replies(evid)
         self.zap_total = damus.zaps.event_totals[evid] ?? 0
         self.our_like = damus.likes.our_events[evid]
         self.our_boost = damus.boosts.our_events[evid]
         self.our_zap = damus.zaps.our_zaps[evid]?.first
-        self.our_reply = damus.replies.our_reply(evid)
         self.objectWillChange.send()
     }
     
@@ -60,10 +54,6 @@ class ActionBarModel: ObservableObject {
         return our_like != nil
     }
     
-    var replied: Bool {
-        return our_reply != nil
-    }
-    
     var boosted: Bool {
         return our_boost != nil
     }

damus/Models/BookmarksManager.swift

@@ -7,65 +7,44 @@
 
 import Foundation
 
-fileprivate func get_bookmarks_key(pubkey: String) -> String {
+class BookmarksManager {
-    pk_setting_key(pubkey, key: "bookmarks")
-}
-
-func load_bookmarks(pubkey: String) -> [NostrEvent] {
-    let key = get_bookmarks_key(pubkey: pubkey)
-    return (UserDefaults.standard.stringArray(forKey: key) ?? []).compactMap {
-        event_from_json(dat: $0)
-    }
-}
-
-func save_bookmarks(pubkey: String, current_value: [NostrEvent], value: [NostrEvent]) -> Bool {
-    let uniq_bookmarks = Array(Set(value))
-    
-    if uniq_bookmarks != current_value {
-        let encoded = uniq_bookmarks.map(event_to_json)
-        UserDefaults.standard.set(encoded, forKey: get_bookmarks_key(pubkey: pubkey))
-        return true
-    }
-    
-    return false
-}
-
-class BookmarksManager: ObservableObject {
     
     private let userDefaults = UserDefaults.standard
     private let pubkey: String
     
-    private var _bookmarks: [NostrEvent]
+    init(pubkey: String) {
-    var bookmarks: [NostrEvent] {
+        self.pubkey = pubkey
+    }
+    
+    var bookmarks: [String] {
         get {
-            return _bookmarks
+            return userDefaults.stringArray(forKey: storageKey()) ?? []
         }
         set {
-            if save_bookmarks(pubkey: pubkey, current_value: _bookmarks, value: newValue) {
+            let uniqueBookmarks = Array(Set(newValue))
-                self._bookmarks = newValue
+            if uniqueBookmarks != bookmarks {
-                self.objectWillChange.send()
+                userDefaults.set(uniqueBookmarks, forKey: storageKey())
             }
         }
     }
     
-    init(pubkey: String) {
+    func isBookmarked(_ string: String) -> Bool {
-        self._bookmarks = load_bookmarks(pubkey: pubkey)
+        return bookmarks.contains(string)
-        self.pubkey = pubkey
     }
     
-    func isBookmarked(_ ev: NostrEvent) -> Bool {
+    func updateBookmark(_ string: String) {
-        return bookmarks.contains(ev)
+        if isBookmarked(string) {
-    }
+            bookmarks = bookmarks.filter { $0 != string }
-    
-    func updateBookmark(_ ev: NostrEvent) {
-        if isBookmarked(ev) {
-            bookmarks = bookmarks.filter { $0 != ev }
         } else {
-            bookmarks.insert(ev, at: 0)
+            bookmarks.append(string)
         }
     }
     
     func clearAll() {
         bookmarks = []
     }
+    
+    private func storageKey() -> String {
+        pk_setting_key(pubkey, key: "bookmarks")
+    }
 }

damus/Models/Contacts.swift

@@ -140,7 +140,7 @@ func follow_user(pool: RelayPool, our_contacts: NostrEvent?, pubkey: String, pri
     return ev
 }
 
-func unfollow_user(postbox: PostBox, our_contacts: NostrEvent?, pubkey: String, privkey: String, unfollow: String) -> NostrEvent? {
+func unfollow_user(pool: RelayPool, our_contacts: NostrEvent?, pubkey: String, privkey: String, unfollow: String) -> NostrEvent? {
     guard let cs = our_contacts else {
         return nil
     }
@@ -149,7 +149,7 @@ func unfollow_user(postbox: PostBox, our_contacts: NostrEvent?, pubkey: String,
     ev.calculate_id()
     ev.sign(privkey: privkey)
     
-    postbox.send(ev)
+    pool.send(.event(ev))
     
     return ev
 }

damus/Models/CreateAccountModel.swift

@@ -14,7 +14,6 @@ class CreateAccountModel: ObservableObject {
     @Published var about: String = ""
     @Published var pubkey: String = ""
     @Published var privkey: String = ""
-    @Published var profile_image: String? = nil
     
     var pubkey_bech32: String {
         return bech32_pubkey(self.pubkey) ?? ""

damus/Models/DamusState.swift

@@ -25,11 +25,6 @@ struct DamusState {
     let relay_metadata: RelayMetadatas
     let drafts: Drafts
     let events: EventCache
-    let bookmarks: BookmarksManager
-    let postbox: PostBox
-    let bootstrap_relays: [String]
-    let replies: ReplyCounter
-    let muted_threads: MutedThreadsManager
     
     var pubkey: String {
         return keypair.pubkey
@@ -40,5 +35,6 @@ struct DamusState {
     }
     
     static var empty: DamusState {
-        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(our_pubkey: ""), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel(our_pubkey: ""), previews: PreviewCache(), zaps: Zaps(our_pubkey: ""), lnurls: LNUrls(), settings: UserSettingsStore(), relay_filters: RelayFilters(our_pubkey: ""), relay_metadata: RelayMetadatas(), drafts: Drafts(), events: EventCache(), bookmarks: BookmarksManager(pubkey: ""), postbox: PostBox(pool: RelayPool()), bootstrap_relays: [], replies: ReplyCounter(our_pubkey: ""), muted_threads: MutedThreadsManager(keypair: Keypair(pubkey: "", privkey: nil))) }
+        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(our_pubkey: ""), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel(our_pubkey: ""), previews: PreviewCache(), zaps: Zaps(our_pubkey: ""), lnurls: LNUrls(), settings: UserSettingsStore(), relay_filters: RelayFilters(our_pubkey: ""), relay_metadata: RelayMetadatas(), drafts: Drafts(), events: EventCache())
+    }
 }

damus/Models/DirectMessageModel.swift

@@ -16,8 +16,6 @@ class DirectMessageModel: ObservableObject {
 
     @Published var draft: String
     
-    let pubkey: String
-    
     var is_request: Bool
     var our_pubkey: String
     
@@ -31,19 +29,17 @@ class DirectMessageModel: ObservableObject {
         return true
     }
     
-    init(events: [NostrEvent], our_pubkey: String, pubkey: String) {
+    init(events: [NostrEvent], our_pubkey: String) {
         self.events = events
         self.is_request = false
         self.our_pubkey = our_pubkey
         self.draft = ""
-        self.pubkey = pubkey
     }
     
-    init(our_pubkey: String, pubkey: String) {
+    init(our_pubkey: String) {
         self.events = []
         self.is_request = false
         self.our_pubkey = our_pubkey
         self.draft = ""
-        self.pubkey = pubkey
     }
 }

damus/Models/DirectMessagesModel.swift

@@ -8,43 +8,20 @@
 import Foundation
 
 class DirectMessagesModel: ObservableObject {
-    @Published var dms: [DirectMessageModel] = []
+    @Published var dms: [(String, DirectMessageModel)] = []
     @Published var loading: Bool = false
-    @Published var open_dm: Bool = false
-    @Published private(set) var active_model: DirectMessageModel = DirectMessageModel(our_pubkey: "", pubkey: "")
     let our_pubkey: String
     
     init(our_pubkey: String) {
         self.our_pubkey = our_pubkey
     }
     
-    var message_requests: [DirectMessageModel] {
+    var message_requests: [(String, DirectMessageModel)] {
-        return dms.filter { dm in dm.is_request }
+        return dms.filter { dm in dm.1.is_request }
     }
     
-    var friend_dms: [DirectMessageModel] {
+    var friend_dms: [(String, DirectMessageModel)] {
-        return dms.filter { dm in !dm.is_request }
+        return dms.filter { dm in !dm.1.is_request }
-    }
-
-    func set_active_dm_model(_ model: DirectMessageModel) {
-        self.active_model = model
-    }
-    
-    func open_dm_by_pk(_ pubkey: String) {
-        self.set_active_dm(pubkey)
-        self.open_dm = true
-    }
-    
-    func open_dm_by_model(_ model: DirectMessageModel) {
-        self.set_active_dm_model(model)
-        self.open_dm = true
-    }
-    
-    func set_active_dm(_ pubkey: String) {
-        for model in self.dms where model.pubkey == pubkey {
-            self.set_active_dm_model(model)
-            break
-        }
     }
     
     func lookup_or_create(_ pubkey: String) -> DirectMessageModel {
@@ -52,15 +29,15 @@ class DirectMessagesModel: ObservableObject {
             return dm
         }
         
-        let new = DirectMessageModel(our_pubkey: our_pubkey, pubkey: pubkey)
+        let new = DirectMessageModel(our_pubkey: our_pubkey)
-        dms.append(new)
+        dms.append((pubkey, new))
         return new
     }
     
     func lookup(_ pubkey: String) -> DirectMessageModel? {
         for dm in dms {
-            if pubkey == dm.pubkey {
+            if pubkey == dm.0 {
-                return dm
+                return dm.1
             }
         }
         

damus/Models/DraftsModel.swift

@@ -10,5 +10,4 @@ import Foundation
 class Drafts: ObservableObject {
     @Published var post: NSMutableAttributedString = NSMutableAttributedString(string: "")
     @Published var replies: [NostrEvent: NSMutableAttributedString] = [:]
-    @Published var medias: [UploadedMedia] = []
 }

damus/Models/EventRef.swift

@@ -74,12 +74,8 @@ func build_mention_indices(_ blocks: [Block], type: MentionType) -> Set<Int> {
         switch block {
         case .mention(let m):
             if m.type == type {
-                if let idx = m.index {
+                acc.insert(m.index)
-                    acc.insert(idx)
-                }
             }
-        case .relay:
-            return
         case .text:
             return
         case .hashtag:

damus/Models/EventsModel.swift

@@ -64,8 +64,6 @@ class EventsModel: ObservableObject {
             handle_event(relay_id: relay_id, ev: ev)
         case .notice(_):
             break
-        case .ok:
-            break
         case .eose(_):
             load_profiles(profiles_subid: profiles_id, relay_id: relay_id, load: .from_events(events), damus_state: state)
         }

damus/Models/FollowersModel.swift

@@ -82,7 +82,7 @@ class FollowersModel: ObservableObject {
             if ev.known_kind == .contacts {
                 handle_contact_event(ev)
             } else if ev.known_kind == .metadata {
-                process_metadata_event(events: damus_state.events, our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
+                process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
             }
             
         case .notice(let msg):
@@ -94,9 +94,6 @@ class FollowersModel: ObservableObject {
             } else if sub_id == self.profiles_id {
                 damus_state.pool.unsubscribe(sub_id: profiles_id, to: [relay_id])
             }
-            
-        case .ok:
-            break
         }
     }
 }

damus/Models/FollowingModel.swift

@@ -58,11 +58,9 @@ class FollowingModel {
             break
         case .nostr_event(let nev):
             switch nev {
-            case .ok:
-                break
             case .event(_, let ev):
                 if ev.kind == 0 {
-                    process_metadata_event(events: damus_state.events, our_pubkey: damus_state.pubkey, 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

@@ -8,19 +8,26 @@
 import Foundation
 import UIKit
 
-struct NewEventsBits: OptionSet {
+struct NewEventsBits {
-    let rawValue: Int
+    let bits: Int
-    
+
-    static let home = NewEventsBits(rawValue: 1 << 0)
+    init() {
-    static let zaps = NewEventsBits(rawValue: 1 << 1)
+        bits = 0
-    static let mentions = NewEventsBits(rawValue: 1 << 2)
+    }
-    static let reposts = NewEventsBits(rawValue: 1 << 3)
+
-    static let likes = NewEventsBits(rawValue: 1 << 4)
+    init (prev: NewEventsBits, setting: Timeline) {
-    static let search = NewEventsBits(rawValue: 1 << 5)
+        self.bits = prev.bits | timeline_bit(setting)
-    static let dms = NewEventsBits(rawValue: 1 << 6)
+    }
-    
+
-    static let all = NewEventsBits(rawValue: 0xFFFFFFFF)
+    init (prev: NewEventsBits, unsetting: Timeline) {
-    static let notifications: NewEventsBits = [.zaps, .likes, .reposts, .mentions]
+        self.bits = prev.bits & ~timeline_bit(unsetting)
+    }
+
+    func is_set(_ timeline: Timeline) -> Bool {
+        let notification_bit = timeline_bit(timeline)
+        return (bits & notification_bit) == notification_bit
+    }
+
 }
 
 class HomeModel: ObservableObject {
@@ -41,27 +48,34 @@ class HomeModel: ObservableObject {
     let dms_subid = UUID().description
     let init_subid = UUID().description
     let profiles_subid = UUID().description
-    
-    var loading: Bool = false
 
-    var signal = SignalModel()
-    
     @Published var new_events: NewEventsBits = NewEventsBits()
     @Published var notifications = NotificationsModel()
+    @Published var dms: DirectMessagesModel
     @Published var events = EventHolder()
+    @Published var loading: Bool = false
+    @Published var signal: SignalModel = SignalModel()
 
     init() {
         self.damus_state = DamusState.empty
-        filter_muted()
+        self.dms = DirectMessagesModel(our_pubkey: "")
-        self.setup_debouncer()
     }
     
+    init(damus_state: DamusState) {
+        self.damus_state = damus_state
+        self.dms = DirectMessagesModel(our_pubkey: damus_state.pubkey)
+        self.setup_debouncer()
+    }
+
     var pool: RelayPool {
         return damus_state.pool
     }
     
-    var dms: DirectMessagesModel {
+    func setup_debouncer() {
-        return damus_state.dms
+        // turn off debouncer after initial load
+        DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
+            self.should_debounce_dms = false
+        }
     }
 
     func has_sub_id_event(sub_id: String, ev_id: String) -> Bool {
@@ -72,13 +86,6 @@ class HomeModel: ObservableObject {
 
         return has_event[sub_id]!.contains(ev_id)
     }
-    
-    func setup_debouncer() {
-        // turn off debouncer after initial load
-        DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
-            self.should_debounce_dms = false
-        }
-    }
 
     func process_event(sub_id: String, relay_id: String, ev: NostrEvent) {
         if has_sub_id_event(sub_id: sub_id, ev_id: ev.id) {
@@ -123,7 +130,7 @@ class HomeModel: ObservableObject {
         }
     }
     
-    func handle_zap_event_with_zapper(profiles: Profiles, ev: NostrEvent, our_keypair: Keypair, zapper: String) {
+    func handle_zap_event_with_zapper(_ ev: NostrEvent, our_keypair: Keypair, zapper: String) {
         guard let zap = Zap.from_zap_event(zap_ev: ev, zapper: zapper, our_privkey: our_keypair.privkey) else {
             return
         }
@@ -134,24 +141,14 @@ class HomeModel: ObservableObject {
             return
         }
         
-        if !notifications.insert_zap(zap, damus_state: damus_state) {
+        if !notifications.insert_zap(zap) {
             return
         }
-
+        
-        if handle_last_event(ev: ev, timeline: .notifications) {
+        handle_last_event(ev: ev, timeline: .notifications)
-            if damus_state.settings.zap_vibration {
-                // Generate zap vibration
-                zap_vibrate(zap_amount: zap.invoice.amount)
-            }
-            if damus_state.settings.zap_notification {
-                // Create in-app local notification for zap received.
-                create_in_app_zap_notification(profiles: profiles, zap: zap, evId: ev.referenced_ids.first?.id ?? "")
-            }
-        }
-
         return
     }
-
+    
     func handle_zap_event(_ ev: NostrEvent) {
         // These are zap notifications
         guard let ptag = event_tag(ev, name: "p") else {
@@ -160,7 +157,7 @@ class HomeModel: ObservableObject {
         
         let our_keypair = damus_state.keypair
         if let local_zapper = damus_state.profiles.lookup_zapper(pubkey: ptag) {
-            handle_zap_event_with_zapper(profiles: self.damus_state.profiles, ev: ev, our_keypair: our_keypair, zapper: local_zapper)
+            handle_zap_event_with_zapper(ev, our_keypair: our_keypair, zapper: local_zapper)
             return
         }
         
@@ -179,13 +176,17 @@ class HomeModel: ObservableObject {
             
             DispatchQueue.main.async {
                 self.damus_state.profiles.zappers[ptag] = zapper
-                self.handle_zap_event_with_zapper(profiles: self.damus_state.profiles, ev: ev, our_keypair: our_keypair, zapper: zapper)
+                self.handle_zap_event_with_zapper(ev, our_keypair: our_keypair, zapper: zapper)
             }
         }
         
     }
     
     func handle_channel_create(_ ev: NostrEvent) {
+        guard ev.is_valid else {
+            return
+        }
+        
         self.channels[ev.id] = ev
     }
     
@@ -193,21 +194,16 @@ class HomeModel: ObservableObject {
     }
     
     func filter_muted() {
-        events.filter { ev in
+        events.filter { !damus_state.contacts.is_muted($0.pubkey) }
-            !damus_state.contacts.is_muted(ev.pubkey)
+        self.dms.dms = dms.dms.filter { !damus_state.contacts.is_muted($0.0) }
-        }
+        notifications.filter { !damus_state.contacts.is_muted($0.pubkey) }
-        
-        self.dms.dms = dms.dms.filter { ev in
-            !damus_state.contacts.is_muted(ev.pubkey)
-        }
-        
-        notifications.filter { ev in
-            !damus_state.contacts.is_muted(ev.pubkey) &&
-            !damus_state.muted_threads.isMutedThread(ev, privkey: damus_state.keypair.privkey)
-        }
     }
     
     func handle_delete_event(_ ev: NostrEvent) {
+        guard ev.is_valid else {
+            return
+        }
+        
         self.deleted_events.insert(ev.id)
     }
 
@@ -229,7 +225,7 @@ class HomeModel: ObservableObject {
         if let inner_ev = ev.inner_event {
             boost_ev_id = inner_ev.id
             
-            guard validate_event(ev: inner_ev) == .ok else {
+            guard inner_ev.is_valid else {
                 return
             }
            
@@ -298,7 +294,10 @@ class HomeModel: ObservableObject {
                 break
             }
             
-            update_signal_from_pool(signal: self.signal, pool: damus_state.pool)
+            update_signal_from_pool(signal: signal, pool: damus_state.pool)
+
+            print("ws_event \(ev)")
+
         case .nostr_event(let ev):
             switch ev {
             case .event(let sub_id, let ev):
@@ -317,7 +316,7 @@ class HomeModel: ObservableObject {
             case .eose(let sub_id):
                 
                 if sub_id == dms_subid {
-                    var dms = dms.dms.flatMap { $0.events }
+                    var dms = dms.dms.flatMap { $0.1.events }
                     dms.append(contentsOf: incoming_dms)
                     load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, load: .from_events(dms), damus_state: damus_state)
                 } else if sub_id == notifications_subid {
@@ -326,11 +325,7 @@ class HomeModel: ObservableObject {
                 
                 self.loading = false
                 break
-                
-            case .ok:
-                break
             }
-            
         }
     }
 
@@ -392,7 +387,7 @@ class HomeModel: ObservableObject {
             NostrKind.zap.rawValue,
         ])
         notifications_filter.pubkeys = [damus_state.pubkey]
-        notifications_filter.limit = 500
+        notifications_filter.limit = 100
 
         var home_filters = [home_filter]
         var notifications_filters = [notifications_filter]
@@ -445,7 +440,7 @@ class HomeModel: ObservableObject {
     }
     
     func handle_metadata_event(_ ev: NostrEvent) {
-        process_metadata_event(events: damus_state.events, our_pubkey: damus_state.pubkey, 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? {
@@ -456,44 +451,31 @@ class HomeModel: ObservableObject {
 
         return m[kind]
     }
-    
+
     func handle_notification(ev: NostrEvent) {
-        // don't show notifications from ourselves
-        guard ev.pubkey != damus_state.pubkey else {
-            return
-        }
-        
         guard event_has_our_pubkey(ev, our_pubkey: self.damus_state.pubkey) else {
             return
         }
         
-        guard should_show_event(contacts: damus_state.contacts, ev: ev) && !damus_state.muted_threads.isMutedThread(ev, privkey: damus_state.keypair.privkey) else {
+        guard should_show_event(contacts: damus_state.contacts, ev: ev) else {
             return
         }
         
         damus_state.events.insert(ev)
-        
         if let inner_ev = ev.inner_event {
             damus_state.events.insert(inner_ev)
         }
         
-        if !notifications.insert_event(ev, damus_state: damus_state) {
+        if !notifications.insert_event(ev) {
             return
         }
         
-        if handle_last_event(ev: ev, timeline: .notifications) {
+        handle_last_event(ev: ev, timeline: .notifications)
-            process_local_notification(damus_state: damus_state, event: ev)
-        }
-        
     }
-
+    
-    @discardableResult
+    func handle_last_event(ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) {
-    func handle_last_event(ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) -> Bool {
         if let new_bits = handle_last_events(new_events: self.new_events, ev: ev, timeline: timeline, shouldNotify: shouldNotify) {
             new_events = new_bits
-            return true
-        } else {
-            return false
         }
     }
 
@@ -503,13 +485,11 @@ class HomeModel: ObservableObject {
         }
     }
 
-
     func handle_text_event(sub_id: String, _ ev: NostrEvent) {
         guard should_show_event(contacts: damus_state.contacts, ev: ev) else {
             return
         }
         
-        damus_state.replies.count_replies(ev)
         damus_state.events.insert(ev)
 
         if sub_id == home_subid {
@@ -519,26 +499,15 @@ class HomeModel: ObservableObject {
         }
     }
     
-    func got_new_dm(notifs: NewEventsBits, ev: NostrEvent) {
-        self.new_events = notifs
-        if damus_state.settings.dm_notification {
-            let convo = ev.decrypted(privkey: self.damus_state.keypair.privkey) ?? NSLocalizedString("New encrypted direct message", comment: "Notification that the user has received a new direct message")
-            let notify = LocalNotification(type: .dm, event: ev, target: ev, content: convo)
-            create_local_notification(profiles: damus_state.profiles, notify: notify)
-        }
-    }
-    
     func handle_dm(_ ev: NostrEvent) {
         guard should_show_event(contacts: damus_state.contacts, ev: ev) else {
             return
         }
         
-        damus_state.events.insert(ev)
-        
         if !should_debounce_dms {
             self.incoming_dms.append(ev)
             if let notifs = handle_incoming_dms(prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, evs: self.incoming_dms) {
-                got_new_dm(notifs: notifs, ev: ev)
+                self.new_events = notifs
             }
             self.incoming_dms = []
             return
@@ -546,9 +515,9 @@ class HomeModel: ObservableObject {
         
         incoming_dms.append(ev)
         
-        dm_debouncer.debounce { [self] in
+        dm_debouncer.debounce {
             if let notifs = handle_incoming_dms(prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, evs: self.incoming_dms) {
-                got_new_dm(notifs: notifs, ev: ev)
+                self.new_events = notifs
             }
             self.incoming_dms = []
         }
@@ -561,8 +530,8 @@ func update_signal_from_pool(signal: SignalModel, pool: RelayPool) {
         signal.max_signal = pool.relays.count
     }
 
-    if signal.signal != pool.num_connected {
+    if signal.signal != pool.num_connecting {
-        signal.signal = pool.num_connected
+        signal.signal = signal.max_signal - pool.num_connecting
     }
 }
 
@@ -656,7 +625,11 @@ func print_filters(relay_id: String?, filters groups: [[NostrFilter]]) {
     print("-----")
 }
 
-func process_metadata_profile(our_pubkey: String, profiles: Profiles, profile: Profile, 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, ())
@@ -673,7 +646,7 @@ func process_metadata_profile(our_pubkey: String, profiles: Profiles, profile: P
         }
     }
 
-    let tprof = TimestampedProfile(profile: profile, timestamp: ev.created_at, event: ev)
+    let tprof = TimestampedProfile(profile: profile, timestamp: ev.created_at)
     profiles.add(id: ev.pubkey, profile: tprof)
     
     if let nip05 = profile.nip05, old_nip05 != profile.nip05 {
@@ -685,7 +658,6 @@ func process_metadata_profile(our_pubkey: String, profiles: Profiles, profile: P
             
             DispatchQueue.main.async {
                 profiles.validated[ev.pubkey] = validated
-                profiles.nip05_pubkey[nip05] = ev.pubkey
                 notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
             }
         }
@@ -707,47 +679,6 @@ func process_metadata_profile(our_pubkey: String, profiles: Profiles, profile: P
     }
     
     notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
-
-}
-
-func guard_valid_event(events: EventCache, ev: NostrEvent, callback: @escaping () -> Void) {
-    let validated = events.is_event_valid(ev.id)
-    
-    switch validated {
-    case .unknown:
-        Task {
-            let result = validate_event(ev: ev)
-            
-            DispatchQueue.main.async {
-                events.validation[ev.id] = result
-                guard result == .ok else {
-                    return
-                }
-                callback()
-            }
-        }
-        
-    case .ok:
-        callback()
-        
-    case .bad_id: fallthrough
-    case .bad_sig:
-        break
-    }
-}
-
-func process_metadata_event(events: EventCache, our_pubkey: String, profiles: Profiles, ev: NostrEvent) {
-    guard_valid_event(events: events, ev: ev) {
-        DispatchQueue.global(qos: .background).async {
-            guard let profile: Profile = decode_data(Data(ev.content.utf8)) else {
-                return
-            }
-            
-            DispatchQueue.main.async {
-                process_metadata_profile(our_pubkey: our_pubkey, profiles: profiles, profile: profile, ev: ev)
-            }
-        }
-    }
 }
 
 func robohash(_ pk: String) -> String {
@@ -780,7 +711,7 @@ func process_contact_event(state: DamusState, ev: NostrEvent) {
 
 func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
     let bootstrap_dict: [String: RelayInfo] = [:]
-    let old_decoded = m_old_ev.flatMap { decode_json_relays($0.content) } ?? state.bootstrap_relays.reduce(into: bootstrap_dict) { (d, r) in
+    let old_decoded = m_old_ev.flatMap { decode_json_relays($0.content) } ?? BOOTSTRAP_RELAYS.reduce(into: bootstrap_dict) { (d, r) in
         d[r] = .rw
     }
     
@@ -815,7 +746,6 @@ func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
     }
     
     if changed {
-        save_bootstrap_relays(pubkey: state.pubkey, relays: Array(new))
         notify(.relays_changed, ())
     }
 }
@@ -888,10 +818,10 @@ func handle_incoming_dm(ev: NostrEvent, our_pubkey: String, dms: DirectMessagesM
         }
     }
 
-    for model in dms.dms {
+    for (pk, _) in dms.dms {
-        if model.pubkey == the_pk {
+        if pk == the_pk {
             found = true
-            inserted = insert_uniq_sorted_event(events: &(dms.dms[i].events), new_ev: ev) {
+            inserted = insert_uniq_sorted_event(events: &(dms.dms[i].1.events), new_ev: ev) {
                 $0.created_at < $1.created_at
             }
 
@@ -901,8 +831,8 @@ func handle_incoming_dm(ev: NostrEvent, our_pubkey: String, dms: DirectMessagesM
     }
 
     if !found {
-        let model = DirectMessageModel(events: [ev], our_pubkey: our_pubkey, pubkey: the_pk)
+        let model = DirectMessageModel(events: [ev], our_pubkey: our_pubkey)
-        dms.dms.append(model)
+        dms.dms.append((the_pk, model))
         inserted = true
     }
     
@@ -929,53 +859,14 @@ func handle_incoming_dms(prev_events: NewEventsBits, dms: DirectMessagesModel, o
     }
     
     if inserted {
-        dms.dms = dms.dms.filter({ $0.events.count > 0 }).sorted { a, b in
+        dms.dms = dms.dms.filter({ $0.1.events.count > 0 }).sorted { a, b in
-            return a.events.last!.created_at > b.events.last!.created_at
+            return a.1.events.last!.created_at > b.1.events.last!.created_at
         }
     }
     
     return new_events
 }
 
-func determine_event_notifications(_ ev: NostrEvent) -> NewEventsBits {
-    guard let kind = ev.known_kind else {
-        return []
-    }
-    
-    if kind == .zap {
-        return [.zaps]
-    }
-    
-    if kind == .boost {
-        return [.reposts]
-    }
-    
-    if kind == .text {
-        return [.mentions]
-    }
-    
-    if kind == .like {
-        return [.likes]
-    }
-    
-    return []
-}
-
-func timeline_to_notification_bits(_ timeline: Timeline, ev: NostrEvent?) -> NewEventsBits {
-    switch timeline {
-    case .home:
-        return [.home]
-    case .notifications:
-        if let ev {
-            return determine_event_notifications(ev)
-        }
-        return [.notifications]
-    case .search:
-        return [.search]
-    case .dms:
-        return [.dms]
-    }
-}
 
 /// 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? {
@@ -984,7 +875,7 @@ func handle_last_events(new_events: NewEventsBits, ev: NostrEvent, timeline: Tim
     if last_ev == nil || last_ev!.created_at < ev.created_at {
         save_last_event(ev, timeline: timeline)
         if shouldNotify {
-            return new_events.union(timeline_to_notification_bits(timeline, ev: ev))
+            return NewEventsBits(prev: new_events, setting: timeline)
         }
     }
     
@@ -1011,143 +902,3 @@ func should_show_event(contacts: Contacts, ev: NostrEvent) -> Bool {
     return ev.should_show_event
 }
 
-func zap_vibrate(zap_amount: Int64) {
-    let sats = zap_amount / 1000
-    var vibration_generator: UIImpactFeedbackGenerator
-    if sats >= 10000 {
-        vibration_generator = UIImpactFeedbackGenerator(style: .heavy)
-    } else if sats >= 1000 {
-        vibration_generator = UIImpactFeedbackGenerator(style: .medium)
-    } else {
-        vibration_generator = UIImpactFeedbackGenerator(style: .light)
-    }
-    vibration_generator.impactOccurred()
-}
-
-func zap_notification_title(_ zap: Zap) -> String {
-    if zap.private_request != nil {
-        return NSLocalizedString("Private Zap", comment: "Title of notification when a private zap is received.")
-    } else {
-        return NSLocalizedString("Zap", comment: "Title of notification when a non-private zap is received.")
-    }
-}
-
-func zap_notification_body(profiles: Profiles, zap: Zap, locale: Locale = Locale.current) -> String {
-    let src = zap.private_request ?? zap.request.ev
-    let anon = event_is_anonymous(ev: src)
-    let pk = anon ? "anon" : src.pubkey
-    let profile = profiles.lookup(id: pk)
-    let sats = NSNumber(value: (Double(zap.invoice.amount) / 1000.0))
-    let formattedSats = format_msats_abbrev(zap.invoice.amount)
-    let name = Profile.displayName(profile: profile, pubkey: pk).display_name
-
-    if src.content.isEmpty {
-        let format = localizedStringFormat(key: "zap_notification_no_message", locale: locale)
-        return String(format: format, locale: locale, sats.decimalValue as NSDecimalNumber, formattedSats, name)
-    } else {
-        let format = localizedStringFormat(key: "zap_notification_with_message", locale: locale)
-        return String(format: format, locale: locale, sats.decimalValue as NSDecimalNumber, formattedSats, name, src.content)
-    }
-}
-
-func create_in_app_zap_notification(profiles: Profiles, zap: Zap, locale: Locale = Locale.current, evId: String) {
-    let content = UNMutableNotificationContent()
-
-    content.title = zap_notification_title(zap)
-    content.body = zap_notification_body(profiles: profiles, zap: zap, locale: locale)
-    content.sound = UNNotificationSound.default
-    content.userInfo = LossyLocalNotification(type: .zap, event_id: evId).to_user_info()
-
-    let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false)
-
-    let request = UNNotificationRequest(identifier: "myZapNotification", content: content, trigger: trigger)
-
-    UNUserNotificationCenter.current().add(request) { error in
-        if let error = error {
-            print("Error: \(error)")
-        } else {
-            print("Local notification scheduled")
-        }
-    }
-}
-
-    
-func process_local_notification(damus_state: DamusState, event ev: NostrEvent) {
-    guard let type = ev.known_kind else {
-        return
-    }
-
-    if damus_state.settings.notification_only_from_following,
-       damus_state.contacts.follow_state(ev.pubkey) != .follows
-        {
-        return
-    }
-
-    // Don't show notifications from muted threads.
-    if damus_state.muted_threads.isMutedThread(ev, privkey: damus_state.keypair.privkey) {
-        return
-    }
-
-    if type == .text && damus_state.settings.mention_notification {
-        let blocks = ev.blocks(damus_state.keypair.privkey)
-        for case .mention(let mention) in blocks where mention.ref.ref_id == damus_state.keypair.pubkey {
-            let content = NSAttributedString(render_note_content(ev: ev, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey).content.attributed).string
-            
-            let notify = LocalNotification(type: .mention, event: ev, target: ev, content: content)
-            create_local_notification(profiles: damus_state.profiles, notify: notify )
-        }
-    } else if type == .boost && damus_state.settings.repost_notification, let inner_ev = ev.inner_event {
-        let notify = LocalNotification(type: .repost, event: ev, target: inner_ev, content: inner_ev.content)
-        create_local_notification(profiles: damus_state.profiles, notify: notify)
-    } else if type == .like && damus_state.settings.like_notification,
-              let evid = ev.referenced_ids.first?.ref_id,
-              let liked_event = damus_state.events.lookup(evid)
-    {
-        let notify = LocalNotification(type: .like, event: ev, target: liked_event, content: liked_event.content)
-        create_local_notification(profiles: damus_state.profiles, notify: notify)
-    }
-
-}
-
-func create_local_notification(profiles: Profiles, notify: LocalNotification) {
-    let content = UNMutableNotificationContent()
-    var title = ""
-    var identifier = ""
-    
-    let displayName = event_author_name(profiles: profiles, pubkey: notify.event.pubkey)
-    
-    switch notify.type {
-    case .mention:
-        title = String(format: NSLocalizedString("Mentioned by %@", comment: "Mentioned by heading in local notification"), displayName)
-        identifier = "myMentionNotification"
-    case .repost:
-        title = String(format: NSLocalizedString("Reposted by %@", comment: "Reposted by heading in local notification"), displayName)
-        identifier = "myBoostNotification"
-    case .like:
-        title = String(format: NSLocalizedString("Liked by %@", comment: "Liked by heading in local notification"), displayName)
-        identifier = "myLikeNotification"
-    case .dm:
-        title = String(format: NSLocalizedString("%@", comment: "DM by heading in local notification"), displayName)
-        identifier = "myDMNotification"
-    case .zap:
-        // not handled here
-        break
-    }
-    content.title = title
-    content.body = notify.content
-    content.sound = UNNotificationSound.default
-    content.userInfo = notify.to_lossy().to_user_info()
-
-    let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false)
-
-    let request = UNNotificationRequest(identifier: identifier, content: content, trigger: trigger)
-
-    UNUserNotificationCenter.current().add(request) { error in
-        if let error = error {
-            print("Error: \(error)")
-        } else {
-            print("Local notification scheduled")
-        }
-    }
-}
-

damus/Models/ImageUploadModel.swift

@@ -1,63 +0,0 @@
-//
-//  ImageUploadModel.swift
-//  damus
-//
-//  Created by William Casarin on 2023-03-16.
-//
-
-import Foundation
-import UIKit
-
-
-enum MediaUpload {
-    case image(URL)
-    case video(URL)
-
-    var genericFileName: String {
-        "damus_generic_filename.\(file_extension)"
-    }
-
-    var file_extension: String {
-        switch self {
-        case .image(let url):
-            return url.pathExtension
-        case .video(let url):
-            return url.pathExtension
-        }
-    }
-
-    var localURL: URL {
-        switch self {
-        case .image(let url):
-            return url
-        case .video(let url):
-            return url
-        }
-    }
-    
-    var is_image: Bool {
-        if case .image = self {
-            return true
-        }
-        
-        return false
-    }
-}
-
-class ImageUploadModel: NSObject, URLSessionTaskDelegate, ObservableObject {
-    @Published var progress: Double? = nil
-    
-    func start(media: MediaUpload, uploader: MediaUploader) async -> ImageUploadResult {
-        let res = await create_upload_request(mediaToUpload: media, mediaUploader: uploader, progress: self)
-        DispatchQueue.main.async {
-            self.progress = nil
-        }
-        return res
-    }
-    
-    func urlSession(_ session: URLSession, task: URLSessionTask, didSendBodyData bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) {
-        DispatchQueue.main.async {
-            self.progress = Double(totalBytesSent) / Double(totalBytesExpectedToSend)
-        }
-    }
-}

damus/Models/Mentions.swift

@@ -21,8 +21,8 @@ enum MentionType {
     }
 }
 
-struct Mention: Equatable {
+struct Mention {
-    let index: Int?
+    let index: Int
     let type: MentionType
     let ref: ReferencedId
 }
@@ -58,30 +58,12 @@ struct LightningInvoice<T> {
     }
 }
 
-enum Block: Equatable {
+enum Block {
-    static func == (lhs: Block, rhs: Block) -> Bool {
-        switch (lhs, rhs) {
-        case (.text(let a), .text(let b)):
-            return a == b
-        case (.mention(let a), .mention(let b)):
-            return a == b
-        case (.hashtag(let a), .hashtag(let b)):
-            return a == b
-        case (.url(let a), .url(let b)):
-            return a == b
-        case (.invoice(let a), .invoice(let b)):
-            return a.string == b.string
-        case (_, _):
-            return false
-        }
-    }
-    
     case text(String)
     case mention(Mention)
     case hashtag(String)
     case url(URL)
     case invoice(Invoice)
-    case relay(String)
     
     var is_invoice: Invoice? {
         if case .invoice(let invoice) = self {
@@ -112,14 +94,6 @@ enum Block: Equatable {
         return nil
     }
     
-    var is_note_mention: Bool {
-        guard case .mention(let mention) = self else {
-            return false
-        }
-        
-        return mention.type == .event
-    }
-    
     var is_mention: Bool {
         if case .mention = self {
             return true
@@ -132,17 +106,7 @@ func render_blocks(blocks: [Block]) -> String {
     return blocks.reduce("") { str, block in
         switch block {
         case .mention(let m):
-            if let idx = m.index {
+            return str + "#[\(m.index)]"
-                return str + "#[\(idx)]"
-            } else if m.type == .pubkey, let pk = bech32_pubkey(m.ref.ref_id) {
-                return str + "nostr:\(pk)"
-            } else if let note_id = bech32_note_id(m.ref.ref_id) {
-                return str + "nostr:\(note_id)"
-            } else {
-                return str + m.ref.ref_id
-            }
-        case .relay(let relay):
-            return str + relay
         case .text(let txt):
             return str + txt
         case .hashtag(let htag):
@@ -205,16 +169,14 @@ func convert_block(_ b: block_t, tags: [[String]]) -> Block? {
             return nil
         }
         return .text(str)
-    } else if b.type == BLOCK_MENTION_INDEX {
+    } else if b.type == BLOCK_MENTION {
-        return convert_mention_index_block(ind: b.block.mention_index, tags: tags)
+        return convert_mention_block(ind: b.block.mention, tags: tags)
     } else if b.type == BLOCK_URL {
         return convert_url_block(b.block.str)
     } else if b.type == BLOCK_INVOICE {
         return convert_invoice_block(b.block.invoice)
-    } else if b.type == BLOCK_MENTION_BECH32 {
-        return convert_mention_bech32_block(b.block.mention_bech32)
     }
-
+    
     return nil
 }
 
@@ -312,8 +274,8 @@ func format_msats(_ msat: Int64, locale: Locale = Locale.current) -> String {
     let sats = NSNumber(value: (Double(msat) / 1000.0))
     let formattedSats = numberFormatter.string(from: sats) ?? sats.stringValue
 
-    let format = localizedStringFormat(key: "sats_count", locale: locale)
+    let bundle = bundleForLocale(locale: locale)
-    return String(format: format, locale: locale, sats.decimalValue as NSDecimalNumber, formattedSats)
+    return String(format: bundle.localizedString(forKey: "sats_count", value: nil, table: nil), locale: locale, sats.decimalValue as NSDecimalNumber, formattedSats)
 }
 
 func convert_invoice_block(_ b: invoice_block) -> Block? {
@@ -337,60 +299,6 @@ func convert_invoice_block(_ b: invoice_block) -> Block? {
     return .invoice(Invoice(description: description, amount: amount, string: invstr, expiry: b11.expiry, payment_hash: payment_hash, created_at: created_at))
 }
 
-func convert_mention_bech32_block(_ b: mention_bech32_block) -> Block?
-{
-    switch b.bech32.type {
-    case NOSTR_BECH32_NOTE:
-        let note = b.bech32.data.note;
-        let event_id = hex_encode(Data(bytes: note.event_id, count: 32))
-        let event_id_ref = ReferencedId(ref_id: event_id, relay_id: nil, key: "e")
-        return .mention(Mention(index: nil, type: .event, ref: event_id_ref))
-        
-    case NOSTR_BECH32_NEVENT:
-        let nevent = b.bech32.data.nevent;
-        let event_id = hex_encode(Data(bytes: nevent.event_id, count: 32))
-        var relay_id: String? = nil
-        if nevent.relays.num_relays > 0 {
-            relay_id = strblock_to_string(nevent.relays.relays.0)
-        }
-        let event_id_ref = ReferencedId(ref_id: event_id, relay_id: relay_id, key: "e")
-        return .mention(Mention(index: nil, type: .event, ref: event_id_ref))
-
-    case NOSTR_BECH32_NPUB:
-        let npub = b.bech32.data.npub
-        let pubkey = hex_encode(Data(bytes: npub.pubkey, count: 32))
-        let pubkey_ref = ReferencedId(ref_id: pubkey, relay_id: nil, key: "p")
-        return .mention(Mention(index: nil, type: .pubkey, ref: pubkey_ref))
-        
-    case NOSTR_BECH32_NPROFILE:
-        let nprofile = b.bech32.data.nprofile
-        let pubkey = hex_encode(Data(bytes: nprofile.pubkey, count: 32))
-        var relay_id: String? = nil
-        if nprofile.relays.num_relays > 0 {
-            relay_id = strblock_to_string(nprofile.relays.relays.0)
-        }
-        let pubkey_ref = ReferencedId(ref_id: pubkey, relay_id: relay_id, key: "p")
-        return .mention(Mention(index: nil, type: .pubkey, ref: pubkey_ref))
-
-    case NOSTR_BECH32_NRELAY:
-        let nrelay = b.bech32.data.nrelay
-        guard let relay_str = strblock_to_string(nrelay.relay) else {
-            return nil
-        }
-        return .relay(relay_str)
-        
-    case NOSTR_BECH32_NADDR:
-        // TODO: wtf do I do with this
-        guard let naddr = strblock_to_string(b.str) else {
-            return nil
-        }
-        return .text("nostr:" + naddr)
-
-    default:
-        return nil
-    }
-}
-
 func convert_invoice_description(b11: bolt11) -> InvoiceDescription? {
     if let desc = b11.description {
         return .description(String(cString: desc))
@@ -403,7 +311,7 @@ func convert_invoice_description(b11: bolt11) -> InvoiceDescription? {
     return nil
 }
 
-func convert_mention_index_block(ind: Int32, tags: [[String]]) -> Block?
+func convert_mention_block(ind: Int32, tags: [[String]]) -> Block?
 {
     let ind = Int(ind)
     
@@ -641,7 +549,7 @@ func parse_mention_type(_ c: String) -> MentionType? {
 }
 
 /// Convert
-func make_post_tags(post_blocks: [PostBlock], tags: [[String]], silent_mentions: Bool) -> PostTags {
+func make_post_tags(post_blocks: [PostBlock], tags: [[String]]) -> PostTags {
     var new_tags = tags
     var blocks: [Block] = []
     
@@ -651,14 +559,6 @@ func make_post_tags(post_blocks: [PostBlock], tags: [[String]], silent_mentions:
             guard let mention_type = parse_mention_type(ref.key) else {
                 continue
             }
-            
-            if silent_mentions || mention_type == .event {
-                let mention = Mention(index: nil, type: mention_type, ref: ref)
-                let block = Block.mention(mention)
-                blocks.append(block)
-                continue
-            }
-            
             if let ind = find_tag_ref(type: ref.key, id: ref.ref_id, tags: tags) {
                 let mention = Mention(index: ind, type: mention_type, ref: ref)
                 let block = Block.mention(mention)
@@ -684,7 +584,7 @@ func make_post_tags(post_blocks: [PostBlock], tags: [[String]], silent_mentions:
 func post_to_event(post: NostrPost, privkey: String, pubkey: String) -> NostrEvent {
     let tags = post.references.map(refid_to_tag)
     let post_blocks = parse_post_blocks(content: post.content)
-    let post_tags = make_post_tags(post_blocks: post_blocks, tags: tags, silent_mentions: false)
+    let post_tags = make_post_tags(post_blocks: post_blocks, tags: tags)
     let content = render_blocks(blocks: post_tags.blocks)
     let new_ev = NostrEvent(content: content, pubkey: pubkey, kind: post.kind.rawValue, tags: post_tags.tags)
     new_ev.calculate_id()

damus/Models/MutedThreadsManager.swift

@@ -1,76 +0,0 @@
-//
-//  MutedThreadsManager.swift
-//  damus
-//
-//  Created by Terry Yiu on 4/6/23.
-//
-
-import Foundation
-
-fileprivate func getMutedThreadsKey(pubkey: String) -> String {
-    pk_setting_key(pubkey, key: "muted_threads")
-}
-
-func loadMutedThreads(pubkey: String) -> [String] {
-    let key = getMutedThreadsKey(pubkey: pubkey)
-    return UserDefaults.standard.stringArray(forKey: key) ?? []
-}
-
-func saveMutedThreads(pubkey: String, currentValue: [String], value: [String]) -> Bool {
-    let uniqueMutedThreads = Array(Set(value))
-
-    if uniqueMutedThreads != currentValue {
-        UserDefaults.standard.set(uniqueMutedThreads, forKey: getMutedThreadsKey(pubkey: pubkey))
-        return true
-    }
-
-    return false
-}
-
-class MutedThreadsManager: ObservableObject {
-
-    private let userDefaults = UserDefaults.standard
-    private let keypair: Keypair
-
-    private var _mutedThreadsSet: Set<String>
-    private var _mutedThreads: [String]
-    var mutedThreads: [String] {
-        get {
-            return _mutedThreads
-        }
-        set {
-            if saveMutedThreads(pubkey: keypair.pubkey, currentValue: _mutedThreads, value: newValue) {
-                self._mutedThreads = newValue
-                self.objectWillChange.send()
-            }
-        }
-    }
-
-    init(keypair: Keypair) {
-        self._mutedThreads = loadMutedThreads(pubkey: keypair.pubkey)
-        self._mutedThreadsSet = Set(_mutedThreads)
-        self.keypair = keypair
-    }
-
-    func isMutedThread(_ ev: NostrEvent, privkey: String?) -> Bool {
-        return _mutedThreadsSet.contains(ev.thread_id(privkey: privkey))
-    }
-
-    func updateMutedThread(_ ev: NostrEvent) {
-        let threadId = ev.thread_id(privkey: nil)
-        if isMutedThread(ev, privkey: keypair.privkey) {
-            mutedThreads = mutedThreads.filter { $0 != threadId }
-            _mutedThreadsSet.remove(threadId)
-            notify(.unmute_thread, ev)
-        } else {
-            mutedThreads.append(threadId)
-            _mutedThreadsSet.insert(threadId)
-            notify(.mute_thread, ev)
-        }
-    }
-
-    func clearAll() {
-        mutedThreads = []
-        _mutedThreadsSet.removeAll()
-    }
-}

damus/Models/NotificationsModel.swift

@@ -14,28 +14,6 @@ enum NotificationItem {
     case event_zap(String, ZapGroup)
     case reply(NostrEvent)
     
-    var is_reply: NostrEvent? {
-        if case .reply(let ev) = self {
-            return ev
-        }
-        return nil
-    }
-    
-    var is_zap: ZapGroup? {
-        switch self {
-        case .profile_zap(let zapgrp):
-            return zapgrp
-        case .event_zap(_, let zapgrp):
-            return zapgrp
-        case .reaction:
-            return nil
-        case .reply:
-            return nil
-        case .repost:
-            return nil
-        }
-    }
-    
     var id: String {
         switch self {
         case .repost(let evid, _):
@@ -129,7 +107,7 @@ class NotificationsModel: ObservableObject, ScrollQueue {
         for el in zaps {
             let evid = el.key
             let zapgrp = el.value
-
+            
             let notif: NotificationItem = .event_zap(evid, zapgrp)
             notifs.append(notif)
         }
@@ -233,7 +211,7 @@ class NotificationsModel: ObservableObject, ScrollQueue {
         }
     }
     
-    func insert_event(_ ev: NostrEvent, damus_state: DamusState) -> Bool {
+    func insert_event(_ ev: NostrEvent) -> Bool {
         if should_queue {
             return insert_uniq_sorted_event_created(events: &incoming_events, new_ev: ev)
         }
@@ -246,7 +224,7 @@ class NotificationsModel: ObservableObject, ScrollQueue {
         return false
     }
     
-    func insert_zap(_ zap: Zap, damus_state: DamusState) -> Bool {
+    func insert_zap(_ zap: Zap) -> Bool {
         if should_queue {
             return insert_uniq_sorted_zap_by_created(zaps: &incoming_zaps, new_zap: zap)
         }
@@ -300,7 +278,7 @@ class NotificationsModel: ObservableObject, ScrollQueue {
         }
     }
     
-    func flush(_ damus_state: DamusState) -> Bool {
+    func flush() -> Bool {
         var inserted = false
         
         for zap in incoming_zaps {

damus/Models/ProfileModel.swift

@@ -12,12 +12,10 @@ class ProfileModel: ObservableObject, Equatable {
     @Published var contacts: NostrEvent? = nil
     @Published var following: Int = 0
     @Published var relays: [String: RelayInfo]? = nil
-    @Published var progress: Int = 0
     
     let pubkey: String
     let damus: DamusState
     
-    
     var seen_event: Set<String> = Set()
     var sub_id = UUID().description
     var prof_subid = UUID().description
@@ -119,7 +117,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(events: damus.events, our_pubkey: damus.pubkey, profiles: damus.profiles, ev: ev)
+            process_metadata_event(our_pubkey: damus.pubkey, profiles: damus.profiles, ev: ev)
         }
         seen_event.insert(ev.id)
     }
@@ -129,18 +127,15 @@ class ProfileModel: ObservableObject, Equatable {
         case .ws_event:
             return
         case .nostr_event(let resp):
-            guard resp.subid == self.sub_id || resp.subid == self.prof_subid else {
-                return
-            }
             switch resp {
-            case .ok:
+            case .event(let sid, let ev):
-                break
+                if sid != self.sub_id && sid != self.prof_subid {
-            case .event(_, let ev):
+                    return
+                }
                 add_event(ev)
             case .notice(let notice):
                 notify(.notice, notice)
             case .eose:
-                progress += 1
                 break
             }
         }

damus/Models/ReplyMap.swift

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

damus/Models/Search/SearchResultsModel.swift

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

damus/Models/SearchHomeModel.swift

@@ -68,8 +68,6 @@ class SearchHomeModel: ObservableObject {
             }
         case .notice(let msg):
             print("search home notice: \(msg)")
-        case .ok:
-            break
         case .eose(let sub_id):
             loading = false
             
@@ -161,7 +159,7 @@ func load_profiles(profiles_subid: String, relay_id: String, load: PubkeysToLoad
             }
             
             if ev.known_kind == .metadata {
-                process_metadata_event(events: damus_state.events, our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
+                process_metadata_event(our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
             }
             
         }

damus/Models/SearchModel.swift

@@ -131,9 +131,6 @@ func handle_subid_event(pool: RelayPool, relay_id: String, ev: NostrConnectionEv
         case .event(let ev_subid, let ev):
             handle(ev_subid, ev)
             return (ev_subid, false)
-        
-        case .ok:
-            return (nil, false)
 
         case .notice(let note):
             if note.contains("Too many subscription filters") {

damus/Models/ThreadModel.swift

@@ -30,121 +30,184 @@ enum InitialEvent {
 
 /// manages the lifetime of a thread
 class ThreadModel: ObservableObject {
-    @Published var event: NostrEvent
+    @Published var initial_event: InitialEvent
-    var event_map: Set<NostrEvent>
+    @Published var events: [NostrEvent] = []
-    
+    @Published var event_map: [String: Int] = [:]
     @Published var loading: Bool = false
 
     var replies: ReplyMap = ReplyMap()
     
-    init(event: NostrEvent, damus_state: DamusState) {
+    var event: NostrEvent? {
-        self.damus_state = damus_state
+        switch initial_event {
-        self.event_map = Set()
+        case .event(let ev):
-        self.event = event
+            return ev
-        add_event(event, privkey: nil)
+        case .event_id(let evid):
+            for event in events {
+                if event.id == evid {
+                    return event
+                }
+            }
+            return nil
+        }
     }
     
     let damus_state: DamusState
     
     let profiles_subid = UUID().description
-    let base_subid = UUID().description
+    var base_subid = UUID().description
-    let meta_subid = UUID().description
+   
+    init(evid: String, damus_state: DamusState) {
+        self.damus_state = damus_state
+        self.initial_event = .event_id(evid)
+    }
     
-    var subids: [String] {
+    init(event: NostrEvent, damus_state: DamusState) {
-        return [profiles_subid, base_subid, meta_subid]
+        self.damus_state = damus_state
+        self.initial_event = .event(event)
     }
     
     func unsubscribe() {
-        self.damus_state.pool.remove_handler(sub_id: base_subid)
-        self.damus_state.pool.remove_handler(sub_id: meta_subid)
-        self.damus_state.pool.remove_handler(sub_id: profiles_subid)
         self.damus_state.pool.unsubscribe(sub_id: base_subid)
-        self.damus_state.pool.unsubscribe(sub_id: meta_subid)
+        print("unsubscribing from thread \(initial_event.id) with sub_id \(base_subid)")
-        self.damus_state.pool.unsubscribe(sub_id: profiles_subid)
-        print("unsubscribing from thread \(event.id) with sub_id \(base_subid)")
     }
     
-    @discardableResult
+    func reset_events() {
-    func set_active_event(_ ev: NostrEvent, privkey: String?) -> Bool {
+        self.events.removeAll()
-        self.event = ev
+        self.event_map.removeAll()
-        add_event(ev, privkey: privkey)
+        self.replies.replies.removeAll()
+    }
+    
+    func should_resubscribe(_ ev_b: NostrEvent) -> Bool {
+        if self.events.count == 0 {
+            return true
+        }
         
-        //self.objectWillChange.send()
+        if ev_b.is_root_event() {
-        return false
+            return false
+        }
+
+        // rough heuristic to save us from resubscribing all the time
+        //return ev_b.count_ids() != self.event.count_ids()
+        return true
+    }
+    
+    func set_active_event(_ ev: NostrEvent, privkey: String?) {
+        if should_resubscribe(ev) {
+            unsubscribe()
+            self.initial_event = .event(ev)
+            subscribe()
+        } else {
+            self.initial_event = .event(ev)
+            if events.count == 0 {
+                add_event(ev, privkey: privkey)
+            }
+        }
     }
     
     func subscribe() {
-        var meta_events = NostrFilter()
-        var event_filter = NostrFilter()
         var ref_events = NostrFilter()
+        var events_filter = NostrFilter()
         //var likes_filter = NostrFilter.filter_kinds(7])
 
-        let thread_id = event.thread_id(privkey: nil)
+        // TODO: add referenced relays
-        
+        switch self.initial_event {
-        ref_events.referenced_ids = [thread_id, event.id]
+        case .event(let ev):
-        ref_events.kinds = [1]
+            ref_events.referenced_ids = ev.referenced_ids.map { $0.ref_id }
-        ref_events.limit = 1000
+            ref_events.referenced_ids?.append(ev.id)
-        
+            ref_events.limit = 50
-        event_filter.ids = [thread_id, event.id]
+            events_filter.ids = ref_events.referenced_ids ?? []
-        
+            events_filter.limit = 100
-        meta_events.referenced_ids = [event.id]
+            events_filter.ids?.append(ev.id)
-        meta_events.kinds = [9735, 1, 6, 7]
+        case .event_id(let evid):
-        meta_events.limit = 1000
+            ref_events.referenced_ids = [evid]
-        
+            ref_events.limit = 50
-        /*
+            events_filter.ids = [evid]
-        if let last_ev = self.events.last {
+            events_filter.limit = 100
-            if last_ev.created_at <= Int64(Date().timeIntervalSince1970) {
-                ref_events.since = last_ev.created_at
-            }
         }
-         */
-        
-        let base_filters = [event_filter, ref_events]
-        let meta_filters = [meta_events]
 
-        print("subscribing to thread \(event.id) with sub_id \(base_subid)")
+        //likes_filter.ids = ref_events.referenced_ids!
+
+        print("subscribing to thread \(initial_event.id) with sub_id \(base_subid)")
+        damus_state.pool.register_handler(sub_id: base_subid, handler: handle_event)
         loading = true
-        damus_state.pool.subscribe(sub_id: base_subid, filters: base_filters, handler: handle_event)
+        damus_state.pool.send(.subscribe(.init(filters: [ref_events, events_filter], sub_id: base_subid)))
-        damus_state.pool.subscribe(sub_id: meta_subid, filters: meta_filters, handler: handle_event)
+    }
+    
+    func lookup(_ event_id: String) -> NostrEvent? {
+        if let i = event_map[event_id] {
+            return events[i]
+        }
+        return nil
     }
     
     func add_event(_ ev: NostrEvent, privkey: String?) {
-        if event_map.contains(ev) {
+        guard ev.should_show_event else {
             return
         }
         
-        let the_ev = damus_state.events.upsert(ev)
+        if event_map[ev.id] != nil {
-        damus_state.replies.count_replies(the_ev)
+            return
-        damus_state.events.add_replies(ev: the_ev)
+        }
         
-        event_map.insert(ev)
+        for reply in ev.direct_replies(privkey) {
-        objectWillChange.send()
+            self.replies.add(id: ev.id, reply_id: reply.ref_id)
+        }
+        
+        if insert_uniq_sorted_event(events: &self.events, new_ev: ev, cmp: { $0.created_at < $1.created_at }) {
+            objectWillChange.send()
+        }
+        //self.events.append(ev)
+        //self.events = self.events.sorted { $0.created_at < $1.created_at }
+        
+        var i: Int = 0
+        for ev in events {
+            self.event_map[ev.id] = i
+            i += 1
+        }
+        
+        if let evid = self.initial_event.is_event_id {
+            if ev.id == evid {
+                // this should trigger a resubscribe...
+                set_active_event(ev, privkey: privkey)
+            }
+        }
+        
+    }
+    
+    func handle_channel_meta(_ ev: NostrEvent) {
+        guard let meta: ChatroomMetadata = decode_json(ev.content) else {
+            return
+        }
+        
+        notify(.chatroom_meta, meta)
     }
     
     func handle_event(relay_id: String, ev: NostrConnectionEvent) {
         
         let (sub_id, done) = handle_subid_event(pool: damus_state.pool, relay_id: relay_id, ev: ev) { sid, ev in
-            guard subids.contains(sid) else {
+            guard sid == base_subid || sid == profiles_subid else {
                 return
             }
             
             if ev.known_kind == .metadata {
-                process_metadata_event(events: damus_state.events, our_pubkey: damus_state.pubkey, 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 {
+                handle_channel_meta(ev)
             }
         }
         
-        guard done, let sub_id, subids.contains(sub_id) else {
+        guard done && (sub_id == base_subid || sub_id == profiles_subid) else {
             return
         }
         
-        if event_map.contains(event) {
+        if (events.contains { ev in ev.id == initial_event.id }) {
             loading = false
         }
         
         if sub_id == self.base_subid {
-            load_profiles(profiles_subid: self.profiles_subid, relay_id: relay_id, load: .from_events(Array(event_map)), damus_state: damus_state)
+            load_profiles(profiles_subid: self.profiles_subid, relay_id: relay_id, load: .from_events(events), damus_state: damus_state)
         }
     }
 

damus/Models/TranslationService.swift

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

damus/Models/UserSettingsStore.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 import Vault
-import UIKit
 
 func should_show_wallet_selector(_ pubkey: String) -> Bool {
     return UserDefaults.standard.object(forKey: "show_wallet_selector") as? Bool ?? true
@@ -35,10 +34,6 @@ func get_default_zap_amount(pubkey: String) -> Int? {
     return amt
 }
 
-func should_disable_image_animation() -> Bool {
-    return (UserDefaults.standard.object(forKey: "disable_animation") as? Bool)
-            ?? UIAccessibility.isReduceMotionEnabled
- }
 
 func get_default_wallet(_ pubkey: String) -> Wallet {
     if let defaultWalletName = UserDefaults.standard.string(forKey: "default_wallet"),
@@ -50,15 +45,6 @@ func get_default_wallet(_ pubkey: String) -> Wallet {
     }
 }
 
-func get_media_uploader(_ pubkey: String) -> MediaUploader {
-    if let defaultMediaUploader = UserDefaults.standard.string(forKey: "default_media_uploader"),
-       let defaultMediaUploader = MediaUploader(rawValue: defaultMediaUploader) {
-        return defaultMediaUploader
-    } else {
-        return .nostrBuild
-    }
-}
-
 private func get_translation_service(_ pubkey: String) -> TranslationService? {
     guard let translation_service = UserDefaults.standard.string(forKey: "translation_service") else {
         return nil
@@ -97,12 +83,6 @@ class UserSettingsStore: ObservableObject {
             UserDefaults.standard.set(default_wallet.rawValue, forKey: "default_wallet")
         }
     }
-
-    @Published var default_media_uploader: MediaUploader {
-        didSet {
-            UserDefaults.standard.set(default_media_uploader.rawValue, forKey: "default_media_uploader")
-        }
-    }
     
     @Published var show_wallet_selector: Bool {
         didSet {
@@ -115,90 +95,6 @@ class UserSettingsStore: ObservableObject {
             UserDefaults.standard.set(left_handed, forKey: "left_handed")
         }
     }
-    
-    @Published var always_show_images: Bool {
-        didSet {
-            UserDefaults.standard.set(always_show_images, forKey: "always_show_images")
-        }
-    }
-
-    @Published var zap_vibration: Bool {
-        didSet {
-            UserDefaults.standard.set(zap_vibration, forKey: "zap_vibration")
-        }
-    }
-
-    @Published var zap_notification: Bool {
-        didSet {
-            UserDefaults.standard.set(zap_notification, forKey: "zap_notification")
-        }
-    }
-
-    @Published var mention_notification: Bool {
-        didSet {
-            UserDefaults.standard.set(mention_notification, forKey: "mention_notification")
-        }
-    }
-
-    @Published var repost_notification: Bool {
-        didSet {
-            UserDefaults.standard.set(repost_notification, forKey: "repost_notification")
-        }
-    }
-
-    @Published var dm_notification: Bool {
-        didSet {
-            UserDefaults.standard.set(dm_notification, forKey: "dm_notification")
-        }
-    }
-
-    @Published var like_notification: Bool {
-        didSet {
-            UserDefaults.standard.set(like_notification, forKey: "like_notification")
-        }
-    }
-
-    @Published var notification_only_from_following: Bool {
-        didSet {
-            UserDefaults.standard.set(notification_only_from_following, forKey: "notification_only_from_following")
-        }
-    }
-    
-    @Published var translate_dms: Bool {
-        didSet {
-            UserDefaults.standard.set(translate_dms, forKey: "translate_dms")
-        }
-    }
-
-    @Published var truncate_timeline_text: Bool {
-        didSet {
-            UserDefaults.standard.set(truncate_timeline_text, forKey: "truncate_timeline_text")
-        }
-    }
-    
-    @Published var notification_indicators: Int {
-        didSet {
-            UserDefaults.standard.set(notification_indicators, forKey: "notification_indicators")
-        }
-    }
-    
-    @Published var truncate_mention_text: Bool {
-        didSet {
-            UserDefaults.standard.set(truncate_mention_text, forKey: "truncate_mention_text")
-        }
-    }
-
-    @Published var auto_translate: Bool {
-        didSet {
-            UserDefaults.standard.set(auto_translate, forKey: "auto_translate")
-        }
-    }
-
-    @Published var show_only_preferred_languages: Bool {
-        didSet {
-            UserDefaults.standard.set(show_only_preferred_languages, forKey: "show_only_preferred_languages")
-        }
-    }
 
     @Published var translation_service: TranslationService {
         didSet {
@@ -263,37 +159,14 @@ class UserSettingsStore: ObservableObject {
             }
         }
     }
-    
-    @Published var disable_animation: Bool {
-        didSet {
-            UserDefaults.standard.set(disable_animation, forKey: "disable_animation")
-        }
-     }
 
     init() {
         // TODO: pubkey-scoped settings
         let pubkey = ""
         self.default_wallet = get_default_wallet(pubkey)
         show_wallet_selector = should_show_wallet_selector(pubkey)
-        always_show_images = UserDefaults.standard.object(forKey: "always_show_images") as? Bool ?? false
-
-        default_media_uploader = get_media_uploader(pubkey)
 
         left_handed = UserDefaults.standard.object(forKey: "left_handed") as? Bool ?? false
-        zap_vibration = UserDefaults.standard.object(forKey: "zap_vibration") as? Bool ?? false
-        zap_notification = UserDefaults.standard.object(forKey: "zap_notification") as? Bool ?? true
-        mention_notification = UserDefaults.standard.object(forKey: "mention_notification") as? Bool ?? true
-        repost_notification = UserDefaults.standard.object(forKey: "repost_notification") as? Bool ?? true
-        like_notification = UserDefaults.standard.object(forKey: "like_notification") as? Bool ?? true
-        dm_notification = UserDefaults.standard.object(forKey: "dm_notification") as? Bool ?? true
-        notification_indicators = UserDefaults.standard.object(forKey: "notification_indicators") as? Int ?? NewEventsBits.all.rawValue
-        notification_only_from_following = UserDefaults.standard.object(forKey: "notification_only_from_following") as? Bool ?? false
-        translate_dms = UserDefaults.standard.object(forKey: "translate_dms") as? Bool ?? false
-        truncate_timeline_text = UserDefaults.standard.object(forKey: "truncate_timeline_text") as? Bool ?? false
-        truncate_mention_text = UserDefaults.standard.object(forKey: "truncate_mention_text") as? Bool ?? false
-        disable_animation = should_disable_image_animation()
-        auto_translate = UserDefaults.standard.object(forKey: "auto_translate") as? Bool ?? true
-        show_only_preferred_languages = UserDefaults.standard.object(forKey: "show_only_preferred_languages") as? Bool ?? false
 
         // Note from @tyiu:
         // Default translation service is disabled by default for now until we gain some confidence that it is working well in production.

damus/Models/Wallet.swift

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

damus/Models/ZapsModel.swift

@@ -46,8 +46,6 @@ class ZapsModel: ObservableObject {
         }
         
         switch resp {
-        case .ok:
-            break
         case .notice:
             break
         case .eose:

damus/Nostr/Nostr.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-class Profile: Codable {
+struct Profile: Codable {
     var value: [String: AnyCodable]
     
     init (name: String?, display_name: String?, about: String?, picture: String?, banner: String?, website: String?, lud06: String?, lud16: String?, nip05: String?) {
@@ -39,7 +39,7 @@ class Profile: Codable {
         return s
     }
     
-    private func set_val<T>(_ key: String, _ val: T?) {
+    private mutating func set_val<T>(_ key: String, _ val: T?) {
         if val == nil {
             self.value.removeValue(forKey: key)
             return
@@ -48,7 +48,7 @@ class Profile: Codable {
         self.value[key] = AnyCodable.init(val)
     }
     
-    private func set_str(_ key: String, _ val: String?) {
+    private mutating func set_str(_ key: String, _ val: String?) {
         set_val(key, val)
     }
     
@@ -98,33 +98,16 @@ class Profile: Codable {
     }
     
     var website_url: URL? {
-        if self.website?.trimmingCharacters(in: .whitespacesAndNewlines) == "" {
+        return self.website.flatMap { URL(string: $0) }
-            return nil
-        }
-        return self.website.flatMap { url in
-            let trim = url.trimmingCharacters(in: .whitespacesAndNewlines)
-            if !(trim.hasPrefix("http://") || trim.hasPrefix("https://")) {
-                return URL(string: "https://" + trim)
-            }
-            return URL(string: trim)
-        }
     }
     
-    private var _lnurl: String? = nil
     var lnurl: String? {
-        if let _lnurl {
-            return _lnurl
-        }
-        
         guard let addr = lud16 ?? lud06 else {
             return nil;
         }
         
         if addr.contains("@") {
-            // this is a heavy op and is used a lot in views, cache it!
+            return lnaddress_to_lnurl(addr);
-            let addr = lnaddress_to_lnurl(addr);
-            self._lnurl = addr
-            return addr
         }
         
         if !addr.lowercased().hasPrefix("lnurl") {
@@ -147,7 +130,7 @@ class Profile: Codable {
         self.value = [:]
     }
     
-    required init(from decoder: Decoder) throws {
+    init(from decoder: Decoder) throws {
         let container = try decoder.singleValueContainer()
         self.value = try container.decode([String: AnyCodable].self)
     }
@@ -157,8 +140,12 @@ class Profile: Codable {
         try container.encode(value)
     }
     
-    static func displayName(profile: Profile?, pubkey: String) -> DisplayName {
+    static func displayName(profile: Profile?, pubkey: String) -> String {
-        return parse_display_name(profile: profile, pubkey: pubkey)
+        if pubkey == "anon" {
+            return "Anonymous"
+        }
+        let pk = bech32_nopre_pubkey(pubkey) ?? pubkey
+        return profile?.name ?? abbrev_pubkey(pk)
     }
 }
 

damus/Nostr/NostrEvent.swift

@@ -10,18 +10,13 @@ import CommonCrypto
 import secp256k1
 import secp256k1_implementation
 import CryptoKit
-import NaturalLanguage
+
 
 
 enum ValidationResult: Decodable {
-    case unknown
     case ok
     case bad_id
     case bad_sig
-    
-    var is_bad: Bool {
-        return self == .bad_id || self == .bad_sig
-    }
 }
 
 struct OtherEvent {
@@ -86,7 +81,7 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
     }
     
     var too_big: Bool {
-        return self.content.utf8.count > 16000
+        return self.content.count > 16000
     }
     
     var should_show_event: Bool {
@@ -97,6 +92,14 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
         return calculate_event_id(ev: self) == self.id
     }
     
+    var is_valid: Bool {
+        return validity == .ok
+    }
+    
+    lazy var validity: ValidationResult = {
+        return .ok //validate_event(ev: self)
+    }()
+    
     private var _blocks: [Block]? = nil
     func blocks(_ privkey: String?) -> [Block] {
         if let bs = _blocks {
@@ -212,16 +215,6 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
             }
         }
     }
-    
-    public func thread_id(privkey: String?) -> String {
-        for ref in event_refs(privkey) {
-            if let thread_id = ref.is_thread_id {
-                return thread_id.ref_id
-            }
-        }
-        
-        return self.id
-    }
 
     public func last_refid() -> ReferencedId? {
         var mlast: Int? = nil
@@ -256,25 +249,6 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
         return event_is_reply(self, privkey: privkey)
     }
 
-    func note_language(_ privkey: String?) -> String? {
-        // Rely on Apple's NLLanguageRecognizer to tell us which language it thinks the note is in
-        // and filter on only the text portions of the content as URLs and hashtags confuse the language recognizer.
-        let originalBlocks = blocks(privkey)
-        let originalOnlyText = originalBlocks.compactMap { $0.is_text }.joined(separator: " ")
-
-        // Only accept language recognition hypothesis if there's at least a 50% probability that it's accurate.
-        let languageRecognizer = NLLanguageRecognizer()
-        languageRecognizer.processString(originalOnlyText)
-
-        guard let locale = languageRecognizer.languageHypotheses(withMaximum: 1).first(where: { $0.value >= 0.5 })?.key.rawValue else {
-            return nil
-        }
-
-        // Remove the variant component and just take the language part as translation services typically only supports the variant-less language.
-        // Moreover, speakers of one variant can generally understand other variants.
-        return localeToLanguage(locale)
-    }
-
     public var referenced_ids: [ReferencedId] {
         return get_referenced_ids(key: "e")
     }
@@ -534,21 +508,16 @@ func make_first_contact_event(keypair: Keypair) -> NostrEvent? {
     guard let privkey = keypair.privkey else {
         return nil
     }
-    
+
-    let bootstrap_relays = load_bootstrap_relays(pubkey: keypair.pubkey)
     let rw_relay_info = RelayInfo(read: true, write: true)
     var relays: [String: RelayInfo] = [:]
-    
+    for relay in BOOTSTRAP_RELAYS {
-    for relay in bootstrap_relays {
         relays[relay] = rw_relay_info
     }
-    
     let relay_json = encode_json(relays)!
     let damus_pubkey = "3efdaebb1d8923ebd99c9e7ace3b4194ab45512e2be79c1b7d68d9243e0d2681"
-    let jb55_pubkey = "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245" // lol
     let tags = [
         ["p", damus_pubkey],
-        ["p", jb55_pubkey],
         ["p", keypair.pubkey] // you're a friend of yourself!
     ]
     let ev = NostrEvent(content: relay_json,

damus/Nostr/NostrFilter.swift

@@ -37,17 +37,13 @@ struct NostrFilter: Codable, Equatable {
     }
     
     public static func filter_hashtag(_ htags: [String]) -> NostrFilter {
-        return NostrFilter(ids: nil, kinds: nil, referenced_ids: nil, pubkeys: nil, since: nil, until: nil, authors: nil, hashtag: htags.map { $0.lowercased() })
+        return NostrFilter(ids: nil, kinds: nil, referenced_ids: nil, pubkeys: nil, since: nil, until: nil, authors: nil, hashtag: htags)
     }
 
     public static var filter_text: NostrFilter {
         return filter_kinds([1])
     }
-    
+
-    public static func filter_ids(_ ids: [String]) -> NostrFilter {
-        return NostrFilter(ids: ids, kinds: nil, referenced_ids: nil, pubkeys: nil, since: nil, until: nil, authors: nil, hashtag: nil)
-    }
-    
     public static var filter_profiles: NostrFilter {
         return filter_kinds([0])
     }

damus/Nostr/NostrLink.swift

@@ -127,9 +127,6 @@ func decode_nostr_uri(_ s: String) -> NostrLink? {
     var uri = s.replacingOccurrences(of: "nostr://", with: "")
     uri = uri.replacingOccurrences(of: "nostr:", with: "")
     
-    uri = uri.replacingOccurrences(of: "damus://", with: "")
-    uri = uri.replacingOccurrences(of: "damus:", with: "")
-    
     let parts = uri.split(separator: ":")
         .reduce(into: Array<String>()) { acc, str in
             guard let decoded = str.removingPercentEncoding else {
@@ -140,7 +137,7 @@ func decode_nostr_uri(_ s: String) -> NostrLink? {
         }
     
     if tag_is_hashtag(parts) {
-        return .filter(NostrFilter.filter_hashtag([parts[1]]))
+        return .filter(NostrFilter.filter_hashtag([parts[1].lowercased()]))
     }
     
     if let rid = tag_to_refid(parts) {

damus/Nostr/NostrMetadata.swift

@@ -21,5 +21,5 @@ struct NostrMetadata: Codable {
 }
 
 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: model.profile_image, banner: 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/Nostr/NostrResponse.swift

@@ -7,22 +7,13 @@
 
 import Foundation
 
-struct CommandResult {
-    let event_id: String
-    let ok: Bool
-    let msg: String
-}
-
 enum NostrResponse: Decodable {
     case event(String, NostrEvent)
     case notice(String)
     case eose(String)
-    case ok(CommandResult)
     
     var subid: String? {
         switch self {
-        case .ok(_):
-            return nil
         case .event(let sub_id, _):
             return sub_id
         case .eose(let sub_id):
@@ -57,23 +48,9 @@ enum NostrResponse: Decodable {
             let sub_id = try container.decode(String.self)
             self = .eose(sub_id)
             return
-        } else if typ == "OK" {
-            var cr: CommandResult
-            do {
-                let event_id = try container.decode(String.self)
-                let ok = try container.decode(Bool.self)
-                let msg = try container.decode(String.self)
-                cr = CommandResult(event_id: event_id, ok: ok, msg: msg)
-            } catch {
-                print(error)
-                throw error
-            }
-            self = .ok(cr)
-            return
-            //ev.pow = count_hash_leading_zero_bits(ev.id)
         }
 
-        throw DecodingError.dataCorrupted(.init(codingPath: [], debugDescription: "expected EVENT, NOTICE or OK, got \(typ)"))
+        throw DecodingError.dataCorrupted(.init(codingPath: [], debugDescription: "expected EVENT or NOTICE, got \(typ)"))
     }
 }
 

damus/Nostr/Profiles.swift

@@ -12,7 +12,6 @@ import UIKit
 class Profiles {
     var profiles: [String: TimestampedProfile] = [:]
     var validated: [String: NIP05] = [:]
-    var nip05_pubkey: [String: String] = [:]
     var zappers: [String: String] = [:]
     
     func is_validated(_ pk: String) -> NIP05? {

damus/Nostr/RelayConnection.swift

@@ -89,7 +89,7 @@ final class RelayConnection: WebSocketDelegate {
             self.isConnected = false
 
         case .text(let txt):
-            if txt.utf8.count > 2000 {
+            if txt.count > 2000 {
                 DispatchQueue.global(qos: .default).async {
                     if let ev = decode_nostr_event(txt: txt) {
                         DispatchQueue.main.async {
@@ -105,6 +105,8 @@ final class RelayConnection: WebSocketDelegate {
                 }
             }
 
+            print("decode failed for \(txt)")
+            // TODO: trigger event error
 
         default:
             break

damus/Nostr/RelayPool.swift

@@ -52,10 +52,6 @@ class RelayPool {
     var num_connecting: Int {
         return relays.reduce(0) { n, r in n + (r.connection.isConnecting ? 1 : 0) }
     }
-    
-    var num_connected: Int {
-        return relays.reduce(0) { n, r in n + (r.connection.isConnected ? 1 : 0) }
-    }
 
     func remove_handler(sub_id: String) {
         self.handlers = handlers.filter { $0.sub_id != sub_id }
@@ -260,6 +256,7 @@ class RelayPool {
             }
         }
         
+        // handle reconnect logic, etc?
         for handler in handlers {
             handler.callback(relay_id, event)
         }

damus/Util/AccountDeletion.swift

@@ -9,7 +9,7 @@ import Foundation
 
 
 func created_deleted_account_profile(keypair: FullKeypair) -> NostrEvent {
-    let profile = Profile()
+    var profile = Profile()
     profile.deleted = true
     profile.about = "account deleted"
     profile.name = "nobody"

damus/Util/CompatibleAttribute.swift

@@ -1,44 +0,0 @@
-//
-//  CompatibleAttribute.swift
-//  damus
-//
-//  Created by William Casarin on 2023-04-06.
-//
-
-import Foundation
-import SwiftUI
-
-class CompatibleText: Equatable {
-    var text: Text
-    var attributed: AttributedString
-    
-    init() {
-        self.text = Text("")
-        self.attributed = AttributedString(stringLiteral: "")
-    }
-    
-    init(stringLiteral: String) {
-        self.text = Text(stringLiteral)
-        self.attributed = AttributedString(stringLiteral: stringLiteral)
-    }
-    
-    init(text: Text, attributed: AttributedString) {
-        self.text = text
-        self.attributed = attributed
-    }
-    
-    init(attributed: AttributedString) {
-        self.text = Text(attributed)
-        self.attributed = attributed
-    }
-    
-    static func == (lhs: CompatibleText, rhs: CompatibleText) -> Bool {
-        return lhs.attributed == rhs.attributed
-    }
-    
-    static func +(lhs: CompatibleText, rhs: CompatibleText) -> CompatibleText {
-        let combinedText = lhs.text + rhs.text
-        let combinedAttributes = lhs.attributed + rhs.attributed
-        return CompatibleText(text: combinedText, attributed: combinedAttributes)
-    }
-}

damus/Util/DebouncedOnChange.swift

@@ -1,69 +0,0 @@
-// https://github.com/Tunous/DebouncedOnChange/blob/5670ea13e8ad33e9cc3197f6d13ce492dc0e46ab/Sources/DebouncedOnChange/DebouncedChangeViewModifier.swift
-
-import SwiftUI
-import Foundation
-
-extension View {
-
-    /// Adds a modifier for this view that fires an action only when a time interval in seconds represented by
-    /// `debounceTime` elapses between value changes.
-    ///
-    /// Each time the value changes before `debounceTime` passes, the previous action will be cancelled and the next
-    /// action /// will be scheduled to run after that time passes again. This mean that the action will only execute
-    /// after changes to the value /// stay unmodified for the specified `debounceTime` in seconds.
-    ///
-    /// - Parameters:
-    ///   - value: The value to check against when determining whether to run the closure.
-    ///   - debounceTime: The time in seconds to wait after each value change before running `action` closure.
-    ///   - action: A closure to run when the value changes.
-    /// - Returns: A view that fires an action after debounced time when the specified value changes.
-    public func onChange<Value>(
-        of value: Value,
-        debounceTime: TimeInterval,
-        perform action: @escaping (_ newValue: Value) -> Void
-    ) -> some View where Value: Equatable {
-        self.modifier(DebouncedChangeViewModifier(trigger: value, debounceTime: debounceTime, action: action))
-    }
-}
-
-private struct DebouncedChangeViewModifier<Value>: ViewModifier where Value: Equatable {
-    let trigger: Value
-    let debounceTime: TimeInterval
-    let action: (Value) -> Void
-
-    @State private var debouncedTask: Task<Void, Never>?
-
-    func body(content: Content) -> some View {
-        content.onChange(of: trigger) { value in
-            debouncedTask?.cancel()
-            debouncedTask = Task.delayed(seconds: debounceTime) { @MainActor in
-                action(value)
-            }
-        }
-    }
-}
-
-extension Task {
-
-    /// Asynchronously runs the given `operation` in its own task after the specified number of `seconds`.
-    ///
-    /// The operation will be executed after specified number of `seconds` passes. You can cancel the task earlier
-    /// for the operation to be skipped.
-    ///
-    /// - Parameters:
-    ///   - time: Delay time in seconds.
-    ///   - operation: The operation to execute.
-    /// - Returns: Handle to the task which can be cancelled.
-    @discardableResult
-    public static func delayed(
-        seconds: TimeInterval,
-        operation: @escaping @Sendable () async -> Void
-    ) -> Self where Success == Void, Failure == Never {
-        Self {
-            do {
-                try await Task<Never, Never>.sleep(nanoseconds: UInt64(seconds * 1_000_000_000))
-                await operation()
-            } catch {}
-        }
-    }
-}

damus/Util/DisplayName.swift

@@ -1,66 +0,0 @@
-//
-//  DisplayName.swift
-//  damus
-//
-//  Created by William Casarin on 2023-03-14.
-//
-
-import Foundation
-
-
-struct BothNames {
-    let username: String
-    let display_name: String
-}
-
-enum DisplayName {
-    case both(BothNames)
-    case one(String)
-    
-    var display_name: String {
-        switch self {
-        case .one(let one):
-            return one
-        case .both(let b):
-            return b.display_name
-        }
-    }
-    
-    var username: String {
-        switch self {
-        case .one(let one):
-            return one
-        case .both(let b):
-            return b.username
-        }
-    }
-}
-
-
-func parse_display_name(profile: Profile?, pubkey: String) -> DisplayName {
-    if pubkey == "anon" {
-        return .one(NSLocalizedString("Anonymous", comment: "Placeholder display name of anonymous user."))
-    }
-    
-    guard let profile else {
-        return .one(abbrev_bech32_pubkey(pubkey: pubkey))
-    }
-    
-    let name = profile.name?.isEmpty == false ? profile.name : nil
-    let disp_name = profile.display_name?.isEmpty == false ? profile.display_name : nil
-    
-    if let name, let disp_name, name != disp_name {
-        return .both(BothNames(username: name, display_name: disp_name))
-    }
-    
-    if let one = name ?? disp_name {
-        return .one(one)
-    }
-    
-    return .one(abbrev_bech32_pubkey(pubkey: pubkey))
-}
-
-func abbrev_bech32_pubkey(pubkey: String) -> String {
-    let pk = bech32_nopre_pubkey(pubkey) ?? pubkey
-    return abbrev_pubkey(pk)
-}

damus/Util/EventCache.swift

@@ -5,101 +5,10 @@
 //  Created by William Casarin on 2023-02-21.
 //
 
-import Combine
 import Foundation
-import UIKit
 
 class EventCache {
-    private var events: [String: NostrEvent] = [:]
+    private var events: [String: NostrEvent]
-    private var replies = ReplyMap()
-    private var cancellable: AnyCancellable?
-    private var translations: [String: TranslateStatus] = [:]
-    private var artifacts: [String: NoteArtifacts] = [:]
-    var validation: [String: ValidationResult] = [:]
-    
-    //private var thread_latest: [String: Int64]
-    
-    init() {
-        cancellable = NotificationCenter.default.publisher(
-            for: UIApplication.didReceiveMemoryWarningNotification
-        ).sink { [weak self] _ in
-            self?.prune()
-        }
-    }
-    
-    func is_event_valid(_ evid: String) -> ValidationResult {
-        guard let result = validation[evid] else {
-            return .unknown
-        }
-        
-        return result
-    }
-    
-    func store_translation_artifacts(evid: String, translated: TranslateStatus) {
-        self.translations[evid] = translated
-    }
-    
-    func store_artifacts(evid: String, artifacts: NoteArtifacts) {
-        self.artifacts[evid] = artifacts
-    }
-    
-    func lookup_artifacts(evid: String) -> NoteArtifacts? {
-        return self.artifacts[evid]
-    }
-    
-    func lookup_translated_artifacts(evid: String) -> TranslateStatus? {
-        return self.translations[evid]
-    }
-    
-    func parent_events(event: NostrEvent) -> [NostrEvent] {
-        var parents: [NostrEvent] = []
-        
-        var ev = event
-        
-        while true {
-            guard let direct_reply = ev.direct_replies(nil).first else {
-                break
-            }
-            
-            guard let next_ev = lookup(direct_reply.ref_id), next_ev != ev else {
-                break
-            }
-            
-            parents.append(next_ev)
-            ev = next_ev
-        }
-        
-        return parents.reversed()
-    }
-    
-    func add_replies(ev: NostrEvent) {
-        for reply in ev.direct_replies(nil) {
-            replies.add(id: reply.ref_id, reply_id: ev.id)
-        }
-    }
-    
-    func child_events(event: NostrEvent) -> [NostrEvent] {
-        guard let xs = replies.lookup(event.id) else {
-            return []
-        }
-        let evs: [NostrEvent] = xs.reduce(into: [], { evs, evid in
-            guard let ev = self.lookup(evid) else {
-                return
-            }
-            
-            evs.append(ev)
-        }).sorted(by: { $0.created_at < $1.created_at })
-        return evs
-    }
-    
-    func upsert(_ ev: NostrEvent) -> NostrEvent {
-        if let found = lookup(ev.id) {
-            return found
-        }
-        
-        insert(ev)
-        return ev
-    }
     
     func lookup(_ evid: String) -> NostrEvent? {
         return events[evid]
@@ -112,10 +21,7 @@ class EventCache {
         events[ev.id] = ev
     }
     
-    private func prune() {
+    init() {
-        events = [:]
+        self.events = [:]
-        translations = [:]
-        artifacts = [:]
-        replies.replies = [:]
     }
 }

damus/Util/Extensions/Binding+.swift

@@ -1,49 +0,0 @@
-//
-//  Binding+.swift
-//  damus
-//
-//  Created by Oleg Abalonski on 3/5/23.
-//  Ref: https://josephduffy.co.uk/posts/mapping-optional-binding-to-bool
-
-import os.log
-import SwiftUI
-
-extension Binding where Value == Bool {
-    /// Creates a binding by mapping an optional value to a `Bool` that is
-    /// `true` when the value is non-`nil` and `false` when the value is `nil`.
-    ///
-    /// When the value of the produced binding is set to `false` the value
-    /// of `bindingToOptional`'s `wrappedValue` is set to `nil`.
-    ///
-    /// Setting the value of the produce binding to `true` does nothing and
-    /// will log an error.
-    ///
-    /// - parameter bindingToOptional: A `Binding` to an optional value, used to calculate the `wrappedValue`.
-    public init<Wrapped>(mappedTo bindingToOptional: Binding<Wrapped?>) {
-        self.init(
-            get: { bindingToOptional.wrappedValue != nil },
-            set: { newValue in
-                if !newValue {
-                    bindingToOptional.wrappedValue = nil
-                } else {
-                    os_log(
-                        .error,
-                        "Optional binding mapped to optional has been set to `true`, which will have no effect. Current value: %@",
-                        String(describing: bindingToOptional.wrappedValue)
-                    )
-                }
-            }
-        )
-    }
-}
-
-extension Binding {
-    /// Returns a binding by mapping this binding's value to a `Bool` that is
-    /// `true` when the value is non-`nil` and `false` when the value is `nil`.
-    ///
-    /// When the value of the produced binding is set to `false` this binding's value
-    /// is set to `nil`.
-    public func mappedToBool<Wrapped>() -> Binding<Bool> where Value == Wrapped? {
-        return Binding<Bool>(mappedTo: self)
-    }
-}

damus/Util/Hashtags.swift

@@ -1,68 +0,0 @@
-//
-//  Hashtags.swift
-//  damus
-//
-//  Created by William Casarin on 2023-04-06.
-//
-
-import Foundation
-import SwiftUI
-
-struct CustomHashtag {
-    let name: String
-    let offset: CGFloat?
-    let color: Color?
-    
-    init(name: String, color: Color? = nil, offset: CGFloat? = nil) {
-        self.name = name
-        self.color = color
-        self.offset = offset
-    }
-    
-    static let coffee = CustomHashtag(name: "coffee", color: DamusColors.brown, offset: -1.0)
-    static let bitcoin = CustomHashtag(name: "bitcoin", color: Color.orange, offset: -3.0)
-    static let nostr = CustomHashtag(name: "nostr", color: DamusColors.purple, offset: -2.0)
-    static let plebchain = CustomHashtag(name: "plebchain", color: DamusColors.deepPurple, offset: -3.0)
-    static let zap = CustomHashtag(name: "zap", color: DamusColors.yellow, offset: -4.0)
-}
-
-
-let custom_hashtags: [String: CustomHashtag] = [
-    "bitcoin": CustomHashtag.bitcoin,
-    "btc": CustomHashtag.bitcoin,
-    "nostr": CustomHashtag.nostr,
-    "coffee": CustomHashtag.coffee,
-    "coffeechain": CustomHashtag.coffee,
-    "plebchain": CustomHashtag.plebchain,
-    "zap": CustomHashtag.zap,
-    "zapathon": CustomHashtag.zap,
-]
-
-func hashtag_str(_ htag: String) -> CompatibleText {
-    var attributedString = AttributedString(stringLiteral: "#\(htag)")
-    attributedString.link = URL(string: "damus:t:\(htag)")
-    
-    let lowertag = htag.lowercased()
-    
-    var text = Text(attributedString)
-    if let custom_hashtag = custom_hashtags[lowertag] {
-        if let col = custom_hashtag.color {
-            attributedString.foregroundColor = col
-        }
-        
-        let name = custom_hashtag.name
-        
-        if let img = UIImage(named: "\(name)-hashtag") {
-            attributedString = attributedString + " "
-            attributed_string_attach_icon(&attributedString, img: img)
-        }
-        text = Text(attributedString)
-        let img = Image("\(name)-hashtag")
-        text = text + Text("\(img)").baselineOffset(custom_hashtag.offset ?? 0.0)
-    } else {
-        attributedString.foregroundColor = DamusColors.purple
-    }
-    
-    return CompatibleText(text: text, attributed: attributedString)
- }
-

damus/Util/KFOptionSetter+.swift

@@ -14,19 +14,19 @@ extension KFOptionSetter {
         options.callbackQueue = .dispatch(.global(qos: .background))
         options.processingQueue = .dispatch(.global(qos: .background))
         options.downloader = CustomImageDownloader.shared
+        options.backgroundDecode = true
+        options.cacheOriginalImage = true
+        options.scaleFactor = UIScreen.main.scale
+        
         options.processor = CustomImageProcessor(
             maxSize: imageContext.maxMebibyteSize(),
             downsampleSize: imageContext.downsampleSize()
         )
+        
         options.cacheSerializer = CustomCacheSerializer(
             maxSize: imageContext.maxMebibyteSize(),
             downsampleSize: imageContext.downsampleSize()
         )
-        options.loadDiskFileSynchronously = false
-        options.backgroundDecode = true
-        options.cacheOriginalImage = true
-        options.scaleFactor = UIScreen.main.scale
-        options.onlyLoadFirstFrame = should_disable_image_animation()
         
         return self
     }

damus/Util/LocalNotification.swift

@@ -1,47 +0,0 @@
-//
-//  LocalNotification.swift
-//  damus
-//
-//  Created by William Casarin on 2023-04-15.
-//
-
-import Foundation
-
-struct LossyLocalNotification {
-    let type: LocalNotificationType
-    let event_id: String
-    
-    func to_user_info() -> [AnyHashable: Any] {
-        return [
-            "type": self.type.rawValue,
-            "evid": self.event_id
-        ]
-    }
-    
-    static func from_user_info(user_info: [AnyHashable: Any]) -> LossyLocalNotification {
-        let target_id = user_info["evid"] as! String
-        let typestr = user_info["type"] as! String
-        let type = LocalNotificationType(rawValue: typestr)!
-        
-        return LossyLocalNotification(type: type, event_id: target_id)
-    }
-}
-
-struct LocalNotification {
-    let type: LocalNotificationType
-    let event: NostrEvent
-    let target: NostrEvent
-    let content: String
-    
-    func to_lossy() -> LossyLocalNotification {
-        return LossyLocalNotification(type: self.type, event_id: self.target.id)
-    }
-}
-
-enum LocalNotificationType: String {
-    case dm
-    case like
-    case mention
-    case repost
-    case zap
-}

damus/Util/LocalizationUtil.swift

@@ -15,20 +15,3 @@ func bundleForLocale(locale: Locale?) -> Bundle {
     let path = Bundle.main.path(forResource: locale!.identifier, ofType: "lproj")
     return path != nil ? (Bundle(path: path!) ?? Bundle.main) : Bundle.main
 }
-
-func localizedStringFormat(key: String, locale: Locale?) -> String {
-    let bundle = bundleForLocale(locale: locale)
-    let fallback = bundleForLocale(locale: Locale(identifier: "en-US")).localizedString(forKey: key, value: nil, table: nil)
-    return bundle.localizedString(forKey: key, value: fallback, table: nil)
-}
-
-/**
- Removes the variant part of a locale code so that it contains only the language code.
- */
-func localeToLanguage(_ locale: String) -> String? {
-    if #available(iOS 16, *) {
-        return Locale.LanguageCode(stringLiteral: locale).identifier(.alpha2)
-    } else {
-        return NSLocale(localeIdentifier: locale).languageCode
-    }
-}

damus/Util/NIP05.swift

@@ -39,20 +39,11 @@ enum NIP05Validation {
     case valid
 }
 
-struct FetchedNIP05 {
+func validate_nip05(pubkey: String, nip05_str: String) async -> NIP05? {
-    let response: NIP05Response
-    let nip05: NIP05Response
-}
-
-func fetch_nip05_str(nip05_str: String) async -> NIP05Response? {
     guard let nip05 = NIP05.parse(nip05_str) else {
         return nil
     }
     
-    return await fetch_nip05(nip05: nip05)
-}
-
-func fetch_nip05(nip05: NIP05) async -> NIP05Response? {
     guard let url = nip05.url else {
         return nil
     }
@@ -66,18 +57,6 @@ func fetch_nip05(nip05: NIP05) async -> NIP05Response? {
         return nil
     }
     
-    return decoded
-}
-
-func validate_nip05(pubkey: String, nip05_str: String) async -> NIP05? {
-    guard let nip05 = NIP05.parse(nip05_str) else {
-        return nil
-    }
-    
-    guard let decoded = await fetch_nip05(nip05: nip05) else {
-        return nil
-    }
-    
     guard let stored_pk = decoded.names[nip05.username] else {
         return nil
     }

damus/Util/Notifications.swift

@@ -86,8 +86,8 @@ extension Notification.Name {
     static var report: Notification.Name {
         return Notification.Name("report")
     }
-    static var mute: Notification.Name {
+    static var block: Notification.Name {
-        return Notification.Name("mute")
+        return Notification.Name("block")
     }
     static var new_mutes: Notification.Name {
         return Notification.Name("new_mutes")
@@ -101,18 +101,12 @@ extension Notification.Name {
     static var update_stats: Notification.Name {
         return Notification.Name("update_stats")
     }
+    static var update_bookmarks: Notification.Name {
+        return Notification.Name("update_bookmarks")
+    }
     static var zapping: Notification.Name {
         return Notification.Name("zapping")
     }
-    static var mute_thread: Notification.Name {
-        return Notification.Name("mute_thread")
-    }
-    static var unmute_thread: Notification.Name {
-        return Notification.Name("unmute_thread")
-    }
-    static var local_notification: Notification.Name {
-        return Notification.Name("local_notification")
-    }
 }
 
 func handle_notify(_ name: Notification.Name) -> NotificationCenter.Publisher {

damus/Util/PostBox.swift

@@ -1,121 +0,0 @@
-//
-//  PostBox.swift
-//  damus
-//
-//  Created by William Casarin on 2023-03-20.
-//
-
-import Foundation
-
-
-class Relayer {
-    let relay: String
-    var attempts: Int
-    var retry_after: Double
-    var last_attempt: Int64?
-    
-    init(relay: String, attempts: Int, retry_after: Double) {
-        self.relay = relay
-        self.attempts = attempts
-        self.retry_after = retry_after
-        self.last_attempt = nil
-    }
-}
-
-class PostedEvent {
-    let event: NostrEvent
-    var remaining: [Relayer]
-    
-    init(event: NostrEvent, remaining: [String]) {
-        self.event = event
-        self.remaining = remaining.map {
-            Relayer(relay: $0, attempts: 0, retry_after: 2.0)
-        }
-    }
-}
-
-class PostBox {
-    let pool: RelayPool
-    var events: [String: PostedEvent]
-    
-    init(pool: RelayPool) {
-        self.pool = pool
-        self.events = [:]
-        pool.register_handler(sub_id: "postbox", handler: handle_event)
-    }
-    
-    func try_flushing_events() {
-        let now = Int64(Date().timeIntervalSince1970)
-        for kv in events {
-            let event = kv.value
-            for relayer in event.remaining {
-                if relayer.last_attempt == nil || (now >= (relayer.last_attempt! + Int64(relayer.retry_after))) {
-                    print("attempt #\(relayer.attempts) to flush event '\(event.event.content)' to \(relayer.relay) after \(relayer.retry_after) seconds")
-                    flush_event(event, to_relay: relayer)
-                }
-            }
-        }
-    }
-    
-    func handle_event(relay_id: String, _ ev: NostrConnectionEvent) {
-        try_flushing_events()
-        
-        guard case .nostr_event(let resp) = ev else {
-            return
-        }
-        
-        guard case .ok(let cr) = resp else {
-            return
-        }
-        
-        remove_relayer(relay_id: relay_id, event_id: cr.event_id)
-    }
-    
-    func remove_relayer(relay_id: String, event_id: String) {
-        guard let ev = self.events[event_id] else {
-            return
-        }
-        ev.remaining = ev.remaining.filter {
-            $0.relay != relay_id
-        }
-        if ev.remaining.count == 0 {
-            self.events.removeValue(forKey: event_id)
-        }
-    }
-    
-    private func flush_event(_ event: PostedEvent, to_relay: Relayer? = nil) {
-        var relayers = event.remaining
-        if let to_relay {
-            relayers = [to_relay]
-        }
-        
-        for relayer in relayers {
-            relayer.attempts += 1
-            relayer.last_attempt = Int64(Date().timeIntervalSince1970)
-            relayer.retry_after *= 1.5
-            pool.send(.event(event.event), to: [relayer.relay])
-        }
-    }
-    
-    func flush() {
-        for event in events {
-            flush_event(event.value)
-        }
-    }
-    
-    func send(_ event: NostrEvent) {
-        // Don't add event if we already have it
-        if events[event.id] != nil {
-            return
-        }
-        
-        let remaining = pool.descriptors.map {
-            $0.url.absoluteString
-        }
-        
-        let posted_ev = PostedEvent(event: event, remaining: remaining)
-        events[event.id] = posted_ev
-        
-        flush_event(posted_ev)
-    }
-}

damus/Util/PreviewCache.swift

@@ -24,21 +24,12 @@ enum Preview {
 }
 
 class PreviewCache {
-    private var previews: [String: Preview]
+    var previews: [String: Preview]
-    private var image_meta: [String: ImageFill]
     
     func lookup(_ evid: String) -> Preview? {
         return previews[evid]
     }
     
-    func lookup_image_meta(_ evid: String) -> ImageFill? {
-        return image_meta[evid]
-    }
-    
-    func cache_image_meta(evid: String, image_fill: ImageFill) {
-        self.image_meta[evid] = image_fill
-    }
-    
     func store(evid: String, preview: LPLinkMetadata?)  {
         switch preview {
         case .none:
@@ -50,6 +41,5 @@ class PreviewCache {
     
     init() {
         self.previews = [:]
-        self.image_meta = [:]
     }
 }

damus/Util/Relays/RelayBootstrap.swift

@@ -1,44 +0,0 @@
-//
-//  RelayBootstrap.swift
-//  damus
-//
-//  Created by William Casarin on 2023-04-04.
-//
-
-import Foundation
-
-let BOOTSTRAP_RELAYS = [
-    "wss://relay.damus.io",
-    "wss://eden.nostr.land",
-    "wss://nostr.wine",
-    "wss://nos.lol",
-]
-
-func bootstrap_relays_setting_key(pubkey: String) -> String {
-    return pk_setting_key(pubkey, key: "bootstrap_relays")
-}
-
-func save_bootstrap_relays(pubkey: String, relays: [String])  {
-    let key = bootstrap_relays_setting_key(pubkey: pubkey)
-    
-    UserDefaults.standard.set(relays, forKey: key)
-}
-
-func load_bootstrap_relays(pubkey: String) -> [String] {
-    let key = bootstrap_relays_setting_key(pubkey: pubkey)
-    
-    guard let relays = UserDefaults.standard.stringArray(forKey: key) else {
-        print("loading default bootstrap relays")
-        return BOOTSTRAP_RELAYS.map { $0 }
-    }
-    
-    if relays.count == 0 {
-        print("loading default bootstrap relays")
-        return BOOTSTRAP_RELAYS.map { $0 }
-    }
-    
-    let loaded_relays = Array(Set(relays + BOOTSTRAP_RELAYS))
-    print("Loading custom bootstrap relays: \(loaded_relays)")
-    return loaded_relays
-}
-

damus/Util/ReplyCounter.swift

@@ -1,54 +0,0 @@
-//
-//  ReplyCounter.swift
-//  damus
-//
-//  Created by William Casarin on 2023-04-04.
-//
-
-import Foundation
-
-class ReplyCounter {
-    private var replies: [String: Int]
-    private var counted: Set<String>
-    private var our_replies: [String: NostrEvent]
-    private let our_pubkey: String
-    
-    init(our_pubkey: String) {
-        self.our_pubkey = our_pubkey
-        replies = [:]
-        counted = Set()
-        our_replies = [:]
-    }
-    
-    func our_reply(_ evid: String) -> NostrEvent? {
-        return our_replies[evid]
-    }
-    
-    func get_replies(_ evid: String) -> Int {
-        return replies[evid] ?? 0
-    }
-    
-    func count_replies(_ event: NostrEvent) {
-        guard event.is_textlike else {
-            return
-        }
-        
-        if counted.contains(event.id) {
-            return
-        }
-        
-        counted.insert(event.id)
-        
-        for reply in event.direct_replies(nil) {
-            if event.pubkey == our_pubkey {
-                self.our_replies[reply.ref_id] = event
-            }
-            
-            if replies[reply.ref_id] != nil {
-                replies[reply.ref_id] = replies[reply.ref_id]! + 1
-            } else {
-                replies[reply.ref_id] = 1
-            }
-        }
-    }
-}

damus/Util/Zap.swift

@@ -303,13 +303,14 @@ func fetch_zap_invoice(_ payreq: LNUrlPayRequest, zapreq: NostrEvent?, sats: Int
     
     var query = [URLQueryItem(name: "amount", value: "\(amount)")]
     
-    if let zapreq, zappable && zap_type != .non_zap, let json = encode_json(zapreq) {
+    if let zapreq, zappable && zap_type != .non_zap {
+        let json = event_to_json(ev: zapreq)
         print("zapreq json: \(json)")
         query.append(URLQueryItem(name: "nostr", value: json))
     }
    
     // add a lud12 comment as well if we have it
-    if zap_type != .priv, let comment, let limit = payreq.commentAllowed, limit != 0 {
+    if let comment, let limit = payreq.commentAllowed, limit != 0 {
         let limited_comment = String(comment.prefix(limit))
         query.append(URLQueryItem(name: "comment", value: limited_comment))
     }
@@ -322,15 +323,7 @@ func fetch_zap_invoice(_ payreq: LNUrlPayRequest, zapreq: NostrEvent?, sats: Int
     
     print("url \(url)")
     
-    var ret: (Data, URLResponse)? = nil
+    guard let ret = try? await URLSession.shared.data(from: url) else {
-    do {
-        ret = try await URLSession.shared.data(from: url)
-    } catch {
-        print(error.localizedDescription)
-        return nil
-    }
-    
-    guard let ret else {
         return nil
     }
     

damus/Views/ActionBar/EventActionBar.swift

@@ -26,13 +26,11 @@ struct EventActionBar: View {
     
     // just used for previews
     @State var sheet: ActionBarSheet? = nil
+    @State var confirm_boost: Bool = false
     @State var show_share_sheet: Bool = false
-    @State var show_share_action: Bool = false
     
     @ObservedObject var bar: ActionBarModel
     
-    @Environment(\.colorScheme) var colorScheme
-    
     init(damus_state: DamusState, event: NostrEvent, bar: ActionBarModel? = nil, test_lnurl: String? = nil) {
         self.damus_state = damus_state
         self.event = event
@@ -47,15 +45,10 @@ struct EventActionBar: View {
     var body: some View {
         HStack {
             if damus_state.keypair.privkey != nil {
-                HStack(spacing: 4) {
+                EventActionButton(img: "bubble.left", col: nil) {
-                    EventActionButton(img: "bubble.left", col: bar.replied ? DamusColors.purple : Color.gray) {
+                    notify(.reply, event)
-                        notify(.reply, event)
-                    }
-                    .accessibilityLabel(NSLocalizedString("Reply", comment: "Accessibility label for reply button"))
-                    Text(verbatim: "\(bar.replies > 0 ? "\(bar.replies)" : "")")
-                        .font(.footnote.weight(.medium))
-                        .foregroundColor(bar.replied ? DamusColors.purple : Color.gray)
                 }
+                .accessibilityLabel(NSLocalizedString("Reply", comment: "Accessibility label for reply button"))
             }
             Spacer()
             HStack(spacing: 4) {
@@ -63,8 +56,8 @@ struct EventActionBar: View {
                 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 {
-                        send_boost()
+                        self.confirm_boost = true
                     }
                 }
                 .accessibilityLabel(NSLocalizedString("Boosts", comment: "Accessibility label for boosts button"))
@@ -82,10 +75,10 @@ struct EventActionBar: View {
                         send_like()
                     }
                 }
-                
                 Text(verbatim: "\(bar.likes > 0 ? "\(bar.likes)" : "")")
                     .font(.footnote.weight(.medium))
-                    .nip05_colorized(gradient: bar.liked)
+                    .foregroundColor(bar.liked ? Color.accentColor : Color.gray)
+                
             }
             
             if let lnurl = self.lnurl {
@@ -95,23 +88,10 @@ struct EventActionBar: View {
 
             Spacer()
             EventActionButton(img: "square.and.arrow.up", col: Color.gray) {
-                show_share_action = true
+                show_share_sheet = true
             }
             .accessibilityLabel(NSLocalizedString("Share", comment: "Button to share a post"))
         }
-        .sheet(isPresented: $show_share_action) {
-            if #available(iOS 16.0, *) {
-                ShareAction(event: event, bookmarks: damus_state.bookmarks, show_share_sheet: $show_share_sheet, show_share_action: $show_share_action)
-                    .presentationDetents([.height(300)])
-                    .presentationDragIndicator(.visible)
-            } else {
-                if let note_id = bech32_note_id(event.id) {
-                    if let url = URL(string: "https://damus.io/" + note_id) {
-                        ShareSheet(activityItems: [url])
-                    }
-                }
-            }
-        }
         .sheet(isPresented: $show_share_sheet) {
             if let note_id = bech32_note_id(event.id) {
                 if let url = URL(string: "https://damus.io/" + note_id) {
@@ -119,6 +99,16 @@ struct EventActionBar: View {
                 }
             }
         }
+        .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(NSLocalizedString("Repost", comment: "Button to confirm reposting a post.")) {
+                send_boost()
+            }
+        } message: {
+            Text("Are you sure you want to repost this?", comment: "Alert message to ask if user wants to repost a post.")
+        }
         .onReceive(handle_notify(.update_stats)) { n in
             let target = n.object as! String
             guard target == self.event.id else { return }
@@ -145,7 +135,7 @@ struct EventActionBar: View {
         
         self.bar.our_boost = boost
         
-        notify(.boost, boost)
+        damus_state.pool.send(.event(boost))
     }
     
     func send_like() {
@@ -159,7 +149,7 @@ struct EventActionBar: View {
 
         generator.impactOccurred()
         
-        damus_state.postbox.send(like_ev)
+        damus_state.pool.send(.event(like_ev))
     }
 }
 
@@ -177,48 +167,13 @@ struct LikeButton: View {
     let action: () -> ()
     
     @Environment(\.colorScheme) var colorScheme
-
-    // Following four are Shaka animation properties
-    let timer = Timer.publish(every: 0.10, on: .main, in: .common).autoconnect()
-    @State private var shouldAnimate = false
-    @State private var rotationAngle = 0.0
-    @State private var amountOfAngleIncrease: Double = 0.0
     
     var body: some View {
-
+        Button(action: action) {
-        Button(action: {
+            Image(liked ? "shaka-full" : "shaka-line")
-            withAnimation(Animation.easeOut(duration: 0.15)) {
+                .foregroundColor(liked ? .accentColor : .gray)
-                self.action()
-                shouldAnimate = true
-                amountOfAngleIncrease = 20.0
-            }
-        }) {
-            if liked {
-                LINEAR_GRADIENT
-                    .mask(Image("shaka-full")
-                        .resizable()
-                    ).frame(width: 14, height: 14)
-            } else {
-                Image("shaka-line")
-                    .foregroundColor(.gray)
-            }
         }
         .accessibilityLabel(NSLocalizedString("Like", comment: "Accessibility Label for Like button"))
-        .rotationEffect(Angle(degrees: shouldAnimate ? rotationAngle : 0))
-        .onReceive(self.timer) { _ in
-            // Shaka animation logic
-            rotationAngle = amountOfAngleIncrease
-            if amountOfAngleIncrease == 0 {
-                timer.upstream.connect().cancel()
-                return
-            }
-            amountOfAngleIncrease = -amountOfAngleIncrease
-            if amountOfAngleIncrease < 0 {
-                amountOfAngleIncrease += 2.5
-            } else {
-                amountOfAngleIncrease -= 2.5
-            }
-        }
     }
 }
 
@@ -230,12 +185,12 @@ struct EventActionBar_Previews: PreviewProvider {
         let ev = NostrEvent(content: "hi", pubkey: pk)
         
         let bar = ActionBarModel.empty()
-        let likedbar = ActionBarModel(likes: 10, boosts: 0, zaps: 0, zap_total: 0, replies: 0, our_like: nil, our_boost: nil, our_zap: nil, our_reply: nil)
+        let likedbar = ActionBarModel(likes: 10, boosts: 0, zaps: 0, zap_total: 0, our_like: nil, our_boost: nil, our_zap: nil)
-        let likedbar_ours = ActionBarModel(likes: 10, boosts: 0, zaps: 0, zap_total: 0, replies: 0, our_like: test_event, our_boost: nil, our_zap: nil, our_reply: nil)
+        let likedbar_ours = ActionBarModel(likes: 10, boosts: 0, zaps: 0, zap_total: 0, our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: nil, our_zap: nil)
-        let maxed_bar = ActionBarModel(likes: 999, boosts: 999, zaps: 999, zap_total: 99999999, replies: 999, our_like: test_event, our_boost: test_event, our_zap: nil, our_reply: nil)
+        let maxed_bar = ActionBarModel(likes: 999, boosts: 999, zaps: 999, zap_total: 99999999,  our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: NostrEvent(id: "", content: "", pubkey: ""), our_zap: nil)
-        let extra_max_bar = ActionBarModel(likes: 9999, boosts: 9999, zaps: 9999, zap_total: 99999999, replies: 9999, our_like: test_event, our_boost: test_event, our_zap: nil, our_reply: test_event)
+        let extra_max_bar = ActionBarModel(likes: 9999, boosts: 9999, zaps: 9999, zap_total: 99999999,  our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: NostrEvent(id: "", content: "", pubkey: ""), our_zap: nil)
-        let mega_max_bar = ActionBarModel(likes: 9999999, boosts: 99999, zaps: 9999, zap_total: 99999999, replies: 9999999,  our_like: test_event, our_boost: test_event, our_zap: test_zap, our_reply: test_event)
+        let mega_max_bar = ActionBarModel(likes: 9999999, boosts: 99999, zaps: 9999, zap_total: 99999999,  our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: NostrEvent(id: "", content: "", pubkey: ""), our_zap: nil)
-        let zapbar = ActionBarModel(likes: 0, boosts: 0, zaps: 5, zap_total: 10000000, replies: 0, our_like: nil, our_boost: nil, our_zap: nil, our_reply: nil)
+        let zapbar = ActionBarModel(likes: 0, boosts: 0, zaps: 5, zap_total: 10000000, our_like: nil, our_boost: nil, our_zap: nil)
         
         VStack(spacing: 50) {
             EventActionBar(damus_state: ds, event: ev, bar: bar)