Skip to content

fix: Migrate getById to getFirstNodeById #16971

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

Closed
artonge wants to merge 1 commit into from
Closed

fix: Migrate getById to getFirstNodeById #16971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions lib/Files/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,12 @@ public function __construct(
*/
public function getUsersWithAccessFile(string $fileId): array {
if (!isset($this->accessLists[$fileId])) {
$nodes = $this->rootFolder->getById((int)$fileId);
$node = $this->rootFolder->getFirstNodeById((int)$fileId);
Copy link
Member

@nickvergessen nickvergessen Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

@artonge artonge Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The combination of both would be best, IUserFolder + getFirstNodeById.

But using getFirstNodeById should already help.

Copy link
Contributor Author

@artonge artonge Feb 3, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only did the easy no-brainer change, as using IUserFolder requires looking at the logic itself to understand whether it fit the situation

Copy link
Member

@nickvergessen nickvergessen Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay I will check then


if (empty($nodes)) {
if ($node === null) {
return [];
}

$node = array_shift($nodes);
$accessList = $this->shareManager->getAccessList($node);
$accessList['users'] ??= [];
if (!$node->getStorage()->instanceOfStorage(SharedStorage::class)) {
Expand All @@ -69,13 +68,12 @@ public function canUserAccessFile(string $fileId, string $userId): bool {

public function canGuestsAccessFile(string $fileId): bool {
if (!isset($this->publicAccessLists[$fileId])) {
$nodes = $this->rootFolder->getById((int)$fileId);
$node = $this->rootFolder->getFirstNodeById((int)$fileId);

if (empty($nodes)) {
if ($node === null) {
return false;
}

$node = array_shift($nodes);
$accessList = $this->shareManager->getAccessList($node, false);
$this->publicAccessLists[$fileId] = $accessList['public'] ?? false;
}
Expand Down
Loading