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

[COMPONENT][Conversation] Sort conversation correctly

Browse Source
This commit is contained in:
Hugo Sales 2022-02-27 21:14:33 +00:00
parent 35f3781a32
commit 46c4bd9099
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/Conversation/Controller/Conversation.php
View File

@ -63,7 +63,10 @@ class Conversation extends FeedController
return [ return [
'_template' => 'collection/notes.html.twig', '_template' => 'collection/notes.html.twig',
'notes' => $this->query(query: "note-conversation:{$conversation_id}")['notes'] ?? [], 'notes' => $this->query(
query: "note-conversation:{$conversation_id}",
note_order_by: ['note.created' => 'ASC', 'note.id' => 'ASC'],
)['notes'] ?? [],
'should_format' => false, 'should_format' => false,
'page_title' => $page_title, 'page_title' => $page_title,
'notes_feed_title' => (new Heading(1, [], $page_title)), 'notes_feed_title' => (new Heading(1, [], $page_title)),
@ -138,7 +141,10 @@ class Conversation extends FeedController
return [ return [
'_template' => 'conversation/mute.html.twig', '_template' => 'conversation/mute.html.twig',
'notes' => $this->query(query: "note-conversation:{$conversation_id}")['notes'] ?? [], 'notes' => $this->query(
query: "note-conversation:{$conversation_id}",
note_order_by: ['note.created' => 'ASC', 'note.id' => 'ASC'],
)['notes'] ?? [],
'is_muted' => $is_muted, 'is_muted' => $is_muted,
'form' => $form->createView(), 'form' => $form->createView(),
]; ];