Replace deprecated NIP-08 indexed mentions with NIP-27 nostr: prefixed URI text note references on writes

Changelog-Fixed: Replace deprecated NIP-08 indexed mentions with NIP-27 nostr: prefixed URI text note references on writes

.envrc

@@ -1,4 +1,4 @@
-use nix
+#use nix
 
 export TODO_FILE=$PWD/TODO
 

.github/workflows/run-tests.yaml

@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - "master"
-      - "ci"
   pull_request:
     branches:
       - "*"

.gitignore

@@ -3,4 +3,3 @@ xcuserdata
 damus/TestingPrivate.swift
 .DS_Store
 TODO.bak
-tags

.mailmap

@@ -1,5 +0,0 @@
-Terry Yiu <git@tyiu.xyz> <963907+tyiu@users.noreply.github.com>
-Ben Weeks <ben.weeks@knowall.ai> <ben.weeks@outlook.com>
-Suhail Saqan <suhail.saqan@gmail.com> <43693074+suhailsaqan@users.noreply.github.com>
-cr0bar <cr0bar@cr0.bar> <cr0bar@users.noreply.github.com>
-Swift <scoder1747@gmail.com> <120697811+scoder1747@users.noreply.github.com>

CHANGELOG.md

@@ -1,117 +1,3 @@
-## [1.6-4] - 2023-07-13
-
-### Added
-
-- Add the ability to follow hashtags (William Casarin)
-
-### Changed
-
-- Remove note size restriction for longform events (William Casarin)
-
-### Fixed
-
-- Hide users and hashtags from home timeline when you unfollow (William Casarin)
-- Fixed a bug where following a user might not work due to poor connectivity (William Casarin)
-- Icon color for developer mode setting is incorrect in low-light mode (Bryan Montz)
-- Fixed nav bar color on login, eula, and account creation (ericholguin)
-
-
-### Removed
-
-- Remove following Damus Will by default (William Casarin)
-
-[1.6-4]: https://github.com/damus-io/damus/releases/tag/v1.6-4
-
-## [1.6-3] - 2023-07-11
-
-### Changed
-
-- Start at top when reading longform events (William Casarin)
-- Allow reposting and quote reposting multiple times (William Casarin)
-
-
-### Fixed
-
-- Show longform previews in notifications instead of the entire post (William Casarin)
-- Fix padding on longform events (William Casarin)
-- Fix action bar appearing on quoted longform previews (William Casarin)
-
-
-[1.6-3]: https://github.com/damus-io/damus/releases/tag/v1.6-3
-## [1.6-2] - 2023-07-11
-
-### Added
-
-- Add support for multilingual hashtags (cr0bar)
-- Add r tag when mentioning a url (William Casarin)
-- Add initial longform note support (William Casarin)
-- Enable banner image editing (Joel Klabo)
-- Add relay log in developer mode (Bryan Montz)
-
-
-### Fixed
-
-- Fix lag when creating large posts (William Casarin)
-- Fix npub mentions failing to parse in some cases (William Casarin)
-- Fix PostView initial string to skip mentioning self when on own profile (Terry Yiu)
-- Fix freezing bug when tapping Developer settings menu (Terry Yiu)
-- Fix potential fake profile zap attacks (William Casarin)
-- Fix issue where malicious zappers can send fake zaps to another user's posts (William Casarin)
-- Fix profile post button mentions (cr0bar)
-- Fix icons on settings view (cr0bar)
-- Fix Invalid Zap bug in reposts (William Casarin)
-
-
-### Removed
-
-- Remove old @ and & hex key mentions (William Casarin)
-
-
-[1.6-2]: https://github.com/damus-io/damus/releases/tag/v1.6-2
-## [1.6] - 2023-07-04
-
-### Added
-
-- Speed up user search (Terry Yiu)
-- Add post button to profile pages (William Casarin)
-- Add post button when logged in with private key and on own profile view (Terry Yiu)
-
-### Changed
-
-- Drop iOS15 support (Scott Penrose)
-
-### Fixed
-
-- Load more content on profile view (William Casarin)
-- Fix reports to conform to NIP-56 (Terry Yiu)
-- Fix profile navigation bugs from muted users list and relay list views (Terry Yiu)
-- Fix navigation to translation settings view (Terry Yiu)
-- Fixed all navigation issues (Scott Penrose)
-- Disable post button when media upload in progress (Terry Yiu)
-- Fix taps on mentions in note drafts to not redirect to other Nostr clients (Terry Yiu)
-- Fix missing profile zap notification text (Terry Yiu)
-
-
-[1.6]: https://github.com/damus-io/damus/releases/tag/v1.6
-
-## [1.5-5] - 2023-06-24
-
-### Fixed
-
-- Remove note zaps to fit apples appstore guidelines
-- Fix zap sheet popping (William Casarin)
-- Fix CustomizeZapView from randomly disappearing (William Casarin)
-- Fix "zapped your profile" strings to say "zapped you" (Terry Yiu)
-- Fix reconnect loop issues on iOS17 (William Casarin)
-- Fix some more thread jankiness (William Casarin)
-- Fix spelling of Nostr to use Titlecase instead of lowercase (Terry Yiu)
-- Rename all usages of the term Post as a noun to Note to conform to the Nostr spec (Terry Yiu)
-- Fix text cutoff on login with npub (gladiusKatana)
-- Fix hangs due to video player (William Casarin)
-
-
-[1.5-5]: https://github.com/damus-io/damus/releases/tag/v1.5-5
-
 ## [1.5-2] - 2023-05-30
 
 ### Added

Makefile

@@ -1,8 +0,0 @@
-
-all: nostrscript/primal.wasm
-
-nostrscript/%.wasm: nostrscript/%.ts nostrscript/nostr.ts Makefile
-	asc $< --runtime stub --outFile $@  --optimize
-
-clean:
-	rm nostrscript/*.wasm

README.md

@@ -94,23 +94,11 @@ damus implements the following [Nostr Implementation Possibilities][nips]
 
 Contributors welcome! Start by examining known issues: https://github.com/damus-io/damus/issues.
 
-### Mailing lists
+### Code
 
-We have a few mailing lists that anyone can join to get involved in damus development:
+[Email patches][git-send-email] to jb55@jb55.com are preferred, but I accept PRs on GitHub as well.
 
-- [dev][dev-list] - development discussions
+[git-send-email]: http://git-send-email.io
-- [patches][patches-list] - code submission and review
-- [product][product-list] - product discussions
-- [design][design-list] - design discussions
-
-[dev-list]: https://damus.io/list/dev
-[patches-list]: https://damus.io/list/patches
-[product-list]: https://damus.io/list/product
-[design-list]: https://damus.io/list/design
-
-### Contributing
-
-See [docs/CONTRIBUTING.md](./docs/CONTRIBUTING.md)
 
 ### Privacy
 Your internet protocol (IP) address is exposed to the relays you connect to, and third party media hosters (e.g. nostr.build, imgur.com, giphy.com, youtube.com etc.) that render on Damus. If you want to improve your privacy, consider utilizing a service that masks your IP address (e.g. a VPN) from trackers online.

damus-c/block.h

@@ -35,7 +35,7 @@ typedef struct mention_bech32_block {
     struct nostr_bech32 bech32;
 } mention_bech32_block_t;
 
-typedef struct note_block {
+typedef struct block {
     enum block_type type;
     union {
         struct str_block str;
@@ -45,13 +45,12 @@ typedef struct note_block {
     } block;
 } block_t;
 
-typedef struct note_blocks {
+typedef struct blocks {
-    int words;
     int num_blocks;
-    struct note_block *blocks;
+    struct block *blocks;
 } blocks_t;
 
-void blocks_init(struct note_blocks *blocks);
+void blocks_init(struct blocks *blocks);
-void blocks_free(struct note_blocks *blocks);
+void blocks_free(struct blocks *blocks);
 
 #endif /* block_h */

damus-c/cursor.h

@@ -1,438 +1,30 @@
+//
+//  cursor.h
+//  damus
+//
+//  Created by William Casarin on 2023-04-09.
+//
 
-#ifndef PROTOVERSE_CURSOR_H
+#ifndef cursor_h
-#define PROTOVERSE_CURSOR_H
+#define cursor_h
 
-#include "typedefs.h"
-#include "varint.h"
-
-#include <stdio.h>
 #include <ctype.h>
-#include <assert.h>
 #include <string.h>
 
-#define unlikely(x) __builtin_expect((x),0)
+typedef unsigned char u8;
-#define likely(x)   __builtin_expect((x),1)
 
 struct cursor {
-	unsigned char *start;
+    const u8 *p;
-	unsigned char *p;
+    const u8 *start;
-	unsigned char *end;
+    const u8 *end;
 };
 
-struct array {
-	struct cursor cur;
-	unsigned int elem_size;
-};
-
-static inline void reset_cursor(struct cursor *cursor)
-{
-	cursor->p = cursor->start;
-}
-
-static inline void wipe_cursor(struct cursor *cursor)
-{
-	reset_cursor(cursor);
-	memset(cursor->start, 0, cursor->end - cursor->start);
-}
-
-static inline void make_cursor(u8 *start, u8 *end, struct cursor *cursor)
-{
-	cursor->start = start;
-	cursor->p = start;
-	cursor->end = end;
-}
-
-static inline void make_array(struct array *a, u8* start, u8 *end, unsigned int elem_size)
-{
-	make_cursor(start, end, &a->cur);
-	a->elem_size = elem_size;
-}
-
-static inline int cursor_eof(struct cursor *c)
-{
-	return c->p == c->end;
-}
-
-static inline void *cursor_malloc(struct cursor *mem, unsigned long size)
-{
-	void *ret;
-
-	if (mem->p + size > mem->end) {
-		return NULL;
-	}
-
-	ret = mem->p;
-	mem->p += size;
-
-	return ret;
-}
-
-static inline void *cursor_alloc(struct cursor *mem, unsigned long size)
-{
-	void *ret;
-	if (!(ret = cursor_malloc(mem, size))) {
-		return 0;
-	}
-
-	memset(ret, 0, size);
-	return ret;
-}
-
-static inline int cursor_slice(struct cursor *mem, struct cursor *slice, size_t size)
-{
-	u8 *p;
-	if (!(p = cursor_alloc(mem, size))) {
-		return 0;
-	}
-	make_cursor(p, mem->p, slice);
-	return 1;
-}
-
-
-static inline void copy_cursor(struct cursor *src, struct cursor *dest)
-{
-	dest->start = src->start;
-	dest->p = src->p;
-	dest->end = src->end;
-}
-
-static inline int pull_byte(struct cursor *cursor, u8 *c)
-{
-	if (unlikely(cursor->p >= cursor->end))
-		return 0;
-
-	*c = *cursor->p;
-	cursor->p++;
-
-	return 1;
-}
-
-static inline int cursor_pull_c_str(struct cursor *cursor, const char **str)
-{
-	*str = (const char*)cursor->p;
-
-	for (; cursor->p < cursor->end; cursor->p++) {
-		if (*cursor->p == 0) {
-			cursor->p++;
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-
-static inline int cursor_push_byte(struct cursor *cursor, u8 c)
-{
-	if (unlikely(cursor->p + 1 > cursor->end)) {
-		return 0;
-	}
-
-	*cursor->p = c;
-	cursor->p++;
-
-	return 1;
-}
-
-static inline int cursor_pull(struct cursor *cursor, u8 *data, int len)
-{
-	if (unlikely(cursor->p + len > cursor->end)) {
-		return 0;
-	}
-
-	memcpy(data, cursor->p, len);
-	cursor->p += len;
-
-	return 1;
-}
-
-static inline int pull_data_into_cursor(struct cursor *cursor,
-			  struct cursor *dest,
-			  unsigned char **data,
-			  int len)
-{
-	int ok;
-
-	if (unlikely(dest->p + len > dest->end)) {
-		printf("not enough room in dest buffer\n");
-		return 0;
-	}
-
-	ok = cursor_pull(cursor, dest->p, len);
-	if (!ok) return 0;
-
-	*data = dest->p;
-	dest->p += len;
-
-	return 1;
-}
-
-static inline int cursor_dropn(struct cursor *cur, int size, int n)
-{
-	if (n == 0)
-		return 1;
-
-	if (unlikely(cur->p - size*n < cur->start)) {
-		return 0;
-	}
-
-	cur->p -= size*n;
-	return 1;
-}
-
-static inline int cursor_drop(struct cursor *cur, int size)
-{
-	return cursor_dropn(cur, size, 1);
-}
-
-static inline unsigned char *cursor_topn(struct cursor *cur, int len, int n)
-{
-	n += 1;
-	if (unlikely(cur->p - len*n < cur->start)) {
-		return NULL;
-	}
-	return cur->p - len*n;
-}
-
-static inline unsigned char *cursor_top(struct cursor *cur, int len)
-{
-	if (unlikely(cur->p - len < cur->start)) {
-		return NULL;
-	}
-	return cur->p - len;
-}
-
-static inline int cursor_top_int(struct cursor *cur, int *i)
-{
-	u8 *p;
-	if (unlikely(!(p = cursor_top(cur, sizeof(*i))))) {
-		return 0;
-	}
-	*i = *((int*)p);
-	return 1;
-}
-
-static inline int cursor_pop(struct cursor *cur, u8 *data, int len)
-{
-	if (unlikely(cur->p - len < cur->start)) {
-		return 0;
-	}
-
-	cur->p -= len;
-	memcpy(data, cur->p, len);
-
-	return 1;
-}
-
-static inline int cursor_push(struct cursor *cursor, u8 *data, int len)
-{
-	if (unlikely(cursor->p + len >= cursor->end)) {
-		return 0;
-	}
-
-	if (cursor->p != data)
-		memcpy(cursor->p, data, len);
-
-	cursor->p += len;
-
-	return 1;
-}
-
-static inline int cursor_push_int(struct cursor *cursor, int i)
-{
-	return cursor_push(cursor, (u8*)&i, sizeof(i));
-}
-
-static inline size_t cursor_count(struct cursor *cursor, size_t elem_size)
-{
-	return (cursor->p - cursor->start)/elem_size;
-}
-
-/* TODO: push_varint */
-static inline int push_varint(struct cursor *cursor, int n)
-{
-	int ok, len;
-	unsigned char b;
-	len = 0;
-
-	while (1) {
-		b = (n & 0xFF) | 0x80;
-		n >>= 7;
-		if (n == 0) {
-			b &= 0x7F;
-			ok = cursor_push_byte(cursor, b);
-			len++;
-			if (!ok) return 0;
-			break;
-		}
-
-		ok = cursor_push_byte(cursor, b);
-		len++;
-		if (!ok) return 0;
-	}
-
-	return len;
-}
-
-/* TODO: pull_varint */
-static inline int pull_varint(struct cursor *cursor, int *n)
-{
-	int ok, i;
-	unsigned char b;
-	*n = 0;
-
-	for (i = 0;; i++) {
-		ok = pull_byte(cursor, &b);
-		if (!ok) return 0;
-
-		*n |= ((int)b & 0x7F) << (i * 7);
-
-		/* is_last */
-		if ((b & 0x80) == 0) {
-			return i+1;
-		}
-
-		if (i == 4) return 0;
-	}
-
-	return 0;
-}
-
-static inline int cursor_pull_int(struct cursor *cursor, int *i)
-{
-	return cursor_pull(cursor, (u8*)i, sizeof(*i));
-}
-
-static inline int cursor_push_u16(struct cursor *cursor, u16 i)
-{
-	return cursor_push(cursor, (u8*)&i, sizeof(i));
-}
-
-static inline void *index_cursor(struct cursor *cursor, unsigned int index, int elem_size)
-{
-	u8 *p;
-	p = &cursor->start[elem_size * index];
-
-	if (unlikely(p >= cursor->end))
-		return NULL;
-
-	return (void*)p;
-}
-
-
-static inline int push_sized_str(struct cursor *cursor, const char *str, int len)
-{
-	return cursor_push(cursor, (u8*)str, len);
-}
-
-static inline int cursor_push_str(struct cursor *cursor, const char *str)
-{
-	return cursor_push(cursor, (u8*)str, (int)strlen(str));
-}
-
-static inline int cursor_push_c_str(struct cursor *cursor, const char *str)
-{
-	return cursor_push_str(cursor, str) && cursor_push_byte(cursor, 0);
-}
-
-/* TODO: push varint size */
-static inline int push_prefixed_str(struct cursor *cursor, const char *str)
-{
-	int ok, len;
-	len = (int)strlen(str);
-	ok = push_varint(cursor, len);
-	if (!ok) return 0;
-	return push_sized_str(cursor, str, len);
-}
-
-static inline int pull_prefixed_str(struct cursor *cursor, struct cursor *dest_buf, const char **str)
-{
-	int len, ok;
-
-	ok = pull_varint(cursor, &len);
-	if (!ok) return 0;
-
-	if (unlikely(dest_buf->p + len > dest_buf->end)) {
-		return 0;
-	}
-
-	ok = pull_data_into_cursor(cursor, dest_buf, (unsigned char**)str, len);
-	if (!ok) return 0;
-
-	ok = cursor_push_byte(dest_buf, 0);
-
-	return 1;
-}
-
-static inline int cursor_remaining_capacity(struct cursor *cursor)
-{
-	return (int)(cursor->end - cursor->p);
-}
-
-
-#define max(a,b) ((a) > (b) ? (a) : (b))
-static inline void cursor_print_around(struct cursor *cur, int range)
-{
-	unsigned char *c;
-
-	printf("[%ld/%ld]\n", cur->p - cur->start, cur->end - cur->start);
-
-	c = max(cur->p - range, cur->start);
-	for (; c < cur->end && c < (cur->p + range); c++) {
-		printf("%02x", *c);
-	}
-	printf("\n");
-
-	c = max(cur->p - range, cur->start);
-	for (; c < cur->end && c < (cur->p + range); c++) {
-		if (c == cur->p) {
-			printf("^");
-			continue;
-		}
-		printf("  ");
-	}
-	printf("\n");
-}
-#undef max
-
-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;
-}
-
 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 is_whitespace(c) || ispunct(c);
+    return !isalnum(c);
 }
 
 static inline int is_invalid_url_ending(char c) {
@@ -443,6 +35,13 @@ 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;
     
@@ -511,4 +110,47 @@ static inline int peek_char(struct cursor *cur, int ind) {
     return *(cur->p + ind);
 }
 
-#endif
+
+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-Bridging-Header.h

@@ -5,7 +5,3 @@
 #include "damus.h"
 #include "bolt11.h"
 #include "amount.h"
-#include "nostr_bech32.h"
-#include "wasm.h"
-#include "nostrscript.h"
-

damus-c/damus.c

@@ -28,9 +28,9 @@ static int parse_digit(struct cursor *cur, int *digit) {
 }
 
 
-static int parse_mention_index(struct cursor *cur, struct note_block *block) {
+static int parse_mention_index(struct cursor *cur, struct block *block) {
     int d1, d2, d3, ind;
-    u8 *start = cur->p;
+    const u8 *start = cur->p;
     
     if (!parse_str(cur, "#["))
         return 0;
@@ -59,9 +59,9 @@ static int parse_mention_index(struct cursor *cur, struct note_block *block) {
     return 1;
 }
 
-static int parse_hashtag(struct cursor *cur, struct note_block *block) {
+static int parse_hashtag(struct cursor *cur, struct block *block) {
     int c;
-    u8 *start = cur->p;
+    const u8 *start = cur->p;
     
     if (!parse_char(cur, '#'))
         return 0;
@@ -81,7 +81,7 @@ static int parse_hashtag(struct cursor *cur, struct note_block *block) {
     return 1;
 }
 
-static int add_block(struct note_blocks *blocks, struct note_block block)
+static int add_block(struct blocks *blocks, struct block block)
 {
     if (blocks->num_blocks + 1 >= MAX_BLOCKS)
         return 0;
@@ -90,9 +90,9 @@ static int add_block(struct note_blocks *blocks, struct note_block block)
     return 1;
 }
 
-static int add_text_block(struct note_blocks *blocks, const u8 *start, const u8 *end)
+static int add_text_block(struct blocks *blocks, const u8 *start, const u8 *end)
 {
-    struct note_block b;
+    struct block b;
     
     if (start == end)
         return 1;
@@ -104,8 +104,8 @@ static int add_text_block(struct note_blocks *blocks, const u8 *start, const u8
     return add_block(blocks, b);
 }
 
-static int parse_url(struct cursor *cur, struct note_block *block) {
+static int parse_url(struct cursor *cur, struct block *block) {
-    u8 *start = cur->p;
+    const u8 *start = cur->p;
     
     if (!parse_str(cur, "http"))
         return 0;
@@ -137,8 +137,8 @@ static int parse_url(struct cursor *cur, struct note_block *block) {
     return 1;
 }
 
-static int parse_invoice(struct cursor *cur, struct note_block *block) {
+static int parse_invoice(struct cursor *cur, struct block *block) {
-    u8 *start, *end;
+    const u8 *start, *end;
     char *fail;
     struct bolt11 *bolt11;
     // optional
@@ -177,11 +177,11 @@ static int parse_invoice(struct cursor *cur, struct note_block *block) {
 }
 
 
-static int parse_mention_bech32(struct cursor *cur, struct note_block *block) {
+static int parse_mention_bech32(struct cursor *cur, struct block *block) {
-    u8 *start = cur->p;
+    const u8 *start = cur->p;
     
-    parse_char(cur, '@');
+    if (!parse_str(cur, "nostr:"))
-    parse_str(cur, "nostr:");
+        return 0;
     
     block->block.str.start = (const char *)cur->p;
     
@@ -197,7 +197,7 @@ static int parse_mention_bech32(struct cursor *cur, struct note_block *block) {
     return 1;
 }
 
-static int add_text_then_block(struct cursor *cur, struct note_blocks *blocks, struct note_block block, u8 **start, const u8 *pre_mention)
+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))
         return 0;
@@ -210,28 +210,22 @@ static int add_text_then_block(struct cursor *cur, struct note_blocks *blocks, s
     return 1;
 }
 
-int damus_parse_content(struct note_blocks *blocks, const char *content) {
+int damus_parse_content(struct blocks *blocks, const char *content) {
     int cp, c;
     struct cursor cur;
-    struct note_block block;
+    struct block block;
-    u8 *start, *pre_mention;
+    const u8 *start, *pre_mention;
     
-    blocks->words = 0;
     blocks->num_blocks = 0;
-    make_cursor((u8*)content, (u8*)content + strlen(content), &cur);
+    make_cursor(&cur, (const u8*)content, strlen(content));
     
     start = cur.p;
     while (cur.p < cur.end && blocks->num_blocks < MAX_BLOCKS) {
         cp = peek_char(&cur, -1);
         c  = peek_char(&cur, 0);
         
-        // new word
-        if (is_whitespace(cp) && !is_whitespace(c)) {
-            blocks->words++;
-        }
-        
         pre_mention = cur.p;
-        if (cp == -1 || is_boundary(cp) || c == '#') {
+        if (cp == -1 || is_whitespace(cp) || c == '#') {
             if (c == '#' && (parse_mention_index(&cur, &block) || parse_hashtag(&cur, &block))) {
                 if (!add_text_then_block(&cur, blocks, block, &start, pre_mention))
                     return 0;
@@ -244,7 +238,7 @@ int damus_parse_content(struct note_blocks *blocks, const char *content) {
                 if (!add_text_then_block(&cur, blocks, block, &start, pre_mention))
                     return 0;
                 continue;
-            } else if ((c == 'n' || c == '@') && parse_mention_bech32(&cur, &block)) {
+            } else if (c == 'n' && parse_mention_bech32(&cur, &block)) {
                 if (!add_text_then_block(&cur, blocks, block, &start, pre_mention))
                     return 0;
                 continue;
@@ -262,12 +256,12 @@ int damus_parse_content(struct note_blocks *blocks, const char *content) {
     return 1;
 }
 
-void blocks_init(struct note_blocks *blocks) {
+void blocks_init(struct blocks *blocks) {
-    blocks->blocks = malloc(sizeof(struct note_block) * MAX_BLOCKS);
+    blocks->blocks = malloc(sizeof(struct block) * MAX_BLOCKS);
     blocks->num_blocks = 0;
 }
 
-void blocks_free(struct note_blocks *blocks) {
+void blocks_free(struct blocks *blocks) {
     if (!blocks->blocks) {
         return;
     }

damus-c/damus.h

@@ -9,10 +9,10 @@
 #define damus_h
 
 #include <stdio.h>
+#include "nostr_bech32.h"
 #include "block.h"
-
 typedef unsigned char u8;
 
-int damus_parse_content(struct note_blocks *blocks, const char *content);
+int damus_parse_content(struct blocks *blocks, const char *content);
 
 #endif /* damus_h */

damus-c/debug.h

@@ -1,15 +0,0 @@
-
-#ifndef PROTOVERSE_DEBUG_H
-#define PROTOVERSE_DEBUG_H
-
-#include <stdio.h>
-
-#define unusual(...) fprintf(stderr, "UNUSUAL: " __VA_ARGS__)
-
-#ifdef DEBUG
-#define debug(...) printf(__VA_ARGS__)
-#else
-#define debug(...)
-#endif
-
-#endif /* PROTOVERSE_DEBUG_H */

damus-c/error.c

@@ -1,34 +0,0 @@
-
-#include "error.h"
-
-#include <stdlib.h>
-#include <stdarg.h>
-
-int note_error_(struct errors *errs_, struct cursor *p, const char *fmt, ...)
-{
-	static char buf[512];
-	struct error err;
-	struct cursor *errs;
-	va_list ap;
-
-	errs = &errs_->cur;
-
-	if (errs_->enabled == 0)
-		return 0;
-
-	va_start(ap, fmt);
-	vsprintf(buf, fmt, ap);
-	va_end(ap);
-
-	err.msg = buf;
-	err.pos = p ? (int)(p->p - p->start) : 0;
-
-	if (!cursor_push_error(errs, &err)) {
-		fprintf(stderr, "arena OOM when recording error, ");
-		fprintf(stderr, "errs->p at %ld, remaining %ld, strlen %ld\n",
-				errs->p - errs->start, errs->end - errs->p, strlen(buf));
-	}
-
-	return 0;
-}
-

damus-c/error.h

@@ -1,33 +0,0 @@
-
-#ifndef PROTOVERSE_ERROR_H
-#define PROTOVERSE_ERROR_H
-
-#include "cursor.h"
-
-struct error {
-	int pos;
-	const char *msg;
-};
-
-struct errors {
-	struct cursor cur;
-	int enabled;
-};
-
-#define note_error(errs, p, fmt, ...) note_error_(errs, p, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__)
-
-static inline int cursor_push_error(struct cursor *cur, struct error *err)
-{
-	return cursor_push_int(cur, err->pos) &&
-	       cursor_push_c_str(cur, err->msg);
-}
-
-static inline int cursor_pull_error(struct cursor *cur, struct error *err)
-{
-	return cursor_pull_int(cur, &err->pos) &&
-	       cursor_pull_c_str(cur, &err->msg);
-}
-
-int note_error_(struct errors *errs, struct cursor *p, const char *fmt, ...);
-
-#endif /* PROTOVERSE_ERROR_H */

damus-c/likely.h

@@ -52,13 +52,9 @@
  */
 #define unlikely(cond) __builtin_expect(!!(cond), 0)
 #else
-#ifndef likely
 #define likely(cond) (!!(cond))
-#endif
-#ifndef unlikely
 #define unlikely(cond) (!!(cond))
 #endif
-#endif
 #else /* CCAN_LIKELY_DEBUG versions */
 #include <ccan/str/str.h>
 

damus-c/nostr_bech32.c

@@ -91,9 +91,6 @@ static int parse_nostr_bech32_type(const char *prefix, enum nostr_bech32_type *t
     } else if (strcmp(prefix, "npub") == 0) {
         *type = NOSTR_BECH32_NPUB;
         return 1;
-    } else if (strcmp(prefix, "nsec") == 0) {
-        *type = NOSTR_BECH32_NSEC;
-        return 1;
     } else if (strcmp(prefix, "nprofile") == 0) {
         *type = NOSTR_BECH32_NPROFILE;
         return 1;
@@ -119,10 +116,6 @@ static int parse_nostr_bech32_npub(struct cursor *cur, struct bech32_npub *npub)
     return pull_bytes(cur, 32, &npub->pubkey);
 }
 
-static int parse_nostr_bech32_nsec(struct cursor *cur, struct bech32_nsec *nsec) {
-    return pull_bytes(cur, 32, &nsec->nsec);
-}
-
 static int tlvs_to_relays(struct nostr_tlvs *tlvs, struct relays *relays) {
     struct nostr_tlv *tlv;
     struct str_block *str;
@@ -225,7 +218,7 @@ static int parse_nostr_bech32_nrelay(struct cursor *cur, struct bech32_nrelay *n
 }
 
 int parse_nostr_bech32(struct cursor *cur, struct nostr_bech32 *obj) {
-    u8 *start, *end;
+    const u8 *start, *end;
     
     start = cur->p;
     
@@ -264,7 +257,7 @@ int parse_nostr_bech32(struct cursor *cur, struct nostr_bech32 *obj) {
     }
     
     struct cursor bcur;
-    make_cursor(obj->buffer, obj->buffer + obj->buflen, &bcur);
+    make_cursor(&bcur, obj->buffer, obj->buflen);
     
     switch (obj->type) {
         case NOSTR_BECH32_NOTE:
@@ -275,10 +268,6 @@ int parse_nostr_bech32(struct cursor *cur, struct nostr_bech32 *obj) {
             if (!parse_nostr_bech32_npub(&bcur, &obj->data.npub))
                 goto fail;
             break;
-        case NOSTR_BECH32_NSEC:
-            if (!parse_nostr_bech32_nsec(&bcur, &obj->data.nsec))
-                goto fail;
-            break;
         case NOSTR_BECH32_NEVENT:
             if (!parse_nostr_bech32_nevent(&bcur, &obj->data.nevent))
                 goto fail;

damus-c/nostr_bech32.h

@@ -26,7 +26,6 @@ enum nostr_bech32_type {
     NOSTR_BECH32_NEVENT = 4,
     NOSTR_BECH32_NRELAY = 5,
     NOSTR_BECH32_NADDR = 6,
-    NOSTR_BECH32_NSEC = 7,
 };
 
 struct bech32_note {
@@ -37,10 +36,6 @@ struct bech32_npub {
     const u8 *pubkey;
 };
 
-struct bech32_nsec {
-    const u8 *nsec;
-};
-
 struct bech32_nevent {
     struct relays relays;
     const u8 *event_id;
@@ -70,7 +65,6 @@ typedef struct nostr_bech32 {
     union {
         struct bech32_note note;
         struct bech32_npub npub;
-        struct bech32_nsec nsec;
         struct bech32_nevent nevent;
         struct bech32_nprofile nprofile;
         struct bech32_naddr naddr;

damus-c/nostrscript.c

@@ -1,192 +0,0 @@
-//
-//  nostrscript.c
-//  damus
-//
-//  Created by William Casarin on 2023-06-02.
-//
-
-#include "nostrscript.h"
-#include "wasm.h"
-#include "array_size.h"
-
-// function to check if the character is in surrogate pair range
-static INLINE int is_surrogate(uint16_t uc) {
-    return (uc - 0xd800u) < 2048u;
-}
-
-// function to convert utf16 to utf8
-static int utf16_to_utf8(u16 utf16, u8 *utf8) {
-    if (utf16 < 0x80) { // 1-byte sequence
-        utf8[0] = (uint8_t) utf16;
-        return 1;
-    }
-    else if (utf16 < 0x800) { // 2-byte sequence
-        utf8[0] = (uint8_t) (0xc0 | (utf16 >> 6));
-        utf8[1] = (uint8_t) (0x80 | (utf16 & 0x3f));
-        return 2;
-    }
-    else if (!is_surrogate(utf16)) { // 3-byte sequence
-        utf8[0] = (uint8_t) (0xe0 | (utf16 >> 12));
-        utf8[1] = (uint8_t) (0x80 | ((utf16 >> 6) & 0x3f));
-        utf8[2] = (uint8_t) (0x80 | (utf16 & 0x3f));
-        return 3;
-    }
-    else { // surrogate pair, return error
-        return -1;
-    }
-}
-
-static int nostr_cmd(struct wasm_interp *interp) {
-    struct val *params = NULL;
-    const char *val = NULL;
-    int len, cmd, ival;
-    
-    if (!get_params(interp, &params, 3) || params == NULL)
-        return interp_error(interp, "get params");
-
-    // command
-    cmd = params[0].num.i32;
-    
-    // value
-    
-    ival = params[1].num.i32;
-    if (!mem_ptr_str(interp, ival, &val))
-        val = 0;
-
-    // length
-    len = params[2].num.i32;
-
-    intptr_t iptr = ival;
-    return nscript_nostr_cmd(interp, cmd, val ? (void*)val : (void*)iptr, len);
-}
-
-static int print_utf16_str(u16 *chars) {
-    u16 *p = chars;
-    int c;
-    
-    while (*p) {
-        if (utf16_to_utf8(*p, (u8*)&c) == -1)
-            return 0;
-        
-        printf("%c", c);
-        
-        p++;
-    }
-    
-    return 1;
-}
-
-static int nostr_log(struct wasm_interp *interp) {
-    struct val *vals;
-    const char *str;
-    struct callframe *callframe;
-    
-    if (!get_params(interp, &vals, 1))
-        return interp_error(interp, "nostr_log get params");
-    
-    if (!mem_ptr_str(interp, vals[0].num.i32, &str))
-        return interp_error(interp, "nostr_log log param");
-    
-    if (!(callframe = top_callframes(&interp->callframes, 2)))
-        return interp_error(interp, "nostr_log callframe");
-    
-    printf("nostr_log:%s: ", callframe->func->name);
-    
-    print_utf16_str((u16*)str);
-    printf("\n");
-    
-    return 1;
-}
-
-static int nostr_set_bool(struct wasm_interp *interp) {
-    struct val *params = NULL;
-    const u16 *setting;
-    u32 val, len;
-
-    if (!get_params(interp, &params, 3) || params == NULL)
-        return 0;
-
-    if (!mem_ptr_str(interp, params[0].num.i32, (const char**)&setting))
-        return 0;
-
-    len = params[1].num.i32;
-    val = params[2].num.i32 > 0 ? 1 : 0;
-
-    return nscript_set_bool(interp, setting, len, val);
-}
-
-static int nostr_pool_send_to(struct wasm_interp *interp) {
-    struct val *params = NULL;
-    const u16 *req, *to;
-    int req_len, to_len;
-    
-    if (!get_params(interp, &params, 4) || params == NULL)
-        return 0;
-
-    if (!mem_ptr_str(interp, params[0].num.i32, (const char**)&req))
-        return 0;
-    
-    req_len = params[1].num.i32;
-    
-    if (!mem_ptr_str(interp, params[2].num.i32, (const char**)&to))
-        return 0;
-    
-    to_len = params[3].num.i32;
-    
-    return nscript_pool_send_to(interp, req, req_len, to, to_len);
-}
-
-static int nscript_abort(struct wasm_interp *interp) {
-    struct val *params = NULL;
-    const char *msg = "", *filename;
-    int line, col;
-    
-    if (!get_params(interp, &params, 4) || params == NULL)
-        return interp_error(interp, "get params");
-    
-    if (params[0].ref.addr != 0 && !mem_ptr_str(interp, params[0].ref.addr, &msg))
-        return interp_error(interp, "abort msg");
-
-    if (!mem_ptr_str(interp, params[1].ref.addr, &filename))
-        return interp_error(interp, "abort filename");
-    
-    line = params[2].num.i32;
-    col = params[3].num.i32;
-
-    printf("nscript_abort:");
-    print_utf16_str((u16*)filename);
-    printf(":%d:%d: ", line, col);
-    print_utf16_str((u16*)msg);
-    printf("\n");
-    
-    return 0;
-}
-
-static struct builtin nscript_builtins[] = {
-    { .name = "null", .fn = 0 },
-    { .name = "nostr_log", .fn = nostr_log },
-    { .name = "nostr_cmd", .fn = nostr_cmd },
-    { .name = "nostr_pool_send_to", .fn = nostr_pool_send_to },
-    { .name = "nostr_set_bool", .fn = nostr_set_bool },
-    { .name = "abort", .fn = nscript_abort },
-};
-
-int nscript_load(struct wasm_parser *p, struct wasm_interp *interp, unsigned char *wasm, unsigned long len) {
-    wasm_parser_init(p, wasm, len, len * 16, nscript_builtins, ARRAY_SIZE(nscript_builtins));
-
-    if (!parse_wasm(p)) {
-        wasm_parser_free(p);
-        return NSCRIPT_PARSE_ERR;
-    }
-
-    if (!wasm_interp_init(interp, &p->module)) {
-        print_error_backtrace(&interp->errors);
-        wasm_parser_free(p);
-        return NSCRIPT_INIT_ERR;
-    }
-
-    //setup_wasi(&interp, argc, argv, env);
-    //wasm_parser_free(&p);
-    
-    return NSCRIPT_LOADED;
-}

damus-c/nostrscript.h

@@ -1,24 +0,0 @@
-//
-//  nostrscript.h
-//  damus
-//
-//  Created by William Casarin on 2023-06-02.
-//
-
-#ifndef nostrscript_h
-#define nostrscript_h
-
-#define NSCRIPT_LOADED 1
-#define NSCRIPT_PARSE_ERR 2
-#define NSCRIPT_INIT_ERR 3
-
-#include <stdio.h>
-#include "wasm.h"
-
-int nscript_load(struct wasm_parser *p, struct wasm_interp *interp, unsigned char *wasm, unsigned long len);
-int nscript_nostr_cmd(struct wasm_interp *interp, int, void*, int);
-int nscript_pool_send_to(struct wasm_interp *interp, const u16*, int, const u16 *, int);
-int nscript_set_bool(struct wasm_interp *interp, const u16*, int, int);
-
-
-#endif /* nostrscript_h */

damus-c/parser.h

@@ -1,42 +0,0 @@
-
-#ifndef CURSOR_PARSER
-#define CURSOR_PARSER
-
-#include "cursor.h"
-
-static int consume_bytes(struct cursor *cursor, const unsigned char *match, int len)
-{
-	int i;
-
-	if (cursor->p + len > cursor->end) {
-		fprintf(stderr, "consume_bytes overflow\n");
-		return 0;
-	}
-
-	for (i = 0; i < len; i++) {
-		if (cursor->p[i] != match[i])
-			return 0;
-	}
-
-	cursor->p += len;
-
-	return 1;
-}
-
-static inline int consume_byte(struct cursor *cursor, unsigned char match)
-{
-	if (unlikely(cursor->p >= cursor->end))
-		return 0;
-	if (*cursor->p != match)
-		return 0;
-	cursor->p++;
-	return 1;
-}
-
-static inline int consume_u32(struct cursor *cursor, unsigned int match)
-{
-	return consume_bytes(cursor, (unsigned char*)&match, sizeof(match));
-}
-
-#endif /* CURSOR_PARSER */
-

damus-c/typedefs.h

@@ -1,14 +0,0 @@
-
-#ifndef PROTOVERSE_TYPEDEFS_H
-#define PROTOVERSE_TYPEDEFS_H
-
-#include <stdint.h>
-
-typedef unsigned char u8;
-typedef unsigned int u32;
-typedef unsigned short u16;
-typedef uint64_t u64;
-typedef int64_t s64;
-
-
-#endif /* PROTOVERSE_TYPEDEFS_H */

damus-c/varint.h

@@ -1,14 +0,0 @@
-
-#ifndef PROTOVERSE_VARINT_H
-#define PROTOVERSE_VARINT_H
-
-#define VARINT_MAX_LEN 9
-
-#include <stddef.h>
-#include <stdint.h>
-
-size_t varint_put(unsigned char buf[VARINT_MAX_LEN], uint64_t v);
-size_t varint_size(uint64_t v);
-size_t varint_get(const unsigned char *p, size_t max, int64_t *val);
-
-#endif /* PROTOVERSE_VARINT_H */

damus-c/wasm.h

@@ -1,850 +0,0 @@
-
-#ifndef PROTOVERSE_WASM_H
-#define PROTOVERSE_WASM_H
-
-static const unsigned char WASM_MAGIC[] = {0,'a','s','m'};
-
-#define WASM_VERSION 0x01
-#define MAX_U32_LEB128_BYTES 5
-#define MAX_U64_LEB128_BYTES 10
-#define MAX_CUSTOM_SECTIONS 32
-#define MAX_BUILTINS 64
-#define BUILTIN_SUSPEND 42
-
-#define FUNC_TYPE_TAG 0x60
-
-
-#include "cursor.h"
-#include "error.h"
-
-#ifdef NOINLINE
-  #define INLINE __attribute__((noinline))
-#else
-  #define INLINE inline
-#endif
-
-
-#define interp_error(p, fmt, ...) note_error(&((p)->errors), interp_codeptr(p), fmt, ##__VA_ARGS__)
-#define parse_err(p, fmt, ...) note_error(&((p)->errs), &(p)->cur, fmt, ##__VA_ARGS__)
-
-enum valtype {
-	val_i32 = 0x7F,
-	val_i64 = 0x7E,
-	val_f32 = 0x7D,
-	val_f64 = 0x7C,
-	val_ref_null = 0xD0,
-	val_ref_func = 0x70, 
-	val_ref_extern = 0x6F,
-};
-
-enum const_instr {
-	ci_const_i32   = 0x41,
-	ci_const_i64   = 0x42,
-	ci_const_f32   = 0x43,
-	ci_const_f64   = 0x44,
-	ci_ref_null    = 0xD0,
-	ci_ref_func    = 0xD2,
-	ci_global_get  = 0x23,
-	ci_end         = 0x0B,
-};
-
-enum limit_type {
-	limit_min = 0x00,
-	limit_min_max = 0x01,
-};
-
-struct limits {
-	u32 min;
-	u32 max;
-	enum limit_type type;
-};
-
-enum section_tag {
-	section_custom,
-	section_type,
-	section_import,
-	section_function,
-	section_table,
-	section_memory,
-	section_global,
-	section_export,
-	section_start,
-	section_element,
-	section_code,
-	section_data,
-	section_data_count,
-	section_name,
-	num_sections,
-};
-
-enum name_subsection_tag {
-	name_subsection_module,
-	name_subsection_funcs,
-	name_subsection_locals,
-	num_name_subsections,
-};
-
-enum reftype {
-	funcref   = 0x70,
-	externref = 0x6F,
-};
-
-struct resulttype {
-	unsigned char *valtypes; /* enum valtype */
-	u32 num_valtypes;
-};
-
-struct functype {
-	struct resulttype params;
-	struct resulttype result;
-};
-
-struct table {
-	enum reftype reftype;
-	struct limits limits;
-};
-
-struct tablesec {
-	struct table *tables;
-	u32 num_tables;
-};
-
-enum elem_mode {
-	elem_mode_passive,
-	elem_mode_active,
-	elem_mode_declarative,
-};
-
-struct expr {
-	u8 *code;
-	u32 code_len;
-};
-
-struct refval {
-	u32 addr;
-};
-
-struct table_inst {
-	struct refval *refs;
-	enum reftype reftype;
-	u32 num_refs;
-};
-
-struct numval {
-	union {
-		int i32;
-		u32 u32;
-		int64_t i64;
-		uint64_t u64;
-		float f32;
-		double f64;
-	};
-};
-
-struct val {
-	enum valtype type;
-	union {
-		struct numval num;
-		struct refval ref;
-	};
-};
-
-struct elem_inst {
-	struct val val;
-	u16 elem;
-	u16 init;
-};
-
-struct elem {
-	struct expr offset;
-	u32 tableidx;
-	struct expr *inits;
-	u32 num_inits;
-	enum elem_mode mode;
-	enum reftype reftype;
-	struct val val;
-};
-
-struct customsec {
-	const char *name;
-	unsigned char *data;
-	u32 data_len;
-};
-
-struct elemsec {
-	struct elem *elements;
-	u32 num_elements;
-};
-
-struct memsec {
-	struct limits *mems; /* memtype */
-	u32 num_mems;
-};
-
-struct funcsec {
-	u32 *type_indices;
-	u32 num_indices;
-};
-
-enum mut {
-	mut_const,
-	mut_var,
-};
-
-struct globaltype {
-	enum valtype valtype;
-	enum mut mut;
-};
-
-struct globalsec {
-	struct global *globals;
-	u32 num_globals;
-};
-
-struct typesec {
-	struct functype *functypes;
-	u32 num_functypes;
-};
-
-enum import_type {
-	import_func,
-	import_table,
-	import_mem,
-	import_global,
-};
-
-struct importdesc {
-	enum import_type type;
-	union {
-		u32 typeidx;
-		struct limits tabletype;
-		struct limits memtype;
-		struct globaltype globaltype;
-	};
-};
-
-struct import {
-	const char *module_name;
-	const char *name;
-	struct importdesc desc;
-	int resolved_builtin;
-};
-
-struct importsec {
-	struct import *imports;
-	u32 num_imports;
-};
-
-struct global {
-	struct globaltype type;
-	struct expr init;
-	struct val val;
-};
-
-struct local_def {
-	u32 num_types;
-	enum valtype type;
-};
-
-/* "code" */
-struct wasm_func {
-	struct expr code;
-	struct local_def *local_defs;
-	u32 num_local_defs;
-};
-
-enum func_type {
-	func_type_wasm,
-	func_type_builtin,
-};
-
-struct func {
-	union {
-		struct wasm_func *wasm_func;
-		struct builtin *builtin;
-	};
-	u32 num_locals;
-	struct functype *functype;
-	enum func_type type;
-	const char *name;
-	u32 idx;
-};
-
-struct codesec {
-	struct wasm_func *funcs;
-	u32 num_funcs;
-};
-
-enum exportdesc {
-	export_func,
-	export_table,
-	export_mem,
-	export_global,
-};
-
-struct wexport {
-	const char *name;
-	u32 index;
-	enum exportdesc desc;
-};
-
-struct exportsec {
-	struct wexport *exports;
-	u32 num_exports;
-};
-
-struct nameassoc {
-	u32 index;
-	const char *name;
-};
-
-struct namemap {
-	struct nameassoc *names;
-	u32 num_names;
-};
-
-struct namesec {
-	const char *module_name;
-	struct namemap func_names;
-	int parsed;
-};
-
-struct wsection {
-	enum section_tag tag;
-};
-
-enum bulk_tag {
-	i_memory_copy = 10,
-	i_memory_fill = 11,
-	i_table_init  = 12,
-	i_elem_drop   = 13,
-	i_table_copy  = 14,
-	i_table_grow  = 15,
-	i_table_size  = 16,
-	i_table_fill  = 17,
-};
-
-enum instr_tag {
-	/* control instructions */
-	i_unreachable   = 0x00,
-	i_nop           = 0x01,
-	i_block         = 0x02,
-	i_loop          = 0x03,
-	i_if            = 0x04,
-	i_else          = 0x05,
-	i_end           = 0x0B,
-	i_br            = 0x0C,
-	i_br_if         = 0x0D,
-	i_br_table      = 0x0E,
-	i_return        = 0x0F,
-	i_call          = 0x10,
-	i_call_indirect = 0x11,
-
-	/* parametric instructions */
-	i_drop          = 0x1A,
-	i_select        = 0x1B,
-	i_selects       = 0x1C,
-
-	/* variable instructions */
-	i_local_get     = 0x20,
-	i_local_set     = 0x21,
-	i_local_tee     = 0x22,
-	i_global_get    = 0x23,
-	i_global_set    = 0x24,
-	i_table_get     = 0x25,
-	i_table_set     = 0x26,
-
-	/* memory instructions */
-	i_i32_load      = 0x28,
-	i_i64_load      = 0x29,
-	i_f32_load      = 0x2A,
-	i_f64_load      = 0x2B,
-	i_i32_load8_s   = 0x2C,
-	i_i32_load8_u   = 0x2D,
-	i_i32_load16_s  = 0x2E,
-	i_i32_load16_u  = 0x2F,
-	i_i64_load8_s   = 0x30,
-	i_i64_load8_u   = 0x31,
-	i_i64_load16_s  = 0x32,
-	i_i64_load16_u  = 0x33,
-	i_i64_load32_s  = 0x34,
-	i_i64_load32_u  = 0x35,
-	i_i32_store     = 0x36,
-	i_i64_store     = 0x37,
-	i_f32_store     = 0x38,
-	i_f64_store     = 0x39,
-	i_i32_store8    = 0x3A,
-	i_i32_store16   = 0x3B,
-	i_i64_store8    = 0x3C,
-	i_i64_store16   = 0x3D,
-	i_i64_store32   = 0x3E,
-	i_memory_size   = 0x3F,
-	i_memory_grow   = 0x40,
-
-	/* numeric instructions */
-	i_i32_const     = 0x41,
-	i_i64_const     = 0x42,
-	i_f32_const     = 0x43,
-	i_f64_const     = 0x44,
-
-	i_i32_eqz       = 0x45,
-	i_i32_eq        = 0x46,
-	i_i32_ne        = 0x47,
-	i_i32_lt_s      = 0x48,
-	i_i32_lt_u      = 0x49,
-	i_i32_gt_s      = 0x4A,
-	i_i32_gt_u      = 0x4B,
-	i_i32_le_s      = 0x4C,
-	i_i32_le_u      = 0x4D,
-	i_i32_ge_s      = 0x4E,
-	i_i32_ge_u      = 0x4F,
-
-	i_i64_eqz       = 0x50,
-	i_i64_eq        = 0x51,
-	i_i64_ne        = 0x52,
-	i_i64_lt_s      = 0x53,
-	i_i64_lt_u      = 0x54,
-	i_i64_gt_s      = 0x55,
-	i_i64_gt_u      = 0x56,
-	i_i64_le_s      = 0x57,
-	i_i64_le_u      = 0x58,
-	i_i64_ge_s      = 0x59,
-	i_i64_ge_u      = 0x5A,
-
-	i_f32_eq        = 0x5B,
-	i_f32_ne        = 0x5C,
-	i_f32_lt        = 0x5D,
-	i_f32_gt        = 0x5E,
-	i_f32_le        = 0x5F,
-	i_f32_ge        = 0x60,
-
-	i_f64_eq        = 0x61,
-	i_f64_ne        = 0x62,
-	i_f64_lt        = 0x63,
-	i_f64_gt        = 0x64,
-	i_f64_le        = 0x65,
-	i_f64_ge        = 0x66,
-
-	i_i32_clz       = 0x67,
-	i_i32_ctz       = 0x68,
-	i_i32_popcnt    = 0x69,
-
-	i_i32_add       = 0x6A,
-	i_i32_sub       = 0x6B,
-	i_i32_mul       = 0x6C,
-	i_i32_div_s     = 0x6D,
-	i_i32_div_u     = 0x6E,
-	i_i32_rem_s     = 0x6F,
-	i_i32_rem_u     = 0x70,
-	i_i32_and       = 0x71,
-	i_i32_or        = 0x72,
-	i_i32_xor       = 0x73,
-	i_i32_shl       = 0x74,
-	i_i32_shr_s     = 0x75,
-	i_i32_shr_u     = 0x76,
-	i_i32_rotl      = 0x77,
-	i_i32_rotr      = 0x78,
-
-	i_i64_clz       = 0x79,
-	i_i64_ctz       = 0x7A,
-	i_i64_popcnt    = 0x7B,
-	i_i64_add       = 0x7C,
-	i_i64_sub       = 0x7D,
-	i_i64_mul       = 0x7E,
-	i_i64_div_s     = 0x7F,
-	i_i64_div_u     = 0x80,
-	i_i64_rem_s     = 0x81,
-	i_i64_rem_u     = 0x82,
-	i_i64_and       = 0x83,
-	i_i64_or        = 0x84,
-	i_i64_xor       = 0x85,
-	i_i64_shl       = 0x86,
-	i_i64_shr_s     = 0x87,
-	i_i64_shr_u     = 0x88,
-	i_i64_rotl      = 0x89,
-	i_i64_rotr      = 0x8A,
-
-	i_f32_abs = 0x8b,
-	i_f32_neg = 0x8c,
-	i_f32_ceil = 0x8d,
-	i_f32_floor = 0x8e,
-	i_f32_trunc = 0x8f,
-	i_f32_nearest = 0x90,
-	i_f32_sqrt = 0x91,
-	i_f32_add = 0x92,
-	i_f32_sub = 0x93,
-	i_f32_mul = 0x94,
-	i_f32_div = 0x95,
-	i_f32_min = 0x96,
-	i_f32_max = 0x97,
-	i_f32_copysign = 0x98,
-
-	i_f64_abs = 0x99,
-	i_f64_neg = 0x9a,
-	i_f64_ceil = 0x9b,
-	i_f64_floor = 0x9c,
-	i_f64_trunc = 0x9d,
-	i_f64_nearest = 0x9e,
-	i_f64_sqrt = 0x9f,
-	i_f64_add = 0xa0,
-	i_f64_sub = 0xa1,
-	i_f64_mul = 0xa2,
-	i_f64_div = 0xa3,
-	i_f64_min = 0xa4,
-	i_f64_max = 0xa5,
-	i_f64_copysign = 0xa6,
-
-	i_i32_wrap_i64 = 0xa7,
-	i_i32_trunc_f32_s = 0xa8,
-	i_i32_trunc_f32_u = 0xa9,
-	i_i32_trunc_f64_s = 0xaa,
-	i_i32_trunc_f64_u = 0xab,
-	i_i64_extend_i32_s = 0xac,
-	i_i64_extend_i32_u = 0xad,
-	i_i64_trunc_f32_s = 0xae,
-	i_i64_trunc_f32_u = 0xaf,
-	i_i64_trunc_f64_s = 0xb0,
-	i_i64_trunc_f64_u = 0xb1,
-	i_f32_convert_i32_s = 0xb2,
-	i_f32_convert_i32_u = 0xb3,
-	i_f32_convert_i64_s = 0xb4,
-	i_f32_convert_i64_u = 0xb5,
-	i_f32_demote_f64 = 0xb6,
-	i_f64_convert_i32_s = 0xb7,
-	i_f64_convert_i32_u = 0xb8,
-	i_f64_convert_i64_s = 0xb9,
-	i_f64_convert_i64_u = 0xba,
-	i_f64_promote_f32 = 0xbb,
-
-	i_i32_reinterpret_f32 = 0xbc,
-	i_i64_reinterpret_f64 = 0xbd,
-	i_f32_reinterpret_i32 = 0xbe,
-	i_f64_reinterpret_i64 = 0xbf,
-
-	i_i32_extend8_s = 0xc0,
-	i_i32_extend16_s = 0xc1,
-	i_i64_extend8_s = 0xc2,
-	i_i64_extend16_s = 0xc3,
-	i_i64_extend32_s = 0xc4,
-
-	i_ref_null    = 0xD0,
-	i_ref_is_null = 0xD1,
-	i_ref_func    = 0xD2,
-
-	i_bulk_op     = 0xFC,
-	/* TODO: more instrs */
-
-};
-
-enum blocktype_tag {
-	blocktype_empty,
-	blocktype_valtype,
-	blocktype_index,
-};
-
-struct blocktype {
-	enum blocktype_tag tag;
-	union {
-		enum valtype valtype;
-		int type_index;
-	};
-};
-
-struct instrs {
-	unsigned char *data;
-	u32 len;
-};
-
-struct block {
-	struct blocktype type;
-	struct expr instrs;
-};
-
-struct memarg {
-	u32 offset;
-	u32 align;
-};
-
-struct br_table {
-	u32 num_label_indices;
-	u32 label_indices[512];
-	u32 default_label;
-};
-
-struct call_indirect {
-	u32 tableidx;
-	u32 typeidx;
-};
-
-struct table_init {
-	u32 tableidx;
-	u32 elemidx;
-};
-
-struct table_copy {
-	u32 from;
-	u32 to;
-};
-
-struct bulk_op {
-	enum bulk_tag tag;
-	union {
-		struct table_init table_init;
-		struct table_copy table_copy;
-		u32 idx;
-	};
-};
-
-struct select_instr {
-	u8 *valtypes;
-	u32 num_valtypes;
-};
-
-struct instr {
-	enum instr_tag tag;
-	int pos;
-	union {
-		struct br_table br_table;
-		struct bulk_op bulk_op;
-		struct call_indirect call_indirect;
-		struct memarg memarg;
-		struct select_instr select;
-		struct block block;
-		struct expr else_block;
-		double f64;
-		float f32;
-		int i32;
-		u32 u32;
-		int64_t i64;
-		u64 u64;
-		unsigned char memidx;
-		enum reftype reftype;
-	};
-};
-
-enum datamode {
-	datamode_active,
-	datamode_passive,
-};
-
-struct wdata_active {
-	u32 mem_index;
-	struct expr offset_expr;
-};
-
-struct wdata {
-	struct wdata_active active;
-	u8 *bytes;
-	u32 bytes_len;
-	enum datamode mode;
-};
-
-struct datasec {
-	struct wdata *datas;
-	u32 num_datas;
-};
-
-struct startsec {
-	u32 start_fn;
-};
-
-struct module {
-	unsigned int parsed;
-	unsigned int custom_sections;
-
-	struct func *funcs;
-    
-	u32 num_funcs;
-
-	struct customsec custom_section[MAX_CUSTOM_SECTIONS];
-	struct typesec type_section;
-	struct funcsec func_section;
-	struct importsec import_section;
-	struct exportsec export_section;
-	struct codesec code_section;
-	struct tablesec table_section;
-	struct memsec memory_section;
-	struct globalsec global_section;
-	struct startsec start_section;
-	struct elemsec element_section;
-	struct datasec data_section;
-	struct namesec name_section;
-};
-
-// make sure the struct is packed so that 
-struct label {
-	u32 instr_pos; // resolved status is stored in HOB of pos
-	u32 jump;
-};
-
-struct callframe {
-	struct cursor code;
-	struct val *locals;
-	struct func *func;
-	u16 prev_stack_items;
-};
-
-struct resolver {
-	u16 label;
-	u8 end_tag;
-	u8 start_tag;
-};
-
-struct global_inst {
-	struct val val;
-};
-
-struct module_inst {
-	struct table_inst *tables;
-	struct global_inst *globals;
-	struct elem_inst *elements;
-
-	u32 num_tables;
-	u32 num_globals;
-	u32 num_elements;
-
-	int start_fn;
-	unsigned char *globals_init;
-};
-
-struct wasi {
-	int argc;
-	const char **argv;
-
-	int environc;
-	const char **environ;
-};
-
-struct wasm_interp;
-
-struct builtin {
-    const char *name;
-    int (*fn)(struct wasm_interp *);
-    int (*prepare_args)(struct wasm_interp *);
-};
-
-struct wasm_interp {
-	struct module *module;
-	struct module_inst module_inst;
-	struct wasi wasi;
-    void *context;
-    
-    struct builtin builtins[MAX_BUILTINS];
-    int num_builtins;
-    
-	int prev_resolvers, quitting;
-
-	struct errors errors; /* struct error */
-	size_t ops;
-
-	struct cursor callframes; /* struct callframe */
-	struct cursor stack; /* struct val */
-	struct cursor mem; /* u8/mixed */
-
-	struct cursor memory; /* memory pages (65536 blocks) */
-
-	struct cursor locals; /* struct val */
-	struct cursor labels; /* struct labels */
-	struct cursor num_labels;
-
-	// resolve stack for the current function. every time a control
-	// instruction is encountered, the label index is pushed. When an
-	// instruction is popped, we can resolve the label
-	struct cursor resolver_stack; /* struct resolver */
-	struct cursor resolver_offsets; /* int */
-};
-
-struct wasm_parser {
-	struct module module;
-    struct builtin *builtins;
-    u32 num_builtins;
-	struct cursor cur;
-	struct cursor mem;
-	struct errors errs;
-};
-
-
-int run_wasm(unsigned char *wasm, unsigned long len, int argc, const char **argv, char **env, int *retval);
-int parse_wasm(struct wasm_parser *p);
-int wasm_interp_init(struct wasm_interp *interp, struct module *module);
-void wasm_parser_free(struct wasm_parser *parser);
-void wasm_parser_init(struct wasm_parser *p, u8 *wasm, size_t wasm_len, size_t arena_size, struct builtin *, int num_builtins);
-void wasm_interp_free(struct wasm_interp *interp);
-int interp_wasm_module(struct wasm_interp *interp, int *retval);
-int interp_wasm_module_resume(struct wasm_interp *interp, int *retval);
-void print_error_backtrace(struct errors *errors);
-void setup_wasi(struct wasm_interp *interp, int argc, const char **argv, char **env);
-void print_callstack(struct wasm_interp *interp);
-
-// builtin helpers
-int get_params(struct wasm_interp *interp, struct val** vals, u32 num_vals);
-int get_var_params(struct wasm_interp *interp, struct val** vals, u32 *num_vals);
-u8 *interp_mem_ptr(struct wasm_interp *interp, u32 ptr, int size);
-
-static INLINE struct callframe *top_callframe(struct cursor *cur)
-{
-    return (struct callframe*)cursor_top(cur, sizeof(struct callframe));
-}
-
-
-static INLINE struct cursor *interp_codeptr(struct wasm_interp *interp)
-{
-    struct callframe *frame;
-    if (unlikely(!(frame = top_callframe(&interp->callframes))))
-        return 0;
-    return &frame->code;
-}
-
-
-static INLINE int mem_ptr_str(struct wasm_interp *interp, u32 ptr,
-        const char **str)
-{
-    // still technically unsafe if the string runs over the end of memory...
-    if (!(*str = (const char*)interp_mem_ptr(interp, ptr, 1))) {
-        return interp_error(interp, "int memptr");
-    }
-    return 1;
-}
-
-static INLINE int mem_ptr_i32(struct wasm_interp *interp, u32 ptr, int **i)
-{
-    if (!(*i = (int*)interp_mem_ptr(interp, ptr, sizeof(int))))
-        return interp_error(interp, "int memptr");
-    return 1;
-}
-
-static INLINE int cursor_pushval(struct cursor *cur, struct val *val)
-{
-    return cursor_push(cur, (u8*)val, sizeof(*val));
-}
-
-static INLINE int cursor_push_i32(struct cursor *stack, int i)
-{
-    struct val val;
-    val.type = val_i32;
-    val.num.i32 = i;
-
-    return cursor_pushval(stack, &val);
-}
-
-static INLINE int stack_push_i32(struct wasm_interp *interp, int i)
-{
-    return cursor_push_i32(&interp->stack, i);
-}
-
-static INLINE struct callframe *top_callframes(struct cursor *cur, int top)
-{
-    return (struct callframe*)cursor_topn(cur, sizeof(struct callframe), top);
-}
-
-static INLINE int was_section_parsed(struct module *module,
-    enum section_tag section)
-{
-    if (section == section_custom)
-        return module->custom_sections > 0;
-
-    return module->parsed & (1 << section);
-}
-
-
-#endif /* PROTOVERSE_WASM_H */

damus.xcodeproj/project.pbxproj

@@ -13,30 +13,25 @@
 		31D2E847295218AF006D67F8 /* Shimmer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31D2E846295218AF006D67F8 /* Shimmer.swift */; };
 		3A23838E2A297DD200E5AA2E /* ZapButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A23838D2A297DD200E5AA2E /* ZapButtonModel.swift */; };
 		3A3040ED29A5CB86008A0F29 /* ReplyDescriptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040EC29A5CB86008A0F29 /* ReplyDescriptionTests.swift */; };
+		3A3040EF29A8FEE9008A0F29 /* EventDetailBarTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040EE29A8FEE9008A0F29 /* EventDetailBarTests.swift */; };
 		3A3040F129A8FF97008A0F29 /* LocalizationUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040F029A8FF97008A0F29 /* LocalizationUtil.swift */; };
 		3A3040F329A91366008A0F29 /* ProfileViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3040F229A91366008A0F29 /* ProfileViewTests.swift */; };
 		3A30410129AB12AA008A0F29 /* EventGroupViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A30410029AB12AA008A0F29 /* EventGroupViewTests.swift */; };
 		3A4325A82961E11400BFCD9D /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 3A4325AA2961E11400BFCD9D /* Localizable.stringsdict */; };
-		3A4647CF2A413ADC00386AD8 /* CondensedProfilePicturesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A4647CE2A413ADC00386AD8 /* CondensedProfilePicturesView.swift */; };
 		3A48E7B029DFBE9D006E787E /* MutedThreadsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A48E7AF29DFBE9D006E787E /* MutedThreadsManager.swift */; };
-		3A5E47C52A4A6CF400C0D090 /* Trie.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A5E47C42A4A6CF400C0D090 /* Trie.swift */; };
-		3A5E47C72A4A76C800C0D090 /* TrieTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A5E47C62A4A76C800C0D090 /* TrieTests.swift */; };
 		3A8CC6CC2A2CFEF900940F5F /* StringUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8CC6CB2A2CFEF900940F5F /* StringUtil.swift */; };
-		3A90B1812A4EA3AF00000D94 /* UserSearchCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A90B1802A4EA3AF00000D94 /* UserSearchCache.swift */; };
-		3A90B1832A4EA3C600000D94 /* UserSearchCacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A90B1822A4EA3C600000D94 /* UserSearchCacheTests.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 */; };
 		3AA59D1D2999B0400061C48E /* DraftsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA59D1C2999B0400061C48E /* DraftsModel.swift */; };
 		3AAA95CA298DF87B00F3D526 /* TranslationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAA95C9298DF87B00F3D526 /* TranslationService.swift */; };
 		3AAA95CC298E07E900F3D526 /* DeepLPlan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAA95CB298E07E900F3D526 /* DeepLPlan.swift */; };
-		3AAC7A022A60FE72002B50DF /* LocalizationUtilTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAC7A012A60FE72002B50DF /* LocalizationUtilTests.swift */; };
-		3AAC7A042A626A75002B50DF /* CarouselDotsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAC7A032A626A75002B50DF /* CarouselDotsView.swift */; };
 		3AB72AB9298ECF30004BB58C /* Translator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AB72AB8298ECF30004BB58C /* Translator.swift */; };
 		3ACB685C297633BC00C46468 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3ACB685A297633BC00C46468 /* InfoPlist.strings */; };
 		3ACB685F297633BC00C46468 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3ACB685D297633BC00C46468 /* Localizable.strings */; };
 		3ACBCB78295FE5C70037388A /* TimeAgoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ACBCB77295FE5C70037388A /* TimeAgoTests.swift */; };
 		3AE45AF6297BB2E700C1D842 /* LibreTranslateServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */; };
+		3AFBF3FD29FDA7CC00E79C7C /* CustomZapViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFBF3FC29FDA7CC00E79C7C /* CustomZapViewTests.swift */; };
 		4C06670128FC7C5900038D2A /* RelayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C06670028FC7C5900038D2A /* RelayView.swift */; };
 		4C06670428FC7EC500038D2A /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 4C06670328FC7EC500038D2A /* Kingfisher */; };
 		4C06670628FCB08600038D2A /* ImageCarousel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C06670528FCB08600038D2A /* ImageCarousel.swift */; };
@@ -44,17 +39,11 @@
 		4C06670E28FDEAA000038D2A /* utf8.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C06670D28FDEAA000038D2A /* utf8.c */; };
 		4C0A3F8F280F640A000448DE /* ThreadModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F8E280F640A000448DE /* ThreadModel.swift */; };
 		4C0A3F93280F66F5000448DE /* ReplyMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F92280F66F5000448DE /* ReplyMap.swift */; };
-		4C0C03992A61E27B0098B3B8 /* primal.wasm in Resources */ = {isa = PBXBuildFile; fileRef = 4C0C03972A61E27B0098B3B8 /* primal.wasm */; };
-		4C0C039A2A61E27B0098B3B8 /* bool_setting.wasm in Resources */ = {isa = PBXBuildFile; fileRef = 4C0C03982A61E27B0098B3B8 /* bool_setting.wasm */; };
-		4C190F202A535FC200027FD5 /* CustomizeZapModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C190F1F2A535FC200027FD5 /* CustomizeZapModel.swift */; };
-		4C190F252A547D2000027FD5 /* LoadScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C190F242A547D2000027FD5 /* LoadScript.swift */; };
 		4C198DEF29F88C6B004C165C /* BlurHashEncode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C198DEB29F88C6B004C165C /* BlurHashEncode.swift */; };
 		4C198DF029F88C6B004C165C /* Readme.md in Resources */ = {isa = PBXBuildFile; fileRef = 4C198DEC29F88C6B004C165C /* Readme.md */; };
 		4C198DF129F88C6B004C165C /* License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4C198DED29F88C6B004C165C /* License.txt */; };
 		4C198DF229F88C6B004C165C /* BlurHashDecode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C198DEE29F88C6B004C165C /* BlurHashDecode.swift */; };
 		4C198DF529F88D2E004C165C /* ImageMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C198DF429F88D2E004C165C /* ImageMetadata.swift */; };
-		4C19AE512A5CEF7C00C90DB7 /* NostrScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C19AE4C2A5CEF7C00C90DB7 /* NostrScript.swift */; };
-		4C19AE552A5D977400C90DB7 /* HashtagTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C19AE542A5D977400C90DB7 /* HashtagTests.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 */; };
@@ -129,7 +118,6 @@
 		4C3EA67D28FFBBA300C48A62 /* InvoicesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA67C28FFBBA200C48A62 /* InvoicesView.swift */; };
 		4C3EA67F28FFC01D00C48A62 /* InvoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EA67E28FFC01D00C48A62 /* InvoiceView.swift */; };
 		4C42812C298C848200DBF26F /* TranslateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C42812B298C848200DBF26F /* TranslateView.swift */; };
-		4C4F14A72A2A61A30045A0B9 /* NostrScriptTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C4F14A62A2A61A30045A0B9 /* NostrScriptTests.swift */; };
 		4C54AA0729A540BA003E4487 /* NotificationsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C54AA0629A540BA003E4487 /* NotificationsModel.swift */; };
 		4C54AA0A29A55429003E4487 /* EventGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C54AA0929A55429003E4487 /* EventGroup.swift */; };
 		4C54AA0C29A5543C003E4487 /* ZapGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C54AA0B29A5543C003E4487 /* ZapGroup.swift */; };
@@ -143,10 +131,6 @@
 		4C64987C286D03E000EAE2B3 /* DirectMessagesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C64987B286D03E000EAE2B3 /* DirectMessagesView.swift */; };
 		4C64987E286D082C00EAE2B3 /* DirectMessagesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C64987D286D082C00EAE2B3 /* DirectMessagesModel.swift */; };
 		4C649881286E0EE300EAE2B3 /* secp256k1 in Frameworks */ = {isa = PBXBuildFile; productRef = 4C649880286E0EE300EAE2B3 /* secp256k1 */; };
-		4C687C212A5F7ED00092C550 /* DamusBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C687C202A5F7ED00092C550 /* DamusBackground.swift */; };
-		4C687C242A5FA86D0092C550 /* SearchHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C687C232A5FA86D0092C550 /* SearchHeaderView.swift */; };
-		4C687C272A6039500092C550 /* TestData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C687C262A6039500092C550 /* TestData.swift */; };
-		4C73C5142A4437C10062CAC0 /* ZapUserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C73C5132A4437C10062CAC0 /* ZapUserView.swift */; };
 		4C75EFA427FA577B0006080F /* PostView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C75EFA327FA577B0006080F /* PostView.swift */; };
 		4C75EFA627FF87A20006080F /* Nostr.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C75EFA527FF87A20006080F /* Nostr.swift */; };
 		4C75EFAD28049CFB0006080F /* PostButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C75EFAC28049CFB0006080F /* PostButton.swift */; };
@@ -184,11 +168,7 @@
 		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 */; };
-		4C9146FD2A2A87C200DDEA40 /* wasm.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CA9276E2A2A5D110098A105 /* wasm.c */; };
-		4C9146FE2A2A87C200DDEA40 /* nostrscript.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C4F14A92A2A71AB0045A0B9 /* nostrscript.c */; };
-		4C9147002A2A891E00DDEA40 /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C9146FF2A2A891E00DDEA40 /* error.c */; };
 		4C987B57283FD07F0042CE38 /* FollowersModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C987B56283FD07F0042CE38 /* FollowersModel.swift */; };
-		4C9AA14A2A4587A6003F49FD /* NotificationStatusModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9AA1492A4587A6003F49FD /* NotificationStatusModel.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 */; };
@@ -196,14 +176,6 @@
 		4CA2EFA0280E37AC0044ACD8 /* TimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */; };
 		4CA3FA1029F593D000FDB3C3 /* ZapTypePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA3FA0F29F593D000FDB3C3 /* ZapTypePicker.swift */; };
 		4CA5588329F33F5B00DC6A45 /* StringCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA5588229F33F5B00DC6A45 /* StringCodable.swift */; };
-		4CA9275D2A28FF630098A105 /* LongformView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA9275C2A28FF630098A105 /* LongformView.swift */; };
-		4CA9275F2A2902B20098A105 /* LongformPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA9275E2A2902B20098A105 /* LongformPreview.swift */; };
-		4CA927612A290E340098A105 /* EventShell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA927602A290E340098A105 /* EventShell.swift */; };
-		4CA927632A290EB10098A105 /* EventTop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA927622A290EB10098A105 /* EventTop.swift */; };
-		4CA927652A290F1A0098A105 /* TimeDot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA927642A290F1A0098A105 /* TimeDot.swift */; };
-		4CA927672A290F8B0098A105 /* RelativeTime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA927662A290F8B0098A105 /* RelativeTime.swift */; };
-		4CA9276A2A290FC00098A105 /* ContextButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA927692A290FC00098A105 /* ContextButton.swift */; };
-		4CA9276C2A2910D10098A105 /* ReplyPart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA9276B2A2910D10098A105 /* ReplyPart.swift */; };
 		4CAAD8AD298851D000060CEA /* AccountDeletion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CAAD8AC298851D000060CEA /* AccountDeletion.swift */; };
 		4CAAD8B029888AD200060CEA /* RelayConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */; };
 		4CACA9D5280C31E100D9BBE8 /* ReplyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */; };
@@ -224,7 +196,6 @@
 		4CB883AE2976FA9300DC99E7 /* FormatTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB883AD2976FA9300DC99E7 /* FormatTests.swift */; };
 		4CB883B0297705DD00DC99E7 /* ZapButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB883AF297705DD00DC99E7 /* ZapButton.swift */; };
 		4CB883B6297730E400DC99E7 /* LNUrls.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB883B5297730E400DC99E7 /* LNUrls.swift */; };
-		4CB8FC232A41ABA800763C51 /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB8FC222A41ABA500763C51 /* AboutView.swift */; };
 		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 */; };
@@ -246,6 +217,7 @@
 		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 */; };
 		4CE1399029F0661A00AC6A0B /* RepostAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE1398F29F0661A00AC6A0B /* RepostAction.swift */; };
 		4CE1399229F0666100AC6A0B /* ShareActionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE1399129F0666100AC6A0B /* ShareActionButton.swift */; };
@@ -265,8 +237,9 @@
 		4CE6DF0427F7A08200C66700 /* damusUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE6DF0327F7A08200C66700 /* damusUITestsLaunchTests.swift */; };
 		4CE6DF1627F8DEBF00C66700 /* RelayConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE6DF1527F8DEBF00C66700 /* RelayConnection.swift */; };
 		4CE8794829941DA700F758CC /* RelayFilters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794729941DA700F758CC /* RelayFilters.swift */; };
+		4CE8794C2995B59E00F758CC /* RelayMetadatas.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794B2995B59E00F758CC /* RelayMetadatas.swift */; };
 		4CE8794E2996B16A00F758CC /* RelayToggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794D2996B16A00F758CC /* RelayToggle.swift */; };
-		4CE879502996B2BD00F758CC /* RelayStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794F2996B2BD00F758CC /* RelayStatusView.swift */; };
+		4CE879502996B2BD00F758CC /* RelayStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794F2996B2BD00F758CC /* RelayStatus.swift */; };
 		4CE879522996B68900F758CC /* RelayType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE879512996B68900F758CC /* RelayType.swift */; };
 		4CE879552996BAB900F758CC /* RelayPaidDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE879542996BAB900F758CC /* RelayPaidDetail.swift */; };
 		4CE879582996C45300F758CC /* ZapsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE879572996C45300F758CC /* ZapsView.swift */; };
@@ -290,7 +263,6 @@
 		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 */; };
-		4CFD502F2A2DA45800A229DB /* MediaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFD502E2A2DA45800A229DB /* MediaView.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 */; };
@@ -298,17 +270,13 @@
 		4CFF8F6D29CD022E008DB934 /* WideEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CFF8F6C29CD022E008DB934 /* WideEventView.swift */; };
 		4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FE60CDC295E1C5E00105A1F /* Wallet.swift */; };
 		50088DA129E8271A008A1FDF /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50088DA029E8271A008A1FDF /* WebSocket.swift */; };
+		501F8C802A0220E1001AFC1D /* KeychainStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C7F2A0220E1001AFC1D /* KeychainStorage.swift */; };
+		501F8C822A0224EB001AFC1D /* KeychainStorageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C812A0224EB001AFC1D /* KeychainStorageTests.swift */; };
 		5019CADD2A0FB0A9000069E1 /* ProfileDatabaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5019CADC2A0FB0A9000069E1 /* ProfileDatabaseTests.swift */; };
 		501F8C5529FF5EF6001AFC1D /* PersistedProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C5429FF5EF6001AFC1D /* PersistedProfile.swift */; };
 		501F8C5829FF5FC5001AFC1D /* Damus.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C5629FF5FC5001AFC1D /* Damus.xcdatamodeld */; };
 		501F8C5A29FF70F5001AFC1D /* ProfileDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C5929FF70F5001AFC1D /* ProfileDatabase.swift */; };
-		501F8C802A0220E1001AFC1D /* KeychainStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C7F2A0220E1001AFC1D /* KeychainStorage.swift */; };
-		501F8C822A0224EB001AFC1D /* KeychainStorageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501F8C812A0224EB001AFC1D /* KeychainStorageTests.swift */; };
-		504323A72A34915F006AE6DC /* RelayModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504323A62A34915F006AE6DC /* RelayModel.swift */; };
-		504323A92A3495B6006AE6DC /* RelayModelCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504323A82A3495B6006AE6DC /* RelayModelCache.swift */; };
-		5053ACA72A56DF3B00851AE3 /* DeveloperSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5053ACA62A56DF3B00851AE3 /* DeveloperSettingsView.swift */; };
 		50A50A8D29A09E1C00C01BE7 /* RequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A50A8C29A09E1C00C01BE7 /* RequestTests.swift */; };
-		50A60D142A28BEEE00186190 /* RelayLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A60D132A28BEEE00186190 /* RelayLog.swift */; };
 		50B5685329F97CB400A23243 /* CredentialHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B5685229F97CB400A23243 /* CredentialHandler.swift */; };
 		50DA11262A16A23F00236234 /* Launch.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DA11252A16A23F00236234 /* Launch.storyboard */; };
 		5C0707D12A1ECB38004E7B51 /* DamusLogoGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0707D02A1ECB38004E7B51 /* DamusLogoGradient.swift */; };
@@ -331,7 +299,6 @@
 		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 */; };
-		D2277EEA2A089BD5006C3807 /* Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2277EE92A089BD5006C3807 /* Router.swift */; };
 		DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */; };
 		E4FA1C032A24BB7F00482697 /* SearchSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4FA1C022A24BB7F00482697 /* SearchSettingsView.swift */; };
 		E990020F2955F837003BBC5A /* EditMetadataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E990020E2955F837003BBC5A /* EditMetadataView.swift */; };
@@ -341,7 +308,7 @@
 		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 /* EditPictureControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = F79C7FAC29D5E9620000F946 /* EditPictureControl.swift */; };
+		F79C7FAD29D5E9620000F946 /* EditProfilePictureControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = F79C7FAC29D5E9620000F946 /* EditProfilePictureControl.swift */; };
 		F7F0BA25297892BD009531F3 /* SwipeToDismiss.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */; };
 		F7F0BA272978E54D009531F3 /* ParticipantsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA262978E54D009531F3 /* ParticipantsView.swift */; };
 		F944F56E29EA9CCC0067B3BF /* DamusParseContentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F944F56D29EA9CCC0067B3BF /* DamusParseContentTests.swift */; };
@@ -378,6 +345,7 @@
 		3A25EF152992DA5D008ABE69 /* el-GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "el-GR"; path = "el-GR.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A2B8B0A296A8982009CC16D /* en-US */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "en-US"; path = "en-US.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A3040EC29A5CB86008A0F29 /* ReplyDescriptionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyDescriptionTests.swift; sourceTree = "<group>"; };
+		3A3040EE29A8FEE9008A0F29 /* EventDetailBarTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventDetailBarTests.swift; sourceTree = "<group>"; };
 		3A3040F029A8FF97008A0F29 /* LocalizationUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizationUtil.swift; sourceTree = "<group>"; };
 		3A3040F229A91366008A0F29 /* ProfileViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewTests.swift; sourceTree = "<group>"; };
 		3A3040F929A91ED6008A0F29 /* zh-HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-HK"; path = "zh-HK.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
@@ -397,14 +365,11 @@
 		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>"; };
-		3A4647CE2A413ADC00386AD8 /* CondensedProfilePicturesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CondensedProfilePicturesView.swift; sourceTree = "<group>"; };
 		3A48E7AF29DFBE9D006E787E /* MutedThreadsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutedThreadsManager.swift; 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>"; };
 		3A5CAE1F298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-CN"; path = "zh-CN.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
-		3A5E47C42A4A6CF400C0D090 /* Trie.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Trie.swift; sourceTree = "<group>"; };
-		3A5E47C62A4A76C800C0D090 /* TrieTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrieTests.swift; sourceTree = "<group>"; };
 		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>"; };
@@ -418,8 +383,6 @@
 		3A8624DA299E82BE00BD8BE9 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3A8624DB299E82BE00BD8BE9 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = cs; path = cs.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		3A8CC6CB2A2CFEF900940F5F /* StringUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringUtil.swift; sourceTree = "<group>"; };
-		3A90B1802A4EA3AF00000D94 /* UserSearchCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserSearchCache.swift; sourceTree = "<group>"; };
-		3A90B1822A4EA3C600000D94 /* UserSearchCacheTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSearchCacheTests.swift; sourceTree = "<group>"; };
 		3A929C20297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "it-IT"; path = "it-IT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A929C21297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "it-IT"; path = "it-IT.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A929C22297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "it-IT"; path = "it-IT.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
@@ -441,15 +404,10 @@
 		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>"; };
-		3AAC7A012A60FE72002B50DF /* LocalizationUtilTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizationUtilTests.swift; sourceTree = "<group>"; };
-		3AAC7A032A626A75002B50DF /* CarouselDotsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselDotsView.swift; sourceTree = "<group>"; };
 		3AB5B86A2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3AB5B86B2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3AB5B86C2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = de; path = de.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		3AB72AB8298ECF30004BB58C /* Translator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Translator.swift; sourceTree = "<group>"; };
-		3ABACEBF2A5B3ED10037A847 /* sw */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sw; path = sw.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		3ABACEC02A5B3ED10037A847 /* sw */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = sw; path = sw.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
-		3ABACEC12A5B3ED10037A847 /* sw */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sw; path = sw.lproj/Localizable.strings; sourceTree = "<group>"; };
 		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>"; };
@@ -478,6 +436,7 @@
 		3AF6336829884C6B0005672A /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3AF6336929884C6B0005672A /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3AF6336A29884C6B0005672A /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "pt-PT"; path = "pt-PT.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3AFBF3FC29FDA7CC00E79C7C /* CustomZapViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomZapViewTests.swift; sourceTree = "<group>"; };
 		4C06670028FC7C5900038D2A /* RelayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayView.swift; sourceTree = "<group>"; };
 		4C06670528FCB08600038D2A /* ImageCarousel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCarousel.swift; sourceTree = "<group>"; };
 		4C06670828FDE64700038D2A /* damus-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "damus-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -487,19 +446,11 @@
 		4C06670D28FDEAA000038D2A /* utf8.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = utf8.c; sourceTree = "<group>"; };
 		4C0A3F8E280F640A000448DE /* ThreadModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadModel.swift; sourceTree = "<group>"; };
 		4C0A3F92280F66F5000448DE /* ReplyMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyMap.swift; sourceTree = "<group>"; };
-		4C0C03972A61E27B0098B3B8 /* primal.wasm */ = {isa = PBXFileReference; lastKnownFileType = file; name = primal.wasm; path = nostrscript/primal.wasm; sourceTree = SOURCE_ROOT; };
-		4C0C03982A61E27B0098B3B8 /* bool_setting.wasm */ = {isa = PBXFileReference; lastKnownFileType = file; name = bool_setting.wasm; path = nostrscript/bool_setting.wasm; sourceTree = SOURCE_ROOT; };
-		4C190F1F2A535FC200027FD5 /* CustomizeZapModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomizeZapModel.swift; sourceTree = "<group>"; };
-		4C190F242A547D2000027FD5 /* LoadScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadScript.swift; sourceTree = "<group>"; };
 		4C198DEB29F88C6B004C165C /* BlurHashEncode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlurHashEncode.swift; sourceTree = "<group>"; };
 		4C198DEC29F88C6B004C165C /* Readme.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = Readme.md; sourceTree = "<group>"; };
 		4C198DED29F88C6B004C165C /* License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = License.txt; sourceTree = "<group>"; };
 		4C198DEE29F88C6B004C165C /* BlurHashDecode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlurHashDecode.swift; sourceTree = "<group>"; };
 		4C198DF429F88D2E004C165C /* ImageMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageMetadata.swift; sourceTree = "<group>"; };
-		4C19AE4B2A5CEF7C00C90DB7 /* primal.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.typescript; path = primal.ts; sourceTree = "<group>"; };
-		4C19AE4C2A5CEF7C00C90DB7 /* NostrScript.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NostrScript.swift; sourceTree = "<group>"; };
-		4C19AE502A5CEF7C00C90DB7 /* nostr.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.typescript; path = nostr.ts; sourceTree = "<group>"; };
-		4C19AE542A5D977400C90DB7 /* HashtagTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HashtagTests.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>"; };
@@ -604,9 +555,6 @@
 		4C3EA67E28FFC01D00C48A62 /* InvoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvoiceView.swift; sourceTree = "<group>"; };
 		4C42812B298C848200DBF26F /* TranslateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslateView.swift; sourceTree = "<group>"; };
 		4C4A3A5A288A1B2200453788 /* damus.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = damus.entitlements; sourceTree = "<group>"; };
-		4C4F14A62A2A61A30045A0B9 /* NostrScriptTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NostrScriptTests.swift; sourceTree = "<group>"; };
-		4C4F14A82A2A71AB0045A0B9 /* nostrscript.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = nostrscript.h; sourceTree = "<group>"; };
-		4C4F14A92A2A71AB0045A0B9 /* nostrscript.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = nostrscript.c; sourceTree = "<group>"; };
 		4C54AA0629A540BA003E4487 /* NotificationsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsModel.swift; sourceTree = "<group>"; };
 		4C54AA0929A55429003E4487 /* EventGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventGroup.swift; sourceTree = "<group>"; };
 		4C54AA0B29A5543C003E4487 /* ZapGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapGroup.swift; sourceTree = "<group>"; };
@@ -619,10 +567,6 @@
 		4C633351283D419F00B1C9C3 /* SignalModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignalModel.swift; sourceTree = "<group>"; };
 		4C64987B286D03E000EAE2B3 /* DirectMessagesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectMessagesView.swift; sourceTree = "<group>"; };
 		4C64987D286D082C00EAE2B3 /* DirectMessagesModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectMessagesModel.swift; sourceTree = "<group>"; };
-		4C687C202A5F7ED00092C550 /* DamusBackground.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusBackground.swift; sourceTree = "<group>"; };
-		4C687C232A5FA86D0092C550 /* SearchHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchHeaderView.swift; sourceTree = "<group>"; };
-		4C687C262A6039500092C550 /* TestData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestData.swift; sourceTree = "<group>"; };
-		4C73C5132A4437C10062CAC0 /* ZapUserView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapUserView.swift; sourceTree = "<group>"; };
 		4C75EFA327FA577B0006080F /* PostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostView.swift; sourceTree = "<group>"; };
 		4C75EFA527FF87A20006080F /* Nostr.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Nostr.swift; sourceTree = "<group>"; };
 		4C75EFA72804823E0006080F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
@@ -665,9 +609,7 @@
 		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>"; };
-		4C9146FF2A2A891E00DDEA40 /* error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = error.c; sourceTree = "<group>"; };
 		4C987B56283FD07F0042CE38 /* FollowersModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowersModel.swift; sourceTree = "<group>"; };
-		4C9AA1492A4587A6003F49FD /* NotificationStatusModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationStatusModel.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>"; };
@@ -675,21 +617,6 @@
 		4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineView.swift; sourceTree = "<group>"; };
 		4CA3FA0F29F593D000FDB3C3 /* ZapTypePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapTypePicker.swift; sourceTree = "<group>"; };
 		4CA5588229F33F5B00DC6A45 /* StringCodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringCodable.swift; sourceTree = "<group>"; };
-		4CA9275C2A28FF630098A105 /* LongformView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LongformView.swift; sourceTree = "<group>"; };
-		4CA9275E2A2902B20098A105 /* LongformPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LongformPreview.swift; sourceTree = "<group>"; };
-		4CA927602A290E340098A105 /* EventShell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventShell.swift; sourceTree = "<group>"; };
-		4CA927622A290EB10098A105 /* EventTop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventTop.swift; sourceTree = "<group>"; };
-		4CA927642A290F1A0098A105 /* TimeDot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeDot.swift; sourceTree = "<group>"; };
-		4CA927662A290F8B0098A105 /* RelativeTime.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelativeTime.swift; sourceTree = "<group>"; };
-		4CA927692A290FC00098A105 /* ContextButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextButton.swift; sourceTree = "<group>"; };
-		4CA9276B2A2910D10098A105 /* ReplyPart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyPart.swift; sourceTree = "<group>"; };
-		4CA9276D2A2A5D110098A105 /* wasm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wasm.h; sourceTree = "<group>"; };
-		4CA9276E2A2A5D110098A105 /* wasm.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = wasm.c; sourceTree = "<group>"; };
-		4CA9276F2A2A5D470098A105 /* parser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = parser.h; sourceTree = "<group>"; };
-		4CA927702A2A5D470098A105 /* debug.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
-		4CA927712A2A5D480098A105 /* error.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = "<group>"; };
-		4CA927742A2A5E2F0098A105 /* varint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = varint.h; sourceTree = "<group>"; };
-		4CA927752A2A5E2F0098A105 /* typedefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = typedefs.h; sourceTree = "<group>"; };
 		4CAAD8AC298851D000060CEA /* AccountDeletion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountDeletion.swift; sourceTree = "<group>"; };
 		4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayConfigView.swift; sourceTree = "<group>"; };
 		4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyView.swift; sourceTree = "<group>"; };
@@ -710,7 +637,6 @@
 		4CB883AD2976FA9300DC99E7 /* FormatTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormatTests.swift; sourceTree = "<group>"; };
 		4CB883AF297705DD00DC99E7 /* ZapButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapButton.swift; sourceTree = "<group>"; };
 		4CB883B5297730E400DC99E7 /* LNUrls.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LNUrls.swift; sourceTree = "<group>"; };
-		4CB8FC222A41ABA500763C51 /* AboutView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutView.swift; sourceTree = "<group>"; };
 		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>"; };
@@ -731,6 +657,7 @@
 		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>"; };
 		4CE1398F29F0661A00AC6A0B /* RepostAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostAction.swift; sourceTree = "<group>"; };
 		4CE1399129F0666100AC6A0B /* ShareActionButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareActionButton.swift; sourceTree = "<group>"; };
@@ -753,8 +680,9 @@
 		4CE6DF0327F7A08200C66700 /* damusUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = damusUITestsLaunchTests.swift; sourceTree = "<group>"; };
 		4CE6DF1527F8DEBF00C66700 /* RelayConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayConnection.swift; sourceTree = "<group>"; };
 		4CE8794729941DA700F758CC /* RelayFilters.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayFilters.swift; sourceTree = "<group>"; };
+		4CE8794B2995B59E00F758CC /* RelayMetadatas.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayMetadatas.swift; sourceTree = "<group>"; };
 		4CE8794D2996B16A00F758CC /* RelayToggle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayToggle.swift; sourceTree = "<group>"; };
-		4CE8794F2996B2BD00F758CC /* RelayStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayStatusView.swift; sourceTree = "<group>"; };
+		4CE8794F2996B2BD00F758CC /* RelayStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayStatus.swift; sourceTree = "<group>"; };
 		4CE879512996B68900F758CC /* RelayType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayType.swift; sourceTree = "<group>"; };
 		4CE879542996BAB900F758CC /* RelayPaidDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayPaidDetail.swift; sourceTree = "<group>"; };
 		4CE879572996C45300F758CC /* ZapsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapsView.swift; sourceTree = "<group>"; };
@@ -779,7 +707,6 @@
 		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>"; };
-		4CFD502E2A2DA45800A229DB /* MediaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaView.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>"; };
@@ -787,17 +714,13 @@
 		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>"; };
 		50088DA029E8271A008A1FDF /* WebSocket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSocket.swift; sourceTree = "<group>"; };
+		501F8C7F2A0220E1001AFC1D /* KeychainStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStorage.swift; sourceTree = "<group>"; };
+		501F8C812A0224EB001AFC1D /* KeychainStorageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStorageTests.swift; sourceTree = "<group>"; };
 		5019CADC2A0FB0A9000069E1 /* ProfileDatabaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileDatabaseTests.swift; sourceTree = "<group>"; };
 		501F8C5429FF5EF6001AFC1D /* PersistedProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistedProfile.swift; sourceTree = "<group>"; };
 		501F8C5729FF5FC5001AFC1D /* Damus.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Damus.xcdatamodel; sourceTree = "<group>"; };
 		501F8C5929FF70F5001AFC1D /* ProfileDatabase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileDatabase.swift; sourceTree = "<group>"; };
-		501F8C7F2A0220E1001AFC1D /* KeychainStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStorage.swift; sourceTree = "<group>"; };
-		501F8C812A0224EB001AFC1D /* KeychainStorageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStorageTests.swift; sourceTree = "<group>"; };
-		504323A62A34915F006AE6DC /* RelayModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayModel.swift; sourceTree = "<group>"; };
-		504323A82A3495B6006AE6DC /* RelayModelCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayModelCache.swift; sourceTree = "<group>"; };
-		5053ACA62A56DF3B00851AE3 /* DeveloperSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeveloperSettingsView.swift; sourceTree = "<group>"; };
 		50A50A8C29A09E1C00C01BE7 /* RequestTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestTests.swift; sourceTree = "<group>"; };
-		50A60D132A28BEEE00186190 /* RelayLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayLog.swift; sourceTree = "<group>"; };
 		50B5685229F97CB400A23243 /* CredentialHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CredentialHandler.swift; sourceTree = "<group>"; };
 		50DA11252A16A23F00236234 /* Launch.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Launch.storyboard; sourceTree = "<group>"; };
 		5C0707D02A1ECB38004E7B51 /* DamusLogoGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusLogoGradient.swift; sourceTree = "<group>"; };
@@ -820,7 +743,6 @@
 		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>"; };
-		D2277EE92A089BD5006C3807 /* Router.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Router.swift; sourceTree = "<group>"; };
 		DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkdownTests.swift; sourceTree = "<group>"; };
 		E4FA1C022A24BB7F00482697 /* SearchSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchSettingsView.swift; sourceTree = "<group>"; };
 		E990020E2955F837003BBC5A /* EditMetadataView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditMetadataView.swift; sourceTree = "<group>"; };
@@ -830,7 +752,7 @@
 		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 /* EditPictureControl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditPictureControl.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 /* ParticipantsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParticipantsView.swift; sourceTree = "<group>"; };
 		F944F56D29EA9CCC0067B3BF /* DamusParseContentTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusParseContentTests.swift; sourceTree = "<group>"; };
@@ -885,16 +807,6 @@
 		4C06670728FDE62900038D2A /* damus-c */ = {
 			isa = PBXGroup;
 			children = (
-				4C9146FF2A2A891E00DDEA40 /* error.c */,
-				4CA927752A2A5E2F0098A105 /* typedefs.h */,
-				4CA927742A2A5E2F0098A105 /* varint.h */,
-				4CA927702A2A5D470098A105 /* debug.h */,
-				4CA927712A2A5D480098A105 /* error.h */,
-				4CA9276F2A2A5D470098A105 /* parser.h */,
-				4CA9276E2A2A5D110098A105 /* wasm.c */,
-				4CA9276D2A2A5D110098A105 /* wasm.h */,
-				4C4F14A82A2A71AB0045A0B9 /* nostrscript.h */,
-				4C4F14A92A2A71AB0045A0B9 /* nostrscript.c */,
 				4C06670928FDE64700038D2A /* damus.h */,
 				4C06670A28FDE64700038D2A /* damus.c */,
 				4C06670828FDE64700038D2A /* damus-Bridging-Header.h */,
@@ -954,7 +866,6 @@
 		4C0A3F8D280F63FF000448DE /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				4C190F1E2A535FC200027FD5 /* Zaps */,
 				4C54AA0829A55416003E4487 /* Notifications */,
 				3AA247FC297E3CFF0090C62D /* RepostsModel.swift */,
 				4C0A3F8E280F640A000448DE /* ThreadModel.swift */,
@@ -997,37 +908,10 @@
 				3A48E7AF29DFBE9D006E787E /* MutedThreadsManager.swift */,
 				4C7D09772A0B0CC900943473 /* WalletModel.swift */,
 				3A23838D2A297DD200E5AA2E /* ZapButtonModel.swift */,
-				3A5E47C42A4A6CF400C0D090 /* Trie.swift */,
-				3A90B1802A4EA3AF00000D94 /* UserSearchCache.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
 		};
-		4C0C03962A61E2670098B3B8 /* Fixtures */ = {
-			isa = PBXGroup;
-			children = (
-				4C0C03982A61E27B0098B3B8 /* bool_setting.wasm */,
-				4C0C03972A61E27B0098B3B8 /* primal.wasm */,
-			);
-			name = Fixtures;
-			sourceTree = "<group>";
-		};
-		4C190F1E2A535FC200027FD5 /* Zaps */ = {
-			isa = PBXGroup;
-			children = (
-				4C190F1F2A535FC200027FD5 /* CustomizeZapModel.swift */,
-			);
-			path = Zaps;
-			sourceTree = "<group>";
-		};
-		4C190F232A547D1700027FD5 /* NostrScript */ = {
-			isa = PBXGroup;
-			children = (
-				4C190F242A547D2000027FD5 /* LoadScript.swift */,
-			);
-			path = NostrScript;
-			sourceTree = "<group>";
-		};
 		4C198DEA29F88C6B004C165C /* BlurHash */ = {
 			isa = PBXGroup;
 			children = (
@@ -1047,16 +931,6 @@
 			path = Images;
 			sourceTree = "<group>";
 		};
-		4C19AE4A2A5CEF7C00C90DB7 /* nostrscript */ = {
-			isa = PBXGroup;
-			children = (
-				4C19AE4B2A5CEF7C00C90DB7 /* primal.ts */,
-				4C19AE4C2A5CEF7C00C90DB7 /* NostrScript.swift */,
-				4C19AE502A5CEF7C00C90DB7 /* nostr.ts */,
-			);
-			path = nostrscript;
-			sourceTree = "<group>";
-		};
 		4C1A9A1B29DDCF8B00516EAC /* Settings */ = {
 			isa = PBXGroup;
 			children = (
@@ -1066,7 +940,6 @@
 				4C1A9A2429DDDF2600516EAC /* ZapSettingsView.swift */,
 				4C1A9A2629DDE31900516EAC /* TranslationSettingsView.swift */,
 				E4FA1C022A24BB7F00482697 /* SearchSettingsView.swift */,
-				5053ACA62A56DF3B00851AE3 /* DeveloperSettingsView.swift */,
 			);
 			path = Settings;
 			sourceTree = "<group>";
@@ -1096,23 +969,13 @@
 			children = (
 				4C54AA0929A55429003E4487 /* EventGroup.swift */,
 				4C54AA0B29A5543C003E4487 /* ZapGroup.swift */,
-				4C9AA1492A4587A6003F49FD /* NotificationStatusModel.swift */,
 			);
 			path = Notifications;
 			sourceTree = "<group>";
 		};
-		4C687C2A2A6058450092C550 /* Search */ = {
-			isa = PBXGroup;
-			children = (
-				4C687C232A5FA86D0092C550 /* SearchHeaderView.swift */,
-			);
-			path = Search;
-			sourceTree = "<group>";
-		};
 		4C75EFA227FA576C0006080F /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				4C190F232A547D1700027FD5 /* NostrScript */,
 				4C7D09692A0AEA0400943473 /* CodeScanner */,
 				4C7D095A2A098C5C00943473 /* Wallet */,
 				4C8D1A6D29F31E4100ACDF75 /* Buttons */,
@@ -1183,7 +1046,6 @@
 			children = (
 				501F8C5329FF5EE2001AFC1D /* CoreData */,
 				4CE6DF1527F8DEBF00C66700 /* RelayConnection.swift */,
-				50A60D132A28BEEE00186190 /* RelayLog.swift */,
 				4C75EFA527FF87A20006080F /* Nostr.swift */,
 				4C75EFAE28049D340006080F /* NostrFilter.swift */,
 				4C75EFB028049D510006080F /* NostrResponse.swift */,
@@ -1229,7 +1091,6 @@
 				4C2859612A12A7F0004746F7 /* GoldSupportGradient.swift */,
 				5C6E1DAE2A194075008FC15A /* PinkGradient.swift */,
 				5C0707D02A1ECB38004E7B51 /* DamusLogoGradient.swift */,
-				4C687C202A5F7ED00092C550 /* DamusBackground.swift */,
 			);
 			path = Gradients;
 			sourceTree = "<group>";
@@ -1282,7 +1143,6 @@
 				50B5685229F97CB400A23243 /* CredentialHandler.swift */,
 				4C7D09582A05BEAD00943473 /* KeyboardVisible.swift */,
 				3A8CC6CB2A2CFEF900940F5F /* StringUtil.swift */,
-				D2277EE92A089BD5006C3807 /* Router.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -1296,28 +1156,6 @@
 			path = Buttons;
 			sourceTree = "<group>";
 		};
-		4CA9275B2A28FF570098A105 /* Longform */ = {
-			isa = PBXGroup;
-			children = (
-				4CA9275C2A28FF630098A105 /* LongformView.swift */,
-				4CA9275E2A2902B20098A105 /* LongformPreview.swift */,
-			);
-			path = Longform;
-			sourceTree = "<group>";
-		};
-		4CA927682A290F8F0098A105 /* Components */ = {
-			isa = PBXGroup;
-			children = (
-				4CA927642A290F1A0098A105 /* TimeDot.swift */,
-				4CA927622A290EB10098A105 /* EventTop.swift */,
-				4CC7AAF3297F18B400430951 /* ReplyDescription.swift */,
-				4CA927662A290F8B0098A105 /* RelativeTime.swift */,
-				4CA927692A290FC00098A105 /* ContextButton.swift */,
-				4CA9276B2A2910D10098A105 /* ReplyPart.swift */,
-			);
-			path = Components;
-			sourceTree = "<group>";
-		};
 		4CAAD8AE29888A9B00060CEA /* Relays */ = {
 			isa = PBXGroup;
 			children = (
@@ -1327,7 +1165,7 @@
 				4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */,
 				F7908E91298B0F0700AB113A /* RelayDetailView.swift */,
 				4CE8794D2996B16A00F758CC /* RelayToggle.swift */,
-				4CE8794F2996B2BD00F758CC /* RelayStatusView.swift */,
+				4CE8794F2996B2BD00F758CC /* RelayStatus.swift */,
 				4CE879512996B68900F758CC /* RelayType.swift */,
 				4CDA128929E9D10C0006FA5A /* SignalView.swift */,
 			);
@@ -1358,11 +1196,10 @@
 		4CB9D4A52992D01900A9A7E4 /* Profile */ = {
 			isa = PBXGroup;
 			children = (
-				4CB8FC222A41ABA500763C51 /* AboutView.swift */,
 				4CEE2AF6280B2DEA00AB5EEF /* ProfileName.swift */,
 				4C285C892838B985008A31F1 /* ProfilePictureSelector.swift */,
+				F79C7FAC29D5E9620000F946 /* EditProfilePictureControl.swift */,
 				E990020E2955F837003BBC5A /* EditMetadataView.swift */,
-				F79C7FAC29D5E9620000F946 /* EditPictureControl.swift */,
 				4CEE2AF2280B25C500AB5EEF /* ProfilePicView.swift */,
 				4C8682862814DE470026224F /* ProfileView.swift */,
 				4CB9D4A62992D02B00A9A7E4 /* ProfileNameView.swift */,
@@ -1370,7 +1207,6 @@
 				4C9F18E329ABDE6D008C55EC /* MaybeAnonPfpView.swift */,
 				4C9BB83329C12D9900FC4E37 /* EventProfileName.swift */,
 				4C8D1A6B29F1DFC200ACDF75 /* FriendIcon.swift */,
-				3A4647CE2A413ADC00386AD8 /* CondensedProfilePicturesView.swift */,
 			);
 			path = Profile;
 			sourceTree = "<group>";
@@ -1378,8 +1214,8 @@
 		4CC7AAEE297F11B300430951 /* Events */ = {
 			isa = PBXGroup;
 			children = (
-				4CA927682A290F8F0098A105 /* Components */,
 				4CC7AAEF297F11C700430951 /* SelectedEventView.swift */,
+				4CC7AAF3297F18B400430951 /* ReplyDescription.swift */,
 				4CC7AAF5297F1A6A00430951 /* EventBody.swift */,
 				4CC7AAEA297F0AEC00430951 /* BuilderEventView.swift */,
 				4CC7AAF7297F1CEE00430951 /* EventProfile.swift */,
@@ -1388,8 +1224,6 @@
 				4C3D52B5298DB4E6001C5831 /* ZapEvent.swift */,
 				4C3D52B7298DB5C6001C5831 /* TextEvent.swift */,
 				4CFF8F6C29CD022E008DB934 /* WideEventView.swift */,
-				4CA9275B2A28FF570098A105 /* Longform */,
-				4CA927602A290E340098A105 /* EventShell.swift */,
 			);
 			path = Events;
 			sourceTree = "<group>";
@@ -1406,6 +1240,7 @@
 		4CE0E2B029A3DF4700DB4CA2 /* Timeline */ = {
 			isa = PBXGroup;
 			children = (
+				4CE0E2B129A3DF6900DB4CA2 /* LoadMoreButton.swift */,
 				4CE0E2B529A3ED5500DB4CA2 /* InnerTimelineView.swift */,
 			);
 			path = Timeline;
@@ -1414,7 +1249,6 @@
 		4CE4F9DF285287A000C00DD9 /* Components */ = {
 			isa = PBXGroup;
 			children = (
-				4C687C2A2A6058450092C550 /* Search */,
 				4C7D09702A0AEF4C00943473 /* Gradients */,
 				31D2E846295218AF006D67F8 /* Shimmer.swift */,
 				4CD7641A28A1641400B6928F /* EndBlock.swift */,
@@ -1437,7 +1271,6 @@
 				4C8D00C929DF80350036AF10 /* TruncatedText.swift */,
 				4C28595F2A12A2BE004746F7 /* SupporterBadge.swift */,
 				5C6E1DAC2A193EC2008FC15A /* GradientButtonStyle.swift */,
-				3AAC7A032A626A75002B50DF /* CarouselDotsView.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -1445,7 +1278,6 @@
 		4CE6DEDA27F7A08100C66700 = {
 			isa = PBXGroup;
 			children = (
-				4C19AE4A2A5CEF7C00C90DB7 /* nostrscript */,
 				4C06670728FDE62900038D2A /* damus-c */,
 				4CE6DEE527F7A08100C66700 /* damus */,
 				4CE6DEF627F7A08200C66700 /* damusTests */,
@@ -1453,9 +1285,7 @@
 				4CE6DEE427F7A08100C66700 /* Products */,
 				4CEE2AE62804F57B00AB5EEF /* Frameworks */,
 			);
-			indentWidth = 4;
 			sourceTree = "<group>";
-			tabWidth = 4;
 		};
 		4CE6DEE427F7A08100C66700 /* Products */ = {
 			isa = PBXGroup;
@@ -1485,7 +1315,6 @@
 				4CE6DEEA27F7A08200C66700 /* Assets.xcassets */,
 				4CE6DEEC27F7A08200C66700 /* Preview Content */,
 				3A4325AA2961E11400BFCD9D /* Localizable.stringsdict */,
-				4C687C262A6039500092C550 /* TestData.swift */,
 			);
 			path = damus;
 			sourceTree = "<group>";
@@ -1501,7 +1330,6 @@
 		4CE6DEF627F7A08200C66700 /* damusTests */ = {
 			isa = PBXGroup;
 			children = (
-				4C0C03962A61E2670098B3B8 /* Fixtures */,
 				4C7D097D2A0C58B900943473 /* WalletConnectTests.swift */,
 				F944F56C29EA9CB20067B3BF /* Models */,
 				50A50A8C29A09E1C00C01BE7 /* RequestTests.swift */,
@@ -1517,16 +1345,13 @@
 				4CB883A9297612FF00DC99E7 /* ZapTests.swift */,
 				4CB883AD2976FA9300DC99E7 /* FormatTests.swift */,
 				3A3040EC29A5CB86008A0F29 /* ReplyDescriptionTests.swift */,
+				3A3040EE29A8FEE9008A0F29 /* EventDetailBarTests.swift */,
 				5019CADC2A0FB0A9000069E1 /* ProfileDatabaseTests.swift */,
 				3A3040F229A91366008A0F29 /* ProfileViewTests.swift */,
 				3A30410029AB12AA008A0F29 /* EventGroupViewTests.swift */,
 				4C8D00D329E3C5D40036AF10 /* NIP19Tests.swift */,
 				501F8C812A0224EB001AFC1D /* KeychainStorageTests.swift */,
-				3A5E47C62A4A76C800C0D090 /* TrieTests.swift */,
+				3AFBF3FC29FDA7CC00E79C7C /* CustomZapViewTests.swift */,
-				3A90B1822A4EA3C600000D94 /* UserSearchCacheTests.swift */,
-				4C4F14A62A2A61A30045A0B9 /* NostrScriptTests.swift */,
-				4C19AE542A5D977400C90DB7 /* HashtagTests.swift */,
-				3AAC7A012A60FE72002B50DF /* LocalizationUtilTests.swift */,
 			);
 			path = damusTests;
 			sourceTree = "<group>";
@@ -1544,9 +1369,8 @@
 			isa = PBXGroup;
 			children = (
 				4CE8794729941DA700F758CC /* RelayFilters.swift */,
-				504323A82A3495B6006AE6DC /* RelayModelCache.swift */,
+				4CE8794B2995B59E00F758CC /* RelayMetadatas.swift */,
 				4CC6193929DC777C006A86D1 /* RelayBootstrap.swift */,
-				504323A62A34915F006AE6DC /* RelayModel.swift */,
 			);
 			path = Relays;
 			sourceTree = "<group>";
@@ -1565,7 +1389,6 @@
 				4CE879572996C45300F758CC /* ZapsView.swift */,
 				4C9F18E129AA9B6C008C55EC /* CustomizeZapView.swift */,
 				4CA3FA0F29F593D000FDB3C3 /* ZapTypePicker.swift */,
-				4C73C5132A4437C10062CAC0 /* ZapUserView.swift */,
 			);
 			path = Zaps;
 			sourceTree = "<group>";
@@ -1611,7 +1434,6 @@
 				4CFF8F6629CC9E3A008DB934 /* ImageView.swift */,
 				6439E013296790CF0020672B /* ProfilePicImageView.swift */,
 				4CFF8F6829CC9ED1008DB934 /* ImageContainerView.swift */,
-				4CFD502E2A2DA45800A229DB /* MediaView.swift */,
 			);
 			path = Images;
 			sourceTree = "<group>";
@@ -1719,7 +1541,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1330;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1330;
 				TargetAttributes = {
 					4CE6DEE227F7A08100C66700 = {
 						CreatedOnToolsVersion = 13.3;
@@ -1763,7 +1585,6 @@
 				"pt-PT",
 				ru,
 				"sv-SE",
-				sw,
 				"tr-TR",
 				uk,
 				vi,
@@ -1808,8 +1629,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4C0C039A2A61E27B0098B3B8 /* bool_setting.wasm in Resources */,
-				4C0C03992A61E27B0098B3B8 /* primal.wasm in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1836,19 +1655,16 @@
 				4C216F34286F5ACD00040376 /* DMView.swift in Sources */,
 				4C3EA64428FF558100C48A62 /* sha256.c in Sources */,
 				4CCF9AAF2A1FDBDB00E03CFB /* VideoPlayer.swift in Sources */,
-				504323A72A34915F006AE6DC /* RelayModel.swift in Sources */,
-				4CA9276A2A290FC00098A105 /* ContextButton.swift in Sources */,
 				4CF0ABF62985CD5500D66079 /* UserSearch.swift in Sources */,
 				4C363AA828297703006E126D /* InsertSort.swift in Sources */,
 				4C285C86283892E7008A31F1 /* CreateAccountModel.swift in Sources */,
 				4C64987C286D03E000EAE2B3 /* DirectMessagesView.swift in Sources */,
 				7C902AE32981D55B002AB16E /* ZoomableScrollView.swift in Sources */,
-				4C190F252A547D2000027FD5 /* LoadScript.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 */,
-				4C190F202A535FC200027FD5 /* CustomizeZapModel.swift in Sources */,
 				4C75EFB728049D990006080F /* RelayPool.swift in Sources */,
 				F757933A29D7AECD007DEAC1 /* ImagePicker.swift in Sources */,
 				4CF0ABEE29844B5500D66079 /* AnyEncodable.swift in Sources */,
@@ -1856,30 +1672,24 @@
 				4C3EA67728FF7A9800C48A62 /* talstr.c in Sources */,
 				4CE6DEE927F7A08100C66700 /* ContentView.swift in Sources */,
 				4CEE2AF5280B29E600AB5EEF /* TimeAgo.swift in Sources */,
-				4CA9275D2A28FF630098A105 /* LongformView.swift in Sources */,
 				4C75EFAD28049CFB0006080F /* PostButton.swift in Sources */,
-				504323A92A3495B6006AE6DC /* RelayModelCache.swift in Sources */,
 				3A8CC6CC2A2CFEF900940F5F /* StringUtil.swift in Sources */,
 				4CB55EF5295E679D007FD187 /* UserRelaysView.swift in Sources */,
 				4C363AA228296A7E006E126D /* SearchView.swift in Sources */,
 				4CC7AAED297F0B9E00430951 /* Highlight.swift in Sources */,
-				4CA927652A290F1A0098A105 /* TimeDot.swift in Sources */,
 				4CC6193A29DC777C006A86D1 /* RelayBootstrap.swift in Sources */,
 				4C285C8A2838B985008A31F1 /* ProfilePictureSelector.swift in Sources */,
-				4CFD502F2A2DA45800A229DB /* MediaView.swift in Sources */,
 				4C9F18E429ABDE6D008C55EC /* MaybeAnonPfpView.swift in Sources */,
 				4CA5588329F33F5B00DC6A45 /* StringCodable.swift in Sources */,
 				4C75EFB92804A2740006080F /* EventView.swift in Sources */,
 				4C8D00C829DF791C0036AF10 /* CompatibleAttribute.swift in Sources */,
 				4C7D09742A0AEF9000943473 /* AlbyGradient.swift in Sources */,
-				4C687C272A6039500092C550 /* TestData.swift in Sources */,
 				3AA247FD297E3CFF0090C62D /* RepostsModel.swift in Sources */,
 				4C198DF229F88C6B004C165C /* BlurHashDecode.swift in Sources */,
 				F75BA12F29A18EF500E10810 /* BookmarksView.swift in Sources */,
 				4CB883B6297730E400DC99E7 /* LNUrls.swift in Sources */,
 				4C7FF7D52823313F009601DB /* Mentions.swift in Sources */,
 				4C633350283D40E500B1C9C3 /* HomeModel.swift in Sources */,
-				3AAC7A042A626A75002B50DF /* CarouselDotsView.swift in Sources */,
 				4C987B57283FD07F0042CE38 /* FollowersModel.swift in Sources */,
 				3AB72AB9298ECF30004BB58C /* Translator.swift in Sources */,
 				4C363A9028247A1D006E126D /* NostrLink.swift in Sources */,
@@ -1888,14 +1698,13 @@
 				F7F0BA272978E54D009531F3 /* ParticipantsView.swift in Sources */,
 				4CF0ABE32981BC7D00D66079 /* UserView.swift in Sources */,
 				4CE0E2AF29A2E82100DB4CA2 /* EventHolder.swift in Sources */,
+				4CE0E2B229A3DF6900DB4CA2 /* LoadMoreButton.swift in Sources */,
 				4CF0ABF029857E9200D66079 /* Bech32Object.swift in Sources */,
 				4C3D52B8298DB5C6001C5831 /* TextEvent.swift in Sources */,
 				4C216F362870A9A700040376 /* InputDismissKeyboard.swift in Sources */,
 				4C8D1A6F29F31E5000ACDF75 /* FriendsButton.swift in Sources */,
-				3A5E47C52A4A6CF400C0D090 /* Trie.swift in Sources */,
 				4C216F382871EDE300040376 /* DirectMessageModel.swift in Sources */,
 				4C75EFA627FF87A20006080F /* Nostr.swift in Sources */,
-				4CA927672A290F8B0098A105 /* RelativeTime.swift in Sources */,
 				4CB883A62975F83C00DC99E7 /* LNUrlPayRequest.swift in Sources */,
 				4C7D096D2A0AEA0400943473 /* CodeScanner.swift in Sources */,
 				4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */,
@@ -1915,7 +1724,6 @@
 				4C363A9A28283854006E126D /* Reply.swift in Sources */,
 				BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */,
 				4CFF8F6729CC9E3A008DB934 /* ImageView.swift in Sources */,
-				4CA927632A290EB10098A105 /* EventTop.swift in Sources */,
 				4C90BD18283A9EE5008EE7EF /* LoginView.swift in Sources */,
 				4CB8838B296F6E1E00DC99E7 /* NIP05Badge.swift in Sources */,
 				4CA3FA1029F593D000FDB3C3 /* ZapTypePicker.swift in Sources */,
@@ -1958,7 +1766,6 @@
 				3169CAE6294E69C000EE4006 /* EmptyTimelineView.swift in Sources */,
 				4CC7AAF0297F11C700430951 /* SelectedEventView.swift in Sources */,
 				4CC7AAF8297F1CEE00430951 /* EventProfile.swift in Sources */,
-				4C687C242A5FA86D0092C550 /* SearchHeaderView.swift in Sources */,
 				64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */,
 				4C1A9A2329DDDB8100516EAC /* IconLabel.swift in Sources */,
 				4C3EA64928FF597700C48A62 /* bech32.c in Sources */,
@@ -1991,15 +1798,12 @@
 				4C363A8828236948006E126D /* BlocksView.swift in Sources */,
 				4C06670628FCB08600038D2A /* ImageCarousel.swift in Sources */,
 				3A23838E2A297DD200E5AA2E /* ZapButtonModel.swift in Sources */,
-				5053ACA72A56DF3B00851AE3 /* DeveloperSettingsView.swift in Sources */,
+				F79C7FAD29D5E9620000F946 /* EditProfilePictureControl.swift in Sources */,
-				F79C7FAD29D5E9620000F946 /* EditPictureControl.swift in Sources */,
 				4C9F18E229AA9B6C008C55EC /* CustomizeZapView.swift in Sources */,
 				4C2859602A12A2BE004746F7 /* SupporterBadge.swift in Sources */,
 				4C1A9A2A29DDF54400516EAC /* DamusVideoPlayer.swift in Sources */,
-				4C9146FD2A2A87C200DDEA40 /* wasm.c in Sources */,
 				4C75EFAF28049D350006080F /* NostrFilter.swift in Sources */,
 				4C3EA64C28FF59AC00C48A62 /* bech32_util.c in Sources */,
-				4CA9276C2A2910D10098A105 /* ReplyPart.swift in Sources */,
 				4CE1399029F0661A00AC6A0B /* RepostAction.swift in Sources */,
 				4CE1399229F0666100AC6A0B /* ShareActionButton.swift in Sources */,
 				4C42812C298C848200DBF26F /* TranslateView.swift in Sources */,
@@ -2016,7 +1820,6 @@
 				50088DA129E8271A008A1FDF /* WebSocket.swift in Sources */,
 				4C3EA64128FF553900C48A62 /* hash_u5.c in Sources */,
 				5C513FCC2984ACA60072348F /* QRCodeView.swift in Sources */,
-				4C19AE512A5CEF7C00C90DB7 /* NostrScript.swift in Sources */,
 				4C3EA64F28FF59F200C48A62 /* tal.c in Sources */,
 				4CB88393296F798300DC99E7 /* ReactionsModel.swift in Sources */,
 				5C42E78C29DB76D90086AAC1 /* EmptyUserSearchView.swift in Sources */,
@@ -2033,9 +1836,6 @@
 				4C30AC8029A6A53F00E2BD5A /* ProfilePicturesView.swift in Sources */,
 				5C6E1DAD2A193EC2008FC15A /* GradientButtonStyle.swift in Sources */,
 				4C8EC52529D1FA6C0085D9A8 /* DamusColors.swift in Sources */,
-				3A4647CF2A413ADC00386AD8 /* CondensedProfilePicturesView.swift in Sources */,
-				D2277EEA2A089BD5006C3807 /* Router.swift in Sources */,
-				3A90B1812A4EA3AF00000D94 /* UserSearchCache.swift in Sources */,
 				4C5C7E6A284EDE2E00A22DF5 /* SearchResultsView.swift in Sources */,
 				4CE1399429F0669900AC6A0B /* BigButton.swift in Sources */,
 				7C60CAEF298471A1009C80D6 /* CoreSVG.swift in Sources */,
@@ -2044,7 +1844,6 @@
 				4CDA128C29EB19C40006FA5A /* LocalNotification.swift in Sources */,
 				4C3BEFD6281D995700B3DE84 /* ActionBarModel.swift in Sources */,
 				4C7D09762A0AF19E00943473 /* FillAndStroke.swift in Sources */,
-				4CA927612A290E340098A105 /* EventShell.swift in Sources */,
 				4C363AA428296DEE006E126D /* SearchModel.swift in Sources */,
 				4C8D00CC29DF92DF0036AF10 /* Hashtags.swift in Sources */,
 				4C7D096F2A0AEA0400943473 /* ScannerViewController.swift in Sources */,
@@ -2054,10 +1853,8 @@
 				4C8D00CF29E38B950036AF10 /* nostr_bech32.c in Sources */,
 				4C3BEFD42819DE8F00B3DE84 /* NostrKind.swift in Sources */,
 				4C3EA66028FF5E7700C48A62 /* node_id.c in Sources */,
-				4C687C212A5F7ED00092C550 /* DamusBackground.swift in Sources */,
 				4CE6DEE727F7A08100C66700 /* damusApp.swift in Sources */,
 				4C363A962827096D006E126D /* PostBlock.swift in Sources */,
-				4CA9275F2A2902B20098A105 /* LongformPreview.swift in Sources */,
 				4C5F9116283D855D0052CD1C /* EventsModel.swift in Sources */,
 				4CEE2AED2805B22500AB5EEF /* NostrRequest.swift in Sources */,
 				4C06670E28FDEAA000038D2A /* utf8.c in Sources */,
@@ -2067,7 +1864,6 @@
 				4C363A922825FCF2006E126D /* ProfileUpdate.swift in Sources */,
 				4CB9D4A92992D2F400A9A7E4 /* FollowsYou.swift in Sources */,
 				4C3BEFDA281DCA1400B3DE84 /* LikeCounter.swift in Sources */,
-				50A60D142A28BEEE00186190 /* RelayLog.swift in Sources */,
 				4CB88389296AF99A00DC99E7 /* EventDetailBar.swift in Sources */,
 				4CE8794E2996B16A00F758CC /* RelayToggle.swift in Sources */,
 				4C3AC79B28306D7B00E1F516 /* Contacts.swift in Sources */,
@@ -2079,7 +1875,6 @@
 				4CB55EF3295E5D59007FD187 /* RecommendedRelayView.swift in Sources */,
 				4CE4F0F229D4FCFA005914DB /* DebouncedOnChange.swift in Sources */,
 				4CF0ABEC29844B4700D66079 /* AnyDecodable.swift in Sources */,
-				4C9146FE2A2A87C200DDEA40 /* nostrscript.c in Sources */,
 				4C5F9118283D88E40052CD1C /* FollowingModel.swift in Sources */,
 				4C1A9A1A29DCA17E00516EAC /* ReplyCounter.swift in Sources */,
 				50B5685329F97CB400A23243 /* CredentialHandler.swift in Sources */,
@@ -2088,12 +1883,10 @@
 				4C363A8E28236FE4006E126D /* NoteContentView.swift in Sources */,
 				4C90BD1A283AA67F008EE7EF /* Bech32.swift in Sources */,
 				E990020F2955F837003BBC5A /* EditMetadataView.swift in Sources */,
-				4CB8FC232A41ABA800763C51 /* AboutView.swift in Sources */,
 				5C513FBA297F72980072348F /* CustomPicker.swift in Sources */,
 				4CACA9D5280C31E100D9BBE8 /* ReplyView.swift in Sources */,
 				F7908E92298B0F0700AB113A /* RelayDetailView.swift in Sources */,
 				4C3A1D332960DB0500558C0F /* Markdown.swift in Sources */,
-				4C9147002A2A891E00DDEA40 /* error.c in Sources */,
 				4CE879552996BAB900F758CC /* RelayPaidDetail.swift in Sources */,
 				501F8C5529FF5EF6001AFC1D /* PersistedProfile.swift in Sources */,
 				4CF0ABD42980996B00D66079 /* Report.swift in Sources */,
@@ -2104,12 +1897,11 @@
 				4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */,
 				3AA247FF297E3D900090C62D /* RepostsView.swift in Sources */,
 				3AE45AF6297BB2E700C1D842 /* LibreTranslateServer.swift in Sources */,
-				4CE879502996B2BD00F758CC /* RelayStatusView.swift in Sources */,
+				4CE879502996B2BD00F758CC /* RelayStatus.swift in Sources */,
 				4CC7AAF4297F18B400430951 /* ReplyDescription.swift in Sources */,
 				4C75EFA427FA577B0006080F /* PostView.swift in Sources */,
 				4C30AC7229A5677A00E2BD5A /* NotificationsView.swift in Sources */,
 				4C1A9A2129DDD3E100516EAC /* KeySettingsView.swift in Sources */,
-				4C73C5142A4437C10062CAC0 /* ZapUserView.swift in Sources */,
 				501F8C802A0220E1001AFC1D /* KeychainStorage.swift in Sources */,
 				4C1A9A1D29DDCF9B00516EAC /* NotificationSettingsView.swift in Sources */,
 				4C75EFB528049D790006080F /* Relay.swift in Sources */,
@@ -2121,7 +1913,6 @@
 				4C1A9A1F29DDD24B00516EAC /* AppearanceSettingsView.swift in Sources */,
 				3AA59D1D2999B0400061C48E /* DraftsModel.swift in Sources */,
 				3169CAED294FCCFC00EE4006 /* Constants.swift in Sources */,
-				4C9AA14A2A4587A6003F49FD /* NotificationStatusModel.swift in Sources */,
 				4CB9D4A72992D02B00A9A7E4 /* ProfileNameView.swift in Sources */,
 				4CE4F0F429D779B5005914DB /* PostBox.swift in Sources */,
 				4C2859622A12A7F0004746F7 /* GoldSupportGradient.swift in Sources */,
@@ -2133,23 +1924,20 @@
 			buildActionMask = 2147483647;
 			files = (
 				5019CADD2A0FB0A9000069E1 /* ProfileDatabaseTests.swift in Sources */,
-				3A90B1832A4EA3C600000D94 /* UserSearchCacheTests.swift in Sources */,
-				4C19AE552A5D977400C90DB7 /* HashtagTests.swift in Sources */,
 				3A3040ED29A5CB86008A0F29 /* ReplyDescriptionTests.swift in Sources */,
-				3AAC7A022A60FE72002B50DF /* LocalizationUtilTests.swift in Sources */,
 				4C8D00D429E3C5D40036AF10 /* NIP19Tests.swift in Sources */,
 				3A30410129AB12AA008A0F29 /* EventGroupViewTests.swift in Sources */,
 				501F8C822A0224EB001AFC1D /* KeychainStorageTests.swift in Sources */,
+				3AFBF3FD29FDA7CC00E79C7C /* CustomZapViewTests.swift in Sources */,
 				3ACBCB78295FE5C70037388A /* TimeAgoTests.swift in Sources */,
 				DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */,
-				4C4F14A72A2A61A30045A0B9 /* NostrScriptTests.swift in Sources */,
+				3A3040EF29A8FEE9008A0F29 /* EventDetailBarTests.swift in Sources */,
 				4C3EA67B28FF7B3900C48A62 /* InvoiceTests.swift in Sources */,
 				4C363A9E2828A822006E126D /* ReplyTests.swift in Sources */,
 				4C7D097E2A0C58B900943473 /* WalletConnectTests.swift in Sources */,
 				4CB883AA297612FF00DC99E7 /* ZapTests.swift in Sources */,
 				4CB8839A297322D200DC99E7 /* DMTests.swift in Sources */,
 				F944F56E29EA9CCC0067B3BF /* DamusParseContentTests.swift in Sources */,
-				3A5E47C72A4A76C800C0D090 /* TrieTests.swift in Sources */,
 				4CB883AE2976FA9300DC99E7 /* FormatTests.swift in Sources */,
 				4C363AA02828A8DD006E126D /* LikeTests.swift in Sources */,
 				4C90BD1C283AC38E008EE7EF /* Bech32Tests.swift in Sources */,
@@ -2216,7 +2004,6 @@
 				3A325AC929C9E0CF002BE7ED /* es-ES */,
 				3AC59CA929CDDB78007E04A6 /* pt-BR */,
 				3A821C4029E819D500B4BCA7 /* fr */,
-				3ABACEC02A5B3ED10037A847 /* sw */,
 			);
 			name = Localizable.stringsdict;
 			sourceTree = "<group>";
@@ -2251,7 +2038,6 @@
 				3A325AC829C9E0CF002BE7ED /* es-ES */,
 				3AC59CA829CDDB78007E04A6 /* pt-BR */,
 				3A821C3F29E819D500B4BCA7 /* fr */,
-				3ABACEBF2A5B3ED10037A847 /* sw */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -2287,7 +2073,6 @@
 				3A325AC729C9E0CF002BE7ED /* es-ES */,
 				3AC59CA729CDDB78007E04A6 /* pt-BR */,
 				3A821C3E29E819D500B4BCA7 /* fr */,
-				3ABACEC12A5B3ED10037A847 /* sw */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -2332,7 +2117,6 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -2396,7 +2180,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -2425,7 +2208,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -2443,7 +2226,6 @@
 				INFOPLIST_KEY_UILaunchStoryboardName = Launch.storyboard;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2452,7 +2234,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.6;
+				MARKETING_VERSION = 1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -2474,7 +2256,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -2492,7 +2274,6 @@
 				INFOPLIST_KEY_UILaunchStoryboardName = Launch.storyboard;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2501,7 +2282,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.6;
+				MARKETING_VERSION = 1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -2523,7 +2304,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				GENERATE_INFOPLIST_FILE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.3;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damusTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2543,7 +2324,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				GENERATE_INFOPLIST_FILE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.3;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damusTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";

damus.xcodeproj/xcshareddata/xcschemes/Release.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1420"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

damus.xcodeproj/xcshareddata/xcschemes/damus.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1420"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

damus/Components/CarouselDotsView.swift

@@ -1,65 +0,0 @@
-//
-//  CarouselDotsView.swift
-//  damus
-//
-//  Created by Terry Yiu on 7/15/23.
-//
-
-import SwiftUI
-
-struct CarouselDotsView: View {
-    let maxCount: Int
-    let maxVisibleCount: Int
-    @Binding var selectedIndex: Int
-
-    var body: some View {
-        if maxCount > 1 {
-            HStack {
-                let visibleRange = visibleRange()
-                ForEach(0 ..< maxCount, id: \.self) { index in
-                    if visibleRange.contains(index) {
-                        Circle()
-                            .fill(index == selectedIndex ? Color("DamusPurple") : Color("DamusLightGrey"))
-                            .frame(width: 10, height: 10)
-                            .onTapGesture {
-                                selectedIndex = index
-                            }
-                    }
-                }
-            }
-            .padding(.top, CGFloat(8))
-            .id(UUID())
-        }
-    }
-
-    private func visibleRange() -> ClosedRange<Int> {
-        let visibleCount = min(maxCount, maxVisibleCount)
-
-        let half = Int(visibleCount / 2)
-
-        // Keep the selected dot in the middle of the visible dots when possible.
-        var minVisibleIndex: Int
-        var maxVisibleIndex: Int
-
-        if visibleCount % 2 == 0 {
-            minVisibleIndex = max(0, selectedIndex - half)
-            maxVisibleIndex = min(maxCount - 1, selectedIndex + half - 1)
-        } else {
-            minVisibleIndex = max(0, selectedIndex - half)
-            maxVisibleIndex = min(maxCount - 1, selectedIndex + half)
-        }
-
-        // Adjust min and max to be within the bounds of what is visibly allowed.
-        if (maxVisibleIndex - minVisibleIndex + 1) < visibleCount {
-            if minVisibleIndex == 0 {
-                maxVisibleIndex = visibleCount - 1
-            } else if maxVisibleIndex == maxCount - 1 {
-                minVisibleIndex = maxVisibleIndex - visibleCount + 1
-            }
-        } else if (maxVisibleIndex - minVisibleIndex + 1) > visibleCount {
-            minVisibleIndex = maxVisibleIndex - maxVisibleCount + 1
-        }
-
-        return minVisibleIndex...maxVisibleIndex
-    }
-}

damus/Components/GradientButtonStyle.swift

@@ -8,19 +8,13 @@
 import SwiftUI
 
 struct GradientButtonStyle: ButtonStyle {
-    let padding: CGFloat
-
-    init(padding: CGFloat = 16.0) {
-        self.padding = padding
-    }
-
     func makeBody(configuration: Self.Configuration) -> some View {
         return configuration.label
-            .padding(padding)
+            .padding()
             .foregroundColor(Color.white)
             .background {
                 RoundedRectangle(cornerRadius: 12)
-                    .fill(PinkGradient)
+                    .fill(PinkGradient.gradient)
             }
             .scaleEffect(configuration.isPressed ? 0.8 : 1)
     }
@@ -30,11 +24,9 @@ struct GradientButtonStyle: ButtonStyle {
 struct GradientButtonStyle_Previews: PreviewProvider {
     static var previews: some View {
         VStack {
-            Button(action: {
+            Button("Dynamic Size", action: {
                 print("dynamic size")
-            }) {
+            })
-                Text(verbatim: "Dynamic Size")
-            }
             .buttonStyle(GradientButtonStyle())
             
             
@@ -42,7 +34,7 @@ struct GradientButtonStyle_Previews: PreviewProvider {
                 print("infinite width")
             }) {
                 HStack {
-                    Text(verbatim: "Infinite Width")
+                    Text("Infinite Width")
                 }
                 .frame(minWidth: 300, maxWidth: .infinity, alignment: .center)
             }

damus/Components/Gradients/DamusBackground.swift

@@ -1,30 +0,0 @@
-//
-//  DamusBackground.swift
-//  damus
-//
-//  Created by William Casarin on 2023-07-12.
-//
-
-import Foundation
-import SwiftUI
-
-struct DamusBackground: View {
-    let maxHeight: CGFloat
-
-    init(maxHeight: CGFloat = 250.0) {
-        self.maxHeight = maxHeight
-    }
-
-    var body: some View {
-        Image("login-header")
-            .resizable()
-            .frame(maxWidth: .infinity, maxHeight: maxHeight, alignment: .center)
-            .ignoresSafeArea()
-    }
-}
-
-struct DamusBackground_Previews: PreviewProvider {
-    static var previews: some View {
-        DamusBackground()
-    }
-}

damus/Components/Gradients/PinkGradient.swift

@@ -11,18 +11,20 @@ fileprivate let damus_grad_c1 = hex_col(r: 0xd3, g: 0x4c, b: 0xd9)
 fileprivate let damus_grad_c2 = hex_col(r: 0xf8, g: 0x69, b: 0xb6)
 fileprivate let pink_grad = [damus_grad_c1, damus_grad_c2]
 
-let PinkGradient = LinearGradient(colors: pink_grad, startPoint: .topTrailing, endPoint: .bottom)
+struct PinkGradient: View {
-
-struct PinkGradientView: View {
     var body: some View {
-        PinkGradient
+        PinkGradient.gradient
             .edgesIgnoringSafeArea([.top,.bottom])
     }
-}
     
-struct PinkGradientView_Previews: PreviewProvider {
+    static var gradient: LinearGradient {
-    static var previews: some View {
+         LinearGradient(colors: pink_grad, startPoint: .topTrailing, endPoint: .bottom)
-        PinkGradientView()
+    }
+}
+
+struct PinkGradient_Previews: PreviewProvider {
+    static var previews: some View {
+        PinkGradient()
     }
 }
 

damus/Components/ImageCarousel.swift

@@ -53,7 +53,6 @@ enum ImageShape {
 }
 
 // MARK: - Image Carousel
-@MainActor
 struct ImageCarousel: View {
     var urls: [MediaUrl]
     
@@ -209,9 +208,30 @@ struct ImageCarousel: View {
                 .onTapGesture { }
             
             // This is our custom carousel image indicator
-            // A maximum of 18 should be visible. Any more than that and it starts to push the frame of the parent view
+            CarouselDotsView(urls: urls, selectedIndex: $selectedIndex)
-            // causing adjacent views to disort in dimensions.
+        }
-            CarouselDotsView(maxCount: urls.count, maxVisibleCount: 18, selectedIndex: $selectedIndex)
+    }
+}
+
+// MARK: - Custom Carousel
+struct CarouselDotsView<T>: View {
+    let urls: [T]
+    @Binding var selectedIndex: Int
+
+    var body: some View {
+        if urls.count > 1 {
+            HStack {
+                ForEach(urls.indices, id: \.self) { index in
+                    Circle()
+                        .fill(index == selectedIndex ? Color("DamusPurple") : Color("DamusLightGrey"))
+                        .frame(width: 10, height: 10)
+                        .onTapGesture {
+                            selectedIndex = index
+                        }
+                }
+            }
+            .padding(.top, CGFloat(8))
+            .id(UUID())
         }
     }
 }

damus/Components/InvoiceView.swift

@@ -37,7 +37,7 @@ struct InvoiceView: View {
     var PayButton: some View {
         Button {
             if settings.show_wallet_selector {
-                present_sheet(.select_wallet(invoice: invoice.string))
+                showing_select_wallet = true
             } else {
                 open_with_wallet(wallet: settings.default_wallet.model, invoice: invoice.string)
             }
@@ -79,6 +79,9 @@ struct InvoiceView: View {
             }
             .padding(30)
         }
+        .sheet(isPresented: $showing_select_wallet, onDismiss: {showing_select_wallet = false}) {
+            SelectWalletView(default_wallet: settings.default_wallet, showingSelectWallet: $showing_select_wallet, our_pubkey: our_pubkey, invoice: invoice.string)
+        }
     }
 }
 
@@ -113,7 +116,3 @@ struct InvoiceView_Previews: PreviewProvider {
     }
 }
 
-
-func present_sheet(_ sheet: Sheets) {
-    notify(.present_sheet, sheet)
-}

damus/Components/NIP05Badge.swift

@@ -32,13 +32,12 @@ struct NIP05Badge: View {
         Group {
             if nip05_color {
                 LINEAR_GRADIENT
-                    .mask(Image("verified.fill")
+                    .mask(Image("check-circle.fill")
                         .resizable()
-                    ).frame(width: 18, height: 18)
+                    ).frame(width: 14, height: 14)
             } else if show_domain {
-                Image("verified")
+                Image("check-circle.fill")
-                    .resizable()
+                    .font(.footnote)
-                    .frame(width: 18, height: 18)
                     .nip05_colorized(gradient: nip05_color)
             }
         }
@@ -85,11 +84,7 @@ func use_nip05_color(pubkey: String, contacts: Contacts) -> Bool {
 struct NIP05Badge_Previews: PreviewProvider {
     static var previews: some View {
         let test_state = test_damus_state()
-        VStack {
         NIP05Badge(nip05: NIP05(username: "jb55", host: "jb55.com"), pubkey: test_state.pubkey, contacts: test_state.contacts, show_domain: true, clickable: false)
-
-            NIP05Badge(nip05: NIP05(username: "jb55", host: "jb55.com"), pubkey: test_state.pubkey, contacts: Contacts(our_pubkey: "sdkfjsdf"), show_domain: true, clickable: false)
-        }
     }
 }
 

damus/Components/Reposted.swift

@@ -18,7 +18,7 @@ struct Reposted: View {
                 .foregroundColor(Color.gray)
             ProfileName(pubkey: pubkey, profile: profile, damus: damus, show_nip5_domain: false)
                     .foregroundColor(Color.gray)
-            Text("Reposted", comment: "Text indicating that the note was reposted (i.e. re-shared).")
+            Text("Reposted", comment: "Text indicating that the post was reposted (i.e. re-shared).")
                 .foregroundColor(Color.gray)
         }
     }

damus/Components/Search/SearchHeaderView.swift

@@ -1,129 +0,0 @@
-//
-//  SearchIconView.swift
-//  damus
-//
-//  Created by William Casarin on 2023-07-12.
-//
-
-import SwiftUI
-
-struct SearchHeaderView: View {
-    let state: DamusState
-    let described: DescribedSearch
-    @State var is_following: Bool
-
-    init(state: DamusState, described: DescribedSearch) {
-        self.state = state
-        self.described = described
-
-        let is_following = (described.is_hashtag.map {
-            ht in is_following_hashtag(contacts: state.contacts.event, hashtag: ht)
-        }) ?? false
-
-        self._is_following = State(wrappedValue: is_following)
-    }
-
-    var Icon: some View {
-        ZStack {
-            Circle()
-                .fill(Color(red: 0xF8/255.0, green: 0xE7/255.0, blue: 0xF8/255.0))
-                .frame(width: 54, height: 54)
-
-            switch described {
-            case .hashtag:
-                Text(verbatim: "#")
-                    .font(.largeTitle.bold())
-                    .foregroundStyle(PinkGradient)
-                    .mask(Text(verbatim: "#")
-                        .font(.largeTitle.bold()))
-
-            case .unknown:
-                Image(systemName: "magnifyingglass")
-                    .font(.title.bold())
-                    .foregroundStyle(PinkGradient)
-            }
-        }
-    }
-
-    var SearchText: Text {
-        Text(described.description)
-    }
-
-    func unfollow(_ hashtag: String) {
-        is_following = false
-        handle_unfollow(state: state, unfollow: .t(hashtag))
-    }
-
-    func follow(_ hashtag: String) {
-        is_following = true
-        handle_follow(state: state, follow: .t(hashtag))
-    }
-
-    func FollowButton(_ ht: String) -> some View {
-        return Button(action: { follow(ht) }) {
-            Text("Follow hashtag", comment: "Button to follow a given hashtag.")
-                .font(.footnote.bold())
-        }
-        .buttonStyle(GradientButtonStyle(padding: 10))
-    }
-
-    func UnfollowButton(_ ht: String) -> some View {
-        return Button(action: { unfollow(ht) }) {
-            Text("Unfollow hashtag", comment: "Button to unfollow a given hashtag.")
-                .font(.footnote.bold())
-        }
-        .buttonStyle(GradientButtonStyle(padding: 10))
-    }
-
-    var body: some View {
-        HStack(alignment: .center, spacing: 30) {
-            Icon
-
-            VStack(alignment: .leading, spacing: 10.0) {
-                SearchText
-                    .foregroundStyle(DamusLogoGradient.gradient)
-                    .font(.title.bold())
-
-                if state.is_privkey_user, case .hashtag(let ht) = described {
-                    if is_following {
-                        UnfollowButton(ht)
-                    } else {
-                        FollowButton(ht)
-                    }
-                }
-            }
-        }
-        .onReceive(handle_notify(.followed)) { notif in
-            let ref = notif.object as! ReferencedId
-            guard hashtag_matches_search(desc: self.described, ref: ref) else { return }
-            self.is_following = true
-        }
-        .onReceive(handle_notify(.unfollowed)) { notif in
-            let ref = notif.object as! ReferencedId
-            guard hashtag_matches_search(desc: self.described, ref: ref) else { return }
-            self.is_following = false
-        }
-    }
-}
-
-func hashtag_matches_search(desc: DescribedSearch, ref: ReferencedId) -> Bool {
-    guard let ht = desc.is_hashtag, ref.key == "t" && ref.ref_id == ht
-    else { return false }
-    return true
-}
-
-func is_following_hashtag(contacts: NostrEvent?, hashtag: String) -> Bool {
-    guard let contacts else { return false }
-    return is_already_following(contacts: contacts, follow: .t(hashtag))
-}
-
-
-struct SearchHeaderView_Previews: PreviewProvider {
-    static var previews: some View {
-        VStack(alignment: .leading) {
-            SearchHeaderView(state: test_damus_state(), described: .hashtag("damus"))
-
-            SearchHeaderView(state: test_damus_state(), described: .unknown)
-        }
-    }
-}

damus/Components/TranslateView.swift

@@ -10,7 +10,7 @@ import NaturalLanguage
 
 
 struct Translated: Equatable {
-    let artifacts: NoteArtifactsSeparated
+    let artifacts: NoteArtifacts
     let language: String
 }
 
@@ -42,10 +42,9 @@ struct TranslateView: View {
         .translate_button_style()
     }
     
-    func TranslatedView(lang: String?, artifacts: NoteArtifactsSeparated) -> some View {
+    func TranslatedView(lang: String?, artifacts: NoteArtifacts) -> some View {
         return VStack(alignment: .leading) {
-            let translatedFromLanguageString = String(format: NSLocalizedString("Translated from %@", comment: "Button to indicate that the note has been translated from a different language."), lang ?? "ja")
+            Text(String(format: NSLocalizedString("Translated from %@", comment: "Button to indicate that the note has been translated from a different language."), lang ?? "ja"))
-            Text(translatedFromLanguageString)
                 .foregroundColor(.gray)
                 .font(.footnote)
                 .padding([.top, .bottom], 10)

damus/Components/UserView.swift

@@ -11,27 +11,30 @@ 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(.clear)
+            .background(
+                NavigationLink(destination: dest, isActive: $navigating) {
+                    EmptyView()
+                }
+            )
+            .onTapGesture {
+                navigating = true
+            }
     }
 }
 
 struct UserView: View {
     let damus_state: DamusState
     let pubkey: String
-    let spacer: Bool
-    
-    @State var about_text: Text? = nil
-    
-    init(damus_state: DamusState, pubkey: String, spacer: Bool = true) {
-        self.damus_state = damus_state
-        self.pubkey = pubkey
-        self.spacer = spacer
-    }
     
     var body: some View {
+        
         VStack {
             HStack {
                 ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles, disable_animation: damus_state.settings.disable_animation)
@@ -39,19 +42,19 @@ struct UserView: View {
                 VStack(alignment: .leading) {
                     let profile = damus_state.profiles.lookup(id: pubkey)
                     ProfileName(pubkey: pubkey, profile: profile, damus: damus_state, show_nip5_domain: false)
-                    if let about_text {
+                    if let about = profile?.about {
-                        about_text
+                        let blocks = parse_mentions(content: about, tags: [])
+                        let about_string = render_blocks(blocks: blocks, profiles: damus_state.profiles).content.attributed
+                        Text(about_string)
                             .lineLimit(3)
                             .font(.footnote)
                     }
                 }
                 
-                if spacer {
                 Spacer()
             }
         }
     }
-    }
 }
 
 struct UserView_Previews: PreviewProvider {

damus/Components/ZapButton.swift

@@ -32,9 +32,10 @@ struct ZapButton: View {
     let lnurl: String
     
     @ObservedObject var zaps: ZapsDataModel
+    @StateObject var button: ZapButtonModel = ZapButtonModel()
     
     var our_zap: Zapping? {
-        zaps.zaps.first(where: { z in z.request.ev.pubkey == damus_state.pubkey })
+        zaps.zaps.first(where: { z in z.request.pubkey == damus_state.pubkey })
     }
     
     var zap_img: String {
@@ -55,6 +56,13 @@ struct ZapButton: View {
         
         // always orange !
         return Color.orange
+            /*
+        if our_zap.is_paid {
+            return Color.orange
+        } else {
+            return Color.yellow
+        }
+             */
     }
     
     func tap() {
@@ -106,7 +114,6 @@ struct ZapButton: View {
     
     var body: some View {
         HStack(spacing: 4) {
-            if !damus_state.settings.nozaps || zaps.zap_total > 0 {
             Button(action: {
             }, label: {
                 Image(zap_img)
@@ -116,7 +123,6 @@ struct ZapButton: View {
                     .aspectRatio(contentMode: .fit)
                     .frame(width:20, height: 20)
             })
-            }
 
             if zaps.zap_total > 0 {
                 Text(verbatim: format_msats_abbrev(zaps.zap_total))
@@ -126,15 +132,43 @@ struct ZapButton: View {
         }
         .accessibilityLabel(NSLocalizedString("Zap", comment: "Accessibility label for zap button"))
         .simultaneousGesture(LongPressGesture().onEnded {_  in
-            guard !damus_state.settings.nozaps else { return }
+            button.showing_zap_customizer = true
-            
-            present_sheet(.zap(target: target, lnurl: lnurl))
         })
         .highPriorityGesture(TapGesture().onEnded {
-            guard !damus_state.settings.nozaps else { return }
-            
             tap()
         })
+        .sheet(isPresented: $button.showing_zap_customizer) {
+            CustomizeZapView(state: damus_state, target: target, lnurl: lnurl)
+        }
+        .sheet(isPresented: $button.showing_select_wallet, onDismiss: {button.showing_select_wallet = false}) {
+            SelectWalletView(default_wallet: damus_state.settings.default_wallet, showingSelectWallet: $button.showing_select_wallet, our_pubkey: damus_state.pubkey, invoice: button.invoice ?? "")
+        }
+        .onReceive(handle_notify(.zapping)) { notif in
+            let zap_ev = notif.object as! ZappingEvent
+            
+            guard zap_ev.target.id == self.target.id else {
+                return
+            }
+            
+            guard !zap_ev.is_custom else {
+                return
+            }
+            
+            switch zap_ev.type {
+            case .failed:
+                break
+            case .got_zap_invoice(let inv):
+                if damus_state.settings.show_wallet_selector {
+                    self.button.invoice = inv
+                    self.button.showing_select_wallet = true
+                } else {
+                    let wallet = damus_state.settings.default_wallet.model
+                    open_with_wallet(wallet: wallet, invoice: inv)
+                }
+            case .sent_from_nwc:
+                break
+            }
+        }
     }
 }
 
@@ -228,21 +262,17 @@ func send_zap(damus_state: DamusState, target: ZapTarget, lnurl: String, is_cust
                 }
                 
                 var flusher: OnFlush? = nil
-                
+                // Don't donate on custom zaps
-                // donations are only enabled on one-tap zaps and off appstore
+                if !is_custom && damus_state.settings.donation_percent > 0 {
-                if !damus_state.settings.nozaps && !is_custom && damus_state.settings.donation_percent > 0 {
                     flusher = .once({ pe in
                         // send donation zap when the pending zap is flushed, this allows user to cancel and not send a donation
-                        Task { @MainActor in
+                        Task.init { @MainActor in
                             await send_donation_zap(pool: damus_state.pool, postbox: damus_state.postbox, nwc: nwc_state.url, percent: damus_state.settings.donation_percent, base_msats: amount_msat)
                         }
                     })
                 }
                 
-                // we don't have a delay on one-tap nozaps (since this will be from customize zap view)
+                let nwc_req = nwc_pay(url: nwc_state.url,  pool: damus_state.pool, post: damus_state.postbox, invoice: inv, on_flush: flusher)
-                let delay = damus_state.settings.nozaps ? nil : 5.0
-                
-                let nwc_req = nwc_pay(url: nwc_state.url, pool: damus_state.pool, post: damus_state.postbox, invoice: inv, delay: delay, on_flush: flusher)
                 
                 guard let nwc_req, case .nwc(let pzap_state) = pending_zap_state else {
                     print("nwc: failed to send nwc request for zapreq \(reqid.reqid)")

damus/ContentView.swift

@@ -14,38 +14,17 @@ struct TimestampedProfile {
     let event: NostrEvent
 }
 
-struct ZapSheet {
-    let target: ZapTarget
-    let lnurl: String
-}
-
-struct SelectWallet {
-    let invoice: String
-}
-
 enum Sheets: Identifiable {
     case post(PostAction)
     case report(ReportTarget)
     case event(NostrEvent)
-    case zap(ZapSheet)
-    case select_wallet(SelectWallet)
     case filter
 
-    static func zap(target: ZapTarget, lnurl: String) -> Sheets {
-        return .zap(ZapSheet(target: target, lnurl: lnurl))
-    }
-    
-    static func select_wallet(invoice: String) -> Sheets {
-        return .select_wallet(SelectWallet(invoice: invoice))
-    }
-    
     var id: String {
         switch self {
         case .report: return "report"
         case .post(let action): return "post-" + (action.ev?.id ?? "")
         case .event(let ev): return "event-" + ev.id
-        case .zap(let sheet): return "zap-" + sheet.target.id
-        case .select_wallet: return "select-wallet"
         case .filter: return "filter"
         }
     }
@@ -82,14 +61,21 @@ struct ContentView: View {
     @State var damus_state: DamusState? = nil
     @SceneStorage("ContentView.selected_timeline") var selected_timeline: Timeline = .home
     @State var is_deleted_account: Bool = false
+    @State var active_profile: String? = nil
+    @State var active_search: NostrFilter? = nil
+    @State var active_event: NostrEvent? = nil
+    @State var profile_open: Bool = false
+    @State var thread_open: Bool = false
+    @State var search_open: Bool = false
+    @State var wallet_open: Bool = false
+    @State var active_nwc: WalletConnectURL? = nil
     @State var muting: String? = nil
     @State var confirm_mute: Bool = false
     @State var user_muted_confirm: Bool = false
     @State var confirm_overwrite_mutelist: Bool = false
     @SceneStorage("ContentView.filter_state") var filter_state : FilterState = .posts_and_replies
     @State private var isSideBarOpened = false
-    var home: HomeModel = HomeModel()
+    @StateObject var home: HomeModel = HomeModel()
-    @StateObject var navigationCoordinator: NavigationCoordinator = NavigationCoordinator()
 
     let sub_id = UUID().description
     
@@ -121,7 +107,7 @@ struct ContentView: View {
                 
                 if privkey != nil {
                     PostButtonContainer(is_left_handed: damus_state?.settings.left_handed ?? false) {
-                        self.active_sheet = .post(.posting(.none))
+                        self.active_sheet = .post(.posting)
                     }
                 }
             }
@@ -129,8 +115,8 @@ struct ContentView: View {
         .safeAreaInset(edge: .top, spacing: 0) {
             VStack(spacing: 0) {
                 CustomPicker(selection: $filter_state, content: {
-                    Text("Notes", comment: "Label for filter for seeing only notes (instead of notes and replies).").tag(FilterState.posts)
+                    Text("Posts", comment: "Label for filter for seeing only posts (instead of posts and replies).").tag(FilterState.posts)
-                    Text("Notes & Replies", comment: "Label for filter for seeing notes and replies (instead of only notes).").tag(FilterState.posts_and_replies)
+                    Text("Posts & Replies", comment: "Label for filter for seeing posts and replies (instead of only posts).").tag(FilterState.posts_and_replies)
                 })
                 Divider()
                     .frame(height: 1)
@@ -142,13 +128,16 @@ struct ContentView: View {
     func contentTimelineView(filter: (@escaping (NostrEvent) -> Bool)) -> some View {
         ZStack {
             if let damus = self.damus_state {
-                TimelineView<AnyView>(events: home.events, loading: .constant(false), damus: damus, show_friend_icon: false, filter: filter)
+                TimelineView(events: home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter)
             }
         }
     }
     
     func popToRoot() {
-        navigationCoordinator.popToRoot()
+        profile_open = false
+        thread_open = false
+        search_open = false
+        wallet_open = false
         isSideBarOpened = false
     }
     
@@ -159,6 +148,21 @@ struct ContentView: View {
     
     func MainContent(damus: DamusState) -> some View {
         VStack {
+            NavigationLink(destination: WalletView(damus_state: damus, model: damus_state!.wallet), isActive: $wallet_open) {
+                EmptyView()
+            }
+            NavigationLink(destination: MaybeProfileView, isActive: $profile_open) {
+                EmptyView()
+            }
+            if let active_event {
+                let thread = ThreadModel(event: active_event, damus_state: damus_state!)
+                NavigationLink(destination: ThreadView(state: damus_state!, thread: thread), isActive: $thread_open) {
+                    EmptyView()
+                }
+            }
+            NavigationLink(destination: MaybeSearchView, isActive: $search_open) {
+                EmptyView()
+            }
             switch selected_timeline {
             case .search:
                 if #available(iOS 16.0, *) {
@@ -200,6 +204,28 @@ struct ContentView: View {
         }
     }
     
+    var MaybeSearchView: some View {
+        Group {
+            if let search = self.active_search {
+                SearchView(appstate: damus_state!, search: SearchModel(state: damus_state!, search: search))
+            } else {
+                EmptyView()
+            }
+        }
+    }
+    
+    var MaybeProfileView: some View {
+        Group {
+            if let pk = self.active_profile {
+                let profile_model = ProfileModel(pubkey: pk, damus: damus_state!)
+                let followers = FollowersModel(damus_state: damus_state!, target: pk)
+                ProfileView(damus_state: damus_state!, profile: profile_model, followers: followers)
+            } else {
+                EmptyView()
+            }
+        }
+    }
+    
     func MaybeReportView(target: ReportTarget) -> some View {
         Group {
             if let damus_state {
@@ -215,36 +241,32 @@ struct ContentView: View {
     }
     
     func open_event(ev: NostrEvent) {
-        let thread = ThreadModel(event: ev, damus_state: damus_state!)
+        popToRoot()
-        navigationCoordinator.push(route: Route.Thread(thread: thread))
+        self.active_event = ev
+        self.thread_open = true
     }
     
     func open_wallet(nwc: WalletConnectURL) {
         self.damus_state!.wallet.new(nwc)
-        navigationCoordinator.push(route: Route.Wallet(wallet: damus_state!.wallet))
+        self.wallet_open = true
-    }
-    
-    func open_script(_ script: [UInt8]) {
-        print("pushing script nav")
-        let model = ScriptModel(data: script, state: .not_loaded)
-        navigationCoordinator.push(route: Route.Script(script: model))
     }
     
     func open_profile(id: String) {
-        let profile_model = ProfileModel(pubkey: id, damus: damus_state!)
+        popToRoot()
-        let followers = FollowersModel(damus_state: damus_state!, target: id)
+        self.active_profile = id
-        navigationCoordinator.push(route: Route.Profile(profile: profile_model, followers: followers))
+        self.profile_open = true
     }
     
     func open_search(filt: NostrFilter) {
-        let search = SearchModel(state: damus_state!, search: filt)
+        popToRoot()
-        navigationCoordinator.push(route: Route.Search(search: search))
+        self.active_search = filt
+        self.search_open = true
     }
     
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
             if let damus = self.damus_state {
-                NavigationStack(path: $navigationCoordinator.path) {
+                NavigationView {
                     TabView { // Prevents navbar appearance change on scroll
                         MainContent(damus: damus)
                             .toolbar() {
@@ -267,14 +289,13 @@ struct ContentView: View {
                                         if selected_timeline == .search {
                                             Button(action: {
                                                 //isFilterVisible.toggle()
-                                                present_sheet(.filter)
+                                                self.active_sheet = .filter
                                             }) {
                                                 // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease...,  line.3.horizontail.decrease
                                                 Label(NSLocalizedString("Filter", comment: "Button label text for filtering relay servers."), image: "filter")
                                                     .foregroundColor(.gray)
                                                     //.contentShape(Rectangle())
                                             }
-                                            .buttonStyle(.plain)
                                         }
                                     }
                                 }
@@ -284,16 +305,10 @@ struct ContentView: View {
                     .overlay(
                         SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
                     )
-                    .navigationDestination(for: Route.self) { route in
-                        route.view(navigationCordinator: navigationCoordinator, damusState: damus_state!)
-                    }
-                    .onReceive(handle_notify(.switched_timeline)) { _ in
-                        navigationCoordinator.popToRoot()
-                    }
                 }
                 .navigationViewStyle(.stack)
             
-                TabBar(nstatus: home.notification_status, selected: $selected_timeline, settings: damus.settings, action: switch_timeline)
+                TabBar(new_events: $home.new_events, selected: $selected_timeline, settings: damus.settings, action: switch_timeline)
                     .padding([.bottom], 8)
                     .background(Color(uiColor: .systemBackground).ignoresSafeArea())
             }
@@ -312,10 +327,6 @@ struct ContentView: View {
                 PostView(action: action, damus_state: damus_state!)
             case .event:
                 EventDetailView()
-            case .zap(let zapsheet):
-                CustomizeZapView(state: damus_state!, target: zapsheet.target, lnurl: zapsheet.lnurl)
-            case .select_wallet(let select):
-                SelectWalletView(default_wallet: damus_state!.settings.default_wallet, active_sheet: $active_sheet, our_pubkey: damus_state!.pubkey, invoice: select.invoice)
             case .filter:
                 let timeline = selected_timeline
                 if #available(iOS 16.0, *) {
@@ -337,9 +348,7 @@ struct ContentView: View {
                 case .filter(let filt): self.open_search(filt: filt)
                 case .profile(let id):  self.open_profile(id: id)
                 case .event(let ev):    self.open_event(ev: ev)
-                case .wallet_connect(let nwc): self.open_wallet(nwc: nwc)
+                case .wallet_connect(let nwc): self.open_wallet(nwc: nwc)}
-                case .script(let data): self.open_script(data)
-                }
             }
         }
         .onReceive(handle_notify(.compose)) { notif in
@@ -395,19 +404,16 @@ struct ContentView: View {
             }
         }
         .onReceive(handle_notify(.unfollow)) { notif in
-            guard let state = self.damus_state else { return }
+            guard let state = self.damus_state else {
-            _ = handle_unfollow_notif(state: state, notif: notif)
+                return
             }
-        .onReceive(handle_notify(.unfollowed)) { notif in
+            handle_unfollow(state: state, notif: notif)
-            let unfollow = notif.object as! ReferencedId
-            home.resubscribe(.unfollowing(unfollow))
         }
         .onReceive(handle_notify(.follow)) { notif in
-            guard let state = self.damus_state else { return }
+            guard let state = self.damus_state else {
-            guard handle_follow_notif(state: state, notif: notif) else { return }
+                return
             }
-        .onReceive(handle_notify(.followed)) { notif in
+            handle_follow(state: state, notif: notif)
-            home.resubscribe(.following)
         }
         .onReceive(handle_notify(.post)) { notif in
             guard let state = self.damus_state,
@@ -428,31 +434,6 @@ struct ContentView: View {
         .onReceive(handle_notify(.unmute_thread)) { notif in
             home.filter_events()
         }
-        .onReceive(handle_notify(.present_sheet)) { notif in
-            let sheet = notif.object as! Sheets
-            self.active_sheet = sheet
-        }
-        .onReceive(handle_notify(.zapping)) { notif in
-            let zap_ev = notif.object as! ZappingEvent
-            
-            guard !zap_ev.is_custom else {
-                return
-            }
-            
-            switch zap_ev.type {
-            case .failed:
-                break
-            case .got_zap_invoice(let inv):
-                if damus_state!.settings.show_wallet_selector {
-                    present_sheet(.select_wallet(invoice: inv))
-                } else {
-                    let wallet = damus_state!.settings.default_wallet.model
-                    open_with_wallet(wallet: wallet, invoice: inv)
-                }
-            case .sent_from_nwc:
-                break
-            }
-        }
         .onChange(of: scenePhase) { (phase: ScenePhase) in
             switch phase {
             case .background:
@@ -488,8 +469,8 @@ struct ContentView: View {
             switch local.type {
             case .dm:
                 selected_timeline = .dms
-                damus_state.dms.set_active_dm(target.pubkey)
+                damus_state.dms.open_dm_by_pk(target.pubkey)
-                navigationCoordinator.push(route: Route.DMChat(dms: damus_state.dms.active_model))
+                
             case .like: fallthrough
             case .zap: fallthrough
             case .mention: fallthrough
@@ -612,44 +593,43 @@ struct ContentView: View {
 
     func connect() {
         let pool = RelayPool()
-        let model_cache = RelayModelCache()
+        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 {
+            if let url = RelayURL(relay) {
+                let descriptor = RelayDescriptor(url: url, info: .rw)
+                add_new_relay(relay_filters: relay_filters, metadatas: metadatas, pool: pool, descriptor: descriptor, new_relay_filters: new_relay_filters)
+            }
+        }
+        
+        pool.register_handler(sub_id: sub_id, handler: home.handle_event)
+        
         // dumb stuff needed for property wrappers
         UserSettingsStore.pubkey = pubkey
         let settings = UserSettingsStore()
         UserSettingsStore.shared = settings
         
-        let new_relay_filters = load_relay_filters(pubkey) == nil
-        for relay in bootstrap_relays {
-            if let url = RelayURL(relay) {
-                let descriptor = RelayDescriptor(url: url, info: .rw)
-                add_new_relay(model_cache: model_cache, relay_filters: relay_filters, pool: pool, descriptor: descriptor, new_relay_filters: new_relay_filters, logging_enabled: settings.developer_mode)
-            }
-        }
-        
-        pool.register_handler(sub_id: sub_id, handler: home.handle_event)
-        
         if let nwc_str = settings.nostr_wallet_connect,
            let nwc = WalletConnectURL(str: nwc_str) {
             try? pool.add_relay(.nwc(url: nwc.relay))
         }
         
-        let user_search_cache = UserSearchCache()
         self.damus_state = DamusState(pool: pool,
                                       keypair: keypair,
                                       likes: EventCounter(our_pubkey: pubkey),
                                       boosts: EventCounter(our_pubkey: pubkey),
                                       contacts: Contacts(our_pubkey: pubkey),
-                                      profiles: Profiles(user_search_cache: user_search_cache),
+                                      profiles: Profiles(),
                                       dms: home.dms,
                                       previews: PreviewCache(),
                                       zaps: Zaps(our_pubkey: pubkey),
                                       lnurls: LNUrls(),
                                       settings: settings,
                                       relay_filters: relay_filters,
-                                      relay_model_cache: model_cache,
+                                      relay_metadata: metadatas,
                                       drafts: Drafts(),
                                       events: EventCache(),
                                       bookmarks: BookmarksManager(pubkey: pubkey),
@@ -657,9 +637,7 @@ struct ContentView: View {
                                       bootstrap_relays: bootstrap_relays,
                                       replies: ReplyCounter(our_pubkey: pubkey),
                                       muted_threads: MutedThreadsManager(keypair: keypair),
-                                      wallet: WalletModel(settings: settings),
+                                      wallet: WalletModel(settings: settings)
-                                      nav: self.navigationCoordinator,
-                                      user_search_cache: user_search_cache
         )
         home.damus_state = self.damus_state!
         
@@ -768,57 +746,24 @@ func setup_notifications() {
     }
 }
 
-struct FindEvent {
+func find_event(state: DamusState, evid: String, search_type: SearchType, find_from: [String]?, callback: @escaping (NostrEvent?) -> ()) {
-    let type: FindEventType
-    let find_from: [String]?
-    
-    static func profile(pubkey: String, find_from: [String]? = nil) -> FindEvent {
-        return FindEvent(type: .profile(pubkey), find_from: find_from)
-    }
-    
-    static func event(evid: String, find_from: [String]? = nil) -> FindEvent {
-        return FindEvent(type: .event(evid), find_from: find_from)
-    }
-}
-
-enum FindEventType {
-    case profile(String)
-    case event(String)
-}
-
-enum FoundEvent {
-    case profile(Profile, NostrEvent)
-    case invalid_profile(NostrEvent)
-    case event(NostrEvent)
-}
-
-func find_event(state: DamusState, query query_: FindEvent, callback: @escaping (FoundEvent?) -> ()) {
-    
-    var filter: NostrFilter? = nil
-    let find_from = query_.find_from
-    let query = query_.type
-    
-    switch query {
-    case .profile(let pubkey):
-        if let profile = state.profiles.lookup_with_timestamp(id: pubkey) {
-            callback(.profile(profile.profile, profile.event))
-            return
-        }
-        filter = NostrFilter(kinds: [.metadata], limit: 1, authors: [pubkey])
-        
-    case .event(let evid):
     if let ev = state.events.lookup(evid) {
-            callback(.event(ev))
+        callback(ev)
         return
     }
     
-        filter = NostrFilter(ids: [evid], limit: 1)
-    }
-    
     let subid = UUID().description
-    var attempts: Int = 0
+    
     var has_event = false
-    guard let filter else { return }
+    
+    var filter = search_type == .event ? NostrFilter(ids: [evid]) : NostrFilter(authors: [evid])
+    
+    if search_type == .profile {
+        filter.kinds = [.metadata]
+    }
+    
+    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 {
@@ -834,22 +779,15 @@ func find_event(state: DamusState, query query_: FindEvent, callback: @escaping
             break
         case .event(_, let ev):
             has_event = true
+            
             state.pool.unsubscribe(sub_id: subid)
             
-            switch query {
+            if search_type == .profile && ev.known_kind == .metadata {
-            case .profile:
+                process_metadata_event(events: state.events, our_pubkey: state.pubkey, profiles: state.profiles, ev: ev) {
-                if ev.known_kind == .metadata {
+                    callback(ev)
-                    process_metadata_event(events: state.events, our_pubkey: state.pubkey, profiles: state.profiles, ev: ev) { profile in
-                        guard let profile else {
-                            callback(.invalid_profile(ev))
-                            return
                 }
-                        callback(.profile(profile, ev))
+            } else {
-                        return
+                callback(ev)
-                    }
-                }
-            case .event:
-                callback(.event(ev))
             }
         case .eose:
             if !has_event {
@@ -872,85 +810,60 @@ func timeline_name(_ timeline: Timeline?) -> String {
     }
     switch timeline {
     case .home:
-        return NSLocalizedString("Home", comment: "Navigation bar title for Home view where notes and replies appear from those who the user is following.")
+        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 notes from all connected relay servers appear.")
+        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.")
     }
 }
 
-@discardableResult
+func handle_unfollow(state: DamusState, notif: Notification) {
-func handle_unfollow(state: DamusState, unfollow: ReferencedId) -> Bool {
+    guard let privkey = state.keypair.privkey else {
-    guard let keypair = state.keypair.to_full() else {
+        return
-        return false
     }
     
-    let old_contacts = state.contacts.event
-
-    guard let ev = unfollow_reference(postbox: state.postbox, our_contacts: old_contacts, keypair: keypair, unfollow: unfollow)
-    else {
-        return false
-    }
-
-    notify(.unfollowed, unfollow)
-
-    state.contacts.event = ev
-
-    if unfollow.key == "p" {
-        state.contacts.remove_friend(unfollow.ref_id)
-        state.user_search_cache.updateOwnContactsPetnames(id: state.pubkey, oldEvent: old_contacts, newEvent: ev)
-    }
-
-    return true
-}
-
-func handle_unfollow_notif(state: DamusState, notif: Notification) -> ReferencedId? {
     let target = notif.object as! FollowTarget
     let pk = target.pubkey
     
-    let ref = ReferencedId.p(pk)
+    if let ev = unfollow_user(postbox: state.postbox,
-    if handle_unfollow(state: state, unfollow: ref) {
+                              our_contacts: state.contacts.event,
-        return ref
+                              pubkey: state.pubkey,
-    }
+                              privkey: privkey,
-
+                              unfollow: pk) {
-    return nil
+        notify(.unfollowed, pk)
-}
-
-@discardableResult
-func handle_follow(state: DamusState, follow: ReferencedId) -> Bool {
-    guard let keypair = state.keypair.to_full() else {
-        return false
-    }
-
-    guard let ev = follow_reference(box: state.postbox, our_contacts: state.contacts.event, keypair: keypair, follow: follow)
-    else {
-        return false
-    }
-
-    notify(.followed, follow)
         
         state.contacts.event = ev
-    if follow.key == "p" {
+        state.contacts.remove_friend(pk)
-        state.contacts.add_friend_pubkey(follow.ref_id)
+        //friend_events = friend_events.filter { $0.pubkey != pk }
     }
-
-    return true
 }
 
-@discardableResult
+func handle_follow(state: DamusState, notif: Notification) {
-func handle_follow_notif(state: DamusState, notif: Notification) -> Bool {
+    guard let privkey = state.keypair.privkey else {
+        return
+    }
+
     let fnotify = notif.object as! FollowTarget
+
+    if let ev = follow_user(pool: state.pool,
+                            our_contacts: state.contacts.event,
+                            pubkey: state.pubkey,
+                            privkey: privkey,
+                            follow: ReferencedId(ref_id: fnotify.pubkey, relay_id: nil, key: "p")) {
+        notify(.followed, fnotify.pubkey)
+        
+        state.contacts.event = ev
+        
         switch fnotify {
         case .pubkey(let pk):
             state.contacts.add_friend_pubkey(pk)
         case .contact(let ev):
             state.contacts.add_friend_contact(ev)
         }
-
+    }
-    return handle_follow(state: state, follow: .p(fnotify.pubkey))
 }
 
 func handle_post_notification(keypair: FullKeypair, postbox: PostBox, events: EventCache, notif: Notification) -> Bool {
@@ -981,7 +894,6 @@ enum OpenResult {
     case filter(NostrFilter)
     case event(NostrEvent)
     case wallet_connect(WalletConnectURL)
-    case script([UInt8])
 }
 
 func on_open_url(state: DamusState, url: URL, result: @escaping (OpenResult?) -> Void) {
@@ -1000,18 +912,15 @@ func on_open_url(state: DamusState, url: URL, result: @escaping (OpenResult?) ->
         if ref.key == "p" {
             result(.profile(ref.ref_id))
         } else if ref.key == "e" {
-            find_event(state: state, query: .event(evid: ref.ref_id)) { res in
+            find_event(state: state, evid: ref.ref_id, search_type: .event, find_from: nil) { ev in
-                guard let res, case .event(let ev) = res else { return }
+                if let ev {
                     result(.event(ev))
                 }
             }
+        }
     case .filter(let filt):
         result(.filter(filt))
         break
         // TODO: handle filter searches?
-    case .script(let script):
-        result(.script(script))
-        break
     }
 }
-

damus/Models/ActionBarModel.swift

@@ -20,7 +20,7 @@ class ActionBarModel: ObservableObject {
     @Published var our_zap: Zapping?
     @Published var likes: Int
     @Published var boosts: Int
-    @Published private(set) var zaps: Int
+    @Published var zaps: Int
     @Published var zap_total: Int64
     @Published var replies: Int
     

damus/Models/Contacts.swift

@@ -11,8 +11,6 @@ import Foundation
 class Contacts {
     private var friends: Set<String> = Set()
     private var friend_of_friends: Set<String> = Set()
-    /// Tracks which friends are friends of a given pubkey.
-    private var pubkey_to_our_friends = [String : Set<String>]()
     private var muted: Set<String> = Set()
     
     let our_pubkey: String
@@ -60,23 +58,10 @@ class Contacts {
     
     func remove_friend(_ pubkey: String) {
         friends.remove(pubkey)
-
-        pubkey_to_our_friends.forEach {
-            pubkey_to_our_friends[$0.key]?.remove(pubkey)
-        }
     }
     
-    func get_friend_list() -> Set<String> {
+    func get_friend_list() -> [String] {
-        return friends
+        return Array(friends)
-    }
-
-    func get_followed_hashtags() -> Set<String> {
-        guard let ev = self.event else { return Set() }
-        return ev.tags.reduce(into: Set<String>(), { htags, tag in
-            if tag.count >= 2 && tag[0] == "t" && tag[1] != "" {
-                htags.insert(tag[1])
-            }
-        })
     }
     
     func add_friend_pubkey(_ pubkey: String) {
@@ -88,15 +73,6 @@ class Contacts {
         for tag in contact.tags {
             if tag.count >= 2 && tag[0] == "p" {
                 friend_of_friends.insert(tag[1])
-
-                // Exclude themself and us.
-                if contact.pubkey != our_pubkey && contact.pubkey != tag[1] {
-                    if pubkey_to_our_friends[tag[1]] == nil {
-                        pubkey_to_our_friends[tag[1]] = Set<String>()
-                    }
-
-                    pubkey_to_our_friends[tag[1]]?.insert(contact.pubkey)
-                }
             }
         }
     }
@@ -120,43 +96,39 @@ class Contacts {
     func follow_state(_ pubkey: String) -> FollowState {
         return is_friend(pubkey) ? .follows : .unfollows
     }
-
-    /// Gets the list of pubkeys of our friends who follow the given pubkey.
-    func get_friended_followers(_ pubkey: String) -> [String] {
-        return Array((pubkey_to_our_friends[pubkey] ?? Set()))
-    }
 }
 
-func follow_reference(box: PostBox, our_contacts: NostrEvent?, keypair: FullKeypair, follow: ReferencedId) -> NostrEvent? {
+func follow_user(pool: RelayPool, our_contacts: NostrEvent?, pubkey: String, privkey: String, follow: ReferencedId) -> NostrEvent? {
-    guard let ev = follow_user_event(our_contacts: our_contacts, our_pubkey: keypair.pubkey, follow: follow) else {
+    guard let ev = follow_user_event(our_contacts: our_contacts, our_pubkey: pubkey, follow: follow) else {
         return nil
     }
     
     ev.calculate_id()
-    ev.sign(privkey: keypair.privkey)
+    ev.sign(privkey: privkey)
     
-    box.send(ev)
+    
+    pool.send(.event(ev))
     
     return ev
 }
 
-func unfollow_reference(postbox: PostBox, our_contacts: NostrEvent?, keypair: FullKeypair, unfollow: ReferencedId) -> NostrEvent? {
+func unfollow_user(postbox: PostBox, our_contacts: NostrEvent?, pubkey: String, privkey: String, unfollow: String) -> NostrEvent? {
     guard let cs = our_contacts else {
         return nil
     }
     
-    let ev = unfollow_reference_event(our_contacts: cs, our_pubkey: keypair.pubkey, unfollow: unfollow)
+    let ev = unfollow_user_event(our_contacts: cs, our_pubkey: pubkey, unfollow: unfollow)
     ev.calculate_id()
-    ev.sign(privkey: keypair.privkey)
+    ev.sign(privkey: privkey)
     
     postbox.send(ev)
     
     return ev
 }
 
-func unfollow_reference_event(our_contacts: NostrEvent, our_pubkey: String, unfollow: ReferencedId) -> NostrEvent {
+func unfollow_user_event(our_contacts: NostrEvent, our_pubkey: String, unfollow: String) -> NostrEvent {
     let tags = our_contacts.tags.filter { tag in
-        if tag.count >= 2 && tag[0] == unfollow.key && tag[1] == unfollow.ref_id {
+        if tag.count >= 2 && tag[0] == "p" && tag[1] == unfollow {
             return false
         }
         return true
@@ -228,13 +200,9 @@ func ensure_relay_info(relays: [RelayDescriptor], content: String) -> [String: R
     return relay_info
 }
 
-func is_already_following(contacts: NostrEvent, follow: ReferencedId) -> Bool {
-    return contacts.references(id: follow.ref_id, key: follow.key)
-}
-
 func follow_with_existing_contacts(our_pubkey: String, our_contacts: NostrEvent, follow: ReferencedId) -> NostrEvent? {
     // don't update if we're already following
-    if is_already_following(contacts: our_contacts, follow: follow) {
+    if our_contacts.references(id: follow.ref_id, key: "p") {
         return nil
     }
     

damus/Models/CreateAccountModel.swift

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

damus/Models/DamusState.swift

@@ -21,7 +21,7 @@ struct DamusState {
     let lnurls: LNUrls
     let settings: UserSettingsStore
     let relay_filters: RelayFilters
-    let relay_model_cache: RelayModelCache
+    let relay_metadata: RelayMetadatas
     let drafts: Drafts
     let events: EventCache
     let bookmarks: BookmarksManager
@@ -30,24 +30,13 @@ struct DamusState {
     let replies: ReplyCounter
     let muted_threads: MutedThreadsManager
     let wallet: WalletModel
-    let nav: NavigationCoordinator
-    let user_search_cache: UserSearchCache
     
     @discardableResult
     func add_zap(zap: Zapping) -> Bool {
         // store generic zap mapping
         self.zaps.add_zap(zap: zap)
-        let stored = self.events.store_zap(zap: zap)
-        
-        // thread zaps
-        if let ev = zap.event, !settings.nozaps, zap.is_in_thread {
-            // [nozaps]: thread zaps are only available outside of the app store
-            replies.count_replies(ev)
-            events.add_replies(ev: ev)
-        }
-
         // associate with events as well
-        return stored
+        return self.events.store_zap(zap: zap)
     }
     
     var pubkey: String {
@@ -59,6 +48,5 @@ struct DamusState {
     }
     
     static var empty: DamusState {
-        let user_search_cache = UserSearchCache()
+        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(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)), wallet: WalletModel(settings: UserSettingsStore())) }
-        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(our_pubkey: ""), profiles: Profiles(user_search_cache: user_search_cache), dms: DirectMessagesModel(our_pubkey: ""), previews: PreviewCache(), zaps: Zaps(our_pubkey: ""), lnurls: LNUrls(), settings: UserSettingsStore(), relay_filters: RelayFilters(our_pubkey: ""), relay_model_cache: RelayModelCache(), 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)), wallet: WalletModel(settings: UserSettingsStore()), nav: NavigationCoordinator(), user_search_cache: user_search_cache) }
 }

damus/Models/DirectMessagesModel.swift

@@ -30,6 +30,16 @@ class DirectMessagesModel: ObservableObject {
         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)

damus/Models/HomeModel.swift

@@ -23,41 +23,7 @@ struct NewEventsBits: OptionSet {
     static let notifications: NewEventsBits = [.zaps, .likes, .reposts, .mentions]
 }
 
-enum Resubscribe {
+class HomeModel: ObservableObject {
-    case following
-    case unfollowing(ReferencedId)
-}
-
-enum HomeResubFilter {
-    case pubkey(String)
-    case hashtag(String)
-
-    init?(from: ReferencedId) {
-        if from.key == "p" {
-            self = .pubkey(from.ref_id)
-            return
-        } else if from.key == "t" {
-            self = .hashtag(from.ref_id)
-            return
-        }
-
-        return nil
-    }
-
-    func filter(contacts: Contacts, ev: NostrEvent) -> Bool {
-        switch self {
-        case .pubkey(let pk):
-            return ev.pubkey == pk
-        case .hashtag(let ht):
-            if contacts.is_friend(ev.pubkey) {
-                return false
-            }
-            return ev.references(id: ht, key: "t")
-        }
-    }
-}
-
-class HomeModel {
     // Don't trigger a user notification for events older than a certain age
     static let event_max_age_for_notification: TimeInterval = 12 * 60 * 60
     
@@ -70,7 +36,6 @@ class HomeModel {
     var done_init: Bool = false
     var incoming_dms: [NostrEvent] = []
     let dm_debouncer = Debouncer(interval: 0.5)
-    let resub_debouncer = Debouncer(interval: 3.0)
     var should_debounce_dms = true
 
     let home_subid = UUID().description
@@ -84,10 +49,9 @@ class HomeModel {
 
     var signal = SignalModel()
     
-    var notifications = NotificationsModel()
+    @Published var new_events: NewEventsBits = NewEventsBits()
-    var notification_status = NotificationStatusModel()
+    @Published var notifications = NotificationsModel()
-    var events: EventHolder = EventHolder()
+    @Published var events: EventHolder = EventHolder()
-    var zap_button: ZapButtonModel = ZapButtonModel()
     
     init() {
         self.damus_state = DamusState.empty
@@ -125,31 +89,6 @@ class HomeModel {
         }
     }
 
-    func resubscribe(_ resubbing: Resubscribe) {
-        if self.should_debounce_dms {
-            // don't resub on initial load
-            return
-        }
-
-        print("hit resub debouncer")
-
-        resub_debouncer.debounce {
-            print("resub")
-            self.unsubscribe_to_home_filters()
-
-            switch resubbing {
-            case .following:
-                break
-            case .unfollowing(let r):
-                if let filter = HomeResubFilter(from: r) {
-                    self.events.filter { ev in !filter.filter(contacts: self.damus_state.contacts, ev: ev) }
-                }
-            }
-
-            self.subscribe_to_home_filters()
-        }
-    }
-
     func process_event(sub_id: String, relay_id: String, ev: NostrEvent) {
         if has_sub_id_event(sub_id: sub_id, ev_id: ev.id) {
             return
@@ -166,7 +105,6 @@ class HomeModel {
 
         switch kind {
         case .chat: fallthrough
-        case .longform: fallthrough
         case .text:
             handle_text_event(sub_id: sub_id, ev)
         case .contacts:
@@ -215,49 +153,81 @@ class HomeModel {
                 print("nwc: \(resp.req_id) not found in the postbox, nothing to remove [\(relay)]")
             }
             
-            guard resp.response.error == nil else {
+            guard let err = resp.response.error else {
-                print("nwc error: \(resp.response)")
-                nwc_error(zapcache: self.damus_state.zaps, evcache: self.damus_state.events, resp: resp)
-                return
-            }
-            
                 print("nwc success: \(resp.response.result.debugDescription) [\(relay)]")
                 nwc_success(state: self.damus_state, resp: resp)
-        }
-    }
-    
-    func handle_zap_event(_ ev: NostrEvent) {
-        process_zap_event(damus_state: damus_state, ev: ev) { zapres in
-            guard case .done(let zap) = zapres else { return }
-            
-            guard zap.target.pubkey == self.damus_state.keypair.pubkey else {
                 return
             }
             
-            if !self.notifications.insert_zap(.zap(zap)) {
+            print("nwc error: \(resp.response)")
+            nwc_error(zapcache: self.damus_state.zaps, evcache: self.damus_state.events, resp: resp)
+        }
+    }
+    
+    func handle_zap_event_with_zapper(profiles: Profiles, 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
         }
         
-            guard let new_bits = handle_last_events(new_events: self.notification_status.new_events, ev: ev, timeline: .notifications, shouldNotify: true) else {
+        damus_state.add_zap(zap: .zap(zap))
+        
+        guard zap.target.pubkey == our_keypair.pubkey else {
             return
         }
         
-            if self.damus_state.settings.zap_vibration {
+        if !notifications.insert_zap(.zap(zap)) {
+            return
+        }
+
+        if 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 {
-            if self.damus_state.settings.zap_notification {
                 // Create in-app local notification for zap received.
                 switch zap.target {
                 case .profile(let profile_id):
-                    create_in_app_profile_zap_notification(profiles: self.damus_state.profiles, zap: zap, profile_id: profile_id)
+                    create_in_app_profile_zap_notification(profiles: profiles, zap: zap, profile_id: profile_id)
                 case .note(let note_target):
-                    create_in_app_event_zap_notification(profiles: self.damus_state.profiles, zap: zap, evId: note_target.note_id)
+                    create_in_app_event_zap_notification(profiles: profiles, zap: zap, evId: note_target.note_id)
+                }
             }
         }
 
-            self.notification_status.new_events = new_bits
+        return
+    }
+
+    func handle_zap_event(_ ev: NostrEvent) {
+        // These are zap notifications
+        guard let ptag = event_tag(ev, name: "p") else {
+            return
+        }
+        
+        let our_keypair = damus_state.keypair
+        if let local_zapper = damus_state.profiles.lookup_zapper(pubkey: ptag) {
+            handle_zap_event_with_zapper(profiles: self.damus_state.profiles, ev: ev, our_keypair: our_keypair, zapper: local_zapper)
+            return
+        }
+        
+        guard let profile = damus_state.profiles.lookup(id: ptag) else {
+            return
+        }
+        
+        guard let lnurl = profile.lnurl else {
+            return
+        }
+        
+        Task {
+            guard let zapper = await fetch_zapper_from_lnurl(lnurl) else {
+                return
+            }
+            
+            DispatchQueue.main.async {
+                self.damus_state.profiles.zappers[ptag] = zapper
+                self.handle_zap_event_with_zapper(profiles: self.damus_state.profiles, ev: ev, our_keypair: our_keypair, zapper: zapper)
+            }
         }
         
     }
@@ -432,17 +402,18 @@ class HomeModel {
 
     /// Send the initial filters, just our contact list mostly
     func send_initial_filters(relay_id: String) {
-        let filter = NostrFilter(kinds: [.contacts], limit: 1, authors: [damus_state.pubkey])
+        var filter = NostrFilter(kinds: [.contacts],
-        let subscription = NostrSubscribe(filters: [filter], sub_id: init_subid)
+                                 limit: 1,
-        pool.send(.subscribe(subscription), to: [relay_id])
+                                 authors: [damus_state.pubkey])
+        pool.send(.subscribe(.init(filters: [filter], sub_id: init_subid)), to: [relay_id])
     }
 
-    /// After initial connection or reconnect, send subscription filters for the home timeline, DMs, and notifications
     func send_home_filters(relay_id: String?) {
         // TODO: since times should be based on events from a specific relay
         // perhaps we could mark this in the relay pool somehow
 
-        let friends = get_friends()
+        var friends = damus_state.contacts.get_friend_list()
+        friends.append(damus_state.pubkey)
 
         var contacts_filter = NostrFilter(kinds: [.metadata])
         contacts_filter.authors = friends
@@ -464,6 +435,19 @@ class HomeModel {
         dms_filter.pubkeys = [ damus_state.pubkey ]
         our_dms_filter.authors = [ damus_state.pubkey ]
 
+        // TODO: separate likes?
+        var home_filter_kinds: [NostrKind] = [
+            .text,
+            .boost
+        ]
+        if !damus_state.settings.onlyzaps_mode {
+            home_filter_kinds.append(.like)
+        }
+        var home_filter = NostrFilter(kinds: home_filter_kinds)
+        // include our pubkey as well even if we're not technically a friend
+        home_filter.authors = friends
+        home_filter.limit = 500
+
         var notifications_filter_kinds: [NostrKind] = [
             .text,
             .boost,
@@ -476,69 +460,31 @@ class HomeModel {
         notifications_filter.pubkeys = [damus_state.pubkey]
         notifications_filter.limit = 500
 
+        var home_filters = [home_filter]
         var notifications_filters = [notifications_filter]
         var contacts_filters = [contacts_filter, our_contacts_filter, our_blocklist_filter]
         var dms_filters = [dms_filter, our_dms_filter]
-        let last_of_kind = get_last_of_kind(relay_id: relay_id)
 
+        let last_of_kind = relay_id.flatMap { last_event_of_kind[$0] } ?? [:]
+
+        home_filters = update_filters_with_since(last_of_kind: last_of_kind, filters: home_filters)
         contacts_filters = update_filters_with_since(last_of_kind: last_of_kind, filters: contacts_filters)
         notifications_filters = update_filters_with_since(last_of_kind: last_of_kind, filters: notifications_filters)
         dms_filters = update_filters_with_since(last_of_kind: last_of_kind, filters: dms_filters)
 
-        //print_filters(relay_id: relay_id, filters: [home_filters, contacts_filters, notifications_filters, dms_filters])
+        print_filters(relay_id: relay_id, filters: [home_filters, contacts_filters, notifications_filters, dms_filters])
 
-        subscribe_to_home_filters(relay_id: relay_id)
+        if let relay_id {
-
+            pool.send(.subscribe(.init(filters: home_filters, sub_id: home_subid)), to: [relay_id])
-        let relay_ids = relay_id.map { [$0] }
+            pool.send(.subscribe(.init(filters: contacts_filters, sub_id: contacts_subid)), to: [relay_id])
-
+            pool.send(.subscribe(.init(filters: notifications_filters, sub_id: notifications_subid)), to: [relay_id])
-        pool.send(.subscribe(.init(filters: contacts_filters, sub_id: contacts_subid)), to: relay_ids)
+            pool.send(.subscribe(.init(filters: dms_filters, sub_id: dms_subid)), to: [relay_id])
-        pool.send(.subscribe(.init(filters: notifications_filters, sub_id: notifications_subid)), to: relay_ids)
+        } else {
-        pool.send(.subscribe(.init(filters: dms_filters, sub_id: dms_subid)), to: relay_ids)
+            pool.send(.subscribe(.init(filters: home_filters, sub_id: home_subid)))
+            pool.send(.subscribe(.init(filters: contacts_filters, sub_id: contacts_subid)))
+            pool.send(.subscribe(.init(filters: notifications_filters, sub_id: notifications_subid)))
+            pool.send(.subscribe(.init(filters: dms_filters, sub_id: dms_subid)))
         }
-
-    func get_last_of_kind(relay_id: String?) -> [Int: NostrEvent] {
-        return relay_id.flatMap { last_event_of_kind[$0] } ?? [:]
-    }
-
-    func unsubscribe_to_home_filters() {
-        pool.send(.unsubscribe(home_subid))
-    }
-
-    func get_friends() -> [String] {
-        var friends = damus_state.contacts.get_friend_list()
-        friends.insert(damus_state.pubkey)
-        return Array(friends)
-    }
-
-    func subscribe_to_home_filters(friends fs: [String]? = nil, relay_id: String? = nil) {
-        // TODO: separate likes?
-        var home_filter_kinds: [NostrKind] = [
-            .text, .longform, .boost
-        ]
-        if !damus_state.settings.onlyzaps_mode {
-            home_filter_kinds.append(.like)
-        }
-
-        let friends = fs ?? get_friends()
-        var home_filter = NostrFilter(kinds: home_filter_kinds)
-        // include our pubkey as well even if we're not technically a friend
-        home_filter.authors = friends
-        home_filter.limit = 500
-
-        var home_filters = [home_filter]
-
-        let followed_hashtags = Array(damus_state.contacts.get_followed_hashtags())
-        if followed_hashtags.count != 0 {
-            var hashtag_filter = NostrFilter.filter_hashtag(followed_hashtags)
-            hashtag_filter.limit = 100
-            home_filters.append(hashtag_filter)
-        }
-
-        let relay_ids = relay_id.map { [$0] }
-        home_filters = update_filters_with_since(last_of_kind: get_last_of_kind(relay_id: relay_id), filters: home_filters)
-        let sub = NostrSubscribe(filters: home_filters, sub_id: home_subid)
-
-        pool.send(.subscribe(sub), to: relay_ids)
     }
     
     func handle_list_event(_ ev: NostrEvent) {
@@ -609,8 +555,8 @@ class HomeModel {
 
     @discardableResult
     func handle_last_event(ev: NostrEvent, timeline: Timeline, shouldNotify: Bool = true) -> Bool {
-        if let new_bits = handle_last_events(new_events: self.notification_status.new_events, ev: ev, timeline: timeline, shouldNotify: shouldNotify) {
+        if let new_bits = handle_last_events(new_events: self.new_events, ev: ev, timeline: timeline, shouldNotify: shouldNotify) {
-            self.notification_status.new_events = new_bits
+            new_events = new_bits
             return true
         } else {
             return false
@@ -642,7 +588,7 @@ class HomeModel {
     }
     
     func got_new_dm(notifs: NewEventsBits, ev: NostrEvent) {
-        notification_status.new_events = notifs
+        self.new_events = notifs
         
         if damus_state.settings.dm_notification && ev.age < HomeModel.event_max_age_for_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")
@@ -660,7 +606,7 @@ class HomeModel {
         
         if !should_debounce_dms {
             self.incoming_dms.append(ev)
-            if let notifs = handle_incoming_dms(prev_events: notification_status.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, evs: self.incoming_dms) {
+            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.incoming_dms = []
@@ -670,7 +616,7 @@ class HomeModel {
         incoming_dms.append(ev)
         
         dm_debouncer.debounce { [self] in
-            if let notifs = handle_incoming_dms(prev_events: notification_status.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, evs: self.incoming_dms) {
+            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.incoming_dms = []
@@ -697,40 +643,35 @@ func add_contact_if_friend(contacts: Contacts, ev: NostrEvent) {
     contacts.add_friend_contact(ev)
 }
 
-func load_our_contacts(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
+func load_our_contacts(contacts: Contacts, m_old_ev: NostrEvent?, ev: NostrEvent) {
-    let contacts = state.contacts
+    var new_pks = Set<String>()
-    var new_refs = Set<ReferencedId>()
     // our contacts
     for tag in ev.tags {
-        guard let ref = tag_to_refid(tag) else { continue }
+        if tag.count >= 2 && tag[0] == "p" {
-        new_refs.insert(ref)
+            new_pks.insert(tag[1])
+        }
     }
     
-    var old_refs = Set<ReferencedId>()
+    var old_pks = Set<String>()
     // find removed contacts
     if let old_ev = m_old_ev {
         for tag in old_ev.tags {
-            guard let ref = tag_to_refid(tag) else { continue }
+            if tag.count >= 2 && tag[0] == "p" {
-            old_refs.insert(ref)
+                old_pks.insert(tag[1])
+            }
         }
     }
     
-    let diff = new_refs.symmetricDifference(old_refs)
+    let diff = new_pks.symmetricDifference(old_pks)
-    for ref in diff {
+    for pk in diff {
-        if new_refs.contains(ref) {
+        if new_pks.contains(pk) {
-            notify(.followed, ref)
+            notify(.followed, pk)
-            if ref.key == "p" {
+            contacts.add_friend_pubkey(pk)
-                contacts.add_friend_pubkey(ref.ref_id)
-            }
         } else {
-            notify(.unfollowed, ref)
+            notify(.unfollowed, pk)
-            if ref.key == "p" {
+            contacts.remove_friend(pk)
-                contacts.remove_friend(ref.ref_id)
         }
     }
-    }
-
-    state.user_search_cache.updateOwnContactsPetnames(id: contacts.our_pubkey, oldEvent: m_old_ev, newEvent: ev)
 }
 
 
@@ -791,9 +732,7 @@ func process_metadata_profile(our_pubkey: String, profiles: Profiles, profile: P
     }
 
     var old_nip05: String? = nil
-    let mprof = profiles.lookup_with_timestamp(id: ev.pubkey)
+    if let mprof = profiles.lookup_with_timestamp(id: ev.pubkey) {
-
-    if let mprof {
         old_nip05 = mprof.profile.nip05
         if mprof.event.created_at > ev.created_at {
             // skip if we already have an newer profile
@@ -813,7 +752,7 @@ func process_metadata_profile(our_pubkey: String, profiles: Profiles, profile: P
             }
             
             Task { @MainActor in
-                profiles.set_validated(ev.pubkey, nip05: validated)
+                profiles.validated[ev.pubkey] = validated
                 profiles.nip05_pubkey[nip05] = ev.pubkey
                 notify(.profile_updated, ProfileUpdate(pubkey: ev.pubkey, profile: profile))
             }
@@ -840,14 +779,11 @@ func process_metadata_profile(our_pubkey: String, profiles: Profiles, profile: P
 }
 
 func guard_valid_event(events: EventCache, ev: NostrEvent, callback: @escaping () -> Void) {
-    guard ev.id==calculate_event_id(ev: ev) else {
-        return
-    }
     let validated = events.is_event_valid(ev.id)
     
     switch validated {
     case .unknown:
-        Task.detached(priority: .medium) {
+        Task {
             let result = validate_event(ev: ev)
             
             DispatchQueue.main.async {
@@ -868,11 +804,11 @@ func guard_valid_event(events: EventCache, ev: NostrEvent, callback: @escaping (
     }
 }
 
-func process_metadata_event(events: EventCache, our_pubkey: String, profiles: Profiles, ev: NostrEvent, completion: ((Profile?) -> Void)? = nil) {
+func process_metadata_event(events: EventCache, our_pubkey: String, profiles: Profiles, ev: NostrEvent, completion: (() -> Void)? = nil) {
     guard_valid_event(events: events, ev: ev) {
         DispatchQueue.global(qos: .background).async {
             guard let profile: Profile = decode_data(Data(ev.content.utf8)) else {
-                completion?(nil)
+                completion?()
                 return
             }
             
@@ -880,7 +816,7 @@ func process_metadata_event(events: EventCache, our_pubkey: String, profiles: Pr
             
             DispatchQueue.main.async {
                 process_metadata_profile(our_pubkey: our_pubkey, profiles: profiles, profile: profile, ev: ev)
-                completion?(profile)
+                completion?()
             }
         }
     }
@@ -905,7 +841,7 @@ func load_our_stuff(state: DamusState, ev: NostrEvent) {
     let m_old_ev = state.contacts.event
     state.contacts.event = ev
 
-    load_our_contacts(state: state, m_old_ev: m_old_ev, ev: ev)
+    load_our_contacts(contacts: state.contacts, m_old_ev: m_old_ev, ev: ev)
     load_our_relays(state: state, m_old_ev: m_old_ev, ev: ev)
 }
 
@@ -944,7 +880,7 @@ func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
         if new.contains(d) {
             if let url = RelayURL(d) {
                 let descriptor = RelayDescriptor(url: url, info: decoded[d] ?? .rw)
-                add_new_relay(model_cache: state.relay_model_cache, relay_filters: state.relay_filters, pool: state.pool, descriptor: descriptor, new_relay_filters: new_relay_filters, logging_enabled: state.settings.developer_mode)
+                add_new_relay(relay_filters: state.relay_filters, metadatas: state.relay_metadata, pool: state.pool, descriptor: descriptor, new_relay_filters: new_relay_filters)
             }
         } else {
             state.pool.remove_relay(d)
@@ -953,17 +889,16 @@ func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
     
     if changed {
         save_bootstrap_relays(pubkey: state.pubkey, relays: Array(new))
-        state.pool.connect()
         notify(.relays_changed, ())
     }
 }
 
-func add_new_relay(model_cache: RelayModelCache, relay_filters: RelayFilters, pool: RelayPool, descriptor: RelayDescriptor, new_relay_filters: Bool, logging_enabled: Bool) {
+func add_new_relay(relay_filters: RelayFilters, metadatas: RelayMetadatas, pool: RelayPool, descriptor: RelayDescriptor, new_relay_filters: Bool) {
     try? pool.add_relay(descriptor)
     let url = descriptor.url
     
     let relay_id = url.id
-    guard model_cache.model(withURL: url) == nil else {
+    guard metadatas.lookup(relay_id: relay_id) == nil else {
         return
     }
     
@@ -972,13 +907,8 @@ func add_new_relay(model_cache: RelayModelCache, relay_filters: RelayFilters, po
             return
         }
         
-        await MainActor.run {
+        DispatchQueue.main.async {
-            let model = RelayModel(url, metadata: meta)
+            metadatas.insert(relay_id: relay_id, metadata: meta)
-            model_cache.insert(model: model)
-            
-            if logging_enabled {
-                pool.setLog(model.log, for: relay_id)
-            }
             
             // if this is the first time adding filters, we should filter non-paid relays
             if new_relay_filters && !meta.is_paid {
@@ -1176,8 +1106,9 @@ func zap_notification_title(_ zap: Zap) -> String {
 }
 
 func zap_notification_body(profiles: Profiles, zap: Zap, locale: Locale = Locale.current) -> String {
-    let src = zap.request.ev
+    let src = zap.private_request ?? zap.request.ev
-    let pk = zap.is_anon ? ANON_PUBKEY : src.pubkey
+    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)
@@ -1234,27 +1165,6 @@ func create_in_app_event_zap_notification(profiles: Profiles, zap: Zap, locale:
     }
 }
 
-func render_notification_content_preview(cache: EventCache, ev: NostrEvent, profiles: Profiles, privkey: String?) -> String {
-    
-    let prefix_len = 50
-    let artifacts = cache.get_cache_data(ev.id).artifacts.artifacts ?? render_note_content(ev: ev, profiles: profiles, privkey: privkey)
-    
-    // special case for longform events
-    if ev.known_kind == .longform {
-        let longform = LongformEvent(event: ev)
-        return longform.title ?? longform.summary ?? "Longform Event"
-    }
-    
-    switch artifacts {
-    case .parts:
-        // we should never hit this until we have more note types built out of parts
-        // since we handle this case above in known_kind == .longform
-        return String(ev.content.prefix(prefix_len))
-        
-    case .separated(let artifacts):
-        return String(NSAttributedString(artifacts.content.attributed).string.prefix(prefix_len))
-    }
-}
     
 func process_local_notification(damus_state: DamusState, event ev: NostrEvent) {
     guard let type = ev.known_kind else {
@@ -1278,22 +1188,21 @@ func process_local_notification(damus_state: DamusState, event ev: NostrEvent) {
     }
 
     if type == .text && damus_state.settings.mention_notification {
-        let blocks = ev.blocks(damus_state.keypair.privkey).blocks
+        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_preview = render_notification_content_preview(cache: damus_state.events, ev: ev, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey)
+            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_preview)
+            
+            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.get_inner_event(cache: damus_state.events) {
-        let content_preview = render_notification_content_preview(cache: damus_state.events, ev: inner_ev, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey)
+        let notify = LocalNotification(type: .repost, event: ev, target: inner_ev, content: inner_ev.content)
-        let notify = LocalNotification(type: .repost, event: ev, target: inner_ev, content: content_preview)
         create_local_notification(profiles: damus_state.profiles, notify: notify)
     } else if type == .like && damus_state.settings.like_notification,
               let evid = ev.referenced_ids.last?.ref_id,
               let liked_event = damus_state.events.lookup(evid)
     {
-        let content_preview = render_notification_content_preview(cache: damus_state.events, ev: liked_event, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey)
+        let notify = LocalNotification(type: .like, event: ev, target: liked_event, content: liked_event.content)
-        let notify = LocalNotification(type: .like, event: ev, target: liked_event, content: content_preview)
         create_local_notification(profiles: damus_state.profiles, notify: notify)
     }
 
@@ -1341,104 +1250,3 @@ func create_local_notification(profiles: Profiles, notify: LocalNotification) {
     }
 }
 
-
-enum ProcessZapResult {
-    case already_processed(Zap)
-    case done(Zap)
-    case failed
-}
-
-// securely get the zap target's pubkey. this can be faked so we need to be
-// careful
-func get_zap_target_pubkey(ev: NostrEvent, events: EventCache) -> String? {
-    let etags = ev.referenced_ids
-
-    guard let etag = etags.first else {
-        // no etags, ptag-only case
-
-        let ptags = ev.referenced_pubkeys
-
-        // ensure that there is only 1 ptag to stop fake profile zap attacks
-        guard ptags.count == 1 else {
-            return nil
-        }
-
-        return ptags.first?.id
-    }
-
-    // we have an e-tag
-
-    // ensure that there is only 1 etag to stop fake note zap attacks
-    guard etags.count == 1 else {
-        return nil
-    }
-
-    // we can't trust the p tag on note zaps because they can be faked
-    return events.lookup(etag.id)?.pubkey
-}
-
-func process_zap_event(damus_state: DamusState, ev: NostrEvent, completion: @escaping (ProcessZapResult) -> Void) {
-    // These are zap notifications
-    guard let ptag = get_zap_target_pubkey(ev: ev, events: damus_state.events) else {
-        completion(.failed)
-        return
-    }
-
-    // just return the zap if we already have it
-    if let zap = damus_state.zaps.zaps[ev.id], case .zap(let z) = zap {
-        completion(.already_processed(z))
-        return
-    }
-    
-    if let local_zapper = damus_state.profiles.lookup_zapper(pubkey: ptag) {
-        guard let zap = process_zap_event_with_zapper(damus_state: damus_state, ev: ev, zapper: local_zapper) else {
-            completion(.failed)
-            return
-        }
-        damus_state.add_zap(zap: .zap(zap))
-        completion(.done(zap))
-        return
-    }
-    
-    guard let profile = damus_state.profiles.lookup(id: ptag) else {
-        completion(.failed)
-        return
-    }
-    
-    guard let lnurl = profile.lnurl else {
-        completion(.failed)
-        return
-    }
-    
-    Task {
-        guard let zapper = await fetch_zapper_from_lnurl(lnurl) else {
-            completion(.failed)
-            return
-        }
-        
-        DispatchQueue.main.async {
-            damus_state.profiles.zappers[ptag] = zapper
-            guard let zap = process_zap_event_with_zapper(damus_state: damus_state, ev: ev, zapper: zapper) else {
-                completion(.failed)
-                return
-            }
-            damus_state.add_zap(zap: .zap(zap))
-            completion(.done(zap))
-        }
-    }
-    
-       
-}
-
-fileprivate func process_zap_event_with_zapper(damus_state: DamusState, ev: NostrEvent, zapper: String) -> Zap? {
-    let our_keypair = damus_state.keypair
-    
-    guard let zap = Zap.from_zap_event(zap_ev: ev, zapper: zapper, our_privkey: our_keypair.privkey) else {
-        return nil
-    }
-    
-    damus_state.add_zap(zap: .zap(zap))
-    
-    return zap
-}
-

damus/Models/Mentions.swift

@@ -25,14 +25,6 @@ struct Mention: Equatable {
     let index: Int?
     let type: MentionType
     let ref: ReferencedId
-
-    static func note(_ id: String) -> Mention {
-        return Mention(index: nil, type: .event, ref: .e(id))
-    }
-
-    static func pubkey(_ pubkey: String) -> Mention {
-        return Mention(index: nil, type: .pubkey, ref: .p(pubkey))
-    }
 }
 
 typealias Invoice = LightningInvoice<Amount>
@@ -123,11 +115,11 @@ enum Block: Equatable {
         return mention.type == .event
     }
     
-    var is_mention: Mention? {
+    var is_mention: Bool {
-        if case .mention(let m) = self {
+        if case .mention = self {
-            return m
+            return true
         }
-        return nil
+        return false
     }
 }
 
@@ -158,15 +150,10 @@ func render_blocks(blocks: [Block]) -> String {
     }
 }
 
-struct Blocks {
+func parse_mentions(content: String, tags: [[String]]) -> [Block] {
-    let words: Int
-    let blocks: [Block]
-}
-
-func parse_mentions(content: String, tags: [[String]]) -> Blocks {
     var out: [Block] = []
     
-    var bs = note_blocks()
+    var bs = blocks()
     bs.num_blocks = 0;
     
     blocks_init(&bs)
@@ -187,10 +174,9 @@ func parse_mentions(content: String, tags: [[String]]) -> Blocks {
         i += 1
     }
     
-    let words = Int(bs.words)
     blocks_free(&bs)
     
-    return Blocks(words: words, blocks: out)
+    return out
 }
 
 func strblock_to_string(_ s: str_block_t) -> String? {
@@ -341,12 +327,6 @@ func convert_mention_bech32_block(_ b: mention_bech32_block) -> Block?
         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_NSEC:
-        let nsec = b.bech32.data.nsec
-        let nsec_bytes = Data(bytes: nsec.nsec, count: 32)
-        let pubkey = privkey_to_pubkey_raw(sec: nsec_bytes.bytes) ?? hex_encode(nsec_bytes)
-        return .mention(.pubkey(pubkey))
-
     case NOSTR_BECH32_NPROFILE:
         let nprofile = b.bech32.data.nprofile
         let pubkey = hex_encode(Data(bytes: nprofile.pubkey, count: 32))
@@ -408,6 +388,65 @@ func convert_mention_index_block(ind: Int32, tags: [[String]]) -> Block?
     return .mention(Mention(index: ind, type: mention_type, ref: ref))
 }
 
+func parse_while(_ p: Parser, match: (Character) -> Bool) -> String? {
+    var i: Int = 0
+    let sub = substring(p.str, start: p.pos, end: p.str.count)
+    let start = p.pos
+    for c in sub {
+        if match(c) {
+            p.pos += 1
+        } else {
+            break
+        }
+        i += 1
+    }
+    
+    let end = start + i
+    if start == end {
+        return nil
+    }
+    return String(substring(p.str, start: start, end: end))
+}
+
+func is_hashtag_char(_ c: Character) -> Bool {
+    return c.isLetter || c.isNumber
+}
+
+func prev_char(_ p: Parser, n: Int) -> Character? {
+    if p.pos - n < 0 {
+        return nil
+    }
+    
+    let ind = p.str.index(p.str.startIndex, offsetBy: p.pos - n)
+    return p.str[ind]
+}
+
+func is_punctuation(_ c: Character) -> Bool {
+    return c.isWhitespace || c.isPunctuation
+}
+
+func parse_hashtag(_ p: Parser) -> String? {
+    let start = p.pos
+    
+    if !parse_char(p, "#") {
+        return nil
+    }
+    
+    if let prev = prev_char(p, n: 2) {
+        // we don't allow adjacent hashtags
+        if !is_punctuation(prev) {
+            return nil
+        }
+    }
+    
+    guard let str = parse_while(p, match: is_hashtag_char) else {
+        p.pos = start
+        return nil
+    }
+    
+    return str
+}
+
 func find_tag_ref(type: String, id: String, tags: [[String]]) -> Int? {
     var i: Int = 0
     for tag in tags {
@@ -438,31 +477,47 @@ func parse_mention_type(_ c: String) -> MentionType? {
 }
 
 /// Convert
-func make_post_tags(post_blocks: [Block], tags: [[String]], silent_mentions: Bool) -> PostTags {
+func make_post_tags(post_blocks: [PostBlock], tags: [[String]], silent_mentions: Bool) -> PostTags {
     var new_tags = tags
+    var blocks: [Block] = []
     
     for post_block in post_blocks {
         switch post_block {
-        case .mention(let mention):
+        case .ref(let ref):
-            let mention_type = mention.type
+            guard let mention_type = parse_mention_type(ref.key) else {
-
-            if silent_mentions || mention_type == .event {
                 continue
             }
             
-            new_tags.append(refid_to_tag(mention.ref))
+            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 find_tag_ref(type: ref.key, id: ref.ref_id, tags: tags) != nil {
+                // Mention index is nil because indexed mentions from NIP-08 is deprecated.
+                // It has been replaced with NIP-27 text note references with nostr: prefixed URIs.
+                let mention = Mention(index: nil, type: mention_type, ref: ref)
+                let block = Block.mention(mention)
+                blocks.append(block)
+            } else {
+                new_tags.append(refid_to_tag(ref))
+                // Mention index is nil because indexed mentions from NIP-08 is deprecated.
+                // It has been replaced with NIP-27 text note references with nostr: prefixed URIs.
+                let mention = Mention(index: nil, type: mention_type, ref: ref)
+                let block = Block.mention(mention)
+                blocks.append(block)
+            }
         case .hashtag(let hashtag):
             new_tags.append(["t", hashtag.lowercased()])
-        case .text: break
+            blocks.append(.hashtag(hashtag))
-        case .invoice: break
+        case .text(let txt):
-        case .relay: break
+            blocks.append(Block.text(txt))
-        case .url(let url):
-            new_tags.append(["r", url.absoluteString])
-            break
         }
     }
     
-    return PostTags(blocks: post_blocks, tags: new_tags)
+    return PostTags(blocks: blocks, tags: new_tags)
 }
 
 func post_to_event(post: NostrPost, privkey: String, pubkey: String) -> NostrEvent {

damus/Models/Notifications/NotificationStatusModel.swift

@@ -1,12 +0,0 @@
-//
-//  NotificationStatusModel.swift
-//  damus
-//
-//  Created by William Casarin on 2023-06-23.
-//
-
-import Foundation
-
-class NotificationStatusModel: ObservableObject {
-    @Published var new_events: NewEventsBits = NewEventsBits()
-}

damus/Models/Notifications/ZapGroup.swift

@@ -21,12 +21,12 @@ class ZapGroup {
     }
     
     func zap_requests() -> [NostrEvent] {
-        zaps.map { z in z.request.ev }
+        zaps.map { z in z.request }
     }
     
     func would_filter(_ isIncluded: (NostrEvent) -> Bool) -> Bool {
         for zap in zaps {
-            if !isIncluded(zap.request.ev) {
+            if !isIncluded(zap.request) {
                 return true
             }
         }
@@ -35,7 +35,7 @@ class ZapGroup {
     }
     
     func filter(_ isIncluded: (NostrEvent) -> Bool) -> ZapGroup? {
-        let new_zaps = zaps.filter { isIncluded($0.request.ev) }
+        let new_zaps = zaps.filter { isIncluded($0.request) }
         guard new_zaps.count > 0 else {
             return nil
         }
@@ -60,8 +60,8 @@ class ZapGroup {
         
         msat_total += zap.amount
         
-        if !zappers.contains(zap.request.ev.pubkey)  {
+        if !zappers.contains(zap.request.pubkey)  {
-            zappers.insert(zap.request.ev.pubkey)
+            zappers.insert(zap.request.pubkey)
         }
         
         return true

damus/Models/NotificationsModel.swift

@@ -150,7 +150,7 @@ class NotificationsModel: ObservableObject, ScrollQueue {
         }
         
         for zap in incoming_zaps {
-            pks.insert(zap.request.ev.pubkey)
+            pks.insert(zap.request.pubkey)
         }
         
         return Array(pks)
@@ -307,7 +307,7 @@ class NotificationsModel: ObservableObject, ScrollQueue {
         changed = changed || incoming_events.count != count
         
         count = profile_zaps.zaps.count
-        profile_zaps.zaps = profile_zaps.zaps.filter { zap in isIncluded(zap.request.ev) }
+        profile_zaps.zaps = profile_zaps.zaps.filter { zap in isIncluded(zap.request) }
         changed = changed || profile_zaps.zaps.count != count
         
         for el in reactions {
@@ -325,7 +325,7 @@ class NotificationsModel: ObservableObject, ScrollQueue {
         for el in zaps {
             count = el.value.zaps.count
             el.value.zaps = el.value.zaps.filter {
-                isIncluded($0.request.ev)
+                isIncluded($0.request)
             }
             changed = changed || el.value.zaps.count != count
         }

damus/Models/Post.swift

@@ -64,7 +64,6 @@ func parse_post_mention(_ p: Parser, mention_type: MentionType) -> ReferencedId?
     }
 }
 
-// TODO: replace this with our C parser
 func parse_post_bech32_mention(_ p: Parser) -> ReferencedId? {
     let start = p.pos
     if parse_str(p, "note") {
@@ -110,7 +109,32 @@ func parse_post_bech32_mention(_ p: Parser) -> ReferencedId? {
 }
 
 /// Return a list of tags
-func parse_post_blocks(content: String) -> [Block] {
+func parse_post_blocks(content: String) -> [PostBlock] {
-    return parse_mentions(content: content, tags: []).blocks
+    let p = Parser(pos: 0, str: content)
+    var blocks: [PostBlock] = []
+    var starting_from: Int = 0
+    
+    if content.count == 0 {
+        return []
+    }
+    
+    while p.pos < content.count {
+        let pre_mention = p.pos
+        if let reference = parse_post_reference(p) {
+            blocks.append(parse_post_textblock(str: p.str, from: starting_from, to: pre_mention))
+            blocks.append(.ref(reference))
+            starting_from = p.pos
+        } else if let hashtag = parse_hashtag(p) {
+            blocks.append(parse_post_textblock(str: p.str, from: starting_from, to: pre_mention))
+            blocks.append(.hashtag(hashtag))
+            starting_from = p.pos
+        } else {
+            p.pos += 1
+        }
+    }
+    
+    blocks.append(parse_post_textblock(str: content, from: starting_from, to: content.count))
+    
+    return blocks
 }
 

damus/Models/ProfileModel.swift

@@ -69,7 +69,8 @@ class ProfileModel: ObservableObject, Equatable {
     }
     
     func subscribe() {
-        var text_filter = NostrFilter(kinds: [.text, .longform])
+        var text_filter = NostrFilter(kinds: [.text, .chat])
+        
         var profile_filter = NostrFilter(kinds: [.contacts, .metadata, .boost])
         
         profile_filter.authors = [pubkey]

damus/Models/Report.swift

@@ -7,27 +7,11 @@
 
 import Foundation
 
-enum ReportType: String, CustomStringConvertible, CaseIterable {
+enum ReportType: String {
-    case spam
+    case explicit
-    case nudity
-    case profanity
     case illegal
+    case spam
     case impersonation
-
-    var description: String {
-        switch self {
-        case .spam:
-            return NSLocalizedString("Spam", comment: "Description of report type for spam.")
-        case .nudity:
-            return NSLocalizedString("Nudity", comment: "Description of report type for nudity.")
-        case .profanity:
-            return NSLocalizedString("Profanity", comment: "Description of report type for profanity.")
-        case .illegal:
-            return NSLocalizedString("Illegal Content", comment: "Description of report type for illegal content.")
-        case .impersonation:
-            return NSLocalizedString("Impersonation", comment: "Description of report type for impersonation.")
-        }
-    }
 }
 
 struct ReportNoteTarget {
@@ -47,12 +31,16 @@ struct Report {
 }
 
 func create_report_tags(target: ReportTarget, type: ReportType) -> [[String]] {
+    var tags: [[String]]
     switch target {
     case .user(let pubkey):
-        return [["p", pubkey, type.rawValue]]
+        tags = [["p", pubkey]]
     case .note(let notet):
-        return [["e", notet.note_id, type.rawValue], ["p", notet.pubkey]]
+        tags = [["e", notet.note_id], ["p", notet.pubkey]]
     }
+    
+    tags.append(["report", type.rawValue])
+    return tags
 }
 
 func create_report_event(privkey: String, report: Report) -> NostrEvent? {

damus/Models/SearchModel.swift

@@ -34,7 +34,7 @@ class SearchModel: ObservableObject {
     func subscribe() {
         // since 1 month
         search.limit = self.limit
-        search.kinds = [.text, .like, .longform]
+        search.kinds = [.text, .like]
 
         //likes_filter.ids = ref_events.referenced_ids!
 

damus/Models/ThreadModel.swift

@@ -10,21 +10,15 @@ import Foundation
 /// manages the lifetime of a thread
 class ThreadModel: ObservableObject {
     @Published var event: NostrEvent
-    let original_event: NostrEvent
     var event_map: Set<NostrEvent>
     
     init(event: NostrEvent, damus_state: DamusState) {
         self.damus_state = damus_state
         self.event_map = Set()
         self.event = event
-        self.original_event = event
         add_event(event)
     }
     
-    var is_original: Bool {
-        return original_event.id == event.id
-    }
-    
     let damus_state: DamusState
     
     let profiles_subid = UUID().description
@@ -107,10 +101,6 @@ class ThreadModel: ObservableObject {
             
             if ev.known_kind == .metadata {
                 process_metadata_event(events: damus_state.events, our_pubkey: damus_state.pubkey, profiles: damus_state.profiles, ev: ev)
-            } else if ev.known_kind == .zap {
-                process_zap_event(damus_state: damus_state, ev: ev) { zap in
-                    
-                }
             } else if ev.is_textlike {
                 self.add_event(ev)
             }
@@ -126,10 +116,3 @@ class ThreadModel: ObservableObject {
     }
 
 }
-
-
-func get_top_zap(events: EventCache, evid: String) -> Zapping? {
-    return events.get_cache_data(evid).zaps_model.zaps.first(where: { zap in
-        !zap.request.marked_hidden
-    })
-}

damus/Models/Trie.swift

@@ -1,129 +0,0 @@
-//
-//  Trie.swift
-//  damus
-//
-//  Created by Terry Yiu on 6/26/23.
-//
-
-import Foundation
-
-/// Tree data structure of all the substring permutations of a collection of strings optimized for searching for values of type V.
-///
-/// Each node in the tree can have child nodes.
-/// Each node represents a single character in substrings, and each of its child nodes represent the subsequent character in those substrings.
-///
-/// A node that has no children mean that there are no substrings with any additional characters beyond the branch of letters leading up to that node.
-///
-/// A node that has values mean that there are strings that end in the character represented by the node and contain the substring represented by the branch of letters leading up to that node.
-///
-/// https://en.wikipedia.org/wiki/Trie
-class Trie<V: Hashable> {
-    private var children: [Character : Trie] = [:]
-
-    /// Separate exact matches from strict substrings so that exact matches appear first in returned results.
-    private var exactMatchValues = Set<V>()
-    private var substringMatchValues = Set<V>()
-
-    private var parent: Trie? = nil
-}
-
-extension Trie {
-    var hasChildren: Bool {
-        return !self.children.isEmpty
-    }
-
-    var hasValues: Bool {
-        return !self.exactMatchValues.isEmpty || !self.substringMatchValues.isEmpty
-    }
-
-    /// Finds the branch that matches the specified key and returns the values from all of its descendant nodes.
-    func find(key: String) -> [V] {
-        var currentNode = self
-
-        // Find branch with matching prefix.
-        for char in key {
-            if let child = currentNode.children[char] {
-                currentNode = child
-            } else {
-                return []
-            }
-        }
-
-        // Perform breadth-first search from matching branch and collect values from all descendants.
-        var substringMatches = Set<V>(currentNode.substringMatchValues)
-        var queue = Array(currentNode.children.values)
-
-        while !queue.isEmpty {
-            let node = queue.removeFirst()
-            substringMatches.formUnion(node.exactMatchValues)
-            substringMatches.formUnion(node.substringMatchValues)
-            queue.append(contentsOf: node.children.values)
-        }
-
-        // Prioritize exact matches to be returned first, and then remove exact matches from the set of partial substring matches that are appended afterward.
-        return Array(currentNode.exactMatchValues) + (substringMatches.subtracting(currentNode.exactMatchValues))
-    }
-
-    /// Inserts value of type V into this trie for the specified key. This function stores all substring endings of the key, not only the key itself.
-    /// Runtime performance is O(n^2) and storage cost is O(n), where n is the number of characters in the key.
-    func insert(key: String, value: V) {
-        // Create root branches for each character of the key to enable substring searches instead of only just prefix searches.
-        // Hence the nested loop.
-        for i in 0..<key.count {
-            var currentNode = self
-
-            // Find branch with matching prefix.
-            for char in key[key.index(key.startIndex, offsetBy: i)...] {
-                if let child = currentNode.children[char] {
-                    currentNode = child
-                } else {
-                    let child = Trie()
-                    child.parent = currentNode
-                    currentNode.children[char] = child
-                    currentNode = child
-                }
-            }
-
-            if i == 0 {
-                currentNode.exactMatchValues.insert(value)
-            } else {
-                currentNode.substringMatchValues.insert(value)
-            }
-        }
-    }
-
-    /// Removes value of type V from this trie for the specified key.
-    func remove(key: String, value: V) {
-        for i in 0..<key.count {
-            var currentNode = self
-
-            var foundLeafNode = true
-
-            // Find branch with matching prefix.
-            for j in i..<key.count {
-                let char = key[key.index(key.startIndex, offsetBy: j)]
-
-                if let child = currentNode.children[char] {
-                    currentNode = child
-                } else {
-                    foundLeafNode = false
-                    break
-                }
-            }
-
-            if foundLeafNode {
-                currentNode.exactMatchValues.remove(value)
-                currentNode.substringMatchValues.remove(value)
-
-                // Clean up the tree if this leaf node no longer holds values or children.
-                for j in (i..<key.count).reversed() {
-                    if let parent = currentNode.parent, !currentNode.hasValues && !currentNode.hasChildren {
-                        currentNode = parent
-                        let char = key[key.index(key.startIndex, offsetBy: j)]
-                        currentNode.children.removeValue(forKey: char)
-                    }
-                }
-            }
-        }
-    }
-}

damus/Models/UserSearchCache.swift

@@ -1,107 +0,0 @@
-//
-//  UserSearchCache.swift
-//  damus
-//
-//  Created by Terry Yiu on 6/27/23.
-//
-
-import Foundation
-
-/// Cache of searchable users by name, display_name, NIP-05 identifier, or own contact list petname.
-/// Optimized for fast searches of substrings by using a Trie.
-/// Optimal for performing user searches that could be initiated by typing quickly on a keyboard into a text input field.
-class UserSearchCache {
-    private let trie = Trie<String>()
-
-    func search(key: String) -> [String] {
-        let results = trie.find(key: key)
-        return results
-    }
-
-    /// Computes the differences between an old profile, if it exists, and a new profile, and updates the user search cache accordingly.
-    func updateProfile(id: String, profiles: Profiles, oldProfile: Profile?, newProfile: Profile) {
-        // Remove searchable keys tied to the old profile if they differ from the new profile
-        // to keep the trie clean without empty nodes while avoiding excessive graph searching.
-        if let oldProfile {
-            if let oldName = oldProfile.name, newProfile.name?.caseInsensitiveCompare(oldName) != .orderedSame {
-                trie.remove(key: oldName.lowercased(), value: id)
-            }
-            if let oldDisplayName = oldProfile.display_name, newProfile.display_name?.caseInsensitiveCompare(oldDisplayName) != .orderedSame {
-                trie.remove(key: oldDisplayName.lowercased(), value: id)
-            }
-            if let oldNip05 = oldProfile.nip05, newProfile.nip05?.caseInsensitiveCompare(oldNip05) != .orderedSame {
-                trie.remove(key: oldNip05.lowercased(), value: id)
-            }
-        }
-
-        addProfile(id: id, profiles: profiles, profile: newProfile)
-    }
-
-    /// Adds a profile to the user search cache.
-    private func addProfile(id: String, profiles: Profiles, profile: Profile) {
-        // Searchable by name.
-        if let name = profile.name {
-            trie.insert(key: name.lowercased(), value: id)
-        }
-
-        // Searchable by display name.
-        if let displayName = profile.display_name {
-            trie.insert(key: displayName.lowercased(), value: id)
-        }
-
-        // Searchable by NIP-05 identifier.
-        if let nip05 = profiles.is_validated(id) {
-            trie.insert(key: "\(nip05.username.lowercased())@\(nip05.host.lowercased())", value: id)
-        }
-    }
-
-    /// Computes the diffences between an old contacts event and a new contacts event for our own user, and updates the search cache accordingly.
-    func updateOwnContactsPetnames(id: String, oldEvent: NostrEvent?, newEvent: NostrEvent) {
-        guard newEvent.known_kind == .contacts && newEvent.pubkey == id else {
-            return
-        }
-
-        var petnames: [String: String] = [:]
-
-        // Gets all petnames from our new contacts list.
-        newEvent.tags.forEach { tag in
-            guard tag.count >= 4 && tag[0] == "p" else {
-                return
-            }
-
-            let pubkey = tag[1]
-            let petname = tag[3]
-
-            petnames[pubkey] = petname
-        }
-
-        // Compute the diff with the old contacts list, if it exists,
-        // mark the ones that are the same to not be removed from the user search cache,
-        // and remove the old ones that are different from the user search cache.
-        if let oldEvent, oldEvent.known_kind == .contacts && oldEvent.pubkey == id {
-            oldEvent.tags.forEach { tag in
-                guard tag.count >= 4 && tag[0] == "p" else {
-                    return
-                }
-
-                let pubkey = tag[1]
-                let oldPetname = tag[3]
-
-                if let newPetname = petnames[pubkey] {
-                    if newPetname.caseInsensitiveCompare(oldPetname) == .orderedSame {
-                        petnames.removeValue(forKey: pubkey)
-                    } else {
-                        trie.remove(key: oldPetname, value: pubkey)
-                    }
-                } else {
-                    trie.remove(key: oldPetname, value: pubkey)
-                }
-            }
-        }
-
-        // Add the new petnames to the user search cache.
-        for (pubkey, petname) in petnames {
-            trie.insert(key: petname, value: pubkey)
-        }
-    }
-}

damus/Models/UserSettingsStore.swift

@@ -15,9 +15,6 @@ let fallback_zap_amount = 1000
     private var value: T
     
     init(key: String, default_value: T) {
-        if T.self == Bool.self {
-            UserSettingsStore.bool_options.insert(key)
-        }
         self.key = pk_setting_key(UserSettingsStore.pubkey ?? "", key: key)
         if let loaded = UserDefaults.standard.object(forKey: self.key) as? T {
             self.value = loaded
@@ -80,7 +77,6 @@ let fallback_zap_amount = 1000
 class UserSettingsStore: ObservableObject {
     static var pubkey: String? = nil
     static var shared: UserSettingsStore? = nil
-    static var bool_options = Set<String>()
     
     @StringSetting(key: "default_wallet", default_value: .system_default_wallet)
     var default_wallet: Wallet
@@ -88,7 +84,7 @@ class UserSettingsStore: ObservableObject {
     @StringSetting(key: "default_media_uploader", default_value: .nostrBuild)
     var default_media_uploader: MediaUploader
     
-    @Setting(key: "show_wallet_selector", default_value: false)
+    @Setting(key: "show_wallet_selector", default_value: true)
     var show_wallet_selector: Bool
     
     @Setting(key: "left_handed", default_value: false)
@@ -130,10 +126,6 @@ class UserSettingsStore: ObservableObject {
     @Setting(key: "truncate_timeline_text", default_value: false)
     var truncate_timeline_text: Bool
     
-    /// Nozaps mode gimps note zapping to fit into apple's content-tipping guidelines. It can not be configurable to end-users on the app store
-    @Setting(key: "nozaps", default_value: true)
-    var nozaps: Bool
-    
     @Setting(key: "truncate_mention_text", default_value: true)
     var truncate_mention_text: Bool
     
@@ -158,9 +150,6 @@ class UserSettingsStore: ObservableObject {
     @Setting(key: "donation_percent", default_value: 0)
     var donation_percent: Int
 
-    @Setting(key: "developer_mode", default_value: false)
-    var developer_mode: Bool
-
     // Helper for inverse of disable_animation.
     // disable_animation was introduced as a setting first, but it's more natural for the settings UI to show the inverse.
     var enable_animation: Bool {

damus/Models/ZapButtonModel.swift

@@ -10,4 +10,6 @@ import Foundation
 class ZapButtonModel: ObservableObject {
     var invoice: String? = nil
     @Published var zapping: String = ""
+    @Published var showing_select_wallet: Bool = false
+    @Published var showing_zap_customizer: Bool = false
 }

damus/Models/Zaps/CustomizeZapModel.swift

@@ -1,29 +0,0 @@
-//
-//  CustomizeZapModel.swift
-//  damus
-//
-//  Created by William Casarin on 2023-06-22.
-//
-
-import Foundation
-
-
-class CustomizeZapModel: ObservableObject {
-    @Published var comment: String = ""
-    @Published var custom_amount: String = ""
-    @Published var custom_amount_sats: Int? = nil
-    @Published var zap_type: ZapType = .pub
-    @Published var invoice: String = ""
-    @Published var error: String? = nil
-    @Published var zapping: Bool = false
-    @Published var show_zap_types: Bool = false
-    
-    init() {
-    }
-    
-    func set_defaults(settings: UserSettingsStore) {
-        self.zap_type = settings.default_zap_type
-        self.custom_amount = String(settings.default_zap_amount)
-        self.custom_amount_sats = settings.default_zap_amount
-    }
-}

damus/Models/ZapsModel.swift

@@ -53,13 +53,18 @@ class ZapsModel: ObservableObject {
         case .notice:
             break
         case .eose:
-            let events = state.events.lookup_zaps(target: target).map { $0.request.ev }
+            let events = state.events.lookup_zaps(target: target).map { $0.request }
             load_profiles(profiles_subid: profiles_subid, relay_id: relay_id, load: .from_events(events), damus_state: state)
         case .event(_, let ev):
             guard ev.kind == 9735 else {
                 return
             }
             
+            if let zap = state.zaps.zaps[ev.id] {
+                state.events.store_zap(zap: zap)
+                return
+            }
+            
             guard let zapper = state.profiles.lookup_zapper(pubkey: target.pubkey) else {
                 return
             }

damus/Nostr/Nostr.swift

@@ -100,8 +100,8 @@ class Profile: Codable {
     }
     
     var damus_donation: Int? {
-        get { return int("damus_donation_v2"); }
+        get { return int("damus_donation"); }
-        set(s) { set_int("damus_donation_v2", s) }
+        set(s) { set_int("damus_donation", s) }
     }
     
     var picture: String? {

damus/Nostr/NostrEvent.swift

@@ -36,14 +36,6 @@ struct ReferencedId: Identifiable, Hashable, Equatable {
     static func e(_ id: String, relay_id: String? = nil) -> ReferencedId {
         return ReferencedId(ref_id: id, relay_id: relay_id, key: "e")
     }
-
-    static func p(_ pk: String, relay_id: String? = nil) -> ReferencedId {
-        return ReferencedId(ref_id: pk, relay_id: relay_id, key: "p")
-    }
-
-    static func t(_ hashtag: String, relay_id: String? = nil) -> ReferencedId {
-        return ReferencedId(ref_id: hashtag, relay_id: relay_id, key: "t")
-    }
 }
 
 class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Hashable, Comparable {
@@ -76,11 +68,11 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
     let content: String
     
     var is_textlike: Bool {
-        return kind == 1 || kind == 42 || kind == 30023
+        return kind == 1 || kind == 42
     }
     
     var too_big: Bool {
-        return known_kind != .longform && self.content.utf8.count > 16000
+        return self.content.utf8.count > 16000
     }
     
     var should_show_event: Bool {
@@ -91,8 +83,8 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
         return calculate_event_id(ev: self) == self.id
     }
     
-    private var _blocks: Blocks? = nil
+    private var _blocks: [Block]? = nil
-    func blocks(_ privkey: String?) -> Blocks {
+    func blocks(_ privkey: String?) -> [Block] {
         if let bs = _blocks {
             return bs
         }
@@ -101,7 +93,7 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
         return blocks
     }
 
-    func get_blocks(content: String) -> Blocks {
+    func get_blocks(content: String) -> [Block] {
         return parse_mentions(content: content, tags: self.tags)
     }
 
@@ -126,7 +118,7 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
         if let rs = _event_refs {
             return rs
         }
-        let refs = interpret_event_refs(blocks: self.blocks(privkey).blocks, tags: self.tags)
+        let refs = interpret_event_refs(blocks: self.blocks(privkey), tags: self.tags)
         self._event_refs = refs
         return refs
     }
@@ -240,7 +232,7 @@ class NostrEvent: Codable, Identifiable, CustomStringConvertible, Equatable, Has
     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).blocks
+        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.
@@ -461,8 +453,10 @@ func make_first_contact_event(keypair: Keypair) -> NostrEvent? {
     
     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,
@@ -948,7 +942,7 @@ func last_etag(tags: [[String]]) -> String? {
 }
 
 func first_eref_mention(ev: NostrEvent, privkey: String?) -> Mention? {
-    let blocks = ev.blocks(privkey).blocks.filter { block in
+    let blocks = ev.blocks(privkey).filter { block in
         guard case .mention(let mention) = block else {
             return false
         }

damus/Nostr/NostrKind.swift

@@ -20,7 +20,6 @@ enum NostrKind: Int, Codable {
     case channel_meta = 41
     case chat = 42
     case list = 30000
-    case longform = 30023
     case zap = 9735
     case zap_request = 9734
     case nwc_request = 23194

damus/Nostr/NostrLink.swift

@@ -11,7 +11,6 @@ import Foundation
 enum NostrLink: Equatable {
     case ref(ReferencedId)
     case filter(NostrFilter)
-    case script([UInt8])
 }
 
 func encode_pubkey_uri(_ ref: ReferencedId) -> String {
@@ -23,18 +22,6 @@ func encode_event_id_uri(_ ref: ReferencedId) -> String {
     return "e:" + ref.ref_id
 }
 
-func parse_nostr_ref_uri_type(_ p: Parser) -> String? {
-    if parse_char(p, "p") {
-        return "p"
-    }
-    
-    if parse_char(p, "e") {
-        return "e"
-    }
-    
-    return nil
-}
-
 func parse_hexstr(_ p: Parser, len: Int) -> String? {
     var i: Int = 0
     
@@ -106,8 +93,6 @@ func decode_nostr_bech32_uri(_ s: String) -> NostrLink? {
         return .ref(ReferencedId(ref_id: pubkey, relay_id: nil, key: "p"))
     case .note(let id):
         return .ref(ReferencedId(ref_id: id, relay_id: nil, key: "e"))
-    case .nscript(let data):
-        return .script(data)
     }
 }
 
@@ -116,13 +101,9 @@ func decode_nostr_uri(_ s: String) -> NostrLink? {
         return decode_universal_link(s)
     }
 
-    var uri = s
+    var uri = s.replacingOccurrences(of: "nostr://", with: "")
-    uri = uri.replacingOccurrences(of: "nostr://", with: "")
     uri = uri.replacingOccurrences(of: "nostr:", with: "")
     
-    // Fix for non-latin characters resulting in second colon being encoded
-    uri = uri.replacingOccurrences(of: "damus:t%3A", with: "t:")
-    
     uri = uri.replacingOccurrences(of: "damus://", with: "")
     uri = uri.replacingOccurrences(of: "damus:", with: "")
     

damus/Nostr/NostrRequest.swift

@@ -12,28 +12,6 @@ struct NostrSubscribe {
     let sub_id: String
 }
 
-
-enum NostrRequestType {
-    case typical(NostrRequest)
-    case custom(String)
-    
-    var is_write: Bool {
-        guard case .typical(let req) = self else {
-            return true
-        }
-        
-        return req.is_write
-    }
-    
-    var is_read: Bool {
-        guard case .typical(let req) = self else {
-            return true
-        }
-        
-        return req.is_read
-    }
-}
-
 enum NostrRequest {
     case subscribe(NostrSubscribe)
     case unsubscribe(String)
@@ -53,5 +31,4 @@ enum NostrRequest {
     var is_read: Bool {
         return !is_write
     }
-    
 }

damus/Nostr/Profiles.swift

@@ -13,41 +13,23 @@ class Profiles {
     
     /// This queue is used to synchronize access to the profiles dictionary, which
     /// prevents data races from crashing the app.
-    private var profiles_queue = DispatchQueue(label: "io.damus.profiles",
+    private var queue = DispatchQueue(label: "io.damus.profiles",
-                                      qos: .userInteractive,
-                                      attributes: .concurrent)
-
-    private var validated_queue = DispatchQueue(label: "io.damus.profiles.validated",
                                       qos: .userInteractive,
                                       attributes: .concurrent)
     
     private var profiles: [String: TimestampedProfile] = [:]
-    private var validated: [String: NIP05] = [:]
+    var validated: [String: NIP05] = [:]
     var nip05_pubkey: [String: String] = [:]
     var zappers: [String: String] = [:]
     
     private let database = ProfileDatabase()
     
-    let user_search_cache: UserSearchCache
-
-    init(user_search_cache: UserSearchCache) {
-        self.user_search_cache = user_search_cache
-    }
-    
     func is_validated(_ pk: String) -> NIP05? {
-        validated_queue.sync {
         validated[pk]
     }
-    }
-
-    func set_validated(_ pk: String, nip05: NIP05?) {
-        validated_queue.async(flags: .barrier) {
-            self.validated[pk] = nip05
-        }
-    }
     
     func enumerated() -> EnumeratedSequence<[String: TimestampedProfile]> {
-        return profiles_queue.sync {
+        return queue.sync {
             return profiles.enumerated()
         }
     }
@@ -57,10 +39,8 @@ class Profiles {
     }
     
     func add(id: String, profile: TimestampedProfile) {
-        profiles_queue.async(flags: .barrier) {
+        queue.async(flags: .barrier) {
-            let old_timestamped_profile = self.profiles[id]
             self.profiles[id] = profile
-            self.user_search_cache.updateProfile(id: id, profiles: self, oldProfile: old_timestamped_profile?.profile, newProfile: profile.profile)
         }
         
         Task {
@@ -74,14 +54,14 @@ class Profiles {
     
     func lookup(id: String) -> Profile? {
         var profile: Profile?
-        profiles_queue.sync {
+        queue.sync {
             profile = profiles[id]?.profile
         }
         return profile ?? database.get(id: id)
     }
     
     func lookup_with_timestamp(id: String) -> TimestampedProfile? {
-        profiles_queue.sync {
+        queue.sync {
             return profiles[id]
         }
     }
@@ -89,7 +69,7 @@ class Profiles {
     func has_fresh_profile(id: String) -> Bool {
         // check memory first
         var profile: Profile?
-        profiles_queue.sync {
+        queue.sync {
             profile = profiles[id]?.profile
         }
         if profile != nil {

damus/Nostr/RelayConnection.swift

@@ -37,9 +37,9 @@ public struct RelayURL: Hashable {
     }
 }
 
-final class RelayConnection: ObservableObject {
+final class RelayConnection {
-    @Published private(set) var isConnected = false
+    private(set) var isConnected = false
-    @Published private(set) var isConnecting = false
+    private(set) var isConnecting = false
     
     private(set) var last_connection_attempt: TimeInterval = 0
     private(set) var last_pong: Date? = nil
@@ -49,7 +49,6 @@ final class RelayConnection: ObservableObject {
     
     private var handleEvent: (NostrConnectionEvent) -> ()
     private let url: RelayURL
-    var log: RelayLog?
 
     init(url: RelayURL, handleEvent: @escaping (NostrConnectionEvent) -> ()) {
         self.url = url
@@ -60,13 +59,11 @@ final class RelayConnection: ObservableObject {
         socket.ping { err in
             if err == nil {
                 self.last_pong = .now
-                self.log?.add("Successful ping")
             } else {
                 print("pong failed, reconnecting \(self.url.id)")
                 self.isConnected = false
                 self.isConnecting = false
                 self.reconnect_with_backoff()
-                self.log?.add("Ping failed")
             }
         }
     }
@@ -103,22 +100,12 @@ final class RelayConnection: ObservableObject {
         isConnecting = false
     }
 
-    func send_raw(_ req: String) {
+    func send(_ req: NostrRequest) {
-        socket.send(.string(req))
-    }
-    
-    func send(_ req: NostrRequestType) {
-        switch req {
-        case .typical(let req):
         guard let req = make_nostr_req(req) else {
             print("failed to encode nostr req: \(req)")
             return
         }
-            send_raw(req)
+        socket.send(.string(req))
-            
-        case .custom(let req):
-            send_raw(req)
-        }
     }
     
     private func receive(event: WebSocketEvent) {
@@ -142,11 +129,6 @@ final class RelayConnection: ObservableObject {
             }
         case .error(let error):
             print("⚠️ Warning: RelayConnection (\(self.url)) error: \(error)")
-            let nserr = error as NSError
-            if nserr.domain == NSPOSIXErrorDomain && nserr.code == 57 {
-                // ignore socket not connected?
-                return
-            }
             DispatchQueue.main.async {
                 self.isConnected = false
                 self.isConnecting = false
@@ -156,10 +138,6 @@ final class RelayConnection: ObservableObject {
         DispatchQueue.main.async {
             self.handleEvent(.ws_event(event))
         }
-        
-        if let description = event.description {
-            log?.add(description)
-        }
     }
     
     func reconnect_with_backoff() {
@@ -173,7 +151,6 @@ final class RelayConnection: ObservableObject {
         }
         disconnect()
         connect()
-        log?.add("Reconnecting...")
     }
     
     func reconnect_in(after: TimeInterval) {

damus/Nostr/RelayLog.swift

@@ -1,146 +0,0 @@
-//
-//  RelayLog.swift
-//  damus
-//
-//  Created by Bryan Montz on 6/1/23.
-//
-
-import Combine
-import Foundation
-import UIKit
-
-/// Stores a running list of events and state changes related to a relay, so that users
-/// will have information to help developers debug issues.
-final class RelayLog: ObservableObject {
-    private static let line_limit = 250
-    private let relay_url: URL?
-    private lazy var formatter: DateFormatter = {
-        let formatter = DateFormatter()
-        formatter.dateStyle = .short
-        formatter.timeStyle = .medium
-        return formatter
-    }()
-    
-    private(set) var lines = [String]()
-    
-    private var notification_token: AnyCancellable?
-    
-    /// Creates a RelayLog
-    /// - Parameter relay_url: the relay url the log represents. Pass nil for the url to create
-    /// a RelayLog that does nothing. This is required to allow RelayLog to be used as a StateObject,
-    /// because they cannot be Optional.
-    init(_ relay_url: URL? = nil) {
-        self.relay_url = relay_url
-        
-        setUp()
-    }
-    
-    private var log_files_directory: URL {
-        FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!.appendingPathComponent("RelayLogs", isDirectory: true)
-    }
-    
-    private var log_file_url: URL? {
-        guard let file_name = relay_url?.absoluteString.data(using: .utf8) else {
-            return nil
-        }
-        return log_files_directory.appendingPathComponent(file_name.base64EncodedString())
-    }
-    
-    /// Sets up the log file and prepares to listen to app state changes
-    private func setUp() {
-        guard let log_file_url else {
-            return
-        }
-        
-        try? FileManager.default.createDirectory(at: log_files_directory, withIntermediateDirectories: false)
-        
-        if !FileManager.default.fileExists(atPath: log_file_url.path) {
-            // create the log file if it doesn't exist yet
-            FileManager.default.createFile(atPath: log_file_url.path, contents: nil)
-        } else {
-            // otherwise load it into memory
-            readFromDisk()
-        }
-        
-        let willResignPublisher = NotificationCenter.default.publisher(for: UIApplication.willResignActiveNotification)
-        let willTerminatePublisher = NotificationCenter.default.publisher(for: UIApplication.willTerminateNotification)
-        notification_token = Publishers.Merge(willResignPublisher, willTerminatePublisher)
-            .sink { [weak self] _ in
-                self?.writeToDisk()
-            }
-    }
-    
-    /// The current contents of the log
-    var contents: String? {
-        guard !lines.isEmpty else {
-            return nil
-        }
-        return lines.joined(separator: "\n")
-    }
-    
-    /// Adds content to the log
-    /// - Parameter content: what to add to the log. The date and time are prepended to the content.
-    func add(_ content: String) {
-        Task {
-            await addLine(content)
-            await publishChanges()
-        }
-    }
-    
-    @MainActor private func addLine(_ line: String) {
-        let line = "\(formatter.string(from: .now)) - \(line)"
-        lines.insert(line, at: 0)
-        truncateLines()
-    }
-    
-    /// Tells views that our log has been updated
-    @MainActor private func publishChanges() {
-        objectWillChange.send()
-    }
-    
-    private func truncateLines() {
-        lines = Array(lines.prefix(RelayLog.line_limit))
-    }
-    
-    /// Reads the contents of the log file from disk into memory
-    private func readFromDisk() {
-        guard let log_file_url else {
-            return
-        }
-        
-        do {
-            let handle = try FileHandle(forReadingFrom: log_file_url)
-            let data = try handle.readToEnd()
-            try handle.close()
-            
-            guard let data, let content = String(data: data, encoding: .utf8) else {
-                return
-            }
-            
-            lines = content.components(separatedBy: "\n")
-            
-            truncateLines()
-        } catch {
-            print("⚠️ Warning: RelayLog failed to read from \(log_file_url)")
-        }
-    }
-    
-    /// Writes the contents of the lines in memory to disk
-    private func writeToDisk() {
-        guard let log_file_url, let relay_url,
-              !lines.isEmpty,
-              let content = lines.joined(separator: "\n").data(using: .utf8) else {
-            return
-        }
-        
-        do {
-            let handle = try FileHandle(forWritingTo: log_file_url)
-            
-            try handle.truncate(atOffset: 0)
-            try handle.write(contentsOf: content)
-            try handle.close()
-        } catch {
-            print("⚠️ Warning: RelayLog(\(relay_url)) failed to write to file: \(error)")
-        }
-    }
-}

damus/Nostr/RelayPool.swift

@@ -14,21 +14,15 @@ struct RelayHandler {
 }
 
 struct QueuedRequest {
-    let req: NostrRequestType
+    let req: NostrRequest
     let relay: String
-    let skip_ephemeral: Bool
-}
-
-struct SeenEvent: Hashable {
-    let relay_id: String
-    let evid: String
 }
 
 class RelayPool {
     var relays: [Relay] = []
     var handlers: [RelayHandler] = []
     var request_queue: [QueuedRequest] = []
-    var seen: Set<SeenEvent> = Set()
+    var seen: Set<String> = Set()
     var counts: [String: UInt64] = [:]
     
     private let network_monitor = NWPathMonitor()
@@ -43,12 +37,6 @@ class RelayPool {
                 }
             }
             
-            if let self, path.status != self.last_network_status {
-                for relay in self.relays {
-                    relay.connection.log?.add("Network state: \(path.status)")
-                }
-            }
-            
             self?.last_network_status = path.status
         }
         network_monitor.start(queue: network_monitor_queue)
@@ -116,13 +104,6 @@ class RelayPool {
         self.relays.append(relay)
     }
     
-    func setLog(_ log: RelayLog, for relay_id: String) {
-        // add the current network state to the log
-        log.add("Network state: \(network_monitor.currentPath.status)")
-        
-        get_relay(relay_id)?.connection.log = log
-    }
-    
     /// This is used to retry dead connections
     func connect_to_disconnected() {
         for relay in relays {
@@ -192,18 +173,18 @@ class RelayPool {
         return c
     }
     
-    func queue_req(r: NostrRequestType, relay: String, skip_ephemeral: Bool) {
+    func queue_req(r: NostrRequest, relay: String) {
         let count = count_queued(relay: relay)
         guard count <= 10 else {
             print("can't queue, too many queued events for \(relay)")
             return
         }
         
-        print("queueing request for \(relay)")
+        print("queueing request: \(r) for \(relay)")
-        request_queue.append(QueuedRequest(req: r, relay: relay, skip_ephemeral: skip_ephemeral))
+        request_queue.append(QueuedRequest(req: r, relay: relay))
     }
     
-    func send_raw(_ req: NostrRequestType, to: [String]? = nil, skip_ephemeral: Bool = true) {
+    func send(_ req: NostrRequest, to: [String]? = nil, skip_ephemeral: Bool = true) {
         let relays = to.map{ get_relays($0) } ?? self.relays
 
         for relay in relays {
@@ -220,7 +201,7 @@ class RelayPool {
             }
             
             guard relay.connection.isConnected else {
-                queue_req(r: req, relay: relay.id, skip_ephemeral: skip_ephemeral)
+                queue_req(r: req, relay: relay.id)
                 continue
             }
             
@@ -228,10 +209,6 @@ class RelayPool {
         }
     }
     
-    func send(_ req: NostrRequest, to: [String]? = nil, skip_ephemeral: Bool = true) {
-        send_raw(.typical(req), to: to, skip_ephemeral: skip_ephemeral)
-    }
-    
     func get_relays(_ ids: [String]) -> [Relay] {
         // don't include ephemeral relays in the default list to query
         relays.filter { ids.contains($0.id) }
@@ -249,14 +226,14 @@ class RelayPool {
             }
             
             print("running queueing request: \(req.req) for \(relay_id)")
-            self.send_raw(req.req, to: [relay_id], skip_ephemeral: false)
+            self.send(req.req, to: [relay_id])
         }
     }
     
     func record_seen(relay_id: String, event: NostrConnectionEvent) {
         if case .nostr_event(let ev) = event {
             if case .event(_, let nev) = ev {
-                let k = SeenEvent(relay_id: relay_id, evid: nev.id)
+                let k = relay_id + nev.id
                 if !seen.contains(k) {
                     seen.insert(k)
                     if counts[relay_id] == nil {

damus/Nostr/WebSocket.swift

@@ -13,19 +13,6 @@ enum WebSocketEvent {
     case message(URLSessionWebSocketTask.Message)
     case disconnected(URLSessionWebSocketTask.CloseCode, String?)
     case error(Error)
-    
-    var description: String? {
-        switch self {
-        case .connected:
-            return "Connected"
-        case .message(_):
-            return nil  // adding this to the RelayLog was too noisy
-        case .disconnected(let close_code, let reason):
-            return "Disconnected: Close code: \(close_code), reason: \(reason ?? "unknown")"
-        case .error(let error):
-            return "Error: \(error)"
-        }
-    }
 }
 
 final class WebSocket: NSObject, URLSessionWebSocketDelegate {

damus/TestData.swift

@@ -1,29 +0,0 @@
-//
-//  TestData.swift
-//  damus
-//
-//  Created by William Casarin on 2023-07-13.
-//
-
-import Foundation
-
-
-let test_event_holder = EventHolder(events: [], incoming: [test_event])
-
-let test_event =
-        NostrEvent(
-            content: "hello there https://jb55.com/s/Oct12-150217.png https://jb55.com/red-me.jpg cool",
-            pubkey: "pk",
-            createdAt: Int64(Date().timeIntervalSince1970 - 100)
-        )
-
-func test_damus_state() -> DamusState {
-    let pubkey = "3efdaebb1d8923ebd99c9e7ace3b4194ab45512e2be79c1b7d68d9243e0d2681"
-    let damus = DamusState.empty
-
-    let prof = Profile(name: "damus", display_name: "damus", about: "iOS app!", picture: "https://damus.io/img/logo.png", banner: "", website: "https://damus.io", lud06: nil, lud16: "jb55@sendsats.lol", nip05: "damus.io", damus_donation: nil)
-    let tsprof = TimestampedProfile(profile: prof, timestamp: 0, event: test_event)
-    damus.profiles.add(id: pubkey, profile: tsprof)
-    return damus
-}
-

damus/Util/AnyCodable/AnyEncodable.swift

@@ -91,8 +91,8 @@ extension _AnyEncodable {
             try encode(nsnumber: number, into: &container)
         case let date as Date:
             try container.encode(date)
-        case let profile_url as URL:
+        case let url as URL:
-            try container.encode(profile_url)
+            try container.encode(url)
         #endif
         case let array as [Any?]:
             try container.encode(array.map { AnyEncodable($0) })

damus/Util/Bech32Object.swift

@@ -12,7 +12,6 @@ enum Bech32Object {
     case nsec(String)
     case npub(String)
     case note(String)
-    case nscript([UInt8])
     
     static func parse(_ str: String) -> Bech32Object? {
         guard let decoded = try? bech32_decode(str) else {
@@ -25,8 +24,6 @@ enum Bech32Object {
             return .nsec(hex_encode(decoded.data))
         } else if decoded.hrp == "note" {
             return .note(hex_encode(decoded.data))
-        } else if decoded.hrp == "nscript" {
-            return .nscript(decoded.data.bytes)
         }
         
         return nil

damus/Util/DisplayName.swift

@@ -38,7 +38,7 @@ enum DisplayName {
 
 
 func parse_display_name(profile: Profile?, pubkey: String) -> DisplayName {
-    if pubkey == ANON_PUBKEY {
+    if pubkey == "anon" {
         return .one(NSLocalizedString("Anonymous", comment: "Placeholder display name of anonymous user."))
     }
     

damus/Util/EventCache.swift

@@ -62,7 +62,7 @@ class ZapsDataModel: ObservableObject {
     }
     
     func confirm_nwc(reqid: String) {
-        guard let zap = zaps.first(where: { z in z.request.ev.id == reqid }),
+        guard let zap = zaps.first(where: { z in z.request.id == reqid }),
               case .pending(let pzap) = zap
         else {
             return
@@ -83,16 +83,16 @@ class ZapsDataModel: ObservableObject {
     }
    
     func from(_ pubkey: String) -> [Zapping] {
-        return self.zaps.filter { z in z.request.ev.pubkey == pubkey }
+        return self.zaps.filter { z in z.request.pubkey == pubkey }
     }
     
     @discardableResult
     func remove(reqid: String) -> Bool {
-        guard zaps.first(where: { z in z.request.ev.id == reqid }) != nil else {
+        guard zaps.first(where: { z in z.request.id == reqid }) != nil else {
             return false
         }
         
-        self.zaps = zaps.filter { z in z.request.ev.id != reqid }
+        self.zaps = zaps.filter { z in z.request.id != reqid }
         return true
     }
 }
@@ -175,9 +175,6 @@ class EventCache {
     @discardableResult
     func store_zap(zap: Zapping) -> Bool {
         let data = get_cache_data(zap.target.id).zaps_model
-        if let ev = zap.event {
-            insert(ev)
-        }
         return insert_uniq_sorted_zap_by_amount(zaps: &data.zaps, new_zap: zap)
     }
     
@@ -185,7 +182,7 @@ class EventCache {
         switch zap.target {
         case .note(let note_target):
             let zaps = get_cache_data(note_target.note_id).zaps_model
-            zaps.remove(reqid: zap.request.ev.id)
+            zaps.remove(reqid: zap.request.id)
         case .profile:
             // these aren't stored anywhere yet
             break
@@ -204,7 +201,6 @@ class EventCache {
         return image_metadata[url.absoluteString.lowercased()]
     }
     
-    @MainActor
     func lookup_media_size(url: URL) -> CGSize? {
         if let img_meta = lookup_img_metadata(url: url) {
             return img_meta.meta.dim?.size
@@ -217,7 +213,6 @@ class EventCache {
         video_meta[url.absoluteString] = meta
     }
     
-    @MainActor
     func get_video_player_model(url: URL) -> VideoPlayerModel {
         if let model = video_meta[url.absoluteString] {
             return model
@@ -344,7 +339,7 @@ struct PreloadPlan {
     let load_preview: Bool
 }
 
-func load_preview(artifacts: NoteArtifactsSeparated) async -> Preview? {
+func load_preview(artifacts: NoteArtifacts) async -> Preview? {
     guard let link = artifacts.links.first else {
         return nil
     }
@@ -400,7 +395,7 @@ func preload_image(url: URL) {
     
     print("Preloading image \(url.absoluteString)")
     
-    KingfisherManager.shared.retrieveImage(with: Kingfisher.ImageResource(downloadURL: url)) { val in
+    KingfisherManager.shared.retrieveImage(with: ImageResource(downloadURL: url)) { val in
         print("Preloaded image \(url.absoluteString)")
     }
 }
@@ -442,12 +437,9 @@ func preload_event(plan: PreloadPlan, state: DamusState) async {
         }
     }
     
-    if plan.load_preview, note_artifact_is_separated(kind: plan.event.known_kind) {
+    if plan.load_preview {
         let arts = artifacts ?? render_note_content(ev: plan.event, profiles: profiles, privkey: our_keypair.privkey)
-        
+        let preview = await load_preview(artifacts: arts)
-        // only separated artifacts have previews
-        if case .separated(let sep) = arts {
-            let preview = await load_preview(artifacts: sep)
         DispatchQueue.main.async {
             if let preview {
                 plan.data.preview_model.state = .loaded(preview)
@@ -456,7 +448,6 @@ func preload_event(plan: PreloadPlan, state: DamusState) async {
             }
         }
     }
-    }
     
     let note_language = plan.data.translations_model.note_language ?? plan.event.note_language(our_keypair.privkey) ?? current_language()
     

damus/Util/EventHolder.swift

@@ -11,7 +11,7 @@ import Foundation
 class EventHolder: ObservableObject, ScrollQueue {
     private var has_event: Set<String>
     @Published var events: [NostrEvent]
-    var incoming: [NostrEvent]
+    @Published var incoming: [NostrEvent]
     var should_queue: Bool
     var on_queue: ((NostrEvent) -> Void)?
     

damus/Util/Extensions/KFOptionSetter+.swift

@@ -40,7 +40,7 @@ extension KFOptionSetter {
     
     func onFailure(fallbackUrl: URL?, cacheKey: String?) -> Self {
         guard let url = fallbackUrl, let key = cacheKey else { return self }
-        let imageResource = Kingfisher.ImageResource(downloadURL: url, cacheKey: key)
+        let imageResource = ImageResource(downloadURL: url, cacheKey: key)
         let source = imageResource.convertToSource()
         options.alternativeSources = [source]
         

damus/Util/Hashtags.swift

@@ -60,7 +60,7 @@ func hashtag_str(_ htag: String) -> CompatibleText {
         }
         text = Text(attributedString)
         let img = Image("\(name)-hashtag")
-        text = text + Text(img).baselineOffset(custom_hashtag.offset ?? 0.0)
+        text = text + Text("\(img)").baselineOffset(custom_hashtag.offset ?? 0.0)
     } else {
         attributedString.foregroundColor = DamusColors.purple
     }

damus/Util/Images/ImageMetadata.swift

@@ -59,15 +59,17 @@ struct ImageMetadata: Equatable {
 }
 
 func process_blurhash(blurhash: String, size: CGSize?) async -> UIImage? {
-    let res = Task.detached(priority: .low) {
+    let res = Task.init {
         let size = get_blurhash_size(img_size: size ?? CGSize(width: 100.0, height: 100.0))
         guard let img = UIImage.init(blurHash: blurhash, size: size) else {
             let noimg: UIImage? = nil
             return noimg
         }
+        
         return img
     }
     
+    
     return await res.value
 }
 
@@ -144,7 +146,7 @@ func calculate_blurhash(img: UIImage) async -> String? {
         return nil
     }
     
-    let res = Task.detached(priority: .low) {
+    let res = Task.init {
         let bhs = get_blurhash_size(img_size: img.size)
         let smaller = img.resized(to: bhs)
         

damus/Util/InsertSort.swift

@@ -11,10 +11,10 @@ func insert_uniq_sorted_zap(zaps: inout [Zapping], new_zap: Zapping, cmp: (Zappi
     var i: Int = 0
     
     for zap in zaps {
-        if new_zap.request.ev.id == zap.request.ev.id {
+        if new_zap.request.id == zap.request.id {
             // replace pending
             if !new_zap.is_pending && zap.is_pending {
-                print("nwc: replacing pending with real zap \(new_zap.request.ev.id)")
+                print("nwc: replacing pending with real zap \(new_zap.request.id)")
                 zaps[i] = new_zap
                 return true
             }

damus/Util/Keys.swift

@@ -9,7 +9,6 @@ import Foundation
 import secp256k1
 
 let PUBKEY_HRP = "npub"
-let ANON_PUBKEY = "anon"
 
 struct FullKeypair: Equatable {
     let pubkey: String
@@ -72,14 +71,6 @@ func bech32_pubkey(_ pubkey: String) -> String? {
     return bech32_encode(hrp: "npub", bytes)
 }
 
-func bech32_pubkey_decode(_ pubkey: String) -> String? {
-    guard let decoded = try? bech32_decode(pubkey), decoded.hrp == "npub" else {
-        return nil
-    }
-
-    return hex_encode(decoded.data)
-}
-
 func bech32_nopre_pubkey(_ pubkey: String) -> String? {
     guard let bytes = hex_decode(pubkey) else {
         return nil
@@ -101,18 +92,16 @@ func generate_new_keypair() -> Keypair {
     return Keypair(pubkey: pubkey, privkey: privkey)
 }
 
-func privkey_to_pubkey_raw(sec: [UInt8]) -> String? {
+func privkey_to_pubkey(privkey: String) -> String? {
+    guard let sec = hex_decode(privkey) else {
+        return nil
+    }
     guard let key = try? secp256k1.Signing.PrivateKey(rawRepresentation: sec) else {
         return nil
     }
     return hex_encode(Data(key.publicKey.xonly.bytes))
 }
 
-func privkey_to_pubkey(privkey: String) -> String? {
-    guard let sec = hex_decode(privkey) else { return nil }
-    return privkey_to_pubkey_raw(sec: sec)
-}
-
 func save_pubkey(pubkey: String) {
     UserDefaults.standard.set(pubkey, forKey: "pubkey")
 }

damus/Util/LocalizationUtil.swift

@@ -32,9 +32,3 @@ func localeToLanguage(_ locale: String) -> String? {
         return NSLocale(localeIdentifier: locale).languageCode
     }
 }
-
-/// Returns a localized string that is pluralized based on a single Int-typed count variable.
-func pluralizedString(key: String, count: Int, locale: Locale = Locale.current) -> String {
-    let format = localizedStringFormat(key: key, locale: locale)
-    return String(format: format, locale: locale, count)
-}

damus/Util/Markdown.swift

@@ -6,32 +6,6 @@
 //
 
 import Foundation
-import SwiftUI
-
-func count_leading_hashes(_ str: String) -> Int {
-    var count = 0
-    for c in str {
-        if c == "#" {
-            count += 1
-        } else {
-            break
-        }
-    }
-    
-    return count
-}
-
-func get_heading_title_size(count: Int) -> SwiftUI.Font {
-    if count >= 3 {
-        return Font.title3
-    } else if count >= 2 {
-        return Font.title2
-    } else if count >= 1 {
-        return Font.title
-    }
-    
-    return Font.body
-}
 
 public struct Markdown {
     private var detector = try? NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
@@ -46,18 +20,6 @@ public struct Markdown {
         let md_opts: AttributedString.MarkdownParsingOptions =
             .init(interpretedSyntax: .inlineOnlyPreservingWhitespace)
 
-        guard content.utf8.count > 0 else {
-            return AttributedString(stringLiteral: "")
-        }
-        
-        let leading_hashes = count_leading_hashes(content)
-        if leading_hashes > 0 {
-            if var str = try? AttributedString(markdown: content) {
-                str.font = get_heading_title_size(count: leading_hashes)
-                return str
-            }
-        }
-
         // TODO: escape unintentional markdown
         let escaped = content.replacingOccurrences(of: "\\_", with: "\\\\\\_")
         if let txt = try? AttributedString(markdown: escaped, options: md_opts) {

damus/Util/Notifications.swift

@@ -77,9 +77,6 @@ extension Notification.Name {
     static var update_stats: Notification.Name {
         return Notification.Name("update_stats")
     }
-    static var present_sheet: Notification.Name {
-        return Notification.Name("present_sheet")
-    }
     static var zapping: Notification.Name {
         return Notification.Name("zapping")
     }

damus/Util/PostBox.swift

@@ -150,7 +150,7 @@ class PostBox {
             relayer.attempts += 1
             relayer.last_attempt = Int64(Date().timeIntervalSince1970)
             relayer.retry_after *= 1.5
-            if pool.get_relay(relayer.relay) != nil {
+            if let relay = pool.get_relay(relayer.relay) {
                 print("flushing event \(event.event.id) to \(relayer.relay)")
             } else {
                 print("could not find relay when flushing: \(relayer.relay)")

damus/Util/Relays/RelayMetadatas.swift

@@ -0,0 +1,20 @@
+//
+//  RelayMetadatas.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-09.
+//
+
+import Foundation
+
+class RelayMetadatas {
+    private var metadata: [String: RelayMetadata] = [:]
+    
+    func lookup(relay_id: String) -> RelayMetadata? {
+        return metadata[relay_id]
+    }
+    
+    func insert(relay_id: String, metadata: RelayMetadata) {
+        self.metadata[relay_id] = metadata
+    }
+}

damus/Util/Relays/RelayModel.swift

@@ -1,29 +0,0 @@
-//
-//  RelayModel.swift
-//  damus
-//
-//  Created by Bryan Montz on 6/10/23.
-//
-
-import Foundation
-
-final class RelayModel: Hashable {
-    
-    let url: RelayURL
-    let log: RelayLog
-    let metadata: RelayMetadata
-
-    init(_ url: RelayURL, metadata: RelayMetadata) {
-        self.url = url
-        self.log = RelayLog(url.url)
-        self.metadata = metadata
-    }
-    
-    static func == (lhs: RelayModel, rhs: RelayModel) -> Bool {
-        lhs.url == rhs.url
-    }
-    
-    func hash(into hasher: inout Hasher) {
-        hasher.combine(url)
-    }
-}

damus/Util/Relays/RelayModelCache.swift

@@ -1,27 +0,0 @@
-//
-//  RelayModels.swift
-//  damus
-//
-//  Created by Bryan Montz on 6/10/23.
-//
-
-import Foundation
-
-final class RelayModelCache {
-    private var models = [RelayURL: RelayModel]()
-    
-    func model(withURL url: RelayURL) -> RelayModel? {
-        models[url]
-    }
-    
-    func model(with_relay_id url_string: String) -> RelayModel? {
-        guard let url = RelayURL(url_string) else {
-            return nil
-        }
-        return model(withURL: url)
-    }
-    
-    func insert(model: RelayModel) {
-        models[model.url] = model
-    }
-}

damus/Util/Router.swift

@@ -1,291 +0,0 @@
-//
-//  Router.swift
-//  damus
-//
-//  Created by Scott Penrose on 5/7/23.
-//
-
-import SwiftUI
-
-enum Route: Hashable {
-    case ProfileByKey(pubkey: String)
-    case Profile(profile: ProfileModel, followers: FollowersModel)
-    case Followers(followers: FollowersModel)
-    case Relay(relay: String, showActionButtons: Binding<Bool>)
-    case RelayDetail(relay: String, metadata: RelayMetadata)
-    case Following(following: FollowingModel)
-    case MuteList(users: [String])
-    case RelayConfig
-    case Script(script: ScriptModel)
-    case Bookmarks
-    case Config
-    case EditMetadata
-    case DMChat(dms: DirectMessageModel)
-    case UserRelays(relays: [String])
-    case KeySettings(keypair: Keypair)
-    case AppearanceSettings(settings: UserSettingsStore)
-    case NotificationSettings(settings: UserSettingsStore)
-    case ZapSettings(settings: UserSettingsStore)
-    case TranslationSettings(settings: UserSettingsStore)
-    case SearchSettings(settings: UserSettingsStore)
-    case DeveloperSettings(settings: UserSettingsStore)
-    case Thread(thread: ThreadModel)
-    case Reposts(reposts: RepostsModel)
-    case Reactions(reactions: ReactionsModel)
-    case Zaps(target: ZapTarget)
-    case Search(search: SearchModel)
-    case EULA
-    case Login
-    case CreateAccount
-    case SaveKeys(account: CreateAccountModel)
-    case Wallet(wallet: WalletModel)
-    case WalletScanner(result: Binding<WalletScanResult>)
-    case FollowersYouKnow(friendedFollowers: [String], followers: FollowersModel)
-
-    @ViewBuilder
-    func view(navigationCordinator: NavigationCoordinator, damusState: DamusState) -> some View {
-        switch self {
-        case .ProfileByKey(let pubkey):
-            ProfileView(damus_state: damusState, pubkey: pubkey)
-        case .Profile(let profile, let followers):
-            ProfileView(damus_state: damusState, profile: profile, followers: followers)
-        case .Followers(let followers):
-            FollowersView(damus_state: damusState, followers: followers)
-        case .Relay(let relay, let showActionButtons):
-            RelayView(state: damusState, relay: relay, showActionButtons: showActionButtons)
-        case .RelayDetail(let relay, let metadata):
-            RelayDetailView(state: damusState, relay: relay, nip11: metadata)
-        case .Following(let following):
-            FollowingView(damus_state: damusState, following: following)
-        case .MuteList(let users):
-            MutelistView(damus_state: damusState, users: users)
-        case .RelayConfig:
-            RelayConfigView(state: damusState)
-        case .Bookmarks:
-            BookmarksView(state: damusState)
-        case .Config:
-            ConfigView(state: damusState)
-        case .EditMetadata:
-            EditMetadataView(damus_state: damusState)
-        case .DMChat(let dms):
-            DMChatView(damus_state: damusState, dms: dms)
-        case .UserRelays(let relays):
-            UserRelaysView(state: damusState, relays: relays)
-        case .KeySettings(let keypair):
-            KeySettingsView(keypair: keypair)
-        case .AppearanceSettings(let settings):
-            AppearanceSettingsView(settings: settings)
-        case .NotificationSettings(let settings):
-            NotificationSettingsView(settings: settings)
-        case .ZapSettings(let settings):
-            ZapSettingsView(settings: settings)
-        case .TranslationSettings(let settings):
-            TranslationSettingsView(settings: settings)
-        case .SearchSettings(let settings):
-            SearchSettingsView(settings: settings)
-        case .DeveloperSettings(let settings):
-            DeveloperSettingsView(settings: settings)
-        case .Thread(let thread):
-            ThreadView(state: damusState, thread: thread)
-        case .Reposts(let reposts):
-            RepostsView(damus_state: damusState, model: reposts)
-        case .Reactions(let reactions):
-            ReactionsView(damus_state: damusState, model: reactions)
-        case .Zaps(let target):
-            ZapsView(state: damusState, target: target)
-        case .Search(let search):
-            SearchView(appstate: damusState, search: search)
-        case .EULA:
-            EULAView(nav: navigationCordinator)
-        case .Login:
-            LoginView(nav: navigationCordinator)
-        case .CreateAccount:
-            CreateAccountView(nav: navigationCordinator)
-        case .SaveKeys(let account):
-            SaveKeysView(account: account)
-        case .Wallet(let walletModel):
-            WalletView(damus_state: damusState, model: walletModel)
-        case .WalletScanner(let walletScanResult):
-            WalletScannerView(result: walletScanResult)
-        case .FollowersYouKnow(let friendedFollowers, let followers):
-            FollowersYouKnowView(damus_state: damusState, friended_followers: friendedFollowers, followers: followers)
-        case .Script(let load_model):
-            LoadScript(pool: damusState.pool, model: load_model)
-        }
-    }
-
-    static func == (lhs: Route, rhs: Route) -> Bool {
-        switch (lhs, rhs) {
-        case (.ProfileByKey (let lhs_pubkey), .ProfileByKey(let rhs_pubkey)):
-            return lhs_pubkey == rhs_pubkey
-        case (.Profile (let lhs_profile, _), .Profile(let rhs_profile, _)):
-            return lhs_profile == rhs_profile
-        case (.Followers (_), .Followers (_)):
-            return true
-        case (.Relay (let lhs_relay, _), .Relay (let rhs_relay, _)):
-            return lhs_relay == rhs_relay
-        case (.RelayDetail(let lhs_relay, _), .RelayDetail(let rhs_relay, _)):
-            return lhs_relay == rhs_relay
-        case (.Following(_), .Following(_)):
-            return true
-        case (.MuteList(let lhs_users), .MuteList(let rhs_users)):
-            return lhs_users == rhs_users
-        case (.RelayConfig, .RelayConfig):
-            return true
-        case (.Bookmarks, .Bookmarks):
-            return true
-        case (.Config, .Config):
-            return true
-        case (.EditMetadata, .EditMetadata):
-            return true
-        case (.DMChat(let lhs_dms), .DMChat(let rhs_dms)):
-            return lhs_dms.our_pubkey == rhs_dms.our_pubkey
-        case (.UserRelays(let lhs_relays), .UserRelays(let rhs_relays)):
-            return lhs_relays == rhs_relays
-        case (.KeySettings(let lhs_keypair), .KeySettings(let rhs_keypair)):
-            return lhs_keypair.pubkey == rhs_keypair.pubkey
-        case (.AppearanceSettings(_), .AppearanceSettings(_)):
-            return true
-        case (.NotificationSettings(_), .NotificationSettings(_)):
-            return true
-        case (.ZapSettings(_), .ZapSettings(_)):
-            return true
-        case (.TranslationSettings(_), .TranslationSettings(_)):
-            return true
-        case (.SearchSettings(_), .SearchSettings(_)):
-            return true
-        case (.DeveloperSettings(_), .DeveloperSettings(_)):
-            return true
-        case (.Thread(let lhs_threadModel), .Thread(thread: let rhs_threadModel)):
-            return lhs_threadModel.event.id == rhs_threadModel.event.id
-        case (.Reposts(let lhs_reposts), .Reposts(let rhs_reposts)):
-            return lhs_reposts.target == rhs_reposts.target
-        case (.Reactions(let lhs_reactions), .Reactions(let rhs_reactions)):
-            return lhs_reactions.target == rhs_reactions.target
-        case (.Zaps(let lhs_target), .Zaps(let rhs_target)):
-            return lhs_target == rhs_target
-        case (.Search(let lhs_search), .Search(let rhs_search)):
-            return lhs_search.sub_id == rhs_search.sub_id && lhs_search.profiles_subid == rhs_search.profiles_subid
-        case (.EULA, .EULA):
-            return true
-        case (.Login, .Login):
-            return true
-        case (.CreateAccount, .CreateAccount):
-            return true
-        case (.SaveKeys(let lhs_account), .SaveKeys(let rhs_account)):
-            return lhs_account.pubkey == rhs_account.pubkey
-        case (.Wallet(_), .Wallet(_)):
-            return true
-        case (.WalletScanner(_), .WalletScanner(_)):
-            return true
-        case (.FollowersYouKnow(_, _), .FollowersYouKnow(_, _)):
-            return true
-        case (.Script(_), .Script(_)):
-            return true
-        default:
-            return false
-        }
-    }
-
-    func hash(into hasher: inout Hasher) {
-        switch self {
-        case .ProfileByKey(let pubkey):
-            hasher.combine("profilebykey")
-            hasher.combine(pubkey)
-        case .Profile(let profile, _):
-            hasher.combine("profile")
-            hasher.combine(profile.pubkey)
-        case .Followers(_):
-            hasher.combine("followers")
-        case .Relay(let relay, _):
-            hasher.combine("relay")
-            hasher.combine(relay)
-        case .RelayDetail(let relay, _):
-            hasher.combine("relayDetail")
-            hasher.combine(relay)
-        case .Following(_):
-            hasher.combine("following")
-        case .MuteList(let users):
-            hasher.combine("muteList")
-            hasher.combine(users)
-        case .RelayConfig:
-            hasher.combine("relayConfig")
-        case .Bookmarks:
-            hasher.combine("bookmarks")
-        case .Config:
-            hasher.combine("config")
-        case .EditMetadata:
-            hasher.combine("editMetadata")
-        case .DMChat(let dms):
-            hasher.combine("dms")
-            hasher.combine(dms.our_pubkey)
-        case .UserRelays(let relays):
-            hasher.combine("userRelays")
-            hasher.combine(relays)
-        case .KeySettings(let keypair):
-            hasher.combine("keySettings")
-            hasher.combine(keypair.pubkey)
-        case .AppearanceSettings(_):
-            hasher.combine("appearanceSettings")
-        case .NotificationSettings(_):
-            hasher.combine("notificationSettings")
-        case .ZapSettings(_):
-            hasher.combine("zapSettings")
-        case .TranslationSettings(_):
-            hasher.combine("translationSettings")
-        case .SearchSettings(_):
-            hasher.combine("searchSettings")
-        case .DeveloperSettings:
-            hasher.combine("developerSettings")
-        case .Thread(let threadModel):
-            hasher.combine("thread")
-            hasher.combine(threadModel.event.id)
-        case .Reposts(let reposts):
-            hasher.combine("reposts")
-            hasher.combine(reposts.target)
-        case .Zaps(let target):
-            hasher.combine("zaps")
-            hasher.combine(target.id)
-            hasher.combine(target.pubkey)
-        case .Reactions(let reactions):
-            hasher.combine("reactions")
-            hasher.combine(reactions.target)
-        case .Search(let search):
-            hasher.combine("search")
-            hasher.combine(search.sub_id)
-            hasher.combine(search.profiles_subid)
-        case .EULA:
-            hasher.combine("eula")
-        case .Login:
-            hasher.combine("login")
-        case .CreateAccount:
-            hasher.combine("createAccount")
-        case .SaveKeys(let account):
-            hasher.combine("saveKeys")
-            hasher.combine(account.pubkey)
-        case .Wallet(_):
-            hasher.combine("wallet")
-        case .WalletScanner(_):
-            hasher.combine("walletScanner")
-        case .FollowersYouKnow(let friendedFollowers, let followers):
-            hasher.combine("followersYouKnow")
-            hasher.combine(friendedFollowers)
-            hasher.combine(followers.sub_id)
-        case .Script(let model):
-            hasher.combine("script")
-            hasher.combine(model.data.count)
-        }
-    }
-}
-
-class NavigationCoordinator: ObservableObject {
-    @Published var path = [Route]()
-
-    func push(route: Route) {
-        path.append(route)
-    }
-
-    func popToRoot() {
-        path = []
-    }
-}

damus/Util/Zap.swift

@@ -41,16 +41,7 @@ public enum ZapTarget: Equatable {
 
 struct ZapRequest {
     let ev: NostrEvent
-    let marked_hidden: Bool
     
-    var is_in_thread: Bool {
-        return !self.ev.content.isEmpty && !marked_hidden
-    }
-    
-    init(ev: NostrEvent) {
-        self.ev = ev
-        self.marked_hidden = ev.tags.first(where: { t in t.count > 0 && t[0] == "hidden" }) != nil
-    }
 }
 
 enum ExtPendingZapStateType {
@@ -138,7 +129,7 @@ struct ZapRequestId: Equatable {
     let reqid: String
     
     init(from_zap: Zapping) {
-        self.reqid = from_zap.request.ev.id
+        self.reqid = from_zap.request.id
     }
     
     init(from_makezap: MakeZapRequest) {
@@ -207,12 +198,12 @@ enum Zapping {
         }
     }
     
-    var request: ZapRequest {
+    var request: NostrEvent {
         switch self {
         case .zap(let zap):
-            return zap.request
+            return zap.request_ev
         case .pending(let pzap):
-            return pzap.request
+            return pzap.request.ev
         }
     }
     
@@ -236,15 +227,6 @@ enum Zapping {
         }
     }
     
-    var is_in_thread: Bool {
-        switch self {
-        case .zap(let zap):
-            return zap.request.is_in_thread
-        case .pending(let pzap):
-            return pzap.request.is_in_thread
-        }
-    }
-    
     var is_anon: Bool {
         switch self {
         case .zap(let zap):
@@ -260,12 +242,12 @@ struct Zap {
     public let invoice: ZapInvoice
     public let zapper: String /// zap authorizer
     public let target: ZapTarget
-    public let raw_request: ZapRequest
+    public let request: ZapRequest
     public let is_anon: Bool
-    public let private_request: ZapRequest?
+    public let private_request: NostrEvent?
     
-    var request: ZapRequest {
+    var request_ev: NostrEvent {
-        return private_request ?? self.raw_request
+        return private_request ?? self.request.ev
     }
     
     public static func from_zap_event(zap_ev: NostrEvent, zapper: String, our_privkey: String?) -> Zap? {
@@ -313,9 +295,8 @@ struct Zap {
         }
         
         let is_anon = private_request == nil && event_is_anonymous(ev: zap_req)
-        let preq = private_request.map { pr in ZapRequest(ev: pr) }
         
-        return Zap(event: zap_ev, invoice: zap_invoice, zapper: zapper, target: target, raw_request: ZapRequest(ev: zap_req), is_anon: is_anon, private_request: preq)
+        return Zap(event: zap_ev, invoice: zap_invoice, zapper: zapper, target: target, request: ZapRequest(ev: zap_req), is_anon: is_anon, private_request: private_request)
     }
 }
 
@@ -360,7 +341,7 @@ func determine_zap_target(_ ev: NostrEvent) -> ZapTarget? {
 }
                    
 func decode_bolt11(_ s: String) -> Invoice? {
-    var bs = note_blocks()
+    var bs = blocks()
     bs.num_blocks = 0
     blocks_init(&bs)
     

damus/Util/Zaps.swift

@@ -8,12 +8,12 @@
 import Foundation
 
 class Zaps {
-    private(set) var zaps: [String: Zapping]
+    var zaps: [String: Zapping]
     let our_pubkey: String
     var our_zaps: [String: [Zapping]]
     
-    private(set) var event_counts: [String: Int]
+    var event_counts: [String: Int]
-    private(set) var event_totals: [String: Int64]
+    var event_totals: [String: Int64]
     
     init(our_pubkey: String) {
         self.zaps = [:]
@@ -27,13 +27,13 @@ class Zaps {
         var res: Zapping? = nil
         for kv in our_zaps {
             let ours = kv.value
-            guard let zap = ours.first(where: { z in z.request.ev.id == reqid }) else {
+            guard let zap = ours.first(where: { z in z.request.id == reqid }) else {
                 continue
             }
             
             res = zap
             
-            our_zaps[kv.key] = ours.filter { z in z.request.ev.id != reqid }
+            our_zaps[kv.key] = ours.filter { z in z.request.id != reqid }
             
             if let count = event_counts[zap.target.id] {
                 event_counts[zap.target.id] = count - 1
@@ -51,16 +51,13 @@ class Zaps {
     }
     
     func add_zap(zap: Zapping) {
-        if zaps[zap.request.ev.id] != nil {
+        if zaps[zap.request.id] != nil {
             return
         }
-        self.zaps[zap.request.ev.id] = zap
+        self.zaps[zap.request.id] = zap
-        if let zap_id = zap.event?.id {
-            self.zaps[zap_id] = zap
-        }
         
         // record our zaps for an event
-        if zap.request.ev.pubkey == our_pubkey {
+        if zap.request.pubkey == our_pubkey {
             switch zap.target {
             case .note(let note_target):
                 if our_zaps[note_target.note_id] == nil {
@@ -74,7 +71,7 @@ class Zaps {
         }
         
         // don't count tips to self. lame.
-        guard zap.request.ev.pubkey != zap.target.pubkey else {
+        guard zap.request.pubkey != zap.target.pubkey else {
             return
         }
         

damus/Views/ActionBar/EventActionBar.swift

@@ -56,9 +56,13 @@ struct EventActionBar: View {
             HStack(spacing: 4) {
                 
                 EventActionButton(img: "repost", col: bar.boosted ? Color.green : nil) {
+                    if bar.boosted {
+                        notify(.delete, bar.our_boost)
+                    } else {
                         self.show_repost_action = true
                     }
-                .accessibilityLabel(NSLocalizedString("Reposts", comment: "Accessibility label for boosts button"))
+                }
+                .accessibilityLabel(NSLocalizedString("Boosts", comment: "Accessibility label for boosts button"))
                 Text(verbatim: "\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
                     .font(.footnote.weight(.medium))
                     .foregroundColor(bar.boosted ? Color.green : Color.gray)
@@ -91,7 +95,7 @@ struct EventActionBar: View {
             EventActionButton(img: "upload", col: Color.gray) {
                 show_share_action = true
             }
-            .accessibilityLabel(NSLocalizedString("Share", comment: "Button to share a note"))
+            .accessibilityLabel(NSLocalizedString("Share", comment: "Button to share a post"))
         }
         .onAppear {
             self.bar.update(damus: damus_state, evid: self.event.id)

damus/Views/ActionBar/EventDetailBar.swift

@@ -25,27 +25,25 @@ struct EventDetailBar: View {
     var body: some View {
         HStack {
             if bar.boosts > 0 {
-                NavigationLink(value: Route.Reposts(reposts: RepostsModel(state: state, target: target))) {
+                NavigationLink(destination: RepostsView(damus_state: state, model: RepostsModel(state: state, target: target))) {
-                    let nounString = pluralizedString(key: "reposts_count", count: bar.boosts)
+                    let noun = Text(verbatim: repostsCountString(bar.boosts)).foregroundColor(.gray)
-                    let noun = Text(nounString).foregroundColor(.gray)
                     Text("\(Text(verbatim: bar.boosts.formatted()).font(.body.bold())) \(noun)", comment: "Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.")
                 }
                 .buttonStyle(PlainButtonStyle())
             }
 
             if bar.likes > 0 && !state.settings.onlyzaps_mode {
-                NavigationLink(value: Route.Reactions(reactions: ReactionsModel(state: state, target: target))) {
+                NavigationLink(destination: ReactionsView(damus_state: state, model: ReactionsModel(state: state, target: target))) {
-                    let nounString = pluralizedString(key: "reactions_count", count: bar.likes)
+                    let noun = Text(verbatim: reactionsCountString(bar.likes)).foregroundColor(.gray)
-                    let noun = Text(nounString).foregroundColor(.gray)
                     Text("\(Text(verbatim: bar.likes.formatted()).font(.body.bold())) \(noun)", comment: "Sentence composed of 2 variables to describe how many reactions there are on a post. In source English, the first variable is the number of reactions, and the second variable is 'Reaction' or 'Reactions'.")
                 }
                 .buttonStyle(PlainButtonStyle())
             }
             
             if bar.zaps > 0 {
-                NavigationLink(value: Route.Zaps(target: .note(id: target, author: target_pk))) {
+                let dst = ZapsView(state: state, target: .note(id: target, author: target_pk))
-                    let nounString = pluralizedString(key: "zaps_count", count: bar.zaps)
+                NavigationLink(destination: dst) {
-                    let noun = Text(nounString).foregroundColor(.gray)
+                    let noun = Text(verbatim: zapsCountString(bar.zaps)).foregroundColor(.gray)
                     Text("\(Text(verbatim: bar.zaps.formatted()).font(.body.bold())) \(noun)", comment: "Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'.")
                 }
                 .buttonStyle(PlainButtonStyle())
@@ -54,6 +52,21 @@ struct EventDetailBar: View {
     }
 }
 
+func repostsCountString(_ count: Int, locale: Locale = Locale.current) -> String {
+    let format = localizedStringFormat(key: "reposts_count", locale: locale)
+    return String(format: format, locale: locale, count)
+}
+
+func reactionsCountString(_ count: Int, locale: Locale = Locale.current) -> String {
+    let format = localizedStringFormat(key: "reactions_count", locale: locale)
+    return String(format: format, locale: locale, count)
+}
+
+func zapsCountString(_ count: Int, locale: Locale = Locale.current) -> String {
+    let format = localizedStringFormat(key: "zaps_count", locale: locale)
+    return String(format: format, locale: locale, count)
+}
+
 struct EventDetailBar_Previews: PreviewProvider {
     static var previews: some View {
         EventDetailBar(state: test_damus_state(), target: "", target_pk: "")

damus/Views/BannerImageView.swift

@@ -8,33 +8,6 @@
 import SwiftUI
 import Kingfisher
 
-struct EditBannerImageView: View {
-    
-    var damus_state: DamusState
-    @ObservedObject var viewModel: ImageUploadingObserver
-    let callback: (URL?) -> Void
-    let defaultImage = UIImage(named: "profile-banner") ?? UIImage()
-    
-    @State var banner_image: URL? = nil
-
-    var body: some View {
-        ZStack {
-            Color(uiColor: .systemBackground)
-            KFAnimatedImage(get_banner_url(banner: banner_image?.absoluteString, pubkey: damus_state.pubkey, profiles: damus_state.profiles))
-                .imageContext(.banner, disable_animation: damus_state.settings.disable_animation)
-                .configure { view in
-                    view.framePreloadCount = 3
-                }
-                .placeholder { _ in
-                    Color(uiColor: .secondarySystemBackground)
-                }
-                .onFailureImage(defaultImage)
-            
-            EditPictureControl(uploader: damus_state.settings.default_media_uploader, pubkey: damus_state.pubkey, image_url: $banner_image, uploadObserver: viewModel, callback: callback)
-        }
-    }
-}
-
 struct InnerBannerImageView: View {
     let disable_animation: Bool
     let url: URL?

damus/Views/BookmarksView.swift

@@ -38,6 +38,7 @@ struct BookmarksView: View {
             } else {
                 ScrollView {
                     InnerTimelineView(events: EventHolder(events: bookmarks, incoming: []), damus: state, filter: noneFilter)
+
                 }
             }
         }

damus/Views/CarouselView.swift

@@ -21,7 +21,7 @@ let carousel_items = [
     CarouselItem(image: Image("undercover"),
                  text: Text("\(Text("Private", comment: "Heading indicating that this application keeps personally identifiable information private. A sentence describing what is done to keep data private comes after this heading.").bold()). Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.", comment: "Explanation of what is done to keep personally identifiable information private. There is a heading that precedes this explanation which is a variable to this string.")),
     CarouselItem(image: Image("bitcoin-p2p"),
-                 text: Text("\(Text("Earn Money", comment: "Heading indicating that this application allows users to earn money.").bold()). Tip your friends and stack sats with Bitcoin⚡️, the native currency of the internet.", comment: "Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string."))
+                 text: Text("\(Text("Earn Money", comment: "Heading indicating that this application allows users to earn money.").bold()). Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet.", comment: "Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string."))
 ]
 
 struct CarouselView: View {

damus/Views/ConfigView.swift

@@ -36,34 +36,31 @@ struct ConfigView: View {
         ZStack(alignment: .leading) {
             Form {
                 Section {
-                    NavigationLink(value: Route.KeySettings(keypair: state.keypair)) {
+                    NavigationLink(destination: KeySettingsView(keypair: state.keypair)) {
-                        IconLabel(NSLocalizedString("Keys", comment: "Settings section for managing keys"), img_name: "Key", color: .purple)
+                        IconLabel(NSLocalizedString("Keys", comment: "Settings section for managing keys"), img_name: "key", color: .purple)
                     }
                     
-                    NavigationLink(value: Route.AppearanceSettings(settings: settings)) {
+                    NavigationLink(destination: AppearanceSettingsView(settings: settings)) {
                         IconLabel(NSLocalizedString("Appearance", comment: "Section header for text and appearance settings"), img_name: "eye", color: .red)
                     }
                     
-                    NavigationLink(value: Route.SearchSettings(settings: settings)) {
+                    NavigationLink(destination: SearchSettingsView(settings: settings)) {
-                        IconLabel(NSLocalizedString("Search/Universe", comment: "Section header for search/universe settings"), img_name: "search", color: .red)
+                        IconLabel(NSLocalizedString("Search/Universe", comment: "Section header for search/universe settings"), img_name: "magnifyingglass", color: .red)
                     }
                     
-                    NavigationLink(value: Route.NotificationSettings(settings: settings)) {
+                    NavigationLink(destination: NotificationSettingsView(settings: settings)) {
                         IconLabel(NSLocalizedString("Notifications", comment: "Section header for Damus notifications"), img_name: "notification-bell-on", color: .blue)
                     }
                     
-                    NavigationLink(value: Route.ZapSettings(settings: settings)) {
+                    NavigationLink(destination: ZapSettingsView(settings: settings)) {
                         IconLabel(NSLocalizedString("Zaps", comment: "Section header for zap settings"), img_name: "zap.fill", color: .orange)
                     }
                     
-                    NavigationLink(value: Route.TranslationSettings(settings: settings)) {
+                    NavigationLink(destination: TranslationSettingsView(settings: settings)) {
                         IconLabel(NSLocalizedString("Translation", comment: "Section header for text and appearance settings"), img_name: "globe", color: .green)
                     }
+                }
                 
-                    NavigationLink(value: Route.DeveloperSettings(settings: settings)) {
-                        IconLabel(NSLocalizedString("Developer", comment: "Section header for developer settings"), img_name: "magic-stick2.fill", color: DamusColors.adaptableBlack)
-                    }
-                }
 
                 Section(NSLocalizedString("Sign Out", comment: "Section title for signing out")) {
                     Button(action: {

damus/Views/CreateAccountView.swift

@@ -9,8 +9,9 @@ import SwiftUI
 
 struct CreateAccountView: View {
     @StateObject var account: CreateAccountModel = CreateAccountModel()
-    @StateObject var profileUploadObserver = ImageUploadingObserver()
+    @StateObject var profileUploadViewModel = ProfileUploadingViewModel()
-    var nav: NavigationCoordinator
+    
+    @State var is_done: Bool = false
     
     func SignupForm<FormContent: View>(@ViewBuilder content: () -> FormContent) -> some View {
         return VStack(alignment: .leading, spacing: 10.0, content: content)
@@ -24,9 +25,13 @@ struct CreateAccountView: View {
     
     var body: some View {
         ZStack(alignment: .top) {
+            NavigationLink(destination: SaveKeysView(account: account), isActive: $is_done) {
+                EmptyView()
+            }
+            
             VStack {
                 VStack(alignment: .center) {
-                    EditPictureControl(uploader: .nostrBuild, pubkey: account.pubkey, image_url: $account.profile_image , uploadObserver: profileUploadObserver, callback: uploadedProfilePicture)
+                    ProfilePictureSelector(pubkey: account.pubkey, viewModel: profileUploadViewModel, callback: uploadedProfilePicture(image_url:))
 
                     Text(NSLocalizedString("Public Key", comment: "Label to indicate the public key of the account."))
                         .bold()
@@ -58,7 +63,7 @@ struct CreateAccountView: View {
                 .padding(.top, 10)
 
                 Button(action: {
-                    nav.push(route: Route.SaveKeys(account: account))
+                    self.is_done = true
                 }) {
                     HStack {
                         Text("Create account now", comment:  "Button to create account.")
@@ -67,8 +72,8 @@ struct CreateAccountView: View {
                     .frame(minWidth: 300, maxWidth: .infinity, maxHeight: 12, alignment: .center)
                 }
                 .buttonStyle(GradientButtonStyle())
-                .disabled(profileUploadObserver.isLoading)
+                .disabled(profileUploadViewModel.isLoading)
-                .opacity(profileUploadObserver.isLoading ? 0.5 : 1)
+                .opacity(profileUploadViewModel.isLoading ? 0.5 : 1)
                 .padding(.top, 20)
 
                 LoginPrompt()
@@ -83,7 +88,7 @@ struct CreateAccountView: View {
     }
     
     func uploadedProfilePicture(image_url: URL?) {
-        account.profile_image = image_url
+        account.profile_image = image_url?.absoluteString
     }
 }
 
@@ -91,7 +96,7 @@ struct LoginPrompt: View {
     @Environment(\.dismiss) var dismiss
     var body: some View {
         HStack {
-            Text("Already on Nostr?", comment: "Ask the user if they already have an account on Nostr")
+            Text("Already on nostr?", comment: "Ask the user if they already have an account on nostr")
                 .foregroundColor(Color("DamusMediumGrey"))
 
             Button(NSLocalizedString("Login", comment: "Button to navigate to login view.")) {
@@ -107,7 +112,7 @@ struct BackNav: View {
     @Environment(\.dismiss) var dismiss
     var body: some View {
         Image("chevron-left")
-            .foregroundColor(DamusColors.adaptableBlack)
+            .foregroundColor(.white)
         .onTapGesture {
             self.dismiss()
         }
@@ -130,7 +135,7 @@ extension View {
 struct CreateAccountView_Previews: PreviewProvider {
     static var previews: some View {
         let model = CreateAccountModel(real: "", nick: "jb55", about: "")
-        return CreateAccountView(account: model, nav: .init())
+        return CreateAccountView(account: model)
     }
 }
 
@@ -162,7 +167,7 @@ func FormLabel(_ title: String, optional: Bool = false) -> some View {
         Text(title)
                 .bold()
         if optional {
-            Text("optional", comment: "Label indicating that a form input is optional.")
+            Text("- optional", comment: "Label indicating that a form input is optional.")
                 .font(.callout)
                 .foregroundColor(DamusColors.mediumGrey)
         }