Format requests before sending notifications.

Author: thisismeonmounteverest

src/Controller/RequestController.php

@@ -40,19 +40,21 @@ class RequestController extends BaseRequestAndInvitationController
 
     private Mailer $mailer;
     private Logger $logger;
+    private HostingRequestModel $hostingRequestModel;
 
     public function __construct(
-        ConversationModel $conversationModel,
-        HostingRequestModel $requestModel,
+        ConversationModel      $conversationModel,
+        HostingRequestModel    $requestModel,
         EntityManagerInterface $entityManager,
-        Mailer $mailer,
-        Logger $logger
+        Mailer                 $mailer,
+        Logger                 $logger, HostingRequestModel $hostingRequestModel
     ) {
         parent::__construct($requestModel, $entityManager);
 
         $this->conversationModel = $conversationModel;
         $this->mailer = $mailer;
         $this->logger = $logger;
+        $this->hostingRequestModel = $hostingRequestModel;
     }
 
     /**
@@ -325,7 +327,9 @@ private function sendInitialRequestNotification(Member $host, Member $guest, Mes
     {
         $subject = $request->getSubject()->getSubject();
 
-        $this->sendRequestNotification($guest, $host, $host, $request, $subject, 'request', false);
+        if ($this->hostingRequestModel->formatRequest($request)) {
+            $this->sendRequestNotification($guest, $host, $host, $request, $subject, 'request', false);
+        }
     }
 
     private function sendHostReplyNotification(

src/Model/HostingRequestModel.php

@@ -7,4 +7,15 @@
 
 class HostingRequestModel extends BaseRequestModel
 {
+    public function formatRequest(Message &$request): bool
+    {
+        $messageText = $request->getMessage();
+        $found = preg_match("/@|at|.at.|-at-/i", $messageText);
+
+        if ($found !== 0) {
+            $request->setMessage($messageText . '<p>Potential spam. Please report if necessary.</p>');
+        }
+
+        return $found === 0;
+    }
 }