ExportFormatter: Add book description and check for empty book and chapter descriptio...

[bookstack] / app / Activity / Notifications / NotificationManager.php

diff --git a/app/Activity/Notifications/NotificationManager.php b/app/Activity/Notifications/NotificationManager.php
index 01361c1ee5fd8ae55195a27f147f1a1125eb6d03..294f56ebbcf4ab86772e33866df46c4b22d1430d 100644 (file)
--- a/app/Activity/Notifications/NotificationManager.php
+++ b/app/Activity/Notifications/NotificationManager.php
@@ -3,6 +3,7 @@
 namespace BookStack\Activity\Notifications;
 
 use BookStack\Activity\ActivityType;
 namespace BookStack\Activity\Notifications;
 
 use BookStack\Activity\ActivityType;

+use BookStack\Activity\Models\Activity;

 use BookStack\Activity\Models\Loggable;
 use BookStack\Activity\Notifications\Handlers\CommentCreationNotificationHandler;
 use BookStack\Activity\Notifications\Handlers\NotificationHandler;
 use BookStack\Activity\Models\Loggable;
 use BookStack\Activity\Notifications\Handlers\CommentCreationNotificationHandler;
 use BookStack\Activity\Notifications\Handlers\NotificationHandler;


@@ -17,13 +18,14 @@ class NotificationManager
      */
     protected array $handlers = [];
 
      */
     protected array $handlers = [];
 

-    public function handle(string $activityType, string|Loggable $detail, User $user): void
+    public function handle(Activity $activity, string|Loggable $detail, User $user): void

     {
     {

+        $activityType = $activity->type;

         $handlersToRun = $this->handlers[$activityType] ?? [];
         foreach ($handlersToRun as $handlerClass) {
             /** @var NotificationHandler $handler */
         $handlersToRun = $this->handlers[$activityType] ?? [];
         foreach ($handlersToRun as $handlerClass) {
             /** @var NotificationHandler $handler */

-            $handler = app()->make($handlerClass);
-            $handler->handle($activityType, $detail, $user);
+            $handler = new $handlerClass();
+            $handler->handle($activity, $detail, $user);

         }
     }
 
         }
     }