add ExternalComplaintNotification

Author: deer-wmde

app/Http/Controllers/ComplaintController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Notifications\ExternalComplaintNotification;
 use App\Notifications\ComplaintNotification;
 use App\Rules\ReCaptchaValidation;
 use Illuminate\Http\Request;
@@ -52,6 +53,19 @@ public function sendMessage(Request $request): \Illuminate\Http\JsonResponse
             )
         );
 
+        if (! empty($validated['mailAddress'])) {
+            Notification::route('mail', [
+                $validated['mailAddress'],
+            ])->notify(
+                new ExternalComplaintNotification(
+                    $validated['offendingUrls'],
+                    $validated['reason'],
+                    $validated['name'],
+                    $validated['mailAddress'],
+                )
+            );
+        }
+
         return response()->json('Success', 200);
     }
 

app/Notifications/ComplaintNotification.php

@@ -25,7 +25,7 @@ class ComplaintNotification extends Notification
      * @param  string  $mailAddress
      * @return void
      */
-    public function __construct($offendingUrls, $reason, $name='', $mailAddress='')
+    public function __construct($offendingUrls, $reason, $name='None', $mailAddress='None')
     {
         $this->offendingUrls = $offendingUrls;
         $this->reason = $reason;
@@ -52,22 +52,19 @@ public function via($notifiable)
      */
     public function toMail($notifiable)
     {
-        $mailAddress = $this->mailAddress ? $this->mailAddress:'None';
-        $name = $this->name ? $this->name:'None';
-
         $mailFrom = config('app.complaint-mail-sender');
         $mailSubject = config('app.name') . ': Report of Illegal Content';
 
         return (new MailMessage)
             ->from($mailFrom)
             ->subject($mailSubject)
             ->line(Lang::get('A message via the wikibase.cloud form for reporting illegal content has been submitted.'))
-            ->line(Lang::get('Reporter name: ') . $name)
-            ->line(Lang::get('Reporter email address: ') . $mailAddress)
-            ->line(Lang::get('Reason:'))
+            ->line(Lang::get('Reporter name: ') . $this->name)
+            ->line(Lang::get('Reporter email address: ') . $this->mailAddress)
+            ->line(Lang::get('Reason why the information in question is illegal content:'))
             ->line($this->reason)
             ->line('---')
-            ->line(Lang::get('Reported URLs:'))
+            ->line(Lang::get('URL(s) for the content in question:'))
             ->line($this->offendingUrls)
             ->line('---');
     }

app/Notifications/ExternalComplaintNotification.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Notifications;
+
+use App\Notifications\ComplaintNotification;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Lang;
+
+/**
+ * A notification to be sent when the legal complaint form is being used.
+ */
+class ExternalComplaintNotification extends ComplaintNotification
+{
+    /**
+     * Build the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        $mailFrom = config('app.complaint-mail-sender');
+        $mailSubject = config('app.name') . ': Report of Illegal Content';
+
+        return (new MailMessage)
+            ->from($mailFrom)
+            ->subject($mailSubject)
+            ->line(Lang::get('Your message via the wikibase.cloud form for reporting illegal content has been submitted.'))
+            ->line(Lang::get('Name: ') . $this->name)
+            ->line(Lang::get('Email address: ') . $this->mailAddress)
+            ->line(Lang::get('Reason why the information in question is illegal content:'))
+            ->line($this->reason)
+            ->line('---')
+            ->line(Lang::get('URL(s) for the content in question:'))
+            ->line($this->offendingUrls)
+            ->line('---');
+    }
+}