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

[Actor] Refactor GSActor into Actor

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro
2021-09-18 03:22:27 +01:00
parent 6c899b7b61
commit 941cbe6599
73 changed files with 489 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/Favourite/Controller/Favourite.php
View File

@@ -32,7 +32,7 @@ class Favourite
$notes = DB::dql(
'select n from App\Entity\Note n, Plugin\Favourite\Entity\Favourite f ' .
'where n.id = f.note_id ' .
'and f.gsactor_id = :id ' .
'and f.actor_id = :id ' .
'order by f.created DESC',
['id' => $id]
);
@@ -64,8 +64,8 @@ class Favourite
{
$notes = DB::dql('select n from App\Entity\Note n, Plugin\Favourite\Entity\Favourite f ' .
'where n.id = f.note_id ' .
'and f.gsactor_id != :id ' .
'and n.gsactor_id = :id ' .
'and f.actor_id != :id ' .
'and n.actor_id = :id ' .
'order by f.created DESC' ,
['id' => $id]
);

22
plugins/Favourite/Entity/Favourite.php
View File

@@ -27,7 +27,7 @@ class Favourite extends Entity
// {{{ Autocode
// @codeCoverageIgnoreStart
private int $note_id;
private int $gsactor_id;
private int $actor_id;
private \DateTimeInterface $created;
private \DateTimeInterface $modified;
@@ -42,15 +42,15 @@ class Favourite extends Entity
return $this->note_id;
}
public function setGSActorId(int $gsactor_id): self
public function setActorId(int $actor_id): self
{
$this->gsactor_id = $gsactor_id;
$this->actor_id = $actor_id;
return $this;
}
public function getGSActorId(): int
public function getActorId(): int
{
return $this->gsactor_id;
return $this->actor_id;
}
public function setCreated(DateTimeInterface $created): self
@@ -83,15 +83,15 @@ class Favourite extends Entity
return [
'name' => 'favourite',
'fields' => [
'note_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'App\Entity\Note.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'note that is the favorite of'],
'gsactor_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'App\Entity\GSActor.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'actor who favourited this note'], // note: formerly referenced notice.id, but we can now record remote users' favorites
'created' => ['type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'],
'modified' => ['type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'],
'note_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'App\Entity\Note.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'note that is the favorite of'],
'actor_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'App\Entity\Actor.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'actor who favourited this note'], // note: formerly referenced notice.id, but we can now record remote users' favorites
'created' => ['type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'],
'modified' => ['type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'],
],
'primary key' => ['note_id', 'gsactor_id'],
'primary key' => ['note_id', 'actor_id'],
'indexes' => [
'fave_note_id_idx' => ['note_id'],
'fave_actor_id_idx' => ['gsactor_id', 'modified'],
'fave_actor_id_idx' => ['actor_id', 'modified'],
'fave_modified_idx' => ['modified'],
],
];

2
plugins/Favourite/Favourite.php
View File

@@ -61,7 +61,7 @@ class Favourite extends NoteHandlerPlugin
}
// if note is favoured, "is_set" is 1
$opts = ['note_id' => $note->getId(), 'gsactor_id' => $user->getId()];
$opts = ['note_id' => $note->getId(), 'actor_id' => $user->getId()];
$is_set = DB::find('favourite', $opts) !== null;
$form_fav = Form::create([
['submit_favourite', SubmitType::class,