fix notifications (#109)

app/Contracts/Notification.php

@@ -8,7 +8,7 @@ interface Notification
 {
     public function rawText(): string;
 
-    public function toMail(object $notifiable): MailMessage;
+    public function toEmail(object $notifiable): MailMessage;
 
     public function toSlack(object $notifiable): string;
 

app/NotificationChannels/Discord.php

@@ -3,6 +3,7 @@
 namespace App\NotificationChannels;
 
 use App\Contracts\Notification;
+use App\Models\NotificationChannel;
 use Illuminate\Support\Facades\Http;
 
 class Discord extends AbstractNotificationChannel
@@ -60,6 +61,8 @@ private function checkConnection(string $subject, string $text): bool
 
     public function send(object $notifiable, Notification $notification): void
     {
+        /** @var NotificationChannel $notifiable */
+        $this->notificationChannel = $notifiable;
         $data = $this->notificationChannel->data;
         Http::post($data['webhook_url'], [
             'content' => $notification->toSlack($notifiable),

app/NotificationChannels/Email.php

@@ -51,8 +51,7 @@ public function send(object $notifiable, Notification $notification): void
     {
         /** @var NotificationChannel $notifiable */
         $this->notificationChannel = $notifiable;
-        $message = $notification->toMail($notifiable);
+        $message = $notification->toEmail($notifiable);
-
         Mail::to($this->data()['email'])->send(
             new NotificationMail($message->subject, $message->render())
         );

app/NotificationChannels/Slack.php

@@ -3,6 +3,7 @@
 namespace App\NotificationChannels;
 
 use App\Contracts\Notification;
+use App\Models\NotificationChannel;
 use Illuminate\Support\Facades\Http;
 
 class Slack extends AbstractNotificationChannel
@@ -60,6 +61,8 @@ private function checkConnection(string $subject, string $text): bool
 
     public function send(object $notifiable, Notification $notification): void
     {
+        /** @var NotificationChannel $notifiable */
+        $this->notificationChannel = $notifiable;
         $data = $this->notificationChannel->data;
         Http::post($data['webhook_url'], [
             'text' => $notification->toSlack($notifiable),

app/NotificationChannels/Telegram.php

@@ -3,6 +3,7 @@
 namespace App\NotificationChannels;
 
 use App\Contracts\Notification;
+use App\Models\NotificationChannel;
 use Illuminate\Support\Facades\Http;
 use Throwable;
 
@@ -47,6 +48,8 @@ public function connect(): bool
 
     public function send(object $notifiable, Notification $notification): void
     {
+        /** @var NotificationChannel $notifiable */
+        $this->notificationChannel = $notifiable;
         $this->sendToTelegram($notification->toTelegram($notifiable));
     }
 

app/Notifications/AbstractNotification.php

@@ -20,7 +20,7 @@ public function via(object $notifiable): string
         return get_class($notifiable->provider());
     }
 
-    public function toMail(object $notifiable): MailMessage
+    public function toEmail(object $notifiable): MailMessage
     {
         return (new MailMessage())
             ->subject('Notification')

app/Notifications/FailedToDeleteServerFromProvider.php

@@ -25,7 +25,7 @@ public function rawText(): string
         ]);
     }
 
-    public function toMail(object $notifiable): MailMessage
+    public function toEmail(object $notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject(__('Failed to delete the server from the provider!'))

app/Notifications/ServerDisconnected.php

@@ -21,7 +21,7 @@ public function rawText(): string
         ]);
     }
 
-    public function toMail(object $notifiable): MailMessage
+    public function toEmail(object $notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject(__('Server disconnected!'))

app/Notifications/ServerInstallationFailed.php

@@ -22,7 +22,7 @@ public function rawText(): string
         ]);
     }
 
-    public function toMail(object $notifiable): MailMessage
+    public function toEmail(object $notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject(__('Server installation failed!'))

app/Notifications/ServerInstallationStarted.php

@@ -22,7 +22,7 @@ public function rawText(): string
         ]);
     }
 
-    public function toMail(object $notifiable): MailMessage
+    public function toEmail(object $notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject(__('Server installation started!'))

app/Notifications/ServerInstallationSucceed.php

@@ -32,7 +32,7 @@ public function rawText(): string
         ]);
     }
 
-    public function toMail(object $notifiable): MailMessage
+    public function toEmail(object $notifiable): MailMessage
     {
         $this->server->refresh();
 

app/Notifications/SiteInstallationFailed.php

@@ -19,7 +19,7 @@ public function rawText(): string
         ]);
     }
 
-    public function toMail(object $notifiable): MailMessage
+    public function toEmail(object $notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject(__('Site installation failed!'))

app/Notifications/SiteInstallationSucceed.php

@@ -18,7 +18,7 @@ public function rawText(): string
         ]);
     }
 
-    public function toMail(object $notifiable): MailMessage
+    public function toEmail(object $notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject(__('Site installation succeed!'))

app/Notifications/SourceControlDisconnected.php

@@ -18,7 +18,7 @@ public function rawText(): string
         ]);
     }
 
-    public function toMail(object $notifiable): MailMessage
+    public function toEmail(object $notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject(__('Source control disconnected!'))