fedipod 1.50.0 → 1.50.2

package/lib/client/masto/render.mjs

@@ -10,6 +10,13 @@ import { sanitizeHtml, followsNeedApproval, publicHandle } from '../../core/wire
 import { profileUrl, postUrl } from '../../connections/bskyfeed.mjs';
 import { htmlToText } from './body.mjs';
 
+// Posts stored from 2026-09-13 to 2026-10-10 hold a Mastodon post's text twice,
+// joined by a comma; shown once.
+export const once = (html) => {
+  const m = (html.length - 1) / 2;
+  return Number.isInteger(m) && html[m] === ',' && html.slice(0, m) === html.slice(m + 1) ? html.slice(0, m) : html;
+};
+
 // 1x1 transparent PNG — placeholder header, and the instance thumbnail. A
 // banner nobody set should take up no room and show nothing; an avatar is a
 // different matter (below).
@@ -273,7 +280,7 @@ export function status(api, s, { all, depth = 0 } = {}) {
     created_at: s.published || new Date().toISOString(),
     in_reply_to_id: s.inReplyTo ? api.store.idFor(s.inReplyTo) : null,
     in_reply_to_account_id: null,
-    sensitive: !!(s.spoiler || s.sensitive), spoiler_text: s.spoiler || '',
+    sensitive: !!(s.spoiler || s.sensitive), spoiler_text: once(s.spoiler || ''),
     visibility: s.visibility || 'public', language: null,
     edited_at: s.editedAt || null,
     uri: s.noteId, url: s.link || s.noteId,
@@ -284,7 +291,7 @@ export function status(api, s, { all, depth = 0 } = {}) {
     favourited: !!s.favourited || (s.sourceAccts || []).some(v => v.favourited),
     reblogged: !!s.reblogged || (s.sourceAccts || []).some(v => v.reblogged),
     muted: false, bookmarked: !!s.bookmarked, pinned: !!s.pinned,
-    content: s.content || '',
+    content: once(s.content || ''),
     reblog: null, application: null,
     account: api.account(s.actor),
     media_attachments: (s.attachments || []).map(a => api.mediaJson(a)),
@@ -323,7 +330,7 @@ export function status(api, s, { all, depth = 0 } = {}) {
 // information it uses to decide anyway.
 export function filtersFor(api, s) {
   const now = Date.now();
-  const hay = `${s.content || ''} ${s.spoiler || ''}`
+  const hay = `${once(s.content || '')} ${once(s.spoiler || '')}`
     .replace(/<[^>]*>/gu, ' ')            // the text, not the markup around it
     .toLowerCase();
   if (!hay.trim()) return [];
@@ -403,7 +410,7 @@ export function pushNotify(api, n) {
   return api.push.notify(n, {
     notification_id: n.id, notification_type: n.type, preferred_locale: 'en',
     title: `${acct.display_name || acct.acct} ${verbs[n.type] || n.type}`,
-    body: s ? htmlToText(s.content || '').slice(0, 140) : '',
+    body: s ? htmlToText(once(s.content || '')).slice(0, 140) : '',
     icon: acct.avatar || '',
   });
 }

package/lib/core/graphview.mjs

@@ -227,6 +227,8 @@ function fromLiteral(term) {
   return term.value;
 }
 
+const isTagged = (term) => term.termType === 'Literal' && !!term.language;
+
 function toValue(term, ctx, depth, path) {
   if (term.termType === 'Literal') return fromLiteral(term);
   if (isListHead(term, ctx)) return readList(term.value, ctx, depth, path);
@@ -248,8 +250,14 @@ function readProperty(subject, name, ctx, depth = 0, path = new Set()) {
 
   const term = TERMS.get(name);
   if (!term) return undefined;
-  const values = preds.get(term.iri);
+  let values = preds.get(term.iri);
   if (!values || !values.length) return undefined;
+  // `content` and `contentMap` are one predicate, and Mastodon sends a post's
+  // text both ways. The plain term is the untagged copy, else the first tagged.
+  if (values.some(isTagged)) {
+    const plain = values.filter(v => !isTagged(v));
+    values = plain.length ? plain : [values.find(isTagged)];
+  }
 
   // `items` and `orderedItems` are the same predicate; the list is what tells
   // them apart, so asking for the ordered one only answers when it is ordered.

package/lib/core/publisher/restore.mjs

@@ -210,6 +210,7 @@ export async function rebuildStatuses(publisher, { fromNotes = false } = {}) {
 // merge-only rebuild when something is.
 export async function healStatuses(publisher) {
   const { urls, store } = publisher;
+  if (store.unread?.has('statuses.json')) return { missing: 0, recovered: 0 };   // nothing to compare with
   const own = store.read('outbox.json', [])
     .map(i => (typeof i === 'string' ? i : null))
     .filter(id => id && id.startsWith(urls.notes));

package/lib/core/store.mjs

@@ -90,6 +90,10 @@ export class PodStore {
     this._held = 0;
     this.chain = Promise.resolve();  // serialized writes
     this.verdicts = new Map();     // name → did its last write land? (read by commit)
+    // Documents the pod holds that could not be read, and that nothing here
+    // has a copy of. Never written to until they are read: what this store
+    // would send is not the document, and would replace it on the pod.
+    this.unread = new Set();
     // Moves on each time queued writes are dropped (discardPending): work that
     // began in an earlier generation has lost results, whatever a commit says.
     this.generation = 0;
@@ -106,7 +110,7 @@ export class PodStore {
   attach(storage) {
     // A different tree is different state: carrying the old cache and its
     // ETags across would serve one container's documents as another's.
-    if (this.storage && this.storage.base !== storage.base) { this.cache.clear(); this.etags.clear(); this.lastText.clear(); }
+    if (this.storage && this.storage.base !== storage.base) { this.cache.clear(); this.etags.clear(); this.lastText.clear(); this.unread.clear(); }
     this.storage = storage;
   }
 
@@ -137,8 +141,8 @@ export class PodStore {
     if (listing.missing && this.storage.kind === 'pod') {
       throw new Error(`state container missing (HTTP 404) at ${this.base} — pod unreachable or state gone`);
     }
-    this.etags.set('', listing.etag);
     const names = listing.names.filter(n => n.endsWith('.json'));
+    for (const name of this.unread) if (!names.includes(name)) this.unread.delete(name);   // gone: nothing to write over
     let fetched = 0;
     const skipped = [];
     for (const name of names) {
@@ -147,17 +151,20 @@ export class PodStore {
       if (r.notModified) continue;                        // ours is current
       if (!r.ok) {
         // One unreadable document must not restart the whole sweep — skip it,
-        // keep whatever we already hold, and try again next load (no etag is
-        // recorded, so the retry is unconditional). config.json is the
+        // keep whatever we already hold, and try again next load (neither its
+        // etag nor the container's is recorded, so the next load lists and
+        // reads it again). config.json is the
         // exception: without it the caller cannot tell "never set up" from
         // "could not read", and would tell the user to run setup.
         if (name === 'config.json' && !this.cache.has(name)) {
           throw new Error(`state doc ${name} unreadable (HTTP ${r.status})`);
         }
+        if (!this.lastText.has(name)) this.unread.add(name);
         skipped.push(`${name} (HTTP ${r.status})`);
         continue;
       }
       fetched++;
+      this.unread.delete(name);
       this.etags.set(name, r.etag);
       try { this.cache.set(name, JSON.parse(r.body)); this.lastText.set(name, r.body); }
       catch (e) { this.log(`state load ${name}: unparsable (${e.message})`); }
@@ -165,7 +172,12 @@ export class PodStore {
     // Kept for /status: a document skipped here is a timeline or a contact
     // list quietly missing, and the owner should be able to see that.
     this.lastSkipped = skipped;
-    if (skipped.length) this.log(`state load skipped ${skipped.length}: ${skipped.join(', ')}`);
+    // The container's ETag vouches for every document in it, so it is kept
+    // only when every one was read; otherwise the next load would stop at
+    // "not modified" and never retry what was skipped.
+    if (skipped.length) this.etags.delete(''); else this.etags.set('', listing.etag);
+    if (skipped.length) this.log(`state load skipped ${skipped.length}: ${skipped.join(', ')}`
+      + (this.unread.size ? ` — not written until read: ${[...this.unread].join(', ')}` : ''));
     this.log(`state loaded: ${this.cache.size} doc(s) from ${this.base} (${fetched} re-fetched)`);
     this.onLoaded?.();
   }
@@ -177,6 +189,7 @@ export class PodStore {
     for (const { name, text, etag } of docs) {
       try { this.cache.set(name, JSON.parse(text)); } catch { continue; }
       this.lastText.set(name, text);
+      this.unread.delete(name);
       if (etag) this.etags.set(name, etag);
     }
     if (listingEtag) this.etags.set('', listingEtag);
@@ -193,11 +206,12 @@ export class PodStore {
       const r = await this.storage.read(name, etag ? { etag } : undefined);
       if (r.notModified) continue;
       if (r.status === 404) {
-        this.cache.delete(name); this.lastText.delete(name); this.etags.delete(name);
+        this.cache.delete(name); this.lastText.delete(name); this.etags.delete(name); this.unread.delete(name);
       } else if (!r.ok) {
         throw new Error(`state doc ${name} unreadable (HTTP ${r.status})`);
       } else {
         this.cache.set(name, JSON.parse(r.body)); this.lastText.set(name, r.body); this.etags.set(name, r.etag);
+        this.unread.delete(name);
       }
       this.onSettled?.(name);
     }
@@ -216,6 +230,8 @@ export class PodStore {
   write(name, obj) {
     this.cache.set(name, structuredClone(obj));
     if (!this.storage) return;
+    // Not sent: the next commit says it did not land, and reads it first.
+    if (this.unread.has(name)) { this.verdicts.set(name, false); return; }
     // The same bytes the pod already holds are not sent again. A like, a
     // bookmark, a sweep that found nothing new each used to upload the whole
     // timeline index and the whole people cache, unchanged — the largest
@@ -263,6 +279,7 @@ export class PodStore {
   // the returned promise so one failure cannot poison the queue.
   _put(name) {
     const done = this.chain.then(async () => {
+      if (this.unread.has(name)) return false;
       const body = serialise(this.cache.get(name));
       await Promise.resolve(this.onWriting?.(name, body)).catch(() => {});
       for (let attempt = 1; attempt <= PUT_RETRIES; attempt++) {
@@ -313,6 +330,10 @@ export class PodStore {
   // `since`: the generation the caller's work began in. Anything dropped since
   // makes the answer false.
   async commit({ since } = {}) {
+    // A document that could not be read is read now, replacing whatever was
+    // written to it here; those writes already count as not landed, so the
+    // drain keeps its items and takes them again against the real document.
+    if (this.unread.size && this.storage) await this.refresh([...this.unread]).catch(() => {});
     const pending = [];
     // Held names too, or a sweep that suspended the debounce would delete the
     // pod's copy of an item whose result had not been written down — the one

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fedipod",
-  "version": "1.50.0",
+  "version": "1.50.2",
   "description": "Standalone single-actor ActivityPub agent whose wire face, RDF truth and state all live on a Solid pod (CSS). Bundles a Phanpy UI and a Mastodon client-API facade.",
   "type": "module",
   "license": "MIT",
@@ -55,7 +55,7 @@
     "install-service": "node bin/fedipod.mjs install-service",
     "uninstall-service": "node bin/fedipod.mjs uninstall-service",
     "prepublishOnly": "npm test",
-    "test": "node claude/smoke-tests/agent-smoke.mjs && node claude/smoke-tests/front-hard-test.mjs && node claude/smoke-tests/copy-test.mjs && node claude/smoke-tests/copy-mode-test.mjs && node claude/smoke-tests/hold-test.mjs && node claude/smoke-tests/masto-gateway-test.mjs && node scripts/check-pod-calls.mjs && node scripts/verify-ui.mjs && node --test claude/smoke-tests/forum-signup-form.test.mjs claude/smoke-tests/door-verify.test.mjs claude/smoke-tests/oauth-signin.test.mjs claude/smoke-tests/app-registration.test.mjs claude/smoke-tests/push-signout.test.mjs claude/smoke-tests/token-fetches.test.mjs claude/smoke-tests/signin-hardening.test.mjs claude/smoke-tests/load-fixes.test.mjs && node scripts/check-sizes.mjs && node scripts/test-dependents.mjs && node claude/validation/browser-agent/all.mjs",
+    "test": "node claude/smoke-tests/agent-smoke.mjs && node claude/smoke-tests/front-hard-test.mjs && node claude/smoke-tests/copy-test.mjs && node claude/smoke-tests/copy-mode-test.mjs && node claude/smoke-tests/hold-test.mjs && node claude/smoke-tests/masto-gateway-test.mjs && node scripts/check-pod-calls.mjs && node scripts/verify-ui.mjs && node --test claude/smoke-tests/forum-signup-form.test.mjs claude/smoke-tests/door-verify.test.mjs claude/smoke-tests/oauth-signin.test.mjs claude/smoke-tests/app-registration.test.mjs claude/smoke-tests/push-signout.test.mjs claude/smoke-tests/token-fetches.test.mjs claude/smoke-tests/signin-hardening.test.mjs claude/smoke-tests/load-fixes.test.mjs claude/smoke-tests/unread-docs.test.mjs claude/smoke-tests/post-text-once.test.mjs && node scripts/check-sizes.mjs && node scripts/test-dependents.mjs && node claude/validation/browser-agent/all.mjs",
     "verify-ui": "node scripts/verify-ui.mjs",
     "build:sw": "node scripts/build-app.mjs --entry web/app/sw-src.mjs --out web/app/dist/sw.js",
     "build:boot": "node scripts/build-app.mjs --entry web/app/boot.mjs --out web/app/dist/boot.js",

package/web/app/agent.mjs

@@ -516,7 +516,9 @@ export class BrowserAgent {
     let unread = null;
     const fullLoad = () => this.store.load().catch((e) => { unread = e; });
     // Warm: only documents caught mid-write are read again, else a full load.
-    if (this._warm) await this.store.refresh(this._warm.pending).catch(fullLoad);
+    // A kept copy without the container's ETag is one whose last load could
+    // not read everything: what it lacks is still on the pod, unread.
+    if (this._warm && warmFrom.listingEtag) await this.store.refresh(this._warm.pending).catch(fullLoad);
     else await fullLoad();
     // Config: handed in on sign-up, or read from the pod on a returning sign-in.
     const cfg = config || this.store.getConfig();

package/web/app/dist/sw.js

@@ -45791,6 +45791,7 @@ var PodStore = class {
     this._held = 0;
     this.chain = Promise.resolve();
     this.verdicts = /* @__PURE__ */ new Map();
+    this.unread = /* @__PURE__ */ new Set();
     this.generation = 0;
     this.onLoaded = null;
     this.onWriting = null;
@@ -45804,6 +45805,7 @@ var PodStore = class {
       this.cache.clear();
       this.etags.clear();
       this.lastText.clear();
+      this.unread.clear();
     }
     this.storage = storage;
   }
@@ -45826,8 +45828,8 @@ var PodStore = class {
     if (listing.missing && this.storage.kind === "pod") {
       throw new Error(`state container missing (HTTP 404) at ${this.base} \u2014 pod unreachable or state gone`);
     }
-    this.etags.set("", listing.etag);
     const names = listing.names.filter((n) => n.endsWith(".json"));
+    for (const name of this.unread) if (!names.includes(name)) this.unread.delete(name);
     let fetched = 0;
     const skipped = [];
     for (const name of names) {
@@ -45838,10 +45840,12 @@ var PodStore = class {
         if (name === "config.json" && !this.cache.has(name)) {
           throw new Error(`state doc ${name} unreadable (HTTP ${r.status})`);
         }
+        if (!this.lastText.has(name)) this.unread.add(name);
         skipped.push(`${name} (HTTP ${r.status})`);
         continue;
       }
       fetched++;
+      this.unread.delete(name);
       this.etags.set(name, r.etag);
       try {
         this.cache.set(name, JSON.parse(r.body));
@@ -45851,7 +45855,9 @@ var PodStore = class {
       }
     }
     this.lastSkipped = skipped;
-    if (skipped.length) this.log(`state load skipped ${skipped.length}: ${skipped.join(", ")}`);
+    if (skipped.length) this.etags.delete("");
+    else this.etags.set("", listing.etag);
+    if (skipped.length) this.log(`state load skipped ${skipped.length}: ${skipped.join(", ")}` + (this.unread.size ? ` \u2014 not written until read: ${[...this.unread].join(", ")}` : ""));
     this.log(`state loaded: ${this.cache.size} doc(s) from ${this.base} (${fetched} re-fetched)`);
     this.onLoaded?.();
   }
@@ -45866,6 +45872,7 @@ var PodStore = class {
         continue;
       }
       this.lastText.set(name, text);
+      this.unread.delete(name);
       if (etag) this.etags.set(name, etag);
     }
     if (listingEtag) this.etags.set("", listingEtag);
@@ -45884,12 +45891,14 @@ var PodStore = class {
         this.cache.delete(name);
         this.lastText.delete(name);
         this.etags.delete(name);
+        this.unread.delete(name);
       } else if (!r.ok) {
         throw new Error(`state doc ${name} unreadable (HTTP ${r.status})`);
       } else {
         this.cache.set(name, JSON.parse(r.body));
         this.lastText.set(name, r.body);
         this.etags.set(name, r.etag);
+        this.unread.delete(name);
       }
       this.onSettled?.(name);
     }
@@ -45908,6 +45917,10 @@ var PodStore = class {
   write(name, obj) {
     this.cache.set(name, structuredClone(obj));
     if (!this.storage) return;
+    if (this.unread.has(name)) {
+      this.verdicts.set(name, false);
+      return;
+    }
     if (this.lastText.get(name) === serialise(obj)) {
       clearTimeout(this.timers.get(name));
       this.timers.delete(name);
@@ -45957,6 +45970,7 @@ var PodStore = class {
   // the returned promise so one failure cannot poison the queue.
   _put(name) {
     const done = this.chain.then(async () => {
+      if (this.unread.has(name)) return false;
       const body = serialise(this.cache.get(name));
       await Promise.resolve(this.onWriting?.(name, body)).catch(() => {
       });
@@ -46011,6 +46025,8 @@ var PodStore = class {
   // `since`: the generation the caller's work began in. Anything dropped since
   // makes the answer false.
   async commit({ since } = {}) {
+    if (this.unread.size && this.storage) await this.refresh([...this.unread]).catch(() => {
+    });
     const pending = [];
     for (const name of /* @__PURE__ */ new Set([...this.timers.keys(), ...this.dirty])) {
       const t = this.timers.get(name);
@@ -57169,6 +57185,7 @@ function fromLiteral(term3) {
   }
   return term3.value;
 }
+var isTagged = (term3) => term3.termType === "Literal" && !!term3.language;
 function toValue(term3, ctx, depth, path) {
   if (term3.termType === "Literal") return fromLiteral(term3);
   if (isListHead(term3, ctx)) return readList(term3.value, ctx, depth, path);
@@ -57187,8 +57204,12 @@ function readProperty(subject, name, ctx, depth = 0, path = /* @__PURE__ */ new
   }
   const term3 = TERMS.get(name);
   if (!term3) return void 0;
-  const values = preds.get(term3.iri);
+  let values = preds.get(term3.iri);
   if (!values || !values.length) return void 0;
+  if (values.some(isTagged)) {
+    const plain = values.filter((v) => !isTagged(v));
+    values = plain.length ? plain : [values.find(isTagged)];
+  }
   const listed = values.filter((v) => isListHead(v, ctx));
   if (term3.list) {
     if (!listed.length) return void 0;
@@ -58104,6 +58125,7 @@ async function rebuildStatuses(publisher, { fromNotes = false } = {}) {
 }
 async function healStatuses(publisher) {
   const { urls, store } = publisher;
+  if (store.unread?.has("statuses.json")) return { missing: 0, recovered: 0 };
   const own = store.read("outbox.json", []).map((i) => typeof i === "string" ? i : null).filter((id) => id && id.startsWith(urls.notes));
   if (!own.length) return { missing: 0, recovered: 0 };
   const have = new Set(store.getStatuses().map((s) => s.noteId));
@@ -68288,6 +68310,10 @@ var BskyFeed = class {
 };
 
 // lib/client/masto/render.mjs
+var once = (html) => {
+  const m = (html.length - 1) / 2;
+  return Number.isInteger(m) && html[m] === "," && html.slice(0, m) === html.slice(m + 1) ? html.slice(0, m) : html;
+};
 var TRANSPARENT_PNG = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==";
 var DEFAULT_AVATAR = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAABd0lEQVR42u3ZoW4CQRDG8Xk6NBLbVCJ5gBpMTQ2iBlFR29RXNsFhz1JHXV9hydfkEkoobW5n2F34i0kIHMfN73ZvdwYbTabpmsMAAAAAAAAAAAAAAAAAAACiY3wzS/ePz+n1bZW6zTZ9fH59h17rPX2mYy4OQEktnl5+JP1b6Bgdey6IcIDb2Ty9r7s/Ez8MfUffbRpACfznrp8aDdEIFjnsh9z5YyMhcjqEAWge5ybfh87VFIDuWM7QPzYVokZBCICWM6/k+9A5mwHQmu4NoHM2A+A5/PenQTMA3sn3AQBTgIcgyyAbIbbCFEOUwzREaInRFKUtDgAAFQLcPSxDCqH9Z4V+o0oAXVhU4ofhiWCtJe+NYKV3e6V3idkAHvv9nDqhKIBnxVeqUrRaav5SvQKrqetTols0GGDdbaoB0LWcFUBP31qS72PoimCtD//caWC1tL1Ltc2ttbXfe08wCKC25HP+OgMAAAAAAAAAAAAAAAAArhNgB1PE/x/JOiuNAAAAAElFTkSuQmCC";
 var selfIcon = (api, self2, cached) => (self2 ? api.store.getConfig()?.icon : null) || cached.icon;
@@ -68511,7 +68537,7 @@ function status(api, s, { all, depth = 0 } = {}) {
     in_reply_to_id: s.inReplyTo ? api.store.idFor(s.inReplyTo) : null,
     in_reply_to_account_id: null,
     sensitive: !!(s.spoiler || s.sensitive),
-    spoiler_text: s.spoiler || "",
+    spoiler_text: once(s.spoiler || ""),
     visibility: s.visibility || "public",
     language: null,
     edited_at: s.editedAt || null,
@@ -68528,7 +68554,7 @@ function status(api, s, { all, depth = 0 } = {}) {
     muted: false,
     bookmarked: !!s.bookmarked,
     pinned: !!s.pinned,
-    content: s.content || "",
+    content: once(s.content || ""),
     reblog: null,
     application: null,
     account: api.account(s.actor),
@@ -68570,7 +68596,7 @@ function status(api, s, { all, depth = 0 } = {}) {
 }
 function filtersFor(api, s) {
   const now = Date.now();
-  const hay = `${s.content || ""} ${s.spoiler || ""}`.replace(/<[^>]*>/gu, " ").toLowerCase();
+  const hay = `${once(s.content || "")} ${once(s.spoiler || "")}`.replace(/<[^>]*>/gu, " ").toLowerCase();
   if (!hay.trim()) return [];
   const out = [];
   for (const f of api.store.getFilters?.() || []) {
@@ -68657,7 +68683,7 @@ function pushNotify(api, n) {
     notification_type: n.type,
     preferred_locale: "en",
     title: `${acct.display_name || acct.acct} ${verbs[n.type] || n.type}`,
-    body: s ? htmlToText(s.content || "").slice(0, 140) : "",
+    body: s ? htmlToText(once(s.content || "")).slice(0, 140) : "",
     icon: acct.avatar || ""
   });
 }
@@ -74022,7 +74048,7 @@ var BrowserAgent = class _BrowserAgent {
     const fullLoad = () => this.store.load().catch((e) => {
       unread = e;
     });
-    if (this._warm) await this.store.refresh(this._warm.pending).catch(fullLoad);
+    if (this._warm && warmFrom.listingEtag) await this.store.refresh(this._warm.pending).catch(fullLoad);
     else await fullLoad();
     const cfg = config || this.store.getConfig();
     if (!cfg) throw await accountNotRead({ unread, podBase: remotePod, state: this.urls.state, webId, actorUrl: this.urls.actor });