From 1a9a31b45b3d6e255608a144eb1e0db3d2439581 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Thu, 19 Jan 2023 09:10:07 -0800
Subject: [PATCH] Add DMs

---
 README.md                   |  11 +-
 src/App.svelte              |  32 ++++--
 src/agent/data.js           |  12 +-
 src/agent/keys.js           |  42 +++++--
 src/agent/pool.js           |   7 +-
 src/app/cmd.js              |  11 +-
 src/app/index.js            |   9 +-
 src/app/messages.js         |  35 ++++++
 src/partials/Channel.svelte | 178 +++++++++++++++++++++++++++++
 src/partials/Room.svelte    |  40 ++++---
 src/routes/Chat.svelte      |  35 ++++--
 src/routes/ChatRoom.svelte  | 218 +++++++-----------------------------
 src/routes/Messages.svelte  |  57 ++++++++++
 src/routes/Person.svelte    |   6 +-
 src/views/ChatEdit.svelte   |   3 +-
 15 files changed, 462 insertions(+), 234 deletions(-)
 create mode 100644 src/app/messages.js
 create mode 100644 src/partials/Channel.svelte
 create mode 100644 src/routes/Messages.svelte

diff --git a/README.md b/README.md
index f4b5ea4c..14aa04cb 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,8 @@ If you like Coracle and want to support its development, you can donate sats via
 - [x] Mentions
 - [x] Persist and load relay list
 - [x] NIP 05
-- [ ] Direct messages https://github.com/nbd-wtf/nostr-tools/blob/master/nip04.ts
+- [ ] Direct messages using NIP 04
+- [ ] Deploy coracle relay, set better defaults
 - [ ] Image uploads
   - Use dufflepud. Default will charge via lightning and have a tos, others can self-host and skip that.
   - Add banner field to profile
@@ -46,11 +47,13 @@ If you like Coracle and want to support its development, you can donate sats via
 ## Current
 
 - [ ] Figure out migrations from previous version
-- [ ] Fix search
-- [ ] Deploy coracle relay, set better defaults
+- [ ] Fix notes search
 - [ ] Chat
   - [ ] Figure out which relays to use
-  - [ ] Add petnames for channels - join/leave from list page?
+  - [ ] Add petnames for channels
+  - [ ] Add back button
+  - [ ] Create Room -> open modal, choose dm or public room
+  - [ ] Add DM button to profile pages
 
 ## 0.2.7
 
diff --git a/src/App.svelte b/src/App.svelte
index 2024d387..5fa3c8dc 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -2,7 +2,7 @@
   import "@fortawesome/fontawesome-free/css/fontawesome.css"
   import "@fortawesome/fontawesome-free/css/solid.css"
 
-  import {pluck} from 'ramda'
+  import {find, pluck} from 'ramda'
   import {onMount} from "svelte"
   import {writable, get} from "svelte/store"
   import {fly, fade} from "svelte/transition"
@@ -12,7 +12,7 @@
   import {displayPerson, isLike} from 'src/util/nostr'
   import {timedelta, now} from 'src/util/misc'
   import {keys, user, pool, getRelays} from 'src/agent'
-  import {modal, toast, settings, alerts} from "src/app"
+  import {modal, toast, settings, alerts, messages} from "src/app"
   import {routes} from "src/app/ui"
   import Anchor from 'src/partials/Anchor.svelte'
   import Spinner from 'src/partials/Spinner.svelte'
@@ -39,6 +39,7 @@
   import Bech32Entity from "src/routes/Bech32Entity.svelte"
   import Chat from "src/routes/Chat.svelte"
   import ChatRoom from "src/routes/ChatRoom.svelte"
+  import Messages from "src/routes/Messages.svelte"
 
   export let url = ""
 
@@ -53,18 +54,27 @@
     menuIsOpen.set(false)
   }
 
-  const {canSign} = keys
   const {lastCheckedAlerts, mostRecentAlert} = alerts
+  const {lastCheckedByPubkey, mostRecentByPubkey} = messages
 
   let menuIcon
   let scrollY
   let suspendedSubs = []
   let slowConnections = []
+  let hasNewMessages = false
+
+  $: {
+    hasNewMessages = Boolean(find(
+      ([k, t]) => ($lastCheckedByPubkey[k] || 0) < t,
+      Object.entries($mostRecentByPubkey)
+    ))
+  }
 
   onMount(() => {
     if ($user) {
       alerts.load(getRelays(), $user.pubkey)
       alerts.listen(getRelays(), $user.pubkey)
+      messages.listen(getRelays(), $user.pubkey)
     }
 
     const interval = setInterval(() => {
@@ -130,11 +140,16 @@
         {/key}
       </Route>
       <Route path="/chat" component={Chat} />
-      <Route path="/chat/:roomId" let:params>
-        {#key params.roomId}
+      <Route path="/chat/:entity" let:params>
+        {#key params.entity}
         <ChatRoom {...params} />
         {/key}
       </Route>
+      <Route path="/messages/:entity" let:params>
+        {#key params.entity}
+        <Messages {...params} />
+        {/key}
+      </Route>
       <Route path="/keys" component={Keys} />
       <Route path="/relays" component={RelayList} />
       <Route path="/profile" component={Profile} />
@@ -186,6 +201,9 @@
       <li class="cursor-pointer">
         <a class="block px-4 py-2 hover:bg-accent transition-all" href="/chat">
           <i class="fa-solid fa-message mr-2" /> Chat
+          {#if hasNewMessages}
+          <div class="w-2 h-2 rounded bg-accent absolute top-3 left-6" />
+          {/if}
         </a>
       </li>
       <li class="h-px mx-3 my-4 bg-medium" />
@@ -232,12 +250,12 @@
         <img src="/images/favicon.png" class="w-8" />
         <h1 class="staatliches text-3xl">Coracle</h1>
       </Anchor>
-      {#if $mostRecentAlert > $lastCheckedAlerts}
+      {#if $mostRecentAlert > $lastCheckedAlerts || hasNewMessages}
       <div class="w-2 h-2 rounded bg-accent absolute top-4 left-12 lg:hidden" />
       {/if}
     </div>
 
-    {#if $canSign}
+    {#if keys.canSign()}
     <div class="fixed bottom-0 right-0 m-8">
       <a
         class="rounded-full bg-accent color-white w-16 h-16 flex justify-center
diff --git a/src/agent/data.js b/src/agent/data.js
index bd2a821e..fd2c802e 100644
--- a/src/agent/data.js
+++ b/src/agent/data.js
@@ -8,9 +8,10 @@ import {personKinds, Tags, roomAttrs} from 'src/util/nostr'
 
 export const db = new Dexie('agent/data/db')
 
-db.version(11).stores({
+db.version(12).stores({
   relays: '++url, name',
   alerts: '++id, created_at',
+  messages: '++id, pubkey',
   people: '++pubkey',
   rooms: '++id, joined',
 })
@@ -51,6 +52,7 @@ export const processEvents = async events => {
   await Promise.all([
     processProfileEvents(events),
     processRoomEvents(events),
+    processMessages(events),
   ])
 }
 
@@ -154,6 +156,14 @@ const processRoomEvents = async events => {
   await db.rooms.bulkPut(Object.values(updates))
 }
 
+const processMessages = async events => {
+  const messages = ensurePlural(events).filter(e => e.kind === 4)
+
+  if (messages.length > 0) {
+    await db.messages.bulkPut(messages)
+  }
+}
+
 // Utils
 
 const verifyNip05 = (pubkey, as) =>
diff --git a/src/agent/keys.js b/src/agent/keys.js
index 90c5f073..cb3ad55c 100644
--- a/src/agent/keys.js
+++ b/src/agent/keys.js
@@ -1,3 +1,4 @@
+import {nip04} from 'nostr-tools'
 import {getPublicKey, getEventHash, signEvent} from 'nostr-tools'
 import {get} from 'svelte/store'
 import {synced} from 'src/util/misc'
@@ -6,7 +7,8 @@ let signingFunction
 
 const pubkey = synced('agent/user/pubkey')
 const privkey = synced('agent/user/privkey')
-const canSign = synced('agent/user/canSign')
+const hasExtension = () => Boolean(window.nostr)
+const canSign = () => Boolean(hasExtension() || get(privkey))
 
 const setPrivateKey = _privkey => {
   privkey.set(_privkey)
@@ -23,6 +25,11 @@ const setPublicKey = _pubkey => {
   pubkey.set(_pubkey)
 }
 
+const clear = () => {
+  pubkey.set(null)
+  privkey.set(null)
+}
+
 const sign = async event => {
   event.pubkey = get(pubkey)
   event.id = getEventHash(event)
@@ -33,14 +40,35 @@ const sign = async event => {
   return event
 }
 
-const clear = () => {
-  pubkey.set(null)
-  privkey.set(null)
-  canSign.set(false)
-}
+const getCrypt = () => {
+  const $privkey = get(privkey)
 
+  if (!$privkey && !hasExtension()) {
+    throw new Error('No encryption method available.')
+  }
+
+  return {
+    encrypt: (pubkey, message) => {
+      return $privkey
+        ? nip04.encrypt($privkey, pubkey, message)
+        : window.nostr.nip04.encrypt(pubkey, message)
+    },
+    decrypt: async (pubkey, message) => {
+      try {
+        return $privkey
+          ? nip04.decrypt($privkey, pubkey, message)
+          : await window.nostr.nip04.decrypt(pubkey, message)
+      } catch (e) {
+        return `<Failed to decrypt message: ${e}>`
+      }
+    },
+  }
+}
 
 // Init signing function by re-setting pubkey
 setPublicKey(get(pubkey))
 
-export default {pubkey, privkey, canSign, setPrivateKey, setPublicKey, sign, clear}
+export default {
+  pubkey, privkey, hasExtension, canSign, setPrivateKey, setPublicKey, clear,
+  sign, getCrypt,
+}
diff --git a/src/agent/pool.js b/src/agent/pool.js
index cba54761..7413c2ae 100644
--- a/src/agent/pool.js
+++ b/src/agent/pool.js
@@ -9,6 +9,7 @@ let connections = []
 
 class Connection {
   constructor(url) {
+    this.promise = null
     this.nostr = this.init(url)
     this.status = 'new'
     this.url = url
@@ -41,9 +42,12 @@ class Connection {
 
     if (shouldConnect) {
       this.status = 'pending'
+      this.promise = this.nostr.connect()
+    }
 
+    if (this.status === 'pending') {
       try {
-        await this.nostr.connect()
+        await this.promise
         this.status = 'ready'
       } catch (e) {
         this.status = 'error'
@@ -107,7 +111,6 @@ const subscribe = async (relays, filters) => {
   relays = uniqBy(prop('url'), relays.filter(r => isRelay(r.url)))
   filters = ensurePlural(filters)
 
-
   // Create a human readable subscription id for debugging
   const id = [
     Math.random().toString().slice(2, 6),
diff --git a/src/app/cmd.js b/src/app/cmd.js
index 54ebf3f9..76e74e1f 100644
--- a/src/app/cmd.js
+++ b/src/app/cmd.js
@@ -22,9 +22,13 @@ const createRoom = (relays, room) =>
 const updateRoom = (relays, {id, ...room}) =>
   publishEvent(relays, 41, {content: JSON.stringify(pick(roomAttrs, room)), tags: [["e", id]]})
 
-const createMessage = (relays, roomId, content) =>
+const createChatMessage = (relays, roomId, content) =>
   publishEvent(relays, 42, {content, tags: [["e", roomId, prop('url', first(relays)), "root"]]})
 
+const createDirectMessage = (relays, pubkey, content) =>
+  // todo, encrypt messages
+  publishEvent(relays, 4, {content, tags: [["p", pubkey]]})
+
 const createNote = (relays, content, mentions = [], topics = []) => {
   mentions = mentions.map(p => ["p", p, prop('url', first(getRelays(p)))])
   topics = topics.map(t => ["t", t])
@@ -100,6 +104,7 @@ const publishEvent = (relays, kind, {content = '', tags = []} = {}) => {
 }
 
 export default {
-  updateUser, setRelays, setPetnames, muffle, createRoom, updateRoom, createMessage, createNote,
-  createReaction, createReply, deleteEvent,
+  updateUser, setRelays, setPetnames, muffle, createRoom, updateRoom,
+  createChatMessage, createDirectMessage, createNote, createReaction,
+  createReply, deleteEvent,
 }
diff --git a/src/app/index.js b/src/app/index.js
index 430830b0..d6635ec8 100644
--- a/src/app/index.js
+++ b/src/app/index.js
@@ -9,9 +9,10 @@ import defaults from 'src/agent/defaults'
 import {toast, routes, modal, settings} from 'src/app/ui'
 import cmd from 'src/app/cmd'
 import alerts from 'src/app/alerts'
+import messages from 'src/app/messages'
 import loaders from 'src/app/loaders'
 
-export {toast, modal, settings, alerts}
+export {toast, modal, settings, alerts, messages}
 
 export const login = async ({privkey, pubkey}, usingExtension = false) => {
   if (privkey) {
@@ -20,14 +21,11 @@ export const login = async ({privkey, pubkey}, usingExtension = false) => {
     keys.setPublicKey(pubkey)
   }
 
-  if (usingExtension || privkey) {
-    keys.canSign.set(true)
-  }
-
   // Load network and start listening, but don't wait for it
   loaders.loadNetwork(getRelays(), pubkey),
   alerts.load(getRelays(), pubkey),
   alerts.listen(getRelays(), pubkey),
+  messages.listen(getRelays(), pubkey)
 
   navigate('/notes/global')
 }
@@ -49,6 +47,7 @@ export const addRelay = async relay => {
       loaders.loadNetwork(relays, person.pubkey),
       alerts.load(relays, person.pubkey),
       alerts.listen(relays, person.pubkey),
+      messages.listen(getRelays(), person.pubkey)
     ])
   }
 }
diff --git a/src/app/messages.js b/src/app/messages.js
new file mode 100644
index 00000000..5a279e03
--- /dev/null
+++ b/src/app/messages.js
@@ -0,0 +1,35 @@
+import {pluck} from 'ramda'
+import {synced, batch} from 'src/util/misc'
+import {listen as _listen} from 'src/agent'
+import loaders from 'src/app/loaders'
+
+let listener
+
+const mostRecentByPubkey = synced('app/messages/mostRecentByPubkey', {})
+const lastCheckedByPubkey = synced('app/messages/lastCheckedByPubkey', {})
+
+const listen = async (relays, pubkey) => {
+  if (listener) {
+    listener.unsub()
+  }
+
+  listener = await _listen(
+    relays,
+    {kinds: [4], '#p': [pubkey]},
+    batch(300, async events => {
+      if (events.length > 0) {
+        await loaders.loadPeople(relays, pluck('pubkey', events))
+
+        mostRecentByPubkey.update(o => {
+          for (const {pubkey, created_at} of events) {
+            o[pubkey] = Math.max(created_at, o[pubkey] || 0)
+          }
+
+          return o
+        })
+      }
+    })
+  )
+}
+
+export default {listen, mostRecentByPubkey, lastCheckedByPubkey}
diff --git a/src/partials/Channel.svelte b/src/partials/Channel.svelte
new file mode 100644
index 00000000..10f9c91b
--- /dev/null
+++ b/src/partials/Channel.svelte
@@ -0,0 +1,178 @@
+<script>
+  import {onMount} from 'svelte'
+  import {fly} from 'svelte/transition'
+  import {navigate} from 'svelte-routing'
+  import {prop, path as getPath, reverse, uniqBy, sortBy, last} from 'ramda'
+  import {formatTimestamp, createScroller, Cursor} from 'src/util/misc'
+  import Badge from 'src/partials/Badge.svelte'
+  import Spinner from 'src/partials/Spinner.svelte'
+  import {user, getPerson} from 'src/agent'
+  import {render} from 'src/app'
+
+  export let name
+  export let about
+  export let picture
+  export let loadMessages
+  export let listenForMessages
+  export let sendMessage
+  export let editRoom = null
+
+  let textarea
+  let messages = []
+  let annotatedMessages = []
+  let showNewMessages = false
+  let cursor = new Cursor()
+
+  $: {
+    // Group messages so we're only showing the person once per chunk
+    annotatedMessages = reverse(sortBy(prop('created_at'), uniqBy(prop('id'), messages)).reduce(
+      (mx, m) => {
+        const person = getPerson(m.pubkey, true)
+        const showPerson = person.pubkey !== getPath(['person', 'pubkey'], last(mx))
+
+        return mx.concat({...m, person, showPerson})
+      },
+      []
+    ))
+  }
+
+  // flex-col means the first is the last
+  const getLastListItem = () => document.querySelector('ul[name=messages] li')
+
+  const stickToBottom = async (behavior, cb) => {
+    const shouldStick = window.scrollY + window.innerHeight > document.body.scrollHeight - 200
+
+    await cb()
+
+    if (shouldStick) {
+      const $li = getLastListItem()
+
+      if ($li) {
+        $li.scrollIntoView({behavior})
+      }
+    } else {
+      showNewMessages = true
+    }
+  }
+
+  onMount(async () => {
+    if (!$user) {
+      return navigate('/login')
+    }
+
+    const sub = listenForMessages(
+      newMessages => stickToBottom('smooth', () => {
+        messages = messages.concat(newMessages)
+      })
+    )
+
+    const scroller = createScroller(
+      async () => {
+        const events = await loadMessages(cursor)
+
+        if (events.length) {
+          cursor.onChunk(events)
+
+          stickToBottom('auto', () => {
+            messages = events.concat(messages)
+          })
+        }
+      },
+      {reverse: true}
+    )
+
+    return async () => {
+      const {unsub} = await sub
+
+      scroller.stop()
+      unsub()
+    }
+  })
+
+  const send = async () => {
+    const content = textarea.value.trim()
+
+    if (content) {
+      textarea.value = ''
+
+      const event = await sendMessage(content)
+
+      stickToBottom('smooth', () => {
+        messages = [event].concat(messages)
+      })
+    }
+  }
+
+  const onKeyPress = e => {
+    if (e.key === 'Enter' && !e.shiftKey) {
+      e.preventDefault()
+      send()
+    }
+  }
+</script>
+
+<svelte:window on:scroll={() => { showNewMessages = false}} />
+
+<div class="flex gap-4 h-full">
+  <div class="relative w-full">
+    <div class="flex flex-col py-32">
+      <ul class="p-4 max-h-full flex-grow flex flex-col-reverse" name="messages">
+        {#each annotatedMessages as m (m.id)}
+          <li in:fly={{y: 20}} class="py-1 flex flex-col gap-2">
+            {#if m.showPerson}
+            <div class="flex gap-4 items-center justify-between">
+              <Badge person={m.person} />
+              <p class="text-sm text-light">{formatTimestamp(m.created_at)}</p>
+            </div>
+            {/if}
+            <div class="ml-6 overflow-hidden text-ellipsis">
+              {@html render(m, {showEntire: true})}
+            </div>
+          </li>
+        {/each}
+        <Spinner>Looking for messages...</Spinner>
+        <div class="h-48" />
+      </ul>
+    </div>
+    <div class="fixed z-10 top-0 pt-20 w-full p-4 border-b border-solid border-medium bg-dark flex gap-4">
+      <div
+        class="overflow-hidden w-12 h-12 rounded-full bg-cover bg-center shrink-0 border border-solid border-white"
+        style="background-image: url({picture})" />
+      <div class="w-full">
+        <div class="flex items-center justify-between w-full">
+          <div class="text-lg font-bold">{name || ''}</div>
+          {#if editRoom}
+          <small class="cursor-pointer" on:click={editRoom}>
+            <i class="fa-solid fa-edit" /> Edit
+          </small>
+          {/if}
+        </div>
+        <div>{about || ''}</div>
+      </div>
+    </div>
+    <div class="fixed z-10 bottom-0 w-full flex bg-medium border-medium border-t border-solid border-dark">
+      <textarea
+        rows="4"
+        autofocus
+        placeholder="Type something..."
+        bind:this={textarea}
+        on:keypress={onKeyPress}
+        class="w-full p-2 text-white bg-medium
+               placeholder:text-light outline-0 resize-none" />
+      <div
+        on:click={send}
+        class="flex flex-col py-8 p-4 justify-center gap-2 border-l border-solid border-dark
+               hover:bg-accent transition-all cursor-pointer text-white ">
+        <i class="fa-solid fa-paper-plane fa-xl" />
+      </div>
+    </div>
+  </div>
+  {#if showNewMessages}
+  <div class="fixed w-full flex justify-center bottom-32" transition:fly|local={{y: 20}}>
+    <div class="rounded-full bg-accent text-white py-2 px-4">
+      New messages found
+    </div>
+  </div>
+  {/if}
+</div>
+
diff --git a/src/partials/Room.svelte b/src/partials/Room.svelte
index 244c77d9..317c7f11 100644
--- a/src/partials/Room.svelte
+++ b/src/partials/Room.svelte
@@ -1,6 +1,8 @@
 <script>
   import {fly} from 'svelte/transition'
+  import {ellipsize} from 'hurdak/lib/hurdak'
   import Anchor from 'src/partials/Anchor.svelte'
+  import {displayPerson} from 'src/util/nostr'
 
   export let joined = false
   export let room
@@ -11,29 +13,39 @@
 
 <li
   class="flex gap-4 px-4 py-6 cursor-pointer hover:bg-medium transition-all rounded border border-solid border-medium bg-dark"
-  on:click={() => setRoom(room.id)}
+  on:click={() => setRoom(room)}
   in:fly={{y: 20}}>
   <div
     class="overflow-hidden w-14 h-14 rounded-full bg-cover bg-center shrink-0 border border-solid border-white"
     style="background-image: url({room.picture})" />
   <div class="flex flex-grow flex-col justify-start gap-2">
     <div class="flex flex-grow items-center justify-between gap-2">
-      <h2 class="text-lg">{room.name}</h2>
-      {#if joined}
-      <Anchor type="button" class="flex items-center gap-2" on:click={e => { e.stopPropagation(); leaveRoom(room.id) }}>
-        <i class="fa fa-right-from-bracket" />
-        <span>Leave</span>
-      </Anchor>
-      {:else}
-      <Anchor type="button" class="flex items-center gap-2" on:click={e => { e.stopPropagation(); joinRoom(room.id) }}>
-        <i class="fa fa-right-to-bracket" />
-        <span>Join</span>
-      </Anchor>
+      <div class="flex gap-2 items-center">
+        {#if room.type === 'private'}
+        <i class="fa fa-lock text-light" />
+        <h2 class="text-lg">{displayPerson(room)}</h2>
+        {:else}
+        <i class="fa fa-lock-open text-light" />
+        <h2 class="text-lg">{room.name}</h2>
+        {/if}
+      </div>
+      {#if room.type === 'public'}
+        {#if joined}
+        <Anchor type="button" class="flex items-center gap-2" on:click={e => { e.stopPropagation(); leaveRoom(room.id) }}>
+          <i class="fa fa-right-from-bracket" />
+          <span>Leave</span>
+        </Anchor>
+        {:else}
+        <Anchor type="button" class="flex items-center gap-2" on:click={e => { e.stopPropagation(); joinRoom(room.id) }}>
+          <i class="fa fa-right-to-bracket" />
+          <span>Join</span>
+        </Anchor>
+        {/if}
       {/if}
     </div>
     {#if room.about}
-    <p class="text-light whitespace-nowrap text-ellipsis overflow-hidden">
-      {room.about}
+    <p class="text-light">
+      {ellipsize(room.about, 300)}
     </p>
     {/if}
   </div>
diff --git a/src/routes/Chat.svelte b/src/routes/Chat.svelte
index 3950b979..5ae686e0 100644
--- a/src/routes/Chat.svelte
+++ b/src/routes/Chat.svelte
@@ -1,11 +1,13 @@
 <script>
-  import {reject} from 'ramda'
+  import {uniq, pluck} from 'ramda'
   import {onMount} from "svelte"
+  import {nip19} from 'nostr-tools'
   import {navigate} from "svelte-routing"
   import {liveQuery} from 'dexie'
   import {fuzzy} from "src/util/misc"
-  import {getRelays, listen, db} from 'src/agent'
+  import {getRelays, getPerson, listen, db} from 'src/agent'
   import {modal} from 'src/app'
+  import loaders from 'src/app/loaders'
   import Room from "src/partials/Room.svelte"
   import Input from "src/partials/Input.svelte"
   import Content from "src/partials/Content.svelte"
@@ -15,20 +17,37 @@
   let q = ""
   let roomsCount = 0
 
-  const joined = liveQuery(() => db.rooms.where('joined').equals(1).toArray())
+  const rooms = liveQuery(async () => {
+    const [rooms, messages] = await Promise.all([
+      db.rooms.where('joined').equals(1).toArray(),
+      db.messages.toArray(),
+    ])
+
+    const pubkeys = uniq(pluck('pubkey', messages))
+    await loaders.loadPeople(getRelays(), pubkeys)
+
+    return pubkeys
+      .map(k => ({type: 'npub', id: k, ...getPerson(k, true)}))
+      .concat(rooms.map(room => ({type: 'note', ...room})))
+  })
 
   const search = liveQuery(async () => {
     const rooms = await db.rooms.where('joined').equals(0).toArray()
-    const nonTestRooms = reject(r => r.name.toLowerCase().includes('test'), rooms)
 
     roomsCount = rooms.length
 
     return fuzzy(rooms, {keys: ["name", "about"]})
   })
 
-  const createRoom = () => navigate(`/chat/new`)
+  const setRoom = ({type, id}) => {
+    if (type === 'npub') {
+      navigate(`/messages/${nip19.npubEncode(id)}`)
+    }
 
-  const setRoom = id => navigate(`/chat/${id}`)
+    if (type === 'note') {
+      navigate(`/chat/${nip19.noteEncode(id)}`)
+    }
+  }
 
   const joinRoom = id => {
     db.rooms.where('id').equals(id).modify({joined: 1})
@@ -49,7 +68,7 @@
   })
 </script>
 
-{#if $search}
+{#if $rooms}
 <Content>
   <div class="flex justify-between">
     <div class="flex gap-2 items-center">
@@ -60,7 +79,7 @@
       <i class="fa-solid fa-plus" /> Create Room
     </Anchor>
   </div>
-  {#each ($joined || []) as room (room.id)}
+  {#each ($rooms || []) as room (room.id)}
   <Room joined {room} {setRoom} {joinRoom} {leaveRoom} />
   {:else}
   <p class="text-center py-8">You haven't yet joined any rooms.</p>
diff --git a/src/routes/ChatRoom.svelte b/src/routes/ChatRoom.svelte
index 404adcd4..f66072e1 100644
--- a/src/routes/ChatRoom.svelte
+++ b/src/routes/ChatRoom.svelte
@@ -1,193 +1,57 @@
 <script>
-  import {onMount} from 'svelte'
   import {liveQuery} from 'dexie'
-  import {fly} from 'svelte/transition'
-  import {navigate} from 'svelte-routing'
-  import {prop, path as getPath, pluck, reverse, uniqBy, sortBy, last} from 'ramda'
-  import {formatTimestamp, now, createScroller, batch, Cursor} from 'src/util/misc'
-  import Badge from 'src/partials/Badge.svelte'
-  import Spinner from 'src/partials/Spinner.svelte'
-  import {user, getPerson, getRelays, db, listen, load} from 'src/agent'
-  import {render, modal} from 'src/app'
+  import {pluck} from 'ramda'
+  import {nip19} from 'nostr-tools'
+  import {now, batch} from 'src/util/misc'
+  import Channel from 'src/partials/Channel.svelte'
+  import {getRelays, db, listen, load} from 'src/agent'
+  import {modal} from 'src/app'
   import loaders from 'src/app/loaders'
   import cmd from 'src/app/cmd'
 
-  export let roomId
+  export let entity
 
-  let textarea
-  let messages = []
-  let annotatedMessages = []
-  let showNewMessages = false
+  let {data: roomId} = nip19.decode(entity)
   let room = liveQuery(() => db.rooms.where('id').equals(roomId).first())
-  let cursor = new Cursor()
 
-  $: {
-    // Group messages so we're only showing the person once per chunk
-    annotatedMessages = reverse(sortBy(prop('created_at'), uniqBy(prop('id'), messages)).reduce(
-      (mx, m) => {
-        const person = getPerson(m.pubkey, true)
-        const showPerson = person.pubkey !== getPath(['person', 'pubkey'], last(mx))
+  const listenForMessages = cb => listen(
+    getRelays(),
+    // Listen for updates to the room in case we didn't get them before
+    [{kinds: [40, 41], ids: [roomId]},
+     {kinds: [42], '#e': [roomId], since: now()}],
+    batch(300, events => {
+      const newMessages = events.filter(e => e.kind === 42)
 
-        return mx.concat({...m, person, showPerson})
-      },
-      []
-    ))
+      loaders.loadPeople(getRelays(), pluck('pubkey', events))
+
+      cb(newMessages)
+    })
+  )
+
+  const loadMessages = async ({until, limit}) => {
+    const events = await load(getRelays(), {kinds: [42], '#e': [roomId], until, limit})
+
+    if (events.length) {
+      await loaders.loadPeople(getRelays(), pluck('pubkey', events))
+    }
+
+    return events
   }
 
-  // flex-col means the first is the last
-  const getLastListItem = () => document.querySelector('ul[name=messages] li')
-
-  const stickToBottom = async (behavior, cb) => {
-    const shouldStick = window.scrollY + window.innerHeight > document.body.scrollHeight - 200
-
-    await cb()
-
-    if (shouldStick) {
-      const $li = getLastListItem()
-
-      if ($li) {
-        $li.scrollIntoView({behavior})
-      }
-    } else {
-      showNewMessages = true
-    }
-  }
-
-  onMount(async () => {
-    if (!$user) {
-      return navigate('/login')
-    }
-
-    const sub = listen(
-      getRelays(),
-      // Listen for updates to the room in case we didn't get them before
-      [{kinds: [40, 41], ids: [roomId]},
-       {kinds: [42], '#e': [roomId], since: now()}],
-      batch(300, events => {
-        const newMessages = events.filter(e => e.kind === 42)
-
-        loaders.loadPeople(getRelays(), pluck('pubkey', events))
-
-        stickToBottom('smooth', () => {
-          messages = messages.concat(newMessages)
-        })
-      })
-    )
-
-    const scroller = createScroller(
-      async () => {
-        const {until, limit} = cursor
-        const events = await load(getRelays(), {kinds: [42], '#e': [roomId], until, limit})
-
-        if (events.length) {
-          cursor.onChunk(events)
-
-          await loaders.loadPeople(getRelays(), pluck('pubkey', events))
-
-          stickToBottom('auto', () => {
-            messages = events.concat(messages)
-          })
-        }
-      },
-      {reverse: true}
-    )
-
-    return async () => {
-      const {unsub} = await sub
-
-      scroller.stop()
-      unsub()
-    }
-  })
-
-  const edit = () => {
+  const editRoom = () => {
     modal.set({form: 'room/edit', room: $room})
   }
 
-  const sendMessage = async () => {
-    const content = textarea.value.trim()
-
-    if (content) {
-      textarea.value = ''
-
-      const event = await cmd.createMessage(getRelays(), roomId, content)
-
-      stickToBottom('smooth', () => {
-        messages = [event].concat(messages)
-      })
-    }
-  }
-
-  const onKeyPress = e => {
-    if (e.key === 'Enter' && !e.shiftKey) {
-      e.preventDefault()
-      sendMessage()
-    }
-  }
+  const sendMessage = content =>
+    cmd.createChannelMessage(getRelays(), roomId, content)
 </script>
 
-<svelte:window on:scroll={() => { showNewMessages = false}} />
-
-<div class="flex gap-4 h-full">
-  <div class="relative w-full">
-    <div class="flex flex-col py-32">
-      <ul class="p-4 max-h-full flex-grow flex flex-col-reverse" name="messages">
-        {#each annotatedMessages as m (m.id)}
-          <li in:fly={{y: 20}} class="py-1 flex flex-col gap-2">
-            {#if m.showPerson}
-            <div class="flex gap-4 items-center justify-between">
-              <Badge person={m.person} />
-              <p class="text-sm text-light">{formatTimestamp(m.created_at)}</p>
-            </div>
-            {/if}
-            <div class="ml-6 overflow-hidden text-ellipsis">
-              {@html render(m, {showEntire: true})}
-            </div>
-          </li>
-        {/each}
-        <Spinner>Looking for messages...</Spinner>
-        <div class="h-64" />
-      </ul>
-    </div>
-    <div class="fixed z-10 top-0 pt-20 w-full p-4 border-b border-solid border-medium bg-dark flex gap-4">
-      <div
-        class="overflow-hidden w-12 h-12 rounded-full bg-cover bg-center shrink-0 border border-solid border-white"
-        style="background-image: url({$room?.picture})" />
-      <div class="w-full">
-        <div class="flex items-center justify-between w-full">
-          <div class="text-lg font-bold">{$room?.name || ''}</div>
-          {#if $room?.pubkey === $user?.pubkey}
-          <small class="cursor-pointer" on:click={edit}>
-            <i class="fa-solid fa-edit" /> Edit
-          </small>
-          {/if}
-        </div>
-        <div>{$room?.about || ''}</div>
-      </div>
-    </div>
-    <div class="fixed z-10 bottom-0 w-full flex bg-medium border-medium border-t border-solid border-dark">
-      <textarea
-        rows="4"
-        autofocus
-        placeholder="Type something..."
-        bind:this={textarea}
-        on:keypress={onKeyPress}
-        class="w-full p-2 text-white bg-medium
-               placeholder:text-light outline-0 resize-none" />
-      <div
-        on:click={sendMessage}
-        class="flex flex-col py-8 p-4 justify-center gap-2 border-l border-solid border-dark
-               hover:bg-accent transition-all cursor-pointer text-white ">
-        <i class="fa-solid fa-paper-plane fa-xl" />
-      </div>
-    </div>
-  </div>
-  {#if showNewMessages}
-  <div class="fixed w-full flex justify-center bottom-32" transition:fly|local={{y: 20}}>
-    <div class="rounded-full bg-accent text-white py-2 px-4">
-      New messages found
-    </div>
-  </div>
-  {/if}
-</div>
-
+<Channel
+  name={$room?.name}
+  about={$room?.about}
+  picture={$room?.picture}
+  {loadMessages}
+  {listenForMessages}
+  {sendMessage}
+  {editRoom}
+/>
diff --git a/src/routes/Messages.svelte b/src/routes/Messages.svelte
new file mode 100644
index 00000000..8996c4c2
--- /dev/null
+++ b/src/routes/Messages.svelte
@@ -0,0 +1,57 @@
+<script>
+  import {liveQuery} from 'dexie'
+  import {nip19} from 'nostr-tools'
+  import {assoc, propEq, mergeRight} from 'ramda'
+  import {now, batch} from 'src/util/misc'
+  import {personKinds} from 'src/util/nostr'
+  import Channel from 'src/partials/Channel.svelte'
+  import {getRelays, user, db, listen, load, keys} from 'src/agent'
+  import cmd from 'src/app/cmd'
+
+  export let entity
+
+  let crypt = keys.getCrypt()
+  let {data: pubkey} = nip19.decode(entity)
+  let person = liveQuery(() => db.people.get(pubkey))
+  let filters = [
+    {kinds: [4], authors: [$user.pubkey], '#p': [pubkey]},
+    {kinds: [4], authors: [pubkey], '#p': [$user.pubkey]}]
+
+  const decryptMessages = async messages => {
+    // Gotta do it in serial because of extension limitations
+    for (const message of messages) {
+      message.content = await crypt.decrypt(message.pubkey, message.content)
+      console.log(message.content)
+    }
+
+    return messages
+  }
+
+  const listenForMessages = cb => listen(
+    getRelays(),
+    [{kinds: personKinds, authors: [pubkey]},
+     ...filters.map(assoc('since', now()))],
+    batch(300, events => {
+      return cb(decryptMessages(events.filter(propEq('kind', 4))))
+    })
+  )
+
+  const loadMessages = async ({until, limit}) => {
+    const messages = await load(getRelays(), filters.map(mergeRight({until, limit})))
+
+    return await decryptMessages(messages)
+  }
+
+
+  const sendMessage = content =>
+    cmd.createDirectMessage(getRelays(), pubkey, content)
+</script>
+
+<Channel
+  name={$person?.name}
+  about={$person?.about}
+  picture={$person?.picture}
+  {loadMessages}
+  {listenForMessages}
+  {sendMessage}
+/>
diff --git a/src/routes/Person.svelte b/src/routes/Person.svelte
index 63e4290b..62cabe1c 100644
--- a/src/routes/Person.svelte
+++ b/src/routes/Person.svelte
@@ -24,8 +24,6 @@
   export let activeTab
   export let relays = null
 
-  const {canSign} = keys
-
   let subs = []
   let pubkey = nip19.decode(npub).data
   let following = false
@@ -109,7 +107,7 @@
           {/if}
         </div>
         <div class="whitespace-nowrap flex gap-4 items-center">
-          {#if $user?.pubkey === pubkey && $canSign}
+          {#if $user?.pubkey === pubkey && keys.canSign()}
           <a href="/profile" class="cursor-pointer text-sm">
             <i class="fa-solid fa-edit" /> Edit
           </a>
@@ -117,7 +115,7 @@
           {#if $user && $user.pubkey !== pubkey}
             <i class="fa-solid fa-sliders cursor-pointer" on:click={openAdvanced} />
           {/if}
-          {#if $user?.petnames && $canSign}
+          {#if $user?.petnames && keys.canSign()}
           <div class="flex flex-col items-end gap-2">
             {#if following}
             <Button on:click={unfollow}>Unfollow</Button>
diff --git a/src/views/ChatEdit.svelte b/src/views/ChatEdit.svelte
index 35c7fb23..dbbb2aee 100644
--- a/src/views/ChatEdit.svelte
+++ b/src/views/ChatEdit.svelte
@@ -7,7 +7,7 @@
   import Content from "src/partials/Content.svelte"
   import Textarea from "src/partials/Textarea.svelte"
   import Button from "src/partials/Button.svelte"
-  import {getRelays, load} from 'src/agent'
+  import {getRelays, db} from 'src/agent'
   import {toast} from "src/app"
   import cmd from "src/app/cmd"
 
@@ -38,7 +38,6 @@
         ? await cmd.updateRoom(getRelays(), room)
         : await cmd.createRoom(getRelays(), room)
 
-      console.log('here')
       await db.rooms.where('id').equals(room.id).modify({joined: 1})
 
       toast.show("info", `Your room has been ${room.id ? 'updated' : 'created'}!`)