From dd536476ec055027a0a72b4b0394d48eb8484a9a Mon Sep 17 00:00:00 2001
From: Jieiku
Date: Tue, 31 May 2022 02:37:04 -0700
Subject: Determine Atom vs Rss Feed Type

---
 config.toml                  | 1 -
 templates/macros/head.html   | 2 +-
 templates/macros/social.html | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/config.toml b/config.toml
index 649aa3e..f35f60c 100644
--- a/config.toml
+++ b/config.toml
@@ -91,7 +91,6 @@ security_header_referrer = "strict-origin-when-cross-origin"
 banner = "banner.png" # Used as default image for OpenGraph/Twitter if page specific image is undefined.
 js_search_index = "search_index.en.js"
 js_search = "search.min.js"
-rss_atom_feed = "atom.xml"
 stylesheet = "abridge.css" # location and file to use for stylesheet:
 #           abridge.css - Orange Automatic Dark/Light Theme based on browser/system preference.
 #      abridge-dark.css - Orange Dark Theme
diff --git a/templates/macros/head.html b/templates/macros/head.html
index 402d99e..9e4d59f 100644
--- a/templates/macros/head.html
+++ b/templates/macros/head.html
@@ -26,7 +26,7 @@
 {%- endif %}
 
 {%- if config.generate_feed %}
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ get_url(path=config.extra.rss_atom_feed, trailing_slash=false) }}">
+  <link rel="alternate" type="{% if config.feed_filename is containing('atom') %}application/atom+xml{% else %}application/rss+xml{% endif %}" title="Atom/RSS Feed" href="{{ get_url(path=config.feed_filename, trailing_slash=false) | safe }}">
 {%- endif %}
 
 {%- endmacro %}
diff --git a/templates/macros/social.html b/templates/macros/social.html
index 37c66af..d34fb29 100644
--- a/templates/macros/social.html
+++ b/templates/macros/social.html
@@ -2,7 +2,7 @@
 {%- set base_url = get_url(path="", lang=lang) %}
         <span>
           {%- if config.generate_feed %}{%- if config.extra.social.feed %}
-          <a href="{{ get_url(path="atom.xml") }}" target="_blank"><span class="svg rss" title="Rss"></span></a>{% endif %}{% endif %}
+          <a href="{{ get_url(path=config.feed_filename, trailing_slash=false) | safe }}" target="_blank"><span class="svg rss" title="Atom/RSS Feed"></span></a>{% endif %}{% endif %}
           {%- if social_config.mail %}
           <a href="mailto:{{ social_config.mail }}" target="_blank"><span class="svg mail" title="Mail"></span></a>{% endif %}
           {%- if social_config.mastodon %}
-- 
cgit v1.3.1