fedipod-server 0.13.1 → 0.13.2

package/web/app/site/sw.js

@@ -34555,8 +34555,40 @@ var PodStore = class {
     this.cache.set("ids.json", ids);
     return id;
   }
+  // The map first, for ids minted under an older scheme. Then, because the
+  // id IS the hash of the url, whatever this store knows is scanned for the
+  // url that hashes to it — actors, posts, contacts, requests, media. The
+  // browser build's worker is stopped whenever it idles, and the in-memory
+  // map went with it: a client clicking an account it had just been shown
+  // reached a fresh worker that held the actor and could not name it.
   urlFor(id) {
-    return this.getIds()[id] || null;
+    const ids = this.getIds();
+    if (ids[id]) return ids[id];
+    if (!/^[a-f0-9]{16}$/u.test(String(id))) return null;
+    const hash = (u) => node_crypto_default.createHash("sha256").update(u).digest("hex").slice(0, 16);
+    const seen = /* @__PURE__ */ new Set();
+    const candidates = function* (store) {
+      for (const u of Object.keys(store.getActors())) yield u;
+      for (const st2 of store.getStatuses()) {
+        yield st2.noteId;
+        yield st2.actor;
+        for (const a of st2.attachments || []) if (a?.url) yield a.url;
+      }
+      const c = store.getContacts();
+      for (const f of [...c.followers, ...c.following]) if (f?.actor) yield f.actor;
+      for (const r of store.getRequests()) if (r?.actor) yield r.actor;
+      for (const u of Object.keys(store.getMedia())) yield u;
+    };
+    for (const u of candidates(this)) {
+      if (typeof u !== "string" || seen.has(u)) continue;
+      seen.add(u);
+      if (hash(u) === id) {
+        ids[id] = u;
+        this.cache.set("ids.json", ids);
+        return u;
+      }
+    }
+    return null;
   }
 };
 
@@ -57439,9 +57471,9 @@ async function onUpdate(intake, activity, actor) {
   const note = await intake.fetchAP(objectId);
   if (!note) throw new Error(`cannot refetch ${objectId} \u2014 will retry`);
   if (note.id !== objectId || !isContentType(note.type)) return `object not verifiable content (${objectId}, ${note.type})`;
-  const { attachmentsOf: attachmentsOf3, titledContent: titledContent2 } = await Promise.resolve().then(() => (init_wire(), wire_exports));
+  const { attachmentsOf: attachmentsOf2, titledContent: titledContent2 } = await Promise.resolve().then(() => (init_wire(), wire_exports));
   const content = titledContent2(note);
-  const attachments = attachmentsOf3(note);
+  const attachments = attachmentsOf2(note);
   const freshPoll = pollOf(note);
   const freshEmojis = emojisOf(note);
   intake.store.updateStatus(objectId, {
@@ -57575,8 +57607,8 @@ async function ingestNote(intake, objectId, actor, { via } = {}) {
   const note = await intake.fetchAP(objectId);
   if (!note) return `object fetch failed (${objectId})`;
   if (note.id !== objectId || !isContentType(note.type)) return `object not verifiable content (${objectId}, ${note.type})`;
-  const { attachmentsOf: attachmentsOf3, titledContent: titledContent2 } = await Promise.resolve().then(() => (init_wire(), wire_exports));
-  const attachments = attachmentsOf3(note);
+  const { attachmentsOf: attachmentsOf2, titledContent: titledContent2 } = await Promise.resolve().then(() => (init_wire(), wire_exports));
+  const attachments = attachmentsOf2(note);
   const content = titledContent2(note);
   const author = authorOf(note, actor);
   if (!author) return `object names an author its origin does not vouch for (${objectId})`;
@@ -64496,16 +64528,6 @@ var postUrl = (uri) => {
   const m = String(uri).match(/^at:\/\/([^/]+)\/[^/]+\/(.+)$/);
   return m ? `https://bsky.app/profile/${m[1]}/post/${m[2]}` : null;
 };
-function attachmentsOf2(post) {
-  const e = post?.embed || {};
-  const images = [...e.images || [], ...e.media?.images || []].filter((i) => i?.fullsize).map((i) => ({ url: i.fullsize, mediaType: "image/jpeg", description: i.alt || "" }));
-  const card = e.external?.thumb || e.media?.external?.thumb;
-  if (card) {
-    const ext = e.external || e.media.external;
-    images.push({ url: card, mediaType: "image/jpeg", description: ext.title || ext.uri || "" });
-  }
-  return images;
-}
 var BskyFeed = class {
   constructor({ store, atproto, log: log2 = console.log, onNotification = null }) {
     Object.assign(this, { store, atproto, log: log2, onNotification });
@@ -64561,27 +64583,14 @@ var BskyFeed = class {
     return url;
   }
   // One Bluesky post into the statuses index. Returns its noteId, new or not.
-  // A post seen before is completed, not duplicated: a reply first met as a
-  // bare notification record learns its parent and its pictures from the
-  // full view when that arrives.
   _mirrorPost(post, { via = null } = {}) {
     const noteId = post.uri;
-    const inReplyTo = post.record?.reply?.parent?.uri || null;
-    const attachments = attachmentsOf2(post);
-    const existing = this.store.getStatuses().find((s) => s.noteId === noteId);
-    if (existing) {
-      const patch = {
-        ...inReplyTo && !existing.inReplyTo ? { inReplyTo } : {},
-        ...attachments.length && !existing.attachments?.length ? { attachments } : {}
-      };
-      if (Object.keys(patch).length && typeof this.store.updateStatus === "function") {
-        this.store.updateStatus(noteId, patch);
-      }
-      return { noteId, added: false };
-    }
+    const existing = this.store.getStatuses().some((s) => s.noteId === noteId);
+    if (existing) return { noteId, added: false };
     const actor = this._rememberAuthor(post.author);
     if (this.store.isBlocked(actor)) return { noteId, added: false };
     const text = post.record?.text || "";
+    const images = post.embed?.images || [];
     this.store.addStatus({
       noteId,
       actor,
@@ -64591,46 +64600,12 @@ var BskyFeed = class {
       ...post.cid ? { cid: post.cid } : {},
       link: postUrl(noteId),
       ...via ? { via } : {},
-      ...inReplyTo ? { inReplyTo } : {},
-      ...attachments.length ? { attachments } : {}
+      ...images.length ? {
+        attachments: images.map((i) => ({ url: i.fullsize, mediaType: "image/jpeg", description: i.alt || "" }))
+      } : {}
     });
     return { noteId, added: true };
   }
-  // The conversation under one post, asked for when a post is opened: the
-  // ancestors it hangs from and the replies beneath it, each mirrored with
-  // the reply link the thread view is built from. View cache only, like the
-  // timeline. Returns how many posts were new; a thread Bluesky will not
-  // give (gone, blocked, rate-limited) adds none and is logged, not thrown.
-  async mirrorThread(uri, { depth = 6 } = {}) {
-    if (!this.atproto?.connected()) return 0;
-    if (this.quietUntil && Date.now() < this.quietUntil) return 0;
-    let out;
-    try {
-      out = await this.atproto.xrpc("app.bsky.feed.getPostThread", { params: { uri, depth, parentHeight: 40 } });
-    } catch (e) {
-      if (e.status === 429 || e.status >= 500) this._backOff(e.status, null);
-      else this.log(`bskyfeed: thread ${uri}: ${e.message}`);
-      return 0;
-    }
-    const self2 = this.atproto.read()?.did;
-    const ownMirrors = new Set(this.store.getStatuses().map((s) => s.atproto?.uri).filter(Boolean));
-    let added = 0;
-    const take2 = (node) => {
-      const post = node?.post;
-      if (!post?.uri) return;
-      if (post.author?.did === self2 && ownMirrors.has(post.uri)) return;
-      if (this._mirrorPost(post).added) added++;
-    };
-    for (let up = out?.thread?.parent; up; up = up.parent) take2(up);
-    const walk = (node, left) => {
-      take2(node);
-      if (left <= 0) return;
-      for (const r of node?.replies || []) walk(r, left - 1);
-    };
-    walk(out?.thread, depth);
-    if (added) this.log(`bskyfeed: +${added} from the thread under ${uri}`);
-    return added;
-  }
   async sweep() {
     if (!this.atproto?.connected()) return;
     if (this.quietUntil && Date.now() < this.quietUntil) return;
@@ -64669,13 +64644,8 @@ var BskyFeed = class {
           this.store.addNotification({ type: "follow", actor, bsky: true });
           await this.onNotification?.(n, { actor });
         } else if (n.reason === "mention" || n.reason === "reply") {
-          let view = null;
-          try {
-            const got = await this.atproto.xrpc("app.bsky.feed.getPosts", { params: { uris: n.uri } });
-            view = (got?.posts || [])[0] || null;
-          } catch {
-          }
-          this._mirrorPost(view || { uri: n.uri, cid: n.cid, author: n.author, record: n.record, indexedAt: n.indexedAt });
+          const record = { uri: n.uri, cid: n.cid, author: n.author, record: n.record, indexedAt: n.indexedAt };
+          this._mirrorPost(record);
           this.store.addNotification({ type: "mention", actor, noteId: n.uri, bsky: true });
           await this.onNotification?.(n, { actor });
         }
@@ -65493,7 +65463,8 @@ async function handle4(api, ctx) {
     }
     const hit = Object.entries(api.store.getActors()).find(([u, a]) => {
       try {
-        return `${a.preferredUsername}@${new URL(u).host}` === acct;
+        const at = new URL(u);
+        return `${a.preferredUsername}@${at.host}` === acct || `${a.preferredUsername}@${at.hostname}` === acct;
       } catch {
         return false;
       }
@@ -66007,10 +65978,6 @@ async function handle6(api, ctx) {
   const mContext = /^\/api\/v1\/statuses\/([a-f0-9]+)\/context$/.exec(pathname);
   if (mContext) {
     const noteUrl = api.lookup(mContext[1]).s?.noteId;
-    const opened = noteUrl && api.store.getStatuses().find((x) => x.noteId === noteUrl);
-    if (opened?.kind === "bsky" && typeof api.agent?.bskyfeed?.mirrorThread === "function") {
-      await api.agent.bskyfeed.mirrorThread(noteUrl);
-    }
     const all = api.store.getStatuses();
     const byId = new Map(all.map((s) => [s.noteId, s]));
     const ancestors = [];
@@ -66446,8 +66413,8 @@ var TagFeed = class {
             await this.intake.fetchAP(author).catch(() => {
             });
           }
-          const { attachmentsOf: attachmentsOf3, titledContent: titledContent2 } = await Promise.resolve().then(() => (init_wire(), wire_exports));
-          const attachments = attachmentsOf3(note);
+          const { attachmentsOf: attachmentsOf2, titledContent: titledContent2 } = await Promise.resolve().then(() => (init_wire(), wire_exports));
+          const attachments = attachmentsOf2(note);
           this.store.addStatus({
             noteId,
             actor: author,