FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix email for news not going out (#1131)

Browse Source
This commit is contained in:
Nabeel S 2021-04-11 14:32:58 -04:00 committed by GitHub
parent 648e7a261d
commit fdab4ee530
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Notifications/EventHandler.php
View File

@ -50,10 +50,16 @@ class EventHandler extends Listener
{
$admin_users = User::whereRoleIs('admin')->get();
try {
Notification::send($admin_users, $notification);
} catch (Exception $e) {
Log::emergency('Error emailing admins, malformed email='.$e->getMessage());
foreach ($admin_users as $user) {
if (empty($user->email)) {
continue;
}
try {
Notification::send([$user], $notification);
} catch (Exception $e) {
Log::emergency('Error emailing admin ('.$user->email.'). Error='.$e->getMessage());
}
}
}
@ -66,7 +72,7 @@ class EventHandler extends Listener
try {
$user->notify($notification);
} catch (Exception $e) {
Log::emergency('Error emailing admins, malformed email='.$e->getMessage());
Log::emergency('Error emailing user, '.$user->ident.'='.$user->email.', error='.$e->getMessage());
}
}
@ -91,10 +97,8 @@ class EventHandler extends Listener
Log::info('Sending notification to '.$users->count().' users');
try {
Notification::send($users, $notification);
} catch (Exception $e) {
Log::emergency('Error emailing admins, malformed email='.$e->getMessage());
foreach ($users as $user) {
$this->notifyUser($user, $notification);
}
}

2
app/Notifications/Messages/NewsAdded.php
View File

@ -22,7 +22,7 @@ class NewsAdded extends Notification
$this->news = $news;
$this->setMailable(
$news->subject,
'notifications.mail.news',
'notifications.mail.news.news',
['news' => $news]
);
}

6
resources/views/notifications/mail/news/news.blade.php
View File

@ -1,11 +1,7 @@
@component('mail::message')
# {{ $news->subject }}
$news->body
@component('mail::button', ['url' => route('frontend.pireps.show', [$pirep->id])])
View PIREP
@endcomponent
{{ $news->body }}
Thanks,<br>
{{ config('app.name') }}