From 8977e4eb0647224608e795265401d35f6d1b567e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 27 Jun 2023 11:41:49 +0200 Subject: [PATCH] fix: Use getRelativePath for relative path in activity listeners MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- apps/comments/lib/Activity/Listener.php | 4 +--- apps/systemtags/lib/Activity/Listener.php | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/comments/lib/Activity/Listener.php b/apps/comments/lib/Activity/Listener.php index fc2205c50c6c2..5e79b5fda7348 100644 --- a/apps/comments/lib/Activity/Listener.php +++ b/apps/comments/lib/Activity/Listener.php @@ -40,9 +40,7 @@ public function commentEvent(CommentsEvent $event): void { $users = []; $filesPerUser = $cache->getReadableNodesByUserForFileId((int)$event->getComment()->getObjectId()); foreach ($filesPerUser as $user => $files) { - /* Remove /user/files prefix */ - $sections = explode('/', reset($files)?->getPath() ?? '', 4); - $users[$user] = '/'.($sections[3] ?? ''); + $users[$user] = $this->rootFolder->getUserFolder($user)->getRelativePath(reset($files)?->getPath() ?? ''); } $actor = $this->session->getUser(); diff --git a/apps/systemtags/lib/Activity/Listener.php b/apps/systemtags/lib/Activity/Listener.php index 4094760bbeef5..cfd5fefb08ded 100644 --- a/apps/systemtags/lib/Activity/Listener.php +++ b/apps/systemtags/lib/Activity/Listener.php @@ -159,9 +159,7 @@ public function mapperEvent(MapperEvent $event) { return; } foreach ($filesPerUser as $user => $files) { - /* Remove /user/files prefix */ - $sections = explode('/', reset($files)?->getPath() ?? '', 4); - $users[$user] = '/'.($sections[3] ?? ''); + $users[$user] = $this->rootFolder->getUserFolder($user)->getRelativePath(reset($files)?->getPath() ?? ''); } $actor = $this->session->getUser();