From b106d42f4d7bcea194a2f04d4034ef3fec699081 Mon Sep 17 00:00:00 2001
From: Parker TenBroeck <51721964+ParkerTenBroeck@users.noreply.github.com>
Date: Sat, 2 May 2026 10:52:48 -0400
Subject: [PATCH] photos properly included in RSS and Atom feed

---
 templates/atom.xml            | 54 +++++++++++++++++++++++++++++++++++
 templates/macros/feed.html    | 15 +++++++++-
 templates/macros/figures.html |  2 +-
 templates/rss.xml             | 42 +++++++++++++++++++++++++++
 4 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100644 templates/atom.xml
 create mode 100644 templates/rss.xml

diff --git a/templates/atom.xml b/templates/atom.xml
new file mode 100644
index 0000000..2a9bae9
--- /dev/null
+++ b/templates/atom.xml
@@ -0,0 +1,54 @@
+{% import "macros/feed.html" as feed_macros %}
+
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="{{ lang }}">
+    <title>{{ config.title }}
+    {%- if term %} - {{ term.name }}
+    {%- elif section.title %} - {{ section.title }}
+    {%- endif -%}
+    </title>
+    {%- if config.description %}
+    <subtitle>{{ config.description }}</subtitle>
+    {%- endif %}
+    <link rel="self" type="application/atom+xml" href="{{ feed_url | safe }}"/>
+    <link rel="alternate" type="text/html" href="
+      {%- if section -%}
+        {{ section.permalink | escape_xml | safe }}
+      {%- else -%}
+        {{ config.base_url | escape_xml | safe }}
+      {%- endif -%}
+    "/>
+    <generator uri="https://www.getzola.org/">Zola</generator>
+    {% if last_updated is defined %}<updated>{{ last_updated | date(format="%+") }}</updated>{% endif %}
+    <id>{{ feed_url | safe }}</id>
+    {%- for page in pages %}
+    <entry xml:lang="{{ page.lang }}">
+        <title>{{ page.title }}</title>
+        <published>{{ page.date | date(format="%+") }}</published>
+        <updated>{{ page.updated | default(value=page.date) | date(format="%+") }}</updated>
+        {% for author in page.authors %}
+        <author>
+          <name>
+            {{ author }}
+          </name>
+        </author>
+        {% else %}
+        <author>
+          <name>
+            {%- if config.author -%}
+              {{ config.author }}
+            {%- else -%}
+              Unknown
+            {%- endif -%}
+          </name>
+        </author>
+        {% endfor %}
+        <link rel="alternate" type="text/html" href="{{ page.permalink | safe }}"/>
+        <id>{{ page.permalink | safe }}</id>
+        {% if page.description %}
+            <summary type="html">{{ page.description }}</summary>
+        {% endif %}
+        <content type="html" xml:base="{{ page.permalink | escape_xml | safe }}">{{ feed_macros::content(page=page) }}</content>
+    </entry>
+    {%- endfor %}
+</feed>
\ No newline at end of file
diff --git a/templates/macros/feed.html b/templates/macros/feed.html
index ad9315e..12be2b1 100644
--- a/templates/macros/feed.html
+++ b/templates/macros/feed.html
@@ -1,3 +1,5 @@
+{% import "macros/figures.html" as figures %}
+
 {%- macro link_alternate(filename, title) -%}
     {%- if filename is ending_with("atom.xml") -%}
         {%- set type = 'type="application/atom+xml" ' -%}
@@ -7,4 +9,15 @@
         {%- set type = 'type="application/feed+json" ' -%}
     {%- endif -%}
     <link rel="alternate" {{ type | default(value="") | safe -}} href="{{ get_url(path=filename) }}" title="{{ title | replace(from='"', to="&quot;") | safe }}">
-{%- endmacro -%}
\ No newline at end of file
+{%- endmacro -%}
+
+
+
+{%- macro content(page) -%}
+    
+    {%if page.taxonomies.category is containing("photo") %}
+        {{ figures::image(src=page.extra.picture_src, caption=page.description) }}
+    {% else %}
+        {% if page.summary %}{{ page.summary }}{% else %}{{ page.content }}{% endif %}
+    {% endif %}
+{%- endmacro -%}
diff --git a/templates/macros/figures.html b/templates/macros/figures.html
index c9406ac..fb4e093 100644
--- a/templates/macros/figures.html
+++ b/templates/macros/figures.html
@@ -3,7 +3,7 @@
 {# {% set image = resize_image(path=src, height=mdata.height, width=mdata.width, format="webp") %} #}
 
 <figure class="{% if class %} {{ class }} {% endif %}">
-  <img src="{{ get_url(path=src) }}" loading="lazy"  height="{{mdata.height}}" width="{{mdata.width}}" alt="{{caption | default(value='')}}" decoding="async" class="zoomable">
+  <img src="{{ get_url(path=src) }}" loading="lazy"  height="{{mdata.height}}" width="{{mdata.width}}" alt="{{caption | default(value='')}}" decoding="async" class="zoomable"/>
   {% if caption != "" %}
     <figcaption>{{ caption  | markdown() | safe }}</figcaption>
   {% endif %}
diff --git a/templates/rss.xml b/templates/rss.xml
new file mode 100644
index 0000000..9641ee2
--- /dev/null
+++ b/templates/rss.xml
@@ -0,0 +1,42 @@
+{% import "macros/feed.html" as feed_macros %}
+
+<?xml version="1.0" encoding="UTF-8"?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
+    <channel>
+      <title>{{ config.title }}
+        {%- if term %} - {{ term.name }}
+        {%- elif section.title %} - {{ section.title }}
+        {%- endif -%}
+      </title>
+      <link>
+        {%- if section -%}
+          {{ section.permalink | escape_xml | safe }}
+        {%- else -%}
+          {{ config.base_url | escape_xml | safe }}
+        {%- endif -%}
+      </link>
+      <description>{{ config.description }}</description>
+      <generator>Zola</generator>
+      <language>{{ lang }}</language>
+      <atom:link href="{{ feed_url | safe }}" rel="self" type="application/rss+xml"/>
+      {% if last_updated is defined %}<lastBuildDate>{{ last_updated | date(format="%a, %d %b %Y %H:%M:%S %z") }}</lastBuildDate>{% endif %}
+      {%- for page in pages %}
+      <item>
+          <title>{{ page.title }}</title>
+          <pubDate>{{ page.date | date(format="%a, %d %b %Y %H:%M:%S %z") }}</pubDate>
+          <author>
+            {%- if page.authors -%}
+              {{ page.authors[0] }}
+            {%- elif config.author -%}
+              {{ config.author }}
+            {%- else -%}
+              Unknown
+            {%- endif -%}
+          </author>
+          <link>{{ page.permalink | escape_xml | safe }}</link>
+          <guid>{{ page.permalink | escape_xml | safe }}</guid>
+          <description xml:base="{{ page.permalink | escape_xml | safe }}">{{ feed_macros::content(page=page) }}</description>
+      </item>
+      {%- endfor %}
+    </channel>
+</rss>
\ No newline at end of file