fix feeds

diff --git a/_data/metadata.json b/_data/metadata.json
index e6bac9e83730e1c357df058976e95b58ba5190b1..45ff9e551ef80cd83e11247715fdcd96c04c284e 100644 (file)
--- a/_data/metadata.json
+++ b/_data/metadata.json
@@ -1,8 +1,8 @@
 {
     "title": "Cameron Otsuka",
-    "url": "https://otsuka.haus",
+    "subtitle": "The collection of Cameron's thoughts.",
+    "base": "https://otsuka.haus",
     "language": "en",
-    "description": "The collection of Cameron's thoughts.",
     "author": {
         "name": "Cameron Otsuka",
         "email": "cameron@otsuka.haus",

diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk
index 289262ae39488974842861a03aa5eb2f9940e75b..c695c71d99b646f6646e8335c30aa48a9fc94ba4 100644 (file)
--- a/_includes/layouts/base.njk
+++ b/_includes/layouts/base.njk
@@ -10,20 +10,20 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'self' 'unsafe-inline'; frame-src 'none'" />
     <meta name="title" property="og:title" content="{{ title }}" />
-    <meta name="description" property="og:description" content="{{ description or metadata.description }}" />
+    <meta name="description" property="og:description" content="{{ description or metadata.subtitle }}" />
     <meta name="author" content="{{ metadata.author.name }}" />
     <meta name="generator" content="{{ eleventy.generator }}" />
     <meta name="fediverse:creator" content="@cameron@otsuka.social" />
     <meta name="twitter:card" content="summary" />
     <meta name="twitter:creator" content="@CameronOtsuka" />
     <meta name="twitter:title" content="{{ title }}" />
-    <meta name="twitter:description" content="{{ description or metadata.description }}" />
-    <meta name="twitter:image" property="og:image" content="https://v1.screenshot.11ty.dev/{{ metadata.url | urlencode }}{{ page.url | urlencode }}/opengraph/9:16/" />
+    <meta name="twitter:description" content="{{ description or metadata.subtitle }}" />
+    <meta name="twitter:image" property="og:image" content="https://v1.screenshot.11ty.dev/{{ metadata.base | urlencode }}{{ page.url | urlencode }}/opengraph/9:16/" />
     <meta property="og:image:type" content="image/jpeg" />
     <meta property="og:image:width" content="1200" />
     <meta property="og:image:height" content="630" />
     <meta property="og:locale" content="en_US" />
-    <meta property="og:url" content="{{ metadata.url }}{{ page.url }}" />
+    <meta property="og:url" content="{{ metadata.base }}{{ page.url }}" />
     <meta property="og:site_name" content="{{ metadata.title }}" />
     <meta property="og:updated_time" content="{{ updated | isoDate }}" />
     {%- if tags %}
@@ -39,7 +39,7 @@
     {%- endif %}
     <title>{{ title }} | {{ metadata.title }}</title>
     <link rel="icon" type="image/x-icon" href="/favicon.ico" />
-    <link rel="canonical" href="{{ metadata.url }}{{ page.url }}" />
+    <link rel="canonical" href="{{ metadata.base }}{{ page.url }}" />
     <link rel="alternate" href="/feed.xml" type="application/atom+xml" title="{{ metadata.title }}" />
     <link rel="preload" href="/fonts/PublicSans-Bold.woff2" as="font" type="font/woff2" crossorigin />
     <link rel="preload" href="/fonts/PublicSans-BoldItalic.woff2" as="font" type="font/woff2" crossorigin />

diff --git a/eleventy.config.js b/eleventy.config.js
index 14291329873f27546b92c775e9482c2e2953c4f0..974246c9fafb377f941e0215c184021f11ddfaa7 100644 (file)
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -64,11 +64,43 @@ module.exports = function (eleventyConfig) {
                type: "atom",
                outputPath: "/feed.xml",
                collection: {
-                       name: "articles",
+                       name: "activities",
                        limit: 10,
                },
                metadata: globalMetadata,
        });
+       eleventyConfig.addPlugin(feedPlugin, {
+               type: "atom",
+               outputPath: "/feeds/articles.xml",
+               inputPath: "eleventy-plugin-feed-cameron-otsuka-articles-atom.njk",
+               collection: {
+                       name: "articles",
+                       limit: 10,
+               },
+               metadata: {
+                       language: globalMetadata['language'],
+                       title: globalMetadata['title'].concat(" - Articles"),
+                       subtitle: globalMetadata['subtitle'],
+                       base: globalMetadata['base'],
+                       author: globalMetadata['author'],
+               },
+       });
+       eleventyConfig.addPlugin(feedPlugin, {
+               type: "atom",
+               outputPath: "/feeds/reviews.xml",
+               inputPath: "eleventy-plugin-feed-cameron-otsuka-reviews-atom.njk",
+               collection: {
+                       name: "reviews",
+                       limit: 10,
+               },
+               metadata: {
+                       language: globalMetadata['language'],
+                       title: globalMetadata['title'].concat(" - Reviews"),
+                       subtitle: globalMetadata['subtitle'],
+                       base: globalMetadata['base'],
+                       author: globalMetadata['author'],
+               },
+       });
        eleventyConfig.addPlugin(eleventySyntaxHighlightPlugin);
        eleventyConfig.addShortcode("image", async function (src, alt) {
                let input;