[PLUGIN][RepeatNote] Fix getRepeatNotes query

This commit is contained in:
Diogo Peralta Cordeiro 2021-12-24 00:39:54 +00:00
parent 10e7c71b6e
commit 7407028891
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0

View File

@ -1,6 +1,6 @@
<?php <?php
declare(strict_types=1); declare(strict_types = 1);
// {{{ License // {{{ License
@ -78,30 +78,30 @@ class NoteRepeat extends Entity
public static function getNoteRepeats(Note $note): array public static function getNoteRepeats(Note $note): array
{ {
return DB::sql( return DB::dql(
<<<'EOF' <<<'EOF'
select {select} from note n select n from note as n
inner join note_repeat nr inner join note_repeat as nr
on nr.note_id = n.id with nr.note_id = n.id
where repeat_of = :note_id where nr.repeat_of = :note_id
order by n.created DESC order by n.created DESC, n.id DESC
EOF, EOF,
['note_id' => $note->getId()] ['note_id' => $note->getId()],
); );
} }
public static function schemaDef(): array public static function schemaDef(): array
{ {
return [ return [
'name' => 'note_repeat', 'name' => 'note_repeat',
'fields' => [ 'fields' => [
'note_id' => ['type' => 'int', 'not null' => true, 'foreign key' => true, 'target' => 'Note.id', 'multiplicity' => 'one to one', 'description' => 'The id of the repeat itself'], 'note_id' => ['type' => 'int', 'not null' => true, 'foreign key' => true, 'target' => 'Note.id', 'multiplicity' => 'one to one', 'description' => 'The id of the repeat itself'],
'actor_id' => ['type' => 'int', 'not null' => true, 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'description' => 'Who made this repeat'], 'actor_id' => ['type' => 'int', 'not null' => true, 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'description' => 'Who made this repeat'],
'repeat_of' => ['type' => 'int', 'not null' => true, 'foreign key' => true, 'target' => 'Note.id', 'multiplicity' => 'one to one', 'description' => 'Note this is a repeat of'], 'repeat_of' => ['type' => 'int', 'not null' => true, 'foreign key' => true, 'target' => 'Note.id', 'multiplicity' => 'one to one', 'description' => 'Note this is a repeat of'],
], ],
'primary key' => ['note_id'], 'primary key' => ['note_id'],
'foreign keys' => [ 'foreign keys' => [
'note_id_to_id_fkey' => ['note', ['note_id' => 'id']], 'note_id_to_id_fkey' => ['note', ['note_id' => 'id']],
'note_repeat_of_id_fkey' => ['note', ['repeat_of' => 'id']], 'note_repeat_of_id_fkey' => ['note', ['repeat_of' => 'id']],
'actor_reply_to_id_fkey' => ['actor', ['actor_id' => 'id']], 'actor_reply_to_id_fkey' => ['actor', ['actor_id' => 'id']],
], ],