Make building of search results work for multi-byte encoded characters

[bookstack] / app / Actions / ActivityService.php

diff --git a/app/Actions/ActivityService.php b/app/Actions/ActivityService.php
index bc7a6b6b7c3353f39384ae73d88eaca284d5ed41..73dc76de00ebf1d7feb9cf20258b9c6e163d56ea 100644 (file)
--- a/app/Actions/ActivityService.php
+++ b/app/Actions/ActivityService.php
@@ -4,6 +4,7 @@ namespace BookStack\Actions;
 
 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Auth\User;
 
 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Auth\User;

+use BookStack\Entities\Models\Book;

 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;


@@ -100,14 +101,14 @@ class ActivityService
      */
     public function entityActivity(Entity $entity, int $count = 20, int $page = 1): array
     {
      */
     public function entityActivity(Entity $entity, int $count = 20, int $page = 1): array
     {

-        /** @var [string => int[]] $queryIds */
+        /** @var array<string, int[]> $queryIds */

         $queryIds = [$entity->getMorphClass() => [$entity->id]];
 
         $queryIds = [$entity->getMorphClass() => [$entity->id]];
 

-        if ($entity->isA('book')) {
-            $queryIds[(new Chapter())->getMorphClass()] = $entity->chapters()->visible()->pluck('id');
+        if ($entity instanceof Book) {
+            $queryIds[(new Chapter())->getMorphClass()] = $entity->chapters()->scopes('visible')->pluck('id');

         }
         }

-        if ($entity->isA('book') || $entity->isA('chapter')) {
-            $queryIds[(new Page())->getMorphClass()] = $entity->pages()->visible()->pluck('id');
+        if ($entity instanceof Book || $entity instanceof Chapter) {
+            $queryIds[(new Page())->getMorphClass()] = $entity->pages()->scopes('visible')->pluck('id');

         }
 
         $query = $this->activity->newQuery();
         }
 
         $query = $this->activity->newQuery();


@@ -132,7 +133,7 @@ class ActivityService
     }
 
     /**
     }
 
     /**

-     * Get latest activity for a user, Filtering out similar items.
+     * Get the latest activity for a user, Filtering out similar items.

      */
     public function userActivity(User $user, int $count = 20, int $page = 0): array
     {
      */
     public function userActivity(User $user, int $count = 20, int $page = 0): array
     {