Add source parameter to RSS and Atom feeds

nationalarchives · Nov 11, 2024 · f007e35 · f007e35
1 parent 3b7b5c5
commit f007e35
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/app/templates/base.html b/app/templates/base.html
@@ -40,6 +40,9 @@
     <meta name="tna.app.build-version" content="{{ app_config.BUILD_VERSION }}">
     <meta name="tna.settings.theme" content="{{ theme }}">
     <meta name="tna.page.route" content="{{ request.url_rule }}">
+    {% if request.args.get('source') %}
+    <meta name="tna.source" content="{{ request.args.get('source') }}">
+    {% endif %}
 {% endblock %}
 
 {% block stylesheets %}
@@ -52,9 +55,9 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Open+Sans:[email protected]&family=Roboto+Mono:[email protected]&display=swap" media="screen,print">
     <link rel="stylesheet" href="{{ url_for('static', filename='font-awesome.css', v=app_config.BUILD_VERSION) }}" media="screen,print">
     <link rel="stylesheet" href="{{ url_for('static', filename='ie.css', v=app_config.BUILD_VERSION) }}" media="all and (-ms-high-contrast: none), (-ms-high-contrast: active)">
-    {%- if feature.LOGO_ADORNMENTS_CSS %}
+    {% if feature.LOGO_ADORNMENTS_CSS %}
     <link rel="stylesheet" href="{{ feature.LOGO_ADORNMENTS_CSS }}?date={{ now_iso_8601_no_time() }}" media="screen">
-    {%- endif %}
+    {% endif %}
 {% endblock %}
 
 {% block cookies %}

diff --git a/app/templates/blog/atom_feed.xml b/app/templates/blog/atom_feed.xml
@@ -25,7 +25,7 @@
     <logo>{{ blog_post.teaser_image.jpeg.full_url }}</logo>
     <icon>{{ blog_post.teaser_image.jpeg.full_url }}</icon>
     {% endif %} #}
-    <id>{{ url_for('wagtail.page_permalink', page_id=blog_post.id, _external=True, _scheme='https') }}</id>
+    <id>{{ url_for('wagtail.page_permalink', page_id=blog_post.id, source='atom', _external=True, _scheme='https') }}</id>
     <summary>{{ blog_post.teaser_text }}</summary>
     {% if blog_post.authors %}
     {% for author in blog_post.authors %}

diff --git a/app/templates/blog/rss_feed.xml b/app/templates/blog/rss_feed.xml
@@ -42,7 +42,7 @@
         <![CDATA[ {{ blog_post.teaser_text }} ]]>
       </description>
       <link>{{ blog_post.full_url }}</link>
-      <guid isPermaLink="true">{{ url_for('wagtail.page_permalink', page_id=blog_post.id, _external=True, _scheme='https') }}</guid>
+      <guid isPermaLink="true">{{ url_for('wagtail.page_permalink', page_id=blog_post.id, source='rss', _external=True, _scheme='https') }}</guid>
       {% if blog_post.authors %}
       <dc:creator>
         <![CDATA[ {% for author in blog_post.authors -%}

diff --git a/app/templates/macros/meta.html b/app/templates/macros/meta.html
@@ -13,22 +13,22 @@
     <meta name="twitter:card" content="summary">
 {% if title %}
     <meta property="og:title" content="{{ title }}">
-{% endif %}
+{%- endif %}
 {% if page_data.meta and page_data.meta.twitter_og_title %}
     <meta name="twitter:title" content="{{ page_data.meta.twitter_og_title }}">
-{% endif %}
+{%- endif %}
 
 {% if description %}
     <meta name="description" content="{{ description }}">
     <meta property="og:description" content="{{ description }}">
-{% endif %}
+{%- endif %}
 {% if page_data.meta and page_data.meta.twitter_og_description %}
     <meta name="twitter:description" content="{{ page_data.meta.twitter_og_description }}">
-{% endif %}
+{%- endif %}
 
 {% if url %}
     <meta property="og:url" content="{{ url }}">
-{% endif %}
+{%- endif %}
 
 {%- set og_image = None %}
 {% if page_data.meta and page_data.meta.facebook_og_image %}
@@ -45,14 +45,14 @@
     'height': page_data.meta.teaser_image.jpeg.height,
     'type': 'image/jpeg'
   } %}
-{% endif %}
+{%- endif %}
 
 {% if og_image %}
     <meta property="og:image" content="{{ og_image.src }}">
     <meta property="og:image:width" content="{{ og_image.width }}">
     <meta property="og:image:height" content="{{ og_image.height }}">
     <meta property="og:image:type" content="{{ og_image.type }}">
-{% endif %}
+{%- endif %}
 
 {%- set og_image_twitter = None %}
 {% if page_data.meta and page_data.meta.twitter_og_image %}
@@ -65,26 +65,26 @@
     {% set og_image_twitter = {
         'src': page_data.meta.teaser_image.jpeg.full_url
     } %}
-{% endif %}
+{%- endif %}
 {% if og_image_twitter %}
     <meta name="twitter:image" content="{{ og_image_twitter.src }}">
-{% endif %}
+{%- endif %}
 
 {% if page_data.id %}
     <meta name="tna.page.wagtail.id" content="{{ page_data.id }}">
-{% endif %}
+{%- endif %}
 
 {% if page_data.title %}
     <meta name="tna.page.title" content="{{ page_data.title }}">
-{% endif %}
+{%- endif %}
 
 {% if page_data.meta and page_data.meta.type %}
     <meta name="tna.page.wagtail.type" content="{{ page_data.meta.type }}">
     <meta name="page_type" content="{{ page_data.meta.type.split('.')[1] }}">
-{% endif %}
+{%- endif %}
 
 {% if page_data.tags and page_data.tags | length %}
     <meta name="tna.page.tags" content="{{ page_data.tags | join('; ') }}">
     <meta name="taxonom_tags" content="{{ page_data.tags | join('; ') }}">
-{% endif %}
+{%- endif %}
 {% endmacro %}
diff --git a/app/wagtail/routes.py b/app/wagtail/routes.py
@@ -119,6 +119,7 @@ def page_permalink(page_id):
             url_for(
                 "wagtail.page",
                 path=page_data["meta"]["url"].strip("/"),
+                **request.args.to_dict(),
             ),
             code=302,
         )