refactor: address PR review feedback for RBAC

Polish RBAC role/member stores and remove state-role cycle
Refactor role view models and member grouping
2026-05-04 21:29:32 +00:00 · 2026-05-04 21:29:32 +00:00 · 2026-05-04 21:29:32 +00:00 · 2026-05-04 21:29:32 +00:00 · 2026-05-04 21:29:32 +00:00 · 2026-05-04 21:02:56 +00:00
68 changed files with 1746 additions and 385 deletions
@@ -26,7 +26,15 @@ FROM node:20-alpine

 WORKDIR /app

-# Copy only the built output - no source, no .env, no dev deps
-COPY --from=builder /app/build ./build
+# Install production dependencies needed by the Node server runtime
+RUN npm install -g pnpm@10.33.0
+COPY package.json pnpm-lock.yaml ./
+RUN pnpm i --prod --frozen-lockfile --ignore-scripts

-CMD ["npx", "serve", "-s", "build"]
+# Copy only the built output and server source - no app source, no .env, no dev deps
+COPY --from=builder /app/build ./build
+COPY --from=builder /app/server.js ./server.js
+
+EXPOSE 3000
+
+CMD ["node", "server.js"]
@@ -31,7 +31,7 @@ To run your own Flotilla, it's as simple as:
 ```sh
 pnpm install
 pnpm run build
-npx serve -s build
+pnpm run start
 ```

 Or, if you prefer to use a container:
@@ -5,6 +5,7 @@
  "scripts": {
    "dev": "vite dev",
    "build": "./build.sh",
+    "start": "node server.js",
    "release:android": "./build.sh && cap build android --androidreleasetype APK --signing-type apksigner",
    "tauri:dev": "tauri dev",
    "tauri:build": "tauri build",
@@ -60,6 +61,7 @@
    "@capawesome/capacitor-badge": "^8.0.0",
    "@getalby/lightning-tools": "^6.1.0",
    "@getalby/sdk": "^5.1.2",
+    "@hono/node-server": "^2.0.0",
    "@noble/curves": "^1.9.7",
    "@pomade/core": "^0.2.3",
    "@poppanator/sveltekit-svg": "^4.2.1",
@@ -80,12 +82,15 @@
    "@welshman/signer": "^0.8.13",
    "@welshman/store": "^0.8.13",
    "@welshman/util": "^0.8.13",
+    "cheerio": "^1.2.0",
    "compressorjs-next": "^1.1.2",
    "daisyui": "^5.5.19",
    "date-picker-svelte": "^2.17.0",
    "dotenv": "^16.6.1",
    "emoji-picker-element": "^1.28.1",
+    "emoji-picker-element-data": "^1.8.0",
    "fuse.js": "^7.1.0",
+    "hono": "^4.12.15",
    "husky": "^9.1.7",
    "idb": "^8.0.3",
    "livekit-client": "^2.17.2",
@@ -62,6 +62,9 @@ importers:
      '@getalby/sdk':
        specifier: ^5.1.2
        version: 5.1.2(typescript@5.9.3)
+      '@hono/node-server':
+        specifier: ^2.0.0
+        version: 2.0.0(hono@4.12.15)
      '@noble/curves':
        specifier: ^1.9.7
        version: 1.9.7
@@ -122,6 +125,9 @@ importers:
      '@welshman/util':
        specifier: ^0.8.13
        version: 0.8.13(@noble/curves@1.9.7)(@welshman/lib@0.8.13)(nostr-tools@2.20.0(typescript@5.9.3))
+      cheerio:
+        specifier: ^1.2.0
+        version: 1.2.0
      compressorjs-next:
        specifier: ^1.1.2
        version: 1.1.2
@@ -137,9 +143,15 @@ importers:
      emoji-picker-element:
        specifier: ^1.28.1
        version: 1.28.1
+      emoji-picker-element-data:
+        specifier: ^1.8.0
+        version: 1.8.0
      fuse.js:
        specifier: ^7.1.0
        version: 7.1.0
+      hono:
+        specifier: ^4.12.15
+        version: 4.12.15
      husky:
        specifier: ^9.1.7
        version: 9.1.7
@@ -1096,6 +1108,12 @@ packages:
    resolution: {integrity: sha512-yUF9LhuvdIFOwjV1aG0ryzfwDiGBFk/CRLkRvrrM9dsE38SUjKsf1FDga5jxsKMu80nWcPZR9TiGGASWedoYPA==}
    engines: {node: '>=14'}

+  '@hono/node-server@2.0.0':
+    resolution: {integrity: sha512-n3GfHwwCvHCkGmOwKfxUPOlbfzuO64Sbc5XC4NGPIXxkuOnJrdgExdRKmHfF924r914WRJPT397GdqLvdYTeyQ==}
+    engines: {node: '>=20'}
+    peerDependencies:
+      hono: ^4
+
  '@humanfs/core@0.19.1':
    resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
    engines: {node: '>=18.18.0'}
@@ -2465,6 +2483,13 @@ packages:
    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
    engines: {node: '>=10'}

+  cheerio-select@2.1.0:
+    resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==}
+
+  cheerio@1.2.0:
+    resolution: {integrity: sha512-WDrybc/gKFpTYQutKIK6UvfcuxijIZfMfXaYm8NMsPQxSYvf+13fXUJ4rztGGbJcBQ/GF55gvrZ0Bc0bj/mqvg==}
+    engines: {node: '>=20.18.1'}
+
  chevrotain@7.1.1:
    resolution: {integrity: sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==}

@@ -2824,12 +2849,18 @@ packages:
    resolution: {integrity: sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==}
    engines: {node: '>= 0.4.0'}

+  emoji-picker-element-data@1.8.0:
+    resolution: {integrity: sha512-VfRuRJNEDLS1JKlNS4olaqhjX5S1nnZ+ZHG73b/dV8QeZyi0yPruTPEE72EmF6XO3k/9hj3lybMIYMOYXb/57A==}
+
  emoji-picker-element@1.28.1:
    resolution: {integrity: sha512-8c64IPish2PWoV9oYCo2pvuPHwIv+uK9bO0dfpPyMupDAvaWL9ZvYhWNTAR+2sx7BhfRjciImqP6CIUgNX+DMg==}

  emoji-regex@8.0.0:
    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}

+  encoding-sniffer@0.2.1:
+    resolution: {integrity: sha512-5gvq20T6vfpekVtqrYQsSCFZ1wEg5+wW0/QaZMWkFr6BqD3NfKs0rLCx4rrVlSWJeZb5NBJgVLswK/w2MWU+Gw==}
+
  enhanced-resolve@5.20.1:
    resolution: {integrity: sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==}
    engines: {node: '>=10.13.0'}
@@ -2841,6 +2872,14 @@ packages:
    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
    engines: {node: '>=0.12'}

+  entities@6.0.1:
+    resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
+    engines: {node: '>=0.12'}
+
+  entities@7.0.1:
+    resolution: {integrity: sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==}
+    engines: {node: '>=0.12'}
+
  env-paths@2.2.1:
    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
    engines: {node: '>=6'}
@@ -3234,6 +3273,10 @@ packages:
    resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
    hasBin: true

+  hono@4.12.15:
+    resolution: {integrity: sha512-qM0jDhFEaCBb4TxoW7f53Qrpv9RBiayUHo0S52JudprkhvpjIrGoU1mnnr29Fvd1U335ZFPZQY1wlkqgfGXyLg==}
+    engines: {node: '>=16.9.0'}
+
  hosted-git-info@2.8.9:
    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}

@@ -3241,6 +3284,9 @@ packages:
    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
    engines: {node: '>=10'}

+  htmlparser2@10.1.0:
+    resolution: {integrity: sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ==}
+
  husky@9.1.7:
    resolution: {integrity: sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==}
    engines: {node: '>=18'}
@@ -3249,6 +3295,10 @@ packages:
  ico-endec@0.1.6:
    resolution: {integrity: sha512-ZdLU38ZoED3g1j3iEyzcQj+wAkY2xfWNkymszfJPoxucIUhK7NayQ+/C4Kv0nDFMIsbtbEHldv3V8PU494/ueQ==}

+  iconv-lite@0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
+    engines: {node: '>=0.10.0'}
+
  idb@7.1.1:
    resolution: {integrity: sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==}

@@ -4015,6 +4065,15 @@ packages:
    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
    engines: {node: '>=8'}

+  parse5-htmlparser2-tree-adapter@7.1.0:
+    resolution: {integrity: sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==}
+
+  parse5-parser-stream@7.1.2:
+    resolution: {integrity: sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==}
+
+  parse5@7.3.0:
+    resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}
+
  path-exists@3.0.0:
    resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
    engines: {node: '>=4'}
@@ -4456,6 +4515,9 @@ packages:
    resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==}
    engines: {node: '>= 0.4'}

+  safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+
  sax@1.1.4:
    resolution: {integrity: sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg==}

@@ -4891,6 +4953,10 @@ packages:
  undici-types@7.16.0:
    resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}

+  undici@7.25.0:
+    resolution: {integrity: sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==}
+    engines: {node: '>=20.18.1'}
+
  unicode-canonical-property-names-ecmascript@2.0.1:
    resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==}
    engines: {node: '>=4'}
@@ -5009,6 +5075,15 @@ packages:
    resolution: {integrity: sha512-5ZZY1+lGq8LEKuDlg9M2RPJHlH3R7OVwyHqMcUsLKCgd9Wvf+QrFTCItkXXYPmrJn8H6gRLXbSgxLLdexiqHxw==}
    engines: {node: '>=6.0.0', npm: '>=3.10.0'}

+  whatwg-encoding@3.1.1:
+    resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
+    engines: {node: '>=18'}
+    deprecated: Use @exodus/bytes instead for a more spec-conformant and faster implementation
+
+  whatwg-mimetype@4.0.0:
+    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
+    engines: {node: '>=18'}
+
  whatwg-url@5.0.0:
    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}

@@ -6228,6 +6303,10 @@ snapshots:
    transitivePeerDependencies:
      - typescript

+  '@hono/node-server@2.0.0(hono@4.12.15)':
+    dependencies:
+      hono: 4.12.15
+
  '@humanfs/core@0.19.1': {}

  '@humanfs/node@0.16.7':
@@ -7642,6 +7721,29 @@ snapshots:
      ansi-styles: 4.3.0
      supports-color: 7.2.0

+  cheerio-select@2.1.0:
+    dependencies:
+      boolbase: 1.0.0
+      css-select: 5.2.2
+      css-what: 6.2.2
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      domutils: 3.2.2
+
+  cheerio@1.2.0:
+    dependencies:
+      cheerio-select: 2.1.0
+      dom-serializer: 2.0.0
+      domhandler: 5.0.3
+      domutils: 3.2.2
+      encoding-sniffer: 0.2.1
+      htmlparser2: 10.1.0
+      parse5: 7.3.0
+      parse5-htmlparser2-tree-adapter: 7.1.0
+      parse5-parser-stream: 7.1.2
+      undici: 7.25.0
+      whatwg-mimetype: 4.0.0
+
  chevrotain@7.1.1:
    dependencies:
      regexp-to-ast: 0.5.0
@@ -8028,10 +8130,17 @@ snapshots:
    dependencies:
      sax: 1.1.4

+  emoji-picker-element-data@1.8.0: {}
+
  emoji-picker-element@1.28.1: {}

  emoji-regex@8.0.0: {}

+  encoding-sniffer@0.2.1:
+    dependencies:
+      iconv-lite: 0.6.3
+      whatwg-encoding: 3.1.1
+
  enhanced-resolve@5.20.1:
    dependencies:
      graceful-fs: 4.2.11
@@ -8041,6 +8150,10 @@ snapshots:

  entities@4.5.0: {}

+  entities@6.0.1: {}
+
+  entities@7.0.1: {}
+
  env-paths@2.2.1: {}

  env-paths@3.0.0: {}
@@ -8550,16 +8663,29 @@ snapshots:

  he@1.2.0: {}

+  hono@4.12.15: {}
+
  hosted-git-info@2.8.9: {}

  hosted-git-info@4.1.0:
    dependencies:
      lru-cache: 6.0.0

+  htmlparser2@10.1.0:
+    dependencies:
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      domutils: 3.2.2
+      entities: 7.0.1
+
  husky@9.1.7: {}

  ico-endec@0.1.6: {}

+  iconv-lite@0.6.3:
+    dependencies:
+      safer-buffer: 2.1.2
+
  idb@7.1.1: {}

  idb@8.0.3: {}
@@ -9266,6 +9392,19 @@ snapshots:
      json-parse-even-better-errors: 2.3.1
      lines-and-columns: 1.2.4

+  parse5-htmlparser2-tree-adapter@7.1.0:
+    dependencies:
+      domhandler: 5.0.3
+      parse5: 7.3.0
+
+  parse5-parser-stream@7.1.2:
+    dependencies:
+      parse5: 7.3.0
+
+  parse5@7.3.0:
+    dependencies:
+      entities: 6.0.1
+
  path-exists@3.0.0: {}

  path-exists@4.0.0: {}
@@ -9704,6 +9843,8 @@ snapshots:
      es-errors: 1.3.0
      is-regex: 1.2.1

+  safer-buffer@2.1.2: {}
+
  sax@1.1.4: {}

  sax@1.4.4: {}
@@ -10229,6 +10370,8 @@ snapshots:

  undici-types@7.16.0: {}

+  undici@7.25.0: {}
+
  unicode-canonical-property-names-ecmascript@2.0.1: {}

  unicode-match-property-ecmascript@2.0.0:
@@ -10309,6 +10452,12 @@ snapshots:
    dependencies:
      sdp: 3.2.1

+  whatwg-encoding@3.1.1:
+    dependencies:
+      iconv-lite: 0.6.3
+
+  whatwg-mimetype@4.0.0: {}
+
  whatwg-url@5.0.0:
    dependencies:
      tr46: 0.0.3
@@ -0,0 +1,280 @@
+import path from "node:path"
+import {promises as fs} from "node:fs"
+import {fileURLToPath} from "node:url"
+
+import "dotenv/config"
+import {serve} from "@hono/node-server"
+import {serveStatic} from "@hono/node-server/serve-static"
+import {loadRelay} from "@welshman/app"
+import {displayRelayUrl, normalizeRelayUrl} from "@welshman/util"
+import {load} from "cheerio"
+import {Hono} from "hono"
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+const BUILD_DIR = path.join(__dirname, "build")
+const INDEX_PATH = path.join(BUILD_DIR, "index.html")
+
+const PORT = parseInt(process.env.PORT || "", 10) || 3000
+const HOST = process.env.HOST || "0.0.0.0"
+
+let TEMPLATE_HTML = ""
+try {
+  TEMPLATE_HTML = await fs.readFile(INDEX_PATH, "utf8")
+} catch (error) {
+  console.error(`Unable to read ${INDEX_PATH}. Run "pnpm run build" first.`)
+  process.exit(1)
+}
+
+const PLATFORM_NAME = process.env.VITE_PLATFORM_NAME
+const PLATFORM_DESCRIPTION = process.env.VITE_PLATFORM_DESCRIPTION
+
+// Match client-side decode logic
+const decodeRelay = url => {
+  try {
+    return normalizeRelayUrl(decodeURIComponent(url))
+  } catch {
+    return undefined
+  }
+}
+
+const requestUrlFromContext = context => {
+  const requestUrl = new URL(context.req.url)
+  const forwardedProto = context.req.header("x-forwarded-proto")?.split(",")[0]?.trim()
+  const forwardedHost = context.req.header("x-forwarded-host")?.split(",")[0]?.trim()
+
+  if (forwardedProto === "http" || forwardedProto === "https") {
+    requestUrl.protocol = `${forwardedProto}:`
+  }
+
+  if (forwardedHost) {
+    requestUrl.host = forwardedHost
+  }
+
+  return requestUrl
+}
+
+const fetchRelayMeta = async relayUrl => {
+  if (!relayUrl) return undefined
+  try {
+    return await loadRelay(normalizeRelayUrl(relayUrl))
+  } catch (err) {
+    console.error(`Failed to fetch relay metadata for ${relayUrl}:`, err)
+    return undefined
+  }
+}
+
+const buildDefaultImage = requestUrl => {
+  return new URL("/maskable-icon-512x512.png", requestUrl.origin).toString()
+}
+
+const getMetadataForInvite = async (url, match) => {
+  const relayParam = url.searchParams.get("r")
+  if (!relayParam) return undefined
+
+  const relayMetadata = await fetchRelayMeta(relayParam)
+  if (!relayMetadata) return undefined
+
+  const relayDisplay = displayRelayUrl(relayParam)
+  const spaceName = relayMetadata.name
+  const relayDescription = relayMetadata.description
+
+  const title = spaceName
+    ? `Invite to ${spaceName} on ${PLATFORM_NAME}`
+    : `Invite to a Space on ${PLATFORM_NAME}`
+
+  const parts = []
+  if (spaceName) {
+    parts.push(`You are invited to join ${spaceName} on ${PLATFORM_NAME}.`)
+  } else {
+    parts.push(`You are invited to join a space on ${PLATFORM_NAME}.`)
+  }
+
+  if (relayDisplay) parts.push(`Relay: ${relayDisplay}.`)
+  if (relayDescription) parts.push(relayDescription)
+  else parts.push(PLATFORM_DESCRIPTION)
+
+  const description = parts.join(" ")
+  const image =
+    relayMetadata.icon ||
+    relayMetadata.picture ||
+    relayMetadata.image ||
+    buildDefaultImage(url)
+
+  return {
+    title,
+    description,
+    image,
+    url: url.toString(),
+    site: url.origin,
+  }
+}
+
+const getMetadataForSpace = async (url, match) => {
+  const relayParam = decodeRelay(match[1])
+  if (!relayParam) return undefined
+
+  const relayMetadata = await fetchRelayMeta(relayParam)
+  if (!relayMetadata) return undefined
+
+  const spaceName = relayMetadata.name || displayRelayUrl(relayParam)
+
+  return {
+    title: `${spaceName} on ${PLATFORM_NAME}`,
+    description: relayMetadata.description || PLATFORM_DESCRIPTION,
+    image:
+      relayMetadata.icon ||
+      relayMetadata.picture ||
+      relayMetadata.image ||
+      buildDefaultImage(url),
+    url: url.toString(),
+    site: url.origin,
+  }
+}
+
+const getMetadataForSpaceSection = async (url, match) => {
+  const spaceMeta = await getMetadataForSpace(url, match)
+  if (!spaceMeta) return undefined
+
+  const section = match[2]
+  const sectionName = section.charAt(0).toUpperCase() + section.slice(1)
+  spaceMeta.title = `${sectionName} on ${spaceMeta.title}`
+  return spaceMeta
+}
+
+const getMetadataForSpaceItem = async (url, match) => {
+  const spaceMeta = await getMetadataForSpace(url, match)
+  if (!spaceMeta) return undefined
+
+  const section = match[2]
+  let itemType = "Item"
+  if (section === "calendar") itemType = "Event"
+  if (section === "threads") itemType = "Thread"
+  if (section === "polls") itemType = "Poll"
+  if (section === "goals") itemType = "Goal"
+  if (section === "classifieds") itemType = "Listing"
+
+  spaceMeta.title = `${itemType} on ${spaceMeta.title}`
+  return spaceMeta
+}
+
+const getMetadataForRoom = async (url, match) => {
+  const spaceMeta = await getMetadataForSpace(url, match)
+  if (!spaceMeta) return undefined
+
+  // Room metadata requires fetching from Nostr, which can be added later.
+  spaceMeta.title = `Room on ${spaceMeta.title}`
+  return spaceMeta
+}
+
+const routes = [
+  [/^\/join\/?$/, getMetadataForInvite],
+  [/^\/spaces\/([^/]+)\/(calendar|chat|threads|polls|goals|classifieds|recent)\/?$/, getMetadataForSpaceSection],
+  [/^\/spaces\/([^/]+)\/(calendar|threads|polls|goals|classifieds)\/([^/]+)\/?$/, getMetadataForSpaceItem],
+  [/^\/spaces\/([^/]+)\/([^/]+)\/?$/, getMetadataForRoom],
+  [/^\/spaces\/([^/]+)\/?$/, getMetadataForSpace],
+]
+
+const getMetadataForRoute = async url => {
+  for (const [regex, getMetadata] of routes) {
+    const match = url.pathname.match(regex)
+    if (match) {
+      try {
+        return await getMetadata(url, match)
+      } catch (err) {
+        console.error(`Error generating metadata for route ${url.pathname}:`, err)
+        return undefined
+      }
+    }
+  }
+  return undefined
+}
+
+const injectMeta = metadata => {
+  const $ = load(TEMPLATE_HTML)
+
+  if (metadata.title) {
+    $("title").text(metadata.title)
+    $('meta[property="og:title"]').attr("content", metadata.title)
+    $('meta[name="twitter:title"]').attr("content", metadata.title)
+  }
+
+  if (metadata.description) {
+    $('meta[name="description"]').attr("content", metadata.description)
+    $('meta[property="og:description"]').attr("content", metadata.description)
+    $('meta[name="twitter:description"]').attr("content", metadata.description)
+  }
+
+  if (metadata.image) {
+    $('meta[property="og:image"]').attr("content", metadata.image)
+    $('meta[name="twitter:image"]').attr("content", metadata.image)
+  }
+
+  if (metadata.url) {
+    $('meta[property="og:url"]').attr("content", metadata.url)
+    $('meta[name="twitter:site"]').attr("content", metadata.site)
+    $('meta[name="twitter:url"]').attr("content", metadata.url)
+    $('link[rel="canonical"]').attr("href", metadata.url)
+  }
+
+  return $.html()
+}
+
+const app = new Hono()
+
+// Only allow GET and HEAD requests
+app.use("*", async (context, next) => {
+  const method = context.req.method
+  if (method !== "GET" && method !== "HEAD") {
+    return context.text("Method Not Allowed", 405, {Allow: "GET, HEAD"})
+  }
+  await next()
+})
+
+// Serve static assets with appropriate caching
+app.use(
+  "*",
+  serveStatic({
+    root: BUILD_DIR,
+    onFound: (filePath, context) => {
+      const isImmutable = filePath.split(path.sep).join("/").includes("/_app/immutable/")
+      const cacheControl =
+        path.basename(filePath) === "index.html"
+          ? "no-cache"
+          : isImmutable
+            ? "public, max-age=31536000, immutable"
+            : "public, max-age=3600"
+
+      context.header("Cache-Control", cacheControl)
+    },
+  }),
+)
+
+// SPA fallback for routes that don't match static files
+app.get("*", async context => {
+  const requestUrl = requestUrlFromContext(context)
+
+  // If the path has an extension, it's likely a missing static asset, not an SPA route
+  if (path.extname(requestUrl.pathname)) {
+    return context.text("Not found", 404)
+  }
+
+  const metadata = await getMetadataForRoute(requestUrl)
+  const html = metadata ? injectMeta(metadata) : TEMPLATE_HTML
+
+  return context.html(html, 200, {
+    "Cache-Control": metadata ? "no-store" : "no-cache",
+  })
+})
+
+serve(
+  {
+    fetch: app.fetch,
+    hostname: HOST,
+    port: PORT,
+  },
+  () => {
+    console.log(`Flotilla server running on http://${HOST}:${PORT}`)
+  },
+)
@@ -2,15 +2,18 @@
 <html lang="en">
  <head>
    <meta charset="utf-8" />
+    <title>{NAME}</title>
+    <link rel="canonical" href="{URL}" />
    <meta
      name="viewport"
      content="width=device-width, initial-scale=1.0, viewport-fit=cover, interactive-widget=resizes-content" />
    <meta name="theme-color" content="{ACCENT}" />
    <meta name="description" content="{DESCRIPTION}" />
-    <meta name="og:url" content="{URL}" />
-    <meta name="og:type" content="website" />
-    <meta name="og:title" content="{NAME}" />
-    <meta name="og:description" content="{DESCRIPTION}" />
+    <meta property="og:url" content="{URL}" />
+    <meta property="og:type" content="website" />
+    <meta property="og:title" content="{NAME}" />
+    <meta property="og:description" content="{DESCRIPTION}" />
+    <meta property="og:image" content="" />
    <meta name="twitter:card" content="summary" />
    <meta name="twitter:site" content="{URL}" />
    <meta name="twitter:title" content="{NAME}" />
@@ -42,7 +42,7 @@
  let popover: Instance | undefined = $state()
 </script>

-<Button class="join rounded-full">
+<div class="join items-center rounded-full">
  {#if ENABLE_ZAPS && !hideZap}
    <ZapButton {url} {event} class="btn join-item btn-neutral btn-xs">
      <Icon icon={Bolt} size={4} />
@@ -52,6 +52,7 @@
    <Icon icon={SmileCircle} size={4} />
  </EmojiButton>
  <Tippy
+    class="flex"
    bind:popover
    component={EventMenu}
    props={{url, noun, event, customActions, onClick: hidePopover}}
@@ -60,4 +61,4 @@
      <Icon icon={MenuDots} size={4} />
    </Button>
  </Tippy>
-</Button>
+</div>
@@ -3,7 +3,7 @@
  import type {Snippet} from "svelte"
  import {goto} from "$app/navigation"
  import type {TrustedEvent} from "@welshman/util"
-  import {COMMENT, ManagementMethod} from "@welshman/util"
+  import {COMMENT, ManagementMethod, getTagValue} from "@welshman/util"
  import {pubkey, repository, relaysByUrl, manageRelay} from "@welshman/app"
  import ShareCircle from "@assets/icons/share-circle.svg?dataurl"
  import Code2 from "@assets/icons/code-2.svg?dataurl"
@@ -17,7 +17,8 @@
  import Report from "@app/components/Report.svelte"
  import EventShare from "@app/components/EventShare.svelte"
  import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
-  import {hasNip29, deriveUserIsSpaceAdmin} from "@app/core/state"
+  import {deriveHasPermission, ROOM_PERMISSION_DELETE_EVENT} from "@app/core/roles"
+  import {hasNip29} from "@app/core/state"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"
  import {makeSpaceChatPath} from "@app/util/routes"
@@ -33,7 +34,8 @@
  const {url, noun, event, onClick, customActions}: Props = $props()

  const isRoot = event.kind !== COMMENT
-  const userIsAdmin = deriveUserIsSpaceAdmin(url)
+  const h = getTagValue("h", event.tags)
+  const canDelete = deriveHasPermission(url, h, ROOM_PERMISSION_DELETE_EVENT)

  const report = () => pushModal(Report, {url, event})

@@ -107,7 +109,7 @@
        Report Content
      </Button>
    </li>
-    {#if $userIsAdmin}
+    {#if $canDelete}
      <li>
        <Button class="text-error" onclick={showAdminDelete}>
          <Icon size={4} icon={TrashBin2} />
@@ -15,6 +15,7 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
+  import ProgressBar from "@app/components/ProgressBar.svelte"
  import {pushToast} from "@app/util/toast"
  import {PLATFORM_NAME} from "@app/core/state"

@@ -22,9 +23,11 @@
    secret: string
    next: () => unknown
    submitText?: string
+    step?: number
+    totalSteps?: number
  }

-  const {secret, next, submitText = "Continue"}: Props = $props()
+  const {secret, next, submitText = "Continue", step, totalSteps}: Props = $props()

  const back = () => history.back()

@@ -150,6 +153,9 @@
      </Button>
    </div>
  </ModalBody>
+  {#if step && totalSteps}
+    <ProgressBar current={step} total={totalSteps} />
+  {/if}
  <ModalFooter>
    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
@@ -19,6 +19,7 @@
  import LogInOTP from "@app/components/LogInOTP.svelte"
  import LogInSelect from "@app/components/LogInSelect.svelte"
  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/util/pomade"
+  import {getPomadeLoginFailureMessage, POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
  import {pushModal, clearModals} from "@app/util/modal"
  import {setChecked} from "@app/util/notifications"
  import {pushToast} from "@app/util/toast"
@@ -44,7 +45,7 @@

        return pushToast({
          theme: "error",
-          message: "Sorry, we were unable to log you in.",
+          message: getPomadeLoginFailureMessage(messages),
        })
      }

@@ -64,10 +65,17 @@

          pushToast({
            theme: "error",
-            message: "Sorry, we were unable to log you in.",
+            message: getPomadeLoginFailureMessage(res.messages),
          })
        }
      }
+    } catch (error) {
+      console.error("Login error:", error)
+
+      pushToast({
+        theme: "error",
+        message: POMADE_NETWORK_ERROR_MESSAGE,
+      })
    } finally {
      loading = false
    }
@@ -90,7 +98,7 @@
      {#snippet input()}
        <label class="input input-bordered flex w-full items-center gap-2">
          <Icon icon={Letter} />
-          <input bind:value={email} />
+          <input type="email" bind:value={email} />
        </label>
      {/snippet}
    </FieldInline>
@@ -15,6 +15,7 @@
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import LogInOTPConfirm from "@app/components/LogInOTPConfirm.svelte"
+  import {POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"

@@ -35,11 +36,20 @@
      if (ok) {
        pushModal(LogInOTPConfirm, {email, peersByPrefix})
      } else {
+        console.error("Pomade challenge request failed during OTP login")
+
        pushToast({
          theme: "error",
-          message: "Sorry, we were unable to request a login code.",
+          message: POMADE_NETWORK_ERROR_MESSAGE,
        })
      }
+    } catch (error) {
+      console.error(error)
+
+      pushToast({
+        theme: "error",
+        message: POMADE_NETWORK_ERROR_MESSAGE,
+      })
    } finally {
      loading = false
    }
@@ -61,7 +71,7 @@
      {#snippet input()}
        <label class="input input-bordered flex w-full items-center gap-2">
          <Icon icon={Letter} />
-          <input bind:value={email} />
+          <input type="email" bind:value={email} />
        </label>
      {/snippet}
    </FieldInline>
@@ -15,10 +15,11 @@
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import StringMultiInput from "@lib/components/StringMultiInput.svelte"
  import LogInSelect from "@app/components/LogInSelect.svelte"
-  import {pushToast} from "@app/util/toast"
-  import {setChecked} from "@app/util/notifications"
  import {pushModal, clearModals} from "@app/util/modal"
+  import {setChecked} from "@app/util/notifications"
  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/util/pomade"
+  import {getPomadeLoginFailureMessage, POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
+  import {pushToast} from "@app/util/toast"

  type Props = {
    email: string
@@ -44,7 +45,7 @@

        return pushToast({
          theme: "error",
-          message: "Sorry, we were unable to log you in.",
+          message: getPomadeLoginFailureMessage(messages),
        })
      }

@@ -64,10 +65,17 @@

          pushToast({
            theme: "error",
-            message: "Sorry, we were unable to log you in.",
+            message: getPomadeLoginFailureMessage(res.messages),
          })
        }
      }
+    } catch (error) {
+      console.error("Login error:", error)
+
+      pushToast({
+        theme: "error",
+        message: POMADE_NETWORK_ERROR_MESSAGE,
+      })
    } finally {
      loading = false
    }
@@ -14,6 +14,7 @@
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import Profile from "@app/components/Profile.svelte"
  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/util/pomade"
+  import {getPomadeLoginFailureMessage, POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
  import {setChecked} from "@app/util/notifications"
  import {clearModals} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"
@@ -46,9 +47,16 @@

        pushToast({
          theme: "error",
-          message: "Sorry, we were unable to log you in.",
+          message: getPomadeLoginFailureMessage(res.messages),
        })
      }
+    } catch (error) {
+      console.error("Login error:", error)
+
+      pushToast({
+        theme: "error",
+        message: POMADE_NETWORK_ERROR_MESSAGE,
+      })
    } finally {
      loading = false
    }
@@ -1,5 +1,6 @@
 <script lang="ts">
  import {onMount} from "svelte"
+  import {readable} from "svelte/store"
  import {removeUndefined} from "@welshman/lib"
  import {ManagementMethod} from "@welshman/util"
  import {
@@ -28,7 +29,14 @@
  import ProfileInfo from "@app/components/ProfileInfo.svelte"
  import EventInfo from "@app/components/EventInfo.svelte"
  import ProfileBadges from "@app/components/ProfileBadges.svelte"
-  import {pubkeyLink, deriveUserIsSpaceAdmin, deriveSpaceBannedPubkeyItems} from "@app/core/state"
+  import RoleBadge from "@app/components/RoleBadge.svelte"
+  import {pubkeyLink, deriveSpaceBannedPubkeyItems} from "@app/core/state"
+  import {
+    deriveUserHasSpacePermission,
+    deriveSpaceMemberRoles,
+    ROOM_PERMISSION_ADD_MEMBER,
+    ROOM_PERMISSION_BAN_USER,
+  } from "@app/core/roles"
  import {addSpaceMembers} from "@app/core/commands"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"
@@ -43,10 +51,16 @@

  const profile = deriveProfile(pubkey, removeUndefined([url]))

-  const userIsAdmin = deriveUserIsSpaceAdmin(url)
+  const canBan = url ? deriveUserHasSpacePermission(url, ROOM_PERMISSION_BAN_USER) : readable(false)
+
+  const canRestore = url
+    ? deriveUserHasSpacePermission(url, ROOM_PERMISSION_ADD_MEMBER)
+    : readable(false)

  const bannedPubkeys = url ? deriveSpaceBannedPubkeyItems(url) : undefined

+  const assignedRoles = url ? deriveSpaceMemberRoles(url, pubkey) : readable([])
+
  const isBanned = $derived($bannedPubkeys?.some(item => item.pubkey === pubkey) ?? false)

  const back = () => history.back()
@@ -105,7 +119,7 @@
    <div class="flex flex-col gap-4">
      <div class="flex justify-between">
        <Profile showPubkey avatarSize={14} {pubkey} {url} />
-        {#if $profile || $userIsAdmin}
+        {#if $profile || $canBan || $canRestore}
          <div class="relative">
            <Button class="btn btn-circle btn-ghost btn-sm" onclick={() => toggleMenu(pubkey)}>
              <Icon icon={MenuDots} />
@@ -123,22 +137,22 @@
                      </Button>
                    </li>
                  {/if}
-                  {#if $userIsAdmin}
-                    {#if isBanned}
+                  {#if isBanned}
+                    {#if $canRestore}
                      <li>
                        <Button onclick={restoreMember}>
                          <Icon icon={Restart} />
                          Restore User
                        </Button>
                      </li>
-                    {:else}
-                      <li>
-                        <Button class="text-error" onclick={banMember}>
-                          <Icon icon={MinusCircle} />
-                          Ban User
-                        </Button>
-                      </li>
                    {/if}
+                  {:else if $canBan}
+                    <li>
+                      <Button class="text-error" onclick={banMember}>
+                        <Icon icon={MinusCircle} />
+                        Ban User
+                      </Button>
+                    </li>
                  {/if}
                </ul>
              </Popover>
@@ -147,6 +161,16 @@
        {/if}
      </div>
      <ProfileInfo {pubkey} {url} />
+      {#if $assignedRoles.length > 0}
+        <div class="card2 card2-sm bg-alt col-3">
+          <h3 class="text-lg font-semibold">Roles</h3>
+          <div class="flex flex-wrap gap-2">
+            {#each $assignedRoles as role (role.name)}
+              <RoleBadge {role} class="badge-md" />
+            {/each}
+          </div>
+        </div>
+      {/if}
      <ProfileBadges {pubkey} {url} />
    </div>
  </ModalBody>
@@ -23,9 +23,10 @@
    onsubmit: (values: Values) => void
    isSignup?: boolean
    footer: Snippet
+    progressBar?: Snippet
  }

-  const {initialValues, isSignup, onsubmit, footer}: Props = $props()
+  const {initialValues, isSignup, onsubmit, footer, progressBar}: Props = $props()

  const values = $state(initialValues)

@@ -103,6 +104,9 @@
      </Field>
    {/if}
  </ModalBody>
+  {#if progressBar}
+    {@render progressBar()}
+  {/if}
  <ModalFooter>
    {@render footer()}
  </ModalFooter>
@@ -0,0 +1,9 @@
+<script lang="ts">
+  const {current, total}: {current: number; total: number} = $props()
+</script>
+
+<div class="flex w-full">
+  {#each Array(total) as _, i}
+    <div class="h-1 flex-1 transition-colors {i < current ? 'bg-primary' : 'bg-base-300'}"></div>
+  {/each}
+</div>
@@ -23,7 +23,8 @@
  import Icon from "@lib/components/Icon.svelte"
  import Reaction from "@app/components/Reaction.svelte"
  import ReportDetails from "@app/components/ReportDetails.svelte"
-  import {REACTION_KINDS, deriveUserIsSpaceAdmin} from "@app/core/state"
+  import {deriveUserIsSpaceAdmin} from "@app/core/roles"
+  import {REACTION_KINDS} from "@app/core/state"
  import {pushModal} from "@app/util/modal"

  interface Props {
@@ -12,7 +12,7 @@
  import Popover from "@lib/components/Popover.svelte"
  import Button from "@lib/components/Button.svelte"
  import Confirm from "@lib/components/Confirm.svelte"
-  import {deriveUserIsSpaceAdmin} from "@app/core/state"
+  import {deriveUserIsSpaceAdmin} from "@app/core/roles"
  import {publishDelete, canEnforceNip70} from "@app/core/commands"
  import {pushToast} from "@app/util/toast"
  import {pushModal} from "@app/util/modal"
@@ -0,0 +1,24 @@
+<script lang="ts">
+  import cx from "classnames"
+  import type {RoleDefinition} from "@app/core/roles"
+  import {roleColorToCSS} from "@app/core/roles"
+
+  type Props = {
+    role: RoleDefinition
+    class?: string
+  }
+
+  const {role, ...props}: Props = $props()
+
+  const style = $derived(
+    role.color === undefined
+      ? ""
+      : `color: ${roleColorToCSS(role.color)}; border-color: ${roleColorToCSS(role.color)};`,
+  )
+
+  const className = $derived(cx("badge badge-outline badge-sm", props.class))
+</script>
+
+<span class={className} {style}>
+  {role.label || role.name}
+</span>
@@ -27,14 +27,22 @@
  import ModalBody from "@lib/components/ModalBody.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import ProfileCircles from "@app/components/ProfileCircles.svelte"
+  import RoleBadge from "@app/components/RoleBadge.svelte"
  import RoomMembers from "@app/components/RoomMembers.svelte"
  import RoomEdit from "@app/components/RoomEdit.svelte"
  import RoomName from "@app/components/RoomName.svelte"
  import RoomImage from "@app/components/RoomImage.svelte"
  import {
-    deriveRoom,
    deriveRoomMembers,
+    deriveRoomRoleDefinitions,
    deriveUserIsRoomAdmin,
+    deriveHasPermission,
+    getRolePermissionsLabel,
+    getRoleAccessLabel,
+    ROOM_PERMISSION_EDIT_META,
+  } from "@app/core/roles"
+  import {
+    deriveRoom,
    deriveUserRoomMembershipStatus,
    deriveUserRooms,
    deriveShouldNotify,
@@ -58,7 +66,9 @@

  const room = deriveRoom(url, h)
  const members = deriveRoomMembers(url, h)
+  const roleDefinitions = deriveRoomRoleDefinitions(url, h)
  const userIsAdmin = deriveUserIsRoomAdmin(url, h)
+  const canEditMetadata = deriveHasPermission(url, h, ROOM_PERMISSION_EDIT_META)
  const membershipStatus = deriveUserRoomMembershipStatus(url, h)
  const userRooms = deriveUserRooms(url)

@@ -152,7 +162,7 @@
            <ul
              transition:fly
              class="bg-alt menu absolute right-0 z-popover w-48 gap-1 rounded-box p-2 shadow-md">
-              {#if $userIsAdmin}
+              {#if $canEditMetadata}
                <li>
                  <Button onclick={startEdit}>
                    <Icon icon={Pen} />
@@ -243,17 +253,36 @@
        {/if}
      </div>
    </div>
-    {#if $members !== undefined && $members.length > 0}
+    {#if $members.length > 0}
      <div class="card2 card2-sm bg-alt flex items-center justify-between gap-4">
        <div class="flex items-center gap-4">
          <span>Members:</span>
-          <ProfileCircles pubkeys={$members} />
+          <ProfileCircles pubkeys={$members.map(member => member.pubkey)} />
        </div>
        <Button class="btn btn-neutral btn-sm" onclick={showMembers}>View All</Button>
      </div>
-    {:else if $members === undefined}
-      <div class="card2 card2-sm bg-base-200 flex items-center gap-4">
-        <span class="text-error">Member list not available from this relay</span>
+    {/if}
+    {#if $userIsAdmin && $roleDefinitions.length > 0}
+      <div class="card2 card2-sm bg-alt col-4">
+        <strong class="text-lg">Role Definitions</strong>
+        <div class="flex flex-col gap-2">
+          {#each $roleDefinitions as role (role.name)}
+            <div class="rounded-box bg-base-300 p-3 flex flex-col gap-2">
+              <div class="flex items-center gap-2">
+                <RoleBadge {role} class="badge-md" />
+                {#if role.order !== undefined}
+                  <span class="text-xs opacity-70">Order {role.order}</span>
+                {/if}
+              </div>
+              {#if role.permissions.length > 0}
+                <p class="text-xs opacity-75">Permissions: {getRolePermissionsLabel(role)}</p>
+              {/if}
+              {#if role.access.size > 0}
+                <p class="text-xs opacity-75">Access: {getRoleAccessLabel(role)}</p>
+              {/if}
+            </div>
+          {/each}
+        </div>
      </div>
    {/if}
    <div class="card2 card2-sm bg-alt col-4">
@@ -13,7 +13,7 @@
  import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"
-  import {deriveUserIsSpaceAdmin} from "@app/core/state"
+  import {deriveUserIsSpaceAdmin} from "@app/core/roles"

  type Props = {
    url: string
@@ -16,9 +16,17 @@
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import Profile from "@app/components/Profile.svelte"
+  import RoleBadge from "@app/components/RoleBadge.svelte"
  import RoomName from "@app/components/RoomName.svelte"
  import RoomMembersAdd from "@app/components/RoomMembersAdd.svelte"
-  import {deriveRoom, deriveRoomMembers, deriveUserIsRoomAdmin} from "@app/core/state"
+  import {
+    deriveRoomMembers,
+    deriveGroupedRoomMembers,
+    deriveHasPermission,
+    ROOM_PERMISSION_ADD_MEMBER,
+    ROOM_PERMISSION_REMOVE_MEMBER,
+  } from "@app/core/roles"
+  import {deriveRoom} from "@app/core/state"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"

@@ -31,7 +39,9 @@

  const room = deriveRoom(url, h)
  const members = deriveRoomMembers(url, h)
-  const userIsAdmin = deriveUserIsRoomAdmin(url, h)
+  const memberGroups = deriveGroupedRoomMembers(url, h)
+  const canAddMembers = deriveHasPermission(url, h, ROOM_PERMISSION_ADD_MEMBER)
+  const canRemoveMembers = deriveHasPermission(url, h, ROOM_PERMISSION_REMOVE_MEMBER)

  const back = () => history.back()

@@ -73,42 +83,58 @@
      </ModalSubtitle>
    </ModalHeader>
    <div class="flex flex-col gap-2">
-      {#if $members === undefined}
-        <div class="card2 bg-base-200 p-4">
-          <span class="text-error">Member list not available from this relay</span>
-        </div>
-      {:else if $members.length === 0}
+      {#if $members.length === 0}
        <div class="card2 bg-base-200 p-4">
          <span class="text-base-content/70">No members yet</span>
        </div>
      {:else}
-        {#each $members as pubkey (pubkey)}
-          <div class="card2 bg-alt relative">
-            <div class="flex items-center justify-between gap-2">
-              <div class="min-w-0 flex-1">
-                <Profile {pubkey} {url} />
-              </div>
-              <div class="relative">
-                <Button class="btn btn-circle btn-ghost btn-sm" onclick={() => toggleMenu(pubkey)}>
-                  <Icon icon={MenuDots} />
-                </Button>
-                {#if menuPubkey === pubkey}
-                  <Popover hideOnClick onClose={closeMenu}>
-                    <ul
-                      transition:fly
-                      class="menu absolute right-0 z-popover mt-2 w-48 gap-1 rounded-box bg-base-100 p-2 shadow-md">
-                      <li>
-                        <Button class="text-error" onclick={() => removeMember(pubkey)}>
-                          <Icon icon={MinusCircle} />
-                          Remove Member
-                        </Button>
-                      </li>
-                    </ul>
-                  </Popover>
+        {#each $memberGroups as group (group.key)}
+          <div class="pt-2 pb-1">
+            {#if group.role}
+              <RoleBadge role={group.role} class="badge-md" />
+            {:else}
+              <span class="text-sm font-semibold opacity-75">Members</span>
+            {/if}
+          </div>
+          {#each group.members as member (member.pubkey)}
+            <div class="card2 bg-alt relative">
+              <div class="flex items-center justify-between gap-2">
+                <div class="min-w-0 flex-1">
+                  <Profile pubkey={member.pubkey} {url} />
+                  {#if member.roles.length > 0}
+                    <div class="mt-1 flex flex-wrap gap-1">
+                      {#each member.roles as role (role.name)}
+                        <RoleBadge {role} />
+                      {/each}
+                    </div>
+                  {/if}
+                </div>
+                {#if $canRemoveMembers}
+                  <div class="relative">
+                    <Button
+                      class="btn btn-circle btn-ghost btn-sm"
+                      onclick={() => toggleMenu(member.pubkey)}>
+                      <Icon icon={MenuDots} />
+                    </Button>
+                    {#if menuPubkey === member.pubkey}
+                      <Popover hideOnClick onClose={closeMenu}>
+                        <ul
+                          transition:fly
+                          class="menu absolute right-0 z-popover mt-2 w-48 gap-1 rounded-box bg-base-100 p-2 shadow-md">
+                          <li>
+                            <Button class="text-error" onclick={() => removeMember(member.pubkey)}>
+                              <Icon icon={MinusCircle} />
+                              Remove Member
+                            </Button>
+                          </li>
+                        </ul>
+                      </Popover>
+                    {/if}
+                  </div>
                {/if}
              </div>
            </div>
-          </div>
+          {/each}
        {/each}
      {/if}
    </div>
@@ -118,7 +144,7 @@
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    {#if $userIsAdmin}
+    {#if $canAddMembers}
      <Button class="btn btn-primary" onclick={addMember}>
        <Icon icon={AddCircle} />
        Add members
@@ -62,9 +62,10 @@

  const flows = {
    email: {
-      start: () => pushModal(SignUpEmail, {next: flows.email.profile}),
-      profile: () => pushModal(SignUpProfile, {next: flows.email.complete}),
-      complete: () => pushModal(SignUpComplete, {next: flows.email.finalize}),
+      start: () => pushModal(SignUpEmail, {next: flows.email.profile, step: 1, totalSteps: 3}),
+      profile: () => pushModal(SignUpProfile, {next: flows.email.complete, step: 2, totalSteps: 3}),
+      complete: () =>
+        pushModal(SignUpComplete, {next: flows.email.finalize, step: 3, totalSteps: 3}),
      finalize: () => {
        const email = getKey<string>("signup.email")!
        const clientOptions = getKey<ClientOptions>("signup.clientOptions")!
@@ -74,9 +75,10 @@
      },
    },
    nostr: {
-      start: () => pushModal(SignUpProfile, {next: flows.nostr.key}),
-      key: () => pushModal(SignUpKey, {next: flows.nostr.complete}),
-      complete: () => pushModal(SignUpComplete, {next: flows.nostr.finalize}),
+      start: () => pushModal(SignUpProfile, {next: flows.nostr.key, step: 1, totalSteps: 3}),
+      key: () => pushModal(SignUpKey, {next: flows.nostr.complete, step: 2, totalSteps: 3}),
+      complete: () =>
+        pushModal(SignUpComplete, {next: flows.nostr.finalize, step: 3, totalSteps: 3}),
      finalize: () => {
        const secret = getKey<string>("signup.secret")!

@@ -9,12 +9,15 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
+  import ProgressBar from "@app/components/ProgressBar.svelte"

  type Props = {
    next: () => void
+    step?: number
+    totalSteps?: number
  }

-  const {next}: Props = $props()
+  const {next, step, totalSteps}: Props = $props()

  const back = () => history.back()
 </script>
@@ -33,6 +36,9 @@
      on groups you've already joined. Click below to get started!
    </p>
  </ModalBody>
+  {#if step && totalSteps}
+    <ProgressBar current={step} total={totalSteps} />
+  {/if}
  <ModalFooter>
    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
@@ -18,14 +18,17 @@
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import SignUpEmailConfirm from "@app/components/SignUpEmailConfirm.svelte"
+  import ProgressBar from "@app/components/ProgressBar.svelte"
  import {pushToast, popToast} from "@app/util/toast"
  import {pushModal} from "@app/util/modal"

  type Props = {
    next: () => void
+    step?: number
+    totalSteps?: number
  }

-  const {next}: Props = $props()
+  const {next, step, totalSteps}: Props = $props()

  const back = () => history.back()

@@ -81,7 +84,7 @@
      setKey("signup.clientOptions", clientOptions)

      popToast(toastId)
-      pushModal(SignUpEmailConfirm, {next})
+      pushModal(SignUpEmailConfirm, {next, step, totalSteps})
    } catch (e) {
      console.error(e)

@@ -120,7 +123,7 @@
      {#snippet input()}
        <label class="input input-bordered flex w-full items-center gap-2">
          <Icon icon={Letter} />
-          <input bind:value={email} />
+          <input type="email" bind:value={email} />
        </label>
      {/snippet}
    </FieldInline>
@@ -134,8 +137,14 @@
          <input type="password" bind:value={password} />
        </label>
      {/snippet}
+      {#snippet info()}
+        Must be at least 12 characters long.
+      {/snippet}
    </FieldInline>
  </ModalBody>
+  {#if step && totalSteps}
+    <ProgressBar current={step} total={totalSteps} />
+  {/if}
  <ModalFooter>
    <Button class="btn btn-link" onclick={back}>
      <Icon icon={AltArrowLeft} />
@@ -15,12 +15,15 @@
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
+  import ProgressBar from "@app/components/ProgressBar.svelte"

  type Props = {
    next: () => void
+    step?: number
+    totalSteps?: number
  }

-  const {next}: Props = $props()
+  const {next, step, totalSteps}: Props = $props()

  const email = getKey<string>("signup.email")

@@ -61,6 +64,9 @@
      above.
    </p>
  </ModalBody>
+  {#if step && totalSteps}
+    <ProgressBar current={step} total={totalSteps} />
+  {/if}
  <ModalFooter>
    <Button class="btn btn-link" onclick={back} disabled={loading}>
      <Icon icon={AltArrowLeft} />
@@ -4,11 +4,13 @@

  type Props = {
    next: () => void
+    step?: number
+    totalSteps?: number
  }

-  const {next}: Props = $props()
+  const {next, step, totalSteps}: Props = $props()

  const secret = getKey<string>("signup.secret")!
 </script>

-<KeyDownload {secret} {next} />
+<KeyDownload {secret} {next} {step} {totalSteps} />
@@ -5,15 +5,16 @@
  import {getKey, setKey} from "@lib/implicit"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
-  import Modal from "@lib/components/Modal.svelte"
-  import ModalBody from "@lib/components/ModalBody.svelte"
  import ProfileEditForm from "@app/components/ProfileEditForm.svelte"
+  import ProgressBar from "@app/components/ProgressBar.svelte"

  type Props = {
    next: () => void
+    step?: number
+    totalSteps?: number
  }

-  const {next}: Props = $props()
+  const {next, step, totalSteps}: Props = $props()

  const profile = getKey<Profile>("signup.profile")!

@@ -27,19 +28,20 @@
  }
 </script>

-<Modal>
-  <ModalBody>
-    <ProfileEditForm isSignup {initialValues} {onsubmit}>
-      {#snippet footer()}
-        <Button class="btn btn-link" onclick={back}>
-          <Icon icon={AltArrowLeft} />
-          Go back
-        </Button>
-        <Button class="btn btn-primary" type="submit">
-          Create Account
-          <Icon icon={AltArrowRight} />
-        </Button>
-      {/snippet}
-    </ProfileEditForm>
-  </ModalBody>
-</Modal>
+<ProfileEditForm isSignup {initialValues} {onsubmit}>
+  {#snippet footer()}
+    <Button class="btn btn-link" onclick={back}>
+      <Icon icon={AltArrowLeft} />
+      Go back
+    </Button>
+    <Button class="btn btn-primary" type="submit">
+      Create Account
+      <Icon icon={AltArrowRight} />
+    </Button>
+  {/snippet}
+  {#snippet progressBar()}
+    {#if step && totalSteps}
+      <ProgressBar current={step} total={totalSteps} />
+    {/if}
+  {/snippet}
+</ProfileEditForm>
@@ -18,7 +18,7 @@
  import SpaceRelayStatus from "@app/components/SpaceRelayStatus.svelte"
  import RelayDescription from "@app/components/RelayDescription.svelte"
  import ProfileLatest from "@app/components/ProfileLatest.svelte"
-  import {deriveUserIsSpaceAdmin} from "@app/core/state"
+  import {deriveUserHasSpacePermission, ROOM_PERMISSION_EDIT_META} from "@app/core/roles"
  import {pushModal} from "@app/util/modal"

  type Props = {
@@ -28,7 +28,7 @@
  const {url}: Props = $props()
  const relay = deriveRelay(url)
  const owner = $derived($relay?.pubkey)
-  const userIsAdmin = deriveUserIsSpaceAdmin(url)
+  const canEdit = deriveUserHasSpacePermission(url, ROOM_PERMISSION_EDIT_META)

  const back = () => history.back()

@@ -54,7 +54,7 @@
          <p class="ellipsize text-sm opacity-75">{displayRelayUrl(url)}</p>
        </div>
      </div>
-      {#if $userIsAdmin}
+      {#if $canEdit}
        <Button class="btn btn-primary" onclick={startEdit}>
          <Icon icon={Pen} />
          Edit
@@ -25,6 +25,16 @@
  const {url} = $props()

  const authError = deriveRelayAuthError(url)
+  let networkError = $state(false)
+  const isExplicitAuthError = $derived(
+    $authError &&
+      !(
+        $authError.toLowerCase().includes("failed") ||
+        $authError.toLowerCase().includes("timeout") ||
+        $authError.toLowerCase().includes("network")
+      ),
+  )
+  const isGenericError = $derived(networkError || ($authError && !isExplicitAuthError))

  const back = () => history.back()
  const copyInvite = () => clip(invite)
@@ -70,8 +80,14 @@
      ])

      claim = getTagValue("claim", event?.tags || []) || ""
-    } catch {
+    } catch (err) {
      claim = ""
+      if (
+        (err instanceof Error && (err.name === "AbortError" || err.name === "TimeoutError")) ||
+        !navigator.onLine
+      ) {
+        networkError = true
+      }
    } finally {
      loading = false
    }
@@ -92,7 +108,11 @@
        <p class="center">
          <Spinner {loading}>Requesting an invite link...</Spinner>
        </p>
-      {:else if $authError}
+      {:else if isGenericError}
+        <p class="center text-center">
+          Unable to reach the relay. Please check your connection and try again.
+        </p>
+      {:else if isExplicitAuthError}
        <p class="center">Oops! It looks like you're not a member of this relay.</p>
      {:else}
        <div class="flex flex-col items-center gap-6">
@@ -17,16 +17,20 @@
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
+  import RoleBadge from "@app/components/RoleBadge.svelte"
  import RelayName from "@app/components/RelayName.svelte"
  import Profile from "@app/components/Profile.svelte"
  import SpaceMembersAdd from "@app/components/SpaceMembersAdd.svelte"
  import SpaceMembersBanned from "@app/components/SpaceMembersBanned.svelte"
+  import {deriveSpaceMembers, deriveSpaceBannedPubkeyItems} from "@app/core/state"
  import {
-    deriveSpaceMembers,
-    deriveSpaceBannedPubkeyItems,
-    deriveUserIsSpaceAdmin,
+    deriveGroupedSpaceMembers,
    deriveSupportedMethods,
-  } from "@app/core/state"
+    deriveUserHasSpacePermission,
+    ROOM_PERMISSION_ADD_MEMBER,
+    ROOM_PERMISSION_REMOVE_MEMBER,
+    ROOM_PERMISSION_BAN_USER,
+  } from "@app/core/roles"
  import {pushModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"

@@ -38,10 +42,17 @@

  const members = deriveSpaceMembers(url)
  const bans = deriveSpaceBannedPubkeyItems(url)
-  const userIsAdmin = deriveUserIsSpaceAdmin(url)
+  const memberGroups = deriveGroupedSpaceMembers(url, members)
+  const canAddMember = deriveUserHasSpacePermission(url, ROOM_PERMISSION_ADD_MEMBER)
+  const canBanByPermission = deriveUserHasSpacePermission(url, ROOM_PERMISSION_BAN_USER)
+  const canUnallowByPermission = deriveUserHasSpacePermission(url, ROOM_PERMISSION_REMOVE_MEMBER)
  const supportedMethods = deriveSupportedMethods(url)
-  const canBan = $derived($supportedMethods.includes(ManagementMethod.BanPubkey))
-  const canUnallow = $derived($supportedMethods.includes(ManagementMethod.UnallowPubkey))
+  const canBan = $derived(
+    $canBanByPermission && $supportedMethods.includes(ManagementMethod.BanPubkey),
+  )
+  const canUnallow = $derived(
+    $canUnallowByPermission && $supportedMethods.includes(ManagementMethod.UnallowPubkey),
+  )

  const back = () => history.back()

@@ -104,7 +115,7 @@
      <ModalTitle>Members</ModalTitle>
      <ModalSubtitle>of <RelayName {url} class="text-primary" /></ModalSubtitle>
    </ModalHeader>
-    {#if $userIsAdmin}
+    {#if canBan || canUnallow}
      {#if $bans.length > 0}
        <Button class="btn btn-neutral" onclick={showBannedPubkeyItems}>
          Banned users ({$bans.length})
@@ -112,56 +123,68 @@
      {/if}
    {/if}
    <div class="flex flex-col gap-2">
-      {#if $members === undefined}
-        <div class="card2 bg-base-200 p-4">
-          <span class="text-error">Member list not available from this space</span>
-        </div>
-      {:else if $members.length === 0}
+      {#if $members.length === 0}
        <div class="card2 bg-base-200 p-4">
          <span class="text-base-content/70">No members yet</span>
        </div>
      {:else}
-        {#each $members as pubkey (pubkey)}
-          <div class="card2 card2-sm bg-alt relative">
-            <div class="flex items-center justify-between gap-2">
-              <div class="min-w-0 flex-1">
-                <Profile {pubkey} {url} />
-              </div>
-              {#if canBan || canUnallow}
-                <div class="relative">
-                  <Button
-                    class="btn btn-circle btn-ghost btn-sm"
-                    onclick={() => toggleMenu(pubkey)}>
-                    <Icon icon={MenuDots} />
-                  </Button>
-                  {#if menuPubkey === pubkey}
-                    <Popover hideOnClick onClose={closeMenu}>
-                      <ul
-                        transition:fly
-                        class="menu absolute right-0 z-popover mt-2 w-48 gap-1 rounded-box bg-base-100 p-2 shadow-md">
-                        {#if canUnallow}
-                          <li>
-                            <Button onclick={() => unallowMember(pubkey)}>
-                              <Icon icon={UserMinus} />
-                              Remove User
-                            </Button>
-                          </li>
-                        {/if}
-                        {#if canBan}
-                          <li>
-                            <Button class="text-error" onclick={() => banMember(pubkey)}>
-                              <Icon icon={MinusCircle} />
-                              Ban User
-                            </Button>
-                          </li>
-                        {/if}
-                      </ul>
-                    </Popover>
+        {#each $memberGroups as group (group.key)}
+          <div class="pt-2 pb-1">
+            {#if group.role}
+              <RoleBadge role={group.role} class="badge-md" />
+            {:else}
+              <span class="text-sm font-semibold opacity-75">Members</span>
+            {/if}
+          </div>
+          {#each group.members as member (member.pubkey)}
+            <div class="card2 card2-sm bg-alt relative">
+              <div class="flex items-center justify-between gap-2">
+                <div class="min-w-0 flex-1">
+                  <Profile pubkey={member.pubkey} {url} />
+                  {#if member.roles.length > 0}
+                    <div class="mt-1 flex flex-wrap gap-1">
+                      {#each member.roles as role (role.name)}
+                        <RoleBadge {role} />
+                      {/each}
+                    </div>
                  {/if}
                </div>
-              {/if}
+                {#if canBan || canUnallow}
+                  <div class="relative">
+                    <Button
+                      class="btn btn-circle btn-ghost btn-sm"
+                      onclick={() => toggleMenu(member.pubkey)}>
+                      <Icon icon={MenuDots} />
+                    </Button>
+                    {#if menuPubkey === member.pubkey}
+                      <Popover hideOnClick onClose={closeMenu}>
+                        <ul
+                          transition:fly
+                          class="menu absolute right-0 z-popover mt-2 w-48 gap-1 rounded-box bg-base-100 p-2 shadow-md">
+                          {#if canUnallow}
+                            <li>
+                              <Button onclick={() => unallowMember(member.pubkey)}>
+                                <Icon icon={UserMinus} />
+                                Remove User
+                              </Button>
+                            </li>
+                          {/if}
+                          {#if canBan}
+                            <li>
+                              <Button class="text-error" onclick={() => banMember(member.pubkey)}>
+                                <Icon icon={MinusCircle} />
+                                Ban User
+                              </Button>
+                            </li>
+                          {/if}
+                        </ul>
+                      </Popover>
+                    {/if}
+                  </div>
+                {/if}
+              </div>
            </div>
-          </div>
+          {/each}
        {/each}
      {/if}
    </div>
@@ -171,7 +194,7 @@
      <Icon icon={AltArrowLeft} />
      Go back
    </Button>
-    {#if $userIsAdmin}
+    {#if $canAddMember}
      <Button class="btn btn-primary" onclick={addMember}>
        <Icon icon={AddCircle} />
        Add members
@@ -16,7 +16,8 @@
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import ModalFooter from "@lib/components/ModalFooter.svelte"
  import Profile from "@app/components/Profile.svelte"
-  import {deriveSpaceBannedPubkeyItems, deriveSupportedMethods} from "@app/core/state"
+  import {deriveSupportedMethods} from "@app/core/roles"
+  import {deriveSpaceBannedPubkeyItems} from "@app/core/state"
  import {addSpaceMembers} from "@app/core/commands"
  import {pushToast} from "@app/util/toast"

@@ -40,6 +40,7 @@
  import SpaceMenuRoomItem from "@app/components/SpaceMenuRoomItem.svelte"
  import VoiceWidget from "@app/components/VoiceWidget.svelte"
  import SocketStatusIndicator from "@app/components/SocketStatusIndicator.svelte"
+  import {deriveUserIsSpaceAdmin} from "@app/core/roles"
  import {
    ENABLE_ZAPS,
    CONTENT_KINDS,
@@ -50,7 +51,6 @@
    userSpaceUrls,
    hasNip29,
    deriveUserCanCreateRoom,
-    deriveUserIsSpaceAdmin,
    deriveEventsForUrl,
    deriveSpaceActionItems,
    notificationSettings,
@@ -46,7 +46,7 @@
        </div>
      {/if}
      {#if Array.isArray(supported_nips)}
-        <p class="badge badge-neutral">
+        <p class="badge badge-neutral text-wrap h-auto">
          <span class="ellipsize">Supported NIPs: {supported_nips.join(", ")}</span>
        </p>
      {/if}
@@ -2,9 +2,10 @@
  import {tick} from "svelte"
  import {debounce} from "throttle-debounce"
  import {request} from "@welshman/net"
-  import {formatTimestampAsDate, groupBy, now, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
+  import {repository, tracker} from "@welshman/app"
+  import {formatTimestampAsDate, groupBy, uniqBy, now, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
  import type {TrustedEvent, Filter} from "@welshman/util"
-  import {sortEventsDesc} from "@welshman/util"
+  import {MESSAGE, sortEventsDesc} from "@welshman/util"
  import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
  import Magnifier from "@assets/icons/magnifier.svg?dataurl"
  import {fly} from "@lib/transition"
@@ -53,8 +54,11 @@

  const getFilter = (searchTerm: string): Filter =>
    h
-      ? {kinds: CONTENT_KINDS, "#h": [h], search: searchTerm}
-      : {kinds: CONTENT_KINDS, search: searchTerm}
+      ? {kinds: [MESSAGE, ...CONTENT_KINDS], "#h": [h], search: searchTerm}
+      : {kinds: [MESSAGE, ...CONTENT_KINDS], search: searchTerm}
+
+  const getLocalResults = (filter: Filter) =>
+    repository.query([filter]).filter(event => tracker.getRelays(event.id).has(url))

  const search = debounce(300, async (searchTerm: string) => {
    controller?.abort()
@@ -68,18 +72,23 @@
    controller = new AbortController()
    loading = true

+    const filter = getFilter(searchTerm.trim())
+    const localResults = getLocalResults(filter)
+
+    results = sortEventsDesc(localResults)
+
    try {
      const events = await request({
        relays: getRelayUrls(),
        autoClose: true,
        signal: controller.signal,
-        filters: [getFilter(searchTerm.trim())],
+        filters: [filter],
      })

-      results = sortEventsDesc(events)
+      results = sortEventsDesc(uniqBy((e: TrustedEvent) => e.id, [...events, ...localResults]))
    } catch (error) {
      if (!(error instanceof DOMException && error.name === "AbortError")) {
-        results = []
+        results = sortEventsDesc(localResults)
      }
    } finally {
      loading = false
@@ -0,0 +1,576 @@
+import {derived, readable, type Readable} from "svelte/store"
+import {first, memoize, removeUndefined, simpleCache, sortBy, uniq} from "@welshman/lib"
+import {pubkey, manageRelay} from "@welshman/app"
+import {deriveEventsForUrl} from "@app/core/state"
+import {
+  ManagementMethod,
+  ROOM_ADD_MEMBER,
+  ROOM_REMOVE_MEMBER,
+  ROOM_EDIT_META,
+  ROOM_DELETE_EVENT,
+  ROOM_ADMINS,
+  ROOM_MEMBERS,
+  getTagValue,
+  isRelayUrl,
+} from "@welshman/util"
+import type {TrustedEvent} from "@welshman/util"
+
+export const ROOM_ROLES = 39003
+
+export const ROOM_PERMISSION_ADD_MEMBER = ROOM_ADD_MEMBER
+export const ROOM_PERMISSION_REMOVE_MEMBER = ROOM_REMOVE_MEMBER
+export const ROOM_PERMISSION_EDIT_META = ROOM_EDIT_META
+export const ROOM_PERMISSION_DELETE_EVENT = ROOM_DELETE_EVENT
+export const ROOM_PERMISSION_BAN_USER = 9009
+
+const ALL_ROOM_PERMISSIONS = [
+  ROOM_PERMISSION_ADD_MEMBER,
+  ROOM_PERMISSION_REMOVE_MEMBER,
+  ROOM_PERMISSION_EDIT_META,
+  ROOM_PERMISSION_DELETE_EVENT,
+  ROOM_PERMISSION_BAN_USER,
+]
+
+export const deriveSupportedMethods = simpleCache(([url]: [string]) =>
+  readable<ManagementMethod[]>([], set => {
+    manageRelay(url, {
+      method: ManagementMethod.SupportedMethods,
+      params: [],
+    }).then(({result = []}) => set(result))
+  }),
+)
+
+export type RoleAccess = "read" | "write" | "join"
+
+export type RoleDefinition = {
+  name: string
+  label?: string
+  color?: number
+  order?: number
+  permissions: number[]
+  access: Set<RoleAccess>
+}
+
+export type RoomRoles = {
+  url: string
+  h: string
+  roles: Map<string, RoleDefinition>
+}
+
+export type RoomMember = {
+  pubkey: string
+  roles: string[]
+}
+
+type MemberRoleInfo = {
+  pubkey: string
+  roles: RoleDefinition[]
+  primaryRole?: RoleDefinition
+}
+
+type MemberRoleGroup = {
+  key: string
+  role?: RoleDefinition
+  members: MemberRoleInfo[]
+}
+
+type ParsedRoleState = {
+  roles: Map<string, RoleDefinition>
+  hasPermissionTags: boolean
+}
+
+type SpaceRoleState = {
+  hasPermissionTags: boolean
+  userPermissions: Set<number>
+  memberRoles: Map<string, RoleDefinition[]>
+}
+
+const makeRoleDefinition = (name: string): RoleDefinition => ({
+  name,
+  permissions: [],
+  access: new Set<RoleAccess>(),
+})
+
+const ensureRole = (roles: Map<string, RoleDefinition>, roleName: string) => {
+  if (!roles.has(roleName)) {
+    roles.set(roleName, makeRoleDefinition(roleName))
+  }
+
+  return roles.get(roleName)!
+}
+
+const asNumber = (value: string | undefined) => {
+  const n = parseInt(value || "")
+
+  return isNaN(n) ? undefined : n
+}
+
+const asAccess = (value: string | undefined): RoleAccess | undefined => {
+  if (value === "read" || value === "write" || value === "join") {
+    return value
+  }
+}
+
+const parseRoleState = (event?: TrustedEvent): ParsedRoleState => {
+  const roles = new Map<string, RoleDefinition>()
+  let hasPermissionTags = false
+  let activeRoleName: string | undefined
+
+  for (const tag of event?.tags || []) {
+    const [name, firstValue, secondValue] = tag
+
+    if (name === "role") {
+      if (firstValue) {
+        activeRoleName = firstValue
+        ensureRole(roles, firstValue)
+      }
+
+      continue
+    }
+
+    if (
+      !["role-label", "role-color", "role-order", "role-permission", "role-access"].includes(name)
+    ) {
+      continue
+    }
+
+    const hasExplicitRole = Boolean(firstValue && secondValue !== undefined)
+    const roleName = hasExplicitRole ? firstValue : activeRoleName
+    const value = hasExplicitRole ? secondValue : firstValue
+
+    if (!roleName || !value) {
+      continue
+    }
+
+    const role = ensureRole(roles, roleName)
+
+    if (name === "role-label") {
+      role.label = value
+      continue
+    }
+
+    if (name === "role-color") {
+      const color = asNumber(value)
+
+      if (color !== undefined && color >= 0 && color <= 255) {
+        role.color = color
+      }
+
+      continue
+    }
+
+    if (name === "role-order") {
+      const order = asNumber(value)
+
+      if (order !== undefined) {
+        role.order = order
+      }
+
+      continue
+    }
+
+    if (name === "role-permission") {
+      const permission = asNumber(value)
+
+      hasPermissionTags = true
+
+      if (permission !== undefined && !role.permissions.includes(permission)) {
+        role.permissions.push(permission)
+      }
+
+      continue
+    }
+
+    if (name === "role-access") {
+      const access = asAccess(value)
+
+      if (access) {
+        role.access.add(access)
+      }
+    }
+  }
+
+  return {roles, hasPermissionTags}
+}
+
+const getRoleTokens = (tag: string[]) => {
+  const roles: string[] = []
+
+  for (const value of tag.slice(2)) {
+    if (!value || isRelayUrl(value)) {
+      continue
+    }
+
+    roles.push(value)
+  }
+
+  return uniq(roles)
+}
+
+export const parseRoomMembers = (tags: string[][]) => {
+  const byPubkey = new Map<string, Set<string>>()
+
+  for (const tag of tags) {
+    if (tag[0] !== "p" || !tag[1]) {
+      continue
+    }
+
+    if (!byPubkey.has(tag[1])) {
+      byPubkey.set(tag[1], new Set<string>())
+    }
+
+    const roles = byPubkey.get(tag[1])!
+
+    for (const role of getRoleTokens(tag)) {
+      roles.add(role)
+    }
+  }
+
+  return Array.from(byPubkey.entries()).map(([pubkey, roles]) => ({
+    pubkey,
+    roles: Array.from(roles),
+  }))
+}
+
+export const deriveRoomMembers = (url: string, h: string) =>
+  derived(deriveEventsForUrl(url, [{kinds: [ROOM_MEMBERS], "#d": [h]}]), ([event]) =>
+    parseRoomMembers(event?.tags || []),
+  )
+
+export const deriveRoomAdmins = (url: string, h: string) =>
+  derived(deriveEventsForUrl(url, [{kinds: [ROOM_ADMINS], "#d": [h]}]), ([event]) =>
+    parseRoomMembers(event?.tags || []),
+  )
+
+const deriveRoomRoleState = simpleCache(([url, h]: [string, string]) =>
+  derived(deriveEventsForUrl(url, [{kinds: [ROOM_ROLES], "#d": [h]}]), ([event]) =>
+    parseRoleState(event),
+  ),
+)
+
+export const deriveRoomRoles = (url: string, h: string) =>
+  derived(deriveRoomRoleState(url, h), $state => ({
+    url,
+    h,
+    roles: $state.roles,
+  }))
+
+const getMember = (members: RoomMember[], targetPubkey: string) =>
+  members.find(member => member.pubkey === targetPubkey)
+
+const getResolvedRoles = (rolesByName: Map<string, RoleDefinition>, roleNames: string[]) =>
+  removeUndefined(roleNames.map(name => rolesByName.get(name)))
+
+export const sortRolesDesc = <T extends {order?: number}>(items: T[]) =>
+  sortBy(item => -(item.order ?? -Infinity), items)
+
+export const getRolePermissionsLabel = (role: RoleDefinition) => role.permissions.join(", ")
+
+export const getRoleAccessLabel = (role: RoleDefinition) => Array.from(role.access).join(", ")
+
+const toMemberRoleInfo = (pubkey: string, roles: RoleDefinition[]): MemberRoleInfo => {
+  const sortedRoles = sortRolesDesc(roles)
+
+  return {
+    pubkey,
+    roles: sortedRoles,
+    primaryRole: first(sortedRoles),
+  }
+}
+
+const sortMemberRoleInfos = (members: MemberRoleInfo[]) =>
+  sortBy(member => -(member.primaryRole?.order ?? -Infinity), members)
+
+const groupMemberRoleInfos = (members: MemberRoleInfo[]) => {
+  const byRole = new Map<string, MemberRoleGroup>()
+  const ungrouped: MemberRoleGroup = {
+    key: "members",
+    members: [],
+  }
+
+  for (const member of sortMemberRoleInfos(members)) {
+    if (!member.primaryRole) {
+      ungrouped.members.push(member)
+      continue
+    }
+
+    const key = member.primaryRole.name
+
+    if (!byRole.has(key)) {
+      byRole.set(key, {
+        key,
+        role: member.primaryRole,
+        members: [],
+      })
+    }
+
+    byRole.get(key)!.members.push(member)
+  }
+
+  const groups = sortBy(group => -(group.role?.order ?? -Infinity), Array.from(byRole.values()))
+
+  if (ungrouped.members.length > 0) {
+    groups.push(ungrouped)
+  }
+
+  return groups
+}
+
+const deriveRoomRoleAssignments = simpleCache(([url, h]: [string, string]) =>
+  derived(
+    [deriveRoomRoleState(url, h), deriveRoomMembers(url, h), deriveRoomAdmins(url, h)],
+    ([$rolesState, $members, $admins]) => ({
+      rolesState: $rolesState,
+      members: $members,
+      admins: $admins,
+    }),
+  ),
+)
+
+export const deriveUserRoles = (url: string, h: string, targetPubkey: string) =>
+  derived(deriveRoomRoleAssignments(url, h), ({members, admins}) => {
+    const member = getMember(members, targetPubkey)
+    const admin = getMember(admins, targetPubkey)
+
+    return uniq([...(member?.roles || []), ...(admin?.roles || [])])
+  })
+
+export const deriveUserPermissions = (url: string, h: string) =>
+  derived(
+    [pubkey, deriveRoomRoleAssignments(url, h)],
+    ([$pubkey, {rolesState, members, admins}]) => {
+      const permissions = new Set<number>()
+
+      if (!$pubkey) {
+        return permissions
+      }
+
+      const member = getMember(members, $pubkey)
+      const admin = getMember(admins, $pubkey)
+      const assignedRoleNames = uniq([...(member?.roles || []), ...(admin?.roles || [])])
+
+      if (!rolesState.hasPermissionTags) {
+        if (admin) {
+          for (const permission of ALL_ROOM_PERMISSIONS) {
+            permissions.add(permission)
+          }
+        }
+
+        return permissions
+      }
+
+      for (const role of getResolvedRoles(rolesState.roles, assignedRoleNames)) {
+        for (const permission of role.permissions) {
+          permissions.add(permission)
+        }
+      }
+
+      return permissions
+    },
+  )
+
+const mergeRoleDefinitions = (left: RoleDefinition[], right: RoleDefinition[]) => {
+  const merged = new Map<string, RoleDefinition>()
+
+  for (const role of [...left, ...right]) {
+    if (!merged.has(role.name)) {
+      merged.set(role.name, {
+        name: role.name,
+        label: role.label,
+        color: role.color,
+        order: role.order,
+        permissions: [...role.permissions],
+        access: new Set(role.access),
+      })
+
+      continue
+    }
+
+    const existing = merged.get(role.name)!
+
+    if (existing.label === undefined) {
+      existing.label = role.label
+    }
+
+    if (existing.color === undefined) {
+      existing.color = role.color
+    }
+
+    if (existing.order === undefined) {
+      existing.order = role.order
+    }
+
+    existing.permissions = uniq([...existing.permissions, ...role.permissions])
+
+    for (const access of role.access) {
+      existing.access.add(access)
+    }
+  }
+
+  return sortBy(role => role.name, Array.from(merged.values()))
+}
+
+const deriveSpaceRoleState = simpleCache(([url]: [string]) =>
+  derived(
+    [pubkey, deriveEventsForUrl(url, [{kinds: [ROOM_ROLES, ROOM_MEMBERS, ROOM_ADMINS]}])],
+    ([$pubkey, $events]): SpaceRoleState => {
+      const userPermissions = new Set<number>()
+      const memberRoles = new Map<string, RoleDefinition[]>()
+      const rolesByH = new Map<string, ReturnType<typeof parseRoleState>>()
+      let hasPermissionTags = false
+
+      for (const event of $events) {
+        if (event.kind === ROOM_ROLES) {
+          const h = getTagValue("d", event.tags)
+          if (h) {
+            const parsed = parseRoleState(event)
+            rolesByH.set(h, parsed)
+            if (parsed.hasPermissionTags) {
+              hasPermissionTags = true
+            }
+          }
+        }
+      }
+
+      for (const event of $events) {
+        if (event.kind === ROOM_MEMBERS || event.kind === ROOM_ADMINS) {
+          const h = getTagValue("d", event.tags)
+          if (!h) continue
+
+          const rolesState = rolesByH.get(h)
+          if (!rolesState) continue
+
+          const members = parseRoomMembers(event.tags)
+          for (const member of members) {
+            const resolvedRoles = getResolvedRoles(rolesState.roles, member.roles)
+
+            if (resolvedRoles.length === 0) {
+              continue
+            }
+
+            memberRoles.set(
+              member.pubkey,
+              mergeRoleDefinitions(memberRoles.get(member.pubkey) || [], resolvedRoles),
+            )
+
+            if ($pubkey === member.pubkey && rolesState.hasPermissionTags) {
+              for (const role of resolvedRoles) {
+                for (const permission of role.permissions) {
+                  userPermissions.add(permission)
+                }
+              }
+            }
+          }
+        }
+      }
+
+      return {
+        hasPermissionTags,
+        userPermissions,
+        memberRoles,
+      }
+    },
+  ),
+)
+
+export const deriveUserIsSpaceAdmin = memoize((url?: string) => {
+  if (!url) {
+    return readable(false)
+  }
+
+  return derived(
+    [deriveSpaceRoleState(url), deriveSupportedMethods(url)],
+    ([$spaceRoleState, $supportedMethods]) => {
+      if ($spaceRoleState.hasPermissionTags) {
+        return $spaceRoleState.userPermissions.size > 0
+      }
+
+      return $supportedMethods.length > 0
+    },
+  )
+})
+
+export const deriveUserSpacePermissions = (url: string) =>
+  derived(
+    [deriveSpaceRoleState(url), deriveUserIsSpaceAdmin(url)],
+    ([$spaceRoleState, $isAdmin]) => {
+      const permissions = new Set<number>()
+
+      if ($spaceRoleState.hasPermissionTags) {
+        for (const permission of $spaceRoleState.userPermissions) {
+          permissions.add(permission)
+        }
+
+        return permissions
+      }
+
+      if ($isAdmin) {
+        for (const permission of ALL_ROOM_PERMISSIONS) {
+          permissions.add(permission)
+        }
+      }
+
+      return permissions
+    },
+  )
+
+export const deriveUserHasSpacePermission = (url: string, kind: number) =>
+  derived(deriveUserSpacePermissions(url), $permissions => $permissions.has(kind))
+
+export const deriveUserIsRoomAdmin = (url: string, h: string) =>
+  derived(
+    [deriveUserPermissions(url, h), deriveUserIsSpaceAdmin(url)],
+    ([$permissions, $isSpaceAdmin]) => $isSpaceAdmin || $permissions.size > 0,
+  )
+
+export const deriveHasPermission = (url: string, h: string | undefined, kind: number) => {
+  if (!h) return deriveUserIsSpaceAdmin(url)
+
+  return derived(
+    [deriveUserPermissions(url, h), deriveUserIsSpaceAdmin(url)],
+    ([$permissions, $isSpaceAdmin]) => $isSpaceAdmin || $permissions.has(kind),
+  )
+}
+
+export const deriveRoomRoleDefinitions = (url: string, h: string) =>
+  derived(deriveRoomRoles(url, h), $roomRoles =>
+    sortRolesDesc(Array.from($roomRoles.roles.values())),
+  )
+
+const deriveRoomMemberRoleInfo = (url: string, h: string) =>
+  derived([deriveRoomMembers(url, h), deriveRoomRoles(url, h)], ([$members, $roomRoles]) =>
+    sortMemberRoleInfos(
+      $members.map(member =>
+        toMemberRoleInfo(member.pubkey, getResolvedRoles($roomRoles.roles, member.roles)),
+      ),
+    ),
+  )
+
+export const deriveGroupedRoomMembers = (url: string, h: string) =>
+  derived(deriveRoomMemberRoleInfo(url, h), $members => groupMemberRoleInfos($members))
+
+const deriveSpaceMemberRoleInfo = (url: string) =>
+  derived(deriveSpaceRoleState(url), $spaceRoleState => {
+    const roleInfoByPubkey = new Map<string, MemberRoleInfo>()
+
+    for (const [pubkey, roles] of $spaceRoleState.memberRoles.entries()) {
+      roleInfoByPubkey.set(pubkey, toMemberRoleInfo(pubkey, roles))
+    }
+
+    return roleInfoByPubkey
+  })
+
+export const deriveSpaceMemberRoles = (url: string, targetPubkey: string) =>
+  derived(
+    deriveSpaceMemberRoleInfo(url),
+    $spaceMemberRoles => $spaceMemberRoles.get(targetPubkey)?.roles || [],
+  )
+
+export const deriveGroupedSpaceMembers = (url: string, members: Readable<string[]>) =>
+  derived([members, deriveSpaceMemberRoleInfo(url)], ([$members, $spaceMemberRoles]) =>
+    groupMemberRoleInfos(
+      $members.map(pubkey => $spaceMemberRoles.get(pubkey) || toMemberRoleInfo(pubkey, [])),
+    ),
+  )
+
+export const roleColorToCSS = (hue: number) => `oklch(0.75 0.15 ${(hue * 360) / 255})`
@@ -20,7 +20,6 @@ import {
  partition,
  shuffle,
  parseJson,
-  memoize,
  addToMapKey,
  identity,
  always,
@@ -84,7 +83,6 @@ import {
  ROOM_JOIN,
  ROOM_LEAVE,
  ROOM_MEMBERS,
-  ROOM_ADMINS,
  ROOM_META,
  ROOM_DELETE,
  ROOM_REMOVE_MEMBER,
@@ -152,6 +150,18 @@ import {
 } from "@welshman/app"
 import {checkRelayHasLivekit} from "$lib/livekit"
 import {readFeed} from "@lib/feeds"
+import {
+  parseRoomMembers,
+  deriveRoomMembers,
+  deriveUserIsSpaceAdmin,
+  deriveUserIsRoomAdmin,
+  deriveUserSpacePermissions,
+  ROOM_PERMISSION_ADD_MEMBER,
+  ROOM_PERMISSION_REMOVE_MEMBER,
+  ROOM_PERMISSION_DELETE_EVENT,
+  ROOM_PERMISSION_BAN_USER,
+} from "@app/core/roles"
+import type {RoomMember} from "@app/core/roles"

 export const fromCsv = (s: string) => (s || "").split(",").filter(identity)

@@ -813,14 +823,6 @@ export const deriveSpaceMembers = (url: string) =>
    uniq(getTagValues("member", event?.tags ?? [])),
  )

-export const deriveRoomMembers = (url: string, h: string) => {
-  const filters: Filter[] = [{kinds: [ROOM_MEMBERS], "#d": [h]}]
-
-  return derived(deriveEventsForUrl(url, filters), ([event]) =>
-    uniq(getPubkeyTagValues(event?.tags ?? [])),
-  )
-}
-
 export type BannedPubkeyItem = {
  pubkey: string
  reason: string
@@ -839,20 +841,6 @@ export const deriveSpaceBannedPubkeyItems = (url: string) => {
  return store
 }

-export const deriveRoomAdmins = (url: string, h: string) => {
-  const filters: Filter[] = [{kinds: [ROOM_ADMINS], "#d": [h]}]
-
-  return derived(deriveEventsForUrl(url, filters), $events => {
-    const adminsEvent = first($events)
-
-    if (adminsEvent) {
-      return getPubkeyTagValues(adminsEvent.tags)
-    }
-
-    return []
-  })
-}
-
 const getRoomMembers = (_url: string, h: string, events: TrustedEvent[]) => {
  const members = new Set<string>()

@@ -860,8 +848,8 @@ const getRoomMembers = (_url: string, h: string, events: TrustedEvent[]) => {
    if (event.kind === ROOM_MEMBERS && getTagValue("d", event.tags) === h) {
      members.clear()

-      for (const pubkey of uniq(getPubkeyTagValues(event.tags))) {
-        members.add(pubkey)
+      for (const member of parseRoomMembers(event.tags)) {
+        members.add(member.pubkey)
      }

      continue
@@ -894,16 +882,31 @@ const getRoomMembers = (_url: string, h: string, events: TrustedEvent[]) => {

 export const deriveSpaceActionItems = (url: string) =>
  derived(
-    deriveEventsForUrl(url, [
-      {
-        kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER],
-      },
-    ]),
-    $events => {
+    [
+      deriveEventsForUrl(url, [
+        {
+          kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER],
+        },
+      ]),
+      deriveUserIsSpaceAdmin(url),
+      deriveUserSpacePermissions(url),
+    ],
+    ([$events, $isAdmin, $permissions]) => {
+      if (!$isAdmin) {
+        return []
+      }
+
      const getRoomId = (e: TrustedEvent) =>
        getTagValue(e.kind === ROOM_MEMBERS ? "d" : "h", e.tags)
      const reports = $events.filter(e => e.kind === REPORT)
      const pendingJoins: TrustedEvent[] = []
+      const canReviewReports =
+        $permissions.has(ROOM_PERMISSION_DELETE_EVENT) || $permissions.size === 0
+      const canReviewJoins =
+        $permissions.has(ROOM_PERMISSION_ADD_MEMBER) ||
+        $permissions.has(ROOM_PERMISSION_REMOVE_MEMBER) ||
+        $permissions.has(ROOM_PERMISSION_BAN_USER) ||
+        $permissions.size === 0

      // Room-level join requests — most recent per pubkey+h
      for (const [h, roomEvents] of groupBy(getRoomId, $events)) {
@@ -960,7 +963,10 @@ export const deriveSpaceActionItems = (url: string) =>
        )
      }

-      return sortEventsDesc([...reports, ...pendingJoins])
+      return sortEventsDesc([
+        ...(canReviewReports ? reports : []),
+        ...(canReviewJoins ? pendingJoins : []),
+      ])
    },
  )

@@ -972,18 +978,6 @@ export enum MembershipStatus {
  Granted,
 }

-export const deriveUserIsSpaceAdmin = memoize((url?: string) => {
-  const store = writable(false)
-
-  if (url) {
-    manageRelay(url, {method: ManagementMethod.SupportedMethods, params: []}).then(res =>
-      store.set(Boolean(res.result?.length)),
-    )
-  }
-
-  return store
-})
-
 export const deriveUserSpaceMembershipStatus = (url: string) => {
  // Fetch member list and user add/remove events directly in this derivation.
  const memberListFilters: Filter[] = [{kinds: [RELAY_MEMBERS]}]
@@ -1046,12 +1040,6 @@ export const deriveUserSpaceMembershipStatus = (url: string) => {
  )
 }

-export const deriveUserIsRoomAdmin = (url: string, h: string) =>
-  derived(
-    [pubkey, deriveRoomAdmins(url, h), deriveUserIsSpaceAdmin(url)],
-    ([$pubkey, $admins, $isSpaceAdmin]) => $isSpaceAdmin || $admins.includes($pubkey!),
-  )
-
 export const deriveUserRoomMembershipStatus = (url: string, h: string) => {
  // Fetch the room member list and the current user's add/remove events.
  const userEventFilters: Filter[] = [{kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [h]}]
@@ -1075,7 +1063,7 @@ export const deriveUserRoomMembershipStatus = (url: string, h: string) => {

      if ($memberList) {
        // Member list exists - check if user is in it.
-        isMember = $memberList.includes($pubkey!)
+        isMember = $memberList.some((member: RoomMember) => member.pubkey === $pubkey)
      } else {
        // No member list available - replay the user's add/remove history.
        for (const event of sortEventsAsc($userAddRemoveEvents)) {
@@ -1312,15 +1300,6 @@ export const deriveSocketStatus = (url: string) =>
    }),
  )

-export const deriveSupportedMethods = simpleCache(([url]: [string]) => {
-  return readable<ManagementMethod[]>([], set => {
-    manageRelay(url, {
-      method: ManagementMethod.SupportedMethods,
-      params: [],
-    }).then(({result = []}) => set(result))
-  })
-})
-
 export const deriveHasLivekit = simpleCache(([url]: [string]) =>
  readable<boolean | undefined>(undefined, set => {
    checkRelayHasLivekit(url).then(has => set(has))
@@ -55,6 +55,7 @@ import {
  makeCommentFilter,
  loadFeedsForPubkey,
 } from "@app/core/state"
+import {ROOM_ROLES} from "@app/core/roles"
 import {hasBlossomSupport} from "@app/core/commands"
 import {LIVEKIT_PARTICIPANTS} from "@app/call/voice"

@@ -271,7 +272,7 @@ const syncSpace = (url: string) => {
  const since = ago(WEEK)
  const controller = new AbortController()
  const relayKinds = [RELAY_MEMBERS]
-  const roomMetaKinds = [ROOM_META, ROOM_ADMINS, ROOM_MEMBERS, LIVEKIT_PARTICIPANTS]
+  const roomMetaKinds = [ROOM_META, ROOM_ROLES, ROOM_ADMINS, ROOM_MEMBERS, LIVEKIT_PARTICIPANTS]
  const roomDeleteKinds = [ROOM_DELETE, ROOM_JOIN, ROOM_LEAVE]

  pullAndListen({
@@ -0,0 +1,11 @@
+export const POMADE_INVALID_LOGIN_MESSAGE = "Invalid login information"
+export const POMADE_NETWORK_ERROR_MESSAGE = "Network error, please try again"
+
+type PomadeMessage = {
+  res?: unknown
+}
+
+export const getPomadeLoginFailureMessage = (messages: PomadeMessage[]) =>
+  messages.some(message => message.res !== undefined)
+    ? POMADE_INVALID_LOGIN_MESSAGE
+    : POMADE_NETWORK_ERROR_MESSAGE
@@ -47,6 +47,7 @@ import {
 } from "@welshman/app"
 import type {Unsubscriber} from "svelte/store"
 import {db} from "@app/core/storage"
+import {ROOM_ROLES} from "@app/core/roles"

 // Shared interval for all non-critical store flushes, so they batch on the same cadence
 const FLUSH_INTERVAL = 3000
@@ -65,6 +66,7 @@ const kinds = {
  alert: [ALERT_STATUS, ALERT_EMAIL, ALERT_WEB, ALERT_IOS, ALERT_ANDROID],
  space: [RELAY_ADD_MEMBER, RELAY_REMOVE_MEMBER, RELAY_MEMBERS, RELAY_JOIN, RELAY_LEAVE],
  room: [
+    ROOM_ROLES,
    ROOM_META,
    ROOM_DELETE,
    ROOM_ADMINS,
@@ -31,6 +31,7 @@
 <svelte:document onmousemove={onMouseMove} />

 <Tippy
+  class="flex"
  bind:popover
  component={EmojiPicker}
  props={{onClick}}
@@ -10,6 +10,7 @@

 <script lang="ts">
  import "emoji-picker-element"
+  import emojiDataUrl from "emoji-picker-element-data/en/emojibase/data.json?url"
  import type {Emoji} from "emoji-picker-element/shared"
  import {onMount} from "svelte"

@@ -26,4 +27,4 @@
  })
 </script>

-<emoji-picker bind:this={element} class="m-auto"></emoji-picker>
+<emoji-picker bind:this={element} data-source={emojiDataUrl} class="m-auto"></emoji-picker>
@@ -9,16 +9,22 @@
  const {...props}: Props = $props()
 </script>

-<div class="grid grid-cols-1 gap-2 lg:gap-6 lg:grid-cols-3 {props.class}">
-  <label class="flex items-center gap-2 font-bold">
-    {@render props.label?.()}
-  </label>
-  <div class="col-span-2 flex items-center gap-2">
-    {@render props.input?.()}
-  </div>
-  <p class="flex-end text-sm opacity-50 lg:col-span-3">
-    {#if props.info}
-      {@render props.info?.()}
+<div class="flex flex-col gap-2 {props.class}">
+  <div class="flex items-center justify-between w-full gap-2">
+    {#if props.label}
+      <label class="flex items-center gap-2 min-w-[30%] max-w-[80%] md:max-w-none">
+        {@render props.label()}
+      </label>
    {/if}
-  </p>
+    <div class="flex items-center gap-2 justify-end grow">
+      {#if props.input}
+        {@render props.input()}
+      {/if}
+    </div>
+  </div>
+  {#if props.info}
+    <p class="text-sm opacity-50">
+      {@render props.info()}
+    </p>
+  {/if}
 </div>
@@ -13,7 +13,12 @@
    placeholder?: string
  }

-  let {value = $bindable(), addLabel, placeholder = "Enter text..."}: Props = $props()
+  let {
+    value = $bindable(),
+    addLabel,
+    placeholder = "Enter text...",
+    allowAdd = true,
+  }: Props & {allowAdd?: boolean} = $props()
  let draggedIndex: number | null = $state(null)

  const onChange = (newValue: string[]) => {
@@ -72,12 +77,14 @@
      </div>
    </div>
  {/each}
-  <Button onclick={addItem} class="btn btn-link w-fit px-0">
-    <Icon icon={AddCircle} size={5} />
-    {#if addLabel}
-      {@render addLabel?.()}
-    {:else}
-      Add Item
-    {/if}
-  </Button>
+  {#if allowAdd}
+    <Button onclick={addItem} class="btn btn-link w-fit px-0">
+      <Icon icon={AddCircle} size={5} />
+      {#if addLabel}
+        {@render addLabel?.()}
+      {:else}
+        Add Item
+      {/if}
+    </Button>
+  {/if}
 </div>
@@ -13,7 +13,7 @@
  const className = $derived(
    cx(
      props.class,
-      "scroll-container z-feature flex min-h-0 w-full min-w-0 flex-1 flex-col overflow-y-auto overflow-x-hidden",
+      "scroll-container z-feature flex min-h-0 w-full min-w-0 flex-col overflow-y-auto overflow-x-hidden pb-14 md:pb-0",
    ),
  )
 </script>
@@ -5,6 +5,7 @@
  import {Badge} from "@capawesome/capacitor-badge"
  import Bell from "@assets/icons/bell.svg?dataurl"
  import {preventDefault} from "@lib/html"
+  import FieldInline from "@lib/components/FieldInline.svelte"
  import Spinner from "@lib/components/Spinner.svelte"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
@@ -63,40 +64,64 @@
      <!-- pass -->
    {:then { isSupported }}
      {#if isSupported}
-        <div class="flex justify-between">
-          <p>Show badge for unread alerts</p>
-          <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.badge} />
-        </div>
+        <FieldInline>
+          {#snippet label()}
+            <p>Show badge for unread alerts</p>
+          {/snippet}
+          {#snippet input()}
+            <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.badge} />
+          {/snippet}
+        </FieldInline>
      {/if}
    {/await}
    {#if !Capacitor.isNativePlatform()}
-      <div class="flex justify-between">
-        <p>Play sound for new activity</p>
-        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.sound} />
-      </div>
+      <FieldInline>
+        {#snippet label()}
+          <p>Play sound for new activity</p>
+        {/snippet}
+        {#snippet input()}
+          <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.sound} />
+        {/snippet}
+      </FieldInline>
    {/if}
-    <div class="flex justify-between">
-      <p>Enable push notifications</p>
-      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.push} />
-    </div>
+    <FieldInline>
+      {#snippet label()}
+        <p>Enable push notifications</p>
+      {/snippet}
+      {#snippet input()}
+        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.push} />
+      {/snippet}
+    </FieldInline>
  </div>
  <div
    class={cx("card2 bg-alt col-4 shadow-md", {
      "pointer-events-none opacity-50": !settings.badge && !settings.sound && !settings.push,
    })}>
    <strong class="text-lg">Alert Types</strong>
-    <div class="flex justify-between">
-      <p>Notify me about new activity</p>
-      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.spaces} />
-    </div>
-    <div class="flex justify-between">
-      <p>Always notify me when mentioned</p>
-      <input type="checkbox" class="toggle toggle-primary" checked={settings.mentions} />
-    </div>
-    <div class="flex justify-between">
-      <p>Notify me about new messages</p>
-      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.messages} />
-    </div>
+    <FieldInline>
+      {#snippet label()}
+        <p>Notify me about new activity</p>
+      {/snippet}
+      {#snippet input()}
+        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.spaces} />
+      {/snippet}
+    </FieldInline>
+    <FieldInline>
+      {#snippet label()}
+        <p>Always notify me when mentioned</p>
+      {/snippet}
+      {#snippet input()}
+        <input type="checkbox" class="toggle toggle-primary" checked={settings.mentions} />
+      {/snippet}
+    </FieldInline>
+    <FieldInline>
+      {#snippet label()}
+        <p>Notify me about new messages</p>
+      {/snippet}
+      {#snippet input()}
+        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.messages} />
+      {/snippet}
+    </FieldInline>
  </div>
  <div
    class="card2 bg-alt sticky -bottom-3 shadow-md flex flex-row items-center justify-between gap-4">
@@ -11,6 +11,7 @@
  import {Router} from "@welshman/router"
  import {userMuteList, tagPubkey, publishThunk, userBlossomServerList} from "@welshman/app"
  import NotesMinimalistic from "@assets/icons/notes-minimalistic.svg?dataurl"
+  import AddCircle from "@assets/icons/add-circle.svg?dataurl"
  import {preventDefault} from "@lib/html"
  import Field from "@lib/components/Field.svelte"
  import FieldInline from "@lib/components/FieldInline.svelte"
@@ -28,6 +29,10 @@
    blossomServers = getTagValues("server", getListTags($userBlossomServerList))
  }

+  const addServer = () => {
+    blossomServers = [...blossomServers, ""]
+  }
+
  const onsubmit = preventDefault(async () => {
    await publishSettings($state.snapshot(settings))

@@ -104,7 +109,7 @@
      {/snippet}
      {#snippet input()}
        <input
-          class="range range-primary"
+          class="range range-primary w-full"
          type="range"
          min="0.8"
          max="1.3"
@@ -115,13 +120,13 @@
  </div>
  <div class="card2 bg-alt col-4 shadow-md">
    <strong class="text-lg">Editor Settings</strong>
-    <FieldInline>
+    <Field>
      {#snippet label()}
        <p>Send Delay</p>
      {/snippet}
      {#snippet input()}
        <input
-          class="range range-primary"
+          class="range range-primary w-full"
          type="range"
          min="0"
          max="10000"
@@ -134,17 +139,19 @@
          {settings.send_delay === 1000 ? "second" : "seconds"}.
        </p>
      {/snippet}
-    </FieldInline>
+    </Field>
    <Field>
      {#snippet label()}
        <p>Media Server</p>
      {/snippet}
+      {#snippet secondary()}
+        <Button class="link text-sm underline flex items-center gap-1" onclick={addServer}>
+          <Icon icon={AddCircle} size={4} />
+          Add Server
+        </Button>
+      {/snippet}
      {#snippet input()}
-        <InputList bind:value={blossomServers}>
-          {#snippet addLabel()}
-            Add Server
-          {/snippet}
-        </InputList>
+        <InputList allowAdd={false} bind:value={blossomServers} />
      {/snippet}
      {#snippet info()}
        <p>Choose a media server type and url for files you upload to {PLATFORM_NAME}.</p>
@@ -1,6 +1,7 @@
 <script lang="ts">
  import ShieldMinimalistic from "@assets/icons/shield-minimalistic.svg?dataurl"
  import {preventDefault} from "@lib/html"
+  import FieldInline from "@lib/components/FieldInline.svelte"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import {pushToast} from "@app/util/toast"
@@ -11,8 +12,10 @@
    settings = {...$userSettingsValues}
  }

-  const onAuthModeChange = (e: any) => {
-    settings.auth_mode = e.target.checked ? RelayAuthMode.Aggressive : RelayAuthMode.Conservative
+  const onAuthModeChange = (e: Event) => {
+    const target = e.currentTarget as HTMLInputElement
+
+    settings.relay_auth = target.checked ? RelayAuthMode.Aggressive : RelayAuthMode.Conservative
  }

  const onsubmit = preventDefault(async () => {
@@ -30,31 +33,46 @@
      <Icon icon={ShieldMinimalistic} />
      Privacy Settings
    </strong>
-    <div class="grid grid-cols-2 gap-2">
-      <p>Authenticate with unknown relays?</p>
-      <input
-        type="checkbox"
-        class="toggle toggle-primary"
-        onchange={onAuthModeChange}
-        checked={settings.auth_mode === RelayAuthMode.Aggressive} />
-      <p class="col-span-2 text-sm opacity-70">
-        Controls whether {PLATFORM_NAME} will identify you to relays not in your lists.
-      </p>
-    </div>
-    <div class="grid grid-cols-2 gap-2">
-      <p>Report errors?</p>
-      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.report_errors} />
-      <p class="col-span-2 text-sm opacity-70">
-        Allow {PLATFORM_NAME} to send error reports to help improve the app.
-      </p>
-    </div>
-    <div class="grid grid-cols-2 gap-2">
-      <p>Report usage?</p>
-      <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.report_usage} />
-      <p class="col-span-2 text-sm opacity-70">
-        Allow {PLATFORM_NAME} to collect anonymous usage data.
-      </p>
-    </div>
+    <FieldInline>
+      {#snippet label()}
+        <p>Authenticate with unknown relays?</p>
+      {/snippet}
+      {#snippet input()}
+        <input
+          type="checkbox"
+          class="toggle toggle-primary"
+          onchange={onAuthModeChange}
+          checked={settings.relay_auth === RelayAuthMode.Aggressive} />
+      {/snippet}
+      {#snippet info()}
+        <p>Controls whether {PLATFORM_NAME} will identify you to relays not in your lists.</p>
+      {/snippet}
+    </FieldInline>
+    <FieldInline>
+      {#snippet label()}
+        <p>Report errors?</p>
+      {/snippet}
+      {#snippet input()}
+        <input
+          type="checkbox"
+          class="toggle toggle-primary"
+          bind:checked={settings.report_errors} />
+      {/snippet}
+      {#snippet info()}
+        <p>Allow {PLATFORM_NAME} to send error reports to help improve the app.</p>
+      {/snippet}
+    </FieldInline>
+    <FieldInline>
+      {#snippet label()}
+        <p>Report usage?</p>
+      {/snippet}
+      {#snippet input()}
+        <input type="checkbox" class="toggle toggle-primary" bind:checked={settings.report_usage} />
+      {/snippet}
+      {#snippet info()}
+        <p>Allow {PLATFORM_NAME} to collect anonymous usage data.</p>
+      {/snippet}
+    </FieldInline>
  </div>
  <div
    class="card2 bg-alt sticky -bottom-3 shadow-md flex flex-row items-center justify-between gap-4">
@@ -27,6 +27,7 @@
  import PasswordReset from "@app/components/PasswordReset.svelte"
  import InfoKeys from "@app/components/InfoKeys.svelte"
  import {pushModal} from "@app/util/modal"
+  import {POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
  import {clip, pushToast} from "@app/util/toast"

  const npub = nip19.npubEncode($pubkey!)
@@ -48,13 +49,24 @@
      const {ok, peersByPrefix} = await Client.requestChallenge($session!.email)

      if (!ok) {
+        console.error("Pomade challenge request failed during password reset initiation")
+
        pushToast({
          theme: "error",
-          message: "Failed to initiate password reset!",
+          message: POMADE_NETWORK_ERROR_MESSAGE,
        })
+
+        return
      }

      pushModal(PasswordReset, {peersByPrefix})
+    } catch (error) {
+      console.error(error)
+
+      pushToast({
+        theme: "error",
+        message: POMADE_NETWORK_ERROR_MESSAGE,
+      })
    } finally {
      loading = false
    }
@@ -4,6 +4,7 @@
  import {page} from "$app/stores"
  import {goto} from "$app/navigation"
  import type {Readable} from "svelte/store"
+  import {debounce} from "throttle-debounce"
  import {pubkey, publishThunk, waitForThunkError, joinRoom, leaveRoom} from "@welshman/app"
  import {now, ifLet, int, formatTimestampAsDate, ago, MINUTE} from "@welshman/lib"
  import type {MakeNonOptional} from "@welshman/lib"
@@ -244,6 +245,8 @@
  const onScroll = () => {
    if (!isProgrammaticScroll) {
      userHasScrolled = true
+      isUserScrolling = true
+      clearIsUserScrolling()
      manageScrollPosition()
    }

@@ -265,6 +268,7 @@
  let leaving = $state(false)
  let userHasScrolled = $state(false)
  let isProgrammaticScroll = $state(false)
+  let isUserScrolling = $state(false)
  let loadingBackward = $state(true)
  let loadingForward = $state(true)
  let share = $state(popKey<TrustedEvent | undefined>("share"))
@@ -278,6 +282,10 @@
  let compose: RoomCompose | undefined = $state()
  let eventToEdit: TrustedEvent | undefined = $state()

+  const clearIsUserScrolling = debounce(150, () => {
+    isUserScrolling = false
+  })
+
  const elements = $derived.by(() => {
    const elements = []
    const seen = new Set()
@@ -351,7 +359,7 @@
  })

  $effect(() => {
-    if (elements.length > 0) {
+    if (elements.length > 0 && !isUserScrolling) {
      requestAnimationFrame(manageScrollPosition)
    }
  })
@@ -4,6 +4,7 @@
  import {goto} from "$app/navigation"
  import type {Readable} from "svelte/store"
  import {readable} from "svelte/store"
+  import {debounce} from "throttle-debounce"
  import {now, int, ifLet, formatTimestampAsDate, MINUTE, ago} from "@welshman/lib"
  import type {TrustedEvent, EventContent} from "@welshman/util"
  import {makeEvent, MESSAGE, RELAY_ADD_MEMBER} from "@welshman/util"
@@ -139,6 +140,8 @@
  const onScroll = () => {
    if (!isProgrammaticScroll) {
      userHasScrolled = true
+      isUserScrolling = true
+      clearIsUserScrolling()
      manageScrollPosition()
    }

@@ -160,6 +163,7 @@
  let loadingForward = $state(true)
  let userHasScrolled = $state(false)
  let isProgrammaticScroll = $state(false)
+  let isUserScrolling = $state(false)
  let share = $state(popKey<TrustedEvent | undefined>("share"))
  let parent: TrustedEvent | undefined = $state()
  let element: HTMLElement | undefined = $state()
@@ -171,6 +175,10 @@
  let compose: RoomCompose | undefined = $state()
  let eventToEdit: TrustedEvent | undefined = $state()

+  const clearIsUserScrolling = debounce(150, () => {
+    isUserScrolling = false
+  })
+
  const elements = $derived.by(() => {
    const elements = []
    const seen = new Set()
@@ -244,7 +252,7 @@
  })

  $effect(() => {
-    if (elements.length > 0) {
+    if (elements.length > 0 && !isUserScrolling) {
      requestAnimationFrame(manageScrollPosition)
    }
  })
@@ -1,5 +1,6 @@
 <script lang="ts">
-  import Server from "@assets/icons/server.svg?dataurl"
+  import CloudCheck from "@assets/icons/cloud-check.svg?dataurl"
+  import CheckCircle from "@assets/icons/check-circle.svg?dataurl"
  import ArrowRight from "@assets/icons/arrow-right.svg?dataurl"
  import Link from "@lib/components/Link.svelte"
  import Icon from "@lib/components/Icon.svelte"
@@ -12,78 +13,91 @@
  <PageContent class="flex flex-col items-center gap-2 p-2 pt-4">
    <PageHeader>
      {#snippet title()}
-        <div>Create your own Space</div>
+        <div>Choose your Hosting Plan</div>
      {/snippet}
      {#snippet info()}
-        <p>Get started with one of our trusted partners, or learn how to host your own space.</p>
+        <p>
+          Select how you want to deploy and manage your new Space. You can always migrate later.
+        </p>
      {/snippet}
    </PageHeader>
-    <div class="grid w-full max-w-lg grid-cols-1 gap-2 lg:max-w-4xl lg:grid-cols-2">
-      <div class="card2 bg-alt flex flex-col gap-4">
-        <div class="flex flex-col gap-4">
-          <div class="flex items-center justify-between">
-            <div class="flex items-center gap-3">
-              <Icon icon={Server} />
-              <h3 class="text-lg font-bold">Self-Host your Space</h3>
+    <div class="flex w-full max-w-lg flex-col gap-4 lg:max-w-4xl">
+      <div class="grid grid-cols-1 gap-2 lg:grid-cols-2">
+        <div class="card2 bg-alt flex flex-col gap-5">
+          <div class="flex flex-col gap-3">
+            <div class="bg-primary/20 flex h-10 w-10 items-center justify-center rounded-md">
+              <Icon icon={CloudCheck} class="text-primary" />
            </div>
-            <div class="badge badge-neutral">Recommended</div>
+            <div class="flex flex-col gap-1">
+              <h3 class="text-lg font-bold">Community</h3>
+              <div class="text-xs font-semibold tracking-wider opacity-60">SELF-HOSTED</div>
+            </div>
+            <p class="text-sm opacity-70">
+              For technical users who want full control. Deploy on your own infrastructure and
+              manage your own updates and scaling.
+            </p>
          </div>
-          <ul class="flex list-inside list-disc flex-col gap-1 text-sm opacity-70">
-            <li>Unlimited customization and control</li>
-            <li>Free and open source software</li>
-            <li>Full-featured admin dashboards available</li>
-            <li>Requires some technical skills</li>
+          <ul class="flex flex-col gap-2 text-sm">
+            <li class="flex items-center gap-2">
+              <Icon icon={CheckCircle} class="opacity-60" />
+              Open source core
+            </li>
+            <li class="flex items-center gap-2">
+              <Icon icon={CheckCircle} class="opacity-60" />
+              Community support
+            </li>
+            <li class="flex items-center gap-2">
+              <Icon icon={CheckCircle} class="opacity-60" />
+              Bring your own infra
+            </li>
          </ul>
+          <Link
+            external
+            class="btn btn-neutral mt-auto"
+            href="https://gitea.coracle.social/coracle/zooid">
+            Get started
+            <Icon icon={ArrowRight} />
+          </Link>
        </div>
-        <Link external class="btn btn-primary" href="https://github.com/coracle-social/zooid">
-          Get Started
-          <Icon icon={ArrowRight} />
-        </Link>
-      </div>
-      <div class="card2 bg-alt flex flex-col gap-4">
-        <div class="flex flex-col gap-4">
-          <div class="flex items-center justify-between">
-            <div class="flex items-center gap-2">
-              <img alt="Coracle Logo" src="/coracle.png" class="h-7 w-7" />
+        <div class="card2 bg-alt border-primary flex flex-col gap-5 border">
+          <div class="flex flex-col gap-3">
+            <div class="flex items-start justify-between">
+              <img alt="Coracle Logo" src="/coracle.png" class="h-10 w-10" />
+              <div class="badge badge-primary">Recommended</div>
+            </div>
+            <div class="flex flex-col gap-1">
              <h3 class="text-lg font-bold">Coracle Hosting</h3>
+              <div class="text-xs font-semibold tracking-wider opacity-60">FULLY MANAGED</div>
            </div>
-            <div class="badge badge-neutral">Recommended</div>
+            <p class="text-sm opacity-70">
+              The premium experience. We handle the infrastructure, security updates, and scaling so
+              you can focus on your community.
+            </p>
          </div>
-          <ul class="flex list-inside list-disc flex-col gap-1 text-sm opacity-70">
-            <li>Simple setup, support included</li>
-            <li>Free and open source software — no vendor lock-in</li>
-            <li>Advanced access controls and relay policies</li>
-            <li>Full-featured admin dashboard</li>
+          <ul class="flex flex-col gap-2 text-sm">
+            <li class="flex items-center gap-2">
+              <Icon icon={CheckCircle} class="text-primary" />
+              One-click deployment
+            </li>
+            <li class="flex items-center gap-2">
+              <Icon icon={CheckCircle} class="text-primary" />
+              Automated backups & scaling
+            </li>
+            <li class="flex items-center gap-2">
+              <Icon icon={CheckCircle} class="text-primary" />
+              Priority support
+            </li>
          </ul>
+          <Link external class="btn btn-primary mt-auto" href="https://hosting.coracle.social">
+            Start for free
+            <Icon icon={ArrowRight} />
+          </Link>
        </div>
-        <Link external class="btn btn-neutral" href="https://hosting.coracle.social">
-          Get Started
-          <Icon icon={ArrowRight} />
-        </Link>
      </div>
-      <div class="card2 bg-alt flex flex-col gap-4">
-        <div class="flex flex-col gap-4">
-          <div class="self-start">
-            <img
-              alt="Relay Tools"
-              src="https://relay.tools/17.svg"
-              class="-my-20 -ml-2 hidden h-48 dark:block"
-              style="filter: contrast(50%)" />
-            <img
-              alt="Relay Tools"
-              src="https://relay.tools/19.svg"
-              class="-my-20 -ml-2 h-48 dark:hidden"
-              style="filter: contrast(50%)" />
-          </div>
-          <ul class="flex list-inside list-disc flex-col gap-1 text-sm opacity-70">
-            <li>Independently run</li>
-            <li>Customizable relay policies</li>
-            <li>Simple management dashboard</li>
-            <li>Support available</li>
-          </ul>
-        </div>
-        <Link external class="btn btn-neutral" href="https://relay.tools/signup">
-          Get Started
+      <div class="flex flex-col items-center justify-center gap-2 py-2 text-sm opacity-70">
+        <span>Want to host on other servers?</span>
+        <Link external class="link center gap-1" href="https://relay.tools/signup">
+          Other hosting options
          <Icon icon={ArrowRight} />
        </Link>
      </div>
Author	SHA1	Message	Date
Khushvendra	ba07c339eb	refactor: address PR review feedback for RBAC	2026-05-04 21:29:32 +00:00
Khushvendra	98bcf4c398	Polish RBAC role/member stores and remove state-role cycle	2026-05-04 21:29:32 +00:00
Khushvendra	7568827d71	Refactor role view models and member grouping	2026-05-04 21:29:32 +00:00
Khushvendra	9756199fdf	Address RBAC review feedback	2026-05-04 21:29:32 +00:00
Khushvendra	559db6b930	feat(rbac): implement NIP-29 room roles and permission gating (#47 )	2026-05-04 21:29:32 +00:00
Khushvendra	bbbc6f7363	fix(metadata): add case-insensitive HTML title fallback parsing for invite links (#248 ) Co-authored-by: 1amKhush <khushvendras99@gmail.com> Co-committed-by: 1amKhush <khushvendras99@gmail.com>	2026-05-04 21:02:56 +00:00
Jon Staab	8a0abacf6f	Fix padding on page content on small screens	2026-05-01 13:24:42 -07:00
Jon Staab	976ccdabd4	fix: include MESSAGE kind and local matches in space search	2026-04-28 14:44:16 -07:00
Jon Staab	99b26680b6	feat: rework hosting page to 2+1 architecture (#231 )	2026-04-28 14:42:09 -07:00
Jon Staab	c5be477855	fix: bundle emoji-picker data locally for Capacitor Android The emoji grid wasn't rendering on Android because emoji-picker-element defaults to fetching its data.json from jsdelivr, and CapacitorHttp's patched fetch breaks the library's ETag-based revalidation flow. Bundle emoji-picker-element-data via Vite's ?url import so the JSON ships as a same-origin asset. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-28 14:15:12 -07:00
deveshanim3	32c1501e9c	feat: add progress bar to signup flow (#234 ) Co-authored-by: deveshanim3 <deveshsingh6986@gmail.com> Co-committed-by: deveshanim3 <deveshsingh6986@gmail.com>	2026-04-23 15:35:59 +00:00
deveshanim3	463837e7d4	fix: restore consistent input field sizing and alignment in FieldInline (#235 ) (#238 ) Co-authored-by: deveshanim3 <deveshsingh6986@gmail.com> Co-committed-by: deveshanim3 <deveshsingh6986@gmail.com>	2026-04-20 16:26:44 +00:00
Shreyas2004wagh	d74f142cdd	Fix relay auth privacy toggle (#240 ) Co-authored-by: Shreyas2004wagh <shreyaswagh2004@gmail.com> Co-committed-by: Shreyas2004wagh <shreyaswagh2004@gmail.com>	2026-04-20 16:25:52 +00:00
Jon Staab	53954aae89	classnames tweak	2026-04-17 16:06:00 -07:00
userAdityaa	24aa62a503	chore: carify Pomade login errors with actionable invalid vs network messaging (#233 ) Co-authored-by: userAdityaa <aditya.chaudhary1558@gmail.com> Co-committed-by: userAdityaa <aditya.chaudhary1558@gmail.com>	2026-04-17 23:00:03 +00:00
Jon Staab	2618bb9c63	Fix centered layout	2026-04-17 14:58:59 -07:00
Prat_09	32a31045ef	fix: Improve toggle switch placement in settings screen (#208 ) (#232 ) Co-authored-by: Pratyush Mohanty <prat_09@noreply.coracle.social> Co-committed-by: Pratyush Mohanty <prat_09@noreply.coracle.social>	2026-04-17 21:58:52 +00:00
deveshanim3	56edad77a8	fix: added logic for password requirements on signup (#230 ) Co-authored-by: deveshanim3 <deveshsingh6986@gmail.com> Co-committed-by: deveshanim3 <deveshsingh6986@gmail.com>	2026-04-17 19:43:27 +00:00
priyanshu_bharti	fdb604e350	Use type=email for signup/login email inputs (#225 ) (#228 ) Co-authored-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com> Co-committed-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com>	2026-04-17 18:55:04 +00:00
deveshanim3	3c66dfd83c	fix/wrong-message-offline (#222 ) Co-authored-by: deveshanim3 <deveshsingh6986@gmail.com> Co-committed-by: deveshanim3 <deveshsingh6986@gmail.com>	2026-04-17 18:24:55 +00:00
userAdityaa	81633b0a1e	fix: vertical alignment of emoji and overflow buttons in shared event action row (#219 ) Co-authored-by: userAdityaa <aditya.chaudhary1558@gmail.com> Co-committed-by: userAdityaa <aditya.chaudhary1558@gmail.com>	2026-04-17 15:22:40 +00:00
Khushvendra	4a967de184	fix(chat): suppress programmatic scroll while user is scrolling (#132 ) (#216 ) Co-authored-by: 1amKhush <khushvendras99@gmail.com> Co-committed-by: 1amKhush <khushvendras99@gmail.com>	2026-04-16 23:20:17 +00:00
deveshanim3	59961cbdb5	fix: supported nip overflow in SpaceRelayStatus.svelte (#215 ) Co-authored-by: deveshanim3 <deveshsingh6986@gmail.com> Co-committed-by: deveshanim3 <deveshsingh6986@gmail.com>	2026-04-16 21:36:14 +00:00