The previous fix incorrectly generated /og/{year}-{month}-{day}-{slug}.png
but the Eleventy blog generates OG images at /og/{slug}.png (e.g. /og/2615b.png).
Remove the unnecessary date extraction and simplify to slug-only.
https://claude.ai/code/session_0124D41vdLYE3DkJxhPqYthX
137 lines
4.8 KiB
JavaScript
137 lines
4.8 KiB
JavaScript
/**
|
|
* Patch: fix OG image URL generation in ActivityPub jf2-to-as2.js.
|
|
*
|
|
* Root cause:
|
|
* Both 842fc5af and 45f8ba9 versions of jf2-to-as2.js try to extract the
|
|
* post slug from the URL using a regex that expects date-based URLs like
|
|
* /articles/2024/01/15/slug/ but this blog uses flat URLs like /articles/slug/.
|
|
* The regex never matches so the `image` property is never set — no OG image
|
|
* preview card reaches Mastodon or other fediverse servers.
|
|
*
|
|
* Fix:
|
|
* Replace the date-from-URL regex with a simple last-path-segment extraction.
|
|
* Constructs /og/{slug}.png — the actual filename pattern the Eleventy build
|
|
* generates for static OG preview images (e.g. /og/2615b.png).
|
|
*
|
|
* Both jf2ToActivityStreams() (plain JSON-LD) and jf2ToAS2Activity() (Fedify
|
|
* vocab objects) are patched. Both 842fc5af and 45f8ba9 variants are handled
|
|
* so the patch works regardless of which commit npm install resolved.
|
|
*/
|
|
|
|
import { access, readFile, writeFile } from "node:fs/promises";
|
|
|
|
const candidates = [
|
|
"node_modules/@rmdes/indiekit-endpoint-activitypub/lib/jf2-to-as2.js",
|
|
"node_modules/@indiekit/indiekit/node_modules/@rmdes/indiekit-endpoint-activitypub/lib/jf2-to-as2.js",
|
|
];
|
|
|
|
const MARKER = "// og-image fix";
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Use JS regex patterns to locate the OG image blocks.
|
|
// Both 842fc5af and 45f8ba9 share the same variable names (ogMatch / ogMatchF)
|
|
// and the same if-block structure, differing only in the URL construction.
|
|
//
|
|
// Pattern: matches from "const ogMatch[F] = postUrl && postUrl.match(" to the
|
|
// closing "}" (2-space indent) of the if block.
|
|
// ---------------------------------------------------------------------------
|
|
const CN_BLOCK_RE =
|
|
/ const ogMatch = postUrl && postUrl\.match\([^\n]+\n if \(ogMatch\) \{[\s\S]*?\n \}/;
|
|
|
|
const AS2_BLOCK_RE =
|
|
/ const ogMatchF = postUrl && postUrl\.match\([^\n]+\n if \(ogMatchF\) \{[\s\S]*?\n \}/;
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Replacement: extract slug from last URL path segment.
|
|
// Build /og/{slug}.png to match the Eleventy OG filenames (e.g. /og/2615b.png).
|
|
//
|
|
// Template literal note: backslashes inside the injected regex are doubled so
|
|
// they survive the template literal → string conversion:
|
|
// \\\/ → \/ (escaped slash in regex)
|
|
// [\\\w-] → [\w-] (word char class)
|
|
// ---------------------------------------------------------------------------
|
|
const NEW_CN = ` const ogSlug = postUrl && postUrl.match(/\\/([\\\w-]+)\\/?$/)?.[1]; // og-image fix
|
|
if (ogSlug) { // og-image fix
|
|
object.image = {
|
|
type: "Image",
|
|
url: \`\${publicationUrl.replace(/\\/$/, "")}/og/\${ogSlug}.png\`, // og-image fix
|
|
mediaType: "image/png",
|
|
};
|
|
}`;
|
|
|
|
const NEW_AS2 = ` const ogSlugF = postUrl && postUrl.match(/\\/([\\\w-]+)\\/?$/)?.[1]; // og-image fix
|
|
if (ogSlugF) { // og-image fix
|
|
noteOptions.image = new Image({
|
|
url: new URL(\`\${publicationUrl.replace(/\\/$/, "")}/og/\${ogSlugF}.png\`), // og-image fix
|
|
mediaType: "image/png",
|
|
});
|
|
}`;
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
async function exists(filePath) {
|
|
try {
|
|
await access(filePath);
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
let checked = 0;
|
|
let patched = 0;
|
|
|
|
for (const filePath of candidates) {
|
|
if (!(await exists(filePath))) {
|
|
continue;
|
|
}
|
|
|
|
checked += 1;
|
|
const source = await readFile(filePath, "utf8");
|
|
|
|
if (source.includes(MARKER)) {
|
|
console.log(`[postinstall] patch-ap-og-image: already applied to ${filePath}`);
|
|
continue;
|
|
}
|
|
|
|
let updated = source;
|
|
let changed = false;
|
|
|
|
// Fix the jf2ToActivityStreams OG block
|
|
if (CN_BLOCK_RE.test(updated)) {
|
|
updated = updated.replace(CN_BLOCK_RE, NEW_CN);
|
|
changed = true;
|
|
} else {
|
|
console.warn(
|
|
`[postinstall] patch-ap-og-image: jf2ToActivityStreams OG block not found in ${filePath} — skipping`,
|
|
);
|
|
}
|
|
|
|
// Fix the jf2ToAS2Activity OG block
|
|
if (AS2_BLOCK_RE.test(updated)) {
|
|
updated = updated.replace(AS2_BLOCK_RE, NEW_AS2);
|
|
changed = true;
|
|
} else {
|
|
console.warn(
|
|
`[postinstall] patch-ap-og-image: jf2ToAS2Activity OG block not found in ${filePath} — skipping`,
|
|
);
|
|
}
|
|
|
|
if (!changed || updated === source) {
|
|
console.log(`[postinstall] patch-ap-og-image: no changes applied to ${filePath}`);
|
|
continue;
|
|
}
|
|
|
|
await writeFile(filePath, updated, "utf8");
|
|
patched += 1;
|
|
console.log(`[postinstall] Applied patch-ap-og-image to ${filePath}`);
|
|
}
|
|
|
|
if (checked === 0) {
|
|
console.log("[postinstall] patch-ap-og-image: no target files found");
|
|
} else if (patched === 0) {
|
|
console.log("[postinstall] patch-ap-og-image: already up to date");
|
|
} else {
|
|
console.log(`[postinstall] patch-ap-og-image: patched ${patched}/${checked} file(s)`);
|
|
}
|