From a804c5f9817e9dcc8269ce0c2483547a467f3bf3 Mon Sep 17 00:00:00 2001
From: rainydaysavings <eliseuamaro@pm.me>
Date: Fri, 4 Sep 2020 00:13:58 +0100
Subject: [PATCH] [COMPONENT][CONTROLLER][TWIG] Recycle component work

---
 components/Posting/Controller/Post.php | 21 +++++++++++++--------
 components/Posting/Posting.php         |  1 +
 templates/note/view.html.twig          |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/components/Posting/Controller/Post.php b/components/Posting/Controller/Post.php
index 5dc6eb9bcf..6fcddef02b 100644
--- a/components/Posting/Controller/Post.php
+++ b/components/Posting/Controller/Post.php
@@ -55,7 +55,7 @@ class Post
         if ($form->isSubmitted()) {
             $data = $form->getData();
             if ($form->isValid()) {
-                self::storeNote($actor_id, $data['content'], $data['attachments'], $is_local = true, $data['reply_to']);
+                self::storeNote($actor_id, $data['content'], $data['attachments'], $is_local = true, $data['reply_to'], null);
             } else {
                 // TODO display errors
             }
@@ -68,9 +68,13 @@ class Post
         ];
     }
 
-    public function favourite(Request $request, string $fav_to)
+    public function recycle(Request $request, string $repeat_of)
     {
-        $note = DB::find('note', ['id' => $fav_to]);
+        $note           = DB::find('note', ['id' => $repeat_of]);
+        $content_repeat = DB::dql('select n.content from App\Entity\Note n ' .
+            'where n.reply_to = ' . $repeat_of
+        );
+
         if ($note == null) {
             throw new ClientException(_m('No such note'));
         }
@@ -78,7 +82,8 @@ class Post
         $actor_id = Common::ensureLoggedIn()->getActor()->getId();
 
         $form = Form::create([
-            ['favourite',        SubmitType::class,   []],
+            ['repeat_of',    HiddenType::class,   ['data' => (int) $repeat_of]],
+            ['save',        SubmitType::class,   ['label' => _m('Submit')]],
         ]);
 
         $form->handleRequest($request);
@@ -86,7 +91,7 @@ class Post
         if ($form->isSubmitted()) {
             $data = $form->getData();
             if ($form->isValid()) {
-                self::storeNote($actor_id, $data['content'], $data['attachments'], $is_local = true, $data['reply_to']);
+                self::storeNote($actor_id, $data[$content_repeat], $data['attachments'], $is_local = true, $data['reply_to'], $data['repeat_of']);
             } else {
                 // TODO display errors
             }
@@ -95,13 +100,13 @@ class Post
         return [
             '_template' => 'note/reply.html.twig',
             'note'      => $note,
-            'fav'       => $form->createView(),
+            'reply'     => $form->createView(),
         ];
     }
 
-    public static function storeNote(int $actor_id, string $content, array $attachments, bool $is_local, ?int $reply_to = null)
+    public static function storeNote(int $actor_id, string $content, array $attachments, bool $is_local, ?int $reply_to = null, ?int $repeat_of = null)
     {
-        $note  = Note::create(['gsactor_id' => $actor_id, 'content' => $content, 'is_local' => $is_local, 'reply_to' => $reply_to]);
+        $note  = Note::create(['gsactor_id' => $actor_id, 'content' => $content, 'is_local' => $is_local, 'reply_to' => $reply_to, 'repeat_of' => $repeat_of]);
         $files = [];
         foreach ($attachments as $f) {
             $nf = Media::validateAndStoreFile($f, Common::config('attachments', 'dir'),
diff --git a/components/Posting/Posting.php b/components/Posting/Posting.php
index aa7be45927..7aecec71ac 100644
--- a/components/Posting/Posting.php
+++ b/components/Posting/Posting.php
@@ -36,6 +36,7 @@ class Posting extends Module
     public function onAddRoute($r)
     {
         $r->connect('note_reply', '/note/reply/{reply_to<\d*>}', [C\Post::class, 'reply']);
+        $r->connect('note_recycle', '/main/all', [C\Post::class, 'recycle']);
     }
 
     public function onStartTwigPopulateVars(array &$vars)
diff --git a/templates/note/view.html.twig b/templates/note/view.html.twig
index 4c80e07b67..c1e6c51a0f 100644
--- a/templates/note/view.html.twig
+++ b/templates/note/view.html.twig
@@ -19,7 +19,7 @@
         <use xlink:href="#icon-reply"></use>
       </svg>
     </a>
-    <a href="{{ path('note_reply', {'reply_to': note.getId()}) }}">
+    <a href="{{ path('note_recycle', {'repeat_of': note.getId()}) }}">
       <svg class="icon icon-recycle">
         <use xlink:href="#icon-recycle"></use>
       </svg>