fedipod 1.8.0 → 1.10.0

package/web/app/dist/sw.js

@@ -9589,6 +9589,7 @@ __export(wire_exports, {
   AS_CTX: () => AS_CTX,
   DEFAULT_ROOT: () => DEFAULT_ROOT,
   FOLLOWERS_PAGE_SIZE: () => FOLLOWERS_PAGE_SIZE,
+  HASHTAG_RE: () => HASHTAG_RE,
   MENTION_RE: () => MENTION_RE,
   OUTBOX_PAGE_SIZE: () => OUTBOX_PAGE_SIZE,
   PUBLIC: () => PUBLIC,
@@ -9615,6 +9616,7 @@ __export(wire_exports, {
   followersPageId: () => followersPageId,
   followersPaging: () => followersPaging,
   followsNeedApproval: () => followsNeedApproval,
+  hashtagsIn: () => hashtagsIn,
   hostMeta: () => hostMeta,
   jrd: () => jrd,
   likeActivity: () => likeActivity,
@@ -9627,11 +9629,13 @@ __export(wire_exports, {
   orderedCollection: () => orderedCollection,
   outboxHead: () => outboxHead,
   outboxItemId: () => outboxItemId,
+  outboxLocalItem: () => outboxLocalItem,
   outboxPage: () => outboxPage,
   outboxPageCount: () => outboxPageCount,
   outboxPageId: () => outboxPageId,
   outboxPages: () => outboxPages,
   outboxPaging: () => outboxPaging,
+  outboxWireItem: () => outboxWireItem,
   pageItems: () => pageItems,
   profilePageHtml: () => profilePageHtml,
   publicHandle: () => publicHandle,
@@ -9639,6 +9643,7 @@ __export(wire_exports, {
   rejectActivity: () => rejectActivity,
   repliesId: () => repliesId,
   sanitizeHtml: () => sanitizeHtml,
+  tagHref: () => tagHref,
   titledContent: () => titledContent,
   tombstoneDoc: () => tombstoneDoc,
   undoActivity: () => undoActivity,
@@ -9659,11 +9664,14 @@ function hostMeta(base) {
 </XRD>
 `;
 }
-function jrd({ handle: handle7, host, actor, aliases = [] }) {
+function jrd({ handle: handle7, host, actor, aliases = [], page: page2 = null }) {
   return {
     subject: `acct:${handle7}@${host}`,
     ...aliases.length ? { aliases } : {},
-    links: [{ rel: "self", type: "application/activity+json", href: actor }]
+    links: [
+      { rel: "self", type: "application/activity+json", href: actor },
+      ...page2 ? [{ rel: "http://webfinger.net/rel/profile-page", type: "text/html", href: page2 }] : []
+    ]
   };
 }
 function followsNeedApproval(config = {}) {
@@ -9926,7 +9934,7 @@ function outboxPage(outboxId, n, items) {
     id: outboxPageId(outboxId, n),
     type: "OrderedCollectionPage",
     partOf: outboxId,
-    orderedItems: items,
+    orderedItems: items.map(outboxWireItem),
     ...n > 1 ? { next: outboxPageId(outboxId, n - 1) } : {}
   };
 }
@@ -10046,8 +10054,27 @@ function attachmentsOf(note) {
 function mentionsIn(text) {
   return [...new Set(String(text).match(MENTION_RE) || [])].map((m) => m.slice(1));
 }
-function contentHtml(text, mentions = []) {
+function hashtagsIn(text) {
+  const seen = /* @__PURE__ */ new Map();
+  for (const m of String(text).matchAll(HASHTAG_RE)) {
+    const key = m[2].toLowerCase();
+    if (!seen.has(key)) seen.set(key, m[2]);
+  }
+  return [...seen.values()];
+}
+function tagHref(urls, name) {
+  return urls.profileHtml + "?tag=" + encodeURIComponent(String(name).toLowerCase());
+}
+function contentHtml(text, mentions = [], hashtags = []) {
   let html = String(text).replace(/[&<>]/g, (c) => HTML_ESCAPES[c]);
+  if (hashtags.length) {
+    const byName = new Map(hashtags.filter((h) => h?.name && h?.href).map((h) => [h.name.toLowerCase(), h.href]));
+    html = html.replace(HASHTAG_RE, (all, lead, name) => {
+      const href = byName.get(name.toLowerCase());
+      if (!href) return all;
+      return `${lead}<a href="${String(href).replace(/[&<>"]/g, (c) => HTML_ESCAPES[c] || "&quot;")}" class="mention hashtag" rel="tag">#<span>${name}</span></a>`;
+    });
+  }
   for (const m of mentions) {
     if (!m?.handle || !m?.actor) continue;
     const href = String(m.page || m.actor).replace(/[&<>"]/g, (c) => HTML_ESCAPES[c] || "&quot;");
@@ -10075,28 +10102,35 @@ function noteDoc({
   mentions = [],
   visibility = "public",
   summary = null,
+  sensitive = false,
   updated = null,
-  container = null
+  container = null,
+  also = []
 }) {
   const id = (container || urls.notes) + slug;
   const who = mentions.map((m) => m.actor);
-  const addressed = addressing(urls, visibility, who);
+  const extra = visibility === "direct" ? [] : also.filter((a) => a && !who.includes(a));
+  const addressed = addressing(urls, visibility, [...who, ...extra]);
+  const hashtags = hashtagsIn(content).map((name) => ({ name, href: tagHref(urls, name) }));
   const note = {
     "@context": AS_CTX,
     id,
     type: "Note",
     attributedTo: urls.actor,
-    content: contentHtml(content, mentions),
+    content: contentHtml(content, mentions, hashtags),
     published,
     to: addressed.to,
     cc: addressed.cc,
     replies: repliesId(id)
   };
   if (summary) note.summary = summary;
+  if (summary || sensitive) note.sensitive = true;
   if (updated) note.updated = updated;
-  if (mentions.length) {
-    note.tag = mentions.map((m) => ({ type: "Mention", href: m.actor, name: "@" + m.handle }));
-  }
+  const tag = [
+    ...mentions.map((m) => ({ type: "Mention", href: m.actor, name: "@" + m.handle })),
+    ...hashtags.map((h) => ({ type: "Hashtag", href: h.href, name: "#" + h.name }))
+  ];
+  if (tag.length) note.tag = tag;
   if (inReplyTo) note.inReplyTo = inReplyTo;
   if (attachments?.length) {
     note.attachment = attachments.map((a) => ({
@@ -10274,7 +10308,7 @@ function addRemoveActivity({ urls, type, object, target, serial }) {
     target
   };
 }
-var import_sanitize_html, AS_CTX, SEC_CTX, PUBLIC, DEFAULT_ROOT, assertionKeyId, OUTBOX_PAGE_SIZE, outboxPageId, outboxPageCount, outboxItemId, FOLLOWERS_PAGE_SIZE, followersPageId, followersPageCount, ALLOWED_TAGS, ALLOWED_ATTRS, MAX_ATTACHMENTS, MAX_ATTACHMENT_URL, attachmentUrl, HTML_ESCAPES, MENTION_RE;
+var import_sanitize_html, AS_CTX, SEC_CTX, PUBLIC, DEFAULT_ROOT, assertionKeyId, OUTBOX_PAGE_SIZE, outboxPageId, outboxPageCount, outboxItemId, outboxWireItem, outboxLocalItem, FOLLOWERS_PAGE_SIZE, followersPageId, followersPageCount, ALLOWED_TAGS, ALLOWED_ATTRS, MAX_ATTACHMENTS, MAX_ATTACHMENT_URL, attachmentUrl, HTML_ESCAPES, MENTION_RE, HASHTAG_RE;
 var init_wire = __esm({
   "lib/core/wire.mjs"() {
     init_urls();
@@ -10289,6 +10323,8 @@ var init_wire = __esm({
     outboxPageId = (outboxId, n) => `${outboxId}-${n}`;
     outboxPageCount = (total) => Math.max(1, Math.ceil(total / OUTBOX_PAGE_SIZE));
     outboxItemId = (i) => typeof i === "string" ? i : i?.id || null;
+    outboxWireItem = (i) => typeof i === "string" ? createActivityId(i) : i;
+    outboxLocalItem = (i) => typeof i === "string" && i.endsWith("-create") ? i.slice(0, -"-create".length) : i;
     FOLLOWERS_PAGE_SIZE = 20;
     followersPageId = (id, n) => `${id}-${n}`;
     followersPageCount = (total) => Math.max(1, Math.ceil(total / FOLLOWERS_PAGE_SIZE));
@@ -10329,6 +10365,7 @@ var init_wire = __esm({
     };
     HTML_ESCAPES = { "&": "&amp;", "<": "&lt;", ">": "&gt;" };
     MENTION_RE = /@([A-Za-z0-9_.-]+)@([A-Za-z0-9.-]+\.[A-Za-z]{2,}(?::\d+)?)/g;
+    HASHTAG_RE = /(^|[^\/\w)])#([\p{L}\p{N}_]*[\p{L}_][\p{L}\p{N}_]*)/gu;
   }
 });
 
@@ -32650,11 +32687,12 @@ async function verifyHttpSignature(request, { documentLoader, keyCache, timeWind
   } catch {
     result = null;
   }
+  const method = request.headers.has("signature-input") ? "rfc9421" : "draft-cavage";
   if (result?.verified) {
     const key = result.key;
     return {
       verified: true,
-      method: "draft-cavage",
+      method,
       keyId: key.id?.href ?? null,
       actor: key.ownerId?.href ?? null,
       reason: null,
@@ -32675,7 +32713,7 @@ async function verifyHttpSignature(request, { documentLoader, keyCache, timeWind
   if (kind === "keyFetchError") {
     return {
       verified: false,
-      method: "draft-cavage",
+      method,
       keyId: null,
       actor: null,
       reason: "key-unfetchable",
@@ -32684,7 +32722,7 @@ async function verifyHttpSignature(request, { documentLoader, keyCache, timeWind
   }
   return {
     verified: false,
-    method: "draft-cavage",
+    method,
     keyId: null,
     actor: null,
     reason: "bad-signature",
@@ -34481,6 +34519,14 @@ var PodStore = class {
   // — not from the pod, not from the RDF. Unverified entries are dropped first
   // now, so a flood can only ever evict itself, and a stranger's genuine
   // favourite still shows up, which is what recording them at all is for.
+  // What an Undo unsays: the favourite or boost it names, matched by a
+  // predicate on what was recorded. Returns how many went.
+  removeNotifications(pred) {
+    const all = this.getNotifications();
+    const kept = all.filter((n) => !pred(n));
+    if (kept.length !== all.length) this.write("notifications.json", kept);
+    return all.length - kept.length;
+  }
   addNotification(n) {
     const all = this.getNotifications();
     const id = node_crypto_default.createHash("sha256").update(JSON.stringify(n)).digest("hex").slice(0, 16);
@@ -45433,8 +45479,9 @@ async function publishOutbox(publisher, outbox, { acls = false, force = false }
   );
   return wrote;
 }
-function readPublishedOutbox(publisher) {
-  return readPublished(publisher.remote, publisher.urls);
+async function readPublishedOutbox(publisher) {
+  const items = await readPublished(publisher.remote, publisher.urls);
+  return Array.isArray(items) ? items.map(outboxLocalItem) : items;
 }
 async function publishFollowers(publisher, actors, { acls = false, force = false } = {}) {
   const { urls } = publisher;
@@ -55941,6 +55988,35 @@ async function mentionsFor(publisher, content, inReplyTo) {
   }
   return mentions;
 }
+async function replyTarget(publisher, inReplyTo, mentions = [], visibility = "public") {
+  if (!inReplyTo || visibility === "direct" || !publisher.resolveActor) return null;
+  const parent = publisher.store.getStatuses().find((s) => s.noteId === inReplyTo);
+  let actor = parent?.actor || null;
+  if (!parent) {
+    const doc2 = await publisher.resolveActor(inReplyTo).catch(() => null);
+    const by = doc2?.attributedTo;
+    actor = typeof by === "string" ? by : (Array.isArray(by) ? by[0] : by)?.id || null;
+    if (typeof actor === "object") actor = actor?.id || null;
+  }
+  if (!actor || actor === publisher.urls.actor) return null;
+  if (mentions.some((m) => m.actor === actor)) return null;
+  if (publisher.store.isBlocked?.(actor)) return null;
+  const doc = await publisher.resolveActor(actor).catch(() => null);
+  const inbox = doc?.endpoints?.sharedInbox || doc?.inbox || null;
+  if (!inbox) publisher.log(`reply: no inbox found for ${actor} \u2014 they get it only through followers`);
+  return { actor, inbox };
+}
+async function inboxesFor(publisher, actorIds = []) {
+  const out = [];
+  for (const id of [...new Set(actorIds.filter((a) => typeof a === "string" && a && a !== publisher.urls.actor))]) {
+    if (!publisher.resolveActor) break;
+    const doc = await publisher.resolveActor(id).catch(() => null);
+    const inbox = doc?.endpoints?.sharedInbox || doc?.inbox;
+    if (inbox) out.push(inbox);
+    else publisher.log(`addressed actor ${id} has no inbox the agent can find \u2014 not delivered to`);
+  }
+  return out;
+}
 function assertDirectAddressed(content, mentions) {
   const wanted = [...new Set(mentionsIn(content))];
   const missing = wanted.filter((h) => !mentions.some((m) => m.handle === h));
@@ -55966,7 +56042,7 @@ function rowContent(obj) {
   const esc = (v) => String(v).replace(/[&<>"]/gu, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" })[c]);
   return `<p><a href="${esc(obj?.id || "")}">${esc(obj?.type || "object")}</a></p>`;
 }
-async function publishNote(publisher, content, { inReplyTo, attachments, visibility = "public", spoilerText = null, slug: wanted = null } = {}) {
+async function publishNote(publisher, content, { inReplyTo, attachments, visibility = "public", spoilerText = null, sensitive = false, slug: wanted = null, also = [], deliverTo = [] } = {}) {
   const { urls } = publisher;
   const priv = visibility === "private" || visibility === "direct";
   if (priv) {
@@ -55977,6 +56053,7 @@ async function publishNote(publisher, content, { inReplyTo, attachments, visibil
   const slug = await slugFor(publisher, priv ? urls.privateNotes : urls.notes, wanted, published);
   const mentions = await publisher._mentionsFor(content, inReplyTo);
   if (visibility === "direct") assertDirectAddressed(content, mentions);
+  const reply = await replyTarget(publisher, inReplyTo, mentions, visibility);
   const note = noteDoc({
     urls,
     slug,
@@ -55987,8 +56064,11 @@ async function publishNote(publisher, content, { inReplyTo, attachments, visibil
     mentions,
     visibility,
     summary: spoilerText,
-    container: priv ? urls.privateNotes : urls.notes
+    sensitive,
+    container: priv ? urls.privateNotes : urls.notes,
+    also: [...also, ...reply ? [reply.actor] : []]
   });
+  const addressedInboxes = await inboxesFor(publisher, [...also, ...deliverTo]);
   await write4(publisher.remote, note.id, note);
   await writeEmptyReplies(
     publisher.remote,
@@ -56007,8 +56087,9 @@ async function publishNote(publisher, content, { inReplyTo, attachments, visibil
     text: content,
     visibility,
     ...spoilerText ? { spoiler: spoilerText } : {},
+    ...note.sensitive ? { sensitive: true } : {},
     ...attachments?.length ? { attachments } : {},
-    ...note.tag?.length ? { mentions: note.tag.map((t) => ({ href: t.href, name: t.name })) } : {}
+    ...rowTags(note)
   });
   if (await publisher.store.commit?.() === false) publisher.log(`post published but its timeline row was refused: ${note.id}`);
   const create = createActivity(note, urls);
@@ -56016,7 +56097,9 @@ async function publishNote(publisher, content, { inReplyTo, attachments, visibil
   const contacts = publisher.store.getContacts();
   const inboxes = [...new Set([
     ...visibility === "direct" ? [] : contacts.followers.map((f) => f.sharedInbox || f.inbox),
-    ...mentions.map((m) => m.inbox)
+    ...mentions.map((m) => m.inbox),
+    reply?.inbox,
+    ...addressedInboxes
   ].filter(Boolean))];
   await publisher.deliverer.deliverToAll(inboxes, create);
   publisher.log(`note published: ${note.id} \u2192 ${inboxes.length} inbox(es)`);
@@ -56035,7 +56118,7 @@ async function publishNote(publisher, content, { inReplyTo, attachments, visibil
   }
   return note;
 }
-async function publishObject(publisher, object, { visibility = "public", slug: wanted = null } = {}) {
+async function publishObject(publisher, object, { visibility = "public", slug: wanted = null, also = [], deliverTo = [] } = {}) {
   const { urls } = publisher;
   const priv = visibility === "private" || visibility === "direct";
   if (priv) {
@@ -56047,11 +56130,13 @@ async function publishObject(publisher, object, { visibility = "public", slug: w
   const pod = publisher.config?.remotePod || urls.base;
   const ownId = typeof object.id === "string" && /^https?:\/\//u.test(object.id) && object.id.startsWith(pod) ? object.id : null;
   const name = await slugFor(publisher, container, wanted, published);
-  const addressed = addressing(urls, visibility);
+  const addressed = addressing(urls, visibility, visibility === "direct" ? also : []);
+  if (visibility !== "direct") addressed.cc = [.../* @__PURE__ */ new Set([...addressed.cc, ...also])];
   let doc = null;
   const id = ownId || container + name;
   if (!ownId) {
-    doc = { ...object, id, attributedTo: urls.actor, published: object.published || published, to: addressed.to, cc: addressed.cc };
+    const { bto, bcc, ...sent } = object;
+    doc = { ...sent, id, attributedTo: urls.actor, published: object.published || published, to: addressed.to, cc: addressed.cc };
     if (!doc["@context"]) doc["@context"] = AS_CTX;
     if (typeof doc.content === "string") doc.content = sanitizeHtml(doc.content);
     await write4(publisher.remote, id, doc);
@@ -56081,12 +56166,21 @@ async function publishObject(publisher, object, { visibility = "public", slug: w
   };
   await writeCreate(publisher.remote, create.id, create);
   const contacts = publisher.store.getContacts();
-  const inboxes = visibility === "direct" ? [] : [...new Set(contacts.followers.map((f) => f.sharedInbox || f.inbox).filter(Boolean))];
+  const inboxes = [...new Set([
+    ...visibility === "direct" ? [] : contacts.followers.map((f) => f.sharedInbox || f.inbox),
+    ...await inboxesFor(publisher, [...also, ...deliverTo])
+  ].filter(Boolean))];
   await publisher.deliverer.deliverToAll(inboxes, create);
   publisher.log(`${row.type || "object"} published: ${id} \u2192 ${inboxes.length} inbox(es)`);
   return { id, createId, copied: !ownId };
 }
-async function updateNote(publisher, s, { content, spoilerText = null, attachments = null } = {}) {
+function rowTags(note) {
+  const tags = [].concat(note.tag || []);
+  const mentions = tags.filter((t) => t.type === "Mention").map((t) => ({ href: t.href, name: t.name }));
+  const hashtags = tags.filter((t) => t.type === "Hashtag").map((t) => ({ name: String(t.name).replace(/^#/, ""), url: t.href }));
+  return { ...mentions.length ? { mentions } : {}, ...hashtags.length ? { tags: hashtags } : {} };
+}
+async function updateNote(publisher, s, { content, spoilerText = null, sensitive = null, attachments = null } = {}) {
   const { urls } = publisher;
   const updated = (/* @__PURE__ */ new Date()).toISOString();
   const inText = new Set(mentionsIn(content));
@@ -56103,6 +56197,7 @@ async function updateNote(publisher, s, { content, spoilerText = null, attachmen
   const atts = attachments ?? s.attachments ?? [];
   const container = String(s.noteId).startsWith(urls.privateNotes) ? urls.privateNotes : urls.notes;
   const slug = s.slug || String(s.noteId).slice(container.length);
+  const reply = await replyTarget(publisher, s.inReplyTo, mentions, s.visibility || "public");
   const note = noteDoc({
     urls,
     slug,
@@ -56113,8 +56208,10 @@ async function updateNote(publisher, s, { content, spoilerText = null, attachmen
     mentions,
     visibility: s.visibility || "public",
     summary: spoilerText,
+    sensitive: sensitive ?? !!s.sensitive,
     updated,
-    container
+    container,
+    also: reply ? [reply.actor] : []
   });
   await write4(publisher.remote, note.id, note);
   await writeCreate(publisher.remote, createActivityId(note.id), createActivity(note, urls));
@@ -56123,14 +56220,17 @@ async function updateNote(publisher, s, { content, spoilerText = null, attachmen
     text: content,
     editedAt: updated,
     spoiler: spoilerText || void 0,
+    sensitive: note.sensitive || void 0,
     attachments: atts.length ? atts : void 0,
-    mentions: note.tag?.length ? note.tag.map((t) => ({ href: t.href, name: t.name })) : void 0
+    mentions: rowTags(note).mentions,
+    tags: rowTags(note).tags
   });
   const update = updateActivity(note, urls);
   const contacts = publisher.store.getContacts();
   const inboxes = [...new Set([
     ...s.visibility === "direct" ? [] : contacts.followers.map((f) => f.sharedInbox || f.inbox),
-    ...mentions.map((m) => m.inbox)
+    ...mentions.map((m) => m.inbox),
+    reply?.inbox
   ].filter(Boolean))];
   await publisher.deliverer.deliverToAll(inboxes, update);
   publisher.log(`note edited: ${note.id} \u2192 ${inboxes.length} inbox(es)`);
@@ -56356,7 +56456,8 @@ async function publishQuestion(publisher, content, {
   expiresAt = null,
   inReplyTo = void 0,
   visibility = "public",
-  spoilerText = null
+  spoilerText = null,
+  sensitive = false
 } = {}) {
   const { urls } = publisher;
   const priv = visibility === "private" || visibility === "direct";
@@ -56383,6 +56484,7 @@ async function publishQuestion(publisher, content, {
   const slug = published.slice(0, 10) + "-" + node_crypto_default.randomBytes(4).toString("hex");
   const mentions = await publisher._mentionsFor(content, inReplyTo);
   if (visibility === "direct") assertDirectAddressed(content, mentions);
+  const reply = await replyTarget(publisher, inReplyTo, mentions, visibility);
   const poll = {
     multiple: !!multiple,
     expiresAt: expiresAt || null,
@@ -56391,7 +56493,7 @@ async function publishQuestion(publisher, content, {
     votersCount: 0,
     // Resolved once, here: a tally rewrite must not cost a webfinger lookup
     // per vote for people the poll named.
-    mentionInboxes: [...new Set(mentions.map((m) => m.inbox).filter(Boolean))]
+    mentionInboxes: [...new Set([...mentions.map((m) => m.inbox), reply?.inbox].filter(Boolean))]
   };
   const question = questionDoc({
     urls,
@@ -56403,6 +56505,8 @@ async function publishQuestion(publisher, content, {
     mentions,
     visibility,
     summary: spoilerText,
+    sensitive,
+    also: reply ? [reply.actor] : [],
     container: priv ? urls.privateNotes : urls.notes,
     options: poll.options,
     multiple: poll.multiple,
@@ -56427,8 +56531,10 @@ async function publishQuestion(publisher, content, {
     visibility,
     poll,
     inReplyTo,
+    ...reply ? { replyActor: reply.actor } : {},
     ...spoilerText ? { spoiler: spoilerText } : {},
-    ...question.tag?.length ? { mentions: question.tag.map((t) => ({ href: t.href, name: t.name })) } : {}
+    ...question.sensitive ? { sensitive: true } : {},
+    ...rowTags(question)
   });
   if (await publisher.store.commit?.() === false) publisher.log(`poll published but its timeline row was refused: ${question.id}`);
   const create = publisher._pollActivity("Create", question, createActivityId(question.id));
@@ -56507,8 +56613,10 @@ async function republishPoll(publisher, questionId, { closing = null } = {}) {
     inReplyTo: s.inReplyTo,
     attachments: [],
     mentions,
+    also: s.replyActor ? [s.replyActor] : [],
     visibility: s.visibility || "public",
     summary: s.spoiler || null,
+    sensitive: !!s.sensitive,
     container,
     options: poll.options,
     multiple: !!poll.multiple,
@@ -56580,6 +56688,7 @@ var Publisher = class {
     log: log2 = console.log,
     probeFetch = null,
     resolveMention = null,
+    resolveActor = null,
     clientOrigin = null
   }) {
     this.config = config;
@@ -56594,6 +56703,7 @@ var Publisher = class {
     if (this.urls.toPod && this.remote?.setUrlMap) this.remote.setUrlMap(this.urls.toPod);
     this.probeFetch = probeFetch || ((u, i) => this.remote.probe(u, i));
     this.resolveMention = resolveMention;
+    this.resolveActor = resolveActor;
     this.pollTimers = /* @__PURE__ */ new Map();
     this.log = log2;
   }
@@ -56619,19 +56729,17 @@ var Publisher = class {
     if (gw.frontActor) return String(gw.frontActor).replace(/ap\/actor\/?$/u, "ap/outbox");
     return String(gw.url).replace(/ap\/inbox\/?$/u, "ap/outbox");
   }
-  async publishProfile({ force = false } = {}) {
+  // Every actor document this identity publishes, from one place: the
+  // profile publish and a Move both write it, and a Move that rebuilt it
+  // by hand dropped the gateway inbox, the outbox door and the collections.
+  actorDocFor({ priv = false, moderators = null, inbox = null, movedTo = this.config.movedTo || null } = {}) {
     const { urls } = this;
-    const host = new URL(urls.base).host;
-    const priv = await this.privateReady() === true;
-    const moderators = (this.config.moderators || []).length ? urls.moderators : null;
-    const gw = this.config.gateway;
-    const gwActive = gw && gw.url && gw.mode && gw.mode !== "off";
-    const actorDoc2 = actorDoc({
+    return actorDoc({
       urls,
       handle: publicHandle(this.config),
       name: this.config.name,
       publicKeyPem: this.publicKeyPem,
-      movedTo: this.config.movedTo || null,
+      movedTo,
       kind: this.config.kind,
       approveJoins: followsNeedApproval(this.config),
       assertionKey: this.assertionKey,
@@ -56645,7 +56753,7 @@ var Publisher = class {
       pendingFollowers: priv ? urls.pendingFollowers : null,
       pendingFollowing: priv ? urls.pendingFollowing : null,
       blocked: priv ? urls.blocked : null,
-      inbox: gwActive ? gw.url : null,
+      inbox,
       // The agent's own outbox endpoint, where it is reachable: a client
       // following the actor must arrive somewhere that will take a write.
       // Otherwise the Gateway's outbox door, when one is attached.
@@ -56655,6 +56763,15 @@ var Publisher = class {
       oauthAuthorize: this.clientOrigin ? `${this.clientOrigin}oauth/authorize` : null,
       oauthToken: this.clientOrigin ? `${this.clientOrigin}oauth/token` : null
     });
+  }
+  async publishProfile({ force = false } = {}) {
+    const { urls } = this;
+    const host = new URL(urls.base).host;
+    const priv = await this.privateReady() === true;
+    const moderators = (this.config.moderators || []).length ? urls.moderators : null;
+    const gw = this.config.gateway;
+    const gwActive = gw && gw.url && gw.mode && gw.mode !== "off";
+    const actorDoc2 = this.actorDocFor({ priv, moderators, inbox: gwActive ? gw.url : null });
     const surface = node_crypto_default.createHash("sha256").update(JSON.stringify({
       actor: actorDoc2,
       handle: this.config.handle,
@@ -56670,7 +56787,7 @@ var Publisher = class {
     await writeWebfinger(
       this.remote,
       urls,
-      jrd({ handle: this.config.handle, host, actor: urls.actor })
+      jrd({ handle: this.config.handle, host, actor: urls.actor, page: urls.profileHtml })
     );
     await writeHostMeta(this.remote, urls, hostMeta(urls.base));
     const nodeinfoDocUrl = urls.home + "ap/nodeinfo-2.0";
@@ -56865,21 +56982,15 @@ var Publisher = class {
     await this.deliverer.deliverToAll(inboxes, moveActivity(urls, target, Date.parse(at)));
     this.config.movedTo = target;
     this.store.setConfig({ ...this.store.getConfig(), movedTo: target, movedAt: at });
-    await writeMoved(this.remote, urls, actorDoc({
-      urls,
-      handle: publicHandle(this.config),
-      name: this.config.name,
-      publicKeyPem: this.publicKeyPem,
-      movedTo: target,
-      kind: this.config.kind,
-      approveJoins: followsNeedApproval(this.config),
-      assertionKey: this.assertionKey,
-      summary: this.config.summary || null,
-      icon: this.config.icon || null,
-      image: this.config.image || null,
-      fields: this.config.fields || [],
-      webId: this.remote.webId || null,
-      aliases: this.config.aliases || []
+    const gw = this.config.gateway;
+    const gwActive = gw && gw.url && gw.mode && gw.mode !== "off";
+    const priv = await this.privateReady() === true;
+    const moderators = (this.config.moderators || []).length ? urls.moderators : null;
+    await writeMoved(this.remote, urls, this.actorDocFor({
+      priv,
+      moderators,
+      inbox: gwActive ? gw.url : null,
+      movedTo: target
     }));
     await this.store.flush();
     this.log(`moved to ${target}: Move sent to ${inboxes.length} inbox(es), actor now advertises movedTo`);
@@ -57583,6 +57694,8 @@ async function onFollow(intake, activity, actor, { trusted = false } = {}) {
   intake.log(`Accept sent \u2192 ${doc.inbox}`);
 }
 async function onUndo(intake, activity, actor, { trusted = false } = {}) {
+  const inner = activity.object && typeof activity.object === "object" ? activity.object : null;
+  if (inner?.type === "Like" || inner?.type === "Announce") return onUndoReaction(intake, inner, actor, { trusted });
   if (typeof activity.object === "object" && activity.object?.type && activity.object.type !== "Follow") return;
   const named = typeof activity.object === "string" ? activity.object : activity.object?.id;
   if (!named && !trusted) return;
@@ -57670,6 +57783,47 @@ async function onAnnounce(intake, activity, actor, objectId) {
   }
   return intake.ingestNote(objectId, actor, { via: actor });
 }
+async function onUndoReaction(intake, inner, actor, { trusted = false } = {}) {
+  const innerActor = typeof inner.actor === "string" ? inner.actor : inner.actor?.id;
+  if (innerActor && innerActor !== actor) return;
+  const wrapped = inner.object;
+  const target = wrapped && typeof wrapped === "object" && (wrapped.type === "Create" || wrapped.type === "Update") ? wrapped.object : wrapped;
+  const objectId = typeof target === "string" ? target : target?.id;
+  if (!objectId) return;
+  if (objectId.startsWith(intake.urls.notes)) {
+    const type = inner.type === "Like" ? "favourite" : "reblog";
+    const gone = intake.store.removeNotifications((n) => n.type === type && n.actor === actor && n.noteId === objectId);
+    if (gone) intake.log(`${inner.type} withdrawn by ${actor} on ${objectId}`);
+    return;
+  }
+  if (inner.type !== "Announce") return;
+  const followed = trusted || intake.store.getContacts().following.some((f) => f.actor === actor && f.accepted);
+  if (!followed) return;
+  const s = intake.store.getStatuses().find((x) => x.noteId === objectId);
+  if (!s || s.kind === "post" || s.via !== actor) return;
+  await intake.forget(s);
+  intake.log(`boost withdrawn by ${actor}: ${objectId} left the timeline`);
+}
+async function onBlock(intake, activity, actor, { trusted = false } = {}) {
+  const objectId = typeof activity.object === "string" ? activity.object : activity.object?.id;
+  if (objectId !== intake.urls.actor) return;
+  if (!trusted) {
+    intake.log(`Block from ${actor} arrived unverified \u2014 ignored`);
+    return;
+  }
+  const contacts = intake.store.getContacts();
+  const wasFollower = contacts.followers.some((f) => f.actor === actor);
+  const wasFollowing = contacts.following.some((f) => f.actor === actor);
+  if (wasFollower) dropFollower(contacts, actor, "blocked-us");
+  contacts.following = contacts.following.filter((f) => f.actor !== actor);
+  intake.store.setContacts(contacts);
+  const reqs = intake.store.getRequests();
+  const left = reqs.filter((r) => r.actor !== actor);
+  if (left.length !== reqs.length) intake.store.setRequests(left);
+  await intake.republish({ followers: wasFollower, following: wasFollowing, pending: true });
+  const what = [wasFollower && "their follow of us", wasFollowing && "our follow of them"].filter(Boolean).join(" and ");
+  intake.log(`blocked by ${actor}: ${what || "no relationship"} dropped`);
+}
 async function onDelete(intake, activity, actor) {
   const objectId = typeof activity.object === "string" ? activity.object : activity.object?.id;
   if (!objectId) return "Delete without object id";
@@ -57875,6 +58029,7 @@ async function ingestNote(intake, objectId, actor, { via, inline = null } = {})
   const followed = via || known2 || !known2 && await intake.isCoMember(author);
   const kind = followed ? "timeline" : "mention";
   const mentions = [].concat(note.tag || []).filter((t) => t?.type === "Mention" && t.href && t.name).slice(0, MAX_MENTIONS).map((t) => ({ href: httpOnly(String(t.href).slice(0, MAX_URL_CHARS)), name: String(t.name).slice(0, 256) })).filter((m) => m.href);
+  const hashtags = [].concat(note.tag || []).filter((t) => t?.type === "Hashtag" && t.name).slice(0, MAX_MENTIONS).map((t) => ({ name: String(t.name).replace(/^#/, "").slice(0, 128), url: httpOnly(String(t.href || "").slice(0, MAX_URL_CHARS)) })).filter((t) => t.name);
   const emojis = emojisOf(note);
   const poll = pollOf(note);
   const audience = [].concat(note.to || [], note.cc || []).map(String);
@@ -57891,6 +58046,8 @@ async function ingestNote(intake, objectId, actor, { via, inline = null } = {})
     ...nonPublic ? { nonPublic: true } : {},
     // The author's content warning, shown as one: plain text only.
     ...note.summary ? { spoiler: String(note.summary).replace(/<[^>]*>/g, "") } : {},
+    ...note.sensitive === true ? { sensitive: true } : {},
+    ...hashtags.length ? { tags: hashtags } : {},
     ...poll ? { poll } : {},
     ...emojis.length ? { emojis } : {},
     ...mentions.length ? { mentions } : {},
@@ -63413,6 +63570,8 @@ var Intake = class {
       case "Add":
       case "Remove":
         return this.onAddRemove(activity, actor);
+      case "Block":
+        return this.onBlock(activity, actor, { trusted });
       default:
         this.log(`ignored ${activity.type} from ${actor}`);
     }
@@ -63506,6 +63665,9 @@ var Intake = class {
   onUndo(...a) {
     return onUndo(this, ...a);
   }
+  onBlock(...a) {
+    return onBlock(this, ...a);
+  }
   onCreate(...a) {
     return onCreate(this, ...a);
   }
@@ -64135,7 +64297,7 @@ var C2S = class {
         return this.send(res, 405, { error: "deliveries go to this actor's inbox on the pod, which the actor document names; this address is the owner reading their own" });
       }
       const reader = await this.auth(req, pathname);
-      if (!reader.ok) return this.send(res, reader.status, { error: reader.error });
+      if (!reader.ok) return this.send(res, reader.status, { error: reader.error }, reader.headers || {});
       return this.sendInbox(res, url);
     }
     if (req.method === "GET" || req.method === "HEAD") {
@@ -64148,7 +64310,7 @@ var C2S = class {
       return this.send(res, 405, { error: "POST the outbox; GET redirects to the pod" });
     }
     const who = await this.auth(req, pathname);
-    if (!who.ok) return this.send(res, who.status, { error: who.error });
+    if (!who.ok) return this.send(res, who.status, { error: who.error }, who.headers || {});
     if (this.agent.viewer) {
       const took = await this.agent.requestTakeover?.();
       if (!took) return this.send(res, 503, { error: "another agent is active for this pod \u2014 takeover failed, try again" });
@@ -64202,6 +64364,13 @@ var C2S = class {
       return reply(422, { error: e.message || String(e) });
     }
   }
+  // The actors a client addressed by id, beyond the audience words: the ones
+  // in to/cc are listed and delivered to; the ones in bto/bcc are delivered
+  // to and never listed (§6).
+  addressedActors(activity, object) {
+    const pick = (...fields) => [...new Set(fields.flatMap((f) => arr(activity[f] ?? object?.[f]).map(idOf)))].filter((a) => typeof a === "string" && /^https?:\/\//u.test(a) && a !== PUBLIC && a !== this.urls.followers && a !== this.urls.actor);
+    return { also: pick("to", "cc"), deliverTo: pick("bto", "bcc") };
+  }
   async _dispatch(activity, { slug, raw, reply }) {
     const agent2 = this.agent;
     const object = typeof activity.object === "object" && activity.object !== null ? activity.object : null;
@@ -64211,9 +64380,10 @@ var C2S = class {
         const makes = object?.type || "Note";
         if (!object) return reply(422, { error: "a Create carries the object it creates" });
         const visibility = this.visibilityOf(activity, object);
+        const { also, deliverTo } = this.addressedActors(activity, object);
         if (makes !== "Note" && makes !== "Question") {
           const asSent = raw && typeof raw === "object" && !Array.isArray(raw) ? ACTIVITY_TYPES.has(raw.type) ? raw.object && typeof raw.object === "object" ? raw.object : null : raw : null;
-          const made = await agent2.publisher.publishObject(asSent || object, { visibility, slug });
+          const made = await agent2.publisher.publishObject(asSent || object, { visibility, slug, also, deliverTo });
           return reply(201, { id: made.createId, object: made.id }, { location: made.createId });
         }
         const text = String(object.source?.content ?? object.content ?? "");
@@ -64229,7 +64399,8 @@ var C2S = class {
               expiresAt: object.endTime || null,
               inReplyTo: idOf(object.inReplyTo) || void 0,
               visibility,
-              spoilerText: object.summary || null
+              spoilerText: object.summary || null,
+              sensitive: object.sensitive === true
             });
             return reply(
               201,
@@ -64250,7 +64421,10 @@ var C2S = class {
           attachments,
           visibility,
           spoilerText: object.summary || null,
-          slug
+          sensitive: object.sensitive === true,
+          slug,
+          also,
+          deliverTo
         });
         return reply(
           201,
@@ -64277,6 +64451,7 @@ var C2S = class {
         await agent2.publisher.updateNote(s, {
           content: text,
           spoilerText: object?.summary || null,
+          sensitive: object?.sensitive === void 0 ? null : object.sensitive === true,
           attachments
         });
         return reply(200, { ok: true, object: s.noteId });
@@ -65482,7 +65657,7 @@ function page(api, items, url, { limit = 20, max = 40, idOf: idOf2 = (s) => api.
   }
   const pageItems2 = items.slice(0, n);
   if (!pageItems2.length) return { items: pageItems2, headers: {} };
-  const base = `http://${api.host}${url.pathname}`;
+  const base = url.origin + url.pathname;
   const q = (extra) => {
     const u = new URL(base);
     for (const [k, v] of url.searchParams) if (!["max_id", "since_id", "min_id"].includes(k)) u.searchParams.set(k, v);
@@ -65608,7 +65783,7 @@ function status(api, s, { all } = {}) {
     created_at: s.published || (/* @__PURE__ */ new Date()).toISOString(),
     in_reply_to_id: s.inReplyTo ? api.store.idFor(s.inReplyTo) : null,
     in_reply_to_account_id: null,
-    sensitive: !!s.spoiler,
+    sensitive: !!(s.spoiler || s.sensitive),
     spoiler_text: s.spoiler || "",
     visibility: s.visibility || "public",
     language: null,
@@ -65648,7 +65823,7 @@ function status(api, s, { all } = {}) {
         acct: bare.includes("@") ? bare : host ? `${user}@${host}` : bare
       };
     }),
-    tags: [],
+    tags: (s.tags || []).map((t) => ({ name: t.name, url: t.url })),
     emojis: (s.emojis || []).map((e) => ({
       shortcode: e.shortcode,
       url: e.url,
@@ -66580,6 +66755,7 @@ async function handle6(api, ctx) {
       if (ready !== true) return send(422, { error: ready });
     }
     const spoilerText = String(body.spoiler_text || "").trim() || null;
+    const sensitive = body.sensitive === true || body.sensitive === "true" || body.sensitive === "1";
     const mediaIds = [].concat(body.media_ids || body["media_ids[]"] || []).filter(Boolean);
     const media = api.store.getMedia();
     const attachments = mediaIds.map((id) => media[id] && { id, ...media[id] }).filter(Boolean);
@@ -66610,7 +66786,8 @@ async function handle6(api, ctx) {
           expiresAt: new Date(Date.now() + seconds * 1e3).toISOString(),
           inReplyTo,
           visibility,
-          spoilerText
+          spoilerText,
+          sensitive
         });
         return send(200, api.status(api.store.getStatuses().find((x) => x.noteId === q.id)));
       } catch (e) {
@@ -66639,7 +66816,7 @@ async function handle6(api, ctx) {
     try {
       note = await api.agent.publisher.publishNote(
         body.status,
-        { inReplyTo, attachments, visibility, spoilerText }
+        { inReplyTo, attachments, visibility, spoilerText, sensitive }
       );
     } catch (e) {
       if (e.code === "unaddressed") return send(422, { error: e.message });
@@ -66663,7 +66840,7 @@ async function handle6(api, ctx) {
     return send(200, [{
       content: s.content || "",
       spoiler_text: s.spoiler || "",
-      sensitive: !!s.spoiler,
+      sensitive: !!(s.spoiler || s.sensitive),
       created_at: s.editedAt || s.published,
       account: api.account(s.actor),
       media_attachments: (s.attachments || []).map((a) => api.mediaJson(a)),
@@ -66688,9 +66865,10 @@ async function handle6(api, ctx) {
     const media = api.store.getMedia();
     const attachments = mediaIds.length ? mediaIds.map((id) => media[id] && { id, ...media[id] }).filter(Boolean) : null;
     const spoilerText = String(body.spoiler_text || "").trim() || null;
+    const sensitive = body.sensitive === void 0 ? null : body.sensitive === true || body.sensitive === "true" || body.sensitive === "1";
     const patched = await api.agent.publisher.updateNote(
       s,
-      { content: body.status, spoilerText, attachments }
+      { content: body.status, spoilerText, sensitive, attachments }
     );
     return send(200, api.status(patched || s));
   }
@@ -66929,7 +67107,13 @@ var MastoApi = class _MastoApi {
       res.end(body);
       return true;
     };
-    const ctx = { req, res, pathname, url, send };
+    const scheme = String(this.scheme || (req.headers?.["x-forwarded-proto"] === "https" || req.socket?.encrypted ? "https" : "http")).replace(/:.*$/, "");
+    let self2 = url;
+    try {
+      self2 = new URL(`${scheme}://${req.headers?.host || "localhost"}${this.mount || ""}${pathname}${url.search || ""}`);
+    } catch {
+    }
+    const ctx = { req, res, pathname, url: self2, send };
     if (await handle(this, ctx)) return true;
     if (!pathname.startsWith("/api/")) return false;
     if (await handle2(this, ctx)) return true;
@@ -67940,6 +68124,7 @@ var hostOf = (inbox) => {
   }
 };
 var aboutTheHost = (e) => !e.status || e.status >= 500 || e.status === 429;
+var unsalvageable = (e) => e.status === 404 || e.status === 410;
 var Deliverer = class {
   // passive: signing-only (viewer-mode agents) — no queue drain timer, so a
   // read-only agent never mutates shared delivery state. startQueue() flips
@@ -67952,9 +68137,11 @@ var Deliverer = class {
     edPrivate = null,
     proofKeyId = null,
     log: log2 = console.log,
-    passive = false
+    passive = false,
+    onGone = null
   }) {
     this.store = store;
+    this.onGone = onGone;
     this.keyId = keyId;
     this.rsaPrivate = rsaPrivate;
     this.actorId = actorId;
@@ -68050,6 +68237,10 @@ var Deliverer = class {
       await this.deliverNow(inbox, signed);
       this.log(`delivered ${signed.type} \u2192 ${inbox}`);
     } catch (e) {
+      if (unsalvageable(e)) {
+        await this._unsalvageable(inbox, e);
+        return;
+      }
       this.log(`delivery failed (${e.message}) \u2014 queued`);
       const wait = e.retryAfterMs || 6e4;
       if (aboutTheHost(e)) {
@@ -68059,6 +68250,26 @@ var Deliverer = class {
       this._enqueue({ inbox, activity: signed, attempts: 1, nextAt: Date.now() + wait });
     }
   }
+  // Not retried, and on a 410 the followers who received there are dropped,
+  // so the next fan-out stops asking; the followers collection is republished
+  // through onGone. A 404 drops only this delivery.
+  async _unsalvageable(inbox, e) {
+    if (e.status !== 410) {
+      this.log(`delivery dropped (${e.message}) \u2014 nothing answers there`);
+      return;
+    }
+    const contacts = this.store.getContacts?.();
+    const left = (contacts?.followers || []).filter((f) => f.inbox === inbox || f.sharedInbox === inbox);
+    this.log(`${inbox} is gone (410) \u2014 delivery dropped${left.length ? `, ${left.length} follower(s) there forgotten` : ""}`);
+    if (!left.length) return;
+    for (const f of left) dropFollower(contacts, f.actor, "inbox-gone");
+    this.store.setContacts(contacts);
+    try {
+      await this.onGone?.();
+    } catch (err) {
+      this.log(`followers republish after 410: ${err.message}`);
+    }
+  }
   // The queue has a ceiling: a fan-out into a sea of down servers must not grow
   // queue.json without bound. Overflow keeps the evidence as a dead letter.
   _enqueue(item) {
@@ -68143,6 +68354,11 @@ var Deliverer = class {
         changed = true;
         this.log(`retry ok: ${item.activity.type} \u2192 ${item.inbox}`);
       } catch (e) {
+        if (unsalvageable(e)) {
+          changed = true;
+          await this._unsalvageable(item.inbox, e);
+          continue;
+        }
         item.attempts += 1;
         changed = true;
         const wait = e.retryAfterMs || ladderFor(item);
@@ -70436,7 +70652,8 @@ var BrowserAgent = class _BrowserAgent {
       // The relay finds the account by the front's own key for it, which for a
       // mail-door account is the full address, not the bare handle.
       handle: doorKeyOf(config.gateway?.url) || config.handle,
-      sessionFetch: session.fetch
+      sessionFetch: session.fetch,
+      onGone: () => this.publisher.publishCollections({ followers: true })
     });
     this.publisher = new Publisher({
       config: this.store.getConfig(),
@@ -70449,7 +70666,8 @@ var BrowserAgent = class _BrowserAgent {
       // Who a post names, resolved — the same lookup the DeviceAgent
       // gives its publisher. Without it no mention from the browser ever
       // resolved: a direct message went to nobody, a mention notified no one.
-      resolveMention: (h) => resolveHandle(this, h)
+      resolveMention: (h) => resolveHandle(this, h),
+      resolveActor: (u) => this.intake.fetchAP(u)
     });
     this.atproto = new BrowserAtproto({ store: this.store, actorId: this.urls.actor, log: this.log });
     this.publisher.atproto = this.atproto;