From 8e56dbb95c8d9acd5a02b22dd935d544f9be695d Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@hsal.es>
Date: Thu, 15 Apr 2021 00:57:29 +0000
Subject: [PATCH] [Favourite] Move table and left panel links to plugin

---
 plugins/Favourite/Controller/Favourite.php | 20 +++++++++++---------
 plugins/Favourite/Favourite.php            | 15 ++++++++++++---
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/plugins/Favourite/Controller/Favourite.php b/plugins/Favourite/Controller/Favourite.php
index f0b5d273ac..a7b8e0b5ee 100644
--- a/plugins/Favourite/Controller/Favourite.php
+++ b/plugins/Favourite/Controller/Favourite.php
@@ -22,6 +22,8 @@
 namespace Plugin\Favourite\Controller;
 
 use App\Core\DB\DB;
+use App\Core\Event;
+use App\Util\Common;
 use Symfony\Component\HttpFoundation\Request;
 
 class Favourite
@@ -29,9 +31,9 @@ class Favourite
     public function favourites(Request $request)
     {
         $actor_id = Common::ensureLoggedIn()->getId();
-        $notes    = DB::dql('select f from App\Entity\Favourite f ' .
-                         'where f.gsactor_id = :id ' .
-                         'order by f.created DESC', ['id' => $actor_id]);
+        $notes    = DB::dql('select f from Plugin\Favourite\Entity\Favourite f ' .
+                            'where f.gsactor_id = :id ' .
+                            'order by f.created DESC', ['id' => $actor_id]);
 
         Event::handle('FormatNoteList', [&$notes]);
 
@@ -53,12 +55,12 @@ class Favourite
     public function reverseFavourites(Request $request)
     {
         $actor_id = Common::ensureLoggedIn()->getId();
-        $notes    = DB::dql('select n from App\Entity\Note n,  App\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]);
+        $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]);
 
         Event::handle('FormatNoteList', [&$notes]);
 
diff --git a/plugins/Favourite/Favourite.php b/plugins/Favourite/Favourite.php
index 690acf8f7c..3ad8bc8009 100644
--- a/plugins/Favourite/Favourite.php
+++ b/plugins/Favourite/Favourite.php
@@ -26,7 +26,8 @@ use App\Core\Modules\Module;
 use App\Core\Router\RouteLoader;
 use App\Entity\Note;
 use App\Util\Common;
-use Plugin\Favourite\Entity\Favourite as Fave;
+use App\Util\Formatting;
+use App\Util\Nickname;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
@@ -72,10 +73,18 @@ class Favourite extends Module
         return Event::next;
     }
 
+    public function onInsertLeftPanelLink(string $user_nickname, &$res)
+    {
+        $res .= Formatting::twigRender(<<<END
+<a href="{{ path("favourites", {'nickname' : user_nickname}) }}" class='hover-effect {{ active("favourites") }}'>Favourites</a>
+<a href="{{ path("reverse_favourites", {'nickname' : user_nickname}) }}" class='hover-effect {{ active("reverse_favourites") }}'>Reverse Favs</a>
+END, ['user_nickname' => $user_nickname]);
+    }
+
     public function onAddRoute(RouteLoader $r)
     {
-        $r->connect('favourites', '/favourites', [Controller\Favourite::class, 'favourites']);
-        $r->connect('reverse_favourites', '/reversefavs', [Controller\Favourite::class, 'reverseFavourites']);
+        $r->connect('favourites', '/favourites/{nickname<' . Nickname::DISPLAY_FMT . '>}', [Controller\Favourite::class, 'favourites']);
+        $r->connect('reverse_favourites', '/reverse_favourites/{nickname<' . Nickname::DISPLAY_FMT . '>}', [Controller\Favourite::class, 'reverseFavourites']);
         return Event::next;
     }
 }