From e52b7e6e439a1f3eba457eda22477504fcf22c50 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 29 Oct 2024 21:50:52 +0100
Subject: [PATCH 01/26] git reset

---
 package-lock.json                       | 646 +++++++++++++++++++++++-
 package.json                            |  15 +-
 src/app.css                             |  33 +-
 src/app/editor/EditBolt11.svelte        |  57 +++
 src/app/editor/EditEvent.svelte         |  80 +++
 src/app/editor/EditLink.svelte          | 127 +++++
 src/app/editor/EditMedia.svelte         |  37 ++
 src/app/editor/EditMention.svelte       |  13 +
 src/app/editor/FileUpload.ts            | 396 +++++++++++++++
 src/app/editor/LinkExtension.ts         | 125 +++++
 src/app/editor/SuggestionProfile.svelte |  38 ++
 src/app/editor/SuggestionString.svelte  |   5 +
 src/app/editor/Suggestions.svelte       |  99 ++++
 src/app/editor/Suggestions.ts           | 104 ++++
 src/app/editor/index.ts                 | 155 ++++++
 src/app/editor/util.ts                  |  98 ++++
 src/app/editor/wordcounts.ts            |  19 +
 src/app/shared/Compose.svelte           | 277 +---------
 src/app/shared/NoteCreateInline.svelte  |  70 ++-
 src/app/shared/NoteReply.svelte         |  75 +--
 src/app/views/EventEdit.svelte          |  65 +--
 src/app/views/Login.svelte              |   3 +-
 src/app/views/LoginBunker.svelte        |   2 +-
 src/app/views/NoteCreate.svelte         | 124 +++--
 src/app/views/OnboardingNote.svelte     |  12 +-
 src/app/views/RelayReview.svelte        |  26 +-
 src/partials/Channel.svelte             |  59 +--
 27 files changed, 2301 insertions(+), 459 deletions(-)
 create mode 100644 src/app/editor/EditBolt11.svelte
 create mode 100644 src/app/editor/EditEvent.svelte
 create mode 100644 src/app/editor/EditLink.svelte
 create mode 100644 src/app/editor/EditMedia.svelte
 create mode 100644 src/app/editor/EditMention.svelte
 create mode 100644 src/app/editor/FileUpload.ts
 create mode 100644 src/app/editor/LinkExtension.ts
 create mode 100644 src/app/editor/SuggestionProfile.svelte
 create mode 100644 src/app/editor/SuggestionString.svelte
 create mode 100644 src/app/editor/Suggestions.svelte
 create mode 100644 src/app/editor/Suggestions.ts
 create mode 100644 src/app/editor/index.ts
 create mode 100644 src/app/editor/util.ts
 create mode 100644 src/app/editor/wordcounts.ts

diff --git a/package-lock.json b/package-lock.json
index f92ec5af2..b89d2dca6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,6 +23,17 @@
         "@sentry/browser": "^8.35.0",
         "@sentry/cli": "^2.38.1",
         "@sveltejs/vite-plugin-svelte": "^3.1.2",
+        "@tiptap/extension-code": "^2.9.1",
+        "@tiptap/extension-code-block": "^2.9.1",
+        "@tiptap/extension-document": "^2.9.1",
+        "@tiptap/extension-dropcursor": "^2.9.1",
+        "@tiptap/extension-gapcursor": "^2.9.1",
+        "@tiptap/extension-hard-break": "^2.9.1",
+        "@tiptap/extension-history": "^2.9.1",
+        "@tiptap/extension-paragraph": "^2.9.1",
+        "@tiptap/extension-placeholder": "^2.9.1",
+        "@tiptap/extension-text": "^2.9.1",
+        "@tiptap/suggestion": "^2.9.1",
         "@tsconfig/svelte": "^5.0.4",
         "@types/ramda": "^0.30.2",
         "@types/throttle-debounce": "^5.0.2",
@@ -56,6 +67,7 @@
         "insane": "^2.6.2",
         "marked": "^14.1.3",
         "normalize-url": "^8.0.1",
+        "nostr-editor": "^0.0.3",
         "nostr-signer-capacitor-plugin": "^0.0.3",
         "nostr-tools": "^2.8.1",
         "npm-run-all": "^4.1.5",
@@ -75,6 +87,7 @@
         "svelte-preprocess": "^6.0.3",
         "svelte-range-slider-pips": "^3.1.1",
         "svelte-switch": "^0.0.5",
+        "svelte-tiptap": "^1.1.3",
         "tailwindcss": "^3.4.14",
         "throttle-debounce": "^5.0.2",
         "tippy.js": "^6.3.7",
@@ -3481,6 +3494,12 @@
         "prettier": ">=2.4.0"
       }
     },
+    "node_modules/@remirror/core-constants": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@remirror/core-constants/-/core-constants-3.0.0.tgz",
+      "integrity": "sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==",
+      "peer": true
+    },
     "node_modules/@rollup/plugin-inject": {
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz",
@@ -3881,7 +3900,6 @@
       "version": "8.35.0",
       "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.35.0.tgz",
       "integrity": "sha512-uj9nwERm7HIS13f/Q52hF/NUS5Al8Ma6jkgpfYGeppYvU0uSjPkwMogtqoJQNbOoZg973tV8qUScbcWY616wNA==",
-      "license": "MIT",
       "dependencies": {
         "@sentry/core": "8.35.0",
         "@sentry/types": "8.35.0",
@@ -3895,7 +3913,6 @@
       "version": "8.35.0",
       "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.35.0.tgz",
       "integrity": "sha512-7bjSaUhL0bDArozre6EiIhhdWdT/1AWNWBC1Wc5w1IxEi5xF7nvF/FfvjQYrONQzZAI3HRxc45J2qhLUzHBmoQ==",
-      "license": "MIT",
       "dependencies": {
         "@sentry/core": "8.35.0",
         "@sentry/types": "8.35.0",
@@ -3909,7 +3926,6 @@
       "version": "8.35.0",
       "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.35.0.tgz",
       "integrity": "sha512-3wkW03vXYMyWtTLxl9yrtkV+qxbnKFgfASdoGWhXzfLjycgT6o4/04eb3Gn71q9aXqRwH17ISVQbVswnRqMcmA==",
-      "license": "MIT",
       "dependencies": {
         "@sentry-internal/browser-utils": "8.35.0",
         "@sentry/core": "8.35.0",
@@ -3924,7 +3940,6 @@
       "version": "8.35.0",
       "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.35.0.tgz",
       "integrity": "sha512-TUrH6Piv19kvHIiRyIuapLdnuwxk/Un/l1WDCQfq7mK9p1Pac0FkQ7Uufjp6zY3lyhDDZQ8qvCS4ioCMibCwQg==",
-      "license": "MIT",
       "dependencies": {
         "@sentry-internal/replay": "8.35.0",
         "@sentry/core": "8.35.0",
@@ -3939,7 +3954,6 @@
       "version": "8.35.0",
       "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.35.0.tgz",
       "integrity": "sha512-WHfI+NoZzpCsmIvtr6ChOe7yWPLQyMchPnVhY3Z4UeC70bkYNdKcoj/4XZbX3m0D8+71JAsm0mJ9s9OC3Ue6MQ==",
-      "license": "MIT",
       "dependencies": {
         "@sentry-internal/browser-utils": "8.35.0",
         "@sentry-internal/feedback": "8.35.0",
@@ -4107,7 +4121,6 @@
       "version": "8.35.0",
       "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.35.0.tgz",
       "integrity": "sha512-Ci0Nmtw5ETWLqQJGY4dyF+iWh7PWKy6k303fCEoEmqj2czDrKJCp7yHBNV0XYbo00prj2ZTbCr6I7albYiyONA==",
-      "license": "MIT",
       "dependencies": {
         "@sentry/types": "8.35.0",
         "@sentry/utils": "8.35.0"
@@ -4120,7 +4133,6 @@
       "version": "8.35.0",
       "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.35.0.tgz",
       "integrity": "sha512-AVEZjb16MlYPifiDDvJ19dPQyDn0jlrtC1PHs6ZKO+Rzyz+2EX2BRdszvanqArldexPoU1p5Bn2w81XZNXThBA==",
-      "license": "MIT",
       "engines": {
         "node": ">=14.18"
       }
@@ -4129,7 +4141,6 @@
       "version": "8.35.0",
       "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.35.0.tgz",
       "integrity": "sha512-MdMb6+uXjqND7qIPWhulubpSeHzia6HtxeJa8jYI09OCvIcmNGPydv/Gx/LZBwosfMHrLdTWcFH7Y7aCxrq7cg==",
-      "license": "MIT",
       "dependencies": {
         "@sentry/types": "8.35.0"
       },
@@ -4197,6 +4208,251 @@
         "vite": "^5.0.0"
       }
     },
+    "node_modules/@tiptap/core": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-2.8.0.tgz",
+      "integrity": "sha512-xsqDI4BNzYRWRtBq7+/38ThhqEr7uG9Njip1x+9/wgR3vWPBFnBkYJTz6jSxS35NRE6BSnERm4/B/vrLuY1Hdw==",
+      "peer": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/pm": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-bubble-menu": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.9.1.tgz",
+      "integrity": "sha512-DWUF6NG08/bZDWw0jCeotSTvpkyqZTi4meJPomG9Wzs/Ol7mEwlNCsCViD999g0+IjyXFatBk4DfUq1YDDu++Q==",
+      "peer": true,
+      "dependencies": {
+        "tippy.js": "^6.3.7"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0",
+        "@tiptap/pm": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-code": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-2.9.1.tgz",
+      "integrity": "sha512-WQqcVGe7i/E+yO3wz5XQteU1ETNZ00euUEl4ylVVmH2NM4Dh0KDjEhbhHlCM0iCfLUo7jhjC7dmS+hMdPUb+Tg==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-code-block": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-2.9.1.tgz",
+      "integrity": "sha512-A/50wPWDqEUUUPhrwRKILP5gXMO5UlQ0F6uBRGYB9CEVOREam9yIgvONOnZVJtszHqOayjIVMXbH/JMBeq11/g==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0",
+        "@tiptap/pm": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-document": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-2.9.1.tgz",
+      "integrity": "sha512-1a+HCoDPnBttjqExfYLwfABq8MYdiowhy/wp8eCxVb6KGFEENO53KapstISvPzqH7eOi+qRjBB1KtVYb/ZXicg==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-dropcursor": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-2.9.1.tgz",
+      "integrity": "sha512-wJZspSmJRkDBtPkzFz1g7gvZOEOayk8s93UHsgbJxcV4VWHYleZ5XhT74sZunSjefNDm3qC6v2BSgLp3vNHVKQ==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0",
+        "@tiptap/pm": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-floating-menu": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-floating-menu/-/extension-floating-menu-2.9.1.tgz",
+      "integrity": "sha512-MxZ7acNNsoNaKpetxfwi3Z11Bgrh0T2EJlCV77v9N1vWK38+st3H1WJanmLbPNtc2ocvhHJrz+DjDz3CWxQ9rQ==",
+      "peer": true,
+      "dependencies": {
+        "tippy.js": "^6.3.7"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0",
+        "@tiptap/pm": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-gapcursor": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-2.9.1.tgz",
+      "integrity": "sha512-jsRBmX01vr+5H02GljiHMo0n5H1vzoMLmFarxe0Yq2d2l9G/WV2VWX2XnGliqZAYWd1bI0phs7uLQIN3mxGQTw==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0",
+        "@tiptap/pm": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-hard-break": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-2.9.1.tgz",
+      "integrity": "sha512-fCuaOD/b7nDjm47PZ58oanq7y4ccS2wjPh42Qm0B0yipu/1fmC8eS1SmaXmk28F89BLtuL6uOCtR1spe+lZtlQ==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-history": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-history/-/extension-history-2.9.1.tgz",
+      "integrity": "sha512-wp9qR1NM+LpvyLZFmdNaAkDq0d4jDJ7z7Fz7icFQPu31NVxfQYO3IXNmvJDCNu8hFAbImpA5aG8MBuwzRo0H9w==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0",
+        "@tiptap/pm": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-image": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-2.8.0.tgz",
+      "integrity": "sha512-5CReomgHGTUgxaX8P3i6qiC9VRWcWQgVoYtds4ZM52LVx/oGwMxQ4ECyzdVYKaRW+6PrNnAe6ew3Qpd5Wk0cIg==",
+      "peer": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-link": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-2.8.0.tgz",
+      "integrity": "sha512-p67hCG/pYCiOK/oCTPZnlkw9Ei7KJ7kCKFaluTcAmr5j8IBdYfDqSMDNCT4vGXBvKFh4X6xD7S7QvOqcH0Gn9A==",
+      "peer": true,
+      "dependencies": {
+        "linkifyjs": "^4.1.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0",
+        "@tiptap/pm": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-paragraph": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-2.9.1.tgz",
+      "integrity": "sha512-JOmT0xd4gd3lIhLwrsjw8lV+ZFROKZdIxLi0Ia05XSu4RLrrvWj0zdKMSB+V87xOWfSB3Epo95zAvnPox5Q16A==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-placeholder": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-placeholder/-/extension-placeholder-2.9.1.tgz",
+      "integrity": "sha512-Q/w3OOg/C6jGBf4QKEWKF9k+iaCQCgPoaIg2IDTPx8QmaxRfgoVE5Csd+oTOY/brdmSNXOxykZWEci6OJP+MbA==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0",
+        "@tiptap/pm": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/extension-text": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-2.9.1.tgz",
+      "integrity": "sha512-3wo9uCrkLVLQFgbw2eFU37QAa1jq1/7oExa+FF/DVxdtHRS9E2rnUZ8s2hat/IWzvPUHXMwo3Zg2XfhoamQpCA==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0"
+      }
+    },
+    "node_modules/@tiptap/pm": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-2.8.0.tgz",
+      "integrity": "sha512-eMGpRooUMvKz/vOpnKKppApMSoNM325HxTdAJvTlVAmuHp5bOY5kyY1kfUlePRiVx1t1UlFcXs3kecFwkkBD3Q==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-changeset": "^2.2.1",
+        "prosemirror-collab": "^1.3.1",
+        "prosemirror-commands": "^1.6.0",
+        "prosemirror-dropcursor": "^1.8.1",
+        "prosemirror-gapcursor": "^1.3.2",
+        "prosemirror-history": "^1.4.1",
+        "prosemirror-inputrules": "^1.4.0",
+        "prosemirror-keymap": "^1.2.2",
+        "prosemirror-markdown": "^1.13.0",
+        "prosemirror-menu": "^1.2.4",
+        "prosemirror-model": "^1.22.3",
+        "prosemirror-schema-basic": "^1.2.3",
+        "prosemirror-schema-list": "^1.4.1",
+        "prosemirror-state": "^1.4.3",
+        "prosemirror-tables": "^1.4.0",
+        "prosemirror-trailing-node": "^3.0.0",
+        "prosemirror-transform": "^1.10.0",
+        "prosemirror-view": "^1.33.10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      }
+    },
+    "node_modules/@tiptap/suggestion": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@tiptap/suggestion/-/suggestion-2.9.1.tgz",
+      "integrity": "sha512-MMxwpbtocxUsbmc8qtFY1AQYNTW5i/M4aNSv9zsKKRISaS5hMD7XVrw2eod0x0yEqZU3izLiPDZPmgr8glF+jQ==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.7.0",
+        "@tiptap/pm": "^2.7.0"
+      }
+    },
     "node_modules/@trapezedev/gradle-parse": {
       "version": "7.0.10",
       "resolved": "https://registry.npmjs.org/@trapezedev/gradle-parse/-/gradle-parse-7.0.10.tgz",
@@ -4322,6 +4578,28 @@
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "license": "MIT"
     },
+    "node_modules/@types/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "peer": true
+    },
+    "node_modules/@types/markdown-it": {
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
+      "peer": true,
+      "dependencies": {
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
+      }
+    },
+    "node_modules/@types/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "peer": true
+    },
     "node_modules/@types/minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
@@ -6573,6 +6851,12 @@
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
       "license": "MIT"
     },
+    "node_modules/crelt": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "peer": true
+    },
     "node_modules/cross-fetch": {
       "version": "3.1.8",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
@@ -9955,6 +10239,25 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/light-bolt11-decoder": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/light-bolt11-decoder/-/light-bolt11-decoder-3.2.0.tgz",
+      "integrity": "sha512-3QEofgiBOP4Ehs9BI+RkZdXZNtSys0nsJ6fyGeSiAGCBsMwHGUDS/JQlY/sTnWs91A2Nh0S9XXfA8Sy9g6QpuQ==",
+      "dependencies": {
+        "@scure/base": "1.1.1"
+      }
+    },
+    "node_modules/light-bolt11-decoder/node_modules/@scure/base": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz",
+      "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
+    },
     "node_modules/lilconfig": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
@@ -9970,6 +10273,21 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "license": "MIT"
     },
+    "node_modules/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+      "peer": true,
+      "dependencies": {
+        "uc.micro": "^2.0.0"
+      }
+    },
+    "node_modules/linkifyjs": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.1.3.tgz",
+      "integrity": "sha512-auMesunaJ8yfkHvK4gfg1K0SaKX/6Wn9g2Aac/NwX+l5VdmFZzo/hdPGxEOETj+ryRa4/fiOPjeeKURSAJx1sg==",
+      "peer": true
+    },
     "node_modules/listr2": {
       "version": "3.14.0",
       "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
@@ -10184,6 +10502,41 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/markdown-it": {
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
+      "peer": true,
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "^4.4.0",
+        "linkify-it": "^5.0.0",
+        "mdurl": "^2.0.0",
+        "punycode.js": "^2.3.1",
+        "uc.micro": "^2.1.0"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.mjs"
+      }
+    },
+    "node_modules/markdown-it-task-lists": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/markdown-it-task-lists/-/markdown-it-task-lists-2.1.1.tgz",
+      "integrity": "sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA==",
+      "peer": true
+    },
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "peer": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/marked": {
       "version": "14.1.3",
       "resolved": "https://registry.npmjs.org/marked/-/marked-14.1.3.tgz",
@@ -10213,6 +10566,12 @@
       "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
       "license": "CC0-1.0"
     },
+    "node_modules/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "peer": true
+    },
     "node_modules/memorystream": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
@@ -10961,6 +11320,29 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/nostr-editor": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/nostr-editor/-/nostr-editor-0.0.3.tgz",
+      "integrity": "sha512-ODfwzebBRweaYt8l0pz8EbV4OqbEKZpDAVdoU+j7ubmfjhqIyk1PcQoikEZ8UasqkBcZjEQMAPl776F8nb55fQ==",
+      "dependencies": {
+        "light-bolt11-decoder": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=18.16.1"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.6.6",
+        "@tiptap/extension-image": "^2.6.6",
+        "@tiptap/extension-link": "^2.6.6",
+        "@tiptap/pm": "^2.6.6",
+        "linkifyjs": "^4.1.3",
+        "nostr-tools": "^2.7.2",
+        "prosemirror-markdown": "^1.13.0",
+        "prosemirror-model": "^1.22.3",
+        "prosemirror-state": "^1.4.3",
+        "tiptap-markdown": "^0.8.10"
+      }
+    },
     "node_modules/nostr-signer-capacitor-plugin": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/nostr-signer-capacitor-plugin/-/nostr-signer-capacitor-plugin-0.0.3.tgz",
@@ -11345,6 +11727,12 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/orderedmap": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/orderedmap/-/orderedmap-2.1.1.tgz",
+      "integrity": "sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==",
+      "peer": true
+    },
     "node_modules/os-browserify": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
@@ -12120,6 +12508,201 @@
         "node": ">=6"
       }
     },
+    "node_modules/prosemirror-changeset": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.2.1.tgz",
+      "integrity": "sha512-J7msc6wbxB4ekDFj+n9gTW/jav/p53kdlivvuppHsrZXCaQdVgRghoZbSS3kwrRyAstRVQ4/+u5k7YfLgkkQvQ==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-transform": "^1.0.0"
+      }
+    },
+    "node_modules/prosemirror-collab": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/prosemirror-collab/-/prosemirror-collab-1.3.1.tgz",
+      "integrity": "sha512-4SnynYR9TTYaQVXd/ieUvsVV4PDMBzrq2xPUWutHivDuOshZXqQ5rGbZM84HEaXKbLdItse7weMGOUdDVcLKEQ==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-state": "^1.0.0"
+      }
+    },
+    "node_modules/prosemirror-commands": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/prosemirror-commands/-/prosemirror-commands-1.6.1.tgz",
+      "integrity": "sha512-tNy4uaGWzvuUYXDke7B28krndIrdQJhSh0OLpubtwtEwFbjItOj/eoAfPvstBJyyV0S2+b5t4G+4XPXdxar6pg==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-model": "^1.0.0",
+        "prosemirror-state": "^1.0.0",
+        "prosemirror-transform": "^1.10.2"
+      }
+    },
+    "node_modules/prosemirror-dropcursor": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/prosemirror-dropcursor/-/prosemirror-dropcursor-1.8.1.tgz",
+      "integrity": "sha512-M30WJdJZLyXHi3N8vxN6Zh5O8ZBbQCz0gURTfPmTIBNQ5pxrdU7A58QkNqfa98YEjSAL1HUyyU34f6Pm5xBSGw==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-state": "^1.0.0",
+        "prosemirror-transform": "^1.1.0",
+        "prosemirror-view": "^1.1.0"
+      }
+    },
+    "node_modules/prosemirror-gapcursor": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/prosemirror-gapcursor/-/prosemirror-gapcursor-1.3.2.tgz",
+      "integrity": "sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-keymap": "^1.0.0",
+        "prosemirror-model": "^1.0.0",
+        "prosemirror-state": "^1.0.0",
+        "prosemirror-view": "^1.0.0"
+      }
+    },
+    "node_modules/prosemirror-history": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/prosemirror-history/-/prosemirror-history-1.4.1.tgz",
+      "integrity": "sha512-2JZD8z2JviJrboD9cPuX/Sv/1ChFng+xh2tChQ2X4bB2HeK+rra/bmJ3xGntCcjhOqIzSDG6Id7e8RJ9QPXLEQ==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-state": "^1.2.2",
+        "prosemirror-transform": "^1.0.0",
+        "prosemirror-view": "^1.31.0",
+        "rope-sequence": "^1.3.0"
+      }
+    },
+    "node_modules/prosemirror-inputrules": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/prosemirror-inputrules/-/prosemirror-inputrules-1.4.0.tgz",
+      "integrity": "sha512-6ygpPRuTJ2lcOXs9JkefieMst63wVJBgHZGl5QOytN7oSZs3Co/BYbc3Yx9zm9H37Bxw8kVzCnDsihsVsL4yEg==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-state": "^1.0.0",
+        "prosemirror-transform": "^1.0.0"
+      }
+    },
+    "node_modules/prosemirror-keymap": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/prosemirror-keymap/-/prosemirror-keymap-1.2.2.tgz",
+      "integrity": "sha512-EAlXoksqC6Vbocqc0GtzCruZEzYgrn+iiGnNjsJsH4mrnIGex4qbLdWWNza3AW5W36ZRrlBID0eM6bdKH4OStQ==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-state": "^1.0.0",
+        "w3c-keyname": "^2.2.0"
+      }
+    },
+    "node_modules/prosemirror-markdown": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/prosemirror-markdown/-/prosemirror-markdown-1.13.1.tgz",
+      "integrity": "sha512-Sl+oMfMtAjWtlcZoj/5L/Q39MpEnVZ840Xo330WJWUvgyhNmLBLN7MsHn07s53nG/KImevWHSE6fEj4q/GihHw==",
+      "peer": true,
+      "dependencies": {
+        "@types/markdown-it": "^14.0.0",
+        "markdown-it": "^14.0.0",
+        "prosemirror-model": "^1.20.0"
+      }
+    },
+    "node_modules/prosemirror-menu": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/prosemirror-menu/-/prosemirror-menu-1.2.4.tgz",
+      "integrity": "sha512-S/bXlc0ODQup6aiBbWVsX/eM+xJgCTAfMq/nLqaO5ID/am4wS0tTCIkzwytmao7ypEtjj39i7YbJjAgO20mIqA==",
+      "peer": true,
+      "dependencies": {
+        "crelt": "^1.0.0",
+        "prosemirror-commands": "^1.0.0",
+        "prosemirror-history": "^1.0.0",
+        "prosemirror-state": "^1.0.0"
+      }
+    },
+    "node_modules/prosemirror-model": {
+      "version": "1.23.0",
+      "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.23.0.tgz",
+      "integrity": "sha512-Q/fgsgl/dlOAW9ILu4OOhYWQbc7TQd4BwKH/RwmUjyVf8682Be4zj3rOYdLnYEcGzyg8LL9Q5IWYKD8tdToreQ==",
+      "peer": true,
+      "dependencies": {
+        "orderedmap": "^2.0.0"
+      }
+    },
+    "node_modules/prosemirror-schema-basic": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.3.tgz",
+      "integrity": "sha512-h+H0OQwZVqMon1PNn0AG9cTfx513zgIG2DY00eJ00Yvgb3UD+GQ/VlWW5rcaxacpCGT1Yx8nuhwXk4+QbXUfJA==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-model": "^1.19.0"
+      }
+    },
+    "node_modules/prosemirror-schema-list": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/prosemirror-schema-list/-/prosemirror-schema-list-1.4.1.tgz",
+      "integrity": "sha512-jbDyaP/6AFfDfu70VzySsD75Om2t3sXTOdl5+31Wlxlg62td1haUpty/ybajSfJ1pkGadlOfwQq9kgW5IMo1Rg==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-model": "^1.0.0",
+        "prosemirror-state": "^1.0.0",
+        "prosemirror-transform": "^1.7.3"
+      }
+    },
+    "node_modules/prosemirror-state": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.3.tgz",
+      "integrity": "sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-model": "^1.0.0",
+        "prosemirror-transform": "^1.0.0",
+        "prosemirror-view": "^1.27.0"
+      }
+    },
+    "node_modules/prosemirror-tables": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/prosemirror-tables/-/prosemirror-tables-1.5.0.tgz",
+      "integrity": "sha512-VMx4zlYWm7aBlZ5xtfJHpqa3Xgu3b7srV54fXYnXgsAcIGRqKSrhiK3f89omzzgaAgAtDOV4ImXnLKhVfheVNQ==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-keymap": "^1.1.2",
+        "prosemirror-model": "^1.8.1",
+        "prosemirror-state": "^1.3.1",
+        "prosemirror-transform": "^1.2.1",
+        "prosemirror-view": "^1.13.3"
+      }
+    },
+    "node_modules/prosemirror-trailing-node": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/prosemirror-trailing-node/-/prosemirror-trailing-node-3.0.0.tgz",
+      "integrity": "sha512-xiun5/3q0w5eRnGYfNlW1uU9W6x5MoFKWwq/0TIRgt09lv7Hcser2QYV8t4muXbEr+Fwo0geYn79Xs4GKywrRQ==",
+      "peer": true,
+      "dependencies": {
+        "@remirror/core-constants": "3.0.0",
+        "escape-string-regexp": "^4.0.0"
+      },
+      "peerDependencies": {
+        "prosemirror-model": "^1.22.1",
+        "prosemirror-state": "^1.4.2",
+        "prosemirror-view": "^1.33.8"
+      }
+    },
+    "node_modules/prosemirror-transform": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.10.2.tgz",
+      "integrity": "sha512-2iUq0wv2iRoJO/zj5mv8uDUriOHWzXRnOTVgCzSXnktS/2iQRa3UUQwVlkBlYZFtygw6Nh1+X4mGqoYBINn5KQ==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-model": "^1.21.0"
+      }
+    },
+    "node_modules/prosemirror-view": {
+      "version": "1.34.3",
+      "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.34.3.tgz",
+      "integrity": "sha512-mKZ54PrX19sSaQye+sef+YjBbNu2voNwLS1ivb6aD2IRmxRGW64HU9B644+7OfJStGLyxvOreKqEgfvXa91WIA==",
+      "peer": true,
+      "dependencies": {
+        "prosemirror-model": "^1.20.0",
+        "prosemirror-state": "^1.0.0",
+        "prosemirror-transform": "^1.1.0"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
@@ -12171,6 +12754,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/q": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
@@ -13128,6 +13720,12 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/rope-sequence": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.4.tgz",
+      "integrity": "sha512-UT5EDe2cu2E/6O4igUr5PSFs23nvvukicWHx6GnOPlHAiiYbzNuCRQCuiUdHJQcqKalLKlrYJnjY0ySGsXNQXQ==",
+      "peer": true
+    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -14350,6 +14948,24 @@
       "integrity": "sha512-nVKSoOlJe1DNiiOyK/oMkZQwEuDgEq1fNmAYd+724Se8eyN/2HRbYiyOvDpNRpw0jJ+lE5vjLHfCruFrhJQFbA==",
       "license": "MIT"
     },
+    "node_modules/svelte-tiptap": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/svelte-tiptap/-/svelte-tiptap-1.1.3.tgz",
+      "integrity": "sha512-Wx4d57SLC5bgx8/hOmdt28CflW17DbiqQWgv4pUUT1Z3o5u9lInNsY8OMQWx24EYPEUyzJsjxj2OejSEoKafcg==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "peerDependencies": {
+        "@tiptap/core": "^2.0.3",
+        "@tiptap/extension-bubble-menu": "^2.0.3",
+        "@tiptap/extension-floating-menu": "^2.0.3",
+        "@tiptap/pm": "^2.0.3",
+        "svelte": "^4.0.1"
+      }
+    },
     "node_modules/tailwindcss": {
       "version": "3.4.14",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.14.tgz",
@@ -15079,6 +15695,12 @@
         }
       }
     },
+    "node_modules/uc.micro": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "peer": true
+    },
     "node_modules/uglify-js": {
       "version": "3.19.3",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
@@ -16052,6 +16674,12 @@
       "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
       "license": "MIT"
     },
+    "node_modules/w3c-keyname": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+      "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
+      "peer": true
+    },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
@@ -16861,4 +17489,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 163260411..baa5815d2 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,17 @@
     "@sentry/browser": "^8.35.0",
     "@sentry/cli": "^2.38.1",
     "@sveltejs/vite-plugin-svelte": "^3.1.2",
+    "@tiptap/extension-code": "^2.9.1",
+    "@tiptap/extension-code-block": "^2.9.1",
+    "@tiptap/extension-document": "^2.9.1",
+    "@tiptap/extension-dropcursor": "^2.9.1",
+    "@tiptap/extension-gapcursor": "^2.9.1",
+    "@tiptap/extension-hard-break": "^2.9.1",
+    "@tiptap/extension-history": "^2.9.1",
+    "@tiptap/extension-paragraph": "^2.9.1",
+    "@tiptap/extension-placeholder": "^2.9.1",
+    "@tiptap/extension-text": "^2.9.1",
+    "@tiptap/suggestion": "^2.9.1",
     "@tsconfig/svelte": "^5.0.4",
     "@types/ramda": "^0.30.2",
     "@types/throttle-debounce": "^5.0.2",
@@ -69,6 +80,7 @@
     "insane": "^2.6.2",
     "marked": "^14.1.3",
     "normalize-url": "^8.0.1",
+    "nostr-editor": "^0.0.3",
     "nostr-signer-capacitor-plugin": "^0.0.3",
     "nostr-tools": "^2.8.1",
     "npm-run-all": "^4.1.5",
@@ -88,6 +100,7 @@
     "svelte-preprocess": "^6.0.3",
     "svelte-range-slider-pips": "^3.1.1",
     "svelte-switch": "^0.0.5",
+    "svelte-tiptap": "^1.1.3",
     "tailwindcss": "^3.4.14",
     "throttle-debounce": "^5.0.2",
     "tippy.js": "^6.3.7",
@@ -100,4 +113,4 @@
     "vite-plugin-pwa": "^0.20.5",
     "vitest": "^2.1.3"
   }
-}
+}
\ No newline at end of file
diff --git a/src/app.css b/src/app.css
index d8d37b3e7..1b0221bfd 100644
--- a/src/app.css
+++ b/src/app.css
@@ -236,8 +236,35 @@ body,
   border: 1px solid var(--neutral-600);
 }
 
-/* note content */
+/* nostr-editor */
+.tiptap {
+  outline: none;
+  min-height: 0;
+  height: 100%;
+}
 
-.note-content > a {
-  text-decoration: underline;
+.tiptap pre code {
+  @apply link-content block w-full;
+}
+
+.tiptap p code {
+  @apply link-content;
+}
+
+.link-content,
+[tag] {
+  @apply max-w-full overflow-hidden text-ellipsis whitespace-nowrap rounded px-1 no-underline;
+}
+
+.link-content.link-content-selected {
+  /* @apply bg-primary text-primary-content; */
 }
+
+.tiptap p.is-editor-empty:first-child::before {
+  color: #adb5bd;
+  content: attr(data-placeholder);
+  float: left;
+  height: 0;
+  pointer-events: none;
+}
+
diff --git a/src/app/editor/EditBolt11.svelte b/src/app/editor/EditBolt11.svelte
new file mode 100644
index 000000000..993b0b9d7
--- /dev/null
+++ b/src/app/editor/EditBolt11.svelte
@@ -0,0 +1,57 @@
+<script lang="ts">
+  import type {NodeViewProps} from "@tiptap/core"
+  import {NodeViewWrapper} from "svelte-tiptap"
+  import QRCode from "qrcode"
+  import {onMount} from "svelte"
+  import Input from "src/partials/Input.svelte"
+  import Anchor from "src/partials/Anchor.svelte"
+  import {showInfo} from "src/partials/Toast.svelte"
+  import {copyToClipboard} from "src/util/html"
+
+  export let node: NodeViewProps["node"]
+  export let selected: NodeViewProps["selected"]
+
+  export let href = null
+  export let onClick = null
+  export let copyOnClick = true
+
+  let canvas, wrapper
+  let scale = 0.1
+  let height = null
+
+  const copy = () => {
+    copyToClipboard(node.attrs.lnbc)
+    showInfo("Copied to clipboard!")
+  }
+
+  onMount(() => {
+    console.log("debug bolt11", node)
+    QRCode.toCanvas(canvas, node.attrs.lnbc)
+
+    const wrapperRect = wrapper.getBoundingClientRect()
+    const canvasRect = canvas.getBoundingClientRect()
+
+    scale = wrapperRect.width / (canvasRect.width * 10)
+    height = canvasRect.width * 10 * scale
+  })
+</script>
+
+<NodeViewWrapper class="inline">
+  <div class="rounded-xl border border-solid border-neutral-600 bg-neutral-800 p-2">
+    <div class="m-auto flex max-w-sm flex-col gap-2">
+      <Anchor external {href} on:click={onClick || (copyOnClick ? copy : null)}>
+        <div bind:this={wrapper} style={`height: ${height}px`}>
+          <canvas
+            class="rounded-xl"
+            bind:this={canvas}
+            style={`transform-origin: top left; transform: scale(${scale}, ${scale})`} />
+        </div>
+      </Anchor>
+      <slot name="below" {copy}>
+        <Input value={node.attrs.lnbc}>
+          <button slot="after" class="fa fa-copy" on:click={copy} />
+        </Input>
+      </slot>
+    </div>
+  </div>
+</NodeViewWrapper>
diff --git a/src/app/editor/EditEvent.svelte b/src/app/editor/EditEvent.svelte
new file mode 100644
index 000000000..073db8f67
--- /dev/null
+++ b/src/app/editor/EditEvent.svelte
@@ -0,0 +1,80 @@
+<script lang="ts">
+  import type {NodeViewProps} from "@tiptap/core"
+  import {NodeViewWrapper} from "svelte-tiptap"
+  import {getAddress, Address} from "@welshman/util"
+  import {deriveProfileDisplay} from "@welshman/app"
+  import Anchor from "src/partials/Anchor.svelte"
+  import Card from "src/partials/Card.svelte"
+  import Spinner from "src/partials/Spinner.svelte"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import {router} from "src/app/util/router"
+  import {isEventMuted, deriveEvent} from "src/engine"
+
+  export let node: NodeViewProps["node"]
+  export let selected: NodeViewProps["selected"]
+
+  export let note
+  export let depth = 0
+
+  let showHidden = false
+
+  $: ({id, identifier, kind, pubkey, relays = []} = node.attrs)
+  $: idOrAddress = id || new Address(kind, pubkey, identifier).toString()
+  $: quote = deriveEvent(idOrAddress, {relays, forcePlatform: false})
+
+  const openQuote = e => {
+    const noteId = id || $quote?.id
+
+    // stopPropagation wasn't working for some reason
+    if (e.detail.target.textContent === "Show") {
+      return
+    }
+
+    if (isGroup) {
+      router.at("groups").of(address, {relays}).at("notes").open()
+    } else if (noteId) {
+      router.at("notes").of(noteId, {relays}).open()
+    }
+  }
+
+  const unmute = e => {
+    showHidden = true
+  }
+
+  $: address = $quote ? getAddress($quote) : ""
+  $: isGroup = address.match(/^(34550|35834):/)
+  $: profileDisplay = deriveProfileDisplay($quote?.pubkey)
+  $: muted = $quote && $isEventMuted($quote, true)
+</script>
+
+<NodeViewWrapper class="inline">
+  <div class="my-2" on:click|stopPropagation>
+    <Card interactive stopPropagation class="my-2" on:click={openQuote}>
+      {#if muted && !showHidden}
+        <p class="mb-1 py-24 text-center text-neutral-600">
+          You have hidden this note.
+          <Anchor underline stopPropagation on:click={unmute}>Show</Anchor>
+        </p>
+      {:else if $quote}
+        {#if !isGroup}
+          <div class="mb-4 flex items-center gap-4">
+            <PersonCircle class="h-6 w-6" pubkey={$quote.pubkey} />
+            <Anchor
+              modal
+              stopPropagation
+              type="unstyled"
+              class="flex items-center gap-2"
+              href={router.at("people").of($quote.pubkey).toString()}>
+              <h2 class="text-lg">{$profileDisplay}</h2>
+            </Anchor>
+          </div>
+        {/if}
+        <slot name="note-content" quote={$quote} {depth} />
+      {:else}
+        <div class="px-20">
+          <Spinner />
+        </div>
+      {/if}
+    </Card>
+  </div>
+</NodeViewWrapper>
diff --git a/src/app/editor/EditLink.svelte b/src/app/editor/EditLink.svelte
new file mode 100644
index 000000000..60c97aa96
--- /dev/null
+++ b/src/app/editor/EditLink.svelte
@@ -0,0 +1,127 @@
+<script lang="ts">
+  import type {NodeViewProps} from "@tiptap/core"
+  import {NodeViewWrapper} from "svelte-tiptap"
+  import {last, postJson} from "@welshman/lib"
+  import Anchor from "src/partials/Anchor.svelte"
+  import Audio from "src/partials/Audio.svelte"
+  import Spinner from "src/partials/Spinner.svelte"
+  import {dufflepud, imgproxy} from "src/engine"
+  import {ellipsize} from "hurdak"
+
+  export let node: NodeViewProps["node"]
+  export let selected: NodeViewProps["selected"]
+
+  $: url = node.attrs.url
+
+  const loadPreview = async () => {
+    const json = await postJson(dufflepud("link/preview"), {url})
+
+    if (!json?.title && !json?.image) {
+      throw new Error("Failed to load link preview")
+    }
+
+    return json
+  }
+
+  function getYouTubeId(url) {
+    const regExp = /^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
+    const match = url.match(regExp)
+    return match && match[2].length === 11 ? match[2] : null
+  }
+
+  function getTwitterId(url) {
+    const regExp = /^.*(twitter.com|x.com)\/\w+\/status\/(\d+)/
+    const match = url.match(regExp)
+    return match ? match[2] : null
+  }
+</script>
+
+<NodeViewWrapper class="block">
+  {#if url.match(/\.(wav|mp3|m3u8)$/)}
+    {#await import("src/util/audio")}
+      <span />
+    {:then { AudioController }}
+      <Audio controller={new AudioController(url)} />
+    {/await}
+  {:else}
+    <Anchor
+      external
+      type="unstyled"
+      href={url}
+      class="relative flex w-full flex-grow flex-col overflow-hidden rounded-xl">
+      {#if url.match(/open.spotify.com/)}
+        {@const id = last(url.split("?")[0].match(/[a-z]+\/[0-9A-z]+$/))}
+        {@const src = `https://open.spotify.com/embed/${id}`}
+        <iframe
+          {src}
+          allowfullscreen
+          style="border-radius:12px"
+          width="100%"
+          height="352"
+          frameBorder="0"
+          allow="autoplay; clipboard-write; encrypted-media; fullscreen; picture-in-picture"
+          loading="lazy" />
+      {:else if url.match(/tidal.com/)}
+        {@const {pathname} = new URL(url)}
+        {@const id = last(pathname.split("/"))}
+        {@const name = pathname.includes("album") ? "albums" : "tracks"}
+        {@const src = `https://embed.tidal.com/${name}/${id}`}
+        <iframe
+          {src}
+          allowfullscreen
+          style="border-radius:12px"
+          width="100%"
+          height="100%"
+          scrolling="no"
+          frameBorder="0"
+          allow="encrypted-media"
+          sandbox="allow-same-origin allow-scripts allow-forms allow-popups"
+          title="TIDAL Embed Player"
+          loading="lazy" />
+      {:else if url.match(/youtube.com|youtu.be/)}
+        {@const videoId = getYouTubeId(url)}
+        <iframe
+          src={`https://www.youtube.com/embed/${videoId}`}
+          frameBorder="0"
+          allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+          allowFullScreen
+          title="YouTube video player"
+          class="max-h-96 object-contain object-center"
+          loading="lazy">
+        </iframe>
+      {:else if url.match(/x.com|twitter.com/)}
+        {@const tweetId = getTwitterId(url)}
+        {@const twt = window.twttr.widgets.load()}
+        {#if tweetId}
+          <blockquote class="twitter-tweet" data-dnt="true">
+            <a href={`https://twitter.com/x/status/${tweetId}`}></a>
+          </blockquote>
+        {:else}
+          <p>Invalid Twitter URL</p>
+        {/if}
+      {:else}
+        {#await loadPreview()}
+          <Spinner />
+        {:then { title, description, image }}
+          {#if image}
+            <img
+              alt="Link preview"
+              src={imgproxy(image)}
+              class="max-h-96 object-contain object-center" />
+          {/if}
+          <div class="h-px bg-neutral-600" />
+          {#if title}
+            <div class="flex flex-col bg-white px-4 py-2 text-black">
+              <strong class="overflow-hidden text-ellipsis whitespace-nowrap">{title}</strong>
+              <small>{ellipsize(description, 140)}</small>
+            </div>
+          {/if}
+        {:catch}
+          <p class="mb-1 p-12 text-center text-neutral-600">
+            Unable to load a preview for {url}
+          </p>
+        {/await}
+      {/if}
+    </Anchor>
+  {/if}
+</NodeViewWrapper>
diff --git a/src/app/editor/EditMedia.svelte b/src/app/editor/EditMedia.svelte
new file mode 100644
index 000000000..f245b4d5d
--- /dev/null
+++ b/src/app/editor/EditMedia.svelte
@@ -0,0 +1,37 @@
+<style>
+  .loading {
+    animation: blurPulse 1.5s infinite;
+  }
+
+  @keyframes blurPulse {
+    0% {
+      opacity: 0.2;
+    }
+    50% {
+      opacity: 1;
+    }
+    100% {
+      opacity: 0.2;
+    }
+  }
+</style>
+
+<script lang="ts">
+  import type {NodeViewProps} from "@tiptap/core"
+  import {NodeViewWrapper} from "svelte-tiptap"
+  import cx from "classnames"
+
+  export let node: NodeViewProps["node"]
+  export let selected: NodeViewProps["selected"]
+</script>
+
+<!-- this component display image or videos only, the filter is made by tiptap -->
+<NodeViewWrapper
+  class={cx("link-content inline", {
+    "link-content-selected": selected,
+  })}>
+  <span class:loading={node.attrs.uploading}>
+    <i class="fas fa-paperclip"></i>
+    {node.attrs.file?.name || node.attrs.src}
+  </span>
+</NodeViewWrapper>
diff --git a/src/app/editor/EditMention.svelte b/src/app/editor/EditMention.svelte
new file mode 100644
index 000000000..03caea1fe
--- /dev/null
+++ b/src/app/editor/EditMention.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+  import cx from "classnames"
+  import type {NodeViewProps} from "@tiptap/core"
+  import {NodeViewWrapper} from "svelte-tiptap"
+  import PersonLink from "src/app/shared/PersonLink.svelte"
+
+  export let node: NodeViewProps["node"]
+  export let selected: NodeViewProps["selected"]
+</script>
+
+<NodeViewWrapper class={cx("link-content inline", {"link-content-selected": selected})}>
+  <PersonLink pubkey={node.attrs.pubkey} />
+</NodeViewWrapper>
diff --git a/src/app/editor/FileUpload.ts b/src/app/editor/FileUpload.ts
new file mode 100644
index 000000000..bb944c3a9
--- /dev/null
+++ b/src/app/editor/FileUpload.ts
@@ -0,0 +1,396 @@
+import type {CommandProps, Editor} from "@tiptap/core"
+import {Extension} from "@tiptap/core"
+import type {ImageAttributes, VideoAttributes} from "nostr-editor"
+import type {EventTemplate, NostrEvent} from "nostr-tools/core"
+import {readServerConfig, uploadFile} from "nostr-tools/nip96"
+import {getToken} from "nostr-tools/nip98"
+import type {Node} from "prosemirror-model"
+import {Plugin, PluginKey} from "prosemirror-state"
+import {writable} from "svelte/store"
+
+declare module "@tiptap/core" {
+  interface Commands<ReturnType> {
+    fileUpload: {
+      selectFiles: () => ReturnType
+      uploadFiles: () => ReturnType
+      getMetaTags: () => string[][]
+    }
+  }
+}
+
+export interface FileUploadOptions {
+  allowedMimeTypes: string[]
+  expiration: number
+  immediateUpload: boolean
+  hash: (file: File) => Promise<string>
+  sign?: (event: EventTemplate) => Promise<NostrEvent> | NostrEvent
+  onDrop: (currentEditor: Editor, file: File, pos: number) => void
+  onComplete: (currentEditor: Editor) => void
+}
+
+interface UploadTask {
+  url?: string
+  sha256?: string
+  error?: string
+}
+
+function bufferToHex(buffer: ArrayBuffer) {
+  return Array.from(new Uint8Array(buffer))
+    .map(b => b.toString(16).padStart(2, "0"))
+    .join("")
+}
+
+export const FileUploadExtension = Extension.create<FileUploadOptions>({
+  name: "fileUpload",
+
+  addStorage() {
+    return {
+      loading: writable(false),
+      tags: [] as string[][],
+    }
+  },
+
+  addOptions() {
+    return {
+      allowedMimeTypes: [
+        "image/jpeg",
+        "image/png",
+        "image/gif",
+        "video/mp4",
+        "video/mpeg",
+        "video/webm",
+      ],
+      immediateUpload: true,
+      expiration: 60000,
+      async hash(file: File) {
+        return bufferToHex(await crypto.subtle.digest("SHA-256", await file.arrayBuffer()))
+      },
+      onDrop() {},
+      onComplete() {},
+    }
+  },
+
+  addCommands() {
+    return {
+      selectFiles: () => props => {
+        props.tr.setMeta("selectFiles", true)
+        return true
+      },
+      uploadFiles: () => (props: CommandProps) => {
+        props.tr.setMeta("uploadFiles", true)
+        return true
+      },
+      getMetaTags: () => (props: CommandProps) => {
+        const tags: string[][] = []
+        // make sure the file uploaded is still in the editor content
+        props.editor.state.doc.descendants(node => {
+          if (!(node.type.name === "image" || node.type.name === "video")) {
+            return
+          }
+          const tag: string[] = props.editor.storage.fileUpload.tags.find(t =>
+            t[1].includes(node.attrs.src),
+          )
+          if (tag) {
+            tags.push(tag)
+          }
+        })
+        return tags
+      },
+    }
+  },
+
+  addProseMirrorPlugins() {
+    const uploader = new Uploader(this.editor, this.options)
+    return [
+      new Plugin({
+        key: new PluginKey("fileUploadPlugin"),
+        state: {
+          init() {
+            return {}
+          },
+          apply(tr) {
+            setTimeout(() => {
+              if (tr.getMeta("selectFiles")) {
+                uploader.selectFiles()
+                tr.setMeta("selectFiles", null)
+              } else if (tr.getMeta("uploadFiles")) {
+                uploader.uploadFiles()
+                tr.setMeta("uploadFiles", null)
+              }
+            })
+            return {}
+          },
+        },
+        props: {
+          handleDrop: (_, event) => {
+            return uploader.handleDrop(event)
+          },
+        },
+      }),
+    ]
+  },
+})
+
+class Uploader {
+  constructor(
+    public editor: Editor,
+    private options: FileUploadOptions,
+  ) {}
+
+  get view() {
+    return this.editor.view
+  }
+
+  addFile(file: File, pos: number) {
+    if (!this.options.allowedMimeTypes.includes(file.type)) {
+      return false
+    }
+    const {tr} = this.view.state
+    const [mimetype] = file.type.split("/")
+    const node = this.view.state.schema.nodes[mimetype].create({
+      file,
+      src: URL.createObjectURL(file),
+      alt: "",
+      uploading: false,
+      uploadError: null,
+    })
+    tr.insert(pos, node)
+    this.view.dispatch(tr)
+
+    if (this.options.immediateUpload) {
+      this.editor.storage.fileUpload.loading.set(true)
+      this.upload(node).then(() => this.editor.storage.fileUpload.loading.set(false))
+    }
+    this.options.onDrop(this.editor, file, pos)
+    return true
+  }
+
+  findNodePosition(node: Node) {
+    let pos = -1
+    this.view.state.doc.descendants((n, p) => {
+      if (n === node) {
+        pos = p
+        return false
+      }
+    })
+    return pos
+  }
+
+  findNodes(uploading: boolean) {
+    const nodes = [] as [Node, number][]
+    this.view.state.doc.descendants((node, pos) => {
+      if (!(node.type.name === "image" || node.type.name === "video")) {
+        return
+      }
+      if (node.attrs.sha256) {
+        return
+      }
+      if ((node.attrs.uploading || false) !== uploading) {
+        return
+      }
+      nodes.push([node, pos])
+    })
+    return nodes
+  }
+
+  updateNodeAttributes(nodeRef: Node, attrs: Record<string, unknown>) {
+    const {tr} = this.editor.view.state
+
+    const pos = this.findNodePosition(nodeRef)
+    if (pos === -1) return
+
+    Object.entries(attrs).forEach(
+      ([key, value]) => value !== undefined && tr.setNodeAttribute(pos, key, value),
+    )
+    this.view.dispatch(tr)
+  }
+
+  onUploadDone(nodeRef: Node, response: UploadTask) {
+    this.findNodes(true).forEach(([node, pos]) => {
+      if (node.attrs.src === nodeRef.attrs.src) {
+        this.updateNodeAttributes(node, {
+          uploading: false,
+          src: response.url,
+          sha256: response.sha256,
+          uploadError: response.error,
+        })
+      }
+    })
+  }
+
+  async upload(node: Node) {
+    const {sign, hash, expiration} = this.options
+
+    const {
+      file,
+      alt,
+      uploadType,
+      uploadUrl: serverUrl,
+    } = node.attrs as ImageAttributes | VideoAttributes
+
+    this.updateNodeAttributes(node, {uploading: true, uploadError: null})
+
+    try {
+      if (uploadType === "nip96") {
+        const res = await uploadNIP96({file, alt, sign, serverUrl})
+        // add the tags as received from nip-96 to the storage
+        this.editor.storage.fileUpload.tags.push(["imeta", ...res.tags])
+        this.onUploadDone(node, res)
+      } else {
+        const res = await uploadBlossom({file, serverUrl, hash, sign, expiration})
+        this.editor.storage.fileUpload.tags.push([
+          "imeta",
+          `url ${res.size}`,
+          `size ${res.size}`,
+          `m ${res.type}`,
+          `x ${res.sha256}`,
+        ])
+        this.onUploadDone(node, res)
+      }
+    } catch (error) {
+      const msg = error as string
+      this.onUploadDone(node, {error: msg})
+      throw new Error(msg as string)
+    }
+  }
+
+  async uploadFiles() {
+    const tasks = this.findNodes(false).map(([node]) => {
+      return this.upload(node)
+    })
+    try {
+      this.editor.storage.fileUpload.loading.set(true)
+      await Promise.all(tasks)
+      this.options.onComplete(this.editor)
+    } catch (error) {
+      console.error(error)
+      this.editor.storage.fileUpload.loading.set(false)
+    } finally {
+      this.editor.storage.fileUpload.loading.set(false)
+    }
+  }
+
+  selectFiles() {
+    const input = document.createElement("input")
+    input.type = "file"
+    input.multiple = true
+    input.accept = this.options.allowedMimeTypes.join(",")
+    input.onchange = event => {
+      const files = (event.target as HTMLInputElement).files
+      if (files) {
+        Array.from(files).forEach(file => {
+          if (file) {
+            const pos = this.view.state.selection.from + 1
+            this.addFile(file, pos)
+          }
+        })
+      }
+    }
+    input.click()
+  }
+
+  handleDrop(event: DragEvent) {
+    event.preventDefault()
+
+    const pos = this.view.posAtCoords({left: event.clientX, top: event.clientY})?.pos
+
+    if (pos === undefined) return false
+
+    const file = event.dataTransfer?.files?.[0]
+    if (file) {
+      this.addFile(file, pos)
+    }
+  }
+}
+
+export interface NIP96Options {
+  file: File
+  alt?: string
+  serverUrl: string
+  expiration?: number
+  sign?: (event: EventTemplate) => Promise<NostrEvent> | NostrEvent
+}
+
+export async function uploadNIP96(options: NIP96Options) {
+  if (!options.sign) {
+    return Promise.reject("No signer found")
+  }
+  try {
+    const server = await readServerConfig(options.serverUrl)
+    const authorization = await getToken(server.api_url, "POST", options.sign, true)
+    const res = await uploadFile(options.file, server.api_url, authorization, {
+      alt: options.alt || "",
+      expiration: options.expiration?.toString() || "",
+      content_type: options.file.type,
+    })
+    if (res.status === "error") {
+      throw new Error(res.message)
+    }
+    const url = res.nip94_event?.tags.find(x => x[0] === "url")?.[1] || ""
+    const sha256 = res.nip94_event?.tags.find(x => x[0] === "x")?.[1] || ""
+    return {
+      url,
+      sha256,
+      tags: res.nip94_event?.tags.flatMap(item => item.join(" ")),
+    }
+  } catch (error) {
+    throw new Error(error as string)
+  }
+}
+
+export interface BlossomOptions {
+  file: File
+  serverUrl: string
+  expiration?: number
+  hash?: (file: File) => Promise<string>
+  sign?: (event: EventTemplate) => Promise<NostrEvent> | NostrEvent
+}
+
+export interface BlossomResponse {
+  sha256: string
+  size: number
+  type: string
+  uploaded: number
+  url: string
+}
+
+export interface BlossomResponseError {
+  message: string
+}
+
+export async function uploadBlossom(options: BlossomOptions) {
+  if (!options.hash) {
+    throw new Error("No hash function provided")
+  }
+  if (!options.sign) {
+    throw new Error("No signer provided")
+  }
+  const now = Date.now() / 1000
+  const hash = await options.hash(options.file)
+  const event = await options.sign({
+    kind: 24242,
+    content: `Upload ${options.file.name}`,
+    created_at: now,
+    tags: [
+      ["t", "upload"],
+      ["x", hash],
+      ["expiration", (now + (options.expiration || 60000)).toString()],
+    ],
+  })
+  await new Promise<void>(r => setTimeout(() => r(), 1000))
+  const data = JSON.stringify(event)
+  const base64 = btoa(data)
+  const authorization = `Nostr ${base64}`
+  const res = await fetch(options.serverUrl + "/upload", {
+    method: "PUT",
+    body: options.file,
+    headers: {
+      authorization,
+    },
+  })
+  const json = await res.json()
+  if (res.status === 200) {
+    return json as BlossomResponse
+  }
+  throw new Error((json as BlossomResponseError).message)
+}
diff --git a/src/app/editor/LinkExtension.ts b/src/app/editor/LinkExtension.ts
new file mode 100644
index 000000000..bbc399f31
--- /dev/null
+++ b/src/app/editor/LinkExtension.ts
@@ -0,0 +1,125 @@
+import {last} from "@welshman/lib"
+import {Node, InputRule, nodePasteRule} from "@tiptap/core"
+import type {Node as ProsemirrorNode} from "@tiptap/pm/model"
+import type {MarkdownSerializerState} from "prosemirror-markdown"
+import {createPasteRuleMatch} from "./util"
+
+export const LINK_REGEX =
+  /([a-z\+:]{2,30}:\/\/)?[^<>\(\)\s]+\.[a-z]{2,6}[^\s]*[^<>"'\.!?,:\s\)\(]*/gi
+
+export interface LinkAttributes {
+  url: string
+}
+
+declare module "@tiptap/core" {
+  interface Commands<ReturnType> {
+    inlineLink: {
+      insertLink: (options: {url: string}) => ReturnType
+    }
+  }
+}
+
+export const LinkExtension = Node.create({
+  atom: true,
+  name: "inlineLink",
+  group: "inline",
+  inline: true,
+  selectable: true,
+  draggable: true,
+  priority: 1000,
+  addAttributes() {
+    return {
+      url: {default: null},
+    }
+  },
+  renderHTML(props) {
+    return ["div", {"data-url": props.node.attrs.url}]
+  },
+  renderText(props) {
+    return props.node.attrs.url
+  },
+  addStorage() {
+    return {
+      markdown: {
+        serialize(state: MarkdownSerializerState, node: ProsemirrorNode) {
+          state.write(node.attrs.url)
+        },
+        parse: {},
+      },
+    }
+  },
+  addCommands() {
+    return {
+      insertLink:
+        ({url}) =>
+        ({commands}) => {
+          return commands.insertContent(
+            {type: this.name, attrs: {url}},
+            {
+              updateSelection: false,
+            },
+          )
+        },
+    }
+  },
+  addInputRules() {
+    return [
+      new InputRule({
+        find: text => {
+          const match = last(Array.from(text.matchAll(LINK_REGEX)))
+
+          if (match && text.length === match.index + match[0].length + 1) {
+            return {
+              index: match.index!,
+              text: match[0],
+              data: {
+                url: match[0],
+              },
+            }
+          }
+
+          return null
+        },
+        handler: ({state, range, match}) => {
+          const {tr} = state
+
+          if (match[0]) {
+            try {
+              tr.insert(range.from - 1, this.type.create(match.data))
+                .delete(tr.mapping.map(range.from - 1), tr.mapping.map(range.to))
+                .insert(
+                  tr.mapping.map(range.to),
+                  this.editor.schema.text(last(Array.from(match.input!))),
+                )
+            } catch (e) {
+              // If the node was already linkified, the above code breaks for whatever reason
+            }
+          }
+
+          tr.scrollIntoView()
+        },
+      }),
+    ]
+  },
+  addPasteRules() {
+    return [
+      nodePasteRule({
+        type: this.type,
+        getAttributes: match => match.data,
+        find: text => {
+          const matches = []
+
+          for (const match of text.matchAll(LINK_REGEX)) {
+            try {
+              matches.push(createPasteRuleMatch(match, {url: match[0]}))
+            } catch (e) {
+              continue
+            }
+          }
+
+          return matches
+        },
+      }),
+    ]
+  },
+})
diff --git a/src/app/editor/SuggestionProfile.svelte b/src/app/editor/SuggestionProfile.svelte
new file mode 100644
index 000000000..42aaf6256
--- /dev/null
+++ b/src/app/editor/SuggestionProfile.svelte
@@ -0,0 +1,38 @@
+<script lang="ts">
+  import {displayPubkey, getPubkeyTagValues, getListTags} from "@welshman/util"
+  import {
+    userFollows,
+    deriveUserWotScore,
+    deriveHandleForPubkey,
+    displayHandle,
+    deriveProfileDisplay,
+  } from "@welshman/app"
+  import WotScore from "src/partials/WotScore.svelte"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+
+  export let value
+
+  const pubkey = value
+  const profileDisplay = deriveProfileDisplay(pubkey)
+  const handle = deriveHandleForPubkey(pubkey)
+  const score = deriveUserWotScore(pubkey)
+
+  $: following = getPubkeyTagValues(getListTags($userFollows)).includes(pubkey)
+</script>
+
+<div class="flex max-w-full gap-3">
+  <div class="py-1">
+    <PersonCircle {pubkey} />
+  </div>
+  <div class="flex min-w-0 flex-col">
+    <div class="flex items-center gap-2">
+      <div class="text-bold overflow-hidden text-ellipsis">
+        {$profileDisplay}
+      </div>
+      <WotScore score={$score} accent={following} />
+    </div>
+    <div class="overflow-hidden text-ellipsis text-sm opacity-75">
+      {$handle ? displayHandle($handle) : displayPubkey(pubkey)}
+    </div>
+  </div>
+</div>
diff --git a/src/app/editor/SuggestionString.svelte b/src/app/editor/SuggestionString.svelte
new file mode 100644
index 000000000..c19d2614a
--- /dev/null
+++ b/src/app/editor/SuggestionString.svelte
@@ -0,0 +1,5 @@
+<script lang="ts">
+  export let value
+</script>
+
+{value}
diff --git a/src/app/editor/Suggestions.svelte b/src/app/editor/Suggestions.svelte
new file mode 100644
index 000000000..25fb43344
--- /dev/null
+++ b/src/app/editor/Suggestions.svelte
@@ -0,0 +1,99 @@
+<svelte:options accessors />
+
+<script lang="ts">
+  import {throttle} from "throttle-debounce"
+  import {fly, slide} from "svelte/transition"
+  import {clamp} from "@welshman/lib"
+  import {theme} from "src/partials/state"
+
+  export let term
+  export let search
+  export let select
+  export let component
+  export let loading = false
+  export let allowCreate = false
+
+  let index = 0
+  let element: Element
+  let items: string[] = []
+
+  $: populateItems(term)
+
+  const populateItems = throttle(300, term => {
+    items = $search.searchValues(term).slice(0, 5)
+  })
+
+  const setIndex = (newIndex: number, block: any) => {
+    index = clamp([0, items.length - 1], newIndex)
+  }
+
+  export const onKeyDown = (e: any) => {
+    if (["Enter", "Tab"].includes(e.code)) {
+      const value = items[index]
+
+      if (value) {
+        select(value)
+        return true
+      } else if (term && allowCreate) {
+        select(term)
+        return true
+      }
+    }
+
+    if (e.code === "Space" && term && allowCreate) {
+      select(term)
+      return true
+    }
+
+    if (e.code === "ArrowUp") {
+      setIndex(index - 1, "start")
+
+      return true
+    }
+
+    if (e.code === "ArrowDown") {
+      setIndex(index + 1, "start")
+
+      return true
+    }
+  }
+</script>
+
+{#if term}
+  <div
+    data-theme={$theme}
+    bind:this={element}
+    transition:fly|local={{duration: 200}}
+    class="mt-2 max-h-[350px] overflow-y-auto overflow-x-hidden shadow-xl {$$props.class} bg-alt"
+    style={$$props.style}>
+    {#if term && allowCreate && !items.includes(term)}
+      <button
+        class="white-space-nowrap block w-full min-w-0 cursor-pointer overflow-x-hidden text-ellipsis px-4 py-2 text-left transition-all hover:brightness-150"
+        on:mousedown|preventDefault|stopPropagation
+        on:click|preventDefault|stopPropagation={() => select(term)}>
+        Use "<svelte:component this={component} value={term} />"
+      </button>
+    {/if}
+    {#each items as value, i (value)}
+      <button
+        class="white-space-nowrap flex w-full min-w-0 cursor-pointer items-center overflow-x-hidden text-ellipsis px-4 py-2 text-left transition-all hover:brightness-150"
+        on:mousedown|preventDefault|stopPropagation
+        on:click|preventDefault|stopPropagation={() => select(value)}>
+        {#if index === i}
+          <div transition:slide|local={{axis: "x"}} class="flex items-center pr-2">
+            <i class="fa fa-alt-arrow-right" />
+          </div>
+        {/if}
+        <svelte:component this={component} {value} />
+      </button>
+    {/each}
+  </div>
+  {#if loading}
+    <div transition:slide|local class="flex gap-2 px-4 py-2">
+      <div>
+        <i class="fa fa-circle-notch fa-spin" />
+      </div>
+      Loading more options...
+    </div>
+  {/if}
+{/if}
diff --git a/src/app/editor/Suggestions.ts b/src/app/editor/Suggestions.ts
new file mode 100644
index 000000000..603e57442
--- /dev/null
+++ b/src/app/editor/Suggestions.ts
@@ -0,0 +1,104 @@
+import type {SvelteComponent, ComponentType} from "svelte"
+import type {Readable} from "svelte/store"
+import tippy, {type Instance} from "tippy.js"
+import type {Editor} from "@tiptap/core"
+import {PluginKey} from "@tiptap/pm/state"
+import Suggestion from "@tiptap/suggestion"
+import type {Search} from "@welshman/app"
+
+export type SuggestionsOptions = {
+  char: string
+  name: string
+  editor: Editor
+  search: Readable<Search<any, any>>
+  select: (value: any, props: any) => void
+  allowCreate?: boolean
+  suggestionComponent: ComponentType
+  suggestionsComponent: ComponentType
+}
+
+export const createSuggestions = (options: SuggestionsOptions) =>
+  Suggestion({
+    char: options.char,
+    editor: options.editor,
+    pluginKey: new PluginKey(`suggest-${options.name}`),
+    command: ({editor, range, props}) => {
+      // increase range.to by one when the next node is of type "text"
+      // and starts with a space character
+      const nodeAfter = editor.view.state.selection.$to.nodeAfter
+      const overrideSpace = nodeAfter?.text?.startsWith(" ")
+
+      if (overrideSpace) {
+        range.to += 1
+      }
+
+      editor
+        .chain()
+        .focus()
+        .insertContentAt(range, [
+          {type: options.name, attrs: props},
+          {type: "text", text: " "},
+        ])
+        .run()
+
+      window.getSelection()?.collapseToEnd()
+    },
+    allow: ({state, range}) => {
+      const $from = state.doc.resolve(range.from)
+      const type = state.schema.nodes[options.name]
+
+      return !!$from.parent.type.contentMatch.matchType(type)
+    },
+    render: () => {
+      let popover: Instance[]
+      let suggestions: SvelteComponent
+
+      const mapProps = (props: any) => ({
+        term: props.query,
+        search: options.search,
+        allowCreate: options.allowCreate,
+        component: options.suggestionComponent,
+        select: (value: string) => options.select(value, props),
+      })
+
+      return {
+        onStart: props => {
+          const target = document.createElement("div")
+
+          popover = tippy("body", {
+            getReferenceClientRect: props.clientRect as any,
+            appendTo: document.querySelector("dialog[open]") || document.body,
+            content: target,
+            showOnCreate: true,
+            interactive: true,
+            trigger: "manual",
+            placement: "bottom-start",
+          })
+
+          suggestions = new options.suggestionsComponent({target, props: mapProps(props)})
+        },
+        onUpdate: props => {
+          suggestions.$set(mapProps(props))
+
+          if (props.clientRect) {
+            popover[0].setProps({
+              getReferenceClientRect: props.clientRect as any,
+            })
+          }
+        },
+        onKeyDown: props => {
+          if (props.event.key === "Escape") {
+            popover[0].hide()
+
+            return true
+          }
+
+          return Boolean(suggestions.onKeyDown?.(props.event))
+        },
+        onExit: () => {
+          popover[0].destroy()
+          suggestions.$destroy()
+        },
+      }
+    },
+  })
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
new file mode 100644
index 000000000..3cca2ac15
--- /dev/null
+++ b/src/app/editor/index.ts
@@ -0,0 +1,155 @@
+import {nprofileEncode} from "nostr-tools/nip19"
+import {SvelteNodeViewRenderer} from "svelte-tiptap"
+import Code from "@tiptap/extension-code"
+import CodeBlock from "@tiptap/extension-code-block"
+import Document from "@tiptap/extension-document"
+import Dropcursor from "@tiptap/extension-dropcursor"
+import Gapcursor from "@tiptap/extension-gapcursor"
+import History from "@tiptap/extension-history"
+import Placeholder from "@tiptap/extension-placeholder"
+import Paragraph from "@tiptap/extension-paragraph"
+import Text from "@tiptap/extension-text"
+import HardBreakExtension from "@tiptap/extension-hard-break"
+import {
+  Bolt11Extension,
+  NProfileExtension,
+  NEventExtension,
+  NAddrExtension,
+  ImageExtension,
+  VideoExtension,
+  TagExtension,
+} from "nostr-editor"
+import {ctx} from "@welshman/lib"
+import type {StampedEvent} from "@welshman/util"
+import {signer, profileSearch} from "@welshman/app"
+import {createSuggestions} from "./Suggestions"
+import {LinkExtension} from "./LinkExtension"
+import EditMention from "./EditMention.svelte"
+import EditEvent from "./EditEvent.svelte"
+import EditBolt11 from "./EditBolt11.svelte"
+import EditMedia from "./EditMedia.svelte"
+import EditLink from "./EditLink.svelte"
+import Suggestions from "./Suggestions.svelte"
+import SuggestionProfile from "./SuggestionProfile.svelte"
+import {asInline} from "./util"
+import {WordCount} from "./wordcounts"
+import {FileUploadExtension} from "./FileUpload"
+import {getSetting} from "src/engine"
+
+export {
+  createSuggestions,
+  LinkExtension,
+  EditMention,
+  EditEvent,
+  EditBolt11,
+  EditMedia,
+  EditLink,
+  Suggestions,
+}
+export * from "./util"
+
+type EditorOptions = {
+  submit: () => void
+  getPubkeyHints?: (pubkey: string) => string[]
+  element?: HTMLElement
+  submitOnEnter?: boolean
+  submitOnModEnter?: boolean
+  defaultUploadUrl?: string
+  autofocus?: boolean
+  content?: string
+  placeholder?: string
+  uploadType?: "nip96" | "blossom"
+}
+
+export type EditorImage = {
+  src: string
+  sha256: string
+}
+
+export const getEditorOptions = ({
+  submit,
+  getPubkeyHints = () => ctx.app.router.WriteRelays().getUrls(),
+  submitOnEnter = true,
+  submitOnModEnter = false,
+  element,
+  defaultUploadUrl = getSetting("nip96_urls").slice(0, 1)[0] || "https://nostr.build",
+  uploadType = "nip96",
+  autofocus = false,
+  content = "",
+  placeholder,
+}: EditorOptions) => ({
+  autofocus,
+  element,
+  content,
+  extensions: [
+    Code,
+    CodeBlock,
+    Document,
+    Dropcursor,
+    Gapcursor,
+    History,
+    Paragraph,
+    Text,
+    TagExtension,
+    WordCount,
+    Placeholder.configure({placeholder}),
+    HardBreakExtension.extend({
+      addKeyboardShortcuts() {
+        return {
+          "Shift-Enter": () => this.editor.commands.setHardBreak(),
+          "Mod-Enter": () => {
+            if (submitOnModEnter && this.editor.getText().trim()) {
+              submit()
+              return true
+            }
+            return this.editor.commands.setHardBreak()
+          },
+          Enter: () => {
+            if (submitOnEnter && this.editor.getText().trim()) {
+              submit()
+              return true
+            }
+            return false
+          },
+        }
+      },
+    }),
+    LinkExtension.extend({addNodeView: () => SvelteNodeViewRenderer(EditLink)}),
+    Bolt11Extension.extend(asInline({addNodeView: () => SvelteNodeViewRenderer(EditBolt11)})),
+    NProfileExtension.extend({
+      addNodeView: () => SvelteNodeViewRenderer(EditMention),
+      addProseMirrorPlugins() {
+        return [
+          createSuggestions({
+            char: "@",
+            name: "nprofile",
+            editor: this.editor,
+            search: profileSearch,
+            select: (pubkey: string, props: any) => {
+              const relays = getPubkeyHints(pubkey)
+              const nprofile = nprofileEncode({pubkey, relays})
+
+              return props.command({pubkey, nprofile, relays})
+            },
+            suggestionComponent: SuggestionProfile,
+            suggestionsComponent: Suggestions,
+          }),
+        ]
+      },
+    }),
+    NEventExtension.extend(asInline({addNodeView: () => SvelteNodeViewRenderer(EditEvent)})),
+    NAddrExtension.extend(asInline({addNodeView: () => SvelteNodeViewRenderer(EditEvent)})),
+    ImageExtension.extend(
+      asInline({addNodeView: () => SvelteNodeViewRenderer(EditMedia)}),
+    ).configure({defaultUploadUrl, defaultUploadType: uploadType}),
+    VideoExtension.extend(
+      asInline({addNodeView: () => SvelteNodeViewRenderer(EditMedia)}),
+    ).configure({defaultUploadUrl, defaultUploadType: uploadType}),
+    FileUploadExtension.configure({
+      immediateUpload: true,
+      sign: (event: StampedEvent) => {
+        return signer.get()!.sign(event)
+      },
+    }),
+  ],
+})
diff --git a/src/app/editor/util.ts b/src/app/editor/util.ts
new file mode 100644
index 000000000..207fd72bd
--- /dev/null
+++ b/src/app/editor/util.ts
@@ -0,0 +1,98 @@
+import type {JSONContent, PasteRuleMatch, InputRuleMatch} from "@tiptap/core"
+import {Editor} from "@tiptap/core"
+import {ctx} from "@welshman/lib"
+import {Address} from "@welshman/util"
+
+export const asInline = (extend: Record<string, any>) => ({
+  inline: true,
+  group: "inline",
+  ...extend,
+})
+
+export const createInputRuleMatch = <T extends Record<string, unknown>>(
+  match: RegExpMatchArray,
+  data: T,
+): InputRuleMatch => ({index: match.index!, text: match[0], match, data})
+
+export const createPasteRuleMatch = <T extends Record<string, unknown>>(
+  match: RegExpMatchArray,
+  data: T,
+): PasteRuleMatch => ({index: match.index!, text: match[0], match, data})
+
+export const findNodes = (type: string, json: JSONContent) => {
+  const results: JSONContent[] = []
+
+  for (const node of json.content || []) {
+    if (node.type === type) {
+      results.push(node)
+    }
+
+    for (const result of findNodes(type, node)) {
+      results.push(result)
+    }
+  }
+
+  return results
+}
+
+export const findMarks = (type: string, json: JSONContent) => {
+  const results: JSONContent[] = []
+
+  for (const node of json.content || []) {
+    for (const mark of node.marks || []) {
+      if (mark.type === type) {
+        results.push(mark)
+      }
+    }
+
+    for (const result of findMarks(type, node)) {
+      results.push(result)
+    }
+  }
+
+  return results
+}
+
+export const getEditorTags = (editor: Editor) => {
+  const json = editor.getJSON()
+
+  const topicTags = findMarks("tag", json).map(({attrs}: any) => [
+    "t",
+    attrs.tag.replace(/^#/, "").toLowerCase(),
+  ])
+
+  const naddrTags = findNodes("naddr", json).map(
+    ({attrs: {kind, pubkey, identifier, relays = []}}: any) => {
+      const address = new Address(kind, pubkey, identifier).toString()
+
+      return ["q", address, ctx.app.router.fromRelays(relays).getUrl(), pubkey]
+    },
+  )
+
+  const neventTags = findNodes("nevent", json).map(({attrs: {id, author, relays = []}}: any) => [
+    "q",
+    id,
+    ctx.app.router.fromRelays(relays).getUrl(),
+    author || "",
+  ])
+
+  const mentionTags = findNodes("nprofile", json).map(({attrs: {pubkey, relays = []}}: any) => [
+    "p",
+    pubkey,
+    ctx.app.router.fromRelays(relays).getUrl(),
+    "",
+  ])
+
+  const imetaTags = findNodes("image", json).map(({attrs: {src, sha256}}: any) => [
+    "imeta",
+    `url ${src}`,
+    `x ${sha256}`,
+    `ox ${sha256}`,
+  ])
+
+  return [...topicTags, ...naddrTags, ...neventTags, ...mentionTags, ...imetaTags]
+}
+
+export const addFile = (editor: Editor) => editor.chain().selectFiles().run()
+
+export const uploadFiles = (editor: Editor) => editor.chain().uploadFiles().run()
diff --git a/src/app/editor/wordcounts.ts b/src/app/editor/wordcounts.ts
new file mode 100644
index 000000000..082088520
--- /dev/null
+++ b/src/app/editor/wordcounts.ts
@@ -0,0 +1,19 @@
+import {Extension} from "@tiptap/core"
+import {writable} from "svelte/store"
+
+export const WordCount = Extension.create({
+  name: "wordCount",
+
+  addStorage() {
+    return {
+      words: writable(0),
+      characters: writable(0),
+    }
+  },
+
+  onUpdate() {
+    const text = this.editor.state.doc.textContent
+    this.storage.characters.set(text.length)
+    this.storage.words.set(text.split(/\s+/).filter(word => word.length > 0).length)
+  },
+})
diff --git a/src/app/shared/Compose.svelte b/src/app/shared/Compose.svelte
index 8edd2265a..d1f2ef715 100644
--- a/src/app/shared/Compose.svelte
+++ b/src/app/shared/Compose.svelte
@@ -1,272 +1,21 @@
-<script lang="ts">
-  import {nip19} from "nostr-tools"
-  import {throttle} from "throttle-debounce"
-  import {createEventDispatcher} from "svelte"
-  import {whereEq} from "ramda"
-  import {ctx, last, partition} from "@welshman/lib"
-  import {displayProfileByPubkey, profileSearch} from "@welshman/app"
-  import PersonBadge from "src/app/shared/PersonBadge.svelte"
-  import ContentEditable from "src/partials/ContentEditable.svelte"
-  import Suggestions from "src/partials/Suggestions.svelte"
-  import {userFollows, createPeopleLoader} from "src/engine"
-
-  export let onSubmit
-  export let autofocus = false
-  export let placeholder = null
-
-  let contenteditable, suggestions
-
-  const dispatch = createEventDispatcher()
-
-  const {loading: loadingPeople, load: loadPeople} = createPeopleLoader({
-    shouldLoad: (term: string) => term.startsWith("@"),
-    onEvent: () => applySearch(getInfo().word),
-  })
-
-  const pubkeyEncoder = {
-    encode: pubkey => {
-      const relays = ctx.app.router.FromPubkeys([pubkey]).getUrls()
-      const nprofile = nip19.nprofileEncode({pubkey, relays})
-
-      return "nostr:" + nprofile
-    },
-    decode: link => {
-      // @ts-ignore
-      return nip19.decode(last(link.split(":"))).data.pubkey
-    },
-  }
-
-  const applySearch = throttle(300, word => {
-    let results = []
-    if (word.length > 1 && word.startsWith("@")) {
-      const [followed, notFollowed] = partition(
-        pubkey => $userFollows.has(pubkey),
-        $profileSearch.searchValues(word.slice(1)),
-      )
-
-      results = followed.concat(notFollowed)
-    }
-
-    suggestions.setData(results)
-  })
-
-  const getInfo = () => {
-    const selection = window.getSelection()
-    const {focusNode: node, focusOffset: offset} = selection
-    const textBeforeCursor = node.textContent.slice(0, offset)
-    const word = last(textBeforeCursor.trim().split(/\s+/))
-
-    return {selection, node, offset, word}
-  }
-
-  const autocomplete = ({pubkey = null, force = false} = {}) => {
-    let completed = false
-
-    const {selection, node, offset, word} = getInfo()
-
-    const annotate = (prefix, text, value) => {
-      const adjustedOffset = offset - word.length + prefix.length
-
-      // Space includes a zero-width space to avoid having the cursor end up inside
-      // mention span on backspace, and a space for convenience in composition.
-      const space = document.createTextNode("\u200B\u00A0")
-      const spaceSpan = document.createElement("span")
-      const span = document.createElement("span")
-
-      spaceSpan.append(space)
-
-      span.classList.add("underline")
-      span.dataset.coracle = JSON.stringify({prefix, value})
-      span.innerText = text
-
-      // Remove our partial mention text
-      selection.setBaseAndExtent(node, adjustedOffset, node, offset)
-      selection.deleteFromDocument()
-
-      // Add the span and space
-      selection.getRangeAt(0).insertNode(span)
-      selection.collapse(span.nextSibling, 0)
-      span.insertAdjacentElement("afterend", spaceSpan)
-      selection.collapse(spaceSpan.nextSibling, 0)
-
-      completed = true
-    }
-
-    // Mentions
-    if ((force || word.length > 1) && word.startsWith("@") && pubkey) {
-      annotate("@", displayProfileByPubkey(pubkey).trim(), pubkeyEncoder.encode(pubkey))
-    }
-
-    // Topics
-    if ((force || word.length > 1) && word.startsWith("#")) {
-      annotate("#", word.slice(1), word.slice(1))
-    }
-
-    suggestions.setData([])
-
-    return completed
+<style>
+  :global(a[data-type="tag"]) {
+    text-decoration: underline;
   }
+</style>
 
-  const onKeyDown = e => {
-    if (e.code === "Enter" && (e.ctrlKey || e.metaKey)) {
-      return onSubmit()
-    }
-
-    // Don't close a modal, submit the form, or lose focus
-    if (["Escape", "Tab"].includes(e.code)) {
-      e.preventDefault()
-      e.stopPropagation()
-    }
-
-    // If we have suggestions, re-route keyboard commands
-    if (["Enter", "ArrowUp", "ArrowDown"].includes(e.code) && suggestions.get()) {
-      e.preventDefault()
-    }
-
-    // Enter adds a newline, so do it on key down
-    if (["Enter"].includes(e.code)) {
-      autocomplete({pubkey: suggestions.get()})
-    }
-
-    // Only autocomplete topics on space
-    if (["Space"].includes(e.code)) {
-      if (autocomplete()) {
-        e.preventDefault()
-      }
-    }
-  }
-
-  const onKeyUp = e => {
-    const {word} = getInfo()
-
-    // Populate search data
-    loadPeople(word)
-    applySearch(word)
-
-    if (["Tab"].includes(e.code)) {
-      autocomplete({pubkey: suggestions.get()})
-    }
-
-    if (["Escape", "Space"].includes(e.code)) {
-      suggestions.clear()
-    }
-
-    if (e.code === "ArrowUp") {
-      suggestions.prev()
-    }
-
-    if (e.code === "ArrowDown") {
-      suggestions.next()
-    }
-
-    dispatch("keyup", e)
-  }
-
-  export const mention = pubkey => {
-    const input = contenteditable.getInput()
-    const selection = window.getSelection()
-    const textNode = document.createTextNode("@")
-    const spaceNode = document.createTextNode(" ")
-
-    // Insert the text node, then an extra node so we don't break stuff in annotate
-    selection.getRangeAt(0).insertNode(textNode)
-    selection.collapse(input, 1)
-    selection.getRangeAt(0).insertNode(spaceNode)
-    selection.collapse(input, 1)
-
-    autocomplete({pubkey, force: true})
-  }
-
-  const createNewLines = (n = 1) => {
-    const div = document.createElement("div")
-
-    div.innerHTML = "<br>".repeat(n)
-
-    return div
-  }
-
-  export const clear = () => {
-    const input = contenteditable.getInput()
-
-    input.innerHTML = ""
-
-    contenteditable.onInput()
-  }
-
-  export const nevent = text => {
-    const input = contenteditable.getInput()
-    const selection = window.getSelection()
-    const textNode = document.createTextNode(text)
-    const newLines = createNewLines(2)
-
-    selection.getRangeAt(0).insertNode(newLines)
-    selection.collapse(input, 1)
-    selection.getRangeAt(0).insertNode(textNode)
-    selection.collapse(input, 0)
-
-    contenteditable.onInput()
-  }
-
-  export const write = text => {
-    const input = contenteditable.getInput()
-
-    input.focus()
-
-    const selection = window.getSelection()
-    const textNode = document.createTextNode(text)
-    const target = (last(input.childNodes) || input) as unknown as Node
-    const offset = target instanceof Text ? target.textContent.length : target.childNodes.length
-
-    selection.collapse(target, offset)
-    selection.getRangeAt(0).insertNode(textNode)
-    selection.collapse(textNode, text.length)
-
-    autocomplete()
-    contenteditable.onInput()
-  }
-
-  export const newlines = n => {
-    const selection = window.getSelection()
-    const newLines = createNewLines(2)
-
-    selection.getRangeAt(0).insertNode(newLines)
-    selection.collapse(newLines, 2)
-
-    contenteditable.onInput()
-  }
-
-  export const parse = () => {
-    let {content, annotations} = contenteditable.parse()
-
-    // Remove zero-width and non-breaking spaces
-    content = content.replace(/[\u200B\u00A0]/g, " ").trim()
+<script lang="ts">
+  import cx from "classnames"
+  import {onDestroy} from "svelte"
+  import {Editor} from "svelte-tiptap"
 
-    // Strip the @ sign in mentions
-    annotations.filter(whereEq({prefix: "@"})).forEach(({prefix, value}, index) => {
-      content = content.replace(prefix + value, value)
-    })
+  export let element: HTMLElement
+  export let editor: Editor
 
-    return content
-  }
+  onDestroy(() => editor?.destroy())
 </script>
 
-<div class="flex w-full">
-  <ContentEditable
-    {autofocus}
-    {placeholder}
-    style={$$props.style}
-    class={$$props.class}
-    bind:this={contenteditable}
-    on:keydown={onKeyDown}
-    on:keyup={onKeyUp} />
+<div class="relative flex w-full overflow-x-hidden">
+  <div bind:this={element} style={$$props.style} class={cx($$props.class, "relative w-full")} />
   <slot name="addon" />
 </div>
-
-<Suggestions
-  bind:this={suggestions}
-  select={pubkey => autocomplete({pubkey})}
-  loading={$loadingPeople}>
-  <div slot="item" let:item>
-    <PersonBadge inert pubkey={item} />
-  </div>
-</Suggestions>
diff --git a/src/app/shared/NoteCreateInline.svelte b/src/app/shared/NoteCreateInline.svelte
index 92186162e..386d34698 100644
--- a/src/app/shared/NoteCreateInline.svelte
+++ b/src/app/shared/NoteCreateInline.svelte
@@ -1,25 +1,30 @@
 <script lang="ts">
-  import {pubkey, tagReplyTo} from "@welshman/app"
+  import {writable, type Writable} from "svelte/store"
   import {ctx} from "@welshman/lib"
   import {createEvent} from "@welshman/util"
-  import {join} from "ramda"
-  import Compose from "src/app/shared/Compose.svelte"
-  import NoteImages from "src/app/shared/NoteImages.svelte"
-  import NoteOptions from "src/app/shared/NoteOptions.svelte"
-  import NsecWarning from "src/app/shared/NsecWarning.svelte"
-  import PersonCircle from "src/app/shared/PersonCircle.svelte"
-  import {getClientTags, publish, signAndPublish, tagsFromContent} from "src/engine"
+  import {pubkey, tagReplyTo} from "@welshman/app"
   import AltColor from "src/partials/AltColor.svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import ImageInput from "src/partials/ImageInput.svelte"
   import {showPublishInfo, showWarning} from "src/partials/Toast.svelte"
-  import {writable} from "svelte/store"
+  import Compose from "src/app/shared/Compose.svelte"
+  import NsecWarning from "src/app/shared/NsecWarning.svelte"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import NoteOptions from "src/app/shared/NoteOptions.svelte"
+  import {getEditorOptions} from "src/app/editor"
+  import {publish, getClientTags, tagsFromContent, signAndPublish} from "src/engine"
+  import {onMount} from "svelte"
+  import {Editor} from "svelte-tiptap"
 
   export let parent = null
+  export let group = null
+
+  let editorElement: HTMLElement
+  let editor: Editor
+  let editorLoading: Writable<boolean>
 
   const defaultOpts = {anonymous: false, warning: ""}
 
-  let images, compose, options, saving
+  let options, saving
 
   let opts = {...defaultOpts}
 
@@ -35,15 +40,17 @@
   }
 
   const onSubmit = async ({skipNsecWarning = false} = {}) => {
+    if ($editorLoading) return
+
     saving = true
 
-    const content = compose.parse().trim()
+    const content = editor.getText().trim()
 
     if (!content) return showWarning("Please provide a description.")
 
     if (!skipNsecWarning && content.match(/\bnsec1.+/)) return nsecWarning.set(true)
 
-    const tags = [...tagsFromContent(content), ...getClientTags()]
+    const tags = [...tagsFromContent(content), ...getClientTags(), ...editor.commands.getMetaTags()]
 
     if (parent) {
       for (const tag of tagReplyTo(parent)) {
@@ -51,10 +58,6 @@
       }
     }
 
-    for (const imeta of images.getValue()) {
-      tags.push(["imeta", ...imeta.unwrap().map(join(" "))])
-    }
-
     if (opts.warning) {
       tags.push(["content-warning", opts.warning])
     }
@@ -69,27 +72,42 @@
 
     showPublishInfo(pub)
     opts = {...defaultOpts}
-    compose.clear()
+
+    editor.commands.clearContent()
     saving = false
   }
+
+  onMount(() => {
+    const options = getEditorOptions({
+      submit: onSubmit,
+      element: editorElement,
+      submitOnEnter: true,
+      autofocus: true,
+    })
+
+    editor = new Editor(options)
+
+    editorLoading = editor.storage.fileUpload.loading
+  })
 </script>
 
 <form on:submit|preventDefault={() => onSubmit()}>
   <AltColor background class="z-feature flex gap-4 overflow-hidden rounded p-3 text-neutral-100">
     <PersonCircle class="h-10 w-10" pubkey={$pubkey} />
     <div class="w-full min-w-0">
-      <Compose placeholder="What's up?" bind:this={compose} {onSubmit} style="min-height: 3em;" />
-      <div class="p-2">
-        <NoteImages bind:this={images} bind:compose includeInContent />
-      </div>
+      <!-- placeholder="What's up?" -->
+      <Compose bind:element={editorElement} {editor} style="min-height: 3em;" />
       <div class="flex items-center justify-between">
         <div class="flex items-center justify-end gap-3">
           <i class="fa fa-cog cursor-pointer" on:click={() => options.setView("settings")} />
-          <ImageInput multi hostLimit={3} on:change={e => images.addImage(e.detail)}>
-            <i slot="button" class="fa fa-paperclip cursor-pointer" />
-          </ImageInput>
+          <button
+            class="hover:bg-white-l staatliches flex h-7 w-7 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded bg-white px-6 text-xl text-black transition-all"
+            on:click|preventDefault={editor.commands.selectFiles}>
+            <i class="fa fa-paperclip cursor-pointer" />
+          </button>
         </div>
-        <Anchor button accent disabled={saving} on:click={() => onSubmit()}>Send</Anchor>
+        <Anchor button accent disabled={saving || $editorLoading} on:click={() => onSubmit({})}
+          >Send</Anchor>
       </div>
     </div>
   </AltColor>
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index 716169c55..a04fd5c6b 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -1,21 +1,21 @@
 <script lang="ts">
-  import {writable} from "svelte/store"
+  import {writable, type Writable} from "svelte/store"
   import {Tags, createEvent, uniqTags} from "@welshman/util"
   import {createEventDispatcher} from "svelte"
-  import {join, without, uniq} from "ramda"
+  import {without, uniq} from "ramda"
   import {ctx} from "@welshman/lib"
   import {session, displayProfileByPubkey, tagReplyTo, tagPubkey} from "@welshman/app"
   import {slide} from "src/util/transition"
   import {showPublishInfo} from "src/partials/Toast.svelte"
-  import ImageInput from "src/partials/ImageInput.svelte"
   import AltColor from "src/partials/AltColor.svelte"
   import Chip from "src/partials/Chip.svelte"
+  import {getEditorOptions} from "src/app/editor"
   import Compose from "src/app/shared/Compose.svelte"
   import NsecWarning from "src/app/shared/NsecWarning.svelte"
   import NoteOptions from "src/app/shared/NoteOptions.svelte"
-  import NoteImages from "src/app/shared/NoteImages.svelte"
-  import {publish, signAndPublish, tagsFromContent, getClientTags} from "src/engine"
+  import {publish, tagsFromContent, getClientTags, signAndPublish} from "src/engine"
   import {drafts} from "src/app/state"
+  import {Editor} from "svelte-tiptap"
 
   export let parent
   export let addToContext
@@ -26,10 +26,13 @@
   const nsecWarning = writable(null)
   const parentTags = Tags.fromEvent(parent)
 
-  let images, compose, container, options, loading
+  let container, options, loading
   let isOpen = false
   let mentions = []
   let opts = {warning: "", anonymous: false}
+  let editorElement: HTMLElement
+  let editor: Editor
+  let editorLoading: Writable<boolean>
 
   export const start = () => {
     dispatch("start")
@@ -39,12 +42,6 @@
       [$session.pubkey],
       uniq(parentTags.values("p").valueOf().concat(parent.pubkey)),
     )
-
-    const draft = drafts.get(parent.id)
-
-    if (draft) {
-      setTimeout(() => compose.write(draft), 10)
-    }
   }
 
   const bypassNsecWarning = () => {
@@ -57,8 +54,8 @@
   }
 
   const saveDraft = () => {
-    if (compose) {
-      drafts.set(parent.id, compose.parse())
+    if (editor) {
+      drafts.set(parent.id, editor.getHTML())
     }
   }
 
@@ -70,7 +67,6 @@
     dispatch("reset")
 
     isOpen = false
-    compose = null
     mentions = []
   }
 
@@ -79,7 +75,9 @@
   }
 
   const send = async ({skipNsecWarning = false} = {}) => {
-    const content = compose.parse().trim()
+    if ($editorLoading) return
+
+    const content = editor.getText().trim()
 
     if (!content) return
 
@@ -89,13 +87,10 @@
       ...mentions.map(tagPubkey),
       ...tagReplyTo(parent),
       ...tagsFromContent(content),
+      ...editor.commands.getMetaTags(),
       ...getClientTags(),
     ])
 
-    for (const imeta of images.getValue()) {
-      tags.push(["imeta", ...imeta.unwrap().map(join(" "))])
-    }
-
     if (opts.warning) {
       tags.push(["content-warning", opts.warning])
     }
@@ -127,6 +122,23 @@
       reset()
     }
   }
+
+  const createEditor = () => {
+    const draft = drafts.get(parent.id)
+
+    const options = getEditorOptions({
+      submit: send,
+      element: editorElement,
+      submitOnEnter: true,
+      autofocus: true,
+      content: draft || "",
+    })
+
+    editor = new Editor({...options})
+    editorLoading = editor.storage.fileUpload.loading
+  }
+
+  $: editorElement && createEditor()
 </script>
 
 <svelte:body on:click={onBodyClick} />
@@ -141,17 +153,18 @@
     {/if}
     <div
       transition:slide|local
-      class="note-reply relative my-2 flex flex-col gap-1"
+      class="note-reply relative my-2 gap-1"
       bind:this={container}
       on:click|stopPropagation>
       <AltColor background class="overflow-hidden rounded">
         <div class="p-3 text-neutral-100" class:rounded-b={mentions.length === 0}>
-          <Compose autofocus bind:this={compose} onSubmit={() => send()} style="min-height: 4rem">
+          <Compose bind:element={editorElement} {editor}>
             <div class="flex flex-col justify-start" slot="addon">
               <button
-                on:click={() => send()}
+                on:click={send}
+                disabled={$editorLoading}
                 class="flex h-12 w-12 cursor-pointer items-center justify-center rounded-full transition-all hover:bg-accent">
-                {#if loading}
+                {#if loading || $editorLoading}
                   <i class="fa fa-circle-notch fa-spin" />
                 {:else}
                   <i class="fa fa-paper-plane" />
@@ -160,21 +173,19 @@
             </div>
           </Compose>
         </div>
-        <div class="p-2">
-          <NoteImages bind:this={images} bind:compose includeInContent />
-        </div>
         <div class="h-px" />
         <div class="flex gap-2 rounded-b p-2 text-sm text-neutral-100">
           <div class="inline-block border-r border-solid border-neutral-600 py-2 pl-1 pr-3">
             <div class="flex cursor-pointer items-center gap-3">
-              <ImageInput multi hostLimit={3} on:change={e => images.addImage(e.detail)}>
-                <i slot="button" class="fa fa-paperclip" />
-              </ImageInput>
-              <i class="fa fa-cog" on:click={() => options.setView("settings")} />
+              <button
+                class="hover:bg-white-l staatliches flex h-7 w-7 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded bg-white px-6 text-xl text-black transition-all"
+                on:click|preventDefault={editor.commands.selectFiles}>
+                <i class="fa fa-paperclip" />
+              </button>
               <i class="fa fa-at" />
             </div>
           </div>
-          <div on:click|stopPropagation>
+          <div on:click|stopPropagation class="flex items-center">
             {#each mentions as pubkey}
               <Chip class="mb-1 mr-1" onRemove={() => removeMention(pubkey)}>
                 {displayProfileByPubkey(pubkey)}
diff --git a/src/app/views/EventEdit.svelte b/src/app/views/EventEdit.svelte
index e5fdaacd1..6f22eda3a 100644
--- a/src/app/views/EventEdit.svelte
+++ b/src/app/views/EventEdit.svelte
@@ -2,7 +2,6 @@
   import {inc} from "ramda"
   import {now} from "@welshman/lib"
   import {Tags, asStampedEvent} from "@welshman/util"
-  import {sleep} from "hurdak"
   import {secondsToDate, dateToSeconds} from "src/util/misc"
   import FlexColumn from "src/partials/FlexColumn.svelte"
   import Anchor from "src/partials/Anchor.svelte"
@@ -10,28 +9,32 @@
   import Field from "src/partials/Field.svelte"
   import Input from "src/partials/Input.svelte"
   import DateTimeInput from "src/partials/DateTimeInput.svelte"
-  import ImageInput from "src/partials/ImageInput.svelte"
-  import NoteImages from "src/app/shared/NoteImages.svelte"
   import Compose from "src/app/shared/Compose.svelte"
   import {router} from "src/app/util/router"
   import {deriveEvent, signAndPublish} from "src/engine"
+  import {Editor} from "svelte-tiptap"
+  import {getEditorOptions} from "src/app/editor"
 
   export let address
 
+  let editor: Editor
+  let editorElement: HTMLElement
+
   const event = deriveEvent(address)
 
   const onSubmit = async () => {
+    if (editor.storage.fileUpload.loading) return
+
     const tags = Tags.fromEvent($event)
       .setTag("title", values.title)
       .setTag("location", values.location)
       .setTag("start", dateToSeconds(values.start).toString())
       .setTag("end", dateToSeconds(values.end).toString())
-      .setIMeta(images.getValue())
 
     const template = asStampedEvent({
       ...$event,
-      tags: tags.unwrap(),
-      content: compose.parse(),
+      tags: [...tags.unwrap(), ...editor.commands.getMetaTags()],
+      content: editor.getText(),
       created_at: inc($event.created_at),
     })
 
@@ -40,32 +43,33 @@
   }
 
   let loading = true
-  let images, compose
   let values: any = {}
 
-  $: {
-    if ($event) {
-      const tags = Tags.fromEvent($event)
+  function edit() {
+    const tags = Tags.fromEvent($event)
 
-      loading = false
+    values = {
+      groups: tags.context().values().valueOf(),
+      title: tags.get("name")?.value() || tags.get("title")?.value() || "",
+      location: tags.get("location")?.value() || "",
+      start: secondsToDate(tags.get("start")?.value() || now()),
+      end: secondsToDate(tags.get("end")?.value() || now()),
+    }
 
-      values = {
-        title: tags.get("name")?.value() || tags.get("title")?.value() || "",
-        location: tags.get("location")?.value() || "",
-        start: secondsToDate(tags.get("start")?.value() || now()),
-        end: secondsToDate(tags.get("end")?.value() || now()),
-      }
+    editor = new Editor(
+      getEditorOptions({
+        submit: onSubmit,
+        element: editorElement,
+        content: $event.content || "",
+        submitOnEnter: true,
+        autofocus: true,
+      }),
+    )
+  }
 
-      // Wait for components to mount
-      sleep(10).then(() => {
-        compose.write($event.content)
+  $: loading = !$event
 
-        for (const url of tags.values("image").valueOf()) {
-          images.addImage(Tags.wrap([["url", url]]))
-        }
-      })
-    }
-  }
+  $: editorElement && edit()
 </script>
 
 {#if loading}
@@ -91,13 +95,16 @@
       </Field>
       <Field label="Description">
         <div class="rounded-xl border border-solid border-neutral-600 bg-white p-3 text-black">
-          <Compose autofocus bind:this={compose} {onSubmit} />
+          <Compose bind:element={editorElement} {editor} class="min-h-24" />
         </div>
       </Field>
-      <NoteImages bind:this={images} bind:compose includeInContent />
       <div class="flex gap-2">
         <Anchor button tag="button" type="submit" class="flex-grow">Save</Anchor>
-        <ImageInput multi hostLimit={3} on:change={e => images?.addImage(e.detail)} />
+        <button
+          class="hover:bg-white-l staatliches flex h-7 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded bg-white px-6 text-xl text-black transition-all"
+          on:click|preventDefault={editor.commands.selectFiles}>
+          <i class="fa fa-upload" />
+        </button>
       </div>
     </FlexColumn>
   </form>
diff --git a/src/app/views/Login.svelte b/src/app/views/Login.svelte
index 77ce7f1b9..e7d35d779 100644
--- a/src/app/views/Login.svelte
+++ b/src/app/views/Login.svelte
@@ -197,7 +197,8 @@
           <span slot="item" let:item>{item.domain}</span>
         </SearchSelect>
       </FieldInline>
-      <Anchor button accent tall type="submit" disabled={!username} {loading} on:click={onSubmit}>Log In</Anchor>
+      <Anchor button accent tall type="submit" disabled={!username} {loading} on:click={onSubmit}
+        >Log In</Anchor>
     </div>
     <div class="relative flex items-center gap-4">
       <div class="h-px flex-grow bg-neutral-600" />
diff --git a/src/app/views/LoginBunker.svelte b/src/app/views/LoginBunker.svelte
index 899915838..b3292f471 100644
--- a/src/app/views/LoginBunker.svelte
+++ b/src/app/views/LoginBunker.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {Nip46Broker} from '@welshman/signer'
+  import {Nip46Broker} from "@welshman/signer"
   import {isKeyValid} from "src/util/nostr"
   import {showWarning} from "src/partials/Toast.svelte"
   import Input from "src/partials/Input.svelte"
diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index 6b0d175cd..7fe9fa0cd 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -1,35 +1,29 @@
 <script lang="ts">
-  import {session, tagPubkey} from "@welshman/app"
-  import {ctx, now} from "@welshman/lib"
+  import {onMount} from "svelte"
+  import {whereEq} from "ramda"
+  import {commaFormat, toTitle, switcherFn} from "hurdak"
+  import {writable, type Writable} from "svelte/store"
+  import {ctx, last, now} from "@welshman/lib"
   import {createEvent} from "@welshman/util"
-  import {commaFormat, switcherFn, throttle, toTitle} from "hurdak"
-  import {nip19} from "nostr-tools"
-  import {join, whereEq} from "ramda"
-  import Compose from "src/app/shared/Compose.svelte"
-  import NoteContent from "src/app/shared/NoteContent.svelte"
-  import NoteImages from "src/app/shared/NoteImages.svelte"
-  import NoteOptions from "src/app/shared/NoteOptions.svelte"
-  import NsecWarning from "src/app/shared/NsecWarning.svelte"
-  import {router} from "src/app/util/router"
-  import {getClientTags, signAndPublish, tagsFromContent} from "src/engine"
   import Anchor from "src/partials/Anchor.svelte"
-  import Chip from "src/partials/Chip.svelte"
-  import Content from "src/partials/Content.svelte"
   import CurrencyInput from "src/partials/CurrencyInput.svelte"
   import CurrencySymbol from "src/partials/CurrencySymbol.svelte"
   import DateTimeInput from "src/partials/DateTimeInput.svelte"
   import Field from "src/partials/Field.svelte"
   import FlexColumn from "src/partials/FlexColumn.svelte"
-  import ImageInput from "src/partials/ImageInput.svelte"
   import Input from "src/partials/Input.svelte"
   import Menu from "src/partials/Menu.svelte"
   import MenuItem from "src/partials/MenuItem.svelte"
-  import Popover from "src/partials/Popover.svelte"
-  import {showPublishInfo, showWarning} from "src/partials/Toast.svelte"
-  import {currencyOptions} from "src/util/i18n"
-  import {dateToSeconds} from "src/util/misc"
-  import {onMount} from "svelte"
-  import {writable} from "svelte/store"
+  import Chip from "src/partials/Chip.svelte"
+  import Compose from "src/app/shared/Compose.svelte"
+  import NsecWarning from "src/app/shared/NsecWarning.svelte"
+  import NoteContent from "src/app/shared/NoteContent.svelte"
+  import NoteOptions from "src/app/shared/NoteOptions.svelte"
+  import {getEditorOptions} from "src/app/editor"
+  import {router} from "src/app/util/router"
+  import {getClientTags, signAndPublish, tagsFromContent} from "src/engine"
+  import {Editor} from "svelte-tiptap"
+  import {nip19} from "nostr-tools"
   import {v4 as uuid} from "uuid"
 
   export let type = "note"
@@ -37,10 +31,14 @@
   export let pubkey = null
   export let initialValues = {}
 
-  let images, compose
-  let charCount = 0
-  let wordCount = 0
+  let charCount: Writable<number>
+  let wordCount: Writable<number>
   let showPreview = false
+  let options
+
+  let editor: Editor
+  let element: HTMLElement
+
   let opts = {
     title: "",
     warning: "",
@@ -66,7 +64,10 @@
   }
 
   const onSubmit = async ({skipNsecWarning = false} = {}) => {
-    const content = compose.parse().trim()
+    // prevent sending before media are uploaded and tags are correctly set
+    if ($loading) return
+
+    const content = editor.getText().trim()
 
     if (!content) return showWarning("Please provide a description.")
 
@@ -95,16 +96,7 @@
         return showWarning("Please select a currency.")
       }
     }
-
-    const tags = [...tagsFromContent(content), ...getClientTags()]
-
-    for (const imeta of images.getValue()) {
-      if (type === "listing") {
-        tags.push(["image", imeta.get("url").value()])
-      } else {
-        tags.push(["imeta", ...imeta.unwrap().map(join(" "))])
-      }
-    }
+    const tags = [...tagsFromContent(content), ...getClientTags(), ...editor.commands.getMetaTags()]
 
     if (opts.warning) {
       tags.push(["content-warning", opts.warning])
@@ -153,22 +145,37 @@
     showPreview = !showPreview
   }
 
-  const updateCounts = throttle(300, () => {
-    if (compose) {
-      const content = compose.parse()
-
-      charCount = content.length || 0
-      wordCount = content.trim() ? (content.match(/\s+/g)?.length || 0) + 1 : 0
-    }
-  })
-
   const setType = t => {
     type = t
   }
 
+  const pubkeyEncoder = {
+    encode: pubkey => {
+      const relays = ctx.app.router.FromPubkeys([pubkey]).getUrls()
+      const nprofile = nip19.nprofileEncode({pubkey, relays})
+
+      return "nostr:" + nprofile
+    },
+    decode: link => {
+      // @ts-ignore
+      return nip19.decode(last(link.split(":"))).data.pubkey
+    },
+  }
+
   onMount(() => {
+    const options = getEditorOptions({
+      submit: onSubmit,
+      element,
+      autofocus: true,
+    })
+
+    editor = new Editor(options)
+
+    charCount = editor.storage.wordCount.characters
+    wordCount = editor.storage.wordCount.words
+
     if (pubkey && pubkey !== $session.pubkey) {
-      compose.mention(pubkey)
+      editor.commands.insertNProfile({nprofile: pubkeyEncoder.encode(pubkey)})
     }
 
     if (quote) {
@@ -179,12 +186,17 @@
         relays: ctx.app.router.Event(quote).getUrls(),
       })
 
-      compose.nevent("nostr:" + nevent)
+      editor.commands.insertNEvent({nevent: "nostr:" + nevent})
     }
   })
+
+  $: loading = editor?.storage.fileUpload.loading
 </script>
 
-<form on:submit|preventDefault={() => onSubmit()}>
+<form
+  on:submit|preventDefault={() => {
+    onSubmit()
+  }}>
   <Content size="lg">
     <div class="flex gap-2">
       <span class="text-2xl font-bold">Create a</span>
@@ -250,19 +262,19 @@
           class:text-black={!showPreview}
           class:bg-tinted-700={showPreview}>
           {#if showPreview}
-            <NoteContent note={{content: compose.parse(), tags: []}} />
+            <NoteContent note={{content: editor.getText(), tags: []}} />
           {/if}
           <div class:hidden={showPreview}>
-            <Compose autofocus on:keyup={updateCounts} bind:this={compose} {onSubmit} />
+            <Compose bind:element {editor} class="min-h-24" />
           </div>
         </div>
         <div class="flex items-center justify-end gap-2 text-neutral-200">
           <small>
-            {commaFormat(charCount)} characters
+            {commaFormat($charCount || 0)} characters
           </small>
           <span>•</span>
           <small>
-            {commaFormat(wordCount)} words
+            {commaFormat($wordCount || 0)} words
           </small>
           <span>•</span>
           <button type="button" on:click={togglePreview} class="cursor-pointer text-sm underline">
@@ -270,10 +282,14 @@
           </button>
         </div>
       </Field>
-      <NoteImages bind:this={images} bind:compose includeInContent={type !== "listing"} />
       <div class="flex gap-2">
-        <Anchor button tag="button" type="submit" class="flex-grow">Send</Anchor>
-        <ImageInput multi hostLimit={3} on:change={e => images?.addImage(e.detail)} />
+        <Anchor button tag="button" type="submit" class="flex-grow" disabled={$loading}
+          >Send</Anchor>
+        <button
+          class="hover:bg-white-l staatliches flex h-7 w-7 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded bg-white px-6 text-xl text-black transition-all"
+          on:click|preventDefault={editor.commands.selectFiles}>
+          <i class="fa fa-upload" />
+        </button>
       </div>
     </FlexColumn>
   </Content>
diff --git a/src/app/views/OnboardingNote.svelte b/src/app/views/OnboardingNote.svelte
index 716ec98d5..51e2bd3d4 100644
--- a/src/app/views/OnboardingNote.svelte
+++ b/src/app/views/OnboardingNote.svelte
@@ -39,7 +39,15 @@
   }
 
   onMount(() => {
-    compose.write("Hello world! #introductions")
+    editor = new Editor(
+      getEditorOptions({
+        submit: next,
+        element,
+        submitOnEnter: false,
+        autofocus: true,
+        content: "Hello world! #introductions",
+      }),
+    )
   })
 </script>
 
@@ -56,7 +64,7 @@
 </p>
 <p>Now is a great time to introduce yourself to the Nostr network!</p>
 <div class="border-l-2 border-solid border-neutral-600 pl-4">
-  <Compose autofocus bind:this={compose} onSubmit={next} />
+  <Compose bind:element {editor} class="min-h-24" />
 </div>
 <div class="flex gap-2">
   <Anchor button on:click={prev}><i class="fa fa-arrow-left" /> Back</Anchor>
diff --git a/src/app/views/RelayReview.svelte b/src/app/views/RelayReview.svelte
index b55f69224..1aa72190a 100644
--- a/src/app/views/RelayReview.svelte
+++ b/src/app/views/RelayReview.svelte
@@ -7,14 +7,18 @@
   import Rating from "src/partials/Rating.svelte"
   import {router} from "src/app/util/router"
   import {createAndPublish, getClientTags, tagsFromContent} from "src/engine"
+  import {Editor} from "svelte-tiptap"
+  import {getEditorOptions} from "src/app/editor"
+  import {onMount} from "svelte"
 
   export let url
 
-  let compose
+  let editor: Editor
+  let element: HTMLElement
   let rating
 
   const onSubmit = () => {
-    const content = compose.parse()
+    const content = editor.getText()
 
     createAndPublish({
       relays: ctx.app.router.FromUser().getUrls(),
@@ -32,6 +36,17 @@
 
     router.pop()
   }
+
+  onMount(() => {
+    editor = new Editor(
+      getEditorOptions({
+        submit: onSubmit,
+        element,
+        submitOnEnter: true,
+        autofocus: true,
+      }),
+    )
+  })
 </script>
 
 <form on:submit|preventDefault={onSubmit}>
@@ -45,11 +60,10 @@
         </div>
       </div>
       <Compose
-        {onSubmit}
-        autofocus
+        {editor}
+        bind:element
         class="shadow-inset rounded bg-tinted-200 px-2 py-2 text-black"
-        style="min-height: 6rem"
-        bind:this={compose} />
+        style="min-height: 6rem" />
       <Anchor button tag="button" type="submit" class="flex-grow">Send</Anchor>
     </div>
   </Content>
diff --git a/src/partials/Channel.svelte b/src/partials/Channel.svelte
index 3debd70a5..55a865db8 100644
--- a/src/partials/Channel.svelte
+++ b/src/partials/Channel.svelte
@@ -20,18 +20,22 @@
   import Popover from "src/partials/Popover.svelte"
   import Toggle from "src/partials/Toggle.svelte"
   import FlexColumn from "src/partials/FlexColumn.svelte"
-  import ImageInput from "src/partials/ImageInput.svelte"
   import Modal from "src/partials/Modal.svelte"
   import Subheading from "src/partials/Subheading.svelte"
   import PersonBadgeMedium from "src/app/shared/PersonBadgeMedium.svelte"
   import NoteContent from "src/app/shared/NoteContent.svelte"
   import {hasNip44, ensureMessagePlaintext} from "src/engine"
+  import {Editor} from "svelte-tiptap"
+  import {getEditorOptions} from "src/app/editor"
+  import Compose from "src/app/shared/Compose.svelte"
 
   export let pubkeys
   export let sendMessage
   export let initialMessage = ""
   export let messages: TrustedEvent[]
 
+  let editor: Editor
+
   const loading = sleep(5_000)
   const toggleScale = 0.7
 
@@ -70,6 +74,17 @@
   let useNip17 = isGroupMessage || ($hasNip44 && $pubkeysWithoutInbox.length === 0)
 
   onMount(() => {
+    editor = new Editor(
+      getEditorOptions({
+        submit: send,
+        element: textarea,
+        submitOnEnter: false,
+        submitOnModEnter: true,
+        autofocus: true,
+        placeholder: "Type something...",
+      }),
+    )
+
     startScroller()
 
     if (textarea) {
@@ -98,10 +113,6 @@
     }
   }
 
-  const addImage = imeta => {
-    textarea.value += "\n" + imeta.get("url").value()
-  }
-
   const sendAnyway = () => {
     send()
     closeConfirm()
@@ -116,23 +127,16 @@
   }
 
   const send = async () => {
-    const content = textarea.value.trim()
+    const content = editor.getText().trim()
 
     if (content) {
-      textarea.value = ""
       sending = true
 
       await sendMessage(content, useNip17)
 
       sending = false
       stickToBottom()
-    }
-  }
-
-  const onKeyDown = e => {
-    if (e.key === "Enter" && !e.shiftKey) {
-      e.preventDefault()
-      sendOrConfirm()
+      editor.commands.clearContent()
     }
   }
 
@@ -244,25 +248,18 @@
     {/await}
   </div>
   {#if $hasNip44 || !isGroupMessage}
-    <div
-      class="flex border-t border-solid border-neutral-600 border-tinted-700 bg-neutral-900 dark:bg-neutral-600">
-      <textarea
-        rows="3"
-        autofocus
-        placeholder="Type something..."
-        bind:this={textarea}
-        on:keydown={onKeyDown}
-        class="mb-8 w-full resize-none bg-transparent p-2
-             text-neutral-100 outline-0 placeholder:text-neutral-100" />
+    <div class="flex border-t border-solid border-tinted-700 bg-neutral-900 dark:bg-neutral-600">
+      <Compose
+        bind:element={textarea}
+        {editor}
+        class="mb-8 h-20 w-full resize-none bg-transparent p-2 text-neutral-100 outline-0 placeholder:text-neutral-100" />
       <div>
-        <ImageInput multi on:change={e => addImage(e.detail)}>
-          <button
-            slot="button"
-            class="flex cursor-pointer flex-col justify-center gap-2 border-l border-solid border-tinted-700 p-3
+        <button
+          on:click={() => editor.commands.selectFiles()}
+          class="flex cursor-pointer flex-col justify-center gap-2 border-l border-solid border-tinted-700 p-3
                  py-6 text-neutral-100 transition-all hover:bg-accent hover:text-white">
-            <i class="fa-solid fa-paperclip fa-lg" />
-          </button>
-        </ImageInput>
+          <i class="fa-solid fa-paperclip fa-lg" />
+        </button>
         <button
           on:click={sendOrConfirm}
           class="flex cursor-pointer flex-col justify-center gap-2 border-l border-solid border-tinted-700 p-3

From b4750028d7919edcb96e548cb5b27fbd58655136 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 1 Nov 2024 16:26:49 +0100
Subject: [PATCH 02/26] button restyling

---
 src/app/shared/NoteCreateInline.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/NoteCreateInline.svelte b/src/app/shared/NoteCreateInline.svelte
index 386d34698..48df12994 100644
--- a/src/app/shared/NoteCreateInline.svelte
+++ b/src/app/shared/NoteCreateInline.svelte
@@ -101,7 +101,7 @@
         <div class="flex items-center justify-end gap-3">
           <i class="fa fa-cog cursor-pointer" on:click={() => options.setView("settings")} />
           <button
-            class="hover:bg-white-l staatliches flex h-7 w-7 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded bg-white px-6 text-xl text-black transition-all"
+            class="hover:bg-white-l staatliches flex h-7 w-7 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded px-6 transition-all"
             on:click|preventDefault={editor.commands.selectFiles}>
             <i class="fa fa-paperclip cursor-pointer" />
           </button>

From b4b73df7f91bebb2454af7babf4062cafc852ca6 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 1 Nov 2024 16:27:10 +0100
Subject: [PATCH 03/26] get suggestions style closer to Coracle than Flotilla

---
 src/app/editor/Suggestions.svelte | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/app/editor/Suggestions.svelte b/src/app/editor/Suggestions.svelte
index 25fb43344..b6ab22853 100644
--- a/src/app/editor/Suggestions.svelte
+++ b/src/app/editor/Suggestions.svelte
@@ -77,13 +77,9 @@
     {#each items as value, i (value)}
       <button
         class="white-space-nowrap flex w-full min-w-0 cursor-pointer items-center overflow-x-hidden text-ellipsis px-4 py-2 text-left transition-all hover:brightness-150"
+        class:bg-tinted-100-l={index === i}
         on:mousedown|preventDefault|stopPropagation
         on:click|preventDefault|stopPropagation={() => select(value)}>
-        {#if index === i}
-          <div transition:slide|local={{axis: "x"}} class="flex items-center pr-2">
-            <i class="fa fa-alt-arrow-right" />
-          </div>
-        {/if}
         <svelte:component this={component} {value} />
       </button>
     {/each}

From f847a578c1c914f11df31e45ca59adeeacb70932 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 1 Nov 2024 16:27:24 +0100
Subject: [PATCH 04/26] no block elements in editor

---
 src/app.css                      |  16 +++-
 src/app/editor/EditBolt11.svelte |  51 ++----------
 src/app/editor/EditEvent.svelte  |  88 ++++++---------------
 src/app/editor/EditLink.svelte   | 129 +++----------------------------
 src/app/shared/NoteReply.svelte  |   3 +-
 5 files changed, 55 insertions(+), 232 deletions(-)

diff --git a/src/app.css b/src/app.css
index 1b0221bfd..4fba0bb83 100644
--- a/src/app.css
+++ b/src/app.css
@@ -251,15 +251,14 @@ body,
   @apply link-content;
 }
 
-.link-content,
+.tiptap,
 [tag] {
   @apply max-w-full overflow-hidden text-ellipsis whitespace-nowrap rounded px-1 no-underline;
 }
 
-.link-content.link-content-selected {
-  /* @apply bg-primary text-primary-content; */
+.tiptap a {
+  @apply underline
 }
-
 .tiptap p.is-editor-empty:first-child::before {
   color: #adb5bd;
   content: attr(data-placeholder);
@@ -268,3 +267,12 @@ body,
   pointer-events: none;
 }
 
+.link-content,
+.tiptap [tag] {
+  @apply max-w-full overflow-hidden text-ellipsis whitespace-nowrap rounded bg-neutral-700-d px-1 text-neutral-100-d no-underline;
+}
+
+.link-content.link-content-selected {
+  @apply bg-tinted-200-l text-tinted-700-d;
+}
+
diff --git a/src/app/editor/EditBolt11.svelte b/src/app/editor/EditBolt11.svelte
index 993b0b9d7..387816c5e 100644
--- a/src/app/editor/EditBolt11.svelte
+++ b/src/app/editor/EditBolt11.svelte
@@ -1,57 +1,20 @@
 <script lang="ts">
+  import cx from "classnames"
   import type {NodeViewProps} from "@tiptap/core"
   import {NodeViewWrapper} from "svelte-tiptap"
-  import QRCode from "qrcode"
-  import {onMount} from "svelte"
-  import Input from "src/partials/Input.svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import {showInfo} from "src/partials/Toast.svelte"
   import {copyToClipboard} from "src/util/html"
+  import {showInfo} from "src/partials/Toast.svelte"
 
   export let node: NodeViewProps["node"]
   export let selected: NodeViewProps["selected"]
 
-  export let href = null
-  export let onClick = null
-  export let copyOnClick = true
-
-  let canvas, wrapper
-  let scale = 0.1
-  let height = null
-
-  const copy = () => {
-    copyToClipboard(node.attrs.lnbc)
-    showInfo("Copied to clipboard!")
-  }
-
-  onMount(() => {
-    console.log("debug bolt11", node)
-    QRCode.toCanvas(canvas, node.attrs.lnbc)
-
-    const wrapperRect = wrapper.getBoundingClientRect()
-    const canvasRect = canvas.getBoundingClientRect()
-
-    scale = wrapperRect.width / (canvasRect.width * 10)
-    height = canvasRect.width * 10 * scale
-  })
+  const copy = () => copyToClipboard(node.attrs.lnbc) && showInfo("Copied to clipboard")
 </script>
 
 <NodeViewWrapper class="inline">
-  <div class="rounded-xl border border-solid border-neutral-600 bg-neutral-800 p-2">
-    <div class="m-auto flex max-w-sm flex-col gap-2">
-      <Anchor external {href} on:click={onClick || (copyOnClick ? copy : null)}>
-        <div bind:this={wrapper} style={`height: ${height}px`}>
-          <canvas
-            class="rounded-xl"
-            bind:this={canvas}
-            style={`transform-origin: top left; transform: scale(${scale}, ${scale})`} />
-        </div>
-      </Anchor>
-      <slot name="below" {copy}>
-        <Input value={node.attrs.lnbc}>
-          <button slot="after" class="fa fa-copy" on:click={copy} />
-        </Input>
-      </slot>
-    </div>
-  </div>
+  <Anchor on:click={copy} class={cx("link-content", {"link-content-selected": selected})}>
+    <i class="fas fa-bolt inline-block translate-y-px"></i>
+    {node.attrs.lnbc.slice(0, 16)}...
+  </Anchor>
 </NodeViewWrapper>
diff --git a/src/app/editor/EditEvent.svelte b/src/app/editor/EditEvent.svelte
index 073db8f67..901ff18bd 100644
--- a/src/app/editor/EditEvent.svelte
+++ b/src/app/editor/EditEvent.svelte
@@ -1,80 +1,38 @@
 <script lang="ts">
+  import cx from "classnames"
   import type {NodeViewProps} from "@tiptap/core"
   import {NodeViewWrapper} from "svelte-tiptap"
-  import {getAddress, Address} from "@welshman/util"
-  import {deriveProfileDisplay} from "@welshman/app"
-  import Anchor from "src/partials/Anchor.svelte"
-  import Card from "src/partials/Card.svelte"
-  import Spinner from "src/partials/Spinner.svelte"
-  import PersonCircle from "src/app/shared/PersonCircle.svelte"
-  import {router} from "src/app/util/router"
-  import {isEventMuted, deriveEvent} from "src/engine"
+  import {ellipsize, nthEq} from "@welshman/lib"
+  import {type TrustedEvent, fromNostrURI, Address} from "@welshman/util"
+  import {router} from "../util"
+  import {deriveEvent} from "src/engine"
 
   export let node: NodeViewProps["node"]
   export let selected: NodeViewProps["selected"]
 
-  export let note
-  export let depth = 0
+  const displayEvent = (e: TrustedEvent) => {
+    const content = e?.tags.find(nthEq(0, "alt"))?.[1] || e?.content
 
-  let showHidden = false
-
-  $: ({id, identifier, kind, pubkey, relays = []} = node.attrs)
-  $: idOrAddress = id || new Address(kind, pubkey, identifier).toString()
-  $: quote = deriveEvent(idOrAddress, {relays, forcePlatform: false})
-
-  const openQuote = e => {
-    const noteId = id || $quote?.id
-
-    // stopPropagation wasn't working for some reason
-    if (e.detail.target.textContent === "Show") {
-      return
-    }
-
-    if (isGroup) {
-      router.at("groups").of(address, {relays}).at("notes").open()
-    } else if (noteId) {
-      router.at("notes").of(noteId, {relays}).open()
-    }
+    return content.length > 1
+      ? ellipsize(content, 30)
+      : fromNostrURI(nevent || naddr).slice(0, 16) + "..."
   }
 
-  const unmute = e => {
-    showHidden = true
-  }
+  $: ({identifier, pubkey, kind, id, relays = [], nevent, naddr} = node.attrs)
+  $: event = deriveEvent(id || new Address(kind, pubkey, identifier).toString(), relays)
 
-  $: address = $quote ? getAddress($quote) : ""
-  $: isGroup = address.match(/^(34550|35834):/)
-  $: profileDisplay = deriveProfileDisplay($quote?.pubkey)
-  $: muted = $quote && $isEventMuted($quote, true)
+  $: src = router
+    .at("notes")
+    .of(id || $event?.id, {relays})
+    .toString()
 </script>
 
 <NodeViewWrapper class="inline">
-  <div class="my-2" on:click|stopPropagation>
-    <Card interactive stopPropagation class="my-2" on:click={openQuote}>
-      {#if muted && !showHidden}
-        <p class="mb-1 py-24 text-center text-neutral-600">
-          You have hidden this note.
-          <Anchor underline stopPropagation on:click={unmute}>Show</Anchor>
-        </p>
-      {:else if $quote}
-        {#if !isGroup}
-          <div class="mb-4 flex items-center gap-4">
-            <PersonCircle class="h-6 w-6" pubkey={$quote.pubkey} />
-            <Anchor
-              modal
-              stopPropagation
-              type="unstyled"
-              class="flex items-center gap-2"
-              href={router.at("people").of($quote.pubkey).toString()}>
-              <h2 class="text-lg">{$profileDisplay}</h2>
-            </Anchor>
-          </div>
-        {/if}
-        <slot name="note-content" quote={$quote} {depth} />
-      {:else}
-        <div class="px-20">
-          <Spinner />
-        </div>
-      {/if}
-    </Card>
-  </div>
+  <a
+    target="_blank"
+    rel="noopener noreferrer"
+    href={src}
+    class={cx("link-content", {"link-content-selected": selected})}>
+    {displayEvent($event)}
+  </a>
 </NodeViewWrapper>
diff --git a/src/app/editor/EditLink.svelte b/src/app/editor/EditLink.svelte
index 60c97aa96..5e8bd90c1 100644
--- a/src/app/editor/EditLink.svelte
+++ b/src/app/editor/EditLink.svelte
@@ -1,127 +1,20 @@
 <script lang="ts">
+  import cx from "classnames"
   import type {NodeViewProps} from "@tiptap/core"
   import {NodeViewWrapper} from "svelte-tiptap"
-  import {last, postJson} from "@welshman/lib"
-  import Anchor from "src/partials/Anchor.svelte"
-  import Audio from "src/partials/Audio.svelte"
-  import Spinner from "src/partials/Spinner.svelte"
-  import {dufflepud, imgproxy} from "src/engine"
-  import {ellipsize} from "hurdak"
+  import {displayUrl} from "@welshman/lib"
 
   export let node: NodeViewProps["node"]
   export let selected: NodeViewProps["selected"]
-
-  $: url = node.attrs.url
-
-  const loadPreview = async () => {
-    const json = await postJson(dufflepud("link/preview"), {url})
-
-    if (!json?.title && !json?.image) {
-      throw new Error("Failed to load link preview")
-    }
-
-    return json
-  }
-
-  function getYouTubeId(url) {
-    const regExp = /^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/
-    const match = url.match(regExp)
-    return match && match[2].length === 11 ? match[2] : null
-  }
-
-  function getTwitterId(url) {
-    const regExp = /^.*(twitter.com|x.com)\/\w+\/status\/(\d+)/
-    const match = url.match(regExp)
-    return match ? match[2] : null
-  }
 </script>
 
-<NodeViewWrapper class="block">
-  {#if url.match(/\.(wav|mp3|m3u8)$/)}
-    {#await import("src/util/audio")}
-      <span />
-    {:then { AudioController }}
-      <Audio controller={new AudioController(url)} />
-    {/await}
-  {:else}
-    <Anchor
-      external
-      type="unstyled"
-      href={url}
-      class="relative flex w-full flex-grow flex-col overflow-hidden rounded-xl">
-      {#if url.match(/open.spotify.com/)}
-        {@const id = last(url.split("?")[0].match(/[a-z]+\/[0-9A-z]+$/))}
-        {@const src = `https://open.spotify.com/embed/${id}`}
-        <iframe
-          {src}
-          allowfullscreen
-          style="border-radius:12px"
-          width="100%"
-          height="352"
-          frameBorder="0"
-          allow="autoplay; clipboard-write; encrypted-media; fullscreen; picture-in-picture"
-          loading="lazy" />
-      {:else if url.match(/tidal.com/)}
-        {@const {pathname} = new URL(url)}
-        {@const id = last(pathname.split("/"))}
-        {@const name = pathname.includes("album") ? "albums" : "tracks"}
-        {@const src = `https://embed.tidal.com/${name}/${id}`}
-        <iframe
-          {src}
-          allowfullscreen
-          style="border-radius:12px"
-          width="100%"
-          height="100%"
-          scrolling="no"
-          frameBorder="0"
-          allow="encrypted-media"
-          sandbox="allow-same-origin allow-scripts allow-forms allow-popups"
-          title="TIDAL Embed Player"
-          loading="lazy" />
-      {:else if url.match(/youtube.com|youtu.be/)}
-        {@const videoId = getYouTubeId(url)}
-        <iframe
-          src={`https://www.youtube.com/embed/${videoId}`}
-          frameBorder="0"
-          allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-          allowFullScreen
-          title="YouTube video player"
-          class="max-h-96 object-contain object-center"
-          loading="lazy">
-        </iframe>
-      {:else if url.match(/x.com|twitter.com/)}
-        {@const tweetId = getTwitterId(url)}
-        {@const twt = window.twttr.widgets.load()}
-        {#if tweetId}
-          <blockquote class="twitter-tweet" data-dnt="true">
-            <a href={`https://twitter.com/x/status/${tweetId}`}></a>
-          </blockquote>
-        {:else}
-          <p>Invalid Twitter URL</p>
-        {/if}
-      {:else}
-        {#await loadPreview()}
-          <Spinner />
-        {:then { title, description, image }}
-          {#if image}
-            <img
-              alt="Link preview"
-              src={imgproxy(image)}
-              class="max-h-96 object-contain object-center" />
-          {/if}
-          <div class="h-px bg-neutral-600" />
-          {#if title}
-            <div class="flex flex-col bg-white px-4 py-2 text-black">
-              <strong class="overflow-hidden text-ellipsis whitespace-nowrap">{title}</strong>
-              <small>{ellipsize(description, 140)}</small>
-            </div>
-          {/if}
-        {:catch}
-          <p class="mb-1 p-12 text-center text-neutral-600">
-            Unable to load a preview for {url}
-          </p>
-        {/await}
-      {/if}
-    </Anchor>
-  {/if}
+<NodeViewWrapper class="inline-block">
+  <a
+    target="_blank"
+    rel="noopener noreferrer"
+    href={node.attrs.url}
+    class={cx("link-content", {"link-content-selected": selected})}>
+    <i class="fas fa-link inline-block"></i>
+    {displayUrl(node.attrs.url)}
+  </a>
 </NodeViewWrapper>
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index a04fd5c6b..a10985fc1 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -129,7 +129,8 @@
     const options = getEditorOptions({
       submit: send,
       element: editorElement,
-      submitOnEnter: true,
+      submitOnEnter: false,
+      submitOnModEnter: true,
       autofocus: true,
       content: draft || "",
     })

From 550602f8e2f3fa3ef545a860d5627a308fee4d75 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 1 Nov 2024 16:35:37 +0100
Subject: [PATCH 05/26] theme fix

---
 src/app/editor/Suggestions.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/editor/Suggestions.svelte b/src/app/editor/Suggestions.svelte
index b6ab22853..4836f3669 100644
--- a/src/app/editor/Suggestions.svelte
+++ b/src/app/editor/Suggestions.svelte
@@ -77,7 +77,9 @@
     {#each items as value, i (value)}
       <button
         class="white-space-nowrap flex w-full min-w-0 cursor-pointer items-center overflow-x-hidden text-ellipsis px-4 py-2 text-left transition-all hover:brightness-150"
-        class:bg-tinted-100-l={index === i}
+        class:brightness-150={index === i}
+        class:dark:bg-neutral-700-d={index === i}
+        class:bg-neutral-400-d={index === i}
         on:mousedown|preventDefault|stopPropagation
         on:click|preventDefault|stopPropagation={() => select(value)}>
         <svelte:component this={component} {value} />

From 75c0b8dd6e72c5e965100c20de9fae51a632a5f6 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 1 Nov 2024 16:37:51 +0100
Subject: [PATCH 06/26] remove unused catch block

---
 src/app/editor/FileUpload.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/app/editor/FileUpload.ts b/src/app/editor/FileUpload.ts
index bb944c3a9..8bc3cf803 100644
--- a/src/app/editor/FileUpload.ts
+++ b/src/app/editor/FileUpload.ts
@@ -262,9 +262,6 @@ class Uploader {
       this.editor.storage.fileUpload.loading.set(true)
       await Promise.all(tasks)
       this.options.onComplete(this.editor)
-    } catch (error) {
-      console.error(error)
-      this.editor.storage.fileUpload.loading.set(false)
     } finally {
       this.editor.storage.fileUpload.loading.set(false)
     }

From 526c02f83eb3d026e2206a8b47b7b5bde492c353 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Mon, 4 Nov 2024 17:01:16 +0100
Subject: [PATCH 07/26] use editor for onboarding

---
 src/app/views/OnboardingNote.svelte | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/views/OnboardingNote.svelte b/src/app/views/OnboardingNote.svelte
index 51e2bd3d4..0eb15e93f 100644
--- a/src/app/views/OnboardingNote.svelte
+++ b/src/app/views/OnboardingNote.svelte
@@ -1,16 +1,19 @@
 <script lang="ts">
-  import {onMount} from "svelte"
   import {ctx} from "@welshman/lib"
   import {NOTE} from "@welshman/util"
+  import {getEditorOptions} from "src/app/editor"
   import Compose from "src/app/shared/Compose.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
   import {createAndPublish, tagsFromContent} from "src/engine"
+  import Anchor from "src/partials/Anchor.svelte"
+  import {onMount} from "svelte"
+  import {Editor} from "svelte-tiptap"
 
   export let signup
   export let setStage
 
   let loading = false
-  let compose = null
+  let element: HTMLElement
+  let editor: Editor
 
   const prev = () => setStage("follows")
 
@@ -20,7 +23,7 @@
     loading = true
 
     try {
-      const content = compose.parse()
+      const content = editor.getText().trim()
 
       // Publish our welcome note
       if (content) {
@@ -43,7 +46,6 @@
       getEditorOptions({
         submit: next,
         element,
-        submitOnEnter: false,
         autofocus: true,
         content: "Hello world! #introductions",
       }),

From f158462ca8f2a8b37a19c5e9c5e6ec718956a0e2 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 12:49:53 +0100
Subject: [PATCH 08/26] blossom support

---
 src/app/editor/FileUpload.ts      |  6 +++---
 src/app/editor/index.ts           |  2 +-
 src/app/views/UserSettings.svelte | 13 +++++++++++++
 src/engine/state.ts               |  3 ++-
 src/partials/Select.svelte        |  4 ++--
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/app/editor/FileUpload.ts b/src/app/editor/FileUpload.ts
index 8bc3cf803..11537c4c4 100644
--- a/src/app/editor/FileUpload.ts
+++ b/src/app/editor/FileUpload.ts
@@ -240,7 +240,7 @@ class Uploader {
         const res = await uploadBlossom({file, serverUrl, hash, sign, expiration})
         this.editor.storage.fileUpload.tags.push([
           "imeta",
-          `url ${res.size}`,
+          `url ${res.url}`,
           `size ${res.size}`,
           `m ${res.type}`,
           `x ${res.sha256}`,
@@ -362,7 +362,7 @@ export async function uploadBlossom(options: BlossomOptions) {
   if (!options.sign) {
     throw new Error("No signer provided")
   }
-  const now = Date.now() / 1000
+  const now = Math.ceil(Date.now() / 1000)
   const hash = await options.hash(options.file)
   const event = await options.sign({
     kind: 24242,
@@ -371,10 +371,10 @@ export async function uploadBlossom(options: BlossomOptions) {
     tags: [
       ["t", "upload"],
       ["x", hash],
+      ["size", options.file.size.toString()],
       ["expiration", (now + (options.expiration || 60000)).toString()],
     ],
   })
-  await new Promise<void>(r => setTimeout(() => r(), 1000))
   const data = JSON.stringify(event)
   const base64 = btoa(data)
   const authorization = `Nostr ${base64}`
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
index 3cca2ac15..ccb66ce75 100644
--- a/src/app/editor/index.ts
+++ b/src/app/editor/index.ts
@@ -73,7 +73,7 @@ export const getEditorOptions = ({
   submitOnModEnter = false,
   element,
   defaultUploadUrl = getSetting("nip96_urls").slice(0, 1)[0] || "https://nostr.build",
-  uploadType = "nip96",
+  uploadType = getSetting("upload_type"),
   autofocus = false,
   content = "",
   placeholder,
diff --git a/src/app/views/UserSettings.svelte b/src/app/views/UserSettings.svelte
index 9eed1e06f..9d3abcbc8 100644
--- a/src/app/views/UserSettings.svelte
+++ b/src/app/views/UserSettings.svelte
@@ -12,6 +12,7 @@
   import {env, userSettings, publishSettings} from "src/engine"
   import SearchSelect from "src/partials/SearchSelect.svelte"
   import {fuzzy} from "src/util/misc"
+  import Select from "src/partials/Select.svelte"
 
   const values = {...$userSettings}
 
@@ -89,6 +90,18 @@
         </div>
       </SearchSelect>
     </Field>
+    <Field label="Upload Type">
+      <p slot="info">
+        Choose an upload type for your files, default is nip-96 but blossom is also supported.
+      </p>
+      <div class="flex items-center bg-neutral-900 px-2">
+        <i class="fa-solid fa-cloud-upload-alt" />
+        <Select class="w-full" bind:value={$userSettings.upload_type} dark={false}>
+          <option value="nip96">NIP-96</option>
+          <option value="blossom">Blossom</option>
+        </Select>
+      </div>
+    </Field>
     <Field label="Dufflepud URL">
       <Input bind:value={values.dufflepud_url}>
         <i slot="before" class="fa-solid fa-server" />
diff --git a/src/engine/state.ts b/src/engine/state.ts
index 396de8f2e..6fc939ff4 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -226,6 +226,7 @@ export const defaultSettings = {
   auto_authenticate: false,
   note_actions: ["zaps", "replies", "reactions", "recommended_apps"],
   nip96_urls: env.NIP96_URLS.slice(0, 1),
+  upload_type: "nip96",
   imgproxy_url: env.IMGPROXY_URL,
   dufflepud_url: env.DUFFLEPUD_URL,
   platform_zap_split: env.PLATFORM_ZAP_SPLIT,
@@ -242,7 +243,7 @@ export const userSettingsPlaintext = derived(
   ([$plaintext, $userSettingsEvent]) => $plaintext[$userSettingsEvent?.id],
 )
 
-export const userSettings = withGetter(
+export const userSettings = withGetter<typeof defaultSettings>(
   derived(userSettingsPlaintext, $userSettingsPlaintext => {
     const overrides = parseJson($userSettingsPlaintext) || {}
 
diff --git a/src/partials/Select.svelte b/src/partials/Select.svelte
index 375bc742f..b2cbf6c57 100644
--- a/src/partials/Select.svelte
+++ b/src/partials/Select.svelte
@@ -8,8 +8,8 @@
 
 <div
   class={cx($$props.class, "shadow-inset relative h-7 cursor-pointer rounded", {
-    "bg-neutral-900 text-neutral-100": dark,
-    "bg-neutral-100 text-neutral-900": !dark,
+    "bg-neutral-900 text-neutral-100": !dark,
+    "bg-neutral-100 text-neutral-900": dark,
   })}>
   <select
     {...$$props}

From 7a751c82a45036d0d9eef392d204427d65f46ba4 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 12:58:27 +0100
Subject: [PATCH 09/26] only show suggestions once a term is set

---
 src/app/editor/Suggestions.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/app/editor/Suggestions.ts b/src/app/editor/Suggestions.ts
index 603e57442..22dab52c5 100644
--- a/src/app/editor/Suggestions.ts
+++ b/src/app/editor/Suggestions.ts
@@ -74,10 +74,15 @@ export const createSuggestions = (options: SuggestionsOptions) =>
             trigger: "manual",
             placement: "bottom-start",
           })
-
+          if (!props.query) popover[0].hide()
           suggestions = new options.suggestionsComponent({target, props: mapProps(props)})
         },
         onUpdate: props => {
+          if (props.query) {
+            popover[0].show()
+          } else {
+            popover[0].hide()
+          }
           suggestions.$set(mapProps(props))
 
           if (props.clientRect) {

From 8382dc0cdd72c2f104950b9ccc190c6541b2a112 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 13:07:00 +0100
Subject: [PATCH 10/26] main note send on mod+enter

---
 src/app/views/NoteCreate.svelte | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index 7fe9fa0cd..3a697829f 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -166,6 +166,8 @@
     const options = getEditorOptions({
       submit: onSubmit,
       element,
+      submitOnEnter: false,
+      submitOnModEnter: true,
       autofocus: true,
     })
 

From 4241fa1a80f066147982cd6241f2ff164dd37e20 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 6 Nov 2024 16:34:18 +0100
Subject: [PATCH 11/26] link content css

---
 src/app.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app.css b/src/app.css
index 4fba0bb83..3868ae966 100644
--- a/src/app.css
+++ b/src/app.css
@@ -269,10 +269,10 @@ body,
 
 .link-content,
 .tiptap [tag] {
-  @apply max-w-full overflow-hidden text-ellipsis whitespace-nowrap rounded bg-neutral-700-d px-1 text-neutral-100-d no-underline;
+  @apply max-w-full overflow-hidden text-ellipsis whitespace-nowrap rounded bg-neutral-200 px-1 no-underline;
 }
 
 .link-content.link-content-selected {
-  @apply bg-tinted-200-l text-tinted-700-d;
+  @apply bg-neutral-300;
 }
 

From 760754fdc6bc164fbf047ae23e0caa7a3465700c Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 6 Nov 2024 16:34:26 +0100
Subject: [PATCH 12/26] fresh install

---
 package-lock.json | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index b89d2dca6..062862d7e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15351,6 +15351,46 @@
         "@popperjs/core": "^2.9.0"
       }
     },
+    "node_modules/tiptap-markdown": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/tiptap-markdown/-/tiptap-markdown-0.8.10.tgz",
+      "integrity": "sha512-iDVkR2BjAqkTDtFX0h94yVvE2AihCXlF0Q7RIXSJPRSR5I0PA1TMuAg6FHFpmqTn4tPxJ0by0CK7PUMlnFLGEQ==",
+      "peer": true,
+      "workspaces": [
+        "example"
+      ],
+      "dependencies": {
+        "@types/markdown-it": "^13.0.7",
+        "markdown-it": "^14.1.0",
+        "markdown-it-task-lists": "^2.1.1",
+        "prosemirror-markdown": "^1.11.1"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "^2.0.3"
+      }
+    },
+    "node_modules/tiptap-markdown/node_modules/@types/linkify-it": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz",
+      "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==",
+      "peer": true
+    },
+    "node_modules/tiptap-markdown/node_modules/@types/markdown-it": {
+      "version": "13.0.9",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-13.0.9.tgz",
+      "integrity": "sha512-1XPwR0+MgXLWfTn9gCsZ55AHOKW1WN+P9vr0PaQh5aerR9LLQXUbjfEAFhjmEmyoYFWAyuN2Mqkn40MZ4ukjBw==",
+      "peer": true,
+      "dependencies": {
+        "@types/linkify-it": "^3",
+        "@types/mdurl": "^1"
+      }
+    },
+    "node_modules/tiptap-markdown/node_modules/@types/mdurl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz",
+      "integrity": "sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==",
+      "peer": true
+    },
     "node_modules/tldts": {
       "version": "6.1.57",
       "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.57.tgz",
@@ -17489,4 +17529,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

From dce6a01a088f0614346de543eff3d3b78f65016f Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 6 Nov 2024 16:37:59 +0100
Subject: [PATCH 13/26] align paperclip with cog and alt buttons

---
 src/app/shared/NoteReply.svelte | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index a10985fc1..2a8b9770d 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -178,11 +178,7 @@
         <div class="flex gap-2 rounded-b p-2 text-sm text-neutral-100">
           <div class="inline-block border-r border-solid border-neutral-600 py-2 pl-1 pr-3">
             <div class="flex cursor-pointer items-center gap-3">
-              <button
-                class="hover:bg-white-l staatliches flex h-7 w-7 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded bg-white px-6 text-xl text-black transition-all"
-                on:click|preventDefault={editor.commands.selectFiles}>
-                <i class="fa fa-paperclip" />
-              </button>
+              <i class="fa fa-paperclip" on:click|preventDefault={editor.commands.selectFiles} />
               <i class="fa fa-at" />
             </div>
           </div>

From 2d34ab0bdb322eec63da498176b1215176e95a2c Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 6 Nov 2024 17:37:54 +0100
Subject: [PATCH 14/26] ts-check

---
 src/app/MenuDesktop.svelte      |  2 +-
 src/app/editor/FileUpload.ts    | 37 +++++++++++++++++----------------
 src/app/editor/index.ts         |  4 ++--
 src/app/editor/util.ts          |  6 +++---
 src/app/shared/NoteReply.svelte |  3 ++-
 src/app/views/EventEdit.svelte  |  2 +-
 src/app/views/NoteCreate.svelte |  9 ++++++--
 7 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/app/MenuDesktop.svelte b/src/app/MenuDesktop.svelte
index c2d1503ae..3c7b9459c 100644
--- a/src/app/MenuDesktop.svelte
+++ b/src/app/MenuDesktop.svelte
@@ -114,7 +114,7 @@
     <Anchor
       class="staatliches px-8 text-tinted-400 hover:text-tinted-100"
       on:click={() => setSubMenu("settings")}>Settings</Anchor>
-    <div class="staatliches block flex h-8 gap-2 px-8 text-tinted-500">
+    <div class="staatliches flex h-8 gap-2 px-8 text-tinted-500">
       <Anchor class="hover:text-tinted-100" href="/about">About</Anchor> /
       <Anchor external class="hover:text-tinted-100" href="/terms.html">Terms</Anchor> /
       <Anchor external class="hover:text-tinted-100" href="/privacy.html">Privacy</Anchor>
diff --git a/src/app/editor/FileUpload.ts b/src/app/editor/FileUpload.ts
index 11537c4c4..114f913d4 100644
--- a/src/app/editor/FileUpload.ts
+++ b/src/app/editor/FileUpload.ts
@@ -10,7 +10,7 @@ import {writable} from "svelte/store"
 
 declare module "@tiptap/core" {
   interface Commands<ReturnType> {
-    fileUpload: {
+    uploadFile: {
       selectFiles: () => ReturnType
       uploadFiles: () => ReturnType
       getMetaTags: () => string[][]
@@ -41,7 +41,7 @@ function bufferToHex(buffer: ArrayBuffer) {
 }
 
 export const FileUploadExtension = Extension.create<FileUploadOptions>({
-  name: "fileUpload",
+  name: "uploadFile",
 
   addStorage() {
     return {
@@ -80,22 +80,23 @@ export const FileUploadExtension = Extension.create<FileUploadOptions>({
         props.tr.setMeta("uploadFiles", true)
         return true
       },
-      getMetaTags: () => (props: CommandProps) => {
-        const tags: string[][] = []
-        // make sure the file uploaded is still in the editor content
-        props.editor.state.doc.descendants(node => {
-          if (!(node.type.name === "image" || node.type.name === "video")) {
-            return
-          }
-          const tag: string[] = props.editor.storage.fileUpload.tags.find(t =>
-            t[1].includes(node.attrs.src),
-          )
-          if (tag) {
-            tags.push(tag)
-          }
-        })
-        return tags
-      },
+      getMetaTags: () =>
+        ((props: CommandProps) => {
+          const tags: string[][] = []
+          // make sure the file uploaded is still in the editor content
+          props.editor.state.doc.descendants(node => {
+            if (!(node.type.name === "image" || node.type.name === "video")) {
+              return
+            }
+            const tag: string[] = props.editor.storage.fileUpload.tags.find(t =>
+              t[1].includes(node.attrs.src),
+            )
+            if (tag) {
+              tags.push(tag)
+            }
+          })
+          return tags
+        }) as any,
     }
   },
 
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
index ccb66ce75..52fde3460 100644
--- a/src/app/editor/index.ts
+++ b/src/app/editor/index.ts
@@ -21,7 +21,7 @@ import {
 } from "nostr-editor"
 import {ctx} from "@welshman/lib"
 import type {StampedEvent} from "@welshman/util"
-import {signer, profileSearch} from "@welshman/app"
+import {signer, profileSearch, RelayMode} from "@welshman/app"
 import {createSuggestions} from "./Suggestions"
 import {LinkExtension} from "./LinkExtension"
 import EditMention from "./EditMention.svelte"
@@ -68,7 +68,7 @@ export type EditorImage = {
 
 export const getEditorOptions = ({
   submit,
-  getPubkeyHints = () => ctx.app.router.WriteRelays().getUrls(),
+  getPubkeyHints = (pubkey: string) => ctx.app.router.getRelaysForPubkey(pubkey, RelayMode.Write),
   submitOnEnter = true,
   submitOnModEnter = false,
   element,
diff --git a/src/app/editor/util.ts b/src/app/editor/util.ts
index 207fd72bd..815e533ae 100644
--- a/src/app/editor/util.ts
+++ b/src/app/editor/util.ts
@@ -65,21 +65,21 @@ export const getEditorTags = (editor: Editor) => {
     ({attrs: {kind, pubkey, identifier, relays = []}}: any) => {
       const address = new Address(kind, pubkey, identifier).toString()
 
-      return ["q", address, ctx.app.router.fromRelays(relays).getUrl(), pubkey]
+      return ["q", address, ctx.app.router.FromRelays(relays).getUrl(), pubkey]
     },
   )
 
   const neventTags = findNodes("nevent", json).map(({attrs: {id, author, relays = []}}: any) => [
     "q",
     id,
-    ctx.app.router.fromRelays(relays).getUrl(),
+    ctx.app.router.FromRelays(relays).getUrl(),
     author || "",
   ])
 
   const mentionTags = findNodes("nprofile", json).map(({attrs: {pubkey, relays = []}}: any) => [
     "p",
     pubkey,
-    ctx.app.router.fromRelays(relays).getUrl(),
+    ctx.app.router.FromRelays(relays).getUrl(),
     "",
   ])
 
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index 2a8b9770d..eda6c2b16 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -139,6 +139,7 @@
     editorLoading = editor.storage.fileUpload.loading
   }
 
+  // eslint-disable-next-line
   $: editorElement && createEditor()
 </script>
 
@@ -162,7 +163,7 @@
           <Compose bind:element={editorElement} {editor}>
             <div class="flex flex-col justify-start" slot="addon">
               <button
-                on:click={send}
+                on:click={() => send()}
                 disabled={$editorLoading}
                 class="flex h-12 w-12 cursor-pointer items-center justify-center rounded-full transition-all hover:bg-accent">
                 {#if loading || $editorLoading}
diff --git a/src/app/views/EventEdit.svelte b/src/app/views/EventEdit.svelte
index 6f22eda3a..8fc74b984 100644
--- a/src/app/views/EventEdit.svelte
+++ b/src/app/views/EventEdit.svelte
@@ -49,7 +49,6 @@
     const tags = Tags.fromEvent($event)
 
     values = {
-      groups: tags.context().values().valueOf(),
       title: tags.get("name")?.value() || tags.get("title")?.value() || "",
       location: tags.get("location")?.value() || "",
       start: secondsToDate(tags.get("start")?.value() || now()),
@@ -69,6 +68,7 @@
 
   $: loading = !$event
 
+  // eslint-disable-next-line
   $: editorElement && edit()
 </script>
 
diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index 3a697829f..ac49abdb9 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -5,7 +5,10 @@
   import {writable, type Writable} from "svelte/store"
   import {ctx, last, now} from "@welshman/lib"
   import {createEvent} from "@welshman/util"
+  import {session, tagPubkey} from "@welshman/app"
   import Anchor from "src/partials/Anchor.svelte"
+  import Content from "src/partials/Content.svelte"
+  import Chip from "src/partials/Chip.svelte"
   import CurrencyInput from "src/partials/CurrencyInput.svelte"
   import CurrencySymbol from "src/partials/CurrencySymbol.svelte"
   import DateTimeInput from "src/partials/DateTimeInput.svelte"
@@ -14,7 +17,8 @@
   import Input from "src/partials/Input.svelte"
   import Menu from "src/partials/Menu.svelte"
   import MenuItem from "src/partials/MenuItem.svelte"
-  import Chip from "src/partials/Chip.svelte"
+  import Popover from "src/partials/Popover.svelte"
+  import {showPublishInfo, showWarning} from "src/partials/Toast.svelte"
   import Compose from "src/app/shared/Compose.svelte"
   import NsecWarning from "src/app/shared/NsecWarning.svelte"
   import NoteContent from "src/app/shared/NoteContent.svelte"
@@ -22,6 +26,8 @@
   import {getEditorOptions} from "src/app/editor"
   import {router} from "src/app/util/router"
   import {getClientTags, signAndPublish, tagsFromContent} from "src/engine"
+  import {dateToSeconds} from "src/util/misc"
+  import {currencyOptions} from "src/util/i18n"
   import {Editor} from "svelte-tiptap"
   import {nip19} from "nostr-tools"
   import {v4 as uuid} from "uuid"
@@ -34,7 +40,6 @@
   let charCount: Writable<number>
   let wordCount: Writable<number>
   let showPreview = false
-  let options
 
   let editor: Editor
   let element: HTMLElement

From 6a19a39014b53dbda3c514462561641e883d8224 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 6 Nov 2024 17:58:48 +0100
Subject: [PATCH 15/26] select fix

---
 src/app/views/UserSettings.svelte | 7 +++++--
 src/partials/Select.svelte        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/views/UserSettings.svelte b/src/app/views/UserSettings.svelte
index 9d3abcbc8..65e8b210a 100644
--- a/src/app/views/UserSettings.svelte
+++ b/src/app/views/UserSettings.svelte
@@ -94,9 +94,12 @@
       <p slot="info">
         Choose an upload type for your files, default is nip-96 but blossom is also supported.
       </p>
-      <div class="flex items-center bg-neutral-900 px-2">
+      <div class="flex items-center rounded-md px-2 text-neutral-600 dark:bg-neutral-100">
         <i class="fa-solid fa-cloud-upload-alt" />
-        <Select class="w-full" bind:value={$userSettings.upload_type} dark={false}>
+        <Select
+          class="w-full dark:!bg-neutral-100 dark:!text-neutral-900"
+          bind:value={values.upload_type}
+          dark={false}>
           <option value="nip96">NIP-96</option>
           <option value="blossom">Blossom</option>
         </Select>
diff --git a/src/partials/Select.svelte b/src/partials/Select.svelte
index b2cbf6c57..5570725eb 100644
--- a/src/partials/Select.svelte
+++ b/src/partials/Select.svelte
@@ -18,7 +18,7 @@
       "pr-10": $$slots.after,
     })}
     bind:value
-    on:change={() => onChange(value)}>
+    on:change={() => onChange && onChange(value)}>
     <slot />
   </select>
   <div class="absolute left-0 top-0 flex gap-2 px-3 pt-3 text-tinted-700">

From 18e30e37ab95116eb9a32648fdb652793435854e Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Wed, 6 Nov 2024 17:59:13 +0100
Subject: [PATCH 16/26] rename fileUpload extension

---
 src/app/editor/FileUpload.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/editor/FileUpload.ts b/src/app/editor/FileUpload.ts
index 114f913d4..78bc751cf 100644
--- a/src/app/editor/FileUpload.ts
+++ b/src/app/editor/FileUpload.ts
@@ -41,7 +41,7 @@ function bufferToHex(buffer: ArrayBuffer) {
 }
 
 export const FileUploadExtension = Extension.create<FileUploadOptions>({
-  name: "uploadFile",
+  name: "fileUpload",
 
   addStorage() {
     return {

From 14964df2e911fbbfe40f084084f413ede7ce6b17 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 8 Nov 2024 13:26:56 +0100
Subject: [PATCH 17/26] parse editor content using \n

---
 src/app/shared/NoteCreateInline.svelte | 2 +-
 src/app/shared/NoteReply.svelte        | 2 +-
 src/app/views/EventEdit.svelte         | 2 +-
 src/app/views/NoteCreate.svelte        | 5 +++--
 src/app/views/OnboardingNote.svelte    | 2 +-
 src/app/views/RelayReview.svelte       | 2 +-
 src/partials/Channel.svelte            | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/app/shared/NoteCreateInline.svelte b/src/app/shared/NoteCreateInline.svelte
index 48df12994..b22a9dba0 100644
--- a/src/app/shared/NoteCreateInline.svelte
+++ b/src/app/shared/NoteCreateInline.svelte
@@ -44,7 +44,7 @@
 
     saving = true
 
-    const content = editor.getText().trim()
+    const content = editor.getText({blockSeparator: "\n"}).trim()
 
     if (!content) return showWarning("Please provide a description.")
 
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index eda6c2b16..732829a8c 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -77,7 +77,7 @@
   const send = async ({skipNsecWarning = false} = {}) => {
     if ($editorLoading) return
 
-    const content = editor.getText().trim()
+    const content = editor.getText({blockSeparator: "\n"}).trim()
 
     if (!content) return
 
diff --git a/src/app/views/EventEdit.svelte b/src/app/views/EventEdit.svelte
index 8fc74b984..20a3eeedd 100644
--- a/src/app/views/EventEdit.svelte
+++ b/src/app/views/EventEdit.svelte
@@ -34,7 +34,7 @@
     const template = asStampedEvent({
       ...$event,
       tags: [...tags.unwrap(), ...editor.commands.getMetaTags()],
-      content: editor.getText(),
+      content: editor.getText({blockSeparator: "\n"}).trim(),
       created_at: inc($event.created_at),
     })
 
diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index ac49abdb9..d0834a649 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -72,7 +72,7 @@
     // prevent sending before media are uploaded and tags are correctly set
     if ($loading) return
 
-    const content = editor.getText().trim()
+    const content = editor.getText({blockSeparator: "\n"}).trim()
 
     if (!content) return showWarning("Please provide a description.")
 
@@ -269,7 +269,8 @@
           class:text-black={!showPreview}
           class:bg-tinted-700={showPreview}>
           {#if showPreview}
-            <NoteContent note={{content: editor.getText(), tags: []}} />
+            <NoteContent
+              note={{content: editor.getText({blockSeparator: "\n"}).trim(), tags: []}} />
           {/if}
           <div class:hidden={showPreview}>
             <Compose bind:element {editor} class="min-h-24" />
diff --git a/src/app/views/OnboardingNote.svelte b/src/app/views/OnboardingNote.svelte
index 0eb15e93f..8f5622bb8 100644
--- a/src/app/views/OnboardingNote.svelte
+++ b/src/app/views/OnboardingNote.svelte
@@ -23,7 +23,7 @@
     loading = true
 
     try {
-      const content = editor.getText().trim()
+      const content = editor.getText({blockSeparator: "\n"}).trim()
 
       // Publish our welcome note
       if (content) {
diff --git a/src/app/views/RelayReview.svelte b/src/app/views/RelayReview.svelte
index 1aa72190a..be8435ddf 100644
--- a/src/app/views/RelayReview.svelte
+++ b/src/app/views/RelayReview.svelte
@@ -18,7 +18,7 @@
   let rating
 
   const onSubmit = () => {
-    const content = editor.getText()
+    const content = editor.getText({blockSeparator: "\n"}).trim()
 
     createAndPublish({
       relays: ctx.app.router.FromUser().getUrls(),
diff --git a/src/partials/Channel.svelte b/src/partials/Channel.svelte
index 55a865db8..59ebe2038 100644
--- a/src/partials/Channel.svelte
+++ b/src/partials/Channel.svelte
@@ -127,7 +127,7 @@
   }
 
   const send = async () => {
-    const content = editor.getText().trim()
+    const content = editor.getText({blockSeparator: "\n"}).trim()
 
     if (content) {
       sending = true

From bac5a594104aa08bf9892ea3573d61fa38516aff Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 8 Nov 2024 15:31:31 +0100
Subject: [PATCH 18/26] fix TagExtension

---
 src/app/editor/TagExtension.ts | 81 ++++++++++++++++++++++++++++++++++
 src/app/editor/index.ts        |  2 +-
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 src/app/editor/TagExtension.ts

diff --git a/src/app/editor/TagExtension.ts b/src/app/editor/TagExtension.ts
new file mode 100644
index 000000000..7f3d9b86c
--- /dev/null
+++ b/src/app/editor/TagExtension.ts
@@ -0,0 +1,81 @@
+import type {InputRuleMatch} from "@tiptap/core"
+import {Mark, markPasteRule, mergeAttributes} from "@tiptap/core"
+
+export interface TagAttributes {
+  tag: string
+}
+
+const REGEX_TAG_PASTE = /(#[^\W]+)(?=\s) /g
+const REGEX_TAG_INPUT = /(#[^\W]+)(?=\s) /g
+
+export const TagExtension = Mark.create({
+  atom: true,
+  name: "tag",
+  group: "inline",
+  inline: true,
+  selectable: true,
+  inclusive: false,
+  priority: 1000,
+
+  addStorage() {
+    return {
+      markdown: {
+        serialize: {
+          open: "",
+          close: "",
+          mixable: false,
+          expelEnclosingWhitespace: true,
+        },
+        parse: {},
+      },
+    }
+  },
+
+  renderHTML(p) {
+    return ["a", mergeAttributes(p.HTMLAttributes, {"data-type": this.name})]
+  },
+
+  parseHTML() {
+    return [{tag: `a[data-type="${this.name}"]`}]
+  },
+
+  addAttributes() {
+    return {
+      tag: {default: null},
+    }
+  },
+
+  addPasteRules() {
+    return [
+      markPasteRule({
+        find: REGEX_TAG_PASTE,
+        getAttributes: match => ({tag: match[0]}),
+        type: this.type,
+      }),
+    ]
+  },
+
+  addInputRules() {
+    return [
+      {
+        find: text => {
+          const match = text.match(REGEX_TAG_INPUT)
+          if (match && match[0] == text) {
+            return {
+              index: match.index,
+              text: match[0],
+              data: {tag: text.trim()},
+              match,
+            } as InputRuleMatch
+          }
+          return null
+        },
+        handler: ({state, range, match}) => {
+          if (match) {
+            state.tr.addMark(range.from - 1, range.to, this.type.create(match.data)).insertText(" ")
+          }
+        },
+      },
+    ]
+  },
+})
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
index 52fde3460..5f4ee779c 100644
--- a/src/app/editor/index.ts
+++ b/src/app/editor/index.ts
@@ -17,7 +17,6 @@ import {
   NAddrExtension,
   ImageExtension,
   VideoExtension,
-  TagExtension,
 } from "nostr-editor"
 import {ctx} from "@welshman/lib"
 import type {StampedEvent} from "@welshman/util"
@@ -35,6 +34,7 @@ import {asInline} from "./util"
 import {WordCount} from "./wordcounts"
 import {FileUploadExtension} from "./FileUpload"
 import {getSetting} from "src/engine"
+import {TagExtension} from "./TagExtension"
 
 export {
   createSuggestions,

From 9c572804f475e5c641490f87799b8ba582d6945f Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 8 Nov 2024 16:34:35 +0100
Subject: [PATCH 19/26] unnecessary if

---
 src/app/editor/TagExtension.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/editor/TagExtension.ts b/src/app/editor/TagExtension.ts
index 7f3d9b86c..48f80e7f9 100644
--- a/src/app/editor/TagExtension.ts
+++ b/src/app/editor/TagExtension.ts
@@ -71,9 +71,7 @@ export const TagExtension = Mark.create({
           return null
         },
         handler: ({state, range, match}) => {
-          if (match) {
-            state.tr.addMark(range.from - 1, range.to, this.type.create(match.data)).insertText(" ")
-          }
+          state.tr.addMark(range.from - 1, range.to, this.type.create(match.data)).insertText(" ")
         },
       },
     ]

From 2406a5d8ed19ecf6b26280f769a7e2fbc202609f Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 8 Nov 2024 17:07:05 +0100
Subject: [PATCH 20/26] multi tags support

---
 src/app/editor/TagExtension.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/editor/TagExtension.ts b/src/app/editor/TagExtension.ts
index 48f80e7f9..bfba92c73 100644
--- a/src/app/editor/TagExtension.ts
+++ b/src/app/editor/TagExtension.ts
@@ -1,5 +1,6 @@
 import type {InputRuleMatch} from "@tiptap/core"
 import {Mark, markPasteRule, mergeAttributes} from "@tiptap/core"
+import {last} from "ramda"
 
 export interface TagAttributes {
   tag: string
@@ -59,19 +60,18 @@ export const TagExtension = Mark.create({
     return [
       {
         find: text => {
-          const match = text.match(REGEX_TAG_INPUT)
-          if (match && match[0] == text) {
+          const match = last(Array.from(text.matchAll(REGEX_TAG_INPUT)))
+          if (match && text.length === match.index + match[0].length) {
             return {
-              index: match.index,
+              index: match?.index,
               text: match[0],
-              data: {tag: text.trim()},
-              match,
+              data: {tag: match[1]},
             } as InputRuleMatch
           }
           return null
         },
         handler: ({state, range, match}) => {
-          state.tr.addMark(range.from - 1, range.to, this.type.create(match.data)).insertText(" ")
+          state.tr.addMark(range.from, range.to, this.type.create(match.data)).insertText(" ")
         },
       },
     ]

From 04f430369d556d8c65ed5a8e15061b5be98c0f42 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 8 Nov 2024 17:12:10 +0100
Subject: [PATCH 21/26] apply text-neutral-800 to link-content

---
 src/app.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app.css b/src/app.css
index 3868ae966..4bd48abbf 100644
--- a/src/app.css
+++ b/src/app.css
@@ -269,7 +269,7 @@ body,
 
 .link-content,
 .tiptap [tag] {
-  @apply max-w-full overflow-hidden text-ellipsis whitespace-nowrap rounded bg-neutral-200 px-1 no-underline;
+  @apply max-w-full overflow-hidden text-ellipsis whitespace-nowrap rounded bg-neutral-200 px-1 no-underline text-neutral-800;
 }
 
 .link-content.link-content-selected {

From 76738fa477b49f6d476e6b4210cc728ead513311 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 8 Nov 2024 17:12:54 +0100
Subject: [PATCH 22/26] avoid error on undefined nevent content

---
 src/app/editor/EditEvent.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/editor/EditEvent.svelte b/src/app/editor/EditEvent.svelte
index 901ff18bd..e1c635f62 100644
--- a/src/app/editor/EditEvent.svelte
+++ b/src/app/editor/EditEvent.svelte
@@ -13,7 +13,7 @@
   const displayEvent = (e: TrustedEvent) => {
     const content = e?.tags.find(nthEq(0, "alt"))?.[1] || e?.content
 
-    return content.length > 1
+    return content?.length > 1
       ? ellipsize(content, 30)
       : fromNostrURI(nevent || naddr).slice(0, 16) + "..."
   }

From 08384071885b78867eb2c8ad052be808819ac241 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 8 Nov 2024 17:33:51 +0100
Subject: [PATCH 23/26] split nip96 and blossom url setting

---
 src/app/views/UserSettings.svelte | 54 ++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/app/views/UserSettings.svelte b/src/app/views/UserSettings.svelte
index 65e8b210a..77d9cd508 100644
--- a/src/app/views/UserSettings.svelte
+++ b/src/app/views/UserSettings.svelte
@@ -14,7 +14,7 @@
   import {fuzzy} from "src/util/misc"
   import Select from "src/partials/Select.svelte"
 
-  const values = {...$userSettings}
+  const values = $userSettings
 
   const submit = () => {
     publishSettings(values)
@@ -22,7 +22,8 @@
     showInfo("Your settings have been saved!")
   }
 
-  const searchUploadProviders = fuzzy(env.NIP96_URLS, {keys: ["url"]})
+  const searchNIP96Providers = fuzzy(env.NIP96_URLS, {keys: ["url"]})
+  const searchBlossomProviders = fuzzy(env.BLOSSOM_URLS, {keys: ["url"]})
 
   const formatPercent = d => String(Math.round(d * 100))
   const parsePercent = p => parseInt(p) / 100
@@ -73,23 +74,6 @@
         </p>
       </FieldInline>
     {/if}
-    <Field label="Upload Provider URLs">
-      <p slot="info">
-        Enter one or more urls for nostr media servers. You can find a full list of NIP-96
-        compatible servers
-        <Anchor underline href="https://github.com/quentintaranpino/NIP96-compatible-servers"
-          >here</Anchor>
-      </p>
-      <SearchSelect
-        multiple
-        search={searchUploadProviders}
-        bind:value={values.nip96_urls}
-        termToItem={identity}>
-        <div slot="item" let:item>
-          <strong>{item}</strong>
-        </div>
-      </SearchSelect>
-    </Field>
     <Field label="Upload Type">
       <p slot="info">
         Choose an upload type for your files, default is nip-96 but blossom is also supported.
@@ -105,6 +89,38 @@
         </Select>
       </div>
     </Field>
+    {#if values.upload_type === "nip96"}
+      <Field label="NIP96 Provider URLs">
+        <p slot="info">
+          Enter one or more urls for nostr media servers. You can find a full list of NIP-96
+          compatible servers
+          <Anchor underline href="https://github.com/quentintaranpino/NIP96-compatible-servers"
+            >here</Anchor>
+        </p>
+        <SearchSelect
+          multiple
+          search={searchNIP96Providers}
+          bind:value={values.nip96_urls}
+          termToItem={identity}>
+          <div slot="item" let:item>
+            <strong>{item}</strong>
+          </div>
+        </SearchSelect>
+      </Field>
+    {:else}
+      <Field label="Blossom Provider URLs">
+        <p slot="info">Enter one or more urls for blossom compatible nostr media servers.</p>
+        <SearchSelect
+          multiple
+          search={searchBlossomProviders}
+          bind:value={values.blossom_urls}
+          termToItem={identity}>
+          <div slot="item" let:item>
+            <strong>{item}</strong>
+          </div>
+        </SearchSelect>
+      </Field>
+    {/if}
     <Field label="Dufflepud URL">
       <Input bind:value={values.dufflepud_url}>
         <i slot="before" class="fa-solid fa-server" />

From 93140d556cfe32da27ec7b962572de8323995435 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 8 Nov 2024 17:35:05 +0100
Subject: [PATCH 24/26] minor improvement

---
 src/app/editor/FileUpload.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/app/editor/FileUpload.ts b/src/app/editor/FileUpload.ts
index 78bc751cf..6623deebf 100644
--- a/src/app/editor/FileUpload.ts
+++ b/src/app/editor/FileUpload.ts
@@ -1,5 +1,6 @@
 import type {CommandProps, Editor} from "@tiptap/core"
 import {Extension} from "@tiptap/core"
+import {now} from "@welshman/lib"
 import type {ImageAttributes, VideoAttributes} from "nostr-editor"
 import type {EventTemplate, NostrEvent} from "nostr-tools/core"
 import {readServerConfig, uploadFile} from "nostr-tools/nip96"
@@ -306,13 +307,10 @@ export interface NIP96Options {
   alt?: string
   serverUrl: string
   expiration?: number
-  sign?: (event: EventTemplate) => Promise<NostrEvent> | NostrEvent
+  sign: (event: EventTemplate) => Promise<NostrEvent> | NostrEvent
 }
 
 export async function uploadNIP96(options: NIP96Options) {
-  if (!options.sign) {
-    return Promise.reject("No signer found")
-  }
   try {
     const server = await readServerConfig(options.serverUrl)
     const authorization = await getToken(server.api_url, "POST", options.sign, true)
@@ -332,7 +330,7 @@ export async function uploadNIP96(options: NIP96Options) {
       tags: res.nip94_event?.tags.flatMap(item => item.join(" ")),
     }
   } catch (error) {
-    throw new Error(error as string)
+    console.warn(error)
   }
 }
 
@@ -363,17 +361,17 @@ export async function uploadBlossom(options: BlossomOptions) {
   if (!options.sign) {
     throw new Error("No signer provided")
   }
-  const now = Math.ceil(Date.now() / 1000)
+  const created_at = now()
   const hash = await options.hash(options.file)
   const event = await options.sign({
     kind: 24242,
     content: `Upload ${options.file.name}`,
-    created_at: now,
+    created_at,
     tags: [
       ["t", "upload"],
       ["x", hash],
       ["size", options.file.size.toString()],
-      ["expiration", (now + (options.expiration || 60000)).toString()],
+      ["expiration", (created_at + (options.expiration || 60000)).toString()],
     ],
   })
   const data = JSON.stringify(event)

From 8ff5fd3d9a3bf7f732e491da8cee4d6bb03f8a7c Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 8 Nov 2024 17:35:30 +0100
Subject: [PATCH 25/26] default blossom settings

---
 src/app/editor/index.ts | 4 +++-
 src/engine/state.ts     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
index 5f4ee779c..1dd70c5a8 100644
--- a/src/app/editor/index.ts
+++ b/src/app/editor/index.ts
@@ -72,7 +72,9 @@ export const getEditorOptions = ({
   submitOnEnter = true,
   submitOnModEnter = false,
   element,
-  defaultUploadUrl = getSetting("nip96_urls").slice(0, 1)[0] || "https://nostr.build",
+  defaultUploadUrl = getSetting("upload_type") == "nip96"
+    ? getSetting("nip96_urls").slice(0, 1)[0] || "https://nostr.build"
+    : getSetting("blossom_urls").slice(0, 1)[0] || "https://cdn.satellite.earth",
   uploadType = getSetting("upload_type"),
   autofocus = false,
   content = "",
diff --git a/src/engine/state.ts b/src/engine/state.ts
index 6fc939ff4..24ed83e46 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -135,6 +135,7 @@ export const env = {
   BLUR_CONTENT: JSON.parse(import.meta.env.VITE_BLUR_CONTENT) as boolean,
   IMGPROXY_URL: import.meta.env.VITE_IMGPROXY_URL as string,
   NIP96_URLS: fromCsv(import.meta.env.VITE_NIP96_URLS) as string[],
+  BLOSSOM_URLS: fromCsv(import.meta.env.VITE_BLOSSOM_URLS) as string[],
   ONBOARDING_LISTS: fromCsv(import.meta.env.VITE_ONBOARDING_LISTS) as string[],
   PLATFORM_PUBKEY: import.meta.env.VITE_PLATFORM_PUBKEY as string,
   PLATFORM_RELAYS: fromCsv(import.meta.env.VITE_PLATFORM_RELAYS).map(normalizeRelayUrl) as string[],
@@ -225,8 +226,9 @@ export const defaultSettings = {
   enable_client_tag: false,
   auto_authenticate: false,
   note_actions: ["zaps", "replies", "reactions", "recommended_apps"],
-  nip96_urls: env.NIP96_URLS.slice(0, 1),
   upload_type: "nip96",
+  nip96_urls: env.NIP96_URLS.slice(0, 1),
+  blossom_urls: env.BLOSSOM_URLS.slice(0, 1),
   imgproxy_url: env.IMGPROXY_URL,
   dufflepud_url: env.DUFFLEPUD_URL,
   platform_zap_split: env.PLATFORM_ZAP_SPLIT,

From 979d16e83719884d572302e1a9680a375d6e5c44 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Fri, 8 Nov 2024 17:39:15 +0100
Subject: [PATCH 26/26] no-underline for tags

---
 src/app.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/app.css b/src/app.css
index 4bd48abbf..68c1f3f8b 100644
--- a/src/app.css
+++ b/src/app.css
@@ -256,9 +256,6 @@ body,
   @apply max-w-full overflow-hidden text-ellipsis whitespace-nowrap rounded px-1 no-underline;
 }
 
-.tiptap a {
-  @apply underline
-}
 .tiptap p.is-editor-empty:first-child::before {
   color: #adb5bd;
   content: attr(data-placeholder);