Updated issue template and added TinyMCE autolinking

[bookstack] / app / Services / ActivityService.php

diff --git a/app/Services/ActivityService.php b/app/Services/ActivityService.php
index 06226f7e433e7a8ee0aae0dc5d830ce10bd48f87..2368ba10aebd73a936ad39684be86d2a8e65241c 100644 (file)
--- a/app/Services/ActivityService.php
+++ b/app/Services/ActivityService.php
@@ -1,6 +1,5 @@
 <?php namespace BookStack\Services;
 
 <?php namespace BookStack\Services;
 

-use Illuminate\Support\Facades\Auth;

 use BookStack\Activity;
 use BookStack\Entity;
 use Session;
 use BookStack\Activity;
 use BookStack\Entity;
 use Session;


@@ -9,40 +8,44 @@ class ActivityService
 {
     protected $activity;
     protected $user;
 {
     protected $activity;
     protected $user;

+    protected $permissionService;

 
     /**
      * ActivityService constructor.
 
     /**
      * ActivityService constructor.

-     * @param $activity
+     * @param Activity $activity
+     * @param PermissionService $permissionService

      */
      */

-    public function __construct(Activity $activity)
+    public function __construct(Activity $activity, PermissionService $permissionService)

     {
         $this->activity = $activity;
     {
         $this->activity = $activity;

-        $this->user = auth()->user();
+        $this->permissionService = $permissionService;
+        $this->user = user();

     }
 
     /**
      * Add activity data to database.
      * @param Entity $entity
      * @param        $activityKey
     }
 
     /**
      * 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)
     {
      */
     public function add(Entity $entity, $activityKey, $bookId = 0, $extra = false)
     {

-        $this->activity->user_id = $this->user->id;
-        $this->activity->book_id = $bookId;
-        $this->activity->key = strtolower($activityKey);
+        $activity = $this->activity->newInstance();
+        $activity->user_id = $this->user->id;
+        $activity->book_id = $bookId;
+        $activity->key = strtolower($activityKey);

         if ($extra !== false) {
         if ($extra !== false) {

-            $this->activity->extra = $extra;
+            $activity->extra = $extra;

         }
         }

-        $entity->activity()->save($this->activity);
+        $entity->activity()->save($activity);

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

-     * Adds a activity history with a message & without binding to a entitiy.
+     * Adds a activity history with a message & without binding to a entity.

      * @param            $activityKey
      * @param            $activityKey

-     * @param int        $bookId
+     * @param int $bookId

      * @param bool|false $extra
      */
     public function addMessage($activityKey, $bookId = 0, $extra = false)
      * @param bool|false $extra
      */
     public function addMessage($activityKey, $bookId = 0, $extra = false)


@@ -85,8 +88,10 @@ class ActivityService
      */
     public function latest($count = 20, $page = 0)
     {
      */
     public function latest($count = 20, $page = 0)
     {

-        $activityList =  $this->activity->orderBy('created_at', 'desc')
-            ->skip($count * $page)->take($count)->get();
+        $activityList = $this->permissionService
+            ->filterRestrictedEntityRelations($this->activity, 'activities', 'entity_id', 'entity_type')
+            ->orderBy('created_at', 'desc')->with('user', 'entity')->skip($count * $page)->take($count)->get();
+

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


@@ -94,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
      * 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)
     {
      * @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);
     }
 
         return $this->filterSimilar($activity);
     }


@@ -116,9 +129,10 @@ class ActivityService
      */
     public function userActivity($user, $count = 20, $page = 0)
     {
      */
     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);

     }
 
     /**
     }
 
     /**