Merge remote-tracking branch 'cs/prod'

1 files changed, 17 insertions, 2 deletions

diff --git a/tools/thread-cache-test.js b/tools/thread-cache-test.js
index 485e874..6bac353 100644
--- a/tools/thread-cache-test.js
+++ b/tools/thread-cache-test.js
@@ -19,9 +19,17 @@ check('a fresh store restores full content and tags by any viewed event', () =>
   const long = { ...reply, content: 'x'.repeat(5000), tags: [...reply.tags, ['emoji', 'wave', 'https://example.com/wave.png']] };
   store.save({ root, replies: [parent, long] }, long.id);
   const restored = createThreadStore(storage).find(long.id);
-  assert.deepEqual(restored, { rootId: root.id, root, profiles: {}, counts: {}, replies: [long, parent] });
+  assert.deepEqual(restored, { rootId: root.id, root, profiles: {}, counts: {}, replies: [long, parent], quotes: [] });
   assert.equal(store.find(parent.id).root.id, root.id);
 });
+check('a thread rooted in a poll (kind 1068) is kept too', () => {
+  const poll = { ...note(40), kind: 1068, tags: [['option', '0', 'Yes!'], ['option', '1', 'No!']] };
+  const answer = note(41, [['e', poll.id, '', 'root']]);
+  store.save({ root: poll, replies: [answer] }, poll.id);
+  const restored = createThreadStore(storage).find(poll.id);
+  assert.equal(restored?.root.kind, 1068);
+  assert.deepEqual(restored.replies, [answer]);
+});
 check('thread authors keep their names and local avatar thumbnails across reloads', () => {
   const thumb = 'data:image/webp;base64,AAAA';
   const face = { name: 'Nostrich', picture: 'https://example.com/face.webp', eventAt: 50,
@@ -36,6 +44,12 @@ check('thread action totals are present before relay refresh and survive a conte
   store.save({ root, replies: [parent, reply] }, reply.id);
   assert.deepEqual(createThreadStore(storage).find(reply.id).counts[reply.id], { likes: 29, boosts: 7, sats: 210 });
 });
+check('posts quoted inside the thread are restored with it, and a later save keeps them', () => {
+  const q = note(77), poll = { ...note(78), kind: 1068 }; // a quote can be any kind
+  store.save({ root, replies: [parent, reply] }, reply.id, {}, {}, [q, poll]);
+  store.save({ root, replies: [parent, reply] }, reply.id); // a relay refresh with no quotes resolved yet
+  assert.deepEqual(createThreadStore(storage).find(reply.id).quotes, [q, poll]);
+});
 check('a large thread retains the selected reply and its ancestors', () => {
   const siblings = Array.from({ length: 200 }, (_, i) => note(1000 + i, [['e', root.id, '', 'root']]));
   store.save({ root, replies: [...siblings, parent, reply] }, reply.id);
@@ -70,7 +84,8 @@ try {
   const { messagesFeature } = await import(path);
   let requests = [], waiting = [];
   globalThis.__threadQuery = (filter) => {
-    if (filter.kinds?.includes(1) && (filter.ids || filter['#e'])) {
+    // root lookups by id carry no kind (a root can be a poll); reply queries are kind 1
+    if (filter.ids || (filter.kinds?.includes(1) && filter['#e'])) {
       requests.push(filter);
       return new Promise((resolve) => waiting.push({ filter, resolve }));
     }