Show bookshelves that a book belongs to on a book view

[bookstack] / app / Actions / ActivityService.php

diff --git a/app/Actions/ActivityService.php b/app/Actions/ActivityService.php
index f4f82a6f4dfbbac6b63c2fb42a15fad0631f77e9..d092a35c2d2452f40f78638d960cd71e3a85d690 100644 (file)
--- a/app/Actions/ActivityService.php
+++ b/app/Actions/ActivityService.php
@@ -2,7 +2,6 @@
 
 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Entities\Entity;
 
 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Entities\Entity;

-use Session;

 
 class ActivityService
 {
 
 class ActivityService
 {


@@ -12,7 +11,7 @@ class ActivityService
 
     /**
      * ActivityService constructor.
 
     /**
      * ActivityService constructor.

-     * @param \BookStack\Actions\Activity $activity
+     * @param Activity $activity

      * @param PermissionService $permissionService
      */
     public function __construct(Activity $activity, PermissionService $permissionService)
      * @param PermissionService $permissionService
      */
     public function __construct(Activity $activity, PermissionService $permissionService)


@@ -24,42 +23,46 @@ class ActivityService
 
     /**
      * Add activity data to database.
 
     /**
      * Add activity data to database.

-     * @param Entity $entity
-     * @param        $activityKey
+     * @param \BookStack\Entities\Entity $entity
+     * @param string $activityKey

      * @param int $bookId
      * @param int $bookId

-     * @param bool $extra

      */
      */

-    public function add(Entity $entity, $activityKey, $bookId = 0, $extra = false)
+    public function add(Entity $entity, string $activityKey, int $bookId = null)

     {
     {

-        $activity = $this->activity->newInstance();
-        $activity->user_id = $this->user->id;
-        $activity->book_id = $bookId;
-        $activity->key = strtolower($activityKey);
-        if ($extra !== false) {
-            $activity->extra = $extra;
-        }
+        $activity = $this->newActivityForUser($activityKey, $bookId);

         $entity->activity()->save($activity);
         $this->setNotification($activityKey);
     }
 
     /**
         $entity->activity()->save($activity);
         $this->setNotification($activityKey);
     }
 
     /**

-     * Adds a activity history with a message & without binding to a entity.
-     * @param            $activityKey
+     * Adds a activity history with a message, without binding to a entity.
+     * @param string $activityKey
+     * @param string $message

      * @param int $bookId
      * @param int $bookId

-     * @param bool|false $extra

      */
      */

-    public function addMessage($activityKey, $bookId = 0, $extra = false)
+    public function addMessage(string $activityKey, string $message, int $bookId = null)

     {
     {

-        $this->activity->user_id = $this->user->id;
-        $this->activity->book_id = $bookId;
-        $this->activity->key = strtolower($activityKey);
-        if ($extra !== false) {
-            $this->activity->extra = $extra;
-        }
-        $this->activity->save();
+        $this->newActivityForUser($activityKey, $bookId)->forceFill([
+            'extra' => $message
+        ])->save();
+

         $this->setNotification($activityKey);
     }
 
         $this->setNotification($activityKey);
     }
 

+    /**
+     * Get a new activity instance for the current user.
+     * @param string $key
+     * @param int|null $bookId
+     * @return Activity
+     */
+    protected function newActivityForUser(string $key, int $bookId = null)
+    {
+        return $this->activity->newInstance()->forceFill([
+            'key' => strtolower($key),
+            'user_id' => $this->user->id,
+            'book_id' => $bookId ?? 0,
+        ]);
+    }

 
     /**
      * Removes the entity attachment from each of its activities
 
     /**
      * Removes the entity attachment from each of its activities


@@ -70,6 +73,7 @@ class ActivityService
      */
     public function removeEntity(Entity $entity)
     {
      */
     public function removeEntity(Entity $entity)
     {

+        // TODO - Rewrite to db query.

         $activities = $entity->activity;
         foreach ($activities as $activity) {
             $activity->extra = $entity->name;
         $activities = $entity->activity;
         foreach ($activities as $activity) {
             $activity->extra = $entity->name;


@@ -90,7 +94,11 @@ class ActivityService
     {
         $activityList = $this->permissionService
             ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
     {
         $activityList = $this->permissionService
             ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')

-            ->orderBy('created_at', 'desc')->with('user', 'entity')->skip($count * $page)->take($count)->get();
+            ->orderBy('created_at', 'desc')
+            ->with('user', 'entity')
+            ->skip($count * $page)
+            ->take($count)
+            ->get();

 
         return $this->filterSimilar($activityList);
     }
 
         return $this->filterSimilar($activityList);
     }


@@ -171,7 +179,7 @@ class ActivityService
         $notificationTextKey = 'activities.' . $activityKey . '_notification';
         if (trans()->has($notificationTextKey)) {
             $message = trans($notificationTextKey);
         $notificationTextKey = 'activities.' . $activityKey . '_notification';
         if (trans()->has($notificationTextKey)) {
             $message = trans($notificationTextKey);

-            Session::flash('success', $message);
+            session()->flash('success', $message);

         }
     }
 }
         }
     }
 }