Skip to content

Fix docs and add log in send method. #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix docs and add log in send method. #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f68b16c
Fix docs in database messages
gugatxr Mar 31, 2020
9073d9e
Add log when erro occur in send notification
gugatxr Mar 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class InvoicePaid implements NotificationInterface
public function exportForDatabase()
{
return \Yii::createObject([
'class' => '\tuyakhov\notifications\messages\DatabaseChannel',
'class' => '\tuyakhov\notifications\messages\DatabaseMessage',
'subject' => "Invoice has been paid",
'body' => "Your invoice #{$this->invoice->id} has been paid",
'data' => [
Expand Down Expand Up @@ -212,4 +212,4 @@ foreach($model->unreadNotifications as $notification) {
$notification->isUnread();
$notification->isRead();
}
```
```
9 changes: 5 additions & 4 deletions src/Notifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class Notifier extends Component
/**
* Sends the given notifications through available channels to the given notifiable entities.
* You may pass an array in order to send multiple notifications to multiple recipients.
*
*
* @param array|NotifiableInterface $recipients the recipients that can receive given notifications.
* @param array|NotificationInterface $notifications the notification that should be delivered.
* @return void
Expand All @@ -77,14 +77,14 @@ public function send($recipients, $notifications)
*/
$recipients = [$recipients];
}

if (!is_array($notifications)){
/**
* @var $notifications NotificationInterface[]
*/
$notifications = [$notifications];
}

foreach ($recipients as $recipient) {
$channels = array_intersect($recipient->viaChannels(), array_keys($this->channels));
foreach ($notifications as $notification) {
Expand All @@ -99,6 +99,7 @@ public function send($recipients, $notifications)
\Yii::info("Sending notification " . get_class($notification) . " to " . get_class($recipient) . " via {$channel}", __METHOD__);
$response = $channelInstance->send($recipient, $notification);
} catch (\Exception $e) {
\Yii::error($e->getMessage());
$response = $e;
}
$this->trigger(self::EVENT_AFTER_SEND, new NotificationEvent([
Expand Down Expand Up @@ -128,4 +129,4 @@ protected function getChannelInstance($channel)
}
return $this->channels[$channel];
}
}
}