X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/80865b30a5d6a82e86d21e272ae58977d4430a64..refs/pull/446/head:/app/Services/ActivityService.php

diff --git a/app/Services/ActivityService.php b/app/Services/ActivityService.php
index a57210b8d..2368ba10a 100644
--- a/app/Services/ActivityService.php
+++ b/app/Services/ActivityService.php
@@ -1,6 +1,5 @@
 <?php namespace BookStack\Services;
 
-use Illuminate\Support\Facades\Auth;
 use BookStack\Activity;
 use BookStack\Entity;
 use Session;
@@ -9,26 +8,26 @@ class ActivityService
 {
     protected $activity;
     protected $user;
-    protected $restrictionService;
+    protected $permissionService;
 
     /**
      * ActivityService constructor.
      * @param Activity $activity
-     * @param RestrictionService $restrictionService
+     * @param PermissionService $permissionService
      */
-    public function __construct(Activity $activity, RestrictionService $restrictionService)
+    public function __construct(Activity $activity, PermissionService $permissionService)
     {
         $this->activity = $activity;
-        $this->restrictionService = $restrictionService;
-        $this->user = auth()->user();
+        $this->permissionService = $permissionService;
+        $this->user = user();
     }
 
     /**
      * Add activity data to database.
      * @param Entity $entity
      * @param        $activityKey
-     * @param int    $bookId
-     * @param bool   $extra
+     * @param int $bookId
+     * @param bool $extra
      */
     public function add(Entity $entity, $activityKey, $bookId = 0, $extra = false)
     {
@@ -46,7 +45,7 @@ class ActivityService
     /**
      * Adds a activity history with a message & without binding to a entity.
      * @param            $activityKey
-     * @param int        $bookId
+     * @param int $bookId
      * @param bool|false $extra
      */
     public function addMessage($activityKey, $bookId = 0, $extra = false)
@@ -89,9 +88,9 @@ class ActivityService
      */
     public function latest($count = 20, $page = 0)
     {
-        $activityList =  $this->restrictionService
+        $activityList = $this->permissionService
             ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
-            ->orderBy('created_at', 'desc')->skip($count * $page)->take($count)->get();
+            ->orderBy('created_at', 'desc')->with('user', 'entity')->skip($count * $page)->take($count)->get();
 
         return $this->filterSimilar($activityList);
     }
@@ -100,14 +99,22 @@ class ActivityService
      * Gets the latest activity for an entity, Filtering out similar
      * items to prevent a message activity list.
      * @param Entity $entity
-     * @param int    $count
-     * @param int    $page
+     * @param int $count
+     * @param int $page
      * @return array
      */
     public function entityActivity($entity, $count = 20, $page = 0)
     {
-        $activity = $entity->hasMany('BookStack\Activity')->orderBy('created_at', 'desc')
-            ->skip($count * $page)->take($count)->get();
+        if ($entity->isA('book')) {
+            $query = $this->activity->where('book_id', '=', $entity->id);
+        } else {
+            $query = $this->activity->where('entity_type', '=', get_class($entity))
+                ->where('entity_id', '=', $entity->id);
+        }
+        
+        $activity = $this->permissionService
+            ->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type')
+            ->orderBy('created_at', 'desc')->with(['entity', 'user.avatar'])->skip($count * $page)->take($count)->get();
 
         return $this->filterSimilar($activity);
     }
@@ -122,9 +129,10 @@ class ActivityService
      */
     public function userActivity($user, $count = 20, $page = 0)
     {
-        $activity = $this->activity->where('user_id', '=', $user->id)
-            ->orderBy('created_at', 'desc')->skip($count * $page)->take($count)->get();
-        return $this->filterSimilar($activity);
+        $activityList = $this->permissionService
+            ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
+            ->orderBy('created_at', 'desc')->where('user_id', '=', $user->id)->skip($count * $page)->take($count)->get();
+        return $this->filterSimilar($activityList);
     }
 
     /**