[Plugins][FAVOURITE] No longer a form, a link to a new page is provided instead. The amount of forms per page were blocking rendering for the majority of its duration.

This commit is contained in:
2021-10-21 20:14:22 +01:00
committed by Diogo Peralta Cordeiro
parent a6d5752748
commit 60b15ea79d
10 changed files with 192 additions and 76 deletions

View File

@@ -1,6 +1,6 @@
<?php
declare(strict_types = 1);
declare(strict_types=1);
// {{{ License
@@ -23,12 +23,109 @@ declare(strict_types = 1);
namespace Plugin\Favourite\Controller;
use App\Core\Controller;
use App\Core\DB\DB;
use App\Core\Event;
use App\Core\Form;
use App\Util\Common;
use App\Util\Exception\InvalidFormException;
use App\Util\Exception\NoLoggedInUser;
use App\Util\Exception\NoSuchNoteException;
use App\Util\Exception\RedirectException;
use Plugin\Favourite\Entity\Favourite as FavouriteEntity;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\HttpFoundation\Request;
use function App\Core\I18n\_m;
class Favourite
class Favourite extends Controller
{
/**
* @throws RedirectException
* @throws NoSuchNoteException
* @throws InvalidFormException
* @throws \App\Util\Exception\ServerException
*/
public function noteAddFavourite(Request $request, int $id): bool|array
{
$user = Common::ensureLoggedIn();
$opts = ['id' => $id];
$add_favourite_note = DB::find('note', $opts);
if (!$user || $add_favourite_note === null) {
throw new NoSuchNoteException();
}
$form_add_to_favourite = Form::create([
['add_favourite', SubmitType::class,
[
'label' => _m('Favourite note!'),
'attr' => [
'title' => _m('Favourite this note!')
],
],
],
]);
$form_add_to_favourite->handleRequest($request);
if ($form_add_to_favourite->isSubmitted()) {
$opts = ['note_id' => $id, 'actor_id' => $user->getId()];
DB::persist(FavouriteEntity::create($opts));
DB::flush();
// TODO: proper redirect from where the user came from
throw new RedirectException();
}
return [
'_template' => 'favourite/add_to_favourites.html.twig',
'note' => $add_favourite_note,
'add_favourite' => $form_add_to_favourite->createView(),
];
}
/**
* @throws RedirectException
* @throws NoSuchNoteException
* @throws InvalidFormException
* @throws \App\Util\Exception\ServerException
* @throws NoLoggedInUser
*/
public function noteRemoveFavourite(Request $request, int $id): array
{
$user = Common::ensureLoggedIn();
$opts = ['note_id' => $id, 'actor_id' => $user->getId()];
$remove_favourite_note = DB::find('favourite', $opts);
if (!$user || $remove_favourite_note === null) {
throw new NoSuchNoteException();
}
$form_remove_favourite = Form::create([
['remove_favourite', SubmitType::class,
[
'label' => _m('Remove favourite'),
'attr' => [
'title' => _m('Remove note from favourites.')
],
],
],
]);
$form_remove_favourite->handleRequest($request);
if ($form_remove_favourite->isSubmitted()) {
DB::remove($remove_favourite_note);
DB::flush();
// TODO: proper redirect from where the user came from
throw new RedirectException();
}
$note = DB::find('note', ['id' => $id]);
return [
'_template' => 'favourite/remove_from_favourites.html.twig',
'note' => $note,
'remove_favourite' => $form_remove_favourite->createView(),
];
}
public function favouritesByActorId(Request $request, int $id)
{
$notes = DB::dql(
@@ -43,11 +140,12 @@ class Favourite
Event::handle('FormatNoteList', [$notes, &$notes_out]);
return [
'_template' => 'network/feed.html.twig',
'notes' => $notes_out,
'_template' => 'network/feed.html.twig',
'notes' => $notes_out,
'page_title' => 'Favourites timeline.',
];
}
public function favouritesByActorNickname(Request $request, string $nickname)
{
$user = DB::findOneBy('local_user', ['nickname' => $nickname]);
@@ -57,18 +155,18 @@ class Favourite
/**
* Reverse favourites stream
*
* @throws \App\Util\Exception\NoLoggedInUser user not logged in
*
* @return array template
* @throws NoLoggedInUser user not logged in
*
*/
public function reverseFavouritesByActorId(Request $request, int $id): array
{
$notes = DB::dql(
'select n from App\Entity\Note n, Plugin\Favourite\Entity\Favourite f '
. 'where n.id = f.note_id '
. 'and f.actor_id != :id '
. 'and n.actor_id = :id '
. 'order by f.created DESC',
. 'where n.id = f.note_id '
. 'and f.actor_id != :id '
. 'and n.actor_id = :id '
. 'order by f.created DESC',
['id' => $id],
);
@@ -76,11 +174,12 @@ class Favourite
Event::handle('FormatNoteList', [$notes, &$notes_out]);
return [
'_template' => 'network/feed.html.twig',
'notes' => $notes,
'_template' => 'network/feed.html.twig',
'notes' => $notes,
'page_title' => 'Reverse favourites timeline.',
];
}
public function reverseFavouritesByActorNickname(Request $request, string $nickname)
{
$user = DB::findOneBy('local_user', ['nickname' => $nickname]);