GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[CARDS][Note] AppendCardNote event overhaul

Browse Source 
[PLUGINS][Favourite] Added complementary information on user action

[COMPONENTS][Conversation] Fixed AppendCardNote issue where cached query
would only act on Notes with depth > 1
This commit is contained in:
Eliseu Amaro 2021-12-29 17:54:02 +00:00
parent 836560f55f
commit 6b82708968
Signed by: eliseuamaro
GPG Key ID: 96DA09D4B97BC2D5
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
templates/cards/note/view.html.twig
View File

@ -134,21 +134,30 @@
{{ block('note_replies') }} {{ block('note_replies') }}
{% for complementary_info in handle_event('AppendCardNote', {'note': note }) %} {% for complementary_info in handle_event('AppendCardNote', {'note': note }) %}
<aside title="{{ 'Note\'s complementary information' | trans }}" class="note-complementary"> <aside title="{{ 'Note\'s complementary information' | trans }}" class="note-complementary">
{% set actor_count = complementary_info['actors'] | length %}
{% set counter = 0 %}
{% for complementary_info_actor in complementary_info['actors'] %} {% for complementary_info_actor in complementary_info['actors'] %}
{% if complementary_info_actor is defined %} {% if complementary_info_actor is defined %}
<a href="{{ complementary_info_actor.getUrl() }}">{{ complementary_info_actor.getNickname() }}</a> <a href="{{ complementary_info_actor.getUrl() }}">{{complementary_info_actor.getNickname()}}{% if actor_count > 1 and counter < actor_count - 2 %}{{', ' | trans }}{% endif %}</a>
{% if counter == actor_count - 2 %}
{{ ' and ' | trans }}
{% endif %} {% endif %}
{% endif %}
{% set counter = counter + 1 %}
{% endfor %} {% endfor %}
{% if complementary_info['action'] is defined and not null %} {% if complementary_info['action'] is defined and not null %}
{{ ' has ' ~ complementary_info['action'] ~ ' this note' | trans }} {% if counter > 1 %}
{{ ' have ' | trans }}
{% else %}
{{ ' has ' | trans }}
{% endif %}
{{ complementary_info['action'] ~ ' this note' | trans }}
{% endif %} {% endif %}
</aside> </aside>
{% endfor %} {% endfor %}
</div> </div>
</article> </article>
{% endmacro macro_note %} {% endmacro macro_note %}