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

[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
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/RepeatNote/Entity/NoteRepeat.php
View File

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