Format conversations before sending notifications.

BeWelcome · Sep 7, 2024 · 960ffc7 · 960ffc7
1 parent 4ba0192
commit 960ffc7
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 3 deletions.
diff --git a/src/Controller/Admin/CheckerController.php b/src/Controller/Admin/CheckerController.php
@@ -22,6 +22,7 @@ class CheckerController extends AbstractController
 {
     private const MESSAGES_REPORTED = 1;
     private const MESSAGES_PROCESSED = 2;
+    private const MESSAGES_BLOCK_WORDS = 3;
 
     private CheckerModel $checkerModel;
 
@@ -42,6 +43,18 @@ public function showReportedMessages(Request $request)
         return $this->handleMessages($request, self::MESSAGES_REPORTED);
     }
 
+    /**
+     * @Route("/admin/spam/messages/blocked", name="admin_spam_messages_block_words")
+     *
+     * @throws AccessDeniedException
+     *
+     * @return Response
+     */
+    public function showBlockWordMessages(Request $request)
+    {
+        return $this->handleMessages($request, self::MESSAGES_BLOCK_WORDS);
+    }
+
     /**
      * @Route("/admin/spam/messages/processed", name="admin_spam_messages_processed")
      *
@@ -165,6 +178,10 @@ private function getSubmenuItems()
                 'key' => 'reported.messages',
                 'url' => $this->generateUrl('admin_spam_messages'),
             ],
+            'blockwords' => [
+                'key' => 'block.words.messages',
+                'url' => $this->generateUrl('admin_spam_messages_block_words'),
+            ],
             'processed_messages' => [
                 'key' => 'reported.messages.processed',
                 'url' => $this->generateUrl('admin_spam_messages_processed'),
@@ -201,6 +218,10 @@ private function handleMessages(Request $request, int $type)
                 $active = 'processed_messages';
                 $messages = $this->checkerModel->getProcessedReportedMessages($page, $limit);
                 break;
+            case self::MESSAGES_BLOCK_WORDS:
+                $active = 'block.words.messages';
+                $messages = $this->checkerModel->getBlockWordsMessages($page, $limit);
+                break;
             default:
                 throw new InvalidArgumentException();
         }

diff --git a/src/Controller/MessageController.php b/src/Controller/MessageController.php
@@ -186,6 +186,7 @@ private function addMessageAndSendNotification(
         $em = $this->getDoctrine()->getManager();
         $message = new Message();
         $message->setMessage($body);
+        $message->setStatus('Sent');
         if (null === $parent) {
             $subject = new Subject();
             $subject->setSubject($subjectText);
@@ -204,11 +205,10 @@ private function addMessageAndSendNotification(
         $message->setParent($parent);
         $message->setSender($sender);
         $message->setReceiver($receiver);
-        $message->setStatus('Sent');
         $em->persist($message);
         $em->flush();
 
-        if (!strpos($message->getSpamInfo(), SpamInfoType::SPAM_BLOCKED_WORD)) {
+        if (strpos($message->getSpamInfo(), SpamInfoType::SPAM_BLOCKED_WORD) === false) {
             $this->mailer->sendMessageNotificationEmail($sender, $receiver, 'message', [
                 'message' => $message,
                 'subject' => $subjectText,

diff --git a/src/Controller/RequestController.php b/src/Controller/RequestController.php
@@ -327,7 +327,7 @@ private function sendInitialRequestNotification(Member $host, Member $guest, Mes
     {
         $subject = $request->getSubject()->getSubject();
 
-        if (!strpos($request->getSpamInfo(), SpamInfoType::SPAM_BLOCKED_WORD)) {
+        if (strpos($request->getSpamInfo(), SpamInfoType::SPAM_BLOCKED_WORD) === false) {
             $this->sendRequestNotification($guest, $host, $host, $request, $subject, 'request', false);
         }
     }

diff --git a/src/Model/Admin/CheckerModel.php b/src/Model/Admin/CheckerModel.php
@@ -74,4 +74,12 @@ public function getProcessedReportedMessages(int $page = 1, int $limit = 10): Pa
 
         return $repository->findProcessedReportedMessages($page, $limit);
     }
+
+    public function getBlockWordsMessages(int $page = 1, int $limit = 10): Pagerfanta
+    {
+        /** @var MessageRepository $repository */
+        $repository = $this->entityManager->getRepository(Message::class);
+
+        return $repository->findBlockWordsMessages($page, $limit);
+    }
 }
diff --git a/src/Model/ConversationModel.php b/src/Model/ConversationModel.php
@@ -295,6 +295,7 @@ public function formatConversation(Message $message): Message
 
         if ($found != 0) {
             $message->setSpamInfo(SpamInfoType::SPAM_BLOCKED_WORD);
+            $message->setStatus(MessageStatusType::CHECK);
             $message->setMessage($messageText);
         }
 

diff --git a/src/Repository/MessageRepository.php b/src/Repository/MessageRepository.php
@@ -120,6 +120,23 @@ public function findProcessedReportedMessages($page = 1, $items = 10): Pagerfant
         return $paginator;
     }
 
+    /**
+     * Returns a Pagerfanta object encapsulating the matching paginated processed reported messages.
+     *
+     * @param mixed $page
+     * @param mixed $items
+     */
+    public function findBlockWordsMessages($page = 1, $items = 10): Pagerfanta
+    {
+        $queryBuilder = $this->queryBlockWordsMessages();
+        $adapter = new QueryAdapter($queryBuilder);
+        $paginator = new Pagerfanta($adapter);
+        $paginator->setMaxPerPage($items);
+        $paginator->setCurrentPage($page);
+
+        return $paginator;
+    }
+
     public function getThread(Message $message)
     {
         $qb = $this->createNativeNamedQuery('get_thread')
@@ -333,6 +350,20 @@ private function queryProcessedReportedMessages(): QueryBuilder
         return $qb;
     }
 
+    private function queryBlockWordsMessages(): QueryBuilder
+    {
+        $qb = $this->createQueryBuilder('m');
+        $qb
+            ->where('m.status = :status')
+            ->setParameter('status', MessageStatusType::CHECK)
+            ->andWhere('m.spamInfo LIKE :spamInfo')
+            ->setParameter('spamInfo', '%' . SpamInfoType::SPAM_BLOCKED_WORD . '%')
+            ->orderBy('m.created', 'DESC')
+        ;
+
+        return $qb;
+    }
+
     private function queryAllMessagesBetween(
         Member $loggedInUser,
         Member $member,

diff --git a/translations/missing/checker.yaml b/translations/missing/checker.yaml
@@ -0,0 +1,6 @@
+block.words.messages:
+    - 'Blocked Notifications'
+    - 'Menu item in Checker Volunteer tool. (Do not translate)'
+    - 'messages+intl-icu'
+    - 'no'
+