Skip to content

perf(sharing): Use new user field from VerifyMountEvent #17046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nickvergessen wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

perf(sharing): Use new user field from VerifyMountEvent #17046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46f0c34
perf(sharing): Use new user field from VerifyMountEvent
nickvergessen Feb 10, 2026
7a52ef5
test: Test against nextcloud/server#58207 share-verify-mount-event-im…
nickvergessen Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/integration-pgsql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- 'sharing-3'
- 'sharing-4'
php-versions: ['8.3']
server-versions: ['master']
server-versions: ['share-verify-mount-event-improvements']
guests-versions: ['main']
circles-versions: ['master']
notifications-versions: ['master']
Expand Down
23 changes: 2 additions & 21 deletions lib/Share/Listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

declare(strict_types=1);
Expand Down Expand Up @@ -52,35 +52,16 @@

protected function overwriteMountPoint(VerifyMountPointEvent $event): void {
$share = $event->getShare();
$view = $event->getView();

if ($share->getShareType() !== IShare::TYPE_ROOM
&& $share->getShareType() !== RoomShareProvider::SHARE_TYPE_USERROOM) {
return;
}

if ($event->getParent() === RoomShareProvider::TALK_FOLDER_PLACEHOLDER) {
try {
$userId = $view->getOwner('/');
} catch (\Exception $e) {
// If we fail to get the owner of the view from the cache,
// e.g. because the user never logged in but a cron job runs
// We fall back to calculating the owner from the root of the view:
if (substr_count($view->getRoot(), '/') >= 2) {
// /37c09aa0-1b92-4cf6-8c66-86d8cac8c1d0/files
[, $userId, ] = explode('/', $view->getRoot(), 3);
} else {
// Something weird is going on, we can't fall back more
// so for now we don't overwrite the share path ¯\_(ツ)_/¯
return;
}
}

$parent = $this->config->getAttachmentFolder($userId);
$parent = $this->config->getAttachmentFolder($event->getUser()->getUID());

Check failure on line 62 in lib/Share/Listener.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

UndefinedMethod 

lib/Share/Listener.php:62:57: UndefinedMethod: Method OCP\Share\Events\VerifyMountPointEvent::getUser does not exist (see https://psalm.dev/022)
$event->setCreateParent(true);

Check failure on line 63 in lib/Share/Listener.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

UndefinedMethod 

lib/Share/Listener.php:63:12: UndefinedMethod: Method OCP\Share\Events\VerifyMountPointEvent::setCreateParent does not exist (see https://psalm.dev/022)
$event->setParent($parent);
if (!$event->getView()->is_dir($parent)) {
$event->getView()->mkdir($parent);
}
}
}

Expand Down
Loading