@@ -147,7 +151,9 @@ {% set actor = note.getActor() %} {% set nickname = actor.getNickname() %} {% set fullname = actor.getFullname() %} + {% set actor_uri = actor.getUri() %} {% set actor_url = actor.getUrl() %} + {% set mention = mention(actor) %} {{ block('note_sidebar') }} diff --git a/templates/cards/profile/view.html.twig b/templates/cards/profile/view.html.twig index b4304bee3b..63d509af42 100644 --- a/templates/cards/profile/view.html.twig +++ b/templates/cards/profile/view.html.twig @@ -4,6 +4,9 @@ {% set actor_tags = actor.getSelfTags() %} {% set actor_has_bio = actor.hasBio() %} {% set actor_uri = actor.getUri() %} +{% set actor_url = actor.getUrl() %} +{% set actor_is_local = actor.getIsLocal() %} +{% set mention = mention(actor) %} {% block profile_view %} @@ -11,30 +14,28 @@ {{ actor_nickname }} - - - {% if actor_has_bio %} - {{ actor.getBio() }} - {% else %} - {{ '(No bio)' | trans }} - {% endif %} - + {% if not actor_is_local %} + + {{ mention }} + + {% endif %} + + + {{ actor.getBio() }} + + {{ 'Subscribed' | trans }}{{ actor.getSubscribedCount() }} {{ 'Subscribers' | trans }}{{ actor.getSubscribersCount() }} - {% if actor_tags %} - {% for tag in actor_tags %} - {% include 'cards/tag/actor_tag.html.twig' with { 'tag': tag, 'actor': actor } %} - {% endfor %} - {% else %} - {{ '(No tags)' | trans }} - {% endif %} + {% for tag in actor_tags %} + {% include 'cards/tag/actor_tag.html.twig' with { 'tag': tag, 'actor': actor } %} + {% endfor %} {% for block in handle_event('AppendCardProfile', { 'actor': actor }) %}
{{ block('note_sidebar') }} diff --git a/templates/cards/profile/view.html.twig b/templates/cards/profile/view.html.twig index b4304bee3b..63d509af42 100644 --- a/templates/cards/profile/view.html.twig +++ b/templates/cards/profile/view.html.twig @@ -4,6 +4,9 @@ {% set actor_tags = actor.getSelfTags() %} {% set actor_has_bio = actor.hasBio() %} {% set actor_uri = actor.getUri() %} +{% set actor_url = actor.getUrl() %} +{% set actor_is_local = actor.getIsLocal() %} +{% set mention = mention(actor) %} {% block profile_view %} @@ -11,30 +14,28 @@ {{ actor_nickname }} - - - {% if actor_has_bio %} - {{ actor.getBio() }} - {% else %} - {{ '(No bio)' | trans }} - {% endif %} - + {% if not actor_is_local %} + + {{ mention }} + + {% endif %} + + + {{ actor.getBio() }} + + {{ 'Subscribed' | trans }}{{ actor.getSubscribedCount() }} {{ 'Subscribers' | trans }}{{ actor.getSubscribersCount() }} - {% if actor_tags %} - {% for tag in actor_tags %} - {% include 'cards/tag/actor_tag.html.twig' with { 'tag': tag, 'actor': actor } %} - {% endfor %} - {% else %} - {{ '(No tags)' | trans }} - {% endif %} + {% for tag in actor_tags %} + {% include 'cards/tag/actor_tag.html.twig' with { 'tag': tag, 'actor': actor } %} + {% endfor %} {% for block in handle_event('AppendCardProfile', { 'actor': actor }) %}