lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #705 and only send emails for public incidents.

Browse Source
This commit is contained in:
James Brooks
2015-06-12 08:05:07 +01:00
parent f1080680bf
commit 832db53ef2
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Handlers/Events/SendIncidentEmailNotificationHandler.php
+20 -16
View File
@@ -67,23 +67,27 @@ class SendIncidentEmailNotificationHandler
{ {
$data = $this->presenter->decorate($event->incident); $data = $this->presenter->decorate($event->incident);
foreach ($this->subscriber->all() as $subscriber) { // Only send emails for public incidents.
$mail = [ if ($event->incident->visible === 1) {
'email' => $subscriber->email, foreach ($this->subscriber->all() as $subscriber) {
'subject' => 'New incident reported.', $mail = [
'status' => $data->humanStatus, 'email' => $subscriber->email,
'htmlContent' => $data->formattedMessage, 'subject' => 'New incident reported.',
'textContent' => $data->message, 'status' => $data->humanStatus,
'token' => $subscriber->token, 'htmlContent' => $data->formattedMessage,
'unsubscribeLink' => route('unsubscribe', ['code' => $subscriber->token]), 'textContent' => $data->message,
]; 'token' => $subscriber->token,
'unsubscribeLink' => route('unsubscribe', ['code' => $subscriber->token]),
'appUrl' => env('APP_URL'),
];
$this->mailer->queue([ $this->mailer->queue([
'html' => 'emails.incidents.new-html', 'html' => 'emails.incidents.new-html',
'text' => 'emails.incidents.new-text', 'text' => 'emails.incidents.new-text',
], $mail, function (Message $message) use ($mail) { ], $mail, function (Message $message) use ($mail) {
$message->to($mail['email'])->subject($mail['subject']); $message->to($mail['email'])->subject($mail['subject']);
}); });
}
} }
} }
} }
app/Handlers/Events/SendMaintenanceEmailNotificationHandler.php
+1
View File
@@ -76,6 +76,7 @@ class SendMaintenanceEmailNotificationHandler
'textContent' => $data->message, 'textContent' => $data->message,
'token' => $subscriber->token, 'token' => $subscriber->token,
'unsubscribeLink' => route('unsubscribe', ['code' => $subscriber->token]), 'unsubscribeLink' => route('unsubscribe', ['code' => $subscriber->token]),
'appUrl' => env('APP_URL'),
]; ];
$this->mailer->queue([ $this->mailer->queue([
app/Handlers/Events/SendSubscriberVerificationEmailHandler.php
+1
View File
@@ -49,6 +49,7 @@ class SendSubscriberVerificationEmailHandler
'email' => $event->subscriber->email, 'email' => $event->subscriber->email,
'subject' => 'Confirm your subscription.', 'subject' => 'Confirm your subscription.',
'link' => route('subscribe-verify', ['code' => $event->subscriber->verify_code]), 'link' => route('subscribe-verify', ['code' => $event->subscriber->verify_code]),
'appUrl' => env('APP_URL'),
]; ];
$this->mailer->queue([ $this->mailer->queue([