atom: bug fix for published/updated for bookmarks

fixes #480
snarfed · Jan 27, 2023 · bb7c631 · bb7c631
1 parent aa2cd45
commit bb7c631
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/granary/templates/_entry.atom b/granary/templates/_entry.atom
@@ -63,7 +63,7 @@
   {% if activity.verb in VERBS_WITH_OBJECT and (obj.url or obj.id) %}
     <activity:object>{{ obj.url or obj.id }}</activity:object>
   {% endif %}
-  {% set base = activity if activity.verb in VERBS_WITH_OBJECT else obj %}
+  {% set base = activity if (activity.verb in VERBS_WITH_OBJECT or obj.objectType == 'bookmark') else obj %}
   <published>{{ base.published }}</published>
   <updated>{{ base.updated or base.published }}</updated>
   {% for orig in obj.inReplyTo or activity.context.inReplyTo %}

diff --git a/granary/tests/test_atom.py b/granary/tests/test_atom.py
@@ -176,6 +176,28 @@ def test_activity_to_atom_like(self):
         'updated': '2013-10-25',
       }), ignore_blanks=True)
 
+  def test_activity_to_atom_bookmark(self):
+    got = atom.activity_to_atom({
+      'url': 'bookmark-url',
+      'objectType': 'activity',
+      'verb': 'post',
+      'object': {
+        'objectType': 'bookmark',
+        'targetUrl': 'http://orig',
+      },
+      'published': '2012-02-22',
+      'updated': '2013-10-25',
+    })
+    self.assert_multiline_in("""\
+<activity:object-type>http://activitystrea.ms/schema/1.0/bookmark</activity:object-type>
+""", got, ignore_blanks=True)
+    self.assert_multiline_in("""\
+<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
+<published>2012-02-22</published>
+<updated>2013-10-25</updated>
+<link rel="self" type="application/atom+xml" href="bookmark-url" />
+""", got, ignore_blanks=True)
+
   def test_activity_to_atom_author_without_properties(self):
     """https://console.cloud.google.com/errors/CMPawqSghuDquwE"""
     self.assertIn('<title>foo</title>', atom.activity_to_atom({