fedipod-server 0.17.0 → 0.18.0

package/lib/client/c2s.mjs

@@ -8,6 +8,11 @@
 // GETs on the actor and outbox are redirects: the pod's documents are the
 // canonical ones, and a second renderer here would only drift from them.
 //
+// `dispatch` takes an activity and answers with { status, body, headers }; it
+// touches no request or response. The HTTP handler below is one caller. The
+// other is the inbox drain, handing over an activity the Gateway took at the
+// outbox door on the owner's behalf and stamped as theirs.
+//
 // The inbox is the exception, and has to be. Deliveries land in a container on
 // the pod which the drain empties as it handles each item, so reading that
 // container tells the owner only what has not been dealt with yet. What was
@@ -18,6 +23,7 @@
 import * as social from '../core/social.mjs';
 import * as wire from '../core/wire.mjs';
 import { readLenient } from '../core/as2.mjs';
+import { safeSlug } from '../core/publisher/notes.mjs';
 
 const MAX_BODY = 512 * 1024;          // same ceiling the inbox drain enforces
 
@@ -154,7 +160,10 @@ export class C2S {
   async handle(req, res, pathname, url) {   // eslint-disable-line no-unused-vars
     if (pathname !== '/ap/outbox' && pathname !== '/ap/actor' && pathname !== '/ap/inbox') return false;
     if (req.method === 'OPTIONS') {
-      res.writeHead(204, { allow: pathname === '/ap/inbox' ? 'GET, OPTIONS' : 'GET, POST, OPTIONS' });
+      // Accept-Post is what a client such as dokieli reads to choose a format;
+      // naming JSON only is what makes it send JSON-LD rather than HTML.
+      res.writeHead(204, pathname === '/ap/inbox' ? { allow: 'GET, OPTIONS' }
+        : { allow: 'GET, POST, OPTIONS', 'accept-post': 'application/ld+json, application/activity+json' });
       res.end(); return true;
     }
     if (!this.agent.configured() || !this.urls) {
@@ -196,9 +205,16 @@ export class C2S {
     // takes decisions from it and the publisher builds the document that is
     // actually posted, so nothing a client sent is republished verbatim and a
     // term it aliased still means what it says.
-    let activity;
+    // `raw` is the document as the client wrote it. The graph is what
+    // decisions are taken from; the bytes are what an object that is stored
+    // as sent (publishObject) is stored from — a read against our contexts
+    // rewrites a stranger's terms to full IRIs, which is right for reading and
+    // wrong for keeping.
+    let activity; let raw = null;
     try {
-      const read = await readLenient(await readBody(req));
+      const body = await readBody(req);
+      try { raw = JSON.parse(body); } catch { raw = null; }
+      const read = await readLenient(body);
       activity = read.view ?? read.doc;
     } catch (e) {
       return this.send(res, 400, { error: `unreadable body: ${e.message}` });
@@ -206,34 +222,47 @@ export class C2S {
     if (!activity || typeof activity !== 'object' || Array.isArray(activity) || !activity.type) {
       return this.send(res, 400, { error: 'a typed ActivityStreams object is required' });
     }
-    // A bare object arrives without an activity around it; the server supplies
-    // the Create (§6.2.1), carrying the object's own addressing up onto it.
-    if (!ACTIVITY_TYPES.has(activity.type)) {
-      activity = { type: 'Create', object: activity, to: activity.to, cc: activity.cc };
-    }
-
-    try {
-      return await this.dispatch(res, activity);
-    } catch (e) {
-      this.log(`c2s ${activity.type}: ${e.message}`);
-      return this.send(res, 422, { error: e.message || String(e) });
-    }
+    // The name the client asks for its new document (LDP's Slug), taken when
+    // it is plain and free — it is what lets the client know the address of
+    // what it made before anything answers.
+    const slug = safeSlug(req.headers.slug) || null;
+    const r = await this.dispatch(activity, { slug, raw });
+    return this.send(res, r.status, r.body, r.headers);
   }
 
   // Addressing → the facade's four visibilities, inverting the table the
-  // composer writes (wire.noteDoc). Addressing is required: a post whose
-  // audience the client never stated is not guessed at in either direction.
+  // composer writes (wire.addressing). Nothing stated is a public post — what
+  // every client means by a post with no audience chosen, and what a client
+  // that never addresses (dokieli's annotations) needs.
   visibilityOf(activity, object) {
     const to = arr(activity.to ?? object?.to).map(idOf);
     const cc = arr(activity.cc ?? object?.cc).map(idOf);
-    if (!to.length && !cc.length) return null;
+    if (!to.length && !cc.length) return 'public';
     if (to.includes(wire.PUBLIC)) return 'public';
     if (cc.includes(wire.PUBLIC)) return 'unlisted';
     if (to.includes(this.urls.followers)) return 'private';
     return 'direct';
   }
 
-  async dispatch(res, activity) {
+  async dispatch(activity, { slug = null, raw = null } = {}) {
+    const reply = (status, body, headers = {}) => ({ status, body, headers });
+    if (!activity || typeof activity !== 'object' || Array.isArray(activity) || !activity.type) {
+      return reply(400, { error: 'a typed ActivityStreams object is required' });
+    }
+    // A bare object arrives without an activity around it; the server supplies
+    // the Create (§6.2.1), carrying the object's own addressing up onto it.
+    if (!ACTIVITY_TYPES.has(activity.type)) {
+      activity = { type: 'Create', object: activity, to: activity.to, cc: activity.cc };
+    }
+    try {
+      return await this._dispatch(activity, { slug, raw, reply });
+    } catch (e) {
+      this.log(`c2s ${activity?.type}: ${e.message}`);
+      return reply(422, { error: e.message || String(e) });
+    }
+  }
+
+  async _dispatch(activity, { slug, raw, reply }) {
     const agent = this.agent;
     const object = typeof activity.object === 'object' && activity.object !== null
       ? activity.object : null;
@@ -242,18 +271,22 @@ export class C2S {
     switch (activity.type) {
       case 'Create': {
         const makes = object?.type || 'Note';
-        if (!object || (makes !== 'Note' && makes !== 'Question')) {
-          return this.send(res, 422, { error: 'only a Note or a Question (or a bare Note) can be created here' });
-        }
+        if (!object) return reply(422, { error: 'a Create carries the object it creates' });
         const visibility = this.visibilityOf(activity, object);
-        if (!visibility) {
-          return this.send(res, 400, { error: 'state the audience: to/cc must address someone (as:Public, your followers collection, or actors)' });
+        // Not a Note and not a poll: stored as sent, under this actor, and
+        // the Create around it delivered — a Web Annotation, for one.
+        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 agent.publisher.publishObject(asSent || object, { visibility, slug });
+          return reply(201, { id: made.createId, object: made.id }, { location: made.createId });
         }
         // `source.content` is the client's plain text when it sends one; bare
         // `content` is TREATED as plain text and escaped — markup survives as
         // visible characters rather than as markup. Documented v1 limit.
         const text = String(object.source?.content ?? object.content ?? '');
-        if (!text.trim()) return this.send(res, 422, { error: 'the note has no content' });
+        if (!text.trim()) return reply(422, { error: 'the note has no content' });
 
         // A Question is a poll: the choices are in oneOf (pick one) or anyOf
         // (pick several), each naming itself, and endTime is when it shuts.
@@ -270,11 +303,11 @@ export class C2S {
               visibility,
               spoilerText: object.summary || null,
             });
-            return this.send(res, 201,
+            return reply(201,
               { id: wire.createActivityId(question.id), object: question.id },
               { location: wire.createActivityId(question.id) });
           } catch (e) {
-            return this.send(res, 422, { error: e.message });
+            return reply(422, { error: e.message });
           }
         }
 
@@ -287,22 +320,23 @@ export class C2S {
           attachments,
           visibility,
           spoilerText: object.summary || null,
+          slug,
         });
-        return this.send(res, 201, { id: wire.createActivityId(note.id), object: note.id },
+        return reply(201, { id: wire.createActivityId(note.id), object: note.id },
           { location: wire.createActivityId(note.id) });
       }
 
       case 'Update': {
         if (objectId === this.urls.actor) {
-          return this.send(res, 422, { error: 'edit the profile on the admin surface; actor updates are not taken here' });
+          return reply(422, { error: 'edit the profile on the admin surface; actor updates are not taken here' });
         }
         const s = this.byIri(objectId);
-        if (!s) return this.send(res, 404, { error: 'no such note here' });
+        if (!s) return reply(404, { error: 'no such note here' });
         if (s.actor !== this.urls.actor || s.kind !== 'post') {
-          return this.send(res, 403, { error: 'not your note' });
+          return reply(403, { error: 'not your note' });
         }
         const text = String(object?.source?.content ?? object?.content ?? '');
-        if (!text.trim()) return this.send(res, 422, { error: 'the edit has no content' });
+        if (!text.trim()) return reply(422, { error: 'the edit has no content' });
         const attachments = object?.attachment !== undefined
           ? arr(object.attachment).map((a) => ({
             url: a?.url, mediaType: a?.mediaType,
@@ -312,52 +346,52 @@ export class C2S {
         await agent.publisher.updateNote(s, {
           content: text, spoilerText: object?.summary || null, attachments,
         });
-        return this.send(res, 200, { ok: true, object: s.noteId });
+        return reply(200, { ok: true, object: s.noteId });
       }
 
       case 'Delete': {
         if (objectId === this.urls.actor) {
-          return this.send(res, 422, { error: 'retiring the actor is done on the admin surface, where it asks twice' });
+          return reply(422, { error: 'retiring the actor is done on the admin surface, where it asks twice' });
         }
         const s = this.byIri(objectId);
-        if (!s) return this.send(res, 404, { error: 'no such note here' });
+        if (!s) return reply(404, { error: 'no such note here' });
         if (s.actor !== this.urls.actor || s.kind !== 'post') {
-          return this.send(res, 403, { error: 'not your note' });
+          return reply(403, { error: 'not your note' });
         }
         const r = await social.deleteNote(agent, s);
-        if (!r.ok) return this.send(res, 502, { error: r.error, stillPublished: r.stillPublished });
-        return this.send(res, 200, { ok: true });
+        if (!r.ok) return reply(502, { error: r.error, stillPublished: r.stillPublished });
+        return reply(200, { ok: true });
       }
 
       case 'Follow': {
-        if (!objectId) return this.send(res, 400, { error: 'whom? object must name an actor' });
+        if (!objectId) return reply(400, { error: 'whom? object must name an actor' });
         // An acct: form or bare handle resolves through WebFinger; an https
         // IRI is fetched directly.
         if (/^acct:|^@|^[^/@]+@[^/@]+$/.test(objectId) && !/^https?:/.test(objectId)) {
           const r = await social.followHandle(agent, objectId.replace(/^acct:/, ''));
           const rec = this.store.getContacts().following.find((f) => f.actor === r.actor);
-          return this.send(res, 201, { id: rec?.followActivity?.id, object: r.actor },
+          return reply(201, { id: rec?.followActivity?.id, object: r.actor },
             rec?.followActivity?.id ? { location: rec.followActivity.id } : {});
         }
         const doc = await social.followActor(agent, objectId);
         const rec = this.store.getContacts().following.find((f) => f.actor === doc.id);
-        return this.send(res, 201, { id: rec?.followActivity?.id, object: doc.id },
+        return reply(201, { id: rec?.followActivity?.id, object: doc.id },
           rec?.followActivity?.id ? { location: rec.followActivity.id } : {});
       }
 
       case 'Like': {
         const s = this.byIri(objectId);
-        if (!s) return this.send(res, 422, { error: 'that note is not held here — like what the timeline holds' });
+        if (!s) return reply(422, { error: 'that note is not held here — like what the timeline holds' });
         const updated = await social.favourite(agent, s);
-        return this.send(res, 201, { id: updated.likeActivity?.id, object: s.noteId },
+        return reply(201, { id: updated.likeActivity?.id, object: s.noteId },
           updated.likeActivity?.id ? { location: updated.likeActivity.id } : {});
       }
 
       case 'Announce': {
         const s = this.byIri(objectId);
-        if (!s) return this.send(res, 422, { error: 'that note is not held here — boost what the timeline holds' });
+        if (!s) return reply(422, { error: 'that note is not held here — boost what the timeline holds' });
         const updated = await social.reblog(agent, s);
-        return this.send(res, 201, { id: updated.announceActivity?.id, object: s.noteId },
+        return reply(201, { id: updated.announceActivity?.id, object: s.noteId },
           updated.announceActivity?.id ? { location: updated.announceActivity.id } : {});
       }
 
@@ -368,37 +402,37 @@ export class C2S {
         const innerId = idOf(activity.object);
         if (inner?.type === 'Block') {
           const target = idOf(inner.object);
-          if (!target) return this.send(res, 400, { error: 'unblock whom?' });
+          if (!target) return reply(400, { error: 'unblock whom?' });
           await social.unblockActor(agent, target);
-          return this.send(res, 200, { ok: true, object: target });
+          return reply(200, { ok: true, object: target });
         }
         const statuses = this.store.getStatuses();
         let s = innerId ? statuses.find((x) => x.likeActivity?.id === innerId) : null;
         if (!s && inner?.type === 'Like') s = this.byIri(idOf(inner.object));
         if (s?.favourited) {
           const updated = await social.unfavourite(agent, s);
-          return this.send(res, 200, { ok: true, object: updated.noteId });
+          return reply(200, { ok: true, object: updated.noteId });
         }
         s = innerId ? statuses.find((x) => x.announceActivity?.id === innerId) : null;
         if (!s && inner?.type === 'Announce') s = this.byIri(idOf(inner.object));
         if (s?.reblogged) {
           const updated = await social.unreblog(agent, s);
-          return this.send(res, 200, { ok: true, object: updated.noteId });
+          return reply(200, { ok: true, object: updated.noteId });
         }
         const following = this.store.getContacts().following;
         const rec = following.find((f) => f.followActivity?.id === innerId)
           || (inner?.type === 'Follow' ? following.find((f) => f.actor === idOf(inner.object)) : null);
         if (rec) {
           await social.unfollowActor(agent, rec.actor);
-          return this.send(res, 200, { ok: true, object: rec.actor });
+          return reply(200, { ok: true, object: rec.actor });
         }
-        return this.send(res, 422, { error: 'nothing here matches what that Undo names' });
+        return reply(422, { error: 'nothing here matches what that Undo names' });
       }
 
       case 'Block': {
-        if (!objectId) return this.send(res, 400, { error: 'block whom? object must name an actor' });
+        if (!objectId) return reply(400, { error: 'block whom? object must name an actor' });
         await social.blockActor(agent, objectId);
-        return this.send(res, 200, { ok: true, object: objectId });
+        return reply(200, { ok: true, object: objectId });
       }
 
       case 'Add':
@@ -406,12 +440,12 @@ export class C2S {
         // The one collection a client may edit is the pins (§7.6/§7.9 in the
         // other direction): target must be the featured collection.
         if (idOf(activity.target) !== this.urls.featured) {
-          return this.send(res, 422, { error: 'the featured collection is the one Add/Remove edits here' });
+          return reply(422, { error: 'the featured collection is the one Add/Remove edits here' });
         }
         const s = this.byIri(objectId);
-        if (!s) return this.send(res, 404, { error: 'no such note here' });
+        if (!s) return reply(404, { error: 'no such note here' });
         const updated = await social.pinStatus(agent, s, activity.type === 'Add');
-        return this.send(res, 200, { ok: true, object: updated.noteId, pinned: !!updated.pinned });
+        return reply(200, { ok: true, object: updated.noteId, pinned: !!updated.pinned });
       }
 
       case 'Accept':
@@ -419,19 +453,19 @@ export class C2S {
         // Answering a held follow request: the object is the Follow (or the
         // requester). Which request is meant comes from the Follow's actor.
         const requester = object?.actor ? idOf(object.actor) : objectId;
-        if (!requester) return this.send(res, 400, { error: 'whose request? object must name the Follow or its actor' });
+        if (!requester) return reply(400, { error: 'whose request? object must name the Follow or its actor' });
         const r = activity.type === 'Accept'
           ? await social.admitRequest(agent, requester).catch((e) => ({ error: e.message }))
           : await social.refuseRequest(agent, requester).catch((e) => ({ error: e.message }));
-        if (r.error) return this.send(res, 404, { error: r.error });
-        return this.send(res, 200, { ok: true, object: requester });
+        if (r.error) return reply(404, { error: r.error });
+        return reply(200, { ok: true, object: requester });
       }
 
       case 'Move':
-        return this.send(res, 422, { error: 'moving the account is done on the admin surface, where it asks twice' });
+        return reply(422, { error: 'moving the account is done on the admin surface, where it asks twice' });
 
       default:
-        return this.send(res, 422, { error: `no handler for ${activity.type}` });
+        return reply(422, { error: `no handler for ${activity.type}` });
     }
   }
 }

package/lib/core/contexts/anno.json

@@ -0,0 +1,126 @@
+{
+ "@context": {
+    "oa":      "http://www.w3.org/ns/oa#",
+    "dc":      "http://purl.org/dc/elements/1.1/",
+    "dcterms": "http://purl.org/dc/terms/",
+    "dctypes": "http://purl.org/dc/dcmitype/",
+    "foaf":    "http://xmlns.com/foaf/0.1/",
+    "rdf":     "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+    "rdfs":    "http://www.w3.org/2000/01/rdf-schema#",
+    "skos":    "http://www.w3.org/2004/02/skos/core#",
+    "xsd":     "http://www.w3.org/2001/XMLSchema#",
+    "iana":    "http://www.iana.org/assignments/relation/",
+    "owl":     "http://www.w3.org/2002/07/owl#",
+    "as":      "http://www.w3.org/ns/activitystreams#",
+    "schema":  "http://schema.org/",
+
+    "id":      {"@type": "@id", "@id": "@id"},
+    "type":    {"@type": "@id", "@id": "@type"},
+
+    "Annotation":           "oa:Annotation",
+    "Dataset":              "dctypes:Dataset",
+    "Image":                "dctypes:StillImage",
+    "Video":                "dctypes:MovingImage",
+    "Audio":                "dctypes:Sound",
+    "Text":                 "dctypes:Text",
+    "TextualBody":          "oa:TextualBody",
+    "ResourceSelection":    "oa:ResourceSelection",
+    "SpecificResource":     "oa:SpecificResource",
+    "FragmentSelector":     "oa:FragmentSelector",
+    "CssSelector":          "oa:CssSelector",
+    "XPathSelector":        "oa:XPathSelector",
+    "TextQuoteSelector":    "oa:TextQuoteSelector",
+    "TextPositionSelector": "oa:TextPositionSelector",
+    "DataPositionSelector": "oa:DataPositionSelector",
+    "SvgSelector":          "oa:SvgSelector",
+    "RangeSelector":        "oa:RangeSelector",
+    "TimeState":            "oa:TimeState",
+    "HttpRequestState":     "oa:HttpRequestState",
+    "CssStylesheet":        "oa:CssStyle",
+    "Choice":               "oa:Choice",
+    "Person":               "foaf:Person",
+    "Software":             "as:Application",
+    "Organization":         "foaf:Organization",
+    "AnnotationCollection": "as:OrderedCollection",
+    "AnnotationPage":       "as:OrderedCollectionPage",
+    "Audience":             "schema:Audience", 
+
+    "Motivation":    "oa:Motivation",
+    "bookmarking":   "oa:bookmarking",
+    "classifying":   "oa:classifying",
+    "commenting":    "oa:commenting",
+    "describing":    "oa:describing",
+    "editing":       "oa:editing",
+    "highlighting":  "oa:highlighting",
+    "identifying":   "oa:identifying",
+    "linking":       "oa:linking",
+    "moderating":    "oa:moderating",
+    "questioning":   "oa:questioning",
+    "replying":      "oa:replying",
+    "reviewing":     "oa:reviewing",
+    "assessing":     "oa:assessing",
+    "tagging":       "oa:tagging",
+
+    "auto":          "oa:autoDirection",
+    "ltr":           "oa:ltrDirection",
+    "rtl":           "oa:rtlDirection",
+
+    "body":          {"@type": "@id", "@id": "oa:hasBody"},
+    "target":        {"@type": "@id", "@id": "oa:hasTarget"},
+    "source":        {"@type": "@id", "@id": "oa:hasSource"},
+    "selector":      {"@type": "@id", "@id": "oa:hasSelector"},
+    "state":         {"@type": "@id", "@id": "oa:hasState"},
+    "scope":         {"@type": "@id", "@id": "oa:hasScope"},
+    "refinedBy":     {"@type": "@id", "@id": "oa:refinedBy"},
+    "startSelector": {"@type": "@id", "@id": "oa:hasStartSelector"},
+    "endSelector":   {"@type": "@id", "@id": "oa:hasEndSelector"},
+    "renderedVia":   {"@type": "@id", "@id": "oa:renderedVia"},
+    "creator":       {"@type": "@id", "@id": "dcterms:creator"},
+    "generator":     {"@type": "@id", "@id": "as:generator"},
+    "rights":        {"@type": "@id", "@id": "dcterms:rights"},
+    "homepage":      {"@type": "@id", "@id": "foaf:homepage"},
+    "via":           {"@type": "@id", "@id": "oa:via"},
+    "canonical":     {"@type": "@id", "@id": "oa:canonical"},
+    "stylesheet":    {"@type": "@id", "@id": "oa:styledBy"},
+    "cached":        {"@type": "@id", "@id": "oa:cachedSource"},
+    "conformsTo":    {"@type": "@id", "@id": "dcterms:conformsTo"},
+    "items":         {"@type": "@id", "@id": "as:items", "@container": "@list"},
+    "partOf":        {"@type": "@id", "@id": "as:partOf"},
+    "first":         {"@type": "@id", "@id": "as:first"},
+    "last":          {"@type": "@id", "@id": "as:last"},
+    "next":          {"@type": "@id", "@id": "as:next"},
+    "prev":          {"@type": "@id", "@id": "as:prev"},
+    "audience":      {"@type": "@id", "@id": "schema:audience"},
+    "motivation":    {"@type": "@vocab", "@id": "oa:motivatedBy"},
+    "purpose":       {"@type": "@vocab", "@id": "oa:hasPurpose"},
+    "textDirection": {"@type": "@vocab", "@id": "oa:textDirection"},
+
+    "accessibility": "schema:accessibilityFeature",
+    "bodyValue":     "oa:bodyValue",
+    "format":        "dc:format",
+    "language":      "dc:language",
+    "processingLanguage": "oa:processingLanguage",
+    "value":         "rdf:value",
+    "exact":         "oa:exact",
+    "prefix":        "oa:prefix",
+    "suffix":        "oa:suffix",
+    "styleClass":    "oa:styleClass",
+    "name":          "foaf:name",
+    "email":         "foaf:mbox",
+    "email_sha1":    "foaf:mbox_sha1sum",
+    "nickname":      "foaf:nick",
+    "label":         "rdfs:label",
+
+    "created":       {"@id": "dcterms:created", "@type": "xsd:dateTime"},
+    "modified":      {"@id": "dcterms:modified", "@type": "xsd:dateTime"},
+    "generated":     {"@id": "dcterms:issued", "@type": "xsd:dateTime"},
+    "sourceDate":    {"@id": "oa:sourceDate", "@type": "xsd:dateTime"},
+    "sourceDateStart": {"@id": "oa:sourceDateStart", "@type": "xsd:dateTime"},
+    "sourceDateEnd": {"@id": "oa:sourceDateEnd", "@type": "xsd:dateTime"},
+
+    "start":         {"@id": "oa:start", "@type": "xsd:nonNegativeInteger"},
+    "end":           {"@id": "oa:end", "@type": "xsd:nonNegativeInteger"},
+    "total":         {"@id": "as:totalItems", "@type": "xsd:nonNegativeInteger"},
+    "startIndex":    {"@id": "as:startIndex", "@type": "xsd:nonNegativeInteger"}
+  }
+}

package/lib/core/contexts/index.mjs

@@ -25,6 +25,9 @@ import ctx10 from './fep-5711.json' with { type: 'json' };
 import ctx11 from './join-lemmy.json' with { type: 'json' };
 import ctx12 from './joinmastodon.json' with { type: 'json' };
 import ctx13 from './miscellany.json' with { type: 'json' };
+// Not from fedify: the W3C Web Annotation context, which a client such as
+// dokieli names on the annotations it posts to the outbox.
+import ctx14 from './anno.json' with { type: 'json' };
 
 /** URL → the context document itself. Nothing outside this map is ever resolved. */
 export const CONTEXTS = {
@@ -42,4 +45,5 @@ export const CONTEXTS = {
   'https://join-lemmy.org/context.json': ctx11,
   'http://joinmastodon.org/ns': ctx12,
   'https://purl.archive.org/miscellany': ctx13,
+  'http://www.w3.org/ns/anno.jsonld': ctx14,
 };

package/lib/core/contexts/map.json

@@ -12,5 +12,6 @@
   "https://w3id.org/fep/5711": "fep-5711.json",
   "https://join-lemmy.org/context.json": "join-lemmy.json",
   "http://joinmastodon.org/ns": "joinmastodon.json",
-  "https://purl.archive.org/miscellany": "miscellany.json"
+  "https://purl.archive.org/miscellany": "miscellany.json",
+  "http://www.w3.org/ns/anno.jsonld": "anno.json"
 }

package/lib/core/intake/index.mjs

@@ -59,8 +59,10 @@ const MAX_ITEM_ATTEMPTS = 5;
 const MAX_ITEMS_PER_DRAIN = 50;
 
 export class Intake {
-  constructor({ config, urls, remote, store, deliverer, publisher, log = console.log, lease = null, archive = null, push = true, pollSeconds = null }) {
-    Object.assign(this, { config, urls, remote, store, deliverer, publisher, log, lease, archive, push, pollSeconds });
+  // `ownerPost(activity, { raw, slug })` is the client-to-server dispatcher,
+  // for an item the Gateway's outbox door took on the owner's behalf.
+  constructor({ config, urls, remote, store, deliverer, publisher, log = console.log, lease = null, archive = null, push = true, pollSeconds = null, ownerPost = null }) {
+    Object.assign(this, { config, urls, remote, store, deliverer, publisher, log, lease, archive, push, pollSeconds, ownerPost });
     this.serial = Date.now();
     this.stopped = false;
     // (attempt counts are kept in pod state — see _bumpAttempt)
@@ -429,9 +431,14 @@ export class Intake {
         // receipt reads as null, which is exactly today's unverified behavior.
         const receipt = activity ? await this._readReceipt(url) : null;
         if (activity && this.gatewaySecret()) this._bumpGatewayStat(!!receipt?.verified);
-        const rejection = activity ? await this.handle(activity, receipt) : 'unparsable JSON';
-        if (!rejection && raw) await this._archive(url, raw, activity);
-        if (!rejection) await this._maybeForward(activity);    // §7.1.2, only what we accepted
+        // The owner's own post, taken at the outbox door: not mail to read
+        // but a write to make. Never archived or forwarded as if received.
+        const owned = activity && this.isOwnerPost(receipt);
+        const rejection = !activity ? 'unparsable JSON'
+          : owned ? await this.ownerPostFrom(activity, raw, receipt)
+            : await this.handle(activity, receipt);
+        if (!rejection && raw && !owned) await this._archive(url, raw, activity);
+        if (!rejection && !owned) await this._maybeForward(activity);    // §7.1.2, only what we accepted
         if (rejection) {
           this.store.addDeadLetter({
             inboxUrl: url, reason: rejection, activity: trimActivity(activity),
@@ -594,6 +601,26 @@ export class Intake {
   gatewaySecret(...a) { return verify.gatewaySecret(this, ...a); }
   _bumpGatewayStat(...a) { return verify.bumpGatewayStat(this, ...a); }
   _readReceipt(...a) { return verify.readReceipt(this, ...a); }
+
+  // A receipt the door stamped `c2s` for THIS actor, and only a receipt whose
+  // HMAC verified (readReceipt returns nothing else). A stranger appending an
+  // item that claims to be ours has no such receipt and is read as mail.
+  isOwnerPost(receipt) {
+    return !!(this.ownerPost && receipt?.verified && receipt.method === 'c2s' && receipt.actor === this.urls.actor);
+  }
+
+  // Publish what the owner posted at the door. The bytes as the client wrote
+  // them go to the dispatcher (an object stored as sent must be the client's
+  // document, not our reading of it); the graph is what it decides from.
+  // Returns null when published, else the reason it was not — a dead letter.
+  async ownerPostFrom(activity, raw, receipt) {
+    let asSent = null;
+    try { asSent = raw ? JSON.parse(raw) : null; } catch { asSent = null; }
+    const r = await this.ownerPost(activity, { raw: asSent, slug: receipt.slug || null });
+    if (!r || r.status >= 300) return `owner post refused (${r?.status || '?'}): ${r?.body?.error || ''}`;
+    this.log(`owner post from the outbox door published: ${r.body?.object || r.body?.id || activity.type}`);
+    return null;
+  }
   receiptVouchesFor(...a) { return verify.receiptVouchesFor(this, ...a); }
   isGone(...a) { return verify.isGone(this, ...a); }
 

package/lib/core/publisher/index.mjs

@@ -76,6 +76,15 @@ export class Publisher {
   // republish button. Without it, an actor lost from the pod would match the
   // digest, be skipped, and leave the agent reporting success while nobody can
   // resolve it.
+  // The Gateway's outbox door for this account, when a Gateway is attached:
+  // beside its inbox door, or under the fronted actor.
+  gatewayOutbox() {
+    const gw = this.config.gateway;
+    if (!(gw && gw.url && gw.mode && gw.mode !== 'off')) return null;
+    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 } = {}) {
     const { urls } = this;
     const host = new URL(urls.base).host;
@@ -105,7 +114,8 @@ export class Publisher {
       inbox: gwActive ? gw.url : null,
       // The agent's own outbox endpoint, where it is reachable: a client
       // following the actor must arrive somewhere that will take a write.
-      outbox: this.clientOrigin ? `${this.clientOrigin}ap/outbox` : null,
+      // Otherwise the Gateway's outbox door, when one is attached.
+      outbox: this.clientOrigin ? `${this.clientOrigin}ap/outbox` : this.gatewayOutbox(),
       // How a client-to-server client finds the way in with nothing configured
       // by hand. Advertised only where the surface is publicly reachable.
       oauthAuthorize: this.clientOrigin ? `${this.clientOrigin}oauth/authorize` : null,
@@ -163,6 +173,8 @@ export class Publisher {
         actorUrl: urls.actor,
         accountName: `@${this.config.handle}@${host}`,
         kind: this.config.kind,
+        // Where a Solid client posts: dokieli reads `as:outbox` off the WebID.
+        outbox: this.clientOrigin ? `${this.clientOrigin}ap/outbox` : this.gatewayOutbox(),
       });
       if (wrote) this.log('WebID profile now lists the actor as a foaf:account');
     } catch (e) {
@@ -400,6 +412,7 @@ export class Publisher {
   reconcileFollowers(...a) { return restore.reconcileFollowers(this, ...a); }
   reconcileOutbox(...a) { return restore.reconcileOutbox(this, ...a); }
   rebuildStatuses(...a) { return restore.rebuildStatuses(this, ...a); }
+  healStatuses(...a) { return restore.healStatuses(this, ...a); }
 
   // notes.mjs
   ensureMediaContainer(...a) { return notes.ensureMediaContainer(this, ...a); }
@@ -408,6 +421,7 @@ export class Publisher {
   privateReady(...a) { return notes.privateReady(this, ...a); }
   _mentionsFor(...a) { return notes.mentionsFor(this, ...a); }
   publishNote(...a) { return notes.publishNote(this, ...a); }
+  publishObject(...a) { return notes.publishObject(this, ...a); }
   updateNote(...a) { return notes.updateNote(this, ...a); }
 
   // questions.mjs