Skip to content

refactor: Use file nodes directly where possible #3000

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 2 commits into from
Oct 2, 2026
Merged

refactor: Use file nodes directly where possible #3000

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
9fad671
refactor: Use file nodes directly where possible
CarlSchwan Oct 2, 2026
cb8d4d2
chore: Remove useless stubs
CarlSchwan Oct 2, 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
116 changes: 51 additions & 65 deletions lib/FilesHooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

namespace OCA\Activity;

use OC\Files\Filesystem;
use OCA\Activity\BackgroundJob\RemoteActivity;
use OCA\Activity\Extension\Files;
use OCA\Activity\Extension\Files_Sharing;
Expand Down Expand Up @@ -48,7 +47,7 @@ class FilesHooks {
protected $oldParentPath;
/** @var string */
protected $oldParentOwner;
/** @var string */
/** @var int */
protected $oldParentId;

public function __construct(
Expand Down Expand Up @@ -76,15 +75,14 @@ public function __construct(
* @param Node $node The node that has been created
*/
public function fileCreate(Node $node): void {
$path = $this->getVisiblePath($node->getPath());
if ($path === '/') {
if ($this->getVisiblePath($node->getPath()) === '/') {
return;
}

if ($this->currentUser->getUserIdentifier() === '' && $this->currentUser->isPublicShareToken()) {
$this->addNotificationsForFileAction($path, Files_Sharing::TYPE_PUBLIC_UPLOAD, '', 'created_public');
$this->addNotificationsForFileAction($node, Files_Sharing::TYPE_PUBLIC_UPLOAD, '', 'created_public');
} else {
$this->addNotificationsForFileAction($path, Files::TYPE_SHARE_CREATED, 'created_self', 'created_by');
$this->addNotificationsForFileAction($node, Files::TYPE_SHARE_CREATED, 'created_self', 'created_by');
}
}

Expand All @@ -94,7 +92,7 @@ public function fileCreate(Node $node): void {
* @param Node $node The node that has been modified
*/
public function fileUpdate(Node $node): void {
$this->addNotificationsForFileAction($this->getVisiblePath($node->getPath()), Files::TYPE_FILE_CHANGED, 'changed_self', 'changed_by');
$this->addNotificationsForFileAction($node, Files::TYPE_FILE_CHANGED, 'changed_self', 'changed_by');
}

/**
Expand All @@ -103,7 +101,7 @@ public function fileUpdate(Node $node): void {
* @param Node $node The node that is about to be deleted
*/
public function fileDelete(Node $node): void {
$this->addNotificationsForFileAction($this->getVisiblePath($node->getPath()), Files::TYPE_SHARE_DELETED, 'deleted_self', 'deleted_by');
$this->addNotificationsForFileAction($node, Files::TYPE_SHARE_DELETED, 'deleted_self', 'deleted_by');
}

/**
Expand All @@ -112,7 +110,7 @@ public function fileDelete(Node $node): void {
* @param Node $node The node that has been restored
*/
public function fileRestore(Node $node): void {
$this->addNotificationsForFileAction($this->getVisiblePath($node->getPath()), Files::TYPE_SHARE_RESTORED, 'restored_self', 'restored_by');
$this->addNotificationsForFileAction($node, Files::TYPE_SHARE_RESTORED, 'restored_self', 'restored_by');
}

private function getFileChangeActivitySettings(int $fileId, array $users, string $type = Files::TYPE_FILE_CHANGED): array {
Expand All @@ -133,20 +131,20 @@ private function getFileChangeActivitySettings(int $fileId, array $users, string
}

/**
* Creates the entries for file actions on $file_path
* Creates the entries for file actions on $node
*
* @param string $filePath The file that is being changed
* @param Node $node The node that is being changed
* @param string $activityType The activity type
* @param string $subject The subject for the actor
* @param string $subjectBy The subject for other users (with "by $actor")
*/
protected function addNotificationsForFileAction($filePath, $activityType, $subject, $subjectBy) {
protected function addNotificationsForFileAction(Node $node, string $activityType, string $subject, string $subjectBy): void {
// Do not add activities for .part-files
if (str_ends_with($filePath, '.part')) {
if (str_ends_with($node->getName(), '.part')) {
return;
}

[$filePath, $uidOwner, $fileId] = $this->getSourcePathAndOwner($filePath);
[$filePath, $uidOwner, $fileId] = $this->getSourcePathAndOwner($node);
if ($fileId === 0) {
// Could not find the file for the owner ...
return;
Expand Down Expand Up @@ -278,7 +276,7 @@ public function fileMove(Node $source, Node $target): void {
}

try {
[$this->oldParentPath, $this->oldParentOwner, $this->oldParentId] = $this->getSourcePathAndOwner($oldDir);
[$this->oldParentPath, $this->oldParentOwner, $this->oldParentId] = $this->getSourcePathAndOwner($source->getParent());
if ($this->oldParentId === 0) {
// Could not find the file for the owner ...
$this->moveCase = false;
Expand All @@ -289,7 +287,7 @@ public function fileMove(Node $source, Node $target): void {

// file can be shared using GroupFolders, including ACL check
if ($this->config->getSystemValueBool('activity_use_cached_mountpoints', false)) {
[, , $oldFileId] = $this->getSourcePathAndOwner($oldPath);
[, , $oldFileId] = $this->getSourcePathAndOwner($source);
$oldAccessList['users'] = array_merge($oldAccessList['users'], $this->getAffectedUsersFromCachedMounts($oldFileId));
}

Expand All @@ -315,17 +313,14 @@ public function fileMovePost(Node $source, Node $target): void {
return;
}

$oldPath = $this->getVisiblePath($source->getPath());
$newPath = $this->getVisiblePath($target->getPath());

switch ($this->moveCase) {
case 'rename':
$this->fileRenaming($oldPath, $newPath);
$this->fileRenaming($source, $target);
break;
case 'moveUp':
case 'moveDown':
case 'moveCross':
$this->fileMoving($oldPath, $newPath);
$this->fileMoving($source, $target);
break;
}

Expand All @@ -335,16 +330,17 @@ public function fileMovePost(Node $source, Node $target): void {
/**
* Renaming a file inside the same folder (a/b to a/c)
*
* @param string $oldPath
* @param string $newPath
* @param Node $source The node at its old location
* @param Node $target The node that has been renamed
*/
protected function fileRenaming($oldPath, $newPath) {
$dirName = dirname($newPath);
$fileName = basename($newPath);
$oldFileName = basename($oldPath);
protected function fileRenaming(Node $source, Node $target): void {
$oldPath = $this->getVisiblePath($source->getPath());
$newPath = $this->getVisiblePath($target->getPath());
$fileName = $target->getName();
$oldFileName = $source->getName();

[, , $fileId] = $this->getSourcePathAndOwner($newPath);
[$parentPath, $parentOwner, $parentId] = $this->getSourcePathAndOwner($dirName);
[, , $fileId] = $this->getSourcePathAndOwner($target);
[$parentPath, $parentOwner, $parentId] = $this->getSourcePathAndOwner($target->getParent());
if ($fileId === 0 || $parentId === 0) {
// Could not find the file for the owner ...
return;
Expand Down Expand Up @@ -399,22 +395,23 @@ protected function fileRenaming($oldPath, $newPath) {
/**
* Moving a file from one folder to another
*
* @param string $oldPath
* @param string $newPath
* @param Node $source The node at its old location
* @param Node $target The node that has been moved
*/
protected function fileMoving($oldPath, $newPath) {
protected function fileMoving(Node $source, Node $target): void {
if (!is_array($this->oldAccessList)) {
// fileMove() could not collect the old access list, so there is no
// base to compute the activities from
return;
}

$dirName = dirname($newPath);
$fileName = basename($newPath);
$oldFileName = basename($oldPath);
$oldPath = $this->getVisiblePath($source->getPath());
$newPath = $this->getVisiblePath($target->getPath());
$fileName = $target->getName();
$oldFileName = $source->getName();

[, , $fileId] = $this->getSourcePathAndOwner($newPath);
[$parentPath, $parentOwner, $parentId] = $this->getSourcePathAndOwner($dirName);
[, , $fileId] = $this->getSourcePathAndOwner($target);
[$parentPath, $parentOwner, $parentId] = $this->getSourcePathAndOwner($target->getParent());
if ($fileId === 0 || $parentId === 0) {
// Could not find the file for the owner ...
return;
Expand Down Expand Up @@ -642,45 +639,34 @@ protected function getVisiblePath(string $absolutePath): string {
}

/**
* Return the source
* Return the path relative to the owner's files folder, the owner and the file id of a node
*
* @param string $path
* The file id is 0 when the node does not exist.
*
* @return array{0: string, 1: string, 2: int}
* @throws NotFoundException
*/
protected function getSourcePathAndOwner($path): array {
$view = Filesystem::getView();
protected function getSourcePathAndOwner(Node $node): array {
try {
$owner = $view->getOwner($path);
$owner = $owner === '' ? null : $owner;
$owner = $node->getOwner()?->getUID();
$fileId = $node->getId();
} catch (NotFoundException) {
$owner = null;
$fileId = 0;
}
$fileId = 0;
$currentUser = $this->currentUser->getUID();

if ($owner === null || $owner !== $currentUser) {
/** @var \OCP\Files\Storage\IStorage $storage */
[$storage,] = $view->resolvePath($path);

if ($owner !== null && !$storage->instanceOfStorage(\OCA\Files_Sharing\External\Storage::class)) {
Filesystem::initMountPoints($owner);
} else {
// Probably a remote user, let's try to at least generate activities
// for the current user
if ($currentUser === null) {
[, $owner,] = explode('/', $view->getAbsolutePath($path), 3);
} else {
$owner = $currentUser;
}
}
if ($owner === null || $node->getStorage()->instanceOfStorage(\OCA\Files_Sharing\External\Storage::class)) {
// Probably a remote user, let's try to at least generate activities
// for the current user
[, $owner,] = explode('/', $node->getPath(), 3);
$owner = $this->currentUser->getUID() ?? $owner;
}

$info = Filesystem::getFileInfo($path);
if ($info !== false) {
$fileId = (int)$info['fileid'];
$path = $this->getOwnerPathById($owner, $fileId);
if ($fileId === 0) {
return [$this->getVisiblePath($node->getPath()), $owner, 0];
}

return [$path, $owner, $fileId];
return [$this->getOwnerPathById($owner, $fileId), $owner, $fileId];
}

/**
Expand Down
1 change: 0 additions & 1 deletion psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<stubs>
<file name="tests/stubs/oc_core_command_base.php" preloadClasses="true" />
<file name="tests/stubs/oc_files.php" preloadClasses="true" />
<file name="tests/stubs/oc_hooks_emitter.php" />
<file name="tests/stubs/oca_files_event.php" preloadClasses="true" />
<file name="tests/stubs/oca_files_sharing.php" preloadClasses="true" />
<file name="tests/stubs/oca_files_trashbin_events.php" preloadClasses="true" />
Expand Down
Loading
Loading