Merge pull request #2295 from CachetHQ/new-notifications

Notifications

.env.example

@@ -32,3 +32,7 @@ REDIS_DATABASE=null
 REDIS_PORT=null
 
 GITHUB_TOKEN=null
+
+NEXMO_KEY=null
+NEXMO_SECRET=null
+NEXMO_SMS_FROM=Cachet

app/Bus/Events/Incident/IncidentWasReportedEvent.php

@@ -22,15 +22,24 @@ final class IncidentWasReportedEvent implements IncidentEventInterface
      */
     public $incident;
 
+    /**
+     * Whether to notify that the incident was reported.
+     *
+     * @var bool
+     */
+    public $notify;
+
     /**
      * Create a new incident has reported event instance.
      *
      * @param \CachetHQ\Cachet\Models\Incident $incident
+     * @param bool                             $notify
      *
      * @return void
      */
-    public function __construct(Incident $incident)
+    public function __construct(Incident $incident, $notify = false)
     {
         $this->incident = $incident;
+        $this->notify = $notify;
     }
 }

app/Bus/Events/User/UserAcceptedInviteEvent.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Bus\Events\User;
+
+use CachetHQ\Cachet\Models\Invite;
+use CachetHQ\Cachet\Models\User;
+
+/**
+ * This is the user accepted invite event class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+final class UserAcceptedInviteEvent implements UserEventInterface
+{
+    /**
+     * The user that accepted the invite.
+     *
+     * @var \CachetHQ\Cachet\Models\User
+     */
+    public $user;
+
+    /**
+     * The invite that the user accepted.
+     *
+     * @var \CachetHQ\Cachet\Models\Invite
+     */
+    public $invite;
+
+    /**
+     * Create a new user accepted invite event class.
+     *
+     * @param \CachetHQ\Cachet\Models\User   $user
+     * @param \CachetHQ\Cachet\Models\Invite $invite
+     *
+     * @return void
+     */
+    public function __construct(User $user, Invite $invite)
+    {
+        $this->user = $user;
+        $this->invite = $invite;
+    }
+}

app/Bus/Handlers/Commands/Incident/ReportIncidentCommandHandler.php

@@ -105,9 +105,7 @@ public function handle(ReportIncidentCommand $command)
             ));
         }
 
-        $incident->update(['notify' => (bool) $command->notify]);
-
-        event(new IncidentWasReportedEvent($incident));
+        event(new IncidentWasReportedEvent($incident, (bool) $command->notify));
 
         return $incident;
     }

app/Bus/Handlers/Commands/Subscriber/SubscribeSubscriberCommandHandler.php

@@ -17,6 +17,7 @@
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Cachet\Models\Subscription;
+use CachetHQ\Cachet\Notifications\Subscriber\VerifySubscriptionNotification;
 
 /**
  * This is the subscribe subscriber command handler.
@@ -49,7 +50,7 @@ public function handle(SubscribeSubscriberCommand $command)
             $components = Component::all();
         }
 
-        $components->map(function ($component) use ($subscriber) {
+        $components->each(function ($component) use ($subscriber) {
             Subscription::create([
                 'subscriber_id' => $subscriber->id,
                 'component_id'  => $component->id,
@@ -59,9 +60,11 @@ public function handle(SubscribeSubscriberCommand $command)
         if ($command->verified) {
             dispatch(new VerifySubscriberCommand($subscriber));
         } else {
-            event(new SubscriberHasSubscribedEvent($subscriber));
+            $subscriber->notify(new VerifySubscriptionNotification());
         }
 
+        event(new SubscriberHasSubscribedEvent($subscriber));
+
         $subscriber->load('subscriptions');
 
         return $subscriber;

app/Bus/Handlers/Commands/User/InviteUserCommandHandler.php

@@ -14,6 +14,7 @@
 use CachetHQ\Cachet\Bus\Commands\User\InviteUserCommand;
 use CachetHQ\Cachet\Bus\Events\User\UserWasInvitedEvent;
 use CachetHQ\Cachet\Models\Invite;
+use CachetHQ\Cachet\Notifications\User\InviteUserNotification;
 
 /**
  * This is the invite user command handler.
@@ -36,6 +37,8 @@ public function handle(InviteUserCommand $command)
                 'email' => $email,
             ]);
 
+            $invite->notify(new InviteUserNotification());
+
             event(new UserWasInvitedEvent($invite));
         }
     }

app/Bus/Handlers/Events/Component/SendComponentUpdateEmailNotificationHandler.php

@@ -14,18 +14,10 @@
 use CachetHQ\Cachet\Bus\Events\Component\ComponentStatusWasUpdatedEvent;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Subscriber;
-use Illuminate\Contracts\Mail\MailQueue;
-use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
+use CachetHQ\Cachet\Notifications\Component\ComponentStatusChangedNotification;
 
 class SendComponentUpdateEmailNotificationHandler
 {
-    /**
-     * The mailer instance.
-     *
-     * @var \Illuminate\Contracts\Mail\Mailer
-     */
-    protected $mailer;
-
     /**
      * The subscriber instance.
      *
@@ -36,14 +28,12 @@ class SendComponentUpdateEmailNotificationHandler
     /**
      * Create a new send incident email notification handler.
      *
-     * @param \Illuminate\Contracts\Mail\Mailer  $mailer
      * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
      *
      * @return void
      */
-    public function __construct(MailQueue $mailer, Subscriber $subscriber)
+    public function __construct(Subscriber $subscriber)
     {
-        $this->mailer = $mailer;
         $this->subscriber = $subscriber;
     }
 
@@ -66,9 +56,9 @@ public function handle(ComponentStatusWasUpdatedEvent $event)
         // First notify all global subscribers.
         $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get();
 
-        foreach ($globalSubscribers as $subscriber) {
-            $this->notify($component, $subscriber);
-        }
+        $globalSubscribers->each(function ($subscriber) use ($component, $event) {
+            $subscriber->notify(new ComponentStatusChangedNotification($component, $event->new_status));
+        });
 
         $notified = $globalSubscribers->pluck('id')->all();
 
@@ -81,37 +71,8 @@ public function handle(ComponentStatusWasUpdatedEvent $event)
                 return in_array($subscriber->id, $notified);
             });
 
-        foreach ($componentSubscribers as $subscriber) {
-            $this->notify($component, $subscriber);
-        }
-    }
-
-    /**
-     * Send notification to subscriber.
-     *
-     * @param \CachetHQ\Cachet\Models\Component  $component
-     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function notify(Component $component, Subscriber $subscriber)
-    {
-        $component = AutoPresenter::decorate($component);
-
-        $mail = [
-            'subject'                => trans('cachet.subscriber.email.component.subject'),
-            'component_name'         => $component->name,
-            'component_human_status' => $component->human_status,
-        ];
-
-        $mail['email'] = $subscriber->email;
-        $mail['manage_link'] = cachet_route('subscribe.manage', [$subscriber->verify_code]);
-
-        $this->mailer->queue([
-            'html' => 'emails.components.update-html',
-            'text' => 'emails.components.update-text',
-        ], $mail, function ($message) use ($mail) {
-            $message->to($mail['email'])->subject($mail['subject']);
+        $componentSubscribers->each(function ($subscriber) use ($component, $event) {
+            $subscriber->notify(new ComponentStatusChangedNotification($component, $event->new_status));
         });
     }
 }