eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[CORE][ActivityStreamsTwo][ActivityPub] Set all routes

Browse Source 
Allow global routes to act for every actor
Fix Favoured stream query
This commit is contained in:
Diogo Peralta Cordeiro
2021-09-16 17:04:05 +01:00
parent 738168461c
commit d6f31d102a
17 changed files with 308 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,17 +23,19 @@ namespace Plugin\Favourite\Controller;
use App\Core\DB\DB;
use App\Core\Event;
use App\Util\Common;
use Symfony\Component\HttpFoundation\Request;
class Favourite
{
public function favourites(Request $request)
public function favouritesByActorId(Request $request, int $id)
{
$actor_id = Common::ensureLoggedIn()->getId();
$notes = DB::dql('select f from Plugin\Favourite\Entity\Favourite f ' .
'where f.gsactor_id = :id ' .
'order by f.created DESC', ['id' => $actor_id]);
$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 ' .
'order by f.created DESC',
['id' => $id]
);
$notes_out = null;
Event::handle('FormatNoteList', [$notes, &$notes_out]);
@@ -43,6 +45,11 @@ class Favourite
'notes' => $notes_out,
];
}
public function favouritesByActorNickname(Request $request, string $nickname)
{
$user = DB::findOneBy('local_user', ['nickname' => $nickname]);
return self::favouritesByActorId($request, $user->getId());
}
/**
* Reverse favourites stream
@@ -53,15 +60,15 @@ class Favourite
*
* @return array template
*/
public function reverseFavourites(Request $request)
public function reverseFavouritesByActorId(Request $request, int $id)
{
$actor_id = Common::ensureLoggedIn()->getId();
$notes = DB::dql('select n from App\Entity\Note n, Plugin\Favourite\Entity\Favourite f ' .
$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 ' .
'order by f.created DESC' ,
['id' => $actor_id]);
['id' => $id]
);
$notes_out = null;
Event::handle('FormatNoteList', [$notes, &$notes_out]);
@@ -71,4 +78,9 @@ class Favourite
'notes' => $notes,
];
}
public function reverseFavouritesByActorNickname(Request $request, string $nickname)
{
$user = DB::findOneBy('local_user', ['nickname' => $nickname]);
return self::reverseFavouritesByActorId($request, $user->getId());
}
}