Skip to content

Commit 287a5a8

Browse files
committed
Use getRelativePath for relative path in activity listeners
Signed-off-by: Côme Chilliet <[email protected]>
1 parent af926ba commit 287a5a8

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

apps/comments/lib/Activity/Listener.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ public function commentEvent(CommentsEvent $event): void {
7171
$users = [];
7272
$filesPerUser = $cache->getReadableNodesByUserForFileId((int)$event->getComment()->getObjectId());
7373
foreach ($filesPerUser as $user => $files) {
74-
/* Remove /user/files prefix */
75-
$sections = explode('/', reset($files)?->getPath() ?? '', 4);
76-
$users[$user] = '/'.($sections[3] ?? '');
74+
$users[$user] = $this->rootFolder->getUserFolder($user)->getRelativePath(reset($files)?->getPath() ?? '');
7775
}
7876

7977
$actor = $this->session->getUser();

apps/systemtags/lib/Activity/Listener.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,7 @@ public function mapperEvent(MapperEvent $event) {
177177
return;
178178
}
179179
foreach ($filesPerUser as $user => $files) {
180-
/* Remove /user/files prefix */
181-
$sections = explode('/', reset($files)?->getPath() ?? '', 4);
182-
$users[$user] = '/'.($sections[3] ?? '');
180+
$users[$user] = $this->rootFolder->getUserFolder($user)->getRelativePath(reset($files)?->getPath() ?? '');
183181
}
184182

185183
$actor = $this->session->getUser();

0 commit comments

Comments
 (0)