Use getRelativePath for relative path in activity listeners

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · Jun 27, 2023 · 287a5a8 · 287a5a8
1 parent af926ba
commit 287a5a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/apps/comments/lib/Activity/Listener.php b/apps/comments/lib/Activity/Listener.php
@@ -71,9 +71,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
@@ -177,9 +177,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();