Add tags to quotation, blogmark and entries in the atom feeds

blog/feeds.py

@@ -48,7 +48,11 @@ def item_title(self, item):
         return item.title
 
     def item_description(self, item):
-        return item.body
+        tags = ", ".join(
+            f'<a href="https://simonwillison.net/tags/{tag.tag}">{tag.tag}</a>'
+            for tag in item.tags.all()
+        )
+        return f"{item.body}<p>Tags: {tags}</p>"
 
 
 class Blogmarks(Base):
@@ -62,6 +66,13 @@ def items(self):
     def item_title(self, item):
         return item.link_title
 
+    def item_description(self, item):
+        tags = ", ".join(
+            f'<a href="https://simonwillison.net/tags/{tag.tag}">{tag.tag}</a>'
+            for tag in item.tags.all()
+        )
+        return f"{item.commentary}<p>Tags: {tags}</p>"
+
 
 class Everything(Base):
     title = "Simon Willison's Weblog"
@@ -92,6 +103,18 @@ def item_title(self, item):
         else:
             return "Quoting %s" % item.source
 
+    def item_description(self, item):
+        tags = ", ".join(
+            f'<a href="https://simonwillison.net/tags/{tag.tag}">{tag.tag}</a>'
+            for tag in item.tags.all()
+        )
+        if isinstance(item, Entry):
+            return f"{item.body}<p>Tags: {tags}</p>"
+        elif isinstance(item, Blogmark):
+            return f"{item.commentary}<p>Tags: {tags}</p>"
+        else:
+            return f"{item.quotation}<p>Tags: {tags}</p>"
+
 
 class SeriesFeed(Everything):
     ga_source = "series"

templates/feeds/blogmark.html

@@ -4,3 +4,6 @@
 {% if obj.via_title %}
     <p>Via <a href="{{ obj.via_url }}">{{ obj.via_title }}</a></p>
 {% endif %}
+{% if obj.tags.count %}
+    <p>Tags: {% for tag in obj.tags.all %}<a href="https://simonwillison.net/tags/{{ tag.tag }}">{{ tag.tag }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
+{% endif %}

templates/feeds/everything.html

@@ -1,7 +1,16 @@
 {% if obj.is_entry %}
     {{ obj.body|safe }}
+    {% if obj.tags.count %}
+        <p>Tags: {% for tag in obj.tags.all %}<a href="https://simonwillison.net/tags/{{ tag.tag }}">{{ tag.tag }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
+    {% endif %}
 {% elif obj.is_blogmark %}
     {% include "feeds/blogmark.html" %}
+    {% if obj.tags.count %}
+        <p>Tags: {% for tag in obj.tags.all %}<a href="https://simonwillison.net/tags/{{ tag.tag }}">{{ tag.tag }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
+    {% endif %}
 {% elif obj.is_quotation %}
     {% include "feeds/quotation.html" %}
+    {% if obj.tags.count %}
+        <p>Tags: {% for tag in obj.tags.all %}<a href="https://simonwillison.net/tags/{{ tag.tag }}">{{ tag.tag }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
+    {% endif %}
 {% endif %}

templates/feeds/quotation.html

@@ -1 +1,4 @@
-<blockquote{% if obj.source_url %} cite="{{ obj.source_url }}"{% endif %}>{{ obj.body }}</blockquote><p class="cite">&mdash; {% if obj.source_url %}<a href="{{ obj.source_url }}">{{ obj.source }}</a>{% else %}{{ obj.source }}{% endif %}
+<blockquote{% if obj.source_url %} cite="{{ obj.source_url }}"{% endif %}>{{ obj.body }}</blockquote><p class="cite">&mdash; {% if obj.source_url %}<a href="{{ obj.source_url }}">{{ obj.source }}</a>{% else %}{{ obj.source }}{% endif %}</p>
+{% if obj.tags.count %}
+    <p>Tags: {% for tag in obj.tags.all %}<a href="https://simonwillison.net/tags/{{ tag.tag }}">{{ tag.tag }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
+{% endif %}