atom: tweak author name rendering in attachments

...specifically, use a smaller version that doesn't include picture

granary/atom.py

@@ -83,7 +83,9 @@ def activities_to_atom(activities, actor, title=None, request_url=None,
         html = microformats2.render_content(att)
         author = att.get('author')
         if author:
-          html = '%s: %s' % (microformats2.object_to_html(author).strip(), html)
+          name = microformats2.maybe_linked_name(
+            microformats2.object_to_json(author).get('properties', []))
+          html = '%s: %s' % (name.strip(), html)
         obj['rendered_children'].append(_encode_ampersands(html))
 
   # Emulate Django template behavior that returns a special default value that

granary/test/test_atom.py

@@ -173,8 +173,15 @@ def test_attachments(self):
     got = atom.activities_to_atom([{'object': {'attachments': [
       {'objectType': 'note', 'url': 'http://p', 'content': 'note content'},
       {'objectType': 'x', 'url': 'http://x'},
-      {'objectType': 'article', 'url': 'http://a', 'content': 'article content',
-       'author': {'displayName': 'Mr. Foo', 'url': 'http://x/', 'objectType': 'person'},
+      {'objectType': 'article',
+       'url': 'http://a',
+       'content': 'article content',
+       'author': {
+         'displayName': 'Mr. Foo',
+         'url': 'http://x/',
+         # image shouldn't be included
+         'image': {'url': 'http://x/avatar.jpg'},
+       },
       },
     ]}}], None)
     self.assert_multiline_in("""
@@ -184,10 +191,7 @@ def test_attachments(self):
 """, got)
     self.assert_multiline_in("""
 <blockquote>
-<span class="h-card">
-<a class="p-name u-url" href="http://x/">Mr. Foo</a>
-
-</span>: article content
+<a class="p-name u-url" href="http://x/">Mr. Foo</a>: article content
 </blockquote>
 """, got)