user and activities UIs: default to username if we don't have name

for #281

models.py

@@ -107,29 +107,16 @@ class User(StringIdModel):
         """Returns this user's ActivityPub address, eg '@me@foo.com'."""
         return f'@{self.username()}@{self.key.id()}'
 
-    def user_page_link(self, domain_as_name=False):
-        """Returns a pretty user page link with the user's name and profile picture.
-
-        If actor_as2 is not set, returns ''.
-
-        Args:
-          domain_as_name: if True, renders domain if user's name isn't available.
-        """
-        if not self.actor_as2:
-            return ''
-
-        actor = util.json_loads(self.actor_as2)
-        img = actor.get('icon', {}).get('url') or ''
-        name = actor.get('name') or ''
-
+    def user_page_link(self):
+        """Returns a pretty user page link with the user's name and profile picture."""
         domain = self.key.id()
-        if not name and domain_as_name:
-            name = util.domain_from_link(domain)
+        actor = util.json_loads(self.actor_as2) if self.actor_as2 else {}
+        name = (actor.get('name') or
+                # prettify if domain, noop if username
+                util.domain_from_link(self.username()))
+        img = actor.get('icon', {}).get('url') or ''
 
-        if not img and not name:
-            return ''
-
-        return f'<a href="/user/{domain}"><img src="{img}" class="profile">{name}</a>'
+        return f'<a href="/user/{domain}"><img src="{img}" class="profile"> {name}</a>'
 
 
     def verify(self):
@@ -230,7 +217,7 @@ class Activity(StringIdModel):
     def actor_link(self, as1=None):
         """Returns a pretty actor link with their name and profile picture."""
         if self.direction == 'out' and self.domain:
-            return User.get_by_id(self.domain[0]).user_page_link(domain_as_name=True)
+            return User.get_by_id(self.domain[0]).user_page_link()
 
         if not as1:
            as1 = self.to_as1()

templates/user_addresses.html

@@ -1,10 +1,7 @@
 <div class="row">
   <div class="big" style="display: inline">
-    {% set user_page_link = user.user_page_link() %}
-    {% if user_page_link %}
-      {{ user_page_link|safe }}
-      &middot;
-    {% endif %}
+    {{ user.user_page_link()|safe }}
+    &middot;
     <span title="Fediverse address">
       <img class="logo" src="/static/fediverse_logo.svg"> {{ user.address() }}</span>
     &middot;