diff --git a/models.py b/models.py index b4061cca..5b040d00 100644 --- a/models.py +++ b/models.py @@ -37,7 +37,7 @@ PROTOCOLS = {'ostatus': None} # 2048 bits makes tests slow, so use 1024 for them KEY_BITS = 1024 if DEBUG else 2048 -PAGE_SIZE = 30 +PAGE_SIZE = 20 # auto delete old objects of these types via the Object.expire property # https://cloud.google.com/datastore/docs/ttl diff --git a/templates/_followers.html b/templates/_followers.html index 041a71ce..77fe0d65 100644 --- a/templates/_followers.html +++ b/templates/_followers.html @@ -5,6 +5,9 @@
  • {% with url=f.user.web_url(), user_as1=f.user.obj.as1 or {} %} + {% with picture=util.get_url(user_as1, 'icon') or util.get_url(user_as1, 'image') %} {% if picture %} diff --git a/templates/activities.html b/templates/activities.html index 2decd7c6..8031c9d1 100644 --- a/templates/activities.html +++ b/templates/activities.html @@ -3,6 +3,9 @@ {% for obj in objects %}
  • + {% if obj.source_protocol %} + + {% endif %} {{ obj.actor_link(user=user)|safe }} {{ obj.phrase|safe }} {% if obj.url %}{% endif %}