Guest create page: name field autofocus

[bookstack] / app / Actions / ActivityQueries.php

diff --git a/app/Actions/ActivityQueries.php b/app/Actions/ActivityQueries.php
index b7599441684e9d764e567b75f19f3e90e2a131bf..0e9cbdebb4b003305bba1045dc59ac4888d764ad 100644 (file)
--- a/app/Actions/ActivityQueries.php
+++ b/app/Actions/ActivityQueries.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Actions;
 
 
 namespace BookStack\Actions;
 

-use BookStack\Auth\Permissions\PermissionService;
+use BookStack\Auth\Permissions\PermissionApplicator;

 use BookStack\Auth\User;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Auth\User;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;


@@ -13,11 +13,11 @@ use Illuminate\Database\Eloquent\Relations\Relation;
 
 class ActivityQueries
 {
 
 class ActivityQueries
 {

-    protected $permissionService;
+    protected PermissionApplicator $permissions;

 
 

-    public function __construct(PermissionService $permissionService)
+    public function __construct(PermissionApplicator $permissions)

     {
     {

-        $this->permissionService = $permissionService;
+        $this->permissions = $permissions;

     }
 
     /**
     }
 
     /**


@@ -25,8 +25,8 @@ class ActivityQueries
      */
     public function latest(int $count = 20, int $page = 0): array
     {
      */
     public function latest(int $count = 20, int $page = 0): array
     {

-        $activityList = $this->permissionService
-            ->filterRestrictedEntityRelations(Activity::query(), 'activities', 'entity_id', 'entity_type')
+        $activityList = $this->permissions
+            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'entity_id', 'entity_type')

             ->orderBy('created_at', 'desc')
             ->with(['user', 'entity'])
             ->skip($count * $page)
             ->orderBy('created_at', 'desc')
             ->with(['user', 'entity'])
             ->skip($count * $page)


@@ -78,8 +78,8 @@ class ActivityQueries
      */
     public function userActivity(User $user, int $count = 20, int $page = 0): array
     {
      */
     public function userActivity(User $user, int $count = 20, int $page = 0): array
     {

-        $activityList = $this->permissionService
-            ->filterRestrictedEntityRelations(Activity::query(), 'activities', 'entity_id', 'entity_type')
+        $activityList = $this->permissions
+            ->restrictEntityRelationQuery(Activity::query(), 'activities', 'entity_id', 'entity_type')

             ->orderBy('created_at', 'desc')
             ->where('user_id', '=', $user->id)
             ->skip($count * $page)
             ->orderBy('created_at', 'desc')
             ->where('user_id', '=', $user->id)
             ->skip($count * $page)


@@ -109,5 +109,4 @@ class ActivityQueries
 
         return $newActivity;
     }
 
         return $newActivity;
     }

-
-}
\ No newline at end of file
+}