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

[COMPONENTS][Group] Group view template now extends the Collection of Notes view instead of trying to reinvent the wheel [COMPONENTS][Conversation] Replaced deprecated DB::merge with DB::persist

Browse Source
This commit is contained in:
Eliseu Amaro 2022-02-23 17:01:41 +00:00
parent 57a07ef74f
commit 338ea0ea58
Signed by: eliseuamaro
GPG Key ID: 96DA09D4B97BC2D5
2 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/Conversation/Conversation.php
View File

@ -83,14 +83,12 @@ class Conversation extends Component
} else { } else {
// It's a reply for sure // It's a reply for sure
// Set reply_to property in newly created Note to parent's id // Set reply_to property in newly created Note to parent's id
$current_note->setReplyTo($parent_id);
// Parent will have a conversation of its own, the reply should have the same one // Parent will have a conversation of its own, the reply should have the same one
$parent_note = Note::getById($parent_id); $parent_note = Note::getById($parent_id);
$current_note->setConversationId($parent_note->getConversationId()); $current_note->setConversationId($parent_note->getConversationId());
} }
DB::merge($current_note); DB::persist($current_note);
} }
/** /**

49
components/Group/templates/group/view.html.twig
View File

@ -1,61 +1,16 @@
{% extends 'stdgrid.html.twig' %} {% extends 'collection/notes.html.twig' %}
{% import '/cards/macros/note.html.twig' as noteView %}
{% set nickname = nickname|escape %} {% set nickname = nickname|escape %}
{% block title %}{{ nickname }}{% endblock %} {% block title %}{{ nickname }}{% endblock %}
{% block stylesheets %}
{{ parent() }}
<link rel="stylesheet" href="{{ asset('assets/default_theme/pages/feeds.css') }}" type="text/css">
{% endblock stylesheets %}
{% block body %} {% block body %}
{% if actor is defined and actor is not null %} {% if actor is defined and actor is not null %}
{% block profile_view %} {% block profile_view %}
{% include 'cards/blocks/profile.html.twig' with { 'actor': actor } only %} {% include 'cards/blocks/profile.html.twig' with { 'actor': actor } only %}
{% endblock profile_view %} {% endblock profile_view %}
{% if notes is defined %} {% if notes is defined %}
<article> {{ parent() }}
<header class="feed-header">
<h1 class="section-title">{{ 'Notes' | trans }}</h1>
<nav class="feed-actions">
<details class="feed-actions-details">
<summary>
{{ icon('filter', 'icon icon-feed-actions') | raw }} {# button-container #}
</summary>
<div class="feed-actions-details-dropdown">
<menu>
{% for block in handle_event('AddFeedActions', app.request, notes is defined and notes is not empty) %}
{{ block | raw }}
{% endfor %}
</menu>
</div>
</details>
</nav>
</header>
{% if notes is not empty %}
{# Backwards compatibility with hAtom 0.1 #}
<section class="feed h-feed hfeed notes" tabindex="0" role="feed">
{% for conversation in notes %}
{% block current_note %}
{% if conversation is instanceof('array') %}
{{ noteView.note_vanilla(conversation['note'], conversation['replies']) }}
{% else %}
{{ noteView.note_vanilla(conversation) }}
{% endif %}
<hr tabindex="0" title="{{ 'End of note and replies.' | trans }}">
{% endblock current_note %}
{% endfor %}
</section>
{% else %}
<section class="feed h-feed hfeed notes" tabindex="0" role="feed">
<strong>{% trans %}No notes yet...{% endtrans %}</strong>
</section>
{% endif %}
</article>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endblock body %} {% endblock body %}