From ab2cf5f3c0ff4cf09b08f365e68a0e6615de083a Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Wed, 2 Oct 2019 22:34:38 +0200 Subject: [PATCH] Simplify/tweak note display --- templates/utils.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/templates/utils.html b/templates/utils.html index 2d0acec..b670050 100644 --- a/templates/utils.html +++ b/templates/utils.html @@ -26,7 +26,7 @@ {% endif %} {%- endmacro %} -{% macro display_note(obj, perma=False, ui=False, likes=[], shares=[], meta={}, no_color=False) -%} +{% macro display_note(obj, perma=False, likes=[], shares=[], meta={}, no_color=False) -%} {% if meta.object_actor %} {% set actor = meta.object_actor %} @@ -259,7 +259,6 @@ {% if not perma and meta.count_like and obj.id | is_from_outbox %}{{ meta.count_like }} like{% if meta.count_like > 1 %}s{% endif %}{% endif %} {% if session.logged_in %} -{% if ui%} reply {% if meta | get_visibility | visibility_is_public %} @@ -342,8 +341,6 @@ {% else %} {% endif %} -{% endif %} - {% if session.logged_in and obj.inReplyTo and not meta.count_reply and not perma %} thread {% endif %} @@ -394,9 +391,9 @@ {% macro display_thread(thread, likes=[], shares=[]) -%} {% for reply in thread %} {% if reply._requested %} -{{ display_note(reply.activity.object, perma=True, ui=False, likes=likes, shares=shares, meta=reply.meta) }} +{{ display_note(reply.activity.object, perma=True, likes=likes, shares=shares, meta=reply.meta) }} {% else %} -{{ display_note(reply.activity.object, perma=False, ui=True, meta=reply.meta) }} +{{ display_note(reply.activity.object, perma=False, meta=reply.meta) }} {% endif %} {% endfor %} {% endmacro -%}