Fix CI tests

Changelog-Fixed: Fix CI tests
2023-05-30 20:20:32 -04:00
279 changed files with 3906 additions and 17974 deletions
--- a/.envrc
+++ b/.envrc
@@ -1,4 +1,4 @@
-use nix
+#use nix

 export TODO_FILE=$PWD/TODO

--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -5,7 +5,6 @@ on:
  push:
    branches:
      - "master"
-      - "ci"
  pull_request:
    branches:
      - "*"
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@ xcuserdata
 damus/TestingPrivate.swift
 .DS_Store
 TODO.bak
-tags
--- a/.mailmap
+++ b/.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>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,149 +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
-
- Add new full-bleed video player (William Casarin)
- Add ability to show multiple posts per user in Universe (Ben Weeks)
- Custom iconography added for other areas of the app. (Ben Weeks)
- Custom iconography for the left navigation. (Ben Weeks)
- Custom iconography for the tab buttons. (Ben Weeks)
- Added dots under image carousel (Ben Weeks)
- Add profile caching (Bryan Montz)
- Add mention parsing and fine-grained text selection on description in ProfileView (Terry Yiu)
-
-
-### Changed
-
- Redesign phase 1 (text, icons)
- Updated UI to use custom font (Ben Weeks)
-
-### Fixed
-
- Fix side menu bug in landscape (OlegAba)
- Use "Follow me on nostr" text when looking at someone else's QR code (Ben Weeks)
- Fix issue where cursor dissapears when typing long message (gladiusKatana)
- Attempt fix for randomly broken animated gifs (William Casarin)
- Fix cursor jumping when pressing return (gladius)
- Fix side menu label size so that translations in longer languages fit without wrapping (Terry Yiu)
- Fix reaction notification title to be consistent with ReactionView (Terry Yiu)
- Fix nostr URL scheme to open properly even if there's already a different view open (Terry Yiu)
- Fix crash related to preloading events (Bryan Montz)
-
-
 ## v1.4.3 - 2023-05-08

 ### Added
--- a/8
+++ b/8
@@ -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
--- a/README.md
+++ b/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
- [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)
+[git-send-email]: http://git-send-email.io

 ### 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.
--- a/damus-c/block.h
+++ b/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 {
-    int words;
+typedef struct blocks {
    int num_blocks;
-    struct note_block *blocks;
+    struct block *blocks;
 } blocks_t;

-void blocks_init(struct note_blocks *blocks);
-void blocks_free(struct note_blocks *blocks);
+void blocks_init(struct blocks *blocks);
+void blocks_free(struct blocks *blocks);

 #endif /* block_h */
--- a/damus-c/cursor.h
+++ b/damus-c/cursor.h
@@ -1,438 +1,30 @@
+//
+//  cursor.h
+//  damus
+//
+//  Created by William Casarin on 2023-04-09.
+//

-#ifndef PROTOVERSE_CURSOR_H
-#define PROTOVERSE_CURSOR_H
+#ifndef 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)
-#define likely(x)   __builtin_expect((x),1)
+typedef unsigned char u8;

 struct cursor {
-	unsigned char *start;
-	unsigned char *p;
-	unsigned char *end;
+    const u8 *p;
+    const u8 *start;
+    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 */
--- a/damus-c/damus-Bridging-Header.h
+++ b/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"
-
--- a/damus-c/damus.c
+++ b/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) {
-    u8 *start = cur->p;
+static int parse_url(struct cursor *cur, struct block *block) {
+    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) {
-    u8 *start, *end;
+static int parse_invoice(struct cursor *cur, struct block *block) {
+    const u8 *start, *end;
    char *fail;
    struct bolt11 *bolt11;
    // optional
@@ -177,12 +177,12 @@ static int parse_invoice(struct cursor *cur, struct note_block *block) {
 }


-static int parse_mention_bech32(struct cursor *cur, struct note_block *block) {
-    u8 *start = cur->p;
+static int parse_mention_bech32(struct cursor *cur, struct block *block) {
+    const u8 *start = cur->p;
+    
+    if (!parse_str(cur, "nostr:"))
+        return 0;
    
-    parse_char(cur, '@');
-    parse_str(cur, "nostr:");
-
    block->block.str.start = (const char *)cur->p;
    
    if (!parse_nostr_bech32(cur, &block->block.mention_bech32.bech32)) {
@@ -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;
-    u8 *start, *pre_mention;
+    struct block block;
+    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) {
-    blocks->blocks = malloc(sizeof(struct note_block) * MAX_BLOCKS);
+void blocks_init(struct blocks *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;
    }
--- a/damus-c/damus.h
+++ b/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 */
--- a/damus-c/debug.h
+++ b/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 */
--- a/damus-c/error.c
+++ b/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;
-}
-
--- a/damus-c/error.h
+++ b/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 */
--- a/damus-c/likely.h
+++ b/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>

--- a/damus-c/nostr_bech32.c
+++ b/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;
--- a/damus-c/nostr_bech32.h
+++ b/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;
--- a/damus-c/nostrscript.c
+++ b/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;
-}
--- a/damus-c/nostrscript.h
+++ b/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 */
--- a/damus-c/parser.h
+++ b/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 */
-
--- a/damus-c/typedefs.h
+++ b/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 */
--- a/damus-c/varint.h
+++ b/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 */
--- a/damus-c/wasm.c
+++ b/damus-c/wasm.c
--- a/damus-c/wasm.h
+++ b/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 */
--- a/damus.xcodeproj/project.pbxproj
+++ b/damus.xcodeproj/project.pbxproj
--- a/damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/damus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,14 +1,5 @@
 {
  "pins" : [
-    {
-      "identity" : "gsplayer",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/wxxsw/GSPlayer",
-      "state" : {
-        "revision" : "aa6dad7943d52f5207f7fcc2ad3e4274583443b8",
-        "version" : "0.2.26"
-      }
-    },
    {
      "identity" : "kingfisher",
      "kind" : "remoteSourceControl",
--- a/damus.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
+++ b/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"
--- a/damus.xcodeproj/xcshareddata/xcschemes/damus.xcscheme
+++ b/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"
--- a/damus/Components/CarouselDotsView.swift
+++ b/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
-    }
-}
--- a/damus/Components/GradientButtonStyle.swift
+++ b/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)
            }
--- a/damus/Components/Gradients/DamusBackground.swift
+++ b/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()
-    }
-}
--- a/damus/Components/Gradients/PinkGradient.swift
+++ b/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 PinkGradientView: View {
+struct PinkGradient: View {
    var body: some View {
-        PinkGradient
+        PinkGradient.gradient
            .edgesIgnoringSafeArea([.top,.bottom])
    }
-}
-
-struct PinkGradientView_Previews: PreviewProvider {
-    static var previews: some View {
-        PinkGradientView()
+    
+    static var gradient: LinearGradient {
+         LinearGradient(colors: pink_grad, startPoint: .topTrailing, endPoint: .bottom)
+    }
+}
+
+struct PinkGradient_Previews: PreviewProvider {
+    static var previews: some View {
+        PinkGradient()
    }
 }

--- a/damus/Components/ImageCarousel.swift
+++ b/damus/Components/ImageCarousel.swift
@@ -53,9 +53,8 @@ enum ImageShape {
 }

 // MARK: - Image Carousel
-@MainActor
 struct ImageCarousel: View {
-    var urls: [MediaUrl]
+    var urls: [URL]
    
    let evid: String
    
@@ -70,13 +69,11 @@ struct ImageCarousel: View {
    @State private var firstImageHeight: CGFloat? = nil
    @State private var currentImageHeight: CGFloat?
    @State private var selectedIndex = 0
-    @State private var video_size: CGSize? = nil
    
-    init(state: DamusState, evid: String, urls: [MediaUrl]) {
+    init(state: DamusState, evid: String, urls: [URL]) {
        _open_sheet = State(initialValue: false)
        _current_url = State(initialValue: nil)
-        let media_model = state.events.get_cache_data(evid).media_metadata_model
-        _image_fill = State(initialValue: media_model.fill)
+        _image_fill = State(initialValue: state.previews.lookup_image_meta(evid))
        self.urls = urls
        self.evid = evid
        self.state = state
@@ -105,113 +102,103 @@ struct ImageCarousel: View {
            }
        }
        .onAppear {
-            if self.image_fill == nil, let size = state.events.lookup_media_size(url: url) {
+            if self.image_fill == nil,
+               let meta = state.events.lookup_img_metadata(url: url),
+               let size = meta.meta.dim?.size
+            {
                let fill = ImageFill.calculate_image_fill(geo_size: geo_size, img_size: size, maxHeight: maxHeight, fillHeight: fillHeight)
                self.image_fill = fill
            }
        }
    }
    
-    func video_model(_ url: URL) -> VideoPlayerModel {
-        return state.events.get_video_player_model(url: url)
-    }
-    
-    func Media(geo: GeometryProxy, url: MediaUrl, index: Int) -> some View {
-        Group {
-            switch url {
-            case .image(let url):
-                Img(geo: geo, url: url, index: index)
-                    .onTapGesture {
-                        open_sheet = true
-                    }
-            case .video(let url):
-                DamusVideoPlayer(url: url, model: video_model(url), video_size: $video_size)
-                    .onChange(of: video_size) { size in
-                        guard let size else { return }
-                        
-                        let fill = ImageFill.calculate_image_fill(geo_size: geo.size, img_size: size, maxHeight: maxHeight, fillHeight: fillHeight)
-                        
-                        print("video_size changed \(size)")
-                        if self.image_fill == nil {
-                            print("video_size firstImageHeight \(fill.height)")
-                            firstImageHeight = fill.height
-                            state.events.get_cache_data(evid).media_metadata_model.fill = fill
-                        }
-                        
-                        self.image_fill = fill
-                    }
-            }
-        }
-    }
-    
-    func Img(geo: GeometryProxy, url: URL, index: Int) -> some View {
-        KFAnimatedImage(url)
-            .callbackQueue(.dispatch(.global(qos:.background)))
-            .backgroundDecode(true)
-            .imageContext(.note, disable_animation: state.settings.disable_animation)
-            .image_fade(duration: 0.25)
-            .cancelOnDisappear(true)
-            .configure { view in
-                view.framePreloadCount = 3
-            }
-            .imageFill(for: geo.size, max: maxHeight, fill: fillHeight) { fill in
-                state.events.get_cache_data(evid).media_metadata_model.fill = fill
-                // blur hash can be discarded when we have the url
-                // NOTE: this is the wrong place for this... we need to remove
-                //       it when the image is loaded in memory. This may happen
-                //       earlier than this (by the preloader, etc)
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-                    state.events.lookup_img_metadata(url: url)?.state = .not_needed
-                }
-                image_fill = fill
-                if index == 0 {
-                    firstImageHeight = fill.height
-                    //maxHeight = firstImageHeight ?? maxHeight
-                } else {
-                    //maxHeight = firstImageHeight ?? fill.height
-                }
-            }
-            .background {
-                Placeholder(url: url, geo_size: geo.size, num_urls: urls.count)
-            }
-            .aspectRatio(contentMode: filling ? .fill : .fit)
-            .position(x: geo.size.width / 2, y: geo.size.height / 2)
-            .tabItem {
-                Text(url.absoluteString)
-            }
-            .id(url.absoluteString)
-            .padding(0)
-                
-    }
-    
-    var Medias: some View {
+    var Images: some View {
        TabView(selection: $selectedIndex) {
            ForEach(urls.indices, id: \.self) { index in
+                let url = urls[index]
                GeometryReader { geo in
-                    Media(geo: geo, url: urls[index], index: index)
+                    KFAnimatedImage(url)
+                        .callbackQueue(.dispatch(.global(qos:.background)))
+                        .backgroundDecode(true)
+                        .imageContext(.note, disable_animation: state.settings.disable_animation)
+                        .image_fade(duration: 0.25)
+                        .cancelOnDisappear(true)
+                        .configure { view in
+                            view.framePreloadCount = 3
+                        }
+                        .imageFill(for: geo.size, max: maxHeight, fill: fillHeight) { fill in
+                            state.previews.cache_image_meta(evid: evid, image_fill: fill)
+                            // blur hash can be discarded when we have the url
+                            // NOTE: this is the wrong place for this... we need to remove
+                            //       it when the image is loaded in memory. This may happen
+                            //       earlier than this (by the preloader, etc)
+                            DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+                                state.events.lookup_img_metadata(url: url)?.state = .not_needed
+                            }
+                            image_fill = fill
+                            if index == 0 {
+                                firstImageHeight = fill.height
+                                //maxHeight = firstImageHeight ?? maxHeight
+                            } else {
+                                //maxHeight = firstImageHeight ?? fill.height
+                            }
+                        }
+                        .background {
+                            Placeholder(url: url, geo_size: geo.size, num_urls: urls.count)
+                        }
+                        .aspectRatio(contentMode: filling ? .fill : .fit)
+                        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
+                        .tabItem {
+                            Text(url.absoluteString)
+                        }
+                        .id(url.absoluteString)
+                        .padding(0)
                }
            }
        }
        .tabViewStyle(PageTabViewStyle(indexDisplayMode: .never))
        .fullScreenCover(isPresented: $open_sheet) {
-            ImageView(cache: state.events, urls: urls, disable_animation: state.settings.disable_animation)
+            ImageView(urls: urls, disable_animation: state.settings.disable_animation)
        }
        .frame(height: height)
-        .onChange(of: selectedIndex) { value in
-            selectedIndex = value
+        .onTapGesture {
+            open_sheet = true
        }
+        .onChange(of: selectedIndex) { value in
+                        selectedIndex = value
+                    }
        .tabViewStyle(PageTabViewStyle())
    }
    
    var body: some View {
        VStack {
-            Medias
-                .onTapGesture { }
+            Images
            
            // 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
-            // causing adjacent views to disort in dimensions.
-            CarouselDotsView(maxCount: urls.count, maxVisibleCount: 18, selectedIndex: $selectedIndex)
+            CarouselDotsView(urls: urls, selectedIndex: $selectedIndex)
+        }
+    }
+}
+
+// MARK: - Custom Carousel
+struct CarouselDotsView: View {
+    let urls: [URL]
+    @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())
        }
    }
 }
@@ -267,8 +254,7 @@ public struct ImageFill {
 // MARK: - Preview Provider
 struct ImageCarousel_Previews: PreviewProvider {
    static var previews: some View {
-        let url: MediaUrl = .image(URL(string: "https://jb55.com/red-me.jpg")!)
-        ImageCarousel(state: test_damus_state(), evid: "evid", urls: [url, url])
+        ImageCarousel(state: test_damus_state(), evid: "evid", urls: [URL(string: "https://jb55.com/red-me.jpg")!,URL(string: "https://jb55.com/red-me.jpg")!])
    }
 }

--- a/damus/Components/InvoiceView.swift
+++ b/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)
-}
--- a/damus/Components/NIP05Badge.swift
+++ b/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")
-                    .resizable()
-                    .frame(width: 18, height: 18)
+                Image("check-circle.fill")
+                    .font(.footnote)
                    .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)
-        }
+        NIP05Badge(nip05: NIP05(username: "jb55", host: "jb55.com"), pubkey: test_state.pubkey, contacts: test_state.contacts, show_domain: true, clickable: false)
    }
 }

--- a/damus/Components/Reposted.swift
+++ b/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)
        }
    }
--- a/damus/Components/Search/SearchHeaderView.swift
+++ b/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)
-        }
-    }
-}
--- a/damus/Components/TranslateView.swift
+++ b/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(translatedFromLanguageString)
+            Text(String(format: NSLocalizedString("Translated from %@", comment: "Button to indicate that the note has been translated from a different language."), lang ?? "ja"))
                .foregroundColor(.gray)
                .font(.footnote)
                .padding([.top, .bottom], 10)
--- a/damus/Components/TruncatedText.swift
+++ b/damus/Components/TruncatedText.swift
@@ -12,7 +12,7 @@ struct TruncatedText: View {
    let maxChars: Int = 280
    
    var body: some View {
-        let truncatedAttributedString: AttributedString? = text.attributed.truncateOrNil(maxLength: maxChars)
+        let truncatedAttributedString: AttributedString? = getTruncatedString()
        
        if let truncatedAttributedString {
            Text(truncatedAttributedString)
@@ -28,6 +28,16 @@ struct TruncatedText: View {
                .allowsHitTesting(false)
        }
    }
+    
+    func getTruncatedString() -> AttributedString? {
+        let nsAttributedString = NSAttributedString(text.attributed)
+        if nsAttributedString.length < maxChars { return nil }
+        
+        let range = NSRange(location: 0, length: maxChars)
+        let truncatedAttributedString = nsAttributedString.attributedSubstring(from: range)
+        
+        return AttributedString(truncatedAttributedString) + "..."
+    }
 }

 struct TruncatedText_Previews: PreviewProvider {
--- a/damus/Components/UserView.swift
+++ b/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,16 +42,16 @@ 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 {
-                        about_text
+                    if let about = profile?.about {
+                        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()
-                }
+                Spacer()
            }
        }
    }
--- a/damus/Components/WebsiteLink.swift
+++ b/damus/Components/WebsiteLink.swift
@@ -23,8 +23,6 @@ struct WebsiteLink: View {
                Text(link_text)
                    .font(.footnote)
                    .foregroundColor(.accentColor)
-                    .truncationMode(.tail)
-                    .lineLimit(1)
            })
        }
    }
--- a/damus/Components/ZapButton.swift
+++ b/damus/Components/ZapButton.swift
@@ -10,31 +10,36 @@ import SwiftUI
 enum ZappingEventType {
    case failed(ZappingError)
    case got_zap_invoice(String)
-    case sent_from_nwc
 }

 enum ZappingError {
    case fetching_invoice
    case bad_lnurl
-    case canceled
-    case send_failed
 }

 struct ZappingEvent {
    let is_custom: Bool
    let type: ZappingEventType
-    let target: ZapTarget
+    let event: NostrEvent
+}
+
+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
 }

 struct ZapButton: View {
    let damus_state: DamusState
-    let target: ZapTarget
+    let event: NostrEvent
    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,11 +60,18 @@ struct ZapButton: View {
        
        // always orange !
        return Color.orange
+            /*
+        if our_zap.is_paid {
+            return Color.orange
+        } else {
+            return Color.yellow
+        }
+             */
    }
    
    func tap() {
        guard let our_zap else {
-            send_zap(damus_state: damus_state, target: target, lnurl: lnurl, is_custom: false, comment: nil, amount_sats: nil, zap_type: damus_state.settings.default_zap_type)
+            send_zap(damus_state: damus_state, event: event, lnurl: lnurl, is_custom: false, comment: nil, amount_sats: nil, zap_type: damus_state.settings.default_zap_type)
            return
        }
        
@@ -106,17 +118,15 @@ 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)
-                        .resizable()
-                        .foregroundColor(zap_color)
-                        .font(.footnote.weight(.medium))
-                        .aspectRatio(contentMode: .fit)
-                        .frame(width:20, height: 20)
-                })
-            }
+            Button(action: {
+            }, label: {
+                Image(zap_img)
+                    .resizable()
+                    .foregroundColor(zap_color)
+                    .font(.footnote.weight(.medium))
+                    .aspectRatio(contentMode: .fit)
+                    .frame(width:20, height: 20)
+            })

            if zaps.zap_total > 0 {
                Text(verbatim: format_msats_abbrev(zaps.zap_total))
@@ -126,15 +136,41 @@ struct ZapButton: View {
        }
        .accessibilityLabel(NSLocalizedString("Zap", comment: "Accessibility label for zap button"))
        .simultaneousGesture(LongPressGesture().onEnded {_  in
-            guard !damus_state.settings.nozaps else { return }
-            
-            present_sheet(.zap(target: target, lnurl: lnurl))
+            button.showing_zap_customizer = true
        })
        .highPriorityGesture(TapGesture().onEnded {
-            guard !damus_state.settings.nozaps else { return }
-            
            tap()
        })
+        .sheet(isPresented: $button.showing_zap_customizer) {
+            CustomizeZapView(state: damus_state, event: event, 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.event.id == self.event.id else {
+                return
+            }
+            
+            guard !zap_ev.is_custom else {
+                return
+            }
+            
+            switch zap_ev.type {
+            case .failed:
+                break
+            case .got_zap_invoice(let inv):
+                if 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)
+                }
+            }
+        }
    }
 }

@@ -144,7 +180,7 @@ struct ZapButton_Previews: PreviewProvider {
        let pending_zap = PendingZap(amount_msat: 1000, target: ZapTarget.note(id: "noteid", author: "author"), request: .normal(test_zap_request), type: .pub, state: .external(.init(state: .fetching_invoice)))
        let zaps = ZapsDataModel([.pending(pending_zap)])
        
-        ZapButton(damus_state: test_damus_state(), target: ZapTarget.note(id: test_event.id, author: test_event.pubkey), lnurl: "lnurl", zaps: zaps)
+        ZapButton(damus_state: test_damus_state(), event: test_event, lnurl: "lnurl", zaps: zaps)
    }
 }

@@ -160,13 +196,14 @@ func initial_pending_zap_state(settings: UserSettingsStore) -> PendingZapState {
    return .external(ExtPendingZapState(state: .fetching_invoice))
 }

-func send_zap(damus_state: DamusState, target: ZapTarget, lnurl: String, is_custom: Bool, comment: String?, amount_sats: Int?, zap_type: ZapType) {
+func send_zap(damus_state: DamusState, event: NostrEvent, lnurl: String, is_custom: Bool, comment: String?, amount_sats: Int?, zap_type: ZapType) {
    guard let keypair = damus_state.keypair.to_full() else {
        return
    }
    
    // Only take the first 10 because reasons
    let relays = Array(damus_state.pool.our_descriptors.prefix(10))
+    let target = ZapTarget.note(id: event.id, author: event.pubkey)
    let content = comment ?? ""
    
    guard let mzapreq = make_zap_request_event(keypair: keypair, content: content, relays: relays, target: target, zap_type: zap_type) else {
@@ -194,7 +231,7 @@ func send_zap(damus_state: DamusState, target: ZapTarget, lnurl: String, is_cust
            DispatchQueue.main.async {
                remove_zap(reqid: reqid, zapcache: damus_state.zaps, evcache: damus_state.events)
                let typ = ZappingEventType.failed(.bad_lnurl)
-                let ev = ZappingEvent(is_custom: is_custom, type: typ, target: target)
+                let ev = ZappingEvent(is_custom: is_custom, type: typ, event: event)
                notify(.zapping, ev)
            }
            return
@@ -208,7 +245,7 @@ func send_zap(damus_state: DamusState, target: ZapTarget, lnurl: String, is_cust
            DispatchQueue.main.async {
                remove_zap(reqid: reqid, zapcache: damus_state.zaps, evcache: damus_state.events)
                let typ = ZappingEventType.failed(.fetching_invoice)
-                let ev = ZappingEvent(is_custom: is_custom, type: typ, target: target)
+                let ev = ZappingEvent(is_custom: is_custom, type: typ, event: event)
                notify(.zapping, ev)
            }
            return
@@ -221,35 +258,24 @@ func send_zap(damus_state: DamusState, target: ZapTarget, lnurl: String, is_cust
                // don't both continuing, user has canceled
                if case .cancel_fetching_invoice = nwc_state.state {
                    remove_zap(reqid: reqid, zapcache: damus_state.zaps, evcache: damus_state.events)
-                    let typ = ZappingEventType.failed(.canceled)
-                    let ev = ZappingEvent(is_custom: is_custom, type: typ, target: target)
-                    notify(.zapping, ev)
                    return
                }
                
                var flusher: OnFlush? = nil
-                
-                // donations are only enabled on one-tap zaps and off appstore
-                if !damus_state.settings.nozaps && !is_custom && damus_state.settings.donation_percent > 0 {
+                // Don't donate on custom zaps
+                if !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 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)
+                let nwc_req = nwc_pay(url: nwc_state.url,  pool: damus_state.pool, post: damus_state.postbox, invoice: inv, 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)")
-
-                    let typ = ZappingEventType.failed(.send_failed)
-                    let ev = ZappingEvent(is_custom: is_custom, type: typ, target: target)
-                    notify(.zapping, ev)
                    return
                }
                
@@ -258,13 +284,9 @@ func send_zap(damus_state: DamusState, target: ZapTarget, lnurl: String, is_cust
                if pzap_state.update_state(state: .postbox_pending(nwc_req)) {
                    // we don't need to trigger a ZapsDataModel update here
                }
-
-                let ev = ZappingEvent(is_custom: is_custom, type: .sent_from_nwc, target: target)
-                notify(.zapping, ev)
-
            case .external(let pending_ext):
                pending_ext.state = .done
-                let ev = ZappingEvent(is_custom: is_custom, type: .got_zap_invoice(inv), target: target)
+                let ev = ZappingEvent(is_custom: is_custom, type: .got_zap_invoice(inv), event: event)
                notify(.zapping, ev)
            }
        }
--- a/damus/ContentView.swift
+++ b/damus/ContentView.swift
@@ -6,7 +6,6 @@
 //

 import SwiftUI
-import AVKit

 struct TimestampedProfile {
    let profile: Profile
@@ -14,38 +13,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 +60,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 navigationCoordinator: NavigationCoordinator = NavigationCoordinator()
+    @StateObject var home: HomeModel = HomeModel()

    let sub_id = UUID().description
    
@@ -121,7 +106,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 +114,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("Notes & Replies", comment: "Label for filter for seeing notes and replies (instead of only notes).").tag(FilterState.posts_and_replies)
+                    Text("Posts", comment: "Label for filter for seeing only posts (instead of posts and replies).").tag(FilterState.posts)
+                    Text("Posts & Replies", comment: "Label for filter for seeing posts and replies (instead of only posts).").tag(FilterState.posts_and_replies)
                })
                Divider()
                    .frame(height: 1)
@@ -142,13 +127,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 +147,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 +203,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 +240,32 @@ struct ContentView: View {
    }
    
    func open_event(ev: NostrEvent) {
-        let thread = ThreadModel(event: ev, damus_state: damus_state!)
-        navigationCoordinator.push(route: Route.Thread(thread: thread))
+        popToRoot()
+        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))
-    }
-    
-    func open_script(_ script: [UInt8]) {
-        print("pushing script nav")
-        let model = ScriptModel(data: script, state: .not_loaded)
-        navigationCoordinator.push(route: Route.Script(script: model))
+        self.wallet_open = true
    }
    
    func open_profile(id: String) {
-        let profile_model = ProfileModel(pubkey: id, damus: damus_state!)
-        let followers = FollowersModel(damus_state: damus_state!, target: id)
-        navigationCoordinator.push(route: Route.Profile(profile: profile_model, followers: followers))
+        popToRoot()
+        self.active_profile = id
+        self.profile_open = true
    }
    
    func open_search(filt: NostrFilter) {
-        let search = SearchModel(state: damus_state!, search: filt)
-        navigationCoordinator.push(route: Route.Search(search: search))
+        popToRoot()
+        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 +288,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 +304,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())
            }
@@ -301,7 +315,6 @@ struct ContentView: View {
        .ignoresSafeArea(.keyboard)
        .onAppear() {
            self.connect()
-            try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, mode: .default, options: .mixWithOthers)
            setup_notifications()
        }
        .sheet(item: $active_sheet) { item in
@@ -312,10 +325,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 +346,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 .script(let data): self.open_script(data)
-                }
+                case .wallet_connect(let nwc): self.open_wallet(nwc: nwc)}
            }
        }
        .onReceive(handle_notify(.compose)) { notif in
@@ -395,19 +402,16 @@ struct ContentView: View {
            }
        }
        .onReceive(handle_notify(.unfollow)) { notif in
-            guard let state = self.damus_state else { return }
-            _ = handle_unfollow_notif(state: state, notif: notif)
-        }
-        .onReceive(handle_notify(.unfollowed)) { notif in
-            let unfollow = notif.object as! ReferencedId
-            home.resubscribe(.unfollowing(unfollow))
+            guard let state = self.damus_state else {
+                return
+            }
+            handle_unfollow(state: state, notif: notif)
        }
        .onReceive(handle_notify(.follow)) { notif in
-            guard let state = self.damus_state else { return }
-            guard handle_follow_notif(state: state, notif: notif) else { return }
-        }
-        .onReceive(handle_notify(.followed)) { notif in
-            home.resubscribe(.following)
+            guard let state = self.damus_state else {
+                return
+            }
+            handle_follow(state: state, notif: notif)
        }
        .onReceive(handle_notify(.post)) { notif in
            guard let state = self.damus_state,
@@ -428,31 +432,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:
@@ -475,11 +454,6 @@ struct ContentView: View {
                let damus_state else {
                return
            }
-
-            if local.type == .profile_zap {
-                open_profile(id: local.event_id)
-                return
-            }
            
            guard let target = damus_state.events.lookup(local.event_id) else {
                return
@@ -488,16 +462,13 @@ struct ContentView: View {
            switch local.type {
            case .dm:
                selected_timeline = .dms
-                damus_state.dms.set_active_dm(target.pubkey)
-                navigationCoordinator.push(route: Route.DMChat(dms: damus_state.dms.active_model))
+                damus_state.dms.open_dm_by_pk(target.pubkey)
+                
            case .like: fallthrough
            case .zap: fallthrough
            case .mention: fallthrough
            case .repost:
                open_event(ev: target)
-            case .profile_zap:
-                // Handled separately above.
-                break
            }
        }
        .onReceive(handle_notify(.onlyzaps_mode)) { notif in
@@ -528,7 +499,7 @@ struct ContentView: View {
        }, message: {
            if let pubkey = self.muting {
                let profile = damus_state!.profiles.lookup(id: pubkey)
-                let name = Profile.displayName(profile: profile, pubkey: pubkey).username.truncate(maxLength: 50)
+                let name = Profile.displayName(profile: profile, pubkey: pubkey).username
                Text("\(name) has been muted", comment: "Alert message that informs a user was muted.")
            } else {
                Text("User has been muted", comment: "Alert message that informs a user was d.")
@@ -588,7 +559,7 @@ struct ContentView: View {
        }, message: {
            if let pubkey = muting {
                let profile = damus_state?.profiles.lookup(id: pubkey)
-                let name = Profile.displayName(profile: profile, pubkey: pubkey).username.truncate(maxLength: 50)
+                let name = Profile.displayName(profile: profile, pubkey: pubkey).username
                Text("Mute \(name)?", comment: "Alert message prompt to ask if a user should be muted.")
            } else {
                Text("Could not find user to mute...", comment: "Alert message to indicate that the muted user could not be found.")
@@ -612,44 +583,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 +627,7 @@ struct ContentView: View {
                                      bootstrap_relays: bootstrap_relays,
                                      replies: ReplyCounter(our_pubkey: pubkey),
                                      muted_threads: MutedThreadsManager(keypair: keypair),
-                                      wallet: WalletModel(settings: settings),
-                                      nav: self.navigationCoordinator,
-                                      user_search_cache: user_search_cache
+                                      wallet: WalletModel(settings: settings)
        )
        home.damus_state = self.damus_state!
        
@@ -768,57 +736,24 @@ func setup_notifications() {
    }
 }

-struct FindEvent {
-    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))
-            return
-        }
-    
-        filter = NostrFilter(ids: [evid], limit: 1)
+func find_event(state: DamusState, evid: String, search_type: SearchType, find_from: [String]?, callback: @escaping (NostrEvent?) -> ()) {
+    if let ev = state.events.lookup(evid) {
+        callback(ev)
+        return
    }
    
    let subid = UUID().description
-    var 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 +769,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 {
-            case .profile:
-                if ev.known_kind == .metadata {
-                    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))
-                        return
-                    }
+            if search_type == .profile && ev.known_kind == .metadata {
+                process_metadata_event(events: state.events, our_pubkey: state.pubkey, profiles: state.profiles, ev: ev) {
+                    callback(ev)
                }
-            case .event:
-                callback(.event(ev))
+            } else {
+                callback(ev)
            }
        case .eose:
            if !has_event {
@@ -872,85 +800,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, unfollow: ReferencedId) -> Bool {
-    guard let keypair = state.keypair.to_full() else {
-        return false
+func handle_unfollow(state: DamusState, notif: Notification) {
+    guard let privkey = state.keypair.privkey else {
+        return
    }
-
-    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 handle_unfollow(state: state, unfollow: ref) {
-        return ref
+    
+    if let ev = unfollow_user(postbox: state.postbox,
+                              our_contacts: state.contacts.event,
+                              pubkey: state.pubkey,
+                              privkey: privkey,
+                              unfollow: pk) {
+        notify(.unfollowed, pk)
+        
+        state.contacts.event = ev
+        state.contacts.remove_friend(pk)
+        //friend_events = friend_events.filter { $0.pubkey != pk }
    }
-
-    return nil
 }

-@discardableResult
-func handle_follow(state: DamusState, follow: ReferencedId) -> Bool {
-    guard let keypair = state.keypair.to_full() else {
-        return false
+func handle_follow(state: DamusState, notif: Notification) {
+    guard let privkey = state.keypair.privkey else {
+        return
    }

-    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.add_friend_pubkey(follow.ref_id)
-    }
-
-    return true
-}
-
-@discardableResult
-func handle_follow_notif(state: DamusState, notif: Notification) -> Bool {
    let fnotify = notif.object as! FollowTarget
-    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))
+    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)
+        }
+    }
 }

 func handle_post_notification(keypair: FullKeypair, postbox: PostBox, events: EventCache, notif: Notification) -> Bool {
@@ -981,7 +884,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 +902,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
-                guard let res, case .event(let ev) = res else { return }
-                result(.event(ev))
+            find_event(state: state, evid: ref.ref_id, search_type: .event, find_from: nil) { ev in
+                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
    }
 }
-
--- a/damus/Fonts/Inter-Bold.otf
+++ b/damus/Fonts/Inter-Bold.otf
--- a/damus/Fonts/Inter-Italic.otf
+++ b/damus/Fonts/Inter-Italic.otf
--- a/damus/Fonts/Inter-Light.otf
+++ b/damus/Fonts/Inter-Light.otf
--- a/damus/Fonts/Inter-Medium.otf
+++ b/damus/Fonts/Inter-Medium.otf
--- a/damus/Fonts/Inter-Regular.otf
+++ b/damus/Fonts/Inter-Regular.otf
--- a/damus/Fonts/Inter-SemiBold.otf
+++ b/damus/Fonts/Inter-SemiBold.otf
--- a/damus/Fonts/LICENSE.txt
+++ b/damus/Fonts/LICENSE.txt
@@ -0,0 +1,94 @@
+Copyright (c) 2016-2020 The Inter Project Authors.
+"Inter" is trademark of Rasmus Andersson.
+https://github.com/rsms/inter
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION AND CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/damus/Info.plist
+++ b/damus/Info.plist
@@ -70,5 +70,16 @@
 	<string>Damus needs access to your camera if you want to upload photos from it</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Damus needs access to your microphone if you want to upload recorded videos from it</string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
+	<key>UIAppFonts</key>
+	<array>
+		<string>Inter-Regular.otf</string>
+		<string>Inter-Bold.otf</string>
+		<string>Inter-Light.otf</string>
+		<string>Inter-SemiBold.otf</string>
+		<string>Inter-Medium.otf</string>
+		<string>Inter-Italic.otf</string>
+	</array>
 </dict>
 </plist>
--- a/damus/Models/ActionBarModel.swift
+++ b/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
    
--- a/damus/Models/Contacts.swift
+++ b/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,25 +58,12 @@ 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> {
-        return friends
+    func get_friend_list() -> [String] {
+        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) {
        friends.insert(pubkey)
    }
@@ -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? {
-    guard let ev = follow_user_event(our_contacts: our_contacts, our_pubkey: keypair.pubkey, follow: follow) else {
+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: pubkey, follow: follow) else {
        return nil
    }
    
    ev.calculate_id()
-    ev.sign(privkey: keypair.privkey)
-
-    box.send(ev)
-
+    ev.sign(privkey: privkey)
+    
+    
+    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,16 +200,12 @@ 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
    }
-
+    
    let kind = NostrKind.contacts.rawValue
    var tags = our_contacts.tags
    tags.append(refid_to_tag(follow))
--- a/damus/Models/CreateAccountModel.swift
+++ b/damus/Models/CreateAccountModel.swift
@@ -14,8 +14,8 @@ 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) ?? ""
    }
--- a/damus/Models/DamusState.swift
+++ b/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(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) }
+        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())) }
 }
--- a/damus/Models/DirectMessagesModel.swift
+++ b/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)
--- a/damus/Models/HomeModel.swift
+++ b/damus/Models/HomeModel.swift
@@ -23,41 +23,7 @@ struct NewEventsBits: OptionSet {
    static let notifications: NewEventsBits = [.zaps, .likes, .reposts, .mentions]
 }

-enum Resubscribe {
-    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 {
+class HomeModel: ObservableObject {
    // 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()
-    var notification_status = NotificationStatusModel()
-    var events: EventHolder = EventHolder()
-    var zap_button: ZapButtonModel = ZapButtonModel()
+    @Published var new_events: NewEventsBits = NewEventsBits()
+    @Published var notifications = NotificationsModel()
+    @Published var events: EventHolder = EventHolder()
    
    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,76 @@ class HomeModel {
                print("nwc: \(resp.req_id) not found in the postbox, nothing to remove [\(relay)]")
            }
            
-            guard resp.response.error == nil else {
-                print("nwc error: \(resp.response)")
-                nwc_error(zapcache: self.damus_state.zaps, evcache: self.damus_state.events, resp: resp)
+            guard let err = resp.response.error else {
+                print("nwc success: \(resp.response.result.debugDescription) [\(relay)]")
+                nwc_success(state: self.damus_state, resp: resp)
                return
            }
            
-            print("nwc success: \(resp.response.result.debugDescription) [\(relay)]")
-            nwc_success(state: self.damus_state, resp: resp)
+            print("nwc error: \(resp.response)")
+            nwc_error(zapcache: self.damus_state.zaps, evcache: self.damus_state.events, 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
-            }
+    func handle_zap_event_with_zapper(profiles: Profiles, ev: NostrEvent, our_keypair: Keypair, zapper: String) {
        
-            if !self.notifications.insert_zap(.zap(zap)) {
-                return
-            }
+        guard let zap = Zap.from_zap_event(zap_ev: ev, zapper: zapper, our_privkey: our_keypair.privkey) else {
+            return
+        }
+        
+        damus_state.add_zap(zap: .zap(zap))
+        
+        guard zap.target.pubkey == our_keypair.pubkey else {
+            return
+        }
+        
+        if !notifications.insert_zap(.zap(zap)) {
+            return
+        }

-            guard let new_bits = handle_last_events(new_events: self.notification_status.new_events, ev: ev, timeline: .notifications, shouldNotify: true) else {
-                return
-            }
-            
-            if self.damus_state.settings.zap_vibration {
+        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 self.damus_state.settings.zap_notification {
+            if 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)
-                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_zap_notification(profiles: profiles, zap: zap, evId: ev.referenced_ids.first?.id ?? "")
+            }
+        }
+
+        return
+    }
+
+    func handle_zap_event(_ ev: NostrEvent) {
+        // These are zap notifications
+        guard let ptag = event_tag(ev, name: "p") else {
+            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
            }
            
-            self.notification_status.new_events = new_bits
+            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,21 +397,22 @@ 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])
-        let subscription = NostrSubscribe(filters: [filter], sub_id: init_subid)
-        pool.send(.subscribe(subscription), to: [relay_id])
+        var filter = NostrFilter(kinds: [.contacts],
+                                 limit: 1,
+                                 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
-
+        
        var our_contacts_filter = NostrFilter(kinds: [.contacts, .metadata])
        our_contacts_filter.authors = [damus_state.pubkey]
        
@@ -464,6 +430,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,71 +455,33 @@ 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)
-
-        let relay_ids = relay_id.map { [$0] }
-
-        pool.send(.subscribe(.init(filters: contacts_filters, sub_id: contacts_subid)), to: relay_ids)
-        pool.send(.subscribe(.init(filters: notifications_filters, sub_id: notifications_subid)), to: relay_ids)
-        pool.send(.subscribe(.init(filters: dms_filters, sub_id: dms_subid)), to: relay_ids)
-    }
-
-    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)
+        if let relay_id {
+            pool.send(.subscribe(.init(filters: home_filters, sub_id: home_subid)), to: [relay_id])
+            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: dms_filters, sub_id: dms_subid)), to: [relay_id])
+        } else {
+            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)))
        }
-
-        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) {
        // we only care about our lists
        guard ev.pubkey == damus_state.pubkey else {
@@ -609,8 +550,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) {
-            self.notification_status.new_events = new_bits
+        if let new_bits = handle_last_events(new_events: self.new_events, ev: ev, timeline: timeline, shouldNotify: shouldNotify) {
+            new_events = new_bits
            return true
        } else {
            return false
@@ -642,7 +583,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 +601,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 +611,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 +638,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) {
-    let contacts = state.contacts
-    var new_refs = Set<ReferencedId>()
+func load_our_contacts(contacts: Contacts, m_old_ev: NostrEvent?, ev: NostrEvent) {
+    var new_pks = Set<String>()
    // our contacts
    for tag in ev.tags {
-        guard let ref = tag_to_refid(tag) else { continue }
-        new_refs.insert(ref)
+        if tag.count >= 2 && tag[0] == "p" {
+            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 }
-            old_refs.insert(ref)
+            if tag.count >= 2 && tag[0] == "p" {
+                old_pks.insert(tag[1])
+            }
        }
    }
    
-    let diff = new_refs.symmetricDifference(old_refs)
-    for ref in diff {
-        if new_refs.contains(ref) {
-            notify(.followed, ref)
-            if ref.key == "p" {
-                contacts.add_friend_pubkey(ref.ref_id)
-            }
+    let diff = new_pks.symmetricDifference(old_pks)
+    for pk in diff {
+        if new_pks.contains(pk) {
+            notify(.followed, pk)
+            contacts.add_friend_pubkey(pk)
        } else {
-            notify(.unfollowed, ref)
-            if ref.key == "p" {
-                contacts.remove_friend(ref.ref_id)
-            }
+            notify(.unfollowed, pk)
+            contacts.remove_friend(pk)
        }
    }
-
-    state.user_search_cache.updateOwnContactsPetnames(id: contacts.our_pubkey, oldEvent: m_old_ev, newEvent: ev)
 }


@@ -791,9 +727,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 {
+    if let mprof = profiles.lookup_with_timestamp(id: ev.pubkey) {
        old_nip05 = mprof.profile.nip05
        if mprof.event.created_at > ev.created_at {
            // skip if we already have an newer profile
@@ -813,7 +747,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 +774,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 +799,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 +811,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 +836,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 +875,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 +884,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 +902,8 @@ func add_new_relay(model_cache: RelayModelCache, relay_filters: RelayFilters, po
            return
        }
        
-        await MainActor.run {
-            let model = RelayModel(url, metadata: meta)
-            model_cache.insert(model: model)
-            
-            if logging_enabled {
-                pool.setLog(model.log, for: relay_id)
-            }
+        DispatchQueue.main.async {
+            metadatas.insert(relay_id: relay_id, metadata: meta)
            
            // if this is the first time adding filters, we should filter non-paid relays
            if new_relay_filters && !meta.is_paid {
@@ -1176,12 +1101,13 @@ 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 pk = zap.is_anon ? ANON_PUBKEY : src.pubkey
+    let src = zap.private_request ?? zap.request.ev
+    let anon = event_is_anonymous(ev: src)
+    let pk = anon ? "anon" : src.pubkey
    let profile = profiles.lookup(id: pk)
    let sats = NSNumber(value: (Double(zap.invoice.amount) / 1000.0))
    let formattedSats = format_msats_abbrev(zap.invoice.amount)
-    let name = Profile.displayName(profile: profile, pubkey: pk).display_name.truncate(maxLength: 50)
+    let name = Profile.displayName(profile: profile, pubkey: pk).display_name

    if src.content.isEmpty {
        let format = localizedStringFormat(key: "zap_notification_no_message", locale: locale)
@@ -1192,28 +1118,7 @@ func zap_notification_body(profiles: Profiles, zap: Zap, locale: Locale = Locale
    }
 }

-func create_in_app_profile_zap_notification(profiles: Profiles, zap: Zap, locale: Locale = Locale.current, profile_id: String) {
-    let content = UNMutableNotificationContent()
-
-    content.title = zap_notification_title(zap)
-    content.body = zap_notification_body(profiles: profiles, zap: zap, locale: locale)
-    content.sound = UNNotificationSound.default
-    content.userInfo = LossyLocalNotification(type: .profile_zap, event_id: profile_id).to_user_info()
-
-    let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false)
-
-    let request = UNNotificationRequest(identifier: "myZapNotification", content: content, trigger: trigger)
-
-    UNUserNotificationCenter.current().add(request) { error in
-        if let error = error {
-            print("Error: \(error)")
-        } else {
-            print("Local notification scheduled")
-        }
-    }
-}
-
-func create_in_app_event_zap_notification(profiles: Profiles, zap: Zap, locale: Locale = Locale.current, evId: String) {
+func create_in_app_zap_notification(profiles: Profiles, zap: Zap, locale: Locale = Locale.current, evId: String) {
    let content = UNMutableNotificationContent()

    content.title = zap_notification_title(zap)
@@ -1234,27 +1139,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 +1162,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 notify = LocalNotification(type: .mention, event: ev, target: ev, content: content_preview)
+            let content = NSAttributedString(render_note_content(ev: ev, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey).content.attributed).string
+            
+            let notify = LocalNotification(type: .mention, event: ev, target: ev, content: content)
            create_local_notification(profiles: damus_state.profiles, notify: notify )
        }
    } else if type == .boost && damus_state.settings.repost_notification, let inner_ev = ev.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: content_preview)
+        let notify = LocalNotification(type: .repost, event: ev, target: inner_ev, content: inner_ev.content)
        create_local_notification(profiles: damus_state.profiles, notify: notify)
    } else if type == .like && damus_state.settings.like_notification,
              let evid = ev.referenced_ids.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: content_preview)
+        let notify = LocalNotification(type: .like, event: ev, target: liked_event, content: liked_event.content)
        create_local_notification(profiles: damus_state.profiles, notify: notify)
    }

@@ -1319,7 +1202,7 @@ func create_local_notification(profiles: Profiles, notify: LocalNotification) {
    case .dm:
        title = displayName
        identifier = "myDMNotification"
-    case .zap, .profile_zap:
+    case .zap:
        // not handled here
        break
    }
@@ -1341,104 +1224,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
-}
-
--- a/damus/Models/Mentions.swift
+++ b/damus/Models/Mentions.swift
@@ -10,7 +10,7 @@ import Foundation
 enum MentionType {
    case pubkey
    case event
-
+    
    var ref: String {
        switch self {
        case .pubkey:
@@ -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>
@@ -122,12 +114,12 @@ enum Block: Equatable {
        
        return mention.type == .event
    }
-
-    var is_mention: Mention? {
-        if case .mention(let m) = self {
-            return m
+    
+    var is_mention: Bool {
+        if case .mention = self {
+            return true
        }
-        return nil
+        return false
    }
 }

@@ -158,15 +150,10 @@ func render_blocks(blocks: [Block]) -> String {
    }
 }

-struct Blocks {
-    let words: Int
-    let blocks: [Block]
-}
-
-func parse_mentions(content: String, tags: [[String]]) -> Blocks {
+func parse_mentions(content: String, tags: [[String]]) -> [Block] {
    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? {
@@ -340,13 +326,7 @@ func convert_mention_bech32_block(_ b: mention_bech32_block) -> Block?
        let pubkey = hex_encode(Data(bytes: npub.pubkey, count: 32))
        let pubkey_ref = ReferencedId(ref_id: pubkey, relay_id: nil, key: "p")
        return .mention(Mention(index: nil, type: .pubkey, ref: pubkey_ref))
-
-    case NOSTR_BECH32_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,44 @@ 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):
-            let mention_type = mention.type
-
-            if silent_mentions || mention_type == .event {
+        case .ref(let ref):
+            guard let mention_type = parse_mention_type(ref.key) else {
                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 let ind = find_tag_ref(type: ref.key, id: ref.ref_id, tags: tags) {
+                let mention = Mention(index: ind, type: mention_type, ref: ref)
+                let block = Block.mention(mention)
+                blocks.append(block)
+            } else {
+                let ind = new_tags.count
+                new_tags.append(refid_to_tag(ref))
+                let mention = Mention(index: ind, 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
-        case .invoice: break
-        case .relay: break
-        case .url(let url):
-            new_tags.append(["r", url.absoluteString])
-            break
+            blocks.append(.hashtag(hashtag))
+        case .text(let txt):
+            blocks.append(Block.text(txt))
        }
    }
    
-    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 {
--- a/damus/Models/Notifications/NotificationStatusModel.swift
+++ b/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()
-}
--- a/damus/Models/Notifications/ZapGroup.swift
+++ b/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)  {
-            zappers.insert(zap.request.ev.pubkey)
+        if !zappers.contains(zap.request.pubkey)  {
+            zappers.insert(zap.request.pubkey)
        }
        
        return true
--- a/damus/Models/NotificationsModel.swift
+++ b/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
        }
--- a/damus/Models/Post.swift
+++ b/damus/Models/Post.swift
@@ -21,6 +21,7 @@ struct NostrPost {
    }
 }

+// TODO: parse nostr:{e,p}:pubkey uris as well
 func parse_post_mention_type(_ p: Parser) -> MentionType? {
    if parse_char(p, "@") {
        return .pubkey
@@ -64,7 +65,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 +110,32 @@ func parse_post_bech32_mention(_ p: Parser) -> ReferencedId? {
 }

 /// Return a list of tags
-func parse_post_blocks(content: String) -> [Block] {
-    return parse_mentions(content: content, tags: []).blocks
+func parse_post_blocks(content: String) -> [PostBlock] {
+    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
 }

--- a/damus/Models/ProfileModel.swift
+++ b/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]
--- a/damus/Models/Report.swift
+++ b/damus/Models/Report.swift
@@ -7,27 +7,11 @@

 import Foundation

-enum ReportType: String, CustomStringConvertible, CaseIterable {
-    case spam
-    case nudity
-    case profanity
+enum ReportType: String {
+    case explicit
    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? {
--- a/damus/Models/SearchModel.swift
+++ b/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!

--- a/damus/Models/ThreadModel.swift
+++ b/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
-    })
-}
--- a/damus/Models/Trie.swift
+++ b/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)
-                    }
-                }
-            }
-        }
-    }
-}
--- a/damus/Models/UserSearchCache.swift
+++ b/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)
-        }
-    }
-}
--- a/damus/Models/UserSettingsStore.swift
+++ b/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
    
@@ -157,9 +149,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.
--- a/damus/Models/ZapButtonModel.swift
+++ b/damus/Models/ZapButtonModel.swift
@@ -1,13 +0,0 @@
-//
-//  ZapButtonModel.swift
-//  damus
-//
-//  Created by Terry Yiu on 6/1/23.
-//
-
-import Foundation
-
-class ZapButtonModel: ObservableObject {
-    var invoice: String? = nil
-    @Published var zapping: String = ""
-}
--- a/damus/Models/Zaps/CustomizeZapModel.swift
+++ b/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
-    }
-}
--- a/damus/Models/ZapsModel.swift
+++ b/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
            }
--- a/damus/Nostr/Nostr.swift
+++ b/damus/Nostr/Nostr.swift
@@ -100,8 +100,8 @@ class Profile: Codable {
    }
    
    var damus_donation: Int? {
-        get { return int("damus_donation_v2"); }
-        set(s) { set_int("damus_donation_v2", s) }
+        get { return int("damus_donation"); }
+        set(s) { set_int("damus_donation", s) }
    }
    
    var picture: String? {
--- a/damus/Nostr/NostrEvent.swift
+++ b/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
-    func blocks(_ privkey: String?) -> Blocks {
+    private var _blocks: [Block]? = nil
+    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
        }
--- a/damus/Nostr/NostrKind.swift
+++ b/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
--- a/damus/Nostr/NostrLink.swift
+++ b/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 {
@@ -61,13 +60,24 @@ func parse_nostr_ref_uri(_ p: Parser) -> ReferencedId? {
    if !parse_str(p, "nostr:") {
        return nil
    }
-
-    guard let ref = parse_post_bech32_mention(p) else {
+    
+    guard let typ = parse_nostr_ref_uri_type(p) else {
        p.pos = start
        return nil
    }
-
-    return ref
+    
+    if !parse_char(p, ":") {
+        p.pos = start
+        return nil
+    }
+    
+    guard let pk = parse_hexstr(p, len: 64) else {
+        p.pos = start
+        return nil
+    }
+    
+    // TODO: parse relays from nostr uris
+    return ReferencedId(ref_id: pk, relay_id: nil, key: typ)
 }

 func decode_universal_link(_ s: String) -> NostrLink? {
@@ -106,8 +116,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,12 +124,8 @@ func decode_nostr_uri(_ s: String) -> NostrLink? {
        return decode_universal_link(s)
    }

-    var uri = s
-    uri = uri.replacingOccurrences(of: "nostr://", with: "")
+    var uri = s.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: "")
--- a/damus/Nostr/NostrRequest.swift
+++ b/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
    }
-    
 }
--- a/damus/Nostr/Profiles.swift
+++ b/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
-        }
+        validated[pk]
    }
    
    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) {
-            let old_timestamped_profile = self.profiles[id]
+        queue.async(flags: .barrier) {
            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 {
--- a/damus/Nostr/RelayConnection.swift
+++ b/damus/Nostr/RelayConnection.swift
@@ -37,9 +37,9 @@ public struct RelayURL: Hashable {
    }
 }

-final class RelayConnection: ObservableObject {
-    @Published private(set) var isConnected = false
-    @Published private(set) var isConnecting = false
+final class RelayConnection {
+    private(set) var isConnected = 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")
            }
        }
    }
@@ -102,23 +99,13 @@ final class RelayConnection: ObservableObject {
        isConnected = false
        isConnecting = false
    }
-    
-    func send_raw(_ req: String) {
-        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)
-            
-        case .custom(let req):
-            send_raw(req)
+
+    func send(_ req: NostrRequest) {
+        guard let req = make_nostr_req(req) else {
+            print("failed to encode nostr req: \(req)")
+            return
        }
+        socket.send(.string(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) {
--- a/damus/Nostr/RelayLog.swift
+++ b/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)")
-        }
-    }
-}
--- a/damus/Nostr/RelayPool.swift
+++ b/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)")
-        request_queue.append(QueuedRequest(req: r, relay: relay, skip_ephemeral: skip_ephemeral))
+        print("queueing request: \(r) for \(relay)")
+        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 {
--- a/damus/Nostr/WebSocket.swift
+++ b/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 {
--- a/damus/TestData.swift
+++ b/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
-}
-
--- a/damus/Util/AnyCodable/AnyEncodable.swift
+++ b/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:
-            try container.encode(profile_url)
+        case let url as URL:
+            try container.encode(url)
        #endif
        case let array as [Any?]:
            try container.encode(array.map { AnyEncodable($0) })
--- a/damus/Util/Bech32Object.swift
+++ b/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
--- a/damus/Util/DisplayName.swift
+++ b/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."))
    }
    
--- a/damus/Util/EventCache.swift
+++ b/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
    }
 }
@@ -101,10 +101,6 @@ class RelativeTimeModel: ObservableObject {
    @Published var value: String = ""
 }

-class MediaMetaModel: ObservableObject {
-    @Published var fill: ImageFill? = nil
-}
-
 class EventData {
    var translations_model: TranslationModel
    var artifacts_model: NoteArtifactsModel
@@ -112,7 +108,6 @@ class EventData {
    var zaps_model : ZapsDataModel
    var relative_time: RelativeTimeModel = RelativeTimeModel()
    var validated: ValidationResult
-    var media_metadata_model: MediaMetaModel
    
    var translations: TranslateStatus {
        return translations_model.state
@@ -131,7 +126,6 @@ class EventData {
        self.artifacts_model = .init(state: .not_loaded)
        self.zaps_model = .init(zaps)
        self.validated = .unknown
-        self.media_metadata_model = MediaMetaModel()
        self.preview_model = .init(state: .not_loaded)
    }
 }
@@ -141,7 +135,6 @@ class EventCache {
    private var replies = ReplyMap()
    private var cancellable: AnyCancellable?
    private var image_metadata: [String: ImageMetadataState] = [:]
-    private var video_meta: [String: VideoPlayerModel] = [:]
    private var event_data: [String: EventData] = [:]
    
    //private var thread_latest: [String: Int64]
@@ -175,9 +168,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 +175,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,30 +194,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
-        }
-        
-        return get_video_player_model(url: url).size
-    }
-    
-    func store_video_player_model(url: URL, meta: VideoPlayerModel) {
-        video_meta[url.absoluteString] = meta
-    }
-    
-    @MainActor
-    func get_video_player_model(url: URL) -> VideoPlayerModel {
-        if let model = video_meta[url.absoluteString] {
-            return model
-        }
-        
-        let model = VideoPlayerModel()
-        video_meta[url.absoluteString] = model
-        return model
-    }
-    
    func parent_events(event: NostrEvent) -> [NostrEvent] {
        var parents: [NostrEvent] = []
        
@@ -291,7 +257,6 @@ class EventCache {
    
    private func prune() {
        events = [:]
-        video_meta = [:]
        event_data = [:]
        replies.replies = [:]
    }
@@ -344,7 +309,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 +365,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,18 +407,14 @@ 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)
-        
-        // 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)
-                } else {
-                    plan.data.preview_model.state = .loaded(.failed)
-                }
+        let preview = await load_preview(artifacts: arts)
+        DispatchQueue.main.async {
+            if let preview {
+                plan.data.preview_model.state = .loaded(preview)
+            } else {
+                plan.data.preview_model.state = .loaded(.failed)
            }
        }
    }
--- a/damus/Util/EventHolder.swift
+++ b/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)?
    
--- a/damus/Util/Extensions/KFOptionSetter+.swift
+++ b/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]
        
--- a/damus/Util/FontManager.swift
+++ b/damus/Util/FontManager.swift
@@ -0,0 +1,63 @@
+//
+//  FontManager.swift
+//  damus
+//
+//  Created by Ben Weeks on 27/05/2023.
+//
+
+import Foundation
+import SwiftUI
+
+struct FontManager {
+    struct dynamicSize {
+        public static var largeTitle: CGFloat = UIFont.preferredFont(forTextStyle: .largeTitle).pointSize - 1
+        public static var title1: CGFloat = UIFont.preferredFont(forTextStyle: .title1).pointSize - 0
+        public static var title2: CGFloat = UIFont.preferredFont(forTextStyle: .title2).pointSize - 0
+        public static var title3: CGFloat = UIFont.preferredFont(forTextStyle: .title3).pointSize - 0
+        public static var body: CGFloat = UIFont.preferredFont(forTextStyle: .body).pointSize - 1
+        public static var callout: CGFloat = UIFont.preferredFont(forTextStyle: .callout).pointSize - 1
+        public static var caption1: CGFloat = UIFont.preferredFont(forTextStyle: .caption1).pointSize - 1
+        public static var caption2: CGFloat = UIFont.preferredFont(forTextStyle: .caption2).pointSize - 1
+        public static var footnote: CGFloat = UIFont.preferredFont(forTextStyle: .footnote).pointSize - 1
+        public static var headline: CGFloat = UIFont.preferredFont(forTextStyle: .headline).pointSize - 1
+        public static var subheadline: CGFloat = UIFont.preferredFont(forTextStyle: .subheadline).pointSize - 1
+        // repeat for all the dynamic sizes
+    }
+
+    struct Inter {
+        static let familyRoot = "Inter"
+
+        static let bold = "\(familyRoot)-Bold"
+        static let regular = "\(familyRoot)-Regular"
+        static let light = "\(familyRoot)-Light"
+        static let medium = "\(familyRoot)-Medium"
+        static let semibold = "\(familyRoot)-SemiBold"
+        static let italic = "\(familyRoot)-Italic"
+
+        static let largeTitle: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.largeTitle)
+        static let title1: Font = Font.custom(FontManager.Inter.semibold, size: FontManager.dynamicSize.title1)
+        static let title2: Font = Font.custom(FontManager.Inter.semibold, size: FontManager.dynamicSize.title2)
+        static let title3: Font = Font.custom(FontManager.Inter.semibold, size: FontManager.dynamicSize.title3)
+        static let body: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.body)
+        static let caption1: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.caption1)
+        static let caption2: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.caption2)
+        static let footnote: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.footnote)
+        static let headline: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.headline)
+        static let subheadline: Font = Font.custom(FontManager.Inter.regular, size: FontManager.dynamicSize.subheadline)
+        // repeat for other sizes
+    }
+}
+
+extension Font {
+    public static var largeTitle = FontManager.Inter.largeTitle
+    public static var title1 = FontManager.Inter.title1
+    public static var title2 = FontManager.Inter.title2
+    public static var title3 = FontManager.Inter.title3
+    public static var body = FontManager.Inter.body
+    public static var caption1 = FontManager.Inter.caption1
+    public static var caption2 = FontManager.Inter.caption2
+    public static var footnote = FontManager.Inter.footnote
+    public static var headline = FontManager.Inter.headline
+    public static var subheadline = FontManager.Inter.subheadline
+    // repeat for the rest of the dynamic sizes
+}
--- a/damus/Util/Hashtags.swift
+++ b/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
    }
--- a/damus/Util/Images/ImageMetadata.swift
+++ b/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)
        
--- a/damus/Util/InsertSort.swift
+++ b/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
            }
--- a/damus/Util/Keys.swift
+++ b/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")
 }
--- a/damus/Util/LocalNotification.swift
+++ b/damus/Util/LocalNotification.swift
@@ -44,5 +44,4 @@ enum LocalNotificationType: String {
    case mention
    case repost
    case zap
-    case profile_zap
 }
--- a/damus/Util/LocalizationUtil.swift
+++ b/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)
-}
--- a/damus/Util/Markdown.swift
+++ b/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)
@@ -45,18 +19,6 @@ public struct Markdown {
    public static func parse(content: String) -> AttributedString {
        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: "\\\\\\_")
--- a/damus/Util/Notifications.swift
+++ b/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")
    }
--- a/damus/Util/PostBox.swift
+++ b/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)")
--- a/Show More
+++ b/Show More