From 02732645da08ccb4eb9e6f09c0b3a9cf64cbd9b5 Mon Sep 17 00:00:00 2001
From: Joshua Seigler <joshua@seigler.net>
Date: Thu, 3 Jul 2025 01:07:32 -0400
Subject: [PATCH] main rss feed combines posts and recipes

---
 eleventy.config.js            | 7 ++++++-
 site/_includes/collection.njk | 6 +-----
 site/feed.njk                 | 6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/eleventy.config.js b/eleventy.config.js
index 031d13b..a46e12c 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -8,7 +8,6 @@ import mdLinkAttributes from "markdown-it-link-attributes"
 import mdPrism from "markdown-it-prism"
 import dayjs from "dayjs"
 import utc from "dayjs/plugin/utc.js"
-import site from "./site/_data/site.js"
 import clean from "eleventy-plugin-clean"
 import toc from "eleventy-plugin-toc"
 import EleventyFeedPlugin from "@11ty/eleventy-plugin-rss"
@@ -114,6 +113,12 @@ export default async (config) => {
 
   config.addCollection("links", fetchShaarliWebroll)
 
+  config.addCollection("combinedFeed", (collectionApi) => {
+    return collectionApi.getAllSorted().filter(item => {
+      return (item.data.tags ?? []).some(t => ['posts', 'recipes', 'links'].includes(t))
+    })
+  })
+
   config.addFilter("toISOString", (dateString) => {
     return new Date(dateString).toISOString()
   })
diff --git a/site/_includes/collection.njk b/site/_includes/collection.njk
index 9d6fc38..ef093c0 100644
--- a/site/_includes/collection.njk
+++ b/site/_includes/collection.njk
@@ -4,13 +4,9 @@ eleventyComputed:
   tag: "{{ page.fileSlug }}"
   title: "{{ tag | capitalize }}"
   rssUrl: "
-  {%- if tag == 'posts' -%}
-  /feed.xml
-  {%- else -%}
     {%- if tag != 'music' -%}
-      /feeds/{{tag}}
+      /feeds/{{tag}}.xml
     {%- endif -%}
-  {%- endif -%}
   "
 ---
 
diff --git a/site/feed.njk b/site/feed.njk
index 54ef6cd..1768905 100644
--- a/site/feed.njk
+++ b/site/feed.njk
@@ -10,13 +10,13 @@ pagination:
     - links
     - timeline
 eleventyComputed:
-  finalLink: "{% if tag == 'posts' %}feed.xml{% else %}feeds/{{tag | slugify}}.xml{% endif %}"
+  finalLink: "{% if tag == 'combinedFeed' %}feed.xml{% else %}feeds/{{tag | slugify}}.xml{% endif %}"
   permalink: "/assets/{{finalLink}}"
 ---
 <?xml version="1.0" encoding="utf-8"?>
 <?xml-stylesheet type="text/xsl" href="/simple-atom.xslt"?>
 <feed xmlns="http://www.w3.org/2005/Atom" xml:lang="{{ site.language }}">
-  <title>{{ site.title }} - {{ tag }}</title>
+  <title>{{ site.title }}{% if tag !== 'combinedFeed' %} - {{ tag }}{% endif %}</title>
   <subtitle>{{ collections.pages[tag].data.description or site.description }}</subtitle>
   <link href="{{ site.baseUrl }}{{ finalLink }}" rel="self" />
   <link href="{{ site.baseUrl | addPathPrefixToFullUrl }}" />
@@ -29,7 +29,7 @@ eleventyComputed:
   {%- if entry.url and entry.date -%}
     {%- set absolutePostUrl %}{{ entry.url | htmlBaseUrl(site.baseUrl) }}{% endset %}
     <entry>
-      <title>{{ entry.data.title }}</title>
+      <title>{% if tag == 'combinedFeed' %}{{ entry.data.tags[0].slice(0,-1) | title }}: {% endif %}{{ entry.data.title }}</title>
       <link href="{{ absolutePostUrl }}" />
       <updated>{{ entry.date | dateToRfc3339 }}</updated>
       <id>{{ absolutePostUrl }}</id>