Format conversations before sending notifications.

Author: thisismeonmounteverest

src/Controller/Admin/CheckerController.php

@@ -9,6 +9,8 @@
 use App\Model\ActivityModel;
 use App\Model\Admin\CheckerModel;
 use App\Model\CommunityNewsModel;
+use App\Utilities\ItemsPerPageTraits;
+use Doctrine\ORM\EntityManagerInterface;
 use InvalidArgumentException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormError;
@@ -20,15 +22,19 @@
 
 class CheckerController extends AbstractController
 {
+    use ItemsPerPageTraits;
+
     private const MESSAGES_REPORTED = 1;
     private const MESSAGES_PROCESSED = 2;
     private const MESSAGES_BLOCK_WORDS = 3;
 
     private CheckerModel $checkerModel;
+    private EntityManagerInterface $entityManager;
 
-    public function __construct(CheckerModel $checkerModel)
+    public function __construct(CheckerModel $checkerModel, EntityManagerInterface $entityManager)
     {
         $this->checkerModel = $checkerModel;
+        $this->entityManager = $entityManager;
     }
 
     /**
@@ -197,7 +203,7 @@ private function getSubmenuItems()
         ];
     }
 
-    private function handleMessages(Request $request, int $type)
+    private function handleMessages(Request $request, int $type): Response
     {
         if (
             !$this->isGranted(Member::ROLE_ADMIN_CHECKER)
@@ -207,7 +213,9 @@ private function handleMessages(Request $request, int $type)
         }
 
         $page = $request->query->get('page', 1);
-        $limit = $request->query->get('limit', 10);
+        /** @var Member $member */
+        $member = $this->getUser();
+        $limit = $this->getItemsPerPage($member);
 
         switch ($type) {
             case self::MESSAGES_REPORTED:

src/Model/Admin/CheckerModel.php

@@ -2,6 +2,7 @@
 
 namespace App\Model\Admin;
 
+use App\Doctrine\InFolderType;
 use App\Doctrine\MessageStatusType;
 use App\Doctrine\SpamInfoType;
 use App\Entity\Message;
@@ -53,6 +54,9 @@ public function unmarkAsSpamByChecker(array $messageIds): void
                 $message->setStatus(MessageStatusType::SEND);
             } else {
                 $message->setStatus(MessageStatusType::CHECKED);
+                if (strpos($message->getSpamInfo(), SpamInfoType::SPAM_BLOCKED_WORD) !== false) {
+                    $message->setFolder(InFolderType::NORMAL);
+                }
             }
             $this->entityManager->persist($message);
         }

src/Model/ConversationModel.php

@@ -295,6 +295,7 @@ public function formatConversation(Message $message): Message
 
         if ($found != 0) {
             $message->setSpamInfo(SpamInfoType::SPAM_BLOCKED_WORD);
+            $message->setFolder(InFolderType::SPAM);
             $message->setStatus(MessageStatusType::CHECK);
             $message->setMessage($messageText);
         }

templates/admin/checker/messages.html.twig

@@ -3,13 +3,26 @@
 
 {% block javascripts %}
 <script type="text/javascript">
-    $(window).on('load', function () {
-        $('#checkAllNoSpam').click(function () {
-            $('input:checkbox.checkableNoSpam').prop('checked', this.checked);
-        });
-        $('#checkAllSpam').click(function () {
-            $('input:checkbox.checkableSpam').prop('checked', this.checked);
-        });
+    const checkAllSpam = document.getElementById('checkAllSpam');
+    const checkAllNoSpam  = document.getElementById('checkAllNoSpam');
+    const spam = document.querySelectorAll('.checkableSpam');
+    const noSpam = document.querySelectorAll('.checkableNoSpam');
+    checkAllSpam.addEventListener('click', function() {
+        const status = checkAllSpam.checked;
+        spam.forEach((checkbox) => {checkbox.checked = status;});
+        if (status) {
+            checkAllNoSpam.checked = false;
+            noSpam.forEach((checkbox) => {checkbox.checked = false;});
+        }
+    });
+    checkAllNoSpam.addEventListener('click', function() {
+        console.log(checkAllNoSpam.checked);
+        const status = checkAllNoSpam.checked;
+        noSpam.forEach((checkbox) => {checkbox.checked = status;});
+        if (status) {
+            checkAllSpam.checked = false;
+            spam.forEach((checkbox) => {checkbox.checked = false;});
+        }
     });
 </script>
 {% endblock %}
@@ -33,13 +46,13 @@
                 <th>Receiver</th>
                 <th>Created</th>
                 <th>Comment</th>
-                <th>{{ 'ok' | trans }}</th>
-                <th>{{ 'spam' | trans }}</th>
+                <th style="writing-mode: vertical-lr">ok</th>
+                <th style="writing-mode: vertical-lr">spam</th>
             </tr>
             <tr>
-                <th colspan="5"></th>
-                <th><input type="checkbox" id="checkAllNoSpam"></th>
-                <th><input type="checkbox" id="checkAllSpam"></th>
+                <td colspan="5">&nbsp;</td>
+                <td><div class="o-checkbox"><input type="checkbox" id="checkAllNoSpam" class="o-checkbox__input"><label class="o-checkbox__label"></label></div></td>
+                <td><div class="o-checkbox"><input type="checkbox" id="checkAllSpam" class="o-checkbox__input"><label class="o-checkbox__label"></label></div></td>
             </tr>
         {% for message in reported.currentPageResults %}
             <tr>