nextcloud / server

lib/public/Files/Folder.php

Indentation +203 added lines, -203 removed lines

@@ -16,207 +16,207 @@
  * @since 6.0.0
  */
 interface Folder extends Node {
-	/**
-	 * Get the full path of an item in the folder within owncloud's filesystem
-	 *
-	 * @param string $path relative path of an item in the folder
-	 * @return string
-	 * @throws \OCP\Files\NotPermittedException
-	 * @since 6.0.0
-	 */
-	public function getFullPath($path);
-
-	/**
-	 * Get the path of an item in the folder relative to the folder
-	 *
-	 * @param string $path absolute path of an item in the folder
-	 * @throws \OCP\Files\NotFoundException
-	 * @return string|null
-	 * @since 6.0.0
-	 */
-	public function getRelativePath($path);
-
-	/**
-	 * check if a node is a (grand-)child of the folder
-	 *
-	 * @param \OCP\Files\Node $node
-	 * @return bool
-	 * @since 6.0.0
-	 */
-	public function isSubNode($node);
-
-	/**
-	 * get the content of this directory
-	 *
-	 * @throws \OCP\Files\NotFoundException
-	 * @return \OCP\Files\Node[]
-	 * @since 6.0.0
-	 */
-	public function getDirectoryListing();
-
-	/**
-	 * Get the node at $path
-	 *
-	 * @param string $path relative path of the file or folder
-	 * @return \OCP\Files\Node
-	 * @throws \OCP\Files\NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 * @since 6.0.0
-	 */
-	public function get($path);
-
-	/**
-	 * Get or create new folder if the folder does not already exist.
-	 *
-	 * @param string $path relative path of the file or folder
-	 * @throw \OCP\Files\NotPermittedException
-	 * @since 33.0.0
-	 */
-	public function getOrCreateFolder(string $path, int $maxRetries = 5): Folder;
-
-	/**
-	 * Check if a file or folder exists in the folder
-	 *
-	 * @param string $path relative path of the file or folder
-	 * @return bool
-	 * @since 6.0.0
-	 */
-	public function nodeExists($path);
-
-	/**
-	 * Create a new folder
-	 *
-	 * @param string $path relative path of the new folder
-	 * @return \OCP\Files\Folder
-	 * @throws \OCP\Files\NotPermittedException
-	 * @since 6.0.0
-	 */
-	public function newFolder($path);
-
-	/**
-	 * Create a new file
-	 *
-	 * @param string $path relative path of the new file
-	 * @param string|resource|null $content content for the new file, since 19.0.0
-	 * @return \OCP\Files\File
-	 * @throws \OCP\Files\NotPermittedException
-	 * @since 6.0.0
-	 */
-	public function newFile($path, $content = null);
-
-	/**
-	 * search for files with the name matching $query
-	 *
-	 * @param string|ISearchQuery $query
-	 * @return \OCP\Files\Node[]
-	 * @since 6.0.0
-	 */
-	public function search($query);
-
-	/**
-	 * search for files by mimetype
-	 * $mimetype can either be a full mimetype (image/png) or a wildcard mimetype (image)
-	 *
-	 * @param string $mimetype
-	 * @return \OCP\Files\Node[]
-	 * @since 6.0.0
-	 */
-	public function searchByMime($mimetype);
-
-	/**
-	 * search for files by tag
-	 *
-	 * @param string|int $tag tag name or tag id
-	 * @param string $userId owner of the tags
-	 * @return \OCP\Files\Node[]
-	 * @since 8.0.0
-	 */
-	public function searchByTag($tag, $userId);
-
-	/**
-	 * search for files by system tag
-	 *
-	 * @param string|int $tag tag name
-	 * @param string $userId user id to ensure access on returned nodes
-	 * @return \OCP\Files\Node[]
-	 * @since 28.0.0
-	 */
-	public function searchBySystemTag(string $tagName, string $userId, int $limit = 0, int $offset = 0);
-
-	/**
-	 * get a file or folder inside the folder by its internal id
-	 *
-	 * This method could return multiple entries. For example once the file/folder
-	 * is shared or mounted (files_external) to the user multiple times.
-	 *
-	 * Note that the different entries can have different permissions.
-	 *
-	 * @param int $id
-	 * @return \OCP\Files\Node[]
-	 * @since 6.0.0
-	 */
-	public function getById($id);
-
-	/**
-	 * get a file or folder inside the folder by its internal id
-	 *
-	 * Unlike getById, this method only returns a single node even if the user has
-	 * access to the file with the requested id multiple times.
-	 *
-	 * This method provides no guarantee about which of the nodes in returned and the
-	 * returned node might, for example, have less permissions than other nodes for the same file
-	 *
-	 * Apps that require accurate information about the users access to the file should use getById
-	 * instead of pick the correct node out of the result.
-	 *
-	 * @param int $id
-	 * @return Node|null
-	 * @since 29.0.0
-	 */
-	public function getFirstNodeById(int $id): ?Node;
-
-	/**
-	 * Get the amount of free space inside the folder
-	 *
-	 * @return int
-	 * @since 6.0.0
-	 */
-	public function getFreeSpace();
-
-	/**
-	 * Check if new files or folders can be created within the folder
-	 *
-	 * @return bool
-	 * @since 6.0.0
-	 */
-	public function isCreatable();
-
-	/**
-	 * Add a suffix to the name in case the file exists
-	 *
-	 * @param string $filename
-	 * @return string
-	 * @throws NotPermittedException
-	 * @since 8.1.0
-	 */
-	public function getNonExistingName($filename);
-
-	/**
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \OCP\Files\Node[]
-	 * @since 9.1.0
-	 */
-	public function getRecent($limit, $offset = 0);
-
-	/**
-	 * Verify if the given path is valid and allowed from this folder.
-	 *
-	 * @param string $path the path from this folder
-	 * @param string $fileName
-	 * @param bool $readonly Check only if the path is allowed for read-only access
-	 * @throws InvalidPathException
-	 * @since 32.0.0
-	 */
-	public function verifyPath($fileName, $readonly = false): void;
+    /**
+     * Get the full path of an item in the folder within owncloud's filesystem
+     *
+     * @param string $path relative path of an item in the folder
+     * @return string
+     * @throws \OCP\Files\NotPermittedException
+     * @since 6.0.0
+     */
+    public function getFullPath($path);
+
+    /**
+     * Get the path of an item in the folder relative to the folder
+     *
+     * @param string $path absolute path of an item in the folder
+     * @throws \OCP\Files\NotFoundException
+     * @return string|null
+     * @since 6.0.0
+     */
+    public function getRelativePath($path);
+
+    /**
+     * check if a node is a (grand-)child of the folder
+     *
+     * @param \OCP\Files\Node $node
+     * @return bool
+     * @since 6.0.0
+     */
+    public function isSubNode($node);
+
+    /**
+     * get the content of this directory
+     *
+     * @throws \OCP\Files\NotFoundException
+     * @return \OCP\Files\Node[]
+     * @since 6.0.0
+     */
+    public function getDirectoryListing();
+
+    /**
+     * Get the node at $path
+     *
+     * @param string $path relative path of the file or folder
+     * @return \OCP\Files\Node
+     * @throws \OCP\Files\NotFoundException
+     * @throws \OCP\Files\NotPermittedException
+     * @since 6.0.0
+     */
+    public function get($path);
+
+    /**
+     * Get or create new folder if the folder does not already exist.
+     *
+     * @param string $path relative path of the file or folder
+     * @throw \OCP\Files\NotPermittedException
+     * @since 33.0.0
+     */
+    public function getOrCreateFolder(string $path, int $maxRetries = 5): Folder;
+
+    /**
+     * Check if a file or folder exists in the folder
+     *
+     * @param string $path relative path of the file or folder
+     * @return bool
+     * @since 6.0.0
+     */
+    public function nodeExists($path);
+
+    /**
+     * Create a new folder
+     *
+     * @param string $path relative path of the new folder
+     * @return \OCP\Files\Folder
+     * @throws \OCP\Files\NotPermittedException
+     * @since 6.0.0
+     */
+    public function newFolder($path);
+
+    /**
+     * Create a new file
+     *
+     * @param string $path relative path of the new file
+     * @param string|resource|null $content content for the new file, since 19.0.0
+     * @return \OCP\Files\File
+     * @throws \OCP\Files\NotPermittedException
+     * @since 6.0.0
+     */
+    public function newFile($path, $content = null);
+
+    /**
+     * search for files with the name matching $query
+     *
+     * @param string|ISearchQuery $query
+     * @return \OCP\Files\Node[]
+     * @since 6.0.0
+     */
+    public function search($query);
+
+    /**
+     * search for files by mimetype
+     * $mimetype can either be a full mimetype (image/png) or a wildcard mimetype (image)
+     *
+     * @param string $mimetype
+     * @return \OCP\Files\Node[]
+     * @since 6.0.0
+     */
+    public function searchByMime($mimetype);
+
+    /**
+     * search for files by tag
+     *
+     * @param string|int $tag tag name or tag id
+     * @param string $userId owner of the tags
+     * @return \OCP\Files\Node[]
+     * @since 8.0.0
+     */
+    public function searchByTag($tag, $userId);
+
+    /**
+     * search for files by system tag
+     *
+     * @param string|int $tag tag name
+     * @param string $userId user id to ensure access on returned nodes
+     * @return \OCP\Files\Node[]
+     * @since 28.0.0
+     */
+    public function searchBySystemTag(string $tagName, string $userId, int $limit = 0, int $offset = 0);
+
+    /**
+     * get a file or folder inside the folder by its internal id
+     *
+     * This method could return multiple entries. For example once the file/folder
+     * is shared or mounted (files_external) to the user multiple times.
+     *
+     * Note that the different entries can have different permissions.
+     *
+     * @param int $id
+     * @return \OCP\Files\Node[]
+     * @since 6.0.0
+     */
+    public function getById($id);
+
+    /**
+     * get a file or folder inside the folder by its internal id
+     *
+     * Unlike getById, this method only returns a single node even if the user has
+     * access to the file with the requested id multiple times.
+     *
+     * This method provides no guarantee about which of the nodes in returned and the
+     * returned node might, for example, have less permissions than other nodes for the same file
+     *
+     * Apps that require accurate information about the users access to the file should use getById
+     * instead of pick the correct node out of the result.
+     *
+     * @param int $id
+     * @return Node|null
+     * @since 29.0.0
+     */
+    public function getFirstNodeById(int $id): ?Node;
+
+    /**
+     * Get the amount of free space inside the folder
+     *
+     * @return int
+     * @since 6.0.0
+     */
+    public function getFreeSpace();
+
+    /**
+     * Check if new files or folders can be created within the folder
+     *
+     * @return bool
+     * @since 6.0.0
+     */
+    public function isCreatable();
+
+    /**
+     * Add a suffix to the name in case the file exists
+     *
+     * @param string $filename
+     * @return string
+     * @throws NotPermittedException
+     * @since 8.1.0
+     */
+    public function getNonExistingName($filename);
+
+    /**
+     * @param int $limit
+     * @param int $offset
+     * @return \OCP\Files\Node[]
+     * @since 9.1.0
+     */
+    public function getRecent($limit, $offset = 0);
+
+    /**
+     * Verify if the given path is valid and allowed from this folder.
+     *
+     * @param string $path the path from this folder
+     * @param string $fileName
+     * @param bool $readonly Check only if the path is allowed for read-only access
+     * @throws InvalidPathException
+     * @since 32.0.0
+     */
+    public function verifyPath($fileName, $readonly = false): void;
 }

lib/public/Files.php

Indentation +99 added lines, -99 removed lines

@@ -19,111 +19,111 @@
  * @deprecated 14.0.0
  */
 class Files {
-	/**
-	 * Recursive deletion of folders
-	 *
-	 * @param string $dir path to the folder
-	 * @param bool $deleteSelf if set to false only the content of the folder will be deleted
-	 * @return bool
-	 * @since 5.0.0
-	 * @since 32.0.0 added the $deleteSelf parameter
-	 * @deprecated 14.0.0
-	 */
-	public static function rmdirr($dir, bool $deleteSelf = true) {
-		if (is_dir($dir)) {
-			$files = new \RecursiveIteratorIterator(
-				new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
-				\RecursiveIteratorIterator::CHILD_FIRST
-			);
+    /**
+     * Recursive deletion of folders
+     *
+     * @param string $dir path to the folder
+     * @param bool $deleteSelf if set to false only the content of the folder will be deleted
+     * @return bool
+     * @since 5.0.0
+     * @since 32.0.0 added the $deleteSelf parameter
+     * @deprecated 14.0.0
+     */
+    public static function rmdirr($dir, bool $deleteSelf = true) {
+        if (is_dir($dir)) {
+            $files = new \RecursiveIteratorIterator(
+                new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
+                \RecursiveIteratorIterator::CHILD_FIRST
+            );
 
-			foreach ($files as $fileInfo) {
-				/** @var \SplFileInfo $fileInfo */
-				if ($fileInfo->isLink()) {
-					unlink($fileInfo->getPathname());
-				} elseif ($fileInfo->isDir()) {
-					rmdir($fileInfo->getRealPath());
-				} else {
-					unlink($fileInfo->getRealPath());
-				}
-			}
-			if ($deleteSelf) {
-				rmdir($dir);
-			}
-		} elseif (file_exists($dir)) {
-			if ($deleteSelf) {
-				unlink($dir);
-			}
-		}
-		if (!$deleteSelf) {
-			return true;
-		}
+            foreach ($files as $fileInfo) {
+                /** @var \SplFileInfo $fileInfo */
+                if ($fileInfo->isLink()) {
+                    unlink($fileInfo->getPathname());
+                } elseif ($fileInfo->isDir()) {
+                    rmdir($fileInfo->getRealPath());
+                } else {
+                    unlink($fileInfo->getRealPath());
+                }
+            }
+            if ($deleteSelf) {
+                rmdir($dir);
+            }
+        } elseif (file_exists($dir)) {
+            if ($deleteSelf) {
+                unlink($dir);
+            }
+        }
+        if (!$deleteSelf) {
+            return true;
+        }
 
-		return !file_exists($dir);
-	}
+        return !file_exists($dir);
+    }
 
-	/**
-	 * Get the mimetype form a local file
-	 * @param string $path
-	 * @return string
-	 *                does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
-	 * @since 5.0.0
-	 * @deprecated 14.0.0
-	 */
-	public static function getMimeType($path) {
-		return Server::get(IMimeTypeDetector::class)->detect($path);
-	}
+    /**
+     * Get the mimetype form a local file
+     * @param string $path
+     * @return string
+     *                does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
+     * @since 5.0.0
+     * @deprecated 14.0.0
+     */
+    public static function getMimeType($path) {
+        return Server::get(IMimeTypeDetector::class)->detect($path);
+    }
 
-	/**
-	 * Search for files by mimetype
-	 * @param string $mimetype
-	 * @return array
-	 * @since 6.0.0
-	 * @deprecated 14.0.0
-	 */
-	public static function searchByMime($mimetype) {
-		return \OC\Files\Filesystem::searchByMime($mimetype);
-	}
+    /**
+     * Search for files by mimetype
+     * @param string $mimetype
+     * @return array
+     * @since 6.0.0
+     * @deprecated 14.0.0
+     */
+    public static function searchByMime($mimetype) {
+        return \OC\Files\Filesystem::searchByMime($mimetype);
+    }
 
-	/**
-	 * Copy the contents of one stream to another
-	 *
-	 * @template T of null|true
-	 * @param resource $source
-	 * @param resource $target
-	 * @param T $includeResult
-	 * @return int|array
-	 * @psalm-return (T is true ? array{0: int, 1: bool} : int)
-	 * @since 5.0.0
-	 * @since 32.0.0 added $includeResult parameter
-	 * @deprecated 14.0.0
-	 */
-	public static function streamCopy($source, $target, ?bool $includeResult = null) {
-		if (!$source || !$target) {
-			return $includeResult ? [0, false] : 0;
-		}
+    /**
+     * Copy the contents of one stream to another
+     *
+     * @template T of null|true
+     * @param resource $source
+     * @param resource $target
+     * @param T $includeResult
+     * @return int|array
+     * @psalm-return (T is true ? array{0: int, 1: bool} : int)
+     * @since 5.0.0
+     * @since 32.0.0 added $includeResult parameter
+     * @deprecated 14.0.0
+     */
+    public static function streamCopy($source, $target, ?bool $includeResult = null) {
+        if (!$source || !$target) {
+            return $includeResult ? [0, false] : 0;
+        }
 
-		$bufSize = 8192;
-		$count = 0;
-		$result = true;
-		while (!feof($source)) {
-			$buf = fread($source, $bufSize);
-			if ($buf === false) {
-				$result = false;
-				break;
-			}
+        $bufSize = 8192;
+        $count = 0;
+        $result = true;
+        while (!feof($source)) {
+            $buf = fread($source, $bufSize);
+            if ($buf === false) {
+                $result = false;
+                break;
+            }
 
-			$bytesWritten = fwrite($target, $buf);
-			if ($bytesWritten !== false) {
-				$count += $bytesWritten;
-			}
+            $bytesWritten = fwrite($target, $buf);
+            if ($bytesWritten !== false) {
+                $count += $bytesWritten;
+            }
 
-			if ($bytesWritten === false
-				|| ($bytesWritten < $bufSize && $bytesWritten < strlen($buf))
-			) {
-				$result = false;
-				break;
-			}
-		}
-		return $includeResult ? [$count, $result] : $count;
-	}
+            if ($bytesWritten === false
+                || ($bytesWritten < $bufSize && $bytesWritten < strlen($buf))
+            ) {
+                $result = false;
+                break;
+            }
+        }
+        return $includeResult ? [$count, $result] : $count;
+    }
 }

lib/public/Share/IManager.php

Indentation +487 added lines, -487 removed lines

@@ -23,491 +23,491 @@
  */
 #[Consumable(since: '9.0.0')]
 interface IManager {
-	/**
-	 * Create a Share
-	 *
-	 * @throws \Exception
-	 * @since 9.0.0
-	 */
-	public function createShare(IShare $share): IShare;
-
-	/**
-	 * Update a share.
-	 * The target of the share can't be changed this way: use moveShare
-	 * The share can't be removed this way (permission 0): use deleteShare
-	 * The state can't be changed this way: use acceptShare
-	 *
-	 * @param bool $onlyValid Only updates valid shares, invalid shares will be deleted automatically and are not updated
-	 * @throws \InvalidArgumentException
-	 * @since 9.0.0
-	 */
-	public function updateShare(IShare $share, bool $onlyValid = true): IShare;
-
-	/**
-	 * Accept a share.
-	 *
-	 * @throws \InvalidArgumentException
-	 * @since 18.0.0
-	 */
-	public function acceptShare(IShare $share, string $recipientId): IShare;
-
-	/**
-	 * Delete a share
-	 *
-	 * @throws ShareNotFound
-	 * @throws \InvalidArgumentException
-	 * @since 9.0.0
-	 */
-	public function deleteShare(IShare $share): void;
-
-	/**
-	 * Unshare a file as the recipient.
-	 * This can be different from a regular delete for example when one of
-	 * the users in a groups deletes that share. But the provider should
-	 * handle this.
-	 *
-	 * @since 9.0.0
-	 */
-	public function deleteFromSelf(IShare $share, string $recipientId): void;
-
-	/**
-	 * Restore the share when it has been deleted
-	 * Certain share types can be restored when they have been deleted
-	 * but the provider should properly handle this\
-	 *
-	 * @param IShare $share The share to restore
-	 * @param string $recipientId The user to restore the share for
-	 * @return IShare The restored share object
-	 * @throws GenericShareException In case restoring the share failed
-	 *
-	 * @since 14.0.0
-	 */
-	public function restoreShare(IShare $share, string $recipientId): IShare;
-
-	/**
-	 * Move the share as a recipient of the share.
-	 * This is updating the share target. So where the recipient has the share mounted.
-	 *
-	 * @throws \InvalidArgumentException If $share is a link share or the $recipient does not match
-	 * @since 9.0.0
-	 */
-	public function moveShare(IShare $share, string $recipientId): IShare;
-
-	/**
-	 * Get all shares shared by (initiated) by the provided user in a folder.
-	 *
-	 * @param string $userId
-	 * @param Folder $node
-	 * @param bool $reshares
-	 * @param bool $shallow Whether the method should stop at the first level, or look into sub-folders.
-	 * @return array<int, list<IShare>> [$fileId => IShare[], ...]
-	 * @since 11.0.0
-	 */
-	public function getSharesInFolder(string $userId, Folder $node, bool $reshares = false, bool $shallow = true): array;
-
-	/**
-	 * Get shares shared by (initiated) by the provided user.
-	 *
-	 * @param string $userId
-	 * @param IShare::TYPE_* $shareType
-	 * @param Node|null $path
-	 * @param bool $reshares
-	 * @param int $limit The maximum number of returned results, -1 for all results
-	 * @param int $offset
-	 * @param bool $onlyValid Only returns valid shares, invalid shares will be deleted automatically and are not returned
-	 * @return IShare[]
-	 * @since 9.0.0
-	 */
-	public function getSharesBy(string $userId, int $shareType, ?Node $path = null, bool $reshares = false, int $limit = 50, int $offset = 0, bool $onlyValid = true): array;
-
-	/**
-	 * Get shares shared with $user.
-	 * Filter by $node if provided
-	 *
-	 * @param string $userId
-	 * @param IShare::TYPE_* $shareType
-	 * @param Node|null $node
-	 * @param int $limit The maximum number of shares returned, -1 for all
-	 * @param int $offset
-	 * @return IShare[]
-	 * @since 9.0.0
-	 */
-	public function getSharedWith(string $userId, int $shareType, ?Node $node = null, int $limit = 50, int $offset = 0): array;
-
-	/**
-	 * Get deleted shares shared with $user.
-	 * Filter by $node if provided
-	 *
-	 * @param IShare::TYPE_* $shareType
-	 * @param int $limit The maximum number of shares returned, -1 for all
-	 * @return IShare[]
-	 * @since 14.0.0
-	 */
-	public function getDeletedSharedWith(string $userId, int $shareType, ?Node $node = null, int $limit = 50, int $offset = 0): array;
-
-	/**
-	 * Retrieve a share by the share id.
-	 * If the recipient is set make sure to retrieve the file for that user.
-	 * This makes sure that if a user has moved/deleted a group share this
-	 * is reflected.
-	 *
-	 * @param string|null $recipient userID of the recipient
-	 * @param bool $onlyValid Only returns valid shares, invalid shares will be deleted automatically and are not returned
-	 * @throws ShareNotFound
-	 * @since 9.0.0
-	 */
-	public function getShareById(string $id, ?string $recipient = null, bool $onlyValid = true): IShare;
-
-	/**
-	 * Get the share by token possible with password
-	 *
-	 * @throws ShareNotFound
-	 * @since 9.0.0
-	 */
-	public function getShareByToken(string $token): IShare;
-
-	/**
-	 * Verify the password of a public share
-	 *
-	 * @since 9.0.0
-	 */
-	public function checkPassword(IShare $share, ?string $password): bool;
-
-	/**
-	 * The user with UID is deleted.
-	 * All share providers have to cleanup the shares with this user as well
-	 * as shares owned by this user.
-	 * Shares only initiated by this user are fine.
-	 *
-	 * @since 9.1.0
-	 */
-	public function userDeleted(string $uid): void;
-
-	/**
-	 * The group with $gid is deleted
-	 * We need to clear up all shares to this group
-	 *
-	 * @since 9.1.0
-	 */
-	public function groupDeleted(string $gid): void;
-
-	/**
-	 * The user $uid is deleted from the group $gid
-	 * All user specific group shares have to be removed
-	 *
-	 * @since 9.1.0
-	 */
-	public function userDeletedFromGroup(string $uid, string $gid): void;
-
-	/**
-	 * Get access list to a path. This means
-	 * all the users that can access a given path.
-	 *
-	 * Consider:
-	 * -root
-	 * |-folder1 (23)
-	 *  |-folder2 (32)
-	 *   |-fileA (42)
-	 *
-	 * fileA is shared with user1 and user1@server1 and email1@maildomain1
-	 * folder2 is shared with group2 (user4 is a member of group2)
-	 * folder1 is shared with user2 (renamed to "folder (1)") and user2@server2
-	 *                        and email2@maildomain2
-	 *
-	 * Then the access list to '/folder1/folder2/fileA' with $currentAccess is:
-	 * [
-	 *  users  => [
-	 *      'user1' => ['node_id' => 42, 'node_path' => '/fileA'],
-	 *      'user4' => ['node_id' => 32, 'node_path' => '/folder2'],
-	 *      'user2' => ['node_id' => 23, 'node_path' => '/folder (1)'],
-	 *  ],
-	 *  remote => [
-	 *      'user1@server1' => ['node_id' => 42, 'token' => 'SeCr3t'],
-	 *      'user2@server2' => ['node_id' => 23, 'token' => 'FooBaR'],
-	 *  ],
-	 *  public => bool
-	 *  mail => [
-	 *      'email1@maildomain1' => ['node_id' => 42, 'token' => 'aBcDeFg'],
-	 *      'email2@maildomain2' => ['node_id' => 23, 'token' => 'hIjKlMn'],
-	 *  ]
-	 *
-	 * The access list to '/folder1/folder2/fileA' **without** $currentAccess is:
-	 * [
-	 *  users  => ['user1', 'user2', 'user4'],
-	 *  remote => bool,
-	 *  public => bool
-	 *  mail => ['email1@maildomain1', 'email2@maildomain2']
-	 * ]
-	 *
-	 * This is required for encryption/activity
-	 *
-	 * @param bool $recursive Should we check all parent folders as well
-	 * @param bool $currentAccess Should the user have currently access to the file
-	 * @return ($currentAccess is true
-	 * 		? array{
-	 *     		users?: array<string, array{node_id: int, node_path: string}>,
-	 *     		remote?: array<string, array{node_id: int, node_path: string}>,
-	 *     		public?: bool,
-	 *     		mail?: array<string, array{node_id: int, node_path: string}>
-	 *     	}
-	 *      : array{users?: list<string>, remote?: bool, public?: bool, mail?: list<string>})
-	 * @since 12.0.0
-	 */
-	public function getAccessList(Node $path, bool $recursive = true, bool $currentAccess = false): array;
-
-	/**
-	 * Instantiates a new share object. This is to be passed to
-	 * createShare.
-	 *
-	 * @since 9.0.0
-	 */
-	public function newShare(): IShare;
-
-	/**
-	 * Is the share API enabled
-	 *
-	 * @since 9.0.0
-	 */
-	public function shareApiEnabled(): bool;
-
-	/**
-	 * Is public link sharing enabled
-	 *
-	 * @param ?IUser $user User to check against group exclusions, defaults to current session user
-	 * @return bool
-	 * @since 9.0.0
-	 * @since 33.0.0 Added optional $user parameter
-	 */
-	public function shareApiAllowLinks(): bool;
-
-	/**
-	 * Is password on public link required
-	 *
-	 * @param bool $checkGroupMembership Check group membership exclusion
-	 * @since 9.0.0
-	 * @since 24.0.0 Added optional $checkGroupMembership parameter
-	 */
-	public function shareApiLinkEnforcePassword(bool $checkGroupMembership = true): bool;
-
-	/**
-	 * Is default expire date enabled
-	 *
-	 * @since 9.0.0
-	 */
-	public function shareApiLinkDefaultExpireDate(): bool;
-
-	/**
-	 * Is default expire date enforced
-	 *`
-	 * @since 9.0.0
-	 */
-	public function shareApiLinkDefaultExpireDateEnforced(): bool;
-
-	/**
-	 * Number of default expire days
-	 *
-	 * @since 9.0.0
-	 */
-	public function shareApiLinkDefaultExpireDays(): int;
-
-	/**
-	 * Is default internal expire date enabled
-	 *
-	 * @since 22.0.0
-	 */
-	public function shareApiInternalDefaultExpireDate(): bool;
-
-	/**
-	 * Is default remote expire date enabled
-	 *
-	 * @since 22.0.0
-	 */
-	public function shareApiRemoteDefaultExpireDate(): bool;
-
-	/**
-	 * Is default expire date enforced
-	 *
-	 * @since 22.0.0
-	 */
-	public function shareApiInternalDefaultExpireDateEnforced(): bool;
-
-	/**
-	 * Is default expire date enforced for remote shares
-	 *
-	 * @since 22.0.0
-	 */
-	public function shareApiRemoteDefaultExpireDateEnforced(): bool;
-
-	/**
-	 * Number of default expire days
-	 *
-	 * @since 22.0.0
-	 */
-	public function shareApiInternalDefaultExpireDays(): int;
-
-	/**
-	 * Number of default expire days for remote shares
-	 *
-	 * @since 22.0.0
-	 */
-	public function shareApiRemoteDefaultExpireDays(): int;
-
-	/**
-	 * Allow public upload on link shares
-	 *
-	 * @since 9.0.0
-	 */
-	public function shareApiLinkAllowPublicUpload(): bool;
-
-	/**
-	 * Check if user can only share with group members.
-	 *
-	 * @since 9.0.0
-	 */
-	public function shareWithGroupMembersOnly(): bool;
-
-	/**
-	 * If shareWithGroupMembersOnly is enabled, return an optional
-	 * list of groups that must be excluded from the principle of
-	 * belonging to the same group.
-	 * @return array
-	 * @since 27.0.0
-	 */
-	public function shareWithGroupMembersOnlyExcludeGroupsList(): array;
-
-	/**
-	 * Check if users can share with groups
-	 *
-	 * @since 9.0.1
-	 */
-	public function allowGroupSharing(): bool;
-
-	/**
-	 * Check if user enumeration is allowed
-	 *
-	 * @since 19.0.0
-	 */
-	public function allowEnumeration(): bool;
-
-	/**
-	 * Check if user enumeration is limited to the users groups
-	 *
-	 * @since 19.0.0
-	 */
-	public function limitEnumerationToGroups(): bool;
-
-	/**
-	 * Check if user enumeration is limited to the phonebook matches
-	 *
-	 * @since 21.0.1
-	 */
-	public function limitEnumerationToPhone(): bool;
-
-	/**
-	 * Check if user enumeration is allowed to return also on full match
-	 * and ignore limitations to phonebook or groups.
-	 *
-	 * @since 21.0.1
-	 */
-	public function allowEnumerationFullMatch(): bool;
-
-	/**
-	 * When `allowEnumerationFullMatch` is enabled and `matchEmail` is set,
-	 * then also return results for full email matches.
-	 *
-	 * @since 25.0.0
-	 */
-	public function matchEmail(): bool;
-
-	/**
-	 * When `allowEnumerationFullMatch` is enabled and `matchUserId` is set,
-	 * then also return results for full user id matches.
-	 *
-	 * @since 33.0.0
-	 */
-	public function matchUserId(): bool;
-
-	/**
-	 * When `allowEnumerationFullMatch` is enabled and `ignoreSecondDisplayName` is set,
-	 * then the search should ignore matches on the second displayname and only use the first.
-	 *
-	 * @since 25.0.0
-	 */
-	public function ignoreSecondDisplayName(): bool;
-
-
-	/**
-	 * Check if custom tokens are allowed
-	 *
-	 * @since 31.0.0
-	 */
-	public function allowCustomTokens(): bool;
-
-	/**
-	 * Check if the current user can view the share
-	 * even if the download is disabled.
-	 *
-	 * @since 32.0.0
-	 */
-	public function allowViewWithoutDownload(): bool;
-
-	/**
-	 * Check if the current user can enumerate the target user
-	 *
-	 * @since 23.0.0
-	 */
-	public function currentUserCanEnumerateTargetUser(?IUser $currentUser, IUser $targetUser): bool;
-
-	/**
-	 * Check if sharing is disabled for the given user
-	 *
-	 * @since 9.0.0
-	 */
-	public function sharingDisabledForUser(?string $userId): bool;
-
-	/**
-	 * Check if outgoing server2server shares are allowed
-	 * @since 9.0.0
-	 */
-	public function outgoingServer2ServerSharesAllowed(): bool;
-
-	/**
-	 * Check if outgoing server2server shares are allowed
-	 * @since 14.0.0
-	 */
-	public function outgoingServer2ServerGroupSharesAllowed(): bool;
-
-
-	/**
-	 * Check if a given share provider exists
-	 * @param IShare::TYPE_* $shareType
-	 * @since 11.0.0
-	 */
-	public function shareProviderExists(int $shareType): bool;
-
-	/**
-	 * @param string $shareProviderClass
-	 * @since 21.0.0
-	 */
-	public function registerShareProvider(string $shareProviderClass): void;
-
-	/**
-	 * @Internal
-	 *
-	 * Get all the shares as iterable to reduce memory overhead
-	 * Note, since this opens up database cursors the iterable should
-	 * be fully iterated.
-	 *
-	 * @return iterable<IShare>
-	 * @since 18.0.0
-	 */
-	public function getAllShares(): iterable;
-
-	/**
-	 * Generate a unique share token
-	 *
-	 * @throws ShareTokenException Failed to generate a unique token
-	 * @since 31.0.0
-	 */
-	public function generateToken(): string;
+    /**
+     * Create a Share
+     *
+     * @throws \Exception
+     * @since 9.0.0
+     */
+    public function createShare(IShare $share): IShare;
+
+    /**
+     * Update a share.
+     * The target of the share can't be changed this way: use moveShare
+     * The share can't be removed this way (permission 0): use deleteShare
+     * The state can't be changed this way: use acceptShare
+     *
+     * @param bool $onlyValid Only updates valid shares, invalid shares will be deleted automatically and are not updated
+     * @throws \InvalidArgumentException
+     * @since 9.0.0
+     */
+    public function updateShare(IShare $share, bool $onlyValid = true): IShare;
+
+    /**
+     * Accept a share.
+     *
+     * @throws \InvalidArgumentException
+     * @since 18.0.0
+     */
+    public function acceptShare(IShare $share, string $recipientId): IShare;
+
+    /**
+     * Delete a share
+     *
+     * @throws ShareNotFound
+     * @throws \InvalidArgumentException
+     * @since 9.0.0
+     */
+    public function deleteShare(IShare $share): void;
+
+    /**
+     * Unshare a file as the recipient.
+     * This can be different from a regular delete for example when one of
+     * the users in a groups deletes that share. But the provider should
+     * handle this.
+     *
+     * @since 9.0.0
+     */
+    public function deleteFromSelf(IShare $share, string $recipientId): void;
+
+    /**
+     * Restore the share when it has been deleted
+     * Certain share types can be restored when they have been deleted
+     * but the provider should properly handle this\
+     *
+     * @param IShare $share The share to restore
+     * @param string $recipientId The user to restore the share for
+     * @return IShare The restored share object
+     * @throws GenericShareException In case restoring the share failed
+     *
+     * @since 14.0.0
+     */
+    public function restoreShare(IShare $share, string $recipientId): IShare;
+
+    /**
+     * Move the share as a recipient of the share.
+     * This is updating the share target. So where the recipient has the share mounted.
+     *
+     * @throws \InvalidArgumentException If $share is a link share or the $recipient does not match
+     * @since 9.0.0
+     */
+    public function moveShare(IShare $share, string $recipientId): IShare;
+
+    /**
+     * Get all shares shared by (initiated) by the provided user in a folder.
+     *
+     * @param string $userId
+     * @param Folder $node
+     * @param bool $reshares
+     * @param bool $shallow Whether the method should stop at the first level, or look into sub-folders.
+     * @return array<int, list<IShare>> [$fileId => IShare[], ...]
+     * @since 11.0.0
+     */
+    public function getSharesInFolder(string $userId, Folder $node, bool $reshares = false, bool $shallow = true): array;
+
+    /**
+     * Get shares shared by (initiated) by the provided user.
+     *
+     * @param string $userId
+     * @param IShare::TYPE_* $shareType
+     * @param Node|null $path
+     * @param bool $reshares
+     * @param int $limit The maximum number of returned results, -1 for all results
+     * @param int $offset
+     * @param bool $onlyValid Only returns valid shares, invalid shares will be deleted automatically and are not returned
+     * @return IShare[]
+     * @since 9.0.0
+     */
+    public function getSharesBy(string $userId, int $shareType, ?Node $path = null, bool $reshares = false, int $limit = 50, int $offset = 0, bool $onlyValid = true): array;
+
+    /**
+     * Get shares shared with $user.
+     * Filter by $node if provided
+     *
+     * @param string $userId
+     * @param IShare::TYPE_* $shareType
+     * @param Node|null $node
+     * @param int $limit The maximum number of shares returned, -1 for all
+     * @param int $offset
+     * @return IShare[]
+     * @since 9.0.0
+     */
+    public function getSharedWith(string $userId, int $shareType, ?Node $node = null, int $limit = 50, int $offset = 0): array;
+
+    /**
+     * Get deleted shares shared with $user.
+     * Filter by $node if provided
+     *
+     * @param IShare::TYPE_* $shareType
+     * @param int $limit The maximum number of shares returned, -1 for all
+     * @return IShare[]
+     * @since 14.0.0
+     */
+    public function getDeletedSharedWith(string $userId, int $shareType, ?Node $node = null, int $limit = 50, int $offset = 0): array;
+
+    /**
+     * Retrieve a share by the share id.
+     * If the recipient is set make sure to retrieve the file for that user.
+     * This makes sure that if a user has moved/deleted a group share this
+     * is reflected.
+     *
+     * @param string|null $recipient userID of the recipient
+     * @param bool $onlyValid Only returns valid shares, invalid shares will be deleted automatically and are not returned
+     * @throws ShareNotFound
+     * @since 9.0.0
+     */
+    public function getShareById(string $id, ?string $recipient = null, bool $onlyValid = true): IShare;
+
+    /**
+     * Get the share by token possible with password
+     *
+     * @throws ShareNotFound
+     * @since 9.0.0
+     */
+    public function getShareByToken(string $token): IShare;
+
+    /**
+     * Verify the password of a public share
+     *
+     * @since 9.0.0
+     */
+    public function checkPassword(IShare $share, ?string $password): bool;
+
+    /**
+     * The user with UID is deleted.
+     * All share providers have to cleanup the shares with this user as well
+     * as shares owned by this user.
+     * Shares only initiated by this user are fine.
+     *
+     * @since 9.1.0
+     */
+    public function userDeleted(string $uid): void;
+
+    /**
+     * The group with $gid is deleted
+     * We need to clear up all shares to this group
+     *
+     * @since 9.1.0
+     */
+    public function groupDeleted(string $gid): void;
+
+    /**
+     * The user $uid is deleted from the group $gid
+     * All user specific group shares have to be removed
+     *
+     * @since 9.1.0
+     */
+    public function userDeletedFromGroup(string $uid, string $gid): void;
+
+    /**
+     * Get access list to a path. This means
+     * all the users that can access a given path.
+     *
+     * Consider:
+     * -root
+     * |-folder1 (23)
+     *  |-folder2 (32)
+     *   |-fileA (42)
+     *
+     * fileA is shared with user1 and user1@server1 and email1@maildomain1
+     * folder2 is shared with group2 (user4 is a member of group2)
+     * folder1 is shared with user2 (renamed to "folder (1)") and user2@server2
+     *                        and email2@maildomain2
+     *
+     * Then the access list to '/folder1/folder2/fileA' with $currentAccess is:
+     * [
+     *  users  => [
+     *      'user1' => ['node_id' => 42, 'node_path' => '/fileA'],
+     *      'user4' => ['node_id' => 32, 'node_path' => '/folder2'],
+     *      'user2' => ['node_id' => 23, 'node_path' => '/folder (1)'],
+     *  ],
+     *  remote => [
+     *      'user1@server1' => ['node_id' => 42, 'token' => 'SeCr3t'],
+     *      'user2@server2' => ['node_id' => 23, 'token' => 'FooBaR'],
+     *  ],
+     *  public => bool
+     *  mail => [
+     *      'email1@maildomain1' => ['node_id' => 42, 'token' => 'aBcDeFg'],
+     *      'email2@maildomain2' => ['node_id' => 23, 'token' => 'hIjKlMn'],
+     *  ]
+     *
+     * The access list to '/folder1/folder2/fileA' **without** $currentAccess is:
+     * [
+     *  users  => ['user1', 'user2', 'user4'],
+     *  remote => bool,
+     *  public => bool
+     *  mail => ['email1@maildomain1', 'email2@maildomain2']
+     * ]
+     *
+     * This is required for encryption/activity
+     *
+     * @param bool $recursive Should we check all parent folders as well
+     * @param bool $currentAccess Should the user have currently access to the file
+     * @return ($currentAccess is true
+     * 		? array{
+     *     		users?: array<string, array{node_id: int, node_path: string}>,
+     *     		remote?: array<string, array{node_id: int, node_path: string}>,
+     *     		public?: bool,
+     *     		mail?: array<string, array{node_id: int, node_path: string}>
+     *     	}
+     *      : array{users?: list<string>, remote?: bool, public?: bool, mail?: list<string>})
+     * @since 12.0.0
+     */
+    public function getAccessList(Node $path, bool $recursive = true, bool $currentAccess = false): array;
+
+    /**
+     * Instantiates a new share object. This is to be passed to
+     * createShare.
+     *
+     * @since 9.0.0
+     */
+    public function newShare(): IShare;
+
+    /**
+     * Is the share API enabled
+     *
+     * @since 9.0.0
+     */
+    public function shareApiEnabled(): bool;
+
+    /**
+     * Is public link sharing enabled
+     *
+     * @param ?IUser $user User to check against group exclusions, defaults to current session user
+     * @return bool
+     * @since 9.0.0
+     * @since 33.0.0 Added optional $user parameter
+     */
+    public function shareApiAllowLinks(): bool;
+
+    /**
+     * Is password on public link required
+     *
+     * @param bool $checkGroupMembership Check group membership exclusion
+     * @since 9.0.0
+     * @since 24.0.0 Added optional $checkGroupMembership parameter
+     */
+    public function shareApiLinkEnforcePassword(bool $checkGroupMembership = true): bool;
+
+    /**
+     * Is default expire date enabled
+     *
+     * @since 9.0.0
+     */
+    public function shareApiLinkDefaultExpireDate(): bool;
+
+    /**
+     * Is default expire date enforced
+     *`
+     * @since 9.0.0
+     */
+    public function shareApiLinkDefaultExpireDateEnforced(): bool;
+
+    /**
+     * Number of default expire days
+     *
+     * @since 9.0.0
+     */
+    public function shareApiLinkDefaultExpireDays(): int;
+
+    /**
+     * Is default internal expire date enabled
+     *
+     * @since 22.0.0
+     */
+    public function shareApiInternalDefaultExpireDate(): bool;
+
+    /**
+     * Is default remote expire date enabled
+     *
+     * @since 22.0.0
+     */
+    public function shareApiRemoteDefaultExpireDate(): bool;
+
+    /**
+     * Is default expire date enforced
+     *
+     * @since 22.0.0
+     */
+    public function shareApiInternalDefaultExpireDateEnforced(): bool;
+
+    /**
+     * Is default expire date enforced for remote shares
+     *
+     * @since 22.0.0
+     */
+    public function shareApiRemoteDefaultExpireDateEnforced(): bool;
+
+    /**
+     * Number of default expire days
+     *
+     * @since 22.0.0
+     */
+    public function shareApiInternalDefaultExpireDays(): int;
+
+    /**
+     * Number of default expire days for remote shares
+     *
+     * @since 22.0.0
+     */
+    public function shareApiRemoteDefaultExpireDays(): int;
+
+    /**
+     * Allow public upload on link shares
+     *
+     * @since 9.0.0
+     */
+    public function shareApiLinkAllowPublicUpload(): bool;
+
+    /**
+     * Check if user can only share with group members.
+     *
+     * @since 9.0.0
+     */
+    public function shareWithGroupMembersOnly(): bool;
+
+    /**
+     * If shareWithGroupMembersOnly is enabled, return an optional
+     * list of groups that must be excluded from the principle of
+     * belonging to the same group.
+     * @return array
+     * @since 27.0.0
+     */
+    public function shareWithGroupMembersOnlyExcludeGroupsList(): array;
+
+    /**
+     * Check if users can share with groups
+     *
+     * @since 9.0.1
+     */
+    public function allowGroupSharing(): bool;
+
+    /**
+     * Check if user enumeration is allowed
+     *
+     * @since 19.0.0
+     */
+    public function allowEnumeration(): bool;
+
+    /**
+     * Check if user enumeration is limited to the users groups
+     *
+     * @since 19.0.0
+     */
+    public function limitEnumerationToGroups(): bool;
+
+    /**
+     * Check if user enumeration is limited to the phonebook matches
+     *
+     * @since 21.0.1
+     */
+    public function limitEnumerationToPhone(): bool;
+
+    /**
+     * Check if user enumeration is allowed to return also on full match
+     * and ignore limitations to phonebook or groups.
+     *
+     * @since 21.0.1
+     */
+    public function allowEnumerationFullMatch(): bool;
+
+    /**
+     * When `allowEnumerationFullMatch` is enabled and `matchEmail` is set,
+     * then also return results for full email matches.
+     *
+     * @since 25.0.0
+     */
+    public function matchEmail(): bool;
+
+    /**
+     * When `allowEnumerationFullMatch` is enabled and `matchUserId` is set,
+     * then also return results for full user id matches.
+     *
+     * @since 33.0.0
+     */
+    public function matchUserId(): bool;
+
+    /**
+     * When `allowEnumerationFullMatch` is enabled and `ignoreSecondDisplayName` is set,
+     * then the search should ignore matches on the second displayname and only use the first.
+     *
+     * @since 25.0.0
+     */
+    public function ignoreSecondDisplayName(): bool;
+
+
+    /**
+     * Check if custom tokens are allowed
+     *
+     * @since 31.0.0
+     */
+    public function allowCustomTokens(): bool;
+
+    /**
+     * Check if the current user can view the share
+     * even if the download is disabled.
+     *
+     * @since 32.0.0
+     */
+    public function allowViewWithoutDownload(): bool;
+
+    /**
+     * Check if the current user can enumerate the target user
+     *
+     * @since 23.0.0
+     */
+    public function currentUserCanEnumerateTargetUser(?IUser $currentUser, IUser $targetUser): bool;
+
+    /**
+     * Check if sharing is disabled for the given user
+     *
+     * @since 9.0.0
+     */
+    public function sharingDisabledForUser(?string $userId): bool;
+
+    /**
+     * Check if outgoing server2server shares are allowed
+     * @since 9.0.0
+     */
+    public function outgoingServer2ServerSharesAllowed(): bool;
+
+    /**
+     * Check if outgoing server2server shares are allowed
+     * @since 14.0.0
+     */
+    public function outgoingServer2ServerGroupSharesAllowed(): bool;
+
+
+    /**
+     * Check if a given share provider exists
+     * @param IShare::TYPE_* $shareType
+     * @since 11.0.0
+     */
+    public function shareProviderExists(int $shareType): bool;
+
+    /**
+     * @param string $shareProviderClass
+     * @since 21.0.0
+     */
+    public function registerShareProvider(string $shareProviderClass): void;
+
+    /**
+     * @Internal
+     *
+     * Get all the shares as iterable to reduce memory overhead
+     * Note, since this opens up database cursors the iterable should
+     * be fully iterated.
+     *
+     * @return iterable<IShare>
+     * @since 18.0.0
+     */
+    public function getAllShares(): iterable;
+
+    /**
+     * Generate a unique share token
+     *
+     * @throws ShareTokenException Failed to generate a unique token
+     * @since 31.0.0
+     */
+    public function generateToken(): string;
 }

lib/public/Share/IShareProvider.php

Indentation +198 added lines, -198 removed lines

@@ -18,202 +18,202 @@
  * @since 9.0.0
  */
 interface IShareProvider {
-	/**
-	 * Return the identifier of this provider.
-	 *
-	 * @return string Containing only [a-zA-Z0-9]
-	 * @since 9.0.0
-	 */
-	public function identifier();
-
-	/**
-	 * Create a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare The share object
-	 * @since 9.0.0
-	 */
-	public function create(\OCP\Share\IShare $share);
-
-	/**
-	 * Update a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare The share object
-	 * @since 9.0.0
-	 */
-	public function update(\OCP\Share\IShare $share);
-
-	/**
-	 * Delete a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @since 9.0.0
-	 */
-	public function delete(\OCP\Share\IShare $share);
-
-	/**
-	 * Unshare a file from self as recipient.
-	 * This may require special handling. If a user unshares a group
-	 * share from their self then the original group share should still exist.
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param string $recipient UserId of the recipient
-	 * @since 9.0.0
-	 */
-	public function deleteFromSelf(\OCP\Share\IShare $share, $recipient);
-
-	/**
-	 * Restore a share for a given recipient. The implementation could be provider independant.
-	 *
-	 * @param IShare $share
-	 * @param string $recipient
-	 * @return IShare The restored share object
-	 *
-	 * @since 14.0.0
-	 * @throws GenericShareException In case the share could not be restored
-	 */
-	public function restore(IShare $share, string $recipient): IShare;
-
-	/**
-	 * Move a share as a recipient.
-	 * This is updating the share target. Thus the mount point of the recipient.
-	 * This may require special handling. If a user moves a group share
-	 * the target should only be changed for them.
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param string $recipient userId of recipient
-	 * @return \OCP\Share\IShare
-	 * @since 9.0.0
-	 */
-	public function move(\OCP\Share\IShare $share, $recipient);
-
-	/**
-	 * Get all shares by the given user in a folder
-	 *
-	 * @param string $userId
-	 * @param Folder $node
-	 * @param bool $reshares Also get the shares where $user is the owner instead of just the shares where $user is the initiator
-	 * @param bool $shallow Whether the method should stop at the first level, or look into sub-folders.
-	 * @return array<int, list<\OCP\Share\IShare>>
-	 * @since 11.0.0
-	 */
-	public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true);
-
-	/**
-	 * Get all shares by the given user
-	 *
-	 * @param string $userId
-	 * @param int $shareType
-	 * @param Node|null $node
-	 * @param bool $reshares Also get the shares where $user is the owner instead of just the shares where $user is the initiator
-	 * @param int $limit The maximum number of shares to be returned, -1 for all shares
-	 * @param int $offset
-	 * @return \OCP\Share\IShare[]
-	 * @since 9.0.0
-	 */
-	public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset);
-
-	/**
-	 * Get share by id
-	 *
-	 * @param string $id
-	 * @param string|null $recipientId
-	 * @return \OCP\Share\IShare
-	 * @throws ShareNotFound
-	 * @since 9.0.0
-	 */
-	public function getShareById($id, $recipientId = null);
-
-	/**
-	 * Get shares for a given path
-	 *
-	 * @param Node $path
-	 * @return \OCP\Share\IShare[]
-	 * @since 9.0.0
-	 */
-	public function getSharesByPath(Node $path);
-
-	/**
-	 * Get shared with the given user
-	 *
-	 * @param string $userId get shares where this user is the recipient
-	 * @param int $shareType
-	 * @param Node|null $node
-	 * @param int $limit The max number of entries returned, -1 for all
-	 * @param int $offset
-	 * @return \OCP\Share\IShare[]
-	 * @since 9.0.0
-	 */
-	public function getSharedWith($userId, $shareType, $node, $limit, $offset);
-
-	/**
-	 * Get a share by token
-	 *
-	 * @param string $token
-	 * @return \OCP\Share\IShare
-	 * @throws ShareNotFound
-	 * @since 9.0.0
-	 */
-	public function getShareByToken(string $token);
-
-	/**
-	 * A user is deleted from the system
-	 * So clean up the relevant shares.
-	 *
-	 * @param string $uid
-	 * @param int $shareType
-	 * @since 9.1.0
-	 */
-	public function userDeleted($uid, $shareType);
-
-	/**
-	 * A group is deleted from the system.
-	 * We have to clean up all shares to this group.
-	 * Providers not handling group shares should just return
-	 *
-	 * @param string $gid
-	 * @since 9.1.0
-	 */
-	public function groupDeleted($gid);
-
-	/**
-	 * A user is deleted from a group
-	 * We have to clean up all the related user specific group shares
-	 * Providers not handling group shares should just return
-	 *
-	 * @param string $uid
-	 * @param string $gid
-	 * @since 9.1.0
-	 */
-	public function userDeletedFromGroup($uid, $gid);
-
-	/**
-	 * Get the access list to the array of provided nodes.
-	 *
-	 * @see IManager::getAccessList() for sample docs
-	 *
-	 * @param Node[] $nodes The list of nodes to get access for
-	 * @param bool $currentAccess If current access is required (like for removed shares that might get revived later)
-	 * @return array
-	 * @since 12
-	 */
-	public function getAccessList($nodes, $currentAccess);
-
-	/**
-	 * Get all the shares in this provider returned as iterable to reduce memory
-	 * overhead
-	 *
-	 * @return iterable<IShare>
-	 * @since 18.0.0
-	 */
-	public function getAllShares(): iterable;
-
-	/**
-	 * Get all children of this share
-	 *
-	 * @return IShare[]
-	 * @since 9.0.0
-	 */
-	public function getChildren(IShare $parent);
+    /**
+     * Return the identifier of this provider.
+     *
+     * @return string Containing only [a-zA-Z0-9]
+     * @since 9.0.0
+     */
+    public function identifier();
+
+    /**
+     * Create a share
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare The share object
+     * @since 9.0.0
+     */
+    public function create(\OCP\Share\IShare $share);
+
+    /**
+     * Update a share
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare The share object
+     * @since 9.0.0
+     */
+    public function update(\OCP\Share\IShare $share);
+
+    /**
+     * Delete a share
+     *
+     * @param \OCP\Share\IShare $share
+     * @since 9.0.0
+     */
+    public function delete(\OCP\Share\IShare $share);
+
+    /**
+     * Unshare a file from self as recipient.
+     * This may require special handling. If a user unshares a group
+     * share from their self then the original group share should still exist.
+     *
+     * @param \OCP\Share\IShare $share
+     * @param string $recipient UserId of the recipient
+     * @since 9.0.0
+     */
+    public function deleteFromSelf(\OCP\Share\IShare $share, $recipient);
+
+    /**
+     * Restore a share for a given recipient. The implementation could be provider independant.
+     *
+     * @param IShare $share
+     * @param string $recipient
+     * @return IShare The restored share object
+     *
+     * @since 14.0.0
+     * @throws GenericShareException In case the share could not be restored
+     */
+    public function restore(IShare $share, string $recipient): IShare;
+
+    /**
+     * Move a share as a recipient.
+     * This is updating the share target. Thus the mount point of the recipient.
+     * This may require special handling. If a user moves a group share
+     * the target should only be changed for them.
+     *
+     * @param \OCP\Share\IShare $share
+     * @param string $recipient userId of recipient
+     * @return \OCP\Share\IShare
+     * @since 9.0.0
+     */
+    public function move(\OCP\Share\IShare $share, $recipient);
+
+    /**
+     * Get all shares by the given user in a folder
+     *
+     * @param string $userId
+     * @param Folder $node
+     * @param bool $reshares Also get the shares where $user is the owner instead of just the shares where $user is the initiator
+     * @param bool $shallow Whether the method should stop at the first level, or look into sub-folders.
+     * @return array<int, list<\OCP\Share\IShare>>
+     * @since 11.0.0
+     */
+    public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true);
+
+    /**
+     * Get all shares by the given user
+     *
+     * @param string $userId
+     * @param int $shareType
+     * @param Node|null $node
+     * @param bool $reshares Also get the shares where $user is the owner instead of just the shares where $user is the initiator
+     * @param int $limit The maximum number of shares to be returned, -1 for all shares
+     * @param int $offset
+     * @return \OCP\Share\IShare[]
+     * @since 9.0.0
+     */
+    public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset);
+
+    /**
+     * Get share by id
+     *
+     * @param string $id
+     * @param string|null $recipientId
+     * @return \OCP\Share\IShare
+     * @throws ShareNotFound
+     * @since 9.0.0
+     */
+    public function getShareById($id, $recipientId = null);
+
+    /**
+     * Get shares for a given path
+     *
+     * @param Node $path
+     * @return \OCP\Share\IShare[]
+     * @since 9.0.0
+     */
+    public function getSharesByPath(Node $path);
+
+    /**
+     * Get shared with the given user
+     *
+     * @param string $userId get shares where this user is the recipient
+     * @param int $shareType
+     * @param Node|null $node
+     * @param int $limit The max number of entries returned, -1 for all
+     * @param int $offset
+     * @return \OCP\Share\IShare[]
+     * @since 9.0.0
+     */
+    public function getSharedWith($userId, $shareType, $node, $limit, $offset);
+
+    /**
+     * Get a share by token
+     *
+     * @param string $token
+     * @return \OCP\Share\IShare
+     * @throws ShareNotFound
+     * @since 9.0.0
+     */
+    public function getShareByToken(string $token);
+
+    /**
+     * A user is deleted from the system
+     * So clean up the relevant shares.
+     *
+     * @param string $uid
+     * @param int $shareType
+     * @since 9.1.0
+     */
+    public function userDeleted($uid, $shareType);
+
+    /**
+     * A group is deleted from the system.
+     * We have to clean up all shares to this group.
+     * Providers not handling group shares should just return
+     *
+     * @param string $gid
+     * @since 9.1.0
+     */
+    public function groupDeleted($gid);
+
+    /**
+     * A user is deleted from a group
+     * We have to clean up all the related user specific group shares
+     * Providers not handling group shares should just return
+     *
+     * @param string $uid
+     * @param string $gid
+     * @since 9.1.0
+     */
+    public function userDeletedFromGroup($uid, $gid);
+
+    /**
+     * Get the access list to the array of provided nodes.
+     *
+     * @see IManager::getAccessList() for sample docs
+     *
+     * @param Node[] $nodes The list of nodes to get access for
+     * @param bool $currentAccess If current access is required (like for removed shares that might get revived later)
+     * @return array
+     * @since 12
+     */
+    public function getAccessList($nodes, $currentAccess);
+
+    /**
+     * Get all the shares in this provider returned as iterable to reduce memory
+     * overhead
+     *
+     * @return iterable<IShare>
+     * @since 18.0.0
+     */
+    public function getAllShares(): iterable;
+
+    /**
+     * Get all children of this share
+     *
+     * @return IShare[]
+     * @since 9.0.0
+     */
+    public function getChildren(IShare $parent);
 }

lib/public/Federation/ICloudFederationProvider.php

Indentation +43 added lines, -43 removed lines

@@ -22,50 +22,50 @@
  */
 
 interface ICloudFederationProvider {
-	/**
-	 * get the name of the share type, handled by this provider
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getShareType();
+    /**
+     * get the name of the share type, handled by this provider
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getShareType();
 
-	/**
-	 * share received from another server
-	 *
-	 * @param ICloudFederationShare $share
-	 * @return string provider specific unique ID of the share
-	 *
-	 * @throws ProviderCouldNotAddShareException
-	 *
-	 * @since 14.0.0
-	 */
-	public function shareReceived(ICloudFederationShare $share);
+    /**
+     * share received from another server
+     *
+     * @param ICloudFederationShare $share
+     * @return string provider specific unique ID of the share
+     *
+     * @throws ProviderCouldNotAddShareException
+     *
+     * @since 14.0.0
+     */
+    public function shareReceived(ICloudFederationShare $share);
 
-	/**
-	 * notification received from another server
-	 *
-	 * @param string $notificationType (e.g SHARE_ACCEPTED)
-	 * @param string $providerId share ID
-	 * @param array $notification provider specific notification
-	 * @return array<string> $data send back to sender
-	 *
-	 * @throws ShareNotFound
-	 * @throws ActionNotSupportedException
-	 * @throws BadRequestException
-	 * @throws AuthenticationFailedException
-	 *
-	 * @since 14.0.0
-	 */
-	public function notificationReceived(string $notificationType, string $providerId, array $notification);
+    /**
+     * notification received from another server
+     *
+     * @param string $notificationType (e.g SHARE_ACCEPTED)
+     * @param string $providerId share ID
+     * @param array $notification provider specific notification
+     * @return array<string> $data send back to sender
+     *
+     * @throws ShareNotFound
+     * @throws ActionNotSupportedException
+     * @throws BadRequestException
+     * @throws AuthenticationFailedException
+     *
+     * @since 14.0.0
+     */
+    public function notificationReceived(string $notificationType, string $providerId, array $notification);
 
-	/**
-	 * get the supported share types, e.g. "user", "group", etc.
-	 *
-	 * @return array
-	 *
-	 * @since 14.0.0
-	 */
-	public function getSupportedShareTypes();
+    /**
+     * get the supported share types, e.g. "user", "group", etc.
+     *
+     * @return array
+     *
+     * @since 14.0.0
+     */
+    public function getSupportedShareTypes();
 }

lib/public/Activity/IEvent.php

Indentation +355 added lines, -355 removed lines

@@ -20,359 +20,359 @@
  * @since 8.2.0
  */
 interface IEvent {
-	/**
-	 * Set the app of the activity
-	 *
-	 * @param string $app
-	 * @return IEvent
-	 * @throws InvalidValueException if the app id is invalid
-	 * @since 8.2.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setApp(string $app): self;
-
-	/**
-	 * Set the type of the activity
-	 *
-	 * @param string $type
-	 * @return IEvent
-	 * @throws InvalidValueException if the type is invalid
-	 * @since 8.2.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setType(string $type): self;
-
-	/**
-	 * Set the affected user of the activity
-	 *
-	 * @param string $affectedUser
-	 * @return IEvent
-	 * @throws InvalidValueException if the affected user is invalid
-	 * @since 8.2.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setAffectedUser(string $affectedUser): self;
-
-	/**
-	 * Set the author of the activity
-	 *
-	 * @param string $author
-	 * @return IEvent
-	 * @throws InvalidValueException if the author is invalid
-	 * @since 8.2.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setAuthor(string $author): self;
-
-	/**
-	 * Set the author of the activity
-	 *
-	 * @param int $timestamp
-	 * @return IEvent
-	 * @throws InvalidValueException if the timestamp is invalid
-	 * @since 8.2.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setTimestamp(int $timestamp): self;
-
-	/**
-	 * Set the subject of the activity
-	 *
-	 * @param string $subject
-	 * @param array $parameters
-	 * @return IEvent
-	 * @throws InvalidValueException if the subject or parameters are invalid
-	 * @since 8.2.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setSubject(string $subject, array $parameters = []): self;
-
-	/**
-	 * Set a parsed subject
-	 *
-	 * HTML is not allowed in the parsed subject and will be escaped
-	 * automatically by the clients. You can use the RichObjectString system
-	 * provided by the Nextcloud server to highlight important parameters via
-	 * the setRichSubject method.
-	 *
-	 * See https://github.com/nextcloud/server/issues/1706 for more information.
-	 *
-	 * @param string $subject
-	 * @return $this
-	 * @throws InvalidValueException if the subject is invalid
-	 * @since 11.0.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setParsedSubject(string $subject): self;
-
-	/**
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getParsedSubject(): string;
-
-	/**
-	 * Set a RichObjectString subject
-	 *
-	 * HTML is not allowed in the rich subject and will be escaped automatically
-	 * by the clients, but you can use the RichObjectString system provided by
-	 * the Nextcloud server to highlight important parameters.
-	 *
-	 * See https://github.com/nextcloud/server/issues/1706 for more information.
-	 *
-	 * @param string $subject
-	 * @param array<string, array<string, string>> $parameters
-	 * @return $this
-	 * @throws InvalidValueException if the subject or parameters are invalid
-	 * @since 11.0.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setRichSubject(string $subject, array $parameters = []): self;
-
-	/**
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getRichSubject(): string;
-
-	/**
-	 * @return array<string, array<string, string>>
-	 * @since 11.0.0
-	 */
-	public function getRichSubjectParameters(): array;
-
-	/**
-	 * Set the message of the activity
-	 *
-	 * @param string $message
-	 * @param array $parameters
-	 * @return IEvent
-	 * @throws InvalidValueException if the message or parameters are invalid
-	 * @since 8.2.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setMessage(string $message, array $parameters = []): self;
-
-	/**
-	 * Set a parsed message
-	 *
-	 * HTML is not allowed in the parsed message and will be escaped
-	 * automatically by the clients. You can use the RichObjectString system
-	 * provided by the Nextcloud server to highlight important parameters via
-	 * the setRichMessage method.
-	 *
-	 * See https://github.com/nextcloud/server/issues/1706 for more information.
-	 *
-	 * @param string $message
-	 * @return $this
-	 * @throws InvalidValueException if the message is invalid
-	 * @since 11.0.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setParsedMessage(string $message): self;
-
-	/**
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getParsedMessage(): string;
-
-	/**
-	 * Set a RichObjectString message
-	 *
-	 * HTML is not allowed in the rich message and will be escaped automatically
-	 * by the clients, but you can use the RichObjectString system provided by
-	 * the Nextcloud server to highlight important parameters.
-	 *
-	 * See https://github.com/nextcloud/server/issues/1706 for more information.
-	 *
-	 * @param string $message
-	 * @param array<string, array<string, string>> $parameters
-	 * @return $this
-	 * @throws \InvalidArgumentException if the message or parameters are invalid
-	 * @since 11.0.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setRichMessage(string $message, array $parameters = []): self;
-
-	/**
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getRichMessage(): string;
-
-	/**
-	 * @return array<string, array<string, string>>
-	 * @since 11.0.0
-	 */
-	public function getRichMessageParameters(): array;
-
-	/**
-	 * Set the object of the activity
-	 *
-	 * @param string $objectType
-	 * @param string|int $objectId
-	 * @param string $objectName
-	 * @return IEvent
-	 * @throws InvalidValueException if the object is invalid
-	 * @since 8.2.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setObject(string $objectType, string|int $objectId, string $objectName = ''): self;
-
-	/**
-	 * Set the link of the activity
-	 *
-	 * @param string $link
-	 * @return IEvent
-	 * @throws InvalidValueException if the link is invalid
-	 * @since 8.2.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setLink(string $link): self;
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getApp(): string;
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getType(): string;
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getAffectedUser(): string;
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getAuthor(): string;
-
-	/**
-	 * @return int
-	 * @since 8.2.0
-	 */
-	public function getTimestamp(): int;
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getSubject(): string;
-
-	/**
-	 * @return array
-	 * @since 8.2.0
-	 */
-	public function getSubjectParameters(): array;
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getMessage(): string;
-
-	/**
-	 * @return array
-	 * @since 8.2.0
-	 */
-	public function getMessageParameters(): array;
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getObjectType(): string;
-
-	/**
-	 * @return string|int
-	 * @since 8.2.0
-	 */
-	public function getObjectId(): string|int;
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getObjectName(): string;
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getLink(): string;
-
-	/**
-	 * Set the absolute url for the icon (should be colored black or not have a color)
-	 *
-	 * It's automatically color inverted by clients when needed
-	 *
-	 * @param string $icon
-	 * @return $this
-	 * @throws InvalidValueException if the icon is invalid
-	 * @since 11.0.0
-	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
-	 */
-	public function setIcon(string $icon): self;
-
-	/**
-	 * Get the absolute url for the icon (should be colored black or not have a color)
-	 *
-	 * It's automatically color inverted by clients when needed
-	 *
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getIcon(): string;
-
-	/**
-	 * @param IEvent $child
-	 * @return $this
-	 * @since 11.0.0 - Since 15.0.0 returns $this
-	 */
-	public function setChildEvent(IEvent $child): self;
-
-	/**
-	 * @return IEvent|null
-	 * @since 11.0.0
-	 */
-	public function getChildEvent();
-
-	/**
-	 * @return bool
-	 * @since 11.0.0
-	 */
-	public function isValid(): bool;
-
-	/**
-	 * @return bool
-	 * @since 11.0.0
-	 */
-	public function isValidParsed(): bool;
-
-	/**
-	 * Set whether a notification should be automatically generated for this activity.
-	 *
-	 * Set this to `false` if the app already generates a notification for the event.
-	 *
-	 * @param bool $generate
-	 * @return IEvent
-	 * @since 20.0.0
-	 */
-	public function setGenerateNotification(bool $generate): self;
-
-	/**
-	 * Whether a notification should be automatically generated for this activity.
-	 *
-	 * @return bool
-	 * @since 20.0.0
-	 */
-	public function getGenerateNotification(): bool;
+    /**
+     * Set the app of the activity
+     *
+     * @param string $app
+     * @return IEvent
+     * @throws InvalidValueException if the app id is invalid
+     * @since 8.2.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setApp(string $app): self;
+
+    /**
+     * Set the type of the activity
+     *
+     * @param string $type
+     * @return IEvent
+     * @throws InvalidValueException if the type is invalid
+     * @since 8.2.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setType(string $type): self;
+
+    /**
+     * Set the affected user of the activity
+     *
+     * @param string $affectedUser
+     * @return IEvent
+     * @throws InvalidValueException if the affected user is invalid
+     * @since 8.2.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setAffectedUser(string $affectedUser): self;
+
+    /**
+     * Set the author of the activity
+     *
+     * @param string $author
+     * @return IEvent
+     * @throws InvalidValueException if the author is invalid
+     * @since 8.2.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setAuthor(string $author): self;
+
+    /**
+     * Set the author of the activity
+     *
+     * @param int $timestamp
+     * @return IEvent
+     * @throws InvalidValueException if the timestamp is invalid
+     * @since 8.2.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setTimestamp(int $timestamp): self;
+
+    /**
+     * Set the subject of the activity
+     *
+     * @param string $subject
+     * @param array $parameters
+     * @return IEvent
+     * @throws InvalidValueException if the subject or parameters are invalid
+     * @since 8.2.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setSubject(string $subject, array $parameters = []): self;
+
+    /**
+     * Set a parsed subject
+     *
+     * HTML is not allowed in the parsed subject and will be escaped
+     * automatically by the clients. You can use the RichObjectString system
+     * provided by the Nextcloud server to highlight important parameters via
+     * the setRichSubject method.
+     *
+     * See https://github.com/nextcloud/server/issues/1706 for more information.
+     *
+     * @param string $subject
+     * @return $this
+     * @throws InvalidValueException if the subject is invalid
+     * @since 11.0.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setParsedSubject(string $subject): self;
+
+    /**
+     * @return string
+     * @since 11.0.0
+     */
+    public function getParsedSubject(): string;
+
+    /**
+     * Set a RichObjectString subject
+     *
+     * HTML is not allowed in the rich subject and will be escaped automatically
+     * by the clients, but you can use the RichObjectString system provided by
+     * the Nextcloud server to highlight important parameters.
+     *
+     * See https://github.com/nextcloud/server/issues/1706 for more information.
+     *
+     * @param string $subject
+     * @param array<string, array<string, string>> $parameters
+     * @return $this
+     * @throws InvalidValueException if the subject or parameters are invalid
+     * @since 11.0.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setRichSubject(string $subject, array $parameters = []): self;
+
+    /**
+     * @return string
+     * @since 11.0.0
+     */
+    public function getRichSubject(): string;
+
+    /**
+     * @return array<string, array<string, string>>
+     * @since 11.0.0
+     */
+    public function getRichSubjectParameters(): array;
+
+    /**
+     * Set the message of the activity
+     *
+     * @param string $message
+     * @param array $parameters
+     * @return IEvent
+     * @throws InvalidValueException if the message or parameters are invalid
+     * @since 8.2.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setMessage(string $message, array $parameters = []): self;
+
+    /**
+     * Set a parsed message
+     *
+     * HTML is not allowed in the parsed message and will be escaped
+     * automatically by the clients. You can use the RichObjectString system
+     * provided by the Nextcloud server to highlight important parameters via
+     * the setRichMessage method.
+     *
+     * See https://github.com/nextcloud/server/issues/1706 for more information.
+     *
+     * @param string $message
+     * @return $this
+     * @throws InvalidValueException if the message is invalid
+     * @since 11.0.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setParsedMessage(string $message): self;
+
+    /**
+     * @return string
+     * @since 11.0.0
+     */
+    public function getParsedMessage(): string;
+
+    /**
+     * Set a RichObjectString message
+     *
+     * HTML is not allowed in the rich message and will be escaped automatically
+     * by the clients, but you can use the RichObjectString system provided by
+     * the Nextcloud server to highlight important parameters.
+     *
+     * See https://github.com/nextcloud/server/issues/1706 for more information.
+     *
+     * @param string $message
+     * @param array<string, array<string, string>> $parameters
+     * @return $this
+     * @throws \InvalidArgumentException if the message or parameters are invalid
+     * @since 11.0.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setRichMessage(string $message, array $parameters = []): self;
+
+    /**
+     * @return string
+     * @since 11.0.0
+     */
+    public function getRichMessage(): string;
+
+    /**
+     * @return array<string, array<string, string>>
+     * @since 11.0.0
+     */
+    public function getRichMessageParameters(): array;
+
+    /**
+     * Set the object of the activity
+     *
+     * @param string $objectType
+     * @param string|int $objectId
+     * @param string $objectName
+     * @return IEvent
+     * @throws InvalidValueException if the object is invalid
+     * @since 8.2.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setObject(string $objectType, string|int $objectId, string $objectName = ''): self;
+
+    /**
+     * Set the link of the activity
+     *
+     * @param string $link
+     * @return IEvent
+     * @throws InvalidValueException if the link is invalid
+     * @since 8.2.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setLink(string $link): self;
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getApp(): string;
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getType(): string;
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getAffectedUser(): string;
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getAuthor(): string;
+
+    /**
+     * @return int
+     * @since 8.2.0
+     */
+    public function getTimestamp(): int;
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getSubject(): string;
+
+    /**
+     * @return array
+     * @since 8.2.0
+     */
+    public function getSubjectParameters(): array;
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getMessage(): string;
+
+    /**
+     * @return array
+     * @since 8.2.0
+     */
+    public function getMessageParameters(): array;
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getObjectType(): string;
+
+    /**
+     * @return string|int
+     * @since 8.2.0
+     */
+    public function getObjectId(): string|int;
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getObjectName(): string;
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getLink(): string;
+
+    /**
+     * Set the absolute url for the icon (should be colored black or not have a color)
+     *
+     * It's automatically color inverted by clients when needed
+     *
+     * @param string $icon
+     * @return $this
+     * @throws InvalidValueException if the icon is invalid
+     * @since 11.0.0
+     * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
+     */
+    public function setIcon(string $icon): self;
+
+    /**
+     * Get the absolute url for the icon (should be colored black or not have a color)
+     *
+     * It's automatically color inverted by clients when needed
+     *
+     * @return string
+     * @since 11.0.0
+     */
+    public function getIcon(): string;
+
+    /**
+     * @param IEvent $child
+     * @return $this
+     * @since 11.0.0 - Since 15.0.0 returns $this
+     */
+    public function setChildEvent(IEvent $child): self;
+
+    /**
+     * @return IEvent|null
+     * @since 11.0.0
+     */
+    public function getChildEvent();
+
+    /**
+     * @return bool
+     * @since 11.0.0
+     */
+    public function isValid(): bool;
+
+    /**
+     * @return bool
+     * @since 11.0.0
+     */
+    public function isValidParsed(): bool;
+
+    /**
+     * Set whether a notification should be automatically generated for this activity.
+     *
+     * Set this to `false` if the app already generates a notification for the event.
+     *
+     * @param bool $generate
+     * @return IEvent
+     * @since 20.0.0
+     */
+    public function setGenerateNotification(bool $generate): self;
+
+    /**
+     * Whether a notification should be automatically generated for this activity.
+     *
+     * @return bool
+     * @since 20.0.0
+     */
+    public function getGenerateNotification(): bool;
 }

Spacing +2 added lines, -2 removed lines

@@ -218,7 +218,7 @@ 
 	 * @since 8.2.0
 	 * @since 30.0.0 throws {@see InvalidValueException} instead of \InvalidArgumentException
 	 */
-	public function setObject(string $objectType, string|int $objectId, string $objectName = ''): self;
+	public function setObject(string $objectType, string | int $objectId, string $objectName = ''): self;
 
 	/**
 	 * Set the link of the activity
@@ -295,7 +295,7 @@ 
 	 * @return string|int
 	 * @since 8.2.0
 	 */
-	public function getObjectId(): string|int;
+	public function getObjectId(): string | int;
 
 	/**
 	 * @return string

lib/private/Files/Node/Folder.php

Indentation +512 added lines, -512 removed lines

@@ -31,516 +31,516 @@
 
 class Folder extends Node implements IFolder {
 
-	private ?IUserManager $userManager = null;
-
-	private bool $wasDeleted = false;
-
-	/**
-	 * Creates a Folder that represents a non-existing path
-	 *
-	 * @param string $path path
-	 * @return NonExistingFolder non-existing node
-	 */
-	protected function createNonExistingNode($path) {
-		return new NonExistingFolder($this->root, $this->view, $path);
-	}
-
-	/**
-	 * @param string $path path relative to the folder
-	 * @return string
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function getFullPath($path) {
-		$path = $this->normalizePath($path);
-		if (!$this->isValidPath($path)) {
-			throw new NotPermittedException('Invalid path "' . $path . '"');
-		}
-		return $this->path . $path;
-	}
-
-	/**
-	 * @param string $path
-	 * @return string|null
-	 */
-	public function getRelativePath($path) {
-		return PathHelper::getRelativePath($this->getPath(), $path);
-	}
-
-	/**
-	 * check if a node is a (grand-)child of the folder
-	 *
-	 * @param \OC\Files\Node\Node $node
-	 * @return bool
-	 */
-	public function isSubNode($node) {
-		return str_starts_with($node->getPath(), $this->path . '/');
-	}
-
-	/**
-	 * get the content of this directory
-	 *
-	 * @return Node[]
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getDirectoryListing() {
-		$folderContent = $this->view->getDirectoryContent($this->path, '', $this->getFileInfo(false));
-
-		return array_map(function (FileInfo $info) {
-			if ($info->getMimetype() === FileInfo::MIMETYPE_FOLDER) {
-				return new Folder($this->root, $this->view, $info->getPath(), $info, $this);
-			} else {
-				return new File($this->root, $this->view, $info->getPath(), $info, $this);
-			}
-		}, $folderContent);
-	}
-
-	protected function createNode(string $path, ?FileInfo $info = null, bool $infoHasSubMountsIncluded = true): INode {
-		if (is_null($info)) {
-			$isDir = $this->view->is_dir($path);
-		} else {
-			$isDir = $info->getType() === FileInfo::TYPE_FOLDER;
-		}
-		$parent = dirname($path) === $this->getPath() ? $this : null;
-		if ($isDir) {
-			return new Folder($this->root, $this->view, $path, $info, $parent, $infoHasSubMountsIncluded);
-		} else {
-			return new File($this->root, $this->view, $path, $info, $parent);
-		}
-	}
-
-	public function get($path) {
-		return $this->root->get($this->getFullPath($path));
-	}
-
-	public function nodeExists($path) {
-		try {
-			$this->get($path);
-			return true;
-		} catch (NotFoundException|NotPermittedException) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return \OC\Files\Node\Folder
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function newFolder($path) {
-		if ($this->checkPermissions(\OCP\Constants::PERMISSION_CREATE)) {
-			$fullPath = $this->getFullPath($path);
-			$nonExisting = new NonExistingFolder($this->root, $this->view, $fullPath);
-			$this->sendHooks(['preWrite', 'preCreate'], [$nonExisting]);
-			if (!$this->view->mkdir($fullPath)) {
-				// maybe another concurrent process created the folder already
-				if (!$this->view->is_dir($fullPath)) {
-					throw new NotPermittedException('Could not create folder "' . $fullPath . '"');
-				} else {
-					// we need to ensure we don't return before the concurrent request has finished updating the cache
-					$tries = 5;
-					while (!$this->view->getFileInfo($fullPath)) {
-						if ($tries < 1) {
-							throw new NotPermittedException('Could not create folder "' . $fullPath . '", folder exists but unable to get cache entry');
-						}
-						usleep(5 * 1000);
-						$tries--;
-					}
-				}
-			}
-			$parent = dirname($fullPath) === $this->getPath() ? $this : null;
-			$node = new Folder($this->root, $this->view, $fullPath, null, $parent);
-			$this->sendHooks(['postWrite', 'postCreate'], [$node]);
-			return $node;
-		} else {
-			throw new NotPermittedException('No create permission for folder "' . $path . '"');
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @param string | resource | null $content
-	 * @return \OC\Files\Node\File
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function newFile($path, $content = null) {
-		if ($path === '') {
-			throw new NotPermittedException('Could not create as provided path is empty');
-		}
-		$this->recreateIfNeeded();
-		if ($this->checkPermissions(\OCP\Constants::PERMISSION_CREATE)) {
-			$fullPath = $this->getFullPath($path);
-			$nonExisting = new NonExistingFile($this->root, $this->view, $fullPath);
-			$this->sendHooks(['preWrite', 'preCreate'], [$nonExisting]);
-			if ($content !== null) {
-				$result = $this->view->file_put_contents($fullPath, $content);
-			} else {
-				$result = $this->view->touch($fullPath);
-			}
-			if ($result === false) {
-				throw new NotPermittedException('Could not create path "' . $fullPath . '"');
-			}
-			$node = new File($this->root, $this->view, $fullPath, null, $this);
-			$this->sendHooks(['postWrite', 'postCreate'], [$node]);
-			return $node;
-		}
-		throw new NotPermittedException('No create permission for path "' . $path . '"');
-	}
-
-	private function queryFromOperator(ISearchOperator $operator, ?string $uid = null, int $limit = 0, int $offset = 0): ISearchQuery {
-		if ($uid === null) {
-			$user = null;
-		} else {
-			/** @var IUserManager $userManager */
-			$userManager = \OCP\Server::get(IUserManager::class);
-			$user = $userManager->get($uid);
-		}
-		return new SearchQuery($operator, $limit, $offset, [], $user);
-	}
-
-	/**
-	 * search for files with the name matching $query
-	 *
-	 * @param string|ISearchQuery $query
-	 * @return \OC\Files\Node\Node[]
-	 */
-	public function search($query) {
-		if (is_string($query)) {
-			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', '%' . $query . '%'));
-		}
-
-		// search is handled by a single query covering all caches that this folder contains
-		// this is done by collect
-
-		$limitToHome = $query->limitToHome();
-		if ($limitToHome && count(explode('/', $this->path)) !== 3) {
-			throw new \InvalidArgumentException('searching by owner is only allowed in the users home folder');
-		}
-
-		/** @var QuerySearchHelper $searchHelper */
-		$searchHelper = \OC::$server->get(QuerySearchHelper::class);
-		[$caches, $mountByMountPoint] = $searchHelper->getCachesAndMountPointsForSearch($this->root, $this->path, $limitToHome);
-		$resultsPerCache = $searchHelper->searchInCaches($query, $caches);
-
-		// loop through all results per-cache, constructing the FileInfo object from the CacheEntry and merge them all
-		$files = array_merge(...array_map(function (array $results, string $relativeMountPoint) use ($mountByMountPoint) {
-			$mount = $mountByMountPoint[$relativeMountPoint];
-			return array_map(function (ICacheEntry $result) use ($relativeMountPoint, $mount) {
-				return $this->cacheEntryToFileInfo($mount, $relativeMountPoint, $result);
-			}, $results);
-		}, array_values($resultsPerCache), array_keys($resultsPerCache)));
-
-		// don't include this folder in the results
-		$files = array_values(array_filter($files, function (FileInfo $file) {
-			return $file->getPath() !== $this->getPath();
-		}));
-
-		// since results were returned per-cache, they are no longer fully sorted
-		$order = $query->getOrder();
-		if ($order) {
-			usort($files, function (FileInfo $a, FileInfo $b) use ($order) {
-				foreach ($order as $orderField) {
-					$cmp = $orderField->sortFileInfo($a, $b);
-					if ($cmp !== 0) {
-						return $cmp;
-					}
-				}
-				return 0;
-			});
-		}
-
-		return array_map(function (FileInfo $file) {
-			return $this->createNode($file->getPath(), $file);
-		}, $files);
-	}
-
-	private function cacheEntryToFileInfo(IMountPoint $mount, string $appendRoot, ICacheEntry $cacheEntry): FileInfo {
-		$cacheEntry['internalPath'] = $cacheEntry['path'];
-		$cacheEntry['path'] = rtrim($appendRoot . $cacheEntry->getPath(), '/');
-		$subPath = $cacheEntry['path'] !== '' ? '/' . $cacheEntry['path'] : '';
-		$storage = $mount->getStorage();
-
-		$owner = null;
-		$ownerId = $storage->getOwner($cacheEntry['internalPath']);
-		if ($ownerId !== false) {
-			// Cache the user manager (for performance)
-			if ($this->userManager === null) {
-				$this->userManager = \OCP\Server::get(IUserManager::class);
-			}
-			$owner = new LazyUser($ownerId, $this->userManager);
-		}
-
-		return new \OC\Files\FileInfo(
-			$this->path . $subPath,
-			$storage,
-			$cacheEntry['internalPath'],
-			$cacheEntry,
-			$mount,
-			$owner,
-		);
-	}
-
-	/**
-	 * search for files by mimetype
-	 *
-	 * @param string $mimetype
-	 * @return Node[]
-	 */
-	public function searchByMime($mimetype) {
-		if (!str_contains($mimetype, '/')) {
-			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'mimetype', $mimetype . '/%'));
-		} else {
-			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'mimetype', $mimetype));
-		}
-		return $this->search($query);
-	}
-
-	/**
-	 * search for files by tag
-	 *
-	 * @param string|int $tag name or tag id
-	 * @param string $userId owner of the tags
-	 * @return Node[]
-	 */
-	public function searchByTag($tag, $userId) {
-		$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'tagname', $tag), $userId);
-		return $this->search($query);
-	}
-
-	public function searchBySystemTag(string $tagName, string $userId, int $limit = 0, int $offset = 0): array {
-		$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'systemtag', $tagName), $userId, $limit, $offset);
-		return $this->search($query);
-	}
-
-	/**
-	 * @param int $id
-	 * @return \OCP\Files\Node[]
-	 */
-	public function getById($id) {
-		return $this->root->getByIdInPath((int)$id, $this->getPath());
-	}
-
-	public function getFirstNodeById(int $id): ?\OCP\Files\Node {
-		return $this->root->getFirstNodeByIdInPath($id, $this->getPath());
-	}
-
-	public function getAppDataDirectoryName(): string {
-		$instanceId = \OC::$server->getConfig()->getSystemValueString('instanceid');
-		return 'appdata_' . $instanceId;
-	}
-
-	/**
-	 * In case the path we are currently in is inside the appdata_* folder,
-	 * the original getById method does not work, because it can only look inside
-	 * the user's mount points. But the user has no mount point for the root storage.
-	 *
-	 * So in that case we directly check the mount of the root if it contains
-	 * the id. If it does we check if the path is inside the path we are working
-	 * in.
-	 *
-	 * @param int $id
-	 * @return array
-	 */
-	protected function getByIdInRootMount(int $id): array {
-		if (!method_exists($this->root, 'createNode')) {
-			// Always expected to be false. Being a method of Folder, this is
-			// always implemented. For it is an internal method and should not
-			// be exposed and made public, it is not part of an interface.
-			return [];
-		}
-		$mount = $this->root->getMount('');
-		$storage = $mount->getStorage();
-		$cacheEntry = $storage?->getCache($this->path)->get($id);
-		if (!$cacheEntry) {
-			return [];
-		}
-
-		$absolutePath = '/' . ltrim($cacheEntry->getPath(), '/');
-		$currentPath = rtrim($this->path, '/') . '/';
-
-		if (!str_starts_with($absolutePath, $currentPath)) {
-			return [];
-		}
-
-		return [$this->root->createNode(
-			$absolutePath, new \OC\Files\FileInfo(
-				$absolutePath,
-				$storage,
-				$cacheEntry->getPath(),
-				$cacheEntry,
-				$mount
-			))];
-	}
-
-	public function getFreeSpace() {
-		return $this->view->free_space($this->path);
-	}
-
-	public function delete() {
-		if ($this->checkPermissions(\OCP\Constants::PERMISSION_DELETE)) {
-			$this->sendHooks(['preDelete']);
-			$fileInfo = $this->getFileInfo();
-			$this->view->rmdir($this->path);
-			$nonExisting = new NonExistingFolder($this->root, $this->view, $this->path, $fileInfo);
-			$this->sendHooks(['postDelete'], [$nonExisting]);
-			$this->wasDeleted = true;
-		} else {
-			throw new NotPermittedException('No delete permission for path "' . $this->path . '"');
-		}
-	}
-
-	/**
-	 * Add a suffix to the name in case the file exists
-	 *
-	 * @param string $filename
-	 * @return string
-	 * @throws NotPermittedException
-	 */
-	public function getNonExistingName($filename) {
-		$path = $this->getPath();
-		if ($path === '/') {
-			$path = '';
-		}
-		if ($pos = strrpos($filename, '.')) {
-			$name = substr($filename, 0, $pos);
-			$ext = substr($filename, $pos);
-		} else {
-			$name = $filename;
-			$ext = '';
-		}
-
-		$newpath = $path . '/' . $filename;
-		if ($this->view->file_exists($newpath)) {
-			if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
-				/** @var array<int<0, max>, array> $matches */
-				//Replace the last "(number)" with "(number+1)"
-				$last_match = count($matches[0]) - 1;
-				$counter = $matches[1][$last_match][0] + 1;
-				$offset = $matches[0][$last_match][1];
-				$match_length = strlen($matches[0][$last_match][0]);
-			} else {
-				$counter = 2;
-				$match_length = 0;
-				$offset = false;
-			}
-			do {
-				if ($offset) {
-					//Replace the last "(number)" with "(number+1)"
-					$newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
-				} else {
-					$newname = $name . ' (' . $counter . ')';
-				}
-				$newpath = $path . '/' . $newname . $ext;
-				$counter++;
-			} while ($this->view->file_exists($newpath));
-		}
-
-		return trim($this->getRelativePath($newpath), '/');
-	}
-
-	/**
-	 * @param int $limit
-	 * @param int $offset
-	 * @return INode[]
-	 */
-	public function getRecent($limit, $offset = 0) {
-		$filterOutNonEmptyFolder = new SearchBinaryOperator(
-			// filter out non empty folders
-			ISearchBinaryOperator::OPERATOR_OR,
-			[
-				new SearchBinaryOperator(
-					ISearchBinaryOperator::OPERATOR_NOT,
-					[
-						new SearchComparison(
-							ISearchComparison::COMPARE_EQUAL,
-							'mimetype',
-							FileInfo::MIMETYPE_FOLDER
-						),
-					]
-				),
-				new SearchComparison(
-					ISearchComparison::COMPARE_EQUAL,
-					'size',
-					0
-				),
-			]
-		);
-
-		$filterNonRecentFiles = new SearchComparison(
-			ISearchComparison::COMPARE_GREATER_THAN,
-			'mtime',
-			strtotime('-2 week')
-		);
-		if ($offset === 0 && $limit <= 100) {
-			$query = new SearchQuery(
-				new SearchBinaryOperator(
-					ISearchBinaryOperator::OPERATOR_AND,
-					[
-						$filterOutNonEmptyFolder,
-						$filterNonRecentFiles,
-					],
-				),
-				$limit,
-				$offset,
-				[
-					new SearchOrder(
-						ISearchOrder::DIRECTION_DESCENDING,
-						'mtime'
-					),
-				]
-			);
-		} else {
-			$query = new SearchQuery(
-				$filterOutNonEmptyFolder,
-				$limit,
-				$offset,
-				[
-					new SearchOrder(
-						ISearchOrder::DIRECTION_DESCENDING,
-						'mtime'
-					),
-				]
-			);
-		}
-
-		return $this->search($query);
-	}
-
-	public function verifyPath($fileName, $readonly = false): void {
-		$this->view->verifyPath(
-			$this->getPath(),
-			$fileName,
-			$readonly,
-		);
-	}
-
-	private function recreateIfNeeded(): void {
-		if ($this->wasDeleted) {
-			$this->newFolder('');
-			$this->wasDeleted = false;
-		}
-	}
-
-	#[Override]
-	public function getOrCreateFolder(string $path, int $maxRetries = 5): IFolder {
-		$i = 0;
-		while (true) {
-			$path = $i === 0 ? $path : $path . ' (' . $i . ')';
-			try {
-				$folder = $this->get($path);
-				if ($folder instanceof IFolder) {
-					return $folder;
-				}
-			} catch (NotFoundException) {
-				$folder = dirname($path) === '.' ? $this : $this->get(dirname($path));
-				if (!($folder instanceof Folder)) {
-					throw new NotPermittedException("Unable to create folder $path. Parent is not a directory.");
-				}
-				return $folder->newFolder(basename($path));
-			}
-			$i++;
-			if ($i === $maxRetries) {
-				throw new NotPermittedException('Unable to load or create folder.');
-			}
-		}
-	}
+    private ?IUserManager $userManager = null;
+
+    private bool $wasDeleted = false;
+
+    /**
+     * Creates a Folder that represents a non-existing path
+     *
+     * @param string $path path
+     * @return NonExistingFolder non-existing node
+     */
+    protected function createNonExistingNode($path) {
+        return new NonExistingFolder($this->root, $this->view, $path);
+    }
+
+    /**
+     * @param string $path path relative to the folder
+     * @return string
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function getFullPath($path) {
+        $path = $this->normalizePath($path);
+        if (!$this->isValidPath($path)) {
+            throw new NotPermittedException('Invalid path "' . $path . '"');
+        }
+        return $this->path . $path;
+    }
+
+    /**
+     * @param string $path
+     * @return string|null
+     */
+    public function getRelativePath($path) {
+        return PathHelper::getRelativePath($this->getPath(), $path);
+    }
+
+    /**
+     * check if a node is a (grand-)child of the folder
+     *
+     * @param \OC\Files\Node\Node $node
+     * @return bool
+     */
+    public function isSubNode($node) {
+        return str_starts_with($node->getPath(), $this->path . '/');
+    }
+
+    /**
+     * get the content of this directory
+     *
+     * @return Node[]
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getDirectoryListing() {
+        $folderContent = $this->view->getDirectoryContent($this->path, '', $this->getFileInfo(false));
+
+        return array_map(function (FileInfo $info) {
+            if ($info->getMimetype() === FileInfo::MIMETYPE_FOLDER) {
+                return new Folder($this->root, $this->view, $info->getPath(), $info, $this);
+            } else {
+                return new File($this->root, $this->view, $info->getPath(), $info, $this);
+            }
+        }, $folderContent);
+    }
+
+    protected function createNode(string $path, ?FileInfo $info = null, bool $infoHasSubMountsIncluded = true): INode {
+        if (is_null($info)) {
+            $isDir = $this->view->is_dir($path);
+        } else {
+            $isDir = $info->getType() === FileInfo::TYPE_FOLDER;
+        }
+        $parent = dirname($path) === $this->getPath() ? $this : null;
+        if ($isDir) {
+            return new Folder($this->root, $this->view, $path, $info, $parent, $infoHasSubMountsIncluded);
+        } else {
+            return new File($this->root, $this->view, $path, $info, $parent);
+        }
+    }
+
+    public function get($path) {
+        return $this->root->get($this->getFullPath($path));
+    }
+
+    public function nodeExists($path) {
+        try {
+            $this->get($path);
+            return true;
+        } catch (NotFoundException|NotPermittedException) {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return \OC\Files\Node\Folder
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function newFolder($path) {
+        if ($this->checkPermissions(\OCP\Constants::PERMISSION_CREATE)) {
+            $fullPath = $this->getFullPath($path);
+            $nonExisting = new NonExistingFolder($this->root, $this->view, $fullPath);
+            $this->sendHooks(['preWrite', 'preCreate'], [$nonExisting]);
+            if (!$this->view->mkdir($fullPath)) {
+                // maybe another concurrent process created the folder already
+                if (!$this->view->is_dir($fullPath)) {
+                    throw new NotPermittedException('Could not create folder "' . $fullPath . '"');
+                } else {
+                    // we need to ensure we don't return before the concurrent request has finished updating the cache
+                    $tries = 5;
+                    while (!$this->view->getFileInfo($fullPath)) {
+                        if ($tries < 1) {
+                            throw new NotPermittedException('Could not create folder "' . $fullPath . '", folder exists but unable to get cache entry');
+                        }
+                        usleep(5 * 1000);
+                        $tries--;
+                    }
+                }
+            }
+            $parent = dirname($fullPath) === $this->getPath() ? $this : null;
+            $node = new Folder($this->root, $this->view, $fullPath, null, $parent);
+            $this->sendHooks(['postWrite', 'postCreate'], [$node]);
+            return $node;
+        } else {
+            throw new NotPermittedException('No create permission for folder "' . $path . '"');
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param string | resource | null $content
+     * @return \OC\Files\Node\File
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function newFile($path, $content = null) {
+        if ($path === '') {
+            throw new NotPermittedException('Could not create as provided path is empty');
+        }
+        $this->recreateIfNeeded();
+        if ($this->checkPermissions(\OCP\Constants::PERMISSION_CREATE)) {
+            $fullPath = $this->getFullPath($path);
+            $nonExisting = new NonExistingFile($this->root, $this->view, $fullPath);
+            $this->sendHooks(['preWrite', 'preCreate'], [$nonExisting]);
+            if ($content !== null) {
+                $result = $this->view->file_put_contents($fullPath, $content);
+            } else {
+                $result = $this->view->touch($fullPath);
+            }
+            if ($result === false) {
+                throw new NotPermittedException('Could not create path "' . $fullPath . '"');
+            }
+            $node = new File($this->root, $this->view, $fullPath, null, $this);
+            $this->sendHooks(['postWrite', 'postCreate'], [$node]);
+            return $node;
+        }
+        throw new NotPermittedException('No create permission for path "' . $path . '"');
+    }
+
+    private function queryFromOperator(ISearchOperator $operator, ?string $uid = null, int $limit = 0, int $offset = 0): ISearchQuery {
+        if ($uid === null) {
+            $user = null;
+        } else {
+            /** @var IUserManager $userManager */
+            $userManager = \OCP\Server::get(IUserManager::class);
+            $user = $userManager->get($uid);
+        }
+        return new SearchQuery($operator, $limit, $offset, [], $user);
+    }
+
+    /**
+     * search for files with the name matching $query
+     *
+     * @param string|ISearchQuery $query
+     * @return \OC\Files\Node\Node[]
+     */
+    public function search($query) {
+        if (is_string($query)) {
+            $query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', '%' . $query . '%'));
+        }
+
+        // search is handled by a single query covering all caches that this folder contains
+        // this is done by collect
+
+        $limitToHome = $query->limitToHome();
+        if ($limitToHome && count(explode('/', $this->path)) !== 3) {
+            throw new \InvalidArgumentException('searching by owner is only allowed in the users home folder');
+        }
+
+        /** @var QuerySearchHelper $searchHelper */
+        $searchHelper = \OC::$server->get(QuerySearchHelper::class);
+        [$caches, $mountByMountPoint] = $searchHelper->getCachesAndMountPointsForSearch($this->root, $this->path, $limitToHome);
+        $resultsPerCache = $searchHelper->searchInCaches($query, $caches);
+
+        // loop through all results per-cache, constructing the FileInfo object from the CacheEntry and merge them all
+        $files = array_merge(...array_map(function (array $results, string $relativeMountPoint) use ($mountByMountPoint) {
+            $mount = $mountByMountPoint[$relativeMountPoint];
+            return array_map(function (ICacheEntry $result) use ($relativeMountPoint, $mount) {
+                return $this->cacheEntryToFileInfo($mount, $relativeMountPoint, $result);
+            }, $results);
+        }, array_values($resultsPerCache), array_keys($resultsPerCache)));
+
+        // don't include this folder in the results
+        $files = array_values(array_filter($files, function (FileInfo $file) {
+            return $file->getPath() !== $this->getPath();
+        }));
+
+        // since results were returned per-cache, they are no longer fully sorted
+        $order = $query->getOrder();
+        if ($order) {
+            usort($files, function (FileInfo $a, FileInfo $b) use ($order) {
+                foreach ($order as $orderField) {
+                    $cmp = $orderField->sortFileInfo($a, $b);
+                    if ($cmp !== 0) {
+                        return $cmp;
+                    }
+                }
+                return 0;
+            });
+        }
+
+        return array_map(function (FileInfo $file) {
+            return $this->createNode($file->getPath(), $file);
+        }, $files);
+    }
+
+    private function cacheEntryToFileInfo(IMountPoint $mount, string $appendRoot, ICacheEntry $cacheEntry): FileInfo {
+        $cacheEntry['internalPath'] = $cacheEntry['path'];
+        $cacheEntry['path'] = rtrim($appendRoot . $cacheEntry->getPath(), '/');
+        $subPath = $cacheEntry['path'] !== '' ? '/' . $cacheEntry['path'] : '';
+        $storage = $mount->getStorage();
+
+        $owner = null;
+        $ownerId = $storage->getOwner($cacheEntry['internalPath']);
+        if ($ownerId !== false) {
+            // Cache the user manager (for performance)
+            if ($this->userManager === null) {
+                $this->userManager = \OCP\Server::get(IUserManager::class);
+            }
+            $owner = new LazyUser($ownerId, $this->userManager);
+        }
+
+        return new \OC\Files\FileInfo(
+            $this->path . $subPath,
+            $storage,
+            $cacheEntry['internalPath'],
+            $cacheEntry,
+            $mount,
+            $owner,
+        );
+    }
+
+    /**
+     * search for files by mimetype
+     *
+     * @param string $mimetype
+     * @return Node[]
+     */
+    public function searchByMime($mimetype) {
+        if (!str_contains($mimetype, '/')) {
+            $query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'mimetype', $mimetype . '/%'));
+        } else {
+            $query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'mimetype', $mimetype));
+        }
+        return $this->search($query);
+    }
+
+    /**
+     * search for files by tag
+     *
+     * @param string|int $tag name or tag id
+     * @param string $userId owner of the tags
+     * @return Node[]
+     */
+    public function searchByTag($tag, $userId) {
+        $query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'tagname', $tag), $userId);
+        return $this->search($query);
+    }
+
+    public function searchBySystemTag(string $tagName, string $userId, int $limit = 0, int $offset = 0): array {
+        $query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'systemtag', $tagName), $userId, $limit, $offset);
+        return $this->search($query);
+    }
+
+    /**
+     * @param int $id
+     * @return \OCP\Files\Node[]
+     */
+    public function getById($id) {
+        return $this->root->getByIdInPath((int)$id, $this->getPath());
+    }
+
+    public function getFirstNodeById(int $id): ?\OCP\Files\Node {
+        return $this->root->getFirstNodeByIdInPath($id, $this->getPath());
+    }
+
+    public function getAppDataDirectoryName(): string {
+        $instanceId = \OC::$server->getConfig()->getSystemValueString('instanceid');
+        return 'appdata_' . $instanceId;
+    }
+
+    /**
+     * In case the path we are currently in is inside the appdata_* folder,
+     * the original getById method does not work, because it can only look inside
+     * the user's mount points. But the user has no mount point for the root storage.
+     *
+     * So in that case we directly check the mount of the root if it contains
+     * the id. If it does we check if the path is inside the path we are working
+     * in.
+     *
+     * @param int $id
+     * @return array
+     */
+    protected function getByIdInRootMount(int $id): array {
+        if (!method_exists($this->root, 'createNode')) {
+            // Always expected to be false. Being a method of Folder, this is
+            // always implemented. For it is an internal method and should not
+            // be exposed and made public, it is not part of an interface.
+            return [];
+        }
+        $mount = $this->root->getMount('');
+        $storage = $mount->getStorage();
+        $cacheEntry = $storage?->getCache($this->path)->get($id);
+        if (!$cacheEntry) {
+            return [];
+        }
+
+        $absolutePath = '/' . ltrim($cacheEntry->getPath(), '/');
+        $currentPath = rtrim($this->path, '/') . '/';
+
+        if (!str_starts_with($absolutePath, $currentPath)) {
+            return [];
+        }
+
+        return [$this->root->createNode(
+            $absolutePath, new \OC\Files\FileInfo(
+                $absolutePath,
+                $storage,
+                $cacheEntry->getPath(),
+                $cacheEntry,
+                $mount
+            ))];
+    }
+
+    public function getFreeSpace() {
+        return $this->view->free_space($this->path);
+    }
+
+    public function delete() {
+        if ($this->checkPermissions(\OCP\Constants::PERMISSION_DELETE)) {
+            $this->sendHooks(['preDelete']);
+            $fileInfo = $this->getFileInfo();
+            $this->view->rmdir($this->path);
+            $nonExisting = new NonExistingFolder($this->root, $this->view, $this->path, $fileInfo);
+            $this->sendHooks(['postDelete'], [$nonExisting]);
+            $this->wasDeleted = true;
+        } else {
+            throw new NotPermittedException('No delete permission for path "' . $this->path . '"');
+        }
+    }
+
+    /**
+     * Add a suffix to the name in case the file exists
+     *
+     * @param string $filename
+     * @return string
+     * @throws NotPermittedException
+     */
+    public function getNonExistingName($filename) {
+        $path = $this->getPath();
+        if ($path === '/') {
+            $path = '';
+        }
+        if ($pos = strrpos($filename, '.')) {
+            $name = substr($filename, 0, $pos);
+            $ext = substr($filename, $pos);
+        } else {
+            $name = $filename;
+            $ext = '';
+        }
+
+        $newpath = $path . '/' . $filename;
+        if ($this->view->file_exists($newpath)) {
+            if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
+                /** @var array<int<0, max>, array> $matches */
+                //Replace the last "(number)" with "(number+1)"
+                $last_match = count($matches[0]) - 1;
+                $counter = $matches[1][$last_match][0] + 1;
+                $offset = $matches[0][$last_match][1];
+                $match_length = strlen($matches[0][$last_match][0]);
+            } else {
+                $counter = 2;
+                $match_length = 0;
+                $offset = false;
+            }
+            do {
+                if ($offset) {
+                    //Replace the last "(number)" with "(number+1)"
+                    $newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
+                } else {
+                    $newname = $name . ' (' . $counter . ')';
+                }
+                $newpath = $path . '/' . $newname . $ext;
+                $counter++;
+            } while ($this->view->file_exists($newpath));
+        }
+
+        return trim($this->getRelativePath($newpath), '/');
+    }
+
+    /**
+     * @param int $limit
+     * @param int $offset
+     * @return INode[]
+     */
+    public function getRecent($limit, $offset = 0) {
+        $filterOutNonEmptyFolder = new SearchBinaryOperator(
+            // filter out non empty folders
+            ISearchBinaryOperator::OPERATOR_OR,
+            [
+                new SearchBinaryOperator(
+                    ISearchBinaryOperator::OPERATOR_NOT,
+                    [
+                        new SearchComparison(
+                            ISearchComparison::COMPARE_EQUAL,
+                            'mimetype',
+                            FileInfo::MIMETYPE_FOLDER
+                        ),
+                    ]
+                ),
+                new SearchComparison(
+                    ISearchComparison::COMPARE_EQUAL,
+                    'size',
+                    0
+                ),
+            ]
+        );
+
+        $filterNonRecentFiles = new SearchComparison(
+            ISearchComparison::COMPARE_GREATER_THAN,
+            'mtime',
+            strtotime('-2 week')
+        );
+        if ($offset === 0 && $limit <= 100) {
+            $query = new SearchQuery(
+                new SearchBinaryOperator(
+                    ISearchBinaryOperator::OPERATOR_AND,
+                    [
+                        $filterOutNonEmptyFolder,
+                        $filterNonRecentFiles,
+                    ],
+                ),
+                $limit,
+                $offset,
+                [
+                    new SearchOrder(
+                        ISearchOrder::DIRECTION_DESCENDING,
+                        'mtime'
+                    ),
+                ]
+            );
+        } else {
+            $query = new SearchQuery(
+                $filterOutNonEmptyFolder,
+                $limit,
+                $offset,
+                [
+                    new SearchOrder(
+                        ISearchOrder::DIRECTION_DESCENDING,
+                        'mtime'
+                    ),
+                ]
+            );
+        }
+
+        return $this->search($query);
+    }
+
+    public function verifyPath($fileName, $readonly = false): void {
+        $this->view->verifyPath(
+            $this->getPath(),
+            $fileName,
+            $readonly,
+        );
+    }
+
+    private function recreateIfNeeded(): void {
+        if ($this->wasDeleted) {
+            $this->newFolder('');
+            $this->wasDeleted = false;
+        }
+    }
+
+    #[Override]
+    public function getOrCreateFolder(string $path, int $maxRetries = 5): IFolder {
+        $i = 0;
+        while (true) {
+            $path = $i === 0 ? $path : $path . ' (' . $i . ')';
+            try {
+                $folder = $this->get($path);
+                if ($folder instanceof IFolder) {
+                    return $folder;
+                }
+            } catch (NotFoundException) {
+                $folder = dirname($path) === '.' ? $this : $this->get(dirname($path));
+                if (!($folder instanceof Folder)) {
+                    throw new NotPermittedException("Unable to create folder $path. Parent is not a directory.");
+                }
+                return $folder->newFolder(basename($path));
+            }
+            $i++;
+            if ($i === $maxRetries) {
+                throw new NotPermittedException('Unable to load or create folder.');
+            }
+        }
+    }
 }

Spacing +30 added lines, -30 removed lines

@@ -53,9 +53,9 @@ 
 	public function getFullPath($path) {
 		$path = $this->normalizePath($path);
 		if (!$this->isValidPath($path)) {
-			throw new NotPermittedException('Invalid path "' . $path . '"');
+			throw new NotPermittedException('Invalid path "'.$path.'"');
 		}
-		return $this->path . $path;
+		return $this->path.$path;
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 	 * @return bool
 	 */
 	public function isSubNode($node) {
-		return str_starts_with($node->getPath(), $this->path . '/');
+		return str_starts_with($node->getPath(), $this->path.'/');
 	}
 
 	/**
@@ -85,7 +85,7 @@ 
 	public function getDirectoryListing() {
 		$folderContent = $this->view->getDirectoryContent($this->path, '', $this->getFileInfo(false));
 
-		return array_map(function (FileInfo $info) {
+		return array_map(function(FileInfo $info) {
 			if ($info->getMimetype() === FileInfo::MIMETYPE_FOLDER) {
 				return new Folder($this->root, $this->view, $info->getPath(), $info, $this);
 			} else {
@@ -116,7 +116,7 @@ 
 		try {
 			$this->get($path);
 			return true;
-		} catch (NotFoundException|NotPermittedException) {
+		} catch (NotFoundException | NotPermittedException) {
 			return false;
 		}
 	}
@@ -134,13 +134,13 @@ 
 			if (!$this->view->mkdir($fullPath)) {
 				// maybe another concurrent process created the folder already
 				if (!$this->view->is_dir($fullPath)) {
-					throw new NotPermittedException('Could not create folder "' . $fullPath . '"');
+					throw new NotPermittedException('Could not create folder "'.$fullPath.'"');
 				} else {
 					// we need to ensure we don't return before the concurrent request has finished updating the cache
 					$tries = 5;
 					while (!$this->view->getFileInfo($fullPath)) {
 						if ($tries < 1) {
-							throw new NotPermittedException('Could not create folder "' . $fullPath . '", folder exists but unable to get cache entry');
+							throw new NotPermittedException('Could not create folder "'.$fullPath.'", folder exists but unable to get cache entry');
 						}
 						usleep(5 * 1000);
 						$tries--;
@@ -152,7 +152,7 @@ 
 			$this->sendHooks(['postWrite', 'postCreate'], [$node]);
 			return $node;
 		} else {
-			throw new NotPermittedException('No create permission for folder "' . $path . '"');
+			throw new NotPermittedException('No create permission for folder "'.$path.'"');
 		}
 	}
 
@@ -177,13 +177,13 @@ 
 				$result = $this->view->touch($fullPath);
 			}
 			if ($result === false) {
-				throw new NotPermittedException('Could not create path "' . $fullPath . '"');
+				throw new NotPermittedException('Could not create path "'.$fullPath.'"');
 			}
 			$node = new File($this->root, $this->view, $fullPath, null, $this);
 			$this->sendHooks(['postWrite', 'postCreate'], [$node]);
 			return $node;
 		}
-		throw new NotPermittedException('No create permission for path "' . $path . '"');
+		throw new NotPermittedException('No create permission for path "'.$path.'"');
 	}
 
 	private function queryFromOperator(ISearchOperator $operator, ?string $uid = null, int $limit = 0, int $offset = 0): ISearchQuery {
@@ -205,7 +205,7 @@ 
 	 */
 	public function search($query) {
 		if (is_string($query)) {
-			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', '%' . $query . '%'));
+			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', '%'.$query.'%'));
 		}
 
 		// search is handled by a single query covering all caches that this folder contains
@@ -222,22 +222,22 @@ 
 		$resultsPerCache = $searchHelper->searchInCaches($query, $caches);
 
 		// loop through all results per-cache, constructing the FileInfo object from the CacheEntry and merge them all
-		$files = array_merge(...array_map(function (array $results, string $relativeMountPoint) use ($mountByMountPoint) {
+		$files = array_merge(...array_map(function(array $results, string $relativeMountPoint) use ($mountByMountPoint) {
 			$mount = $mountByMountPoint[$relativeMountPoint];
-			return array_map(function (ICacheEntry $result) use ($relativeMountPoint, $mount) {
+			return array_map(function(ICacheEntry $result) use ($relativeMountPoint, $mount) {
 				return $this->cacheEntryToFileInfo($mount, $relativeMountPoint, $result);
 			}, $results);
 		}, array_values($resultsPerCache), array_keys($resultsPerCache)));
 
 		// don't include this folder in the results
-		$files = array_values(array_filter($files, function (FileInfo $file) {
+		$files = array_values(array_filter($files, function(FileInfo $file) {
 			return $file->getPath() !== $this->getPath();
 		}));
 
 		// since results were returned per-cache, they are no longer fully sorted
 		$order = $query->getOrder();
 		if ($order) {
-			usort($files, function (FileInfo $a, FileInfo $b) use ($order) {
+			usort($files, function(FileInfo $a, FileInfo $b) use ($order) {
 				foreach ($order as $orderField) {
 					$cmp = $orderField->sortFileInfo($a, $b);
 					if ($cmp !== 0) {
@@ -248,15 +248,15 @@ 
 			});
 		}
 
-		return array_map(function (FileInfo $file) {
+		return array_map(function(FileInfo $file) {
 			return $this->createNode($file->getPath(), $file);
 		}, $files);
 	}
 
 	private function cacheEntryToFileInfo(IMountPoint $mount, string $appendRoot, ICacheEntry $cacheEntry): FileInfo {
 		$cacheEntry['internalPath'] = $cacheEntry['path'];
-		$cacheEntry['path'] = rtrim($appendRoot . $cacheEntry->getPath(), '/');
-		$subPath = $cacheEntry['path'] !== '' ? '/' . $cacheEntry['path'] : '';
+		$cacheEntry['path'] = rtrim($appendRoot.$cacheEntry->getPath(), '/');
+		$subPath = $cacheEntry['path'] !== '' ? '/'.$cacheEntry['path'] : '';
 		$storage = $mount->getStorage();
 
 		$owner = null;
@@ -270,7 +270,7 @@ 
 		}
 
 		return new \OC\Files\FileInfo(
-			$this->path . $subPath,
+			$this->path.$subPath,
 			$storage,
 			$cacheEntry['internalPath'],
 			$cacheEntry,
@@ -287,7 +287,7 @@ 
 	 */
 	public function searchByMime($mimetype) {
 		if (!str_contains($mimetype, '/')) {
-			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'mimetype', $mimetype . '/%'));
+			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'mimetype', $mimetype.'/%'));
 		} else {
 			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'mimetype', $mimetype));
 		}
@@ -316,7 +316,7 @@ 
 	 * @return \OCP\Files\Node[]
 	 */
 	public function getById($id) {
-		return $this->root->getByIdInPath((int)$id, $this->getPath());
+		return $this->root->getByIdInPath((int) $id, $this->getPath());
 	}
 
 	public function getFirstNodeById(int $id): ?\OCP\Files\Node {
@@ -325,7 +325,7 @@ 
 
 	public function getAppDataDirectoryName(): string {
 		$instanceId = \OC::$server->getConfig()->getSystemValueString('instanceid');
-		return 'appdata_' . $instanceId;
+		return 'appdata_'.$instanceId;
 	}
 
 	/**
@@ -354,8 +354,8 @@ 
 			return [];
 		}
 
-		$absolutePath = '/' . ltrim($cacheEntry->getPath(), '/');
-		$currentPath = rtrim($this->path, '/') . '/';
+		$absolutePath = '/'.ltrim($cacheEntry->getPath(), '/');
+		$currentPath = rtrim($this->path, '/').'/';
 
 		if (!str_starts_with($absolutePath, $currentPath)) {
 			return [];
@@ -384,7 +384,7 @@ 
 			$this->sendHooks(['postDelete'], [$nonExisting]);
 			$this->wasDeleted = true;
 		} else {
-			throw new NotPermittedException('No delete permission for path "' . $this->path . '"');
+			throw new NotPermittedException('No delete permission for path "'.$this->path.'"');
 		}
 	}
 
@@ -408,7 +408,7 @@ 
 			$ext = '';
 		}
 
-		$newpath = $path . '/' . $filename;
+		$newpath = $path.'/'.$filename;
 		if ($this->view->file_exists($newpath)) {
 			if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
 				/** @var array<int<0, max>, array> $matches */
@@ -425,11 +425,11 @@ 
 			do {
 				if ($offset) {
 					//Replace the last "(number)" with "(number+1)"
-					$newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
+					$newname = substr_replace($name, '('.$counter.')', $offset, $match_length);
 				} else {
-					$newname = $name . ' (' . $counter . ')';
+					$newname = $name.' ('.$counter.')';
 				}
-				$newpath = $path . '/' . $newname . $ext;
+				$newpath = $path.'/'.$newname.$ext;
 				$counter++;
 			} while ($this->view->file_exists($newpath));
 		}
@@ -524,7 +524,7 @@ 
 	public function getOrCreateFolder(string $path, int $maxRetries = 5): IFolder {
 		$i = 0;
 		while (true) {
-			$path = $i === 0 ? $path : $path . ' (' . $i . ')';
+			$path = $i === 0 ? $path : $path.' ('.$i.')';
 			try {
 				$folder = $this->get($path);
 				if ($folder instanceof IFolder) {

lib/private/Files/Node/LazyFolder.php

Indentation +543 added lines, -543 removed lines

@@ -25,547 +25,547 @@
  * @package OC\Files\Node
  */
 class LazyFolder implements Folder {
-	/** @var \Closure(): Folder */
-	private \Closure $folderClosure;
-	protected ?Folder $folder = null;
-	protected IRootFolder $rootFolder;
-	protected array $data;
-
-	/**
-	 * @param IRootFolder $rootFolder
-	 * @param \Closure(): Folder $folderClosure
-	 * @param array $data
-	 */
-	public function __construct(IRootFolder $rootFolder, \Closure $folderClosure, array $data = []) {
-		$this->rootFolder = $rootFolder;
-		$this->folderClosure = $folderClosure;
-		$this->data = $data;
-	}
-
-	protected function getRootFolder(): IRootFolder {
-		return $this->rootFolder;
-	}
-
-	protected function getRealFolder(): Folder {
-		if ($this->folder === null) {
-			$this->folder = call_user_func($this->folderClosure);
-		}
-		return $this->folder;
-	}
-
-	/**
-	 * Magic method to first get the real rootFolder and then
-	 * call $method with $args on it
-	 *
-	 * @param $method
-	 * @param $args
-	 * @return mixed
-	 */
-	public function __call($method, $args) {
-		return call_user_func_array([$this->getRealFolder(), $method], $args);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getUser() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function listen($scope, $method, callable $callback) {
-		$this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function removeListener($scope = null, $method = null, ?callable $callback = null) {
-		$this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function emit($scope, $method, $arguments = []) {
-		$this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function mount($storage, $mountPoint, $arguments = []) {
-		$this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getMount(string $mountPoint): IMountPoint {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @return IMountPoint[]
-	 */
-	public function getMountsIn(string $mountPoint): array {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getMountByStorageId($storageId) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getMountByNumericStorageId($numericId) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function unMount($mount) {
-		$this->__call(__FUNCTION__, func_get_args());
-	}
-
-	public function get($path) {
-		return $this->getRootFolder()->get($this->getFullPath($path));
-	}
-
-	#[Override]
-	public function getOrCreateFolder(string $path, int $maxRetries = 5): Folder {
-		return $this->getRootFolder()->getOrCreateFolder($this->getFullPath($path), $maxRetries);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function rename($targetPath) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function delete() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function copy($targetPath) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function touch($mtime = null) {
-		$this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getStorage() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getPath() {
-		if (isset($this->data['path'])) {
-			return $this->data['path'];
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getInternalPath() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getId() {
-		if (isset($this->data['fileid'])) {
-			return $this->data['fileid'];
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function stat() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getMTime() {
-		if (isset($this->data['mtime'])) {
-			return $this->data['mtime'];
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getSize($includeMounts = true): int|float {
-		if (isset($this->data['size'])) {
-			return $this->data['size'];
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getEtag() {
-		if (isset($this->data['etag'])) {
-			return $this->data['etag'];
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getPermissions() {
-		if (isset($this->data['permissions'])) {
-			return $this->data['permissions'];
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function isReadable() {
-		if (isset($this->data['permissions'])) {
-			return ($this->data['permissions'] & Constants::PERMISSION_READ) == Constants::PERMISSION_READ;
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function isUpdateable() {
-		if (isset($this->data['permissions'])) {
-			return ($this->data['permissions'] & Constants::PERMISSION_UPDATE) == Constants::PERMISSION_UPDATE;
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function isDeletable() {
-		if (isset($this->data['permissions'])) {
-			return ($this->data['permissions'] & Constants::PERMISSION_DELETE) == Constants::PERMISSION_DELETE;
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function isShareable() {
-		if (isset($this->data['permissions'])) {
-			return ($this->data['permissions'] & Constants::PERMISSION_SHARE) == Constants::PERMISSION_SHARE;
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getParent() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName() {
-		if (isset($this->data['path'])) {
-			return basename($this->data['path']);
-		}
-		if (isset($this->data['name'])) {
-			return $this->data['name'];
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getUserFolder($userId) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	public function getMimetype(): string {
-		if (isset($this->data['mimetype'])) {
-			return $this->data['mimetype'];
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getMimePart() {
-		if (isset($this->data['mimetype'])) {
-			[$part,] = explode('/', $this->data['mimetype']);
-			return $part;
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function isEncrypted() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getType() {
-		if (isset($this->data['type'])) {
-			return $this->data['type'];
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function isShared() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function isMounted() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getMountPoint() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOwner() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getChecksum() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	public function getExtension(): string {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getFullPath($path) {
-		if (isset($this->data['path'])) {
-			$path = PathHelper::normalizePath($path);
-			if (!Filesystem::isValidPath($path)) {
-				throw new NotPermittedException('Invalid path "' . $path . '"');
-			}
-			return $this->data['path'] . $path;
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function isSubNode($node) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getDirectoryListing() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	public function nodeExists($path) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function newFolder($path) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function newFile($path, $content = null) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function search($query) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function searchByMime($mimetype) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function searchByTag($tag, $userId) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	public function searchBySystemTag(string $tagName, string $userId, int $limit = 0, int $offset = 0) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getById($id) {
-		return $this->getRootFolder()->getByIdInPath((int)$id, $this->getPath());
-	}
-
-	public function getFirstNodeById(int $id): ?\OCP\Files\Node {
-		return $this->getRootFolder()->getFirstNodeByIdInPath($id, $this->getPath());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getFreeSpace() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function isCreatable() {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getNonExistingName($filename) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function move($targetPath) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function lock($type) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function changeLock($targetType) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function unlock($type) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getRecent($limit, $offset = 0) {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getCreationTime(): int {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getUploadTime(): int {
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	public function getRelativePath($path) {
-		return PathHelper::getRelativePath($this->getPath(), $path);
-	}
-
-	public function getParentId(): int {
-		if (isset($this->data['parent'])) {
-			return $this->data['parent'];
-		}
-		return $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	/**
-	 * @inheritDoc
-	 * @return array<string, int|string|bool|float|string[]|int[]>
-	 */
-	public function getMetadata(): array {
-		return $this->data['metadata'] ?? $this->__call(__FUNCTION__, func_get_args());
-	}
-
-	public function verifyPath($fileName, $readonly = false): void {
-		$this->__call(__FUNCTION__, func_get_args());
-	}
+    /** @var \Closure(): Folder */
+    private \Closure $folderClosure;
+    protected ?Folder $folder = null;
+    protected IRootFolder $rootFolder;
+    protected array $data;
+
+    /**
+     * @param IRootFolder $rootFolder
+     * @param \Closure(): Folder $folderClosure
+     * @param array $data
+     */
+    public function __construct(IRootFolder $rootFolder, \Closure $folderClosure, array $data = []) {
+        $this->rootFolder = $rootFolder;
+        $this->folderClosure = $folderClosure;
+        $this->data = $data;
+    }
+
+    protected function getRootFolder(): IRootFolder {
+        return $this->rootFolder;
+    }
+
+    protected function getRealFolder(): Folder {
+        if ($this->folder === null) {
+            $this->folder = call_user_func($this->folderClosure);
+        }
+        return $this->folder;
+    }
+
+    /**
+     * Magic method to first get the real rootFolder and then
+     * call $method with $args on it
+     *
+     * @param $method
+     * @param $args
+     * @return mixed
+     */
+    public function __call($method, $args) {
+        return call_user_func_array([$this->getRealFolder(), $method], $args);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUser() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function listen($scope, $method, callable $callback) {
+        $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function removeListener($scope = null, $method = null, ?callable $callback = null) {
+        $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function emit($scope, $method, $arguments = []) {
+        $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function mount($storage, $mountPoint, $arguments = []) {
+        $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMount(string $mountPoint): IMountPoint {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @return IMountPoint[]
+     */
+    public function getMountsIn(string $mountPoint): array {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMountByStorageId($storageId) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMountByNumericStorageId($numericId) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function unMount($mount) {
+        $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    public function get($path) {
+        return $this->getRootFolder()->get($this->getFullPath($path));
+    }
+
+    #[Override]
+    public function getOrCreateFolder(string $path, int $maxRetries = 5): Folder {
+        return $this->getRootFolder()->getOrCreateFolder($this->getFullPath($path), $maxRetries);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function rename($targetPath) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function delete() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function copy($targetPath) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function touch($mtime = null) {
+        $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getStorage() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getPath() {
+        if (isset($this->data['path'])) {
+            return $this->data['path'];
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getInternalPath() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId() {
+        if (isset($this->data['fileid'])) {
+            return $this->data['fileid'];
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function stat() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMTime() {
+        if (isset($this->data['mtime'])) {
+            return $this->data['mtime'];
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSize($includeMounts = true): int|float {
+        if (isset($this->data['size'])) {
+            return $this->data['size'];
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getEtag() {
+        if (isset($this->data['etag'])) {
+            return $this->data['etag'];
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getPermissions() {
+        if (isset($this->data['permissions'])) {
+            return $this->data['permissions'];
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isReadable() {
+        if (isset($this->data['permissions'])) {
+            return ($this->data['permissions'] & Constants::PERMISSION_READ) == Constants::PERMISSION_READ;
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isUpdateable() {
+        if (isset($this->data['permissions'])) {
+            return ($this->data['permissions'] & Constants::PERMISSION_UPDATE) == Constants::PERMISSION_UPDATE;
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isDeletable() {
+        if (isset($this->data['permissions'])) {
+            return ($this->data['permissions'] & Constants::PERMISSION_DELETE) == Constants::PERMISSION_DELETE;
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isShareable() {
+        if (isset($this->data['permissions'])) {
+            return ($this->data['permissions'] & Constants::PERMISSION_SHARE) == Constants::PERMISSION_SHARE;
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getParent() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName() {
+        if (isset($this->data['path'])) {
+            return basename($this->data['path']);
+        }
+        if (isset($this->data['name'])) {
+            return $this->data['name'];
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUserFolder($userId) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    public function getMimetype(): string {
+        if (isset($this->data['mimetype'])) {
+            return $this->data['mimetype'];
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMimePart() {
+        if (isset($this->data['mimetype'])) {
+            [$part,] = explode('/', $this->data['mimetype']);
+            return $part;
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isEncrypted() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getType() {
+        if (isset($this->data['type'])) {
+            return $this->data['type'];
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isShared() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isMounted() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMountPoint() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOwner() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getChecksum() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    public function getExtension(): string {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFullPath($path) {
+        if (isset($this->data['path'])) {
+            $path = PathHelper::normalizePath($path);
+            if (!Filesystem::isValidPath($path)) {
+                throw new NotPermittedException('Invalid path "' . $path . '"');
+            }
+            return $this->data['path'] . $path;
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isSubNode($node) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDirectoryListing() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    public function nodeExists($path) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function newFolder($path) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function newFile($path, $content = null) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function search($query) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function searchByMime($mimetype) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function searchByTag($tag, $userId) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    public function searchBySystemTag(string $tagName, string $userId, int $limit = 0, int $offset = 0) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getById($id) {
+        return $this->getRootFolder()->getByIdInPath((int)$id, $this->getPath());
+    }
+
+    public function getFirstNodeById(int $id): ?\OCP\Files\Node {
+        return $this->getRootFolder()->getFirstNodeByIdInPath($id, $this->getPath());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFreeSpace() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isCreatable() {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getNonExistingName($filename) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function move($targetPath) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function lock($type) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function changeLock($targetType) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function unlock($type) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getRecent($limit, $offset = 0) {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getCreationTime(): int {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUploadTime(): int {
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    public function getRelativePath($path) {
+        return PathHelper::getRelativePath($this->getPath(), $path);
+    }
+
+    public function getParentId(): int {
+        if (isset($this->data['parent'])) {
+            return $this->data['parent'];
+        }
+        return $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    /**
+     * @inheritDoc
+     * @return array<string, int|string|bool|float|string[]|int[]>
+     */
+    public function getMetadata(): array {
+        return $this->data['metadata'] ?? $this->__call(__FUNCTION__, func_get_args());
+    }
+
+    public function verifyPath($fileName, $readonly = false): void {
+        $this->__call(__FUNCTION__, func_get_args());
+    }
 }

lib/private/Share20/DefaultShareProvider.php

Indentation +1597 added lines, -1597 removed lines

@@ -45,1637 +45,1637 @@
  * @package OC\Share20
  */
 class DefaultShareProvider implements IShareProviderWithNotification, IShareProviderSupportsAccept, IShareProviderSupportsAllSharesInFolder {
-	public function __construct(
-		private IDBConnection $dbConn,
-		private IUserManager $userManager,
-		private IGroupManager $groupManager,
-		private IRootFolder $rootFolder,
-		private IMailer $mailer,
-		private Defaults $defaults,
-		private IFactory $l10nFactory,
-		private IURLGenerator $urlGenerator,
-		private ITimeFactory $timeFactory,
-		private LoggerInterface $logger,
-		private IManager $shareManager,
-		private IConfig $config,
-	) {
-	}
-
-	/**
-	 * Return the identifier of this provider.
-	 *
-	 * @return string Containing only [a-zA-Z0-9]
-	 */
-	public function identifier() {
-		return 'ocinternal';
-	}
-
-	/**
-	 * Share a path
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare The share object
-	 * @throws ShareNotFound
-	 * @throws \Exception
-	 */
-	public function create(\OCP\Share\IShare $share) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->insert('share');
-		$qb->setValue('share_type', $qb->createNamedParameter($share->getShareType()));
-
-		$expirationDate = $share->getExpirationDate();
-		if ($expirationDate !== null) {
-			$expirationDate = clone $expirationDate;
-			$expirationDate->setTimezone(new \DateTimeZone(date_default_timezone_get()));
-		}
-
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			//Set the UID of the user we share with
-			$qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
-			$qb->setValue('accepted', $qb->createNamedParameter(IShare::STATUS_PENDING));
-
-			//If an expiration date is set store it
-			if ($expirationDate !== null) {
-				$qb->setValue('expiration', $qb->createNamedParameter($expirationDate, 'datetime'));
-			}
-
-			$qb->setValue('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL));
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			//Set the GID of the group we share with
-			$qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
-
-			//If an expiration date is set store it
-			if ($expirationDate !== null) {
-				$qb->setValue('expiration', $qb->createNamedParameter($expirationDate, 'datetime'));
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_LINK) {
-			//set label for public link
-			$qb->setValue('label', $qb->createNamedParameter($share->getLabel()));
-			//Set the token of the share
-			$qb->setValue('token', $qb->createNamedParameter($share->getToken()));
-
-			//If a password is set store it
-			if ($share->getPassword() !== null) {
-				$qb->setValue('password', $qb->createNamedParameter($share->getPassword()));
-			}
-
-			$qb->setValue('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL));
-
-			//If an expiration date is set store it
-			if ($expirationDate !== null) {
-				$qb->setValue('expiration', $qb->createNamedParameter($expirationDate, 'datetime'));
-			}
-
-			$qb->setValue('parent', $qb->createNamedParameter($share->getParent()));
-
-			$qb->setValue('hide_download', $qb->createNamedParameter($share->getHideDownload() ? 1 : 0, IQueryBuilder::PARAM_INT));
-		} else {
-			throw new \Exception('invalid share type!');
-		}
-
-		// Set what is shares
-		$qb->setValue('item_type', $qb->createParameter('itemType'));
-		if ($share->getNode() instanceof \OCP\Files\File) {
-			$qb->setParameter('itemType', 'file');
-		} else {
-			$qb->setParameter('itemType', 'folder');
-		}
-
-		// Set the file id
-		$qb->setValue('item_source', $qb->createNamedParameter($share->getNode()->getId()));
-		$qb->setValue('file_source', $qb->createNamedParameter($share->getNode()->getId()));
-
-		// set the permissions
-		$qb->setValue('permissions', $qb->createNamedParameter($share->getPermissions()));
-
-		// set share attributes
-		$shareAttributes = $this->formatShareAttributes(
-			$share->getAttributes()
-		);
-		$qb->setValue('attributes', $qb->createNamedParameter($shareAttributes));
-
-		// Set who created this share
-		$qb->setValue('uid_initiator', $qb->createNamedParameter($share->getSharedBy()));
-
-		// Set who is the owner of this file/folder (and this the owner of the share)
-		$qb->setValue('uid_owner', $qb->createNamedParameter($share->getShareOwner()));
-
-		// Set the file target
-		$qb->setValue('file_target', $qb->createNamedParameter($share->getTarget()));
-
-		if ($share->getNote() !== '') {
-			$qb->setValue('note', $qb->createNamedParameter($share->getNote()));
-		}
-
-		// Set the time this share was created
-		$shareTime = $this->timeFactory->now();
-		$qb->setValue('stime', $qb->createNamedParameter($shareTime->getTimestamp()));
-
-		// insert the data and fetch the id of the share
-		$qb->executeStatement();
-
-		// Update mandatory data
-		$id = $qb->getLastInsertId();
-		$share->setId((string)$id);
-		$share->setProviderId($this->identifier());
-
-		$share->setShareTime(\DateTime::createFromImmutable($shareTime));
-
-		$mailSendValue = $share->getMailSend();
-		$share->setMailSend(($mailSendValue === null) ? true : $mailSendValue);
-
-		return $share;
-	}
-
-	/**
-	 * Update a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare The share object
-	 * @throws ShareNotFound
-	 * @throws \OCP\Files\InvalidPathException
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function update(\OCP\Share\IShare $share) {
-		$originalShare = $this->getShareById($share->getId());
-
-		$shareAttributes = $this->formatShareAttributes($share->getAttributes());
-
-		$expirationDate = $share->getExpirationDate();
-		if ($expirationDate !== null) {
-			$expirationDate = clone $expirationDate;
-			$expirationDate->setTimezone(new \DateTimeZone(date_default_timezone_get()));
-		}
-
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			/*
+    public function __construct(
+        private IDBConnection $dbConn,
+        private IUserManager $userManager,
+        private IGroupManager $groupManager,
+        private IRootFolder $rootFolder,
+        private IMailer $mailer,
+        private Defaults $defaults,
+        private IFactory $l10nFactory,
+        private IURLGenerator $urlGenerator,
+        private ITimeFactory $timeFactory,
+        private LoggerInterface $logger,
+        private IManager $shareManager,
+        private IConfig $config,
+    ) {
+    }
+
+    /**
+     * Return the identifier of this provider.
+     *
+     * @return string Containing only [a-zA-Z0-9]
+     */
+    public function identifier() {
+        return 'ocinternal';
+    }
+
+    /**
+     * Share a path
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare The share object
+     * @throws ShareNotFound
+     * @throws \Exception
+     */
+    public function create(\OCP\Share\IShare $share) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->insert('share');
+        $qb->setValue('share_type', $qb->createNamedParameter($share->getShareType()));
+
+        $expirationDate = $share->getExpirationDate();
+        if ($expirationDate !== null) {
+            $expirationDate = clone $expirationDate;
+            $expirationDate->setTimezone(new \DateTimeZone(date_default_timezone_get()));
+        }
+
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            //Set the UID of the user we share with
+            $qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
+            $qb->setValue('accepted', $qb->createNamedParameter(IShare::STATUS_PENDING));
+
+            //If an expiration date is set store it
+            if ($expirationDate !== null) {
+                $qb->setValue('expiration', $qb->createNamedParameter($expirationDate, 'datetime'));
+            }
+
+            $qb->setValue('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL));
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            //Set the GID of the group we share with
+            $qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
+
+            //If an expiration date is set store it
+            if ($expirationDate !== null) {
+                $qb->setValue('expiration', $qb->createNamedParameter($expirationDate, 'datetime'));
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_LINK) {
+            //set label for public link
+            $qb->setValue('label', $qb->createNamedParameter($share->getLabel()));
+            //Set the token of the share
+            $qb->setValue('token', $qb->createNamedParameter($share->getToken()));
+
+            //If a password is set store it
+            if ($share->getPassword() !== null) {
+                $qb->setValue('password', $qb->createNamedParameter($share->getPassword()));
+            }
+
+            $qb->setValue('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL));
+
+            //If an expiration date is set store it
+            if ($expirationDate !== null) {
+                $qb->setValue('expiration', $qb->createNamedParameter($expirationDate, 'datetime'));
+            }
+
+            $qb->setValue('parent', $qb->createNamedParameter($share->getParent()));
+
+            $qb->setValue('hide_download', $qb->createNamedParameter($share->getHideDownload() ? 1 : 0, IQueryBuilder::PARAM_INT));
+        } else {
+            throw new \Exception('invalid share type!');
+        }
+
+        // Set what is shares
+        $qb->setValue('item_type', $qb->createParameter('itemType'));
+        if ($share->getNode() instanceof \OCP\Files\File) {
+            $qb->setParameter('itemType', 'file');
+        } else {
+            $qb->setParameter('itemType', 'folder');
+        }
+
+        // Set the file id
+        $qb->setValue('item_source', $qb->createNamedParameter($share->getNode()->getId()));
+        $qb->setValue('file_source', $qb->createNamedParameter($share->getNode()->getId()));
+
+        // set the permissions
+        $qb->setValue('permissions', $qb->createNamedParameter($share->getPermissions()));
+
+        // set share attributes
+        $shareAttributes = $this->formatShareAttributes(
+            $share->getAttributes()
+        );
+        $qb->setValue('attributes', $qb->createNamedParameter($shareAttributes));
+
+        // Set who created this share
+        $qb->setValue('uid_initiator', $qb->createNamedParameter($share->getSharedBy()));
+
+        // Set who is the owner of this file/folder (and this the owner of the share)
+        $qb->setValue('uid_owner', $qb->createNamedParameter($share->getShareOwner()));
+
+        // Set the file target
+        $qb->setValue('file_target', $qb->createNamedParameter($share->getTarget()));
+
+        if ($share->getNote() !== '') {
+            $qb->setValue('note', $qb->createNamedParameter($share->getNote()));
+        }
+
+        // Set the time this share was created
+        $shareTime = $this->timeFactory->now();
+        $qb->setValue('stime', $qb->createNamedParameter($shareTime->getTimestamp()));
+
+        // insert the data and fetch the id of the share
+        $qb->executeStatement();
+
+        // Update mandatory data
+        $id = $qb->getLastInsertId();
+        $share->setId((string)$id);
+        $share->setProviderId($this->identifier());
+
+        $share->setShareTime(\DateTime::createFromImmutable($shareTime));
+
+        $mailSendValue = $share->getMailSend();
+        $share->setMailSend(($mailSendValue === null) ? true : $mailSendValue);
+
+        return $share;
+    }
+
+    /**
+     * Update a share
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare The share object
+     * @throws ShareNotFound
+     * @throws \OCP\Files\InvalidPathException
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function update(\OCP\Share\IShare $share) {
+        $originalShare = $this->getShareById($share->getId());
+
+        $shareAttributes = $this->formatShareAttributes($share->getAttributes());
+
+        $expirationDate = $share->getExpirationDate();
+        if ($expirationDate !== null) {
+            $expirationDate = clone $expirationDate;
+            $expirationDate->setTimezone(new \DateTimeZone(date_default_timezone_get()));
+        }
+
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            /*
 			 * We allow updating the recipient on user shares.
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('share_with', $qb->createNamedParameter($share->getSharedWith()))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('attributes', $qb->createNamedParameter($shareAttributes))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('expiration', $qb->createNamedParameter($expirationDate, IQueryBuilder::PARAM_DATETIME_MUTABLE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->set('accepted', $qb->createNamedParameter($share->getStatus()))
-				->set('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL))
-				->executeStatement();
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('attributes', $qb->createNamedParameter($shareAttributes))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('expiration', $qb->createNamedParameter($expirationDate, IQueryBuilder::PARAM_DATETIME_MUTABLE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->executeStatement();
-
-			/*
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->set('share_with', $qb->createNamedParameter($share->getSharedWith()))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('attributes', $qb->createNamedParameter($shareAttributes))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('expiration', $qb->createNamedParameter($expirationDate, IQueryBuilder::PARAM_DATETIME_MUTABLE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->set('accepted', $qb->createNamedParameter($share->getStatus()))
+                ->set('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL))
+                ->executeStatement();
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('attributes', $qb->createNamedParameter($shareAttributes))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('expiration', $qb->createNamedParameter($expirationDate, IQueryBuilder::PARAM_DATETIME_MUTABLE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->executeStatement();
+
+            /*
 			 * Update all user defined group shares
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('expiration', $qb->createNamedParameter($expirationDate, IQueryBuilder::PARAM_DATETIME_MUTABLE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->executeStatement();
-
-			/*
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('expiration', $qb->createNamedParameter($expirationDate, IQueryBuilder::PARAM_DATETIME_MUTABLE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->executeStatement();
+
+            /*
 			 * Now update the permissions for all children that have not set it to 0
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->neq('permissions', $qb->createNamedParameter(0)))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('attributes', $qb->createNamedParameter($shareAttributes))
-				->executeStatement();
-		} elseif ($share->getShareType() === IShare::TYPE_LINK) {
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('password', $qb->createNamedParameter($share->getPassword()))
-				->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('attributes', $qb->createNamedParameter($shareAttributes))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('token', $qb->createNamedParameter($share->getToken()))
-				->set('expiration', $qb->createNamedParameter($expirationDate, IQueryBuilder::PARAM_DATETIME_MUTABLE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->set('label', $qb->createNamedParameter($share->getLabel()))
-				->set('hide_download', $qb->createNamedParameter($share->getHideDownload() ? 1 : 0, IQueryBuilder::PARAM_INT))
-				->executeStatement();
-		}
-
-		if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
-			$this->propagateNote($share);
-		}
-
-
-		return $share;
-	}
-
-	/**
-	 * Accept a share.
-	 *
-	 * @param IShare $share
-	 * @param string $recipient
-	 * @return IShare The share object
-	 * @since 9.0.0
-	 */
-	public function acceptShare(IShare $share, string $recipient): IShare {
-		if ($share->getShareType() === IShare::TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($recipient);
-
-			if (is_null($group)) {
-				throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
-			}
-
-			if (!$group->inGroup($user)) {
-				throw new ProviderException('Recipient not in receiving group');
-			}
-
-			// Try to fetch user specific share
-			$qb = $this->dbConn->getQueryBuilder();
-			$stmt = $qb->select('*')
-				->from('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
-				->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
-				->executeQuery();
-
-			$data = $stmt->fetch();
-			$stmt->closeCursor();
-
-			/*
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->neq('permissions', $qb->createNamedParameter(0)))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('attributes', $qb->createNamedParameter($shareAttributes))
+                ->executeStatement();
+        } elseif ($share->getShareType() === IShare::TYPE_LINK) {
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->set('password', $qb->createNamedParameter($share->getPassword()))
+                ->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('attributes', $qb->createNamedParameter($shareAttributes))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('token', $qb->createNamedParameter($share->getToken()))
+                ->set('expiration', $qb->createNamedParameter($expirationDate, IQueryBuilder::PARAM_DATETIME_MUTABLE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->set('label', $qb->createNamedParameter($share->getLabel()))
+                ->set('hide_download', $qb->createNamedParameter($share->getHideDownload() ? 1 : 0, IQueryBuilder::PARAM_INT))
+                ->executeStatement();
+        }
+
+        if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
+            $this->propagateNote($share);
+        }
+
+
+        return $share;
+    }
+
+    /**
+     * Accept a share.
+     *
+     * @param IShare $share
+     * @param string $recipient
+     * @return IShare The share object
+     * @since 9.0.0
+     */
+    public function acceptShare(IShare $share, string $recipient): IShare {
+        if ($share->getShareType() === IShare::TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($recipient);
+
+            if (is_null($group)) {
+                throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
+            }
+
+            if (!$group->inGroup($user)) {
+                throw new ProviderException('Recipient not in receiving group');
+            }
+
+            // Try to fetch user specific share
+            $qb = $this->dbConn->getQueryBuilder();
+            $stmt = $qb->select('*')
+                ->from('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
+                ->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
+                ->executeQuery();
+
+            $data = $stmt->fetch();
+            $stmt->closeCursor();
+
+            /*
 			 * Check if there already is a user specific group share.
 			 * If there is update it (if required).
 			 */
-			if ($data === false) {
-				$id = $this->createUserSpecificGroupShare($share, $recipient);
-			} else {
-				$id = $data['id'];
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_USER) {
-			if ($share->getSharedWith() !== $recipient) {
-				throw new ProviderException('Recipient does not match');
-			}
-
-			$id = $share->getId();
-		} else {
-			throw new ProviderException('Invalid shareType');
-		}
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->update('share')
-			->set('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED))
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->executeStatement();
-
-		return $share;
-	}
-
-	public function getChildren(IShare $parent): array {
-		$children = [];
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
-			->andWhere(
-				$qb->expr()->in(
-					'share_type',
-					$qb->createNamedParameter([
-						IShare::TYPE_USER,
-						IShare::TYPE_GROUP,
-						IShare::TYPE_LINK,
-					], IQueryBuilder::PARAM_INT_ARRAY)
-				)
-			)
-			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
-			->orderBy('id');
-
-		$cursor = $qb->executeQuery();
-		while ($data = $cursor->fetch()) {
-			$children[] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $children;
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 */
-	public function delete(\OCP\Share\IShare $share) {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())));
-
-		/*
+            if ($data === false) {
+                $id = $this->createUserSpecificGroupShare($share, $recipient);
+            } else {
+                $id = $data['id'];
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_USER) {
+            if ($share->getSharedWith() !== $recipient) {
+                throw new ProviderException('Recipient does not match');
+            }
+
+            $id = $share->getId();
+        } else {
+            throw new ProviderException('Invalid shareType');
+        }
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->update('share')
+            ->set('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED))
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->executeStatement();
+
+        return $share;
+    }
+
+    public function getChildren(IShare $parent): array {
+        $children = [];
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
+            ->andWhere(
+                $qb->expr()->in(
+                    'share_type',
+                    $qb->createNamedParameter([
+                        IShare::TYPE_USER,
+                        IShare::TYPE_GROUP,
+                        IShare::TYPE_LINK,
+                    ], IQueryBuilder::PARAM_INT_ARRAY)
+                )
+            )
+            ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
+            ->orderBy('id');
+
+        $cursor = $qb->executeQuery();
+        while ($data = $cursor->fetch()) {
+            $children[] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $children;
+    }
+
+    /**
+     * Delete a share
+     *
+     * @param \OCP\Share\IShare $share
+     */
+    public function delete(\OCP\Share\IShare $share) {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())));
+
+        /*
 		 * If the share is a group share delete all possible
 		 * user defined groups shares.
 		 */
-		if ($share->getShareType() === IShare::TYPE_GROUP) {
-			$qb->orWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())));
-		}
-
-		$qb->executeStatement();
-	}
-
-	/**
-	 * Unshare a share from the recipient. If this is a group share
-	 * this means we need a special entry in the share db.
-	 *
-	 * @param IShare $share
-	 * @param string $recipient UserId of recipient
-	 * @throws BackendError
-	 * @throws ProviderException
-	 */
-	public function deleteFromSelf(IShare $share, $recipient) {
-		if ($share->getShareType() === IShare::TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($recipient);
-
-			if (is_null($group)) {
-				throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
-			}
-
-			if (!$group->inGroup($user)) {
-				// nothing left to do
-				return;
-			}
-
-			// Try to fetch user specific share
-			$qb = $this->dbConn->getQueryBuilder();
-			$stmt = $qb->select('*')
-				->from('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
-				->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
-				->executeQuery();
-
-			$data = $stmt->fetch();
-
-			/*
+        if ($share->getShareType() === IShare::TYPE_GROUP) {
+            $qb->orWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())));
+        }
+
+        $qb->executeStatement();
+    }
+
+    /**
+     * Unshare a share from the recipient. If this is a group share
+     * this means we need a special entry in the share db.
+     *
+     * @param IShare $share
+     * @param string $recipient UserId of recipient
+     * @throws BackendError
+     * @throws ProviderException
+     */
+    public function deleteFromSelf(IShare $share, $recipient) {
+        if ($share->getShareType() === IShare::TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($recipient);
+
+            if (is_null($group)) {
+                throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
+            }
+
+            if (!$group->inGroup($user)) {
+                // nothing left to do
+                return;
+            }
+
+            // Try to fetch user specific share
+            $qb = $this->dbConn->getQueryBuilder();
+            $stmt = $qb->select('*')
+                ->from('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
+                ->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
+                ->executeQuery();
+
+            $data = $stmt->fetch();
+
+            /*
 			 * Check if there already is a user specific group share.
 			 * If there is update it (if required).
 			 */
-			if ($data === false) {
-				$id = $this->createUserSpecificGroupShare($share, $recipient);
-				$permissions = $share->getPermissions();
-			} else {
-				$permissions = $data['permissions'];
-				$id = $data['id'];
-			}
-
-			if ($permissions !== 0) {
-				// Update existing usergroup share
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->update('share')
-					->set('permissions', $qb->createNamedParameter(0))
-					->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-					->executeStatement();
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_USER) {
-			if ($share->getSharedWith() !== $recipient) {
-				throw new ProviderException('Recipient does not match');
-			}
-
-			// We can just delete user and link shares
-			$this->delete($share);
-		} else {
-			throw new ProviderException('Invalid shareType');
-		}
-	}
-
-	protected function createUserSpecificGroupShare(IShare $share, string $recipient): int {
-		$type = $share->getNodeType();
-
-		$shareFolder = $this->config->getSystemValue('share_folder', '/');
-		$allowCustomShareFolder = $this->config->getSystemValueBool('sharing.allow_custom_share_folder', true);
-		if ($allowCustomShareFolder) {
-			$shareFolder = $this->config->getUserValue($recipient, Application::APP_ID, 'share_folder', $shareFolder);
-		}
-
-		$target = $shareFolder . '/' . $share->getNode()->getName();
-		$target = \OC\Files\Filesystem::normalizePath($target);
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->insert('share')
-			->values([
-				'share_type' => $qb->createNamedParameter(IShare::TYPE_USERGROUP),
-				'share_with' => $qb->createNamedParameter($recipient),
-				'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
-				'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
-				'parent' => $qb->createNamedParameter($share->getId()),
-				'item_type' => $qb->createNamedParameter($type),
-				'item_source' => $qb->createNamedParameter($share->getNodeId()),
-				'file_source' => $qb->createNamedParameter($share->getNodeId()),
-				'file_target' => $qb->createNamedParameter($target),
-				'permissions' => $qb->createNamedParameter($share->getPermissions()),
-				'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
-			])->executeStatement();
-
-		return $qb->getLastInsertId();
-	}
-
-	/**
-	 * @inheritdoc
-	 *
-	 * For now this only works for group shares
-	 * If this gets implemented for normal shares we have to extend it
-	 */
-	public function restore(IShare $share, string $recipient): IShare {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('permissions')
-			->from('share')
-			->where(
-				$qb->expr()->eq('id', $qb->createNamedParameter($share->getId()))
-			);
-		$cursor = $qb->executeQuery();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		$originalPermission = $data['permissions'];
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->update('share')
-			->set('permissions', $qb->createNamedParameter($originalPermission))
-			->where(
-				$qb->expr()->eq('parent', $qb->createNamedParameter($share->getParent()))
-			)->andWhere(
-				$qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP))
-			)->andWhere(
-				$qb->expr()->eq('share_with', $qb->createNamedParameter($recipient))
-			);
-
-		$qb->executeStatement();
-
-		return $this->getShareById($share->getId(), $recipient);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function move(\OCP\Share\IShare $share, $recipient) {
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			// Just update the target
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->set('file_target', $qb->createNamedParameter($share->getTarget()))
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->executeStatement();
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			// Check if there is a usergroup share
-			$qb = $this->dbConn->getQueryBuilder();
-			$stmt = $qb->select('id')
-				->from('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
-				->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
-				->setMaxResults(1)
-				->executeQuery();
-
-			$data = $stmt->fetch();
-			$stmt->closeCursor();
-
-			$shareAttributes = $this->formatShareAttributes(
-				$share->getAttributes()
-			);
-
-			if ($data === false) {
-				// No usergroup share yet. Create one.
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->insert('share')
-					->values([
-						'share_type' => $qb->createNamedParameter(IShare::TYPE_USERGROUP),
-						'share_with' => $qb->createNamedParameter($recipient),
-						'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
-						'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
-						'parent' => $qb->createNamedParameter($share->getId()),
-						'item_type' => $qb->createNamedParameter($share->getNodeType()),
-						'item_source' => $qb->createNamedParameter($share->getNodeId()),
-						'file_source' => $qb->createNamedParameter($share->getNodeId()),
-						'file_target' => $qb->createNamedParameter($share->getTarget()),
-						'permissions' => $qb->createNamedParameter($share->getPermissions()),
-						'attributes' => $qb->createNamedParameter($shareAttributes),
-						'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
-					])->executeStatement();
-			} else {
-				// Already a usergroup share. Update it.
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->update('share')
-					->set('file_target', $qb->createNamedParameter($share->getTarget()))
-					->where($qb->expr()->eq('id', $qb->createNamedParameter($data['id'])))
-					->executeStatement();
-			}
-		}
-
-		return $share;
-	}
-
-	public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true) {
-		if (!$shallow) {
-			throw new \Exception('non-shallow getSharesInFolder is no longer supported');
-		}
-
-		return $this->getSharesInFolderInternal($userId, $node, $reshares);
-	}
-
-	public function getAllSharesInFolder(Folder $node): array {
-		return $this->getSharesInFolderInternal(null, $node, null);
-	}
-
-	/**
-	 * @return array<int, list<IShare>>
-	 */
-	private function getSharesInFolderInternal(?string $userId, Folder $node, ?bool $reshares): array {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('s.*',
-			'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
-			'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
-			'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum')
-			->from('share', 's')
-			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
-
-		$qb->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK], IQueryBuilder::PARAM_INT_ARRAY)));
-
-		if ($userId !== null) {
-			/**
-			 * Reshares for this user are shares where they are the owner.
-			 */
-			if ($reshares !== true) {
-				$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
-			} else {
-				$qb->andWhere(
-					$qb->expr()->orX(
-						$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-						$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-					)
-				);
-			}
-		}
-
-		// todo? maybe get these from the oc_mounts table
-		$childMountNodes = array_filter($node->getDirectoryListing(), function (Node $node): bool {
-			return $node->getInternalPath() === '';
-		});
-		$childMountRootIds = array_map(function (Node $node): int {
-			return $node->getId();
-		}, $childMountNodes);
-
-		$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
-		$qb->andWhere(
-			$qb->expr()->orX(
-				$qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())),
-				$qb->expr()->in('f.fileid', $qb->createParameter('chunk'))
-			)
-		);
-
-		$qb->orderBy('id');
-
-		$shares = [];
-
-		$chunks = array_chunk($childMountRootIds, 1000);
-
-		// Force the request to be run when there is 0 mount.
-		if (count($chunks) === 0) {
-			$chunks = [[]];
-		}
-
-		foreach ($chunks as $chunk) {
-			$qb->setParameter('chunk', $chunk, IQueryBuilder::PARAM_INT_ARRAY);
-			$cursor = $qb->executeQuery();
-			while ($data = $cursor->fetch()) {
-				$shares[$data['fileid']][] = $this->createShare($data);
-			}
-			$cursor->closeCursor();
-		}
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
-
-		$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter($shareType)));
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
-		} else {
-			if ($node === null) {
-				$qb->andWhere(
-					$qb->expr()->orX(
-						$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-						$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-					)
-				);
-			}
-		}
-
-		if ($node !== null) {
-			$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-		}
-
-		if ($limit !== -1) {
-			$qb->setMaxResults($limit);
-		}
-
-		$qb->setFirstResult($offset);
-		$qb->orderBy('id');
-
-		$cursor = $qb->executeQuery();
-		$shares = [];
-		while ($data = $cursor->fetch()) {
-			$shares[] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareById($id, $recipientId = null) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere(
-				$qb->expr()->in(
-					'share_type',
-					$qb->createNamedParameter([
-						IShare::TYPE_USER,
-						IShare::TYPE_GROUP,
-						IShare::TYPE_LINK,
-					], IQueryBuilder::PARAM_INT_ARRAY)
-				)
-			)
-			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
-
-		$cursor = $qb->executeQuery();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		try {
-			$share = $this->createShare($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		// If the recipient is set for a group share resolve to that user
-		if ($recipientId !== null && $share->getShareType() === IShare::TYPE_GROUP) {
-			$share = $this->resolveGroupShares([(int)$share->getId() => $share], $recipientId)[0];
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Get shares for a given path
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @return \OCP\Share\IShare[]
-	 */
-	public function getSharesByPath(Node $path) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
-			->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK], IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
-			->orderBy('id', 'ASC')
-			->executeQuery();
-
-		$shares = [];
-		while ($data = $cursor->fetch()) {
-			$shares[] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * Returns whether the given database result can be interpreted as
-	 * a share with accessible file (not trashed, not deleted)
-	 */
-	private function isAccessibleResult($data) {
-		// exclude shares leading to deleted file entries
-		if ($data['fileid'] === null || $data['path'] === null) {
-			return false;
-		}
-
-		// exclude shares leading to trashbin on home storages
-		$pathSections = explode('/', $data['path'], 2);
-		// FIXME: would not detect rare md5'd home storage case properly
-		if ($pathSections[0] !== 'files'
-			&& (str_starts_with($data['storage_string_id'], 'home::') || str_starts_with($data['storage_string_id'], 'object::user'))) {
-			return false;
-		} elseif ($pathSections[0] === '__groupfolders'
-			&& str_starts_with($pathSections[1], 'trash/')
-		) {
-			// exclude shares leading to trashbin on group folders storages
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
-		/** @var Share[] $shares */
-		$shares = [];
-
-		if ($shareType === IShare::TYPE_USER) {
-			//Get shares directly with this user
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->select('s.*',
-				'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
-				'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
-				'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
-			)
-				->selectAlias('st.id', 'storage_string_id')
-				->from('share', 's')
-				->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
-				->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'));
-
-			// Order by id
-			$qb->orderBy('s.id');
-
-			// Set limit and offset
-			if ($limit !== -1) {
-				$qb->setMaxResults($limit);
-			}
-			$qb->setFirstResult($offset);
-
-			$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USER)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
-				->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
-
-			// Filter by node if provided
-			if ($node !== null) {
-				$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-			}
-
-			$cursor = $qb->executeQuery();
-
-			while ($data = $cursor->fetch()) {
-				if ($data['fileid'] && $data['path'] === null) {
-					$data['path'] = (string)$data['path'];
-					$data['name'] = (string)$data['name'];
-					$data['checksum'] = (string)$data['checksum'];
-				}
-				if ($this->isAccessibleResult($data)) {
-					$shares[] = $this->createShare($data);
-				}
-			}
-			$cursor->closeCursor();
-		} elseif ($shareType === IShare::TYPE_GROUP) {
-			$user = new LazyUser($userId, $this->userManager);
-			$allGroups = $this->groupManager->getUserGroupIds($user);
-
-			/** @var Share[] $shares2 */
-			$shares2 = [];
-
-			$start = 0;
-			while (true) {
-				$groups = array_slice($allGroups, $start, 1000);
-				$start += 1000;
-
-				if ($groups === []) {
-					break;
-				}
-
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->select('s.*',
-					'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
-					'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
-					'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
-				)
-					->selectAlias('st.id', 'storage_string_id')
-					->from('share', 's')
-					->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
-					->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
-					->orderBy('s.id')
-					->setFirstResult(0);
-
-				if ($limit !== -1) {
-					$qb->setMaxResults($limit - count($shares));
-				}
-
-				// Filter by node if provided
-				if ($node !== null) {
-					$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-				}
-
-				$groups = array_filter($groups);
-
-				$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
-					->andWhere($qb->expr()->in('share_with', $qb->createNamedParameter(
-						$groups,
-						IQueryBuilder::PARAM_STR_ARRAY
-					)))
-					->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
-
-				$cursor = $qb->executeQuery();
-				while ($data = $cursor->fetch()) {
-					if ($offset > 0) {
-						$offset--;
-						continue;
-					}
-
-					if ($this->isAccessibleResult($data)) {
-						$share = $this->createShare($data);
-						$shares2[$share->getId()] = $share;
-					}
-				}
-				$cursor->closeCursor();
-			}
-
-			/*
+            if ($data === false) {
+                $id = $this->createUserSpecificGroupShare($share, $recipient);
+                $permissions = $share->getPermissions();
+            } else {
+                $permissions = $data['permissions'];
+                $id = $data['id'];
+            }
+
+            if ($permissions !== 0) {
+                // Update existing usergroup share
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->update('share')
+                    ->set('permissions', $qb->createNamedParameter(0))
+                    ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+                    ->executeStatement();
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_USER) {
+            if ($share->getSharedWith() !== $recipient) {
+                throw new ProviderException('Recipient does not match');
+            }
+
+            // We can just delete user and link shares
+            $this->delete($share);
+        } else {
+            throw new ProviderException('Invalid shareType');
+        }
+    }
+
+    protected function createUserSpecificGroupShare(IShare $share, string $recipient): int {
+        $type = $share->getNodeType();
+
+        $shareFolder = $this->config->getSystemValue('share_folder', '/');
+        $allowCustomShareFolder = $this->config->getSystemValueBool('sharing.allow_custom_share_folder', true);
+        if ($allowCustomShareFolder) {
+            $shareFolder = $this->config->getUserValue($recipient, Application::APP_ID, 'share_folder', $shareFolder);
+        }
+
+        $target = $shareFolder . '/' . $share->getNode()->getName();
+        $target = \OC\Files\Filesystem::normalizePath($target);
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->insert('share')
+            ->values([
+                'share_type' => $qb->createNamedParameter(IShare::TYPE_USERGROUP),
+                'share_with' => $qb->createNamedParameter($recipient),
+                'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
+                'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
+                'parent' => $qb->createNamedParameter($share->getId()),
+                'item_type' => $qb->createNamedParameter($type),
+                'item_source' => $qb->createNamedParameter($share->getNodeId()),
+                'file_source' => $qb->createNamedParameter($share->getNodeId()),
+                'file_target' => $qb->createNamedParameter($target),
+                'permissions' => $qb->createNamedParameter($share->getPermissions()),
+                'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
+            ])->executeStatement();
+
+        return $qb->getLastInsertId();
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * For now this only works for group shares
+     * If this gets implemented for normal shares we have to extend it
+     */
+    public function restore(IShare $share, string $recipient): IShare {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('permissions')
+            ->from('share')
+            ->where(
+                $qb->expr()->eq('id', $qb->createNamedParameter($share->getId()))
+            );
+        $cursor = $qb->executeQuery();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        $originalPermission = $data['permissions'];
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->update('share')
+            ->set('permissions', $qb->createNamedParameter($originalPermission))
+            ->where(
+                $qb->expr()->eq('parent', $qb->createNamedParameter($share->getParent()))
+            )->andWhere(
+                $qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP))
+            )->andWhere(
+                $qb->expr()->eq('share_with', $qb->createNamedParameter($recipient))
+            );
+
+        $qb->executeStatement();
+
+        return $this->getShareById($share->getId(), $recipient);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function move(\OCP\Share\IShare $share, $recipient) {
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            // Just update the target
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->set('file_target', $qb->createNamedParameter($share->getTarget()))
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->executeStatement();
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            // Check if there is a usergroup share
+            $qb = $this->dbConn->getQueryBuilder();
+            $stmt = $qb->select('id')
+                ->from('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
+                ->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
+                ->setMaxResults(1)
+                ->executeQuery();
+
+            $data = $stmt->fetch();
+            $stmt->closeCursor();
+
+            $shareAttributes = $this->formatShareAttributes(
+                $share->getAttributes()
+            );
+
+            if ($data === false) {
+                // No usergroup share yet. Create one.
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->insert('share')
+                    ->values([
+                        'share_type' => $qb->createNamedParameter(IShare::TYPE_USERGROUP),
+                        'share_with' => $qb->createNamedParameter($recipient),
+                        'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
+                        'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
+                        'parent' => $qb->createNamedParameter($share->getId()),
+                        'item_type' => $qb->createNamedParameter($share->getNodeType()),
+                        'item_source' => $qb->createNamedParameter($share->getNodeId()),
+                        'file_source' => $qb->createNamedParameter($share->getNodeId()),
+                        'file_target' => $qb->createNamedParameter($share->getTarget()),
+                        'permissions' => $qb->createNamedParameter($share->getPermissions()),
+                        'attributes' => $qb->createNamedParameter($shareAttributes),
+                        'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
+                    ])->executeStatement();
+            } else {
+                // Already a usergroup share. Update it.
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->update('share')
+                    ->set('file_target', $qb->createNamedParameter($share->getTarget()))
+                    ->where($qb->expr()->eq('id', $qb->createNamedParameter($data['id'])))
+                    ->executeStatement();
+            }
+        }
+
+        return $share;
+    }
+
+    public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true) {
+        if (!$shallow) {
+            throw new \Exception('non-shallow getSharesInFolder is no longer supported');
+        }
+
+        return $this->getSharesInFolderInternal($userId, $node, $reshares);
+    }
+
+    public function getAllSharesInFolder(Folder $node): array {
+        return $this->getSharesInFolderInternal(null, $node, null);
+    }
+
+    /**
+     * @return array<int, list<IShare>>
+     */
+    private function getSharesInFolderInternal(?string $userId, Folder $node, ?bool $reshares): array {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('s.*',
+            'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
+            'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
+            'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum')
+            ->from('share', 's')
+            ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
+
+        $qb->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK], IQueryBuilder::PARAM_INT_ARRAY)));
+
+        if ($userId !== null) {
+            /**
+             * Reshares for this user are shares where they are the owner.
+             */
+            if ($reshares !== true) {
+                $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
+            } else {
+                $qb->andWhere(
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                        $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                    )
+                );
+            }
+        }
+
+        // todo? maybe get these from the oc_mounts table
+        $childMountNodes = array_filter($node->getDirectoryListing(), function (Node $node): bool {
+            return $node->getInternalPath() === '';
+        });
+        $childMountRootIds = array_map(function (Node $node): int {
+            return $node->getId();
+        }, $childMountNodes);
+
+        $qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+        $qb->andWhere(
+            $qb->expr()->orX(
+                $qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())),
+                $qb->expr()->in('f.fileid', $qb->createParameter('chunk'))
+            )
+        );
+
+        $qb->orderBy('id');
+
+        $shares = [];
+
+        $chunks = array_chunk($childMountRootIds, 1000);
+
+        // Force the request to be run when there is 0 mount.
+        if (count($chunks) === 0) {
+            $chunks = [[]];
+        }
+
+        foreach ($chunks as $chunk) {
+            $qb->setParameter('chunk', $chunk, IQueryBuilder::PARAM_INT_ARRAY);
+            $cursor = $qb->executeQuery();
+            while ($data = $cursor->fetch()) {
+                $shares[$data['fileid']][] = $this->createShare($data);
+            }
+            $cursor->closeCursor();
+        }
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
+
+        $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter($shareType)));
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
+        } else {
+            if ($node === null) {
+                $qb->andWhere(
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                        $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                    )
+                );
+            }
+        }
+
+        if ($node !== null) {
+            $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+        }
+
+        if ($limit !== -1) {
+            $qb->setMaxResults($limit);
+        }
+
+        $qb->setFirstResult($offset);
+        $qb->orderBy('id');
+
+        $cursor = $qb->executeQuery();
+        $shares = [];
+        while ($data = $cursor->fetch()) {
+            $shares[] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareById($id, $recipientId = null) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere(
+                $qb->expr()->in(
+                    'share_type',
+                    $qb->createNamedParameter([
+                        IShare::TYPE_USER,
+                        IShare::TYPE_GROUP,
+                        IShare::TYPE_LINK,
+                    ], IQueryBuilder::PARAM_INT_ARRAY)
+                )
+            )
+            ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
+
+        $cursor = $qb->executeQuery();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        try {
+            $share = $this->createShare($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        // If the recipient is set for a group share resolve to that user
+        if ($recipientId !== null && $share->getShareType() === IShare::TYPE_GROUP) {
+            $share = $this->resolveGroupShares([(int)$share->getId() => $share], $recipientId)[0];
+        }
+
+        return $share;
+    }
+
+    /**
+     * Get shares for a given path
+     *
+     * @param \OCP\Files\Node $path
+     * @return \OCP\Share\IShare[]
+     */
+    public function getSharesByPath(Node $path) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
+            ->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK], IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
+            ->orderBy('id', 'ASC')
+            ->executeQuery();
+
+        $shares = [];
+        while ($data = $cursor->fetch()) {
+            $shares[] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * Returns whether the given database result can be interpreted as
+     * a share with accessible file (not trashed, not deleted)
+     */
+    private function isAccessibleResult($data) {
+        // exclude shares leading to deleted file entries
+        if ($data['fileid'] === null || $data['path'] === null) {
+            return false;
+        }
+
+        // exclude shares leading to trashbin on home storages
+        $pathSections = explode('/', $data['path'], 2);
+        // FIXME: would not detect rare md5'd home storage case properly
+        if ($pathSections[0] !== 'files'
+            && (str_starts_with($data['storage_string_id'], 'home::') || str_starts_with($data['storage_string_id'], 'object::user'))) {
+            return false;
+        } elseif ($pathSections[0] === '__groupfolders'
+            && str_starts_with($pathSections[1], 'trash/')
+        ) {
+            // exclude shares leading to trashbin on group folders storages
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
+        /** @var Share[] $shares */
+        $shares = [];
+
+        if ($shareType === IShare::TYPE_USER) {
+            //Get shares directly with this user
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->select('s.*',
+                'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
+                'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
+                'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
+            )
+                ->selectAlias('st.id', 'storage_string_id')
+                ->from('share', 's')
+                ->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
+                ->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'));
+
+            // Order by id
+            $qb->orderBy('s.id');
+
+            // Set limit and offset
+            if ($limit !== -1) {
+                $qb->setMaxResults($limit);
+            }
+            $qb->setFirstResult($offset);
+
+            $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USER)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
+                ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
+
+            // Filter by node if provided
+            if ($node !== null) {
+                $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+            }
+
+            $cursor = $qb->executeQuery();
+
+            while ($data = $cursor->fetch()) {
+                if ($data['fileid'] && $data['path'] === null) {
+                    $data['path'] = (string)$data['path'];
+                    $data['name'] = (string)$data['name'];
+                    $data['checksum'] = (string)$data['checksum'];
+                }
+                if ($this->isAccessibleResult($data)) {
+                    $shares[] = $this->createShare($data);
+                }
+            }
+            $cursor->closeCursor();
+        } elseif ($shareType === IShare::TYPE_GROUP) {
+            $user = new LazyUser($userId, $this->userManager);
+            $allGroups = $this->groupManager->getUserGroupIds($user);
+
+            /** @var Share[] $shares2 */
+            $shares2 = [];
+
+            $start = 0;
+            while (true) {
+                $groups = array_slice($allGroups, $start, 1000);
+                $start += 1000;
+
+                if ($groups === []) {
+                    break;
+                }
+
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->select('s.*',
+                    'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
+                    'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
+                    'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
+                )
+                    ->selectAlias('st.id', 'storage_string_id')
+                    ->from('share', 's')
+                    ->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
+                    ->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
+                    ->orderBy('s.id')
+                    ->setFirstResult(0);
+
+                if ($limit !== -1) {
+                    $qb->setMaxResults($limit - count($shares));
+                }
+
+                // Filter by node if provided
+                if ($node !== null) {
+                    $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+                }
+
+                $groups = array_filter($groups);
+
+                $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
+                    ->andWhere($qb->expr()->in('share_with', $qb->createNamedParameter(
+                        $groups,
+                        IQueryBuilder::PARAM_STR_ARRAY
+                    )))
+                    ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
+
+                $cursor = $qb->executeQuery();
+                while ($data = $cursor->fetch()) {
+                    if ($offset > 0) {
+                        $offset--;
+                        continue;
+                    }
+
+                    if ($this->isAccessibleResult($data)) {
+                        $share = $this->createShare($data);
+                        $shares2[$share->getId()] = $share;
+                    }
+                }
+                $cursor->closeCursor();
+            }
+
+            /*
 			 * Resolve all group shares to user specific shares
 			 */
-			$shares = $this->resolveGroupShares($shares2, $userId);
-		} else {
-			throw new BackendError('Invalid backend');
-		}
-
-
-		return $shares;
-	}
-
-	/**
-	 * Get a share by token
-	 *
-	 * @param string $token
-	 * @return \OCP\Share\IShare
-	 * @throws ShareNotFound
-	 */
-	public function getShareByToken($token) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_LINK)))
-			->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
-			->executeQuery();
-
-		$data = $cursor->fetch();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		try {
-			$share = $this->createShare($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Create a share object from a database row
-	 *
-	 * @param mixed[] $data
-	 * @return \OCP\Share\IShare
-	 * @throws InvalidShare
-	 */
-	private function createShare($data) {
-		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId($data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
-			->setTarget($data['file_target'])
-			->setNote((string)$data['note'])
-			->setMailSend((bool)$data['mail_send'])
-			->setStatus((int)$data['accepted'])
-			->setLabel($data['label'] ?? '');
-
-		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
-		$share->setShareTime($shareTime);
-
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			$share->setSharedWith($data['share_with']);
-			$displayName = $this->userManager->getDisplayName($data['share_with']);
-			if ($displayName !== null) {
-				$share->setSharedWithDisplayName($displayName);
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			$share->setSharedWith($data['share_with']);
-			$group = $this->groupManager->get($data['share_with']);
-			if ($group !== null) {
-				$share->setSharedWithDisplayName($group->getDisplayName());
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_LINK) {
-			$share->setPassword($data['password']);
-			$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
-			$share->setToken($data['token']);
-		}
-
-		$share = $this->updateShareAttributes($share, $data['attributes']);
-
-		$share->setSharedBy($data['uid_initiator']);
-		$share->setShareOwner($data['uid_owner']);
-
-		$share->setNodeId((int)$data['file_source']);
-		$share->setNodeType($data['item_type']);
-
-		if ($data['expiration'] !== null) {
-			$expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
-			$share->setExpirationDate($expiration);
-		}
-
-		if (isset($data['f_permissions'])) {
-			$entryData = $data;
-			$entryData['permissions'] = $entryData['f_permissions'];
-			$entryData['parent'] = $entryData['f_parent'];
-			$share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData,
-				\OC::$server->getMimeTypeLoader()));
-		}
-
-		$share->setProviderId($this->identifier());
-		$share->setHideDownload((int)$data['hide_download'] === 1);
-		$share->setReminderSent((bool)$data['reminder_sent']);
-
-		return $share;
-	}
-
-	/**
-	 * Update the data from group shares with any per-user modifications
-	 *
-	 * @param array<int, Share> $shareMap shares indexed by share id
-	 * @param $userId
-	 * @return Share[] The updates shares if no update is found for a share return the original
-	 */
-	private function resolveGroupShares($shareMap, $userId) {
-		$qb = $this->dbConn->getQueryBuilder();
-		$query = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
-			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
-
-		// this is called with either all group shares or one group share.
-		// for all shares it's easier to just only search by share_with,
-		// for a single share it's efficient to filter by parent
-		if (count($shareMap) === 1) {
-			$share = reset($shareMap);
-			$query->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())));
-		}
-
-		$stmt = $query->executeQuery();
-
-		while ($data = $stmt->fetch()) {
-			if (array_key_exists($data['parent'], $shareMap)) {
-				$shareMap[$data['parent']]->setPermissions((int)$data['permissions']);
-				$shareMap[$data['parent']]->setStatus((int)$data['accepted']);
-				$shareMap[$data['parent']]->setTarget($data['file_target']);
-				$shareMap[$data['parent']]->setParent($data['parent']);
-			}
-		}
-
-		return array_values($shareMap);
-	}
-
-	/**
-	 * A user is deleted from the system
-	 * So clean up the relevant shares.
-	 *
-	 * @param string $uid
-	 * @param int $shareType
-	 */
-	public function userDeleted($uid, $shareType) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->delete('share');
-
-		if ($shareType === IShare::TYPE_USER) {
-			/*
+            $shares = $this->resolveGroupShares($shares2, $userId);
+        } else {
+            throw new BackendError('Invalid backend');
+        }
+
+
+        return $shares;
+    }
+
+    /**
+     * Get a share by token
+     *
+     * @param string $token
+     * @return \OCP\Share\IShare
+     * @throws ShareNotFound
+     */
+    public function getShareByToken($token) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_LINK)))
+            ->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
+            ->executeQuery();
+
+        $data = $cursor->fetch();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        try {
+            $share = $this->createShare($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        return $share;
+    }
+
+    /**
+     * Create a share object from a database row
+     *
+     * @param mixed[] $data
+     * @return \OCP\Share\IShare
+     * @throws InvalidShare
+     */
+    private function createShare($data) {
+        $share = new Share($this->rootFolder, $this->userManager);
+        $share->setId($data['id'])
+            ->setShareType((int)$data['share_type'])
+            ->setPermissions((int)$data['permissions'])
+            ->setTarget($data['file_target'])
+            ->setNote((string)$data['note'])
+            ->setMailSend((bool)$data['mail_send'])
+            ->setStatus((int)$data['accepted'])
+            ->setLabel($data['label'] ?? '');
+
+        $shareTime = new \DateTime();
+        $shareTime->setTimestamp((int)$data['stime']);
+        $share->setShareTime($shareTime);
+
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            $share->setSharedWith($data['share_with']);
+            $displayName = $this->userManager->getDisplayName($data['share_with']);
+            if ($displayName !== null) {
+                $share->setSharedWithDisplayName($displayName);
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            $share->setSharedWith($data['share_with']);
+            $group = $this->groupManager->get($data['share_with']);
+            if ($group !== null) {
+                $share->setSharedWithDisplayName($group->getDisplayName());
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_LINK) {
+            $share->setPassword($data['password']);
+            $share->setSendPasswordByTalk((bool)$data['password_by_talk']);
+            $share->setToken($data['token']);
+        }
+
+        $share = $this->updateShareAttributes($share, $data['attributes']);
+
+        $share->setSharedBy($data['uid_initiator']);
+        $share->setShareOwner($data['uid_owner']);
+
+        $share->setNodeId((int)$data['file_source']);
+        $share->setNodeType($data['item_type']);
+
+        if ($data['expiration'] !== null) {
+            $expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
+            $share->setExpirationDate($expiration);
+        }
+
+        if (isset($data['f_permissions'])) {
+            $entryData = $data;
+            $entryData['permissions'] = $entryData['f_permissions'];
+            $entryData['parent'] = $entryData['f_parent'];
+            $share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData,
+                \OC::$server->getMimeTypeLoader()));
+        }
+
+        $share->setProviderId($this->identifier());
+        $share->setHideDownload((int)$data['hide_download'] === 1);
+        $share->setReminderSent((bool)$data['reminder_sent']);
+
+        return $share;
+    }
+
+    /**
+     * Update the data from group shares with any per-user modifications
+     *
+     * @param array<int, Share> $shareMap shares indexed by share id
+     * @param $userId
+     * @return Share[] The updates shares if no update is found for a share return the original
+     */
+    private function resolveGroupShares($shareMap, $userId) {
+        $qb = $this->dbConn->getQueryBuilder();
+        $query = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
+            ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
+
+        // this is called with either all group shares or one group share.
+        // for all shares it's easier to just only search by share_with,
+        // for a single share it's efficient to filter by parent
+        if (count($shareMap) === 1) {
+            $share = reset($shareMap);
+            $query->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())));
+        }
+
+        $stmt = $query->executeQuery();
+
+        while ($data = $stmt->fetch()) {
+            if (array_key_exists($data['parent'], $shareMap)) {
+                $shareMap[$data['parent']]->setPermissions((int)$data['permissions']);
+                $shareMap[$data['parent']]->setStatus((int)$data['accepted']);
+                $shareMap[$data['parent']]->setTarget($data['file_target']);
+                $shareMap[$data['parent']]->setParent($data['parent']);
+            }
+        }
+
+        return array_values($shareMap);
+    }
+
+    /**
+     * A user is deleted from the system
+     * So clean up the relevant shares.
+     *
+     * @param string $uid
+     * @param int $shareType
+     */
+    public function userDeleted($uid, $shareType) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->delete('share');
+
+        if ($shareType === IShare::TYPE_USER) {
+            /*
 			 * Delete all user shares that are owned by this user
 			 * or that are received by this user
 			 */
 
-			$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USER)));
+            $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USER)));
 
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
-					$qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
-				)
-			);
-		} elseif ($shareType === IShare::TYPE_GROUP) {
-			/*
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
+                    $qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
+                )
+            );
+        } elseif ($shareType === IShare::TYPE_GROUP) {
+            /*
 			 * Delete all group shares that are owned by this user
 			 * Or special user group shares that are received by this user
 			 */
-			$qb->where(
-				$qb->expr()->andX(
-					$qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_GROUP, IShare::TYPE_USERGROUP], IQueryBuilder::PARAM_INT_ARRAY)),
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid))
-				)
-			);
-
-			$qb->orWhere(
-				$qb->expr()->andX(
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)),
-					$qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
-				)
-			);
-		} elseif ($shareType === IShare::TYPE_LINK) {
-			/*
+            $qb->where(
+                $qb->expr()->andX(
+                    $qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_GROUP, IShare::TYPE_USERGROUP], IQueryBuilder::PARAM_INT_ARRAY)),
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid))
+                )
+            );
+
+            $qb->orWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)),
+                    $qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
+                )
+            );
+        } elseif ($shareType === IShare::TYPE_LINK) {
+            /*
 			 * Delete all link shares owned by this user.
 			 * And all link shares initiated by this user (until #22327 is in)
 			 */
-			$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_LINK)));
-
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($uid))
-				)
-			);
-		} else {
-			$e = new \InvalidArgumentException('Default share provider tried to delete all shares for type: ' . $shareType);
-			$this->logger->error($e->getMessage(), ['exception' => $e]);
-			return;
-		}
-
-		$qb->executeStatement();
-	}
-
-	/**
-	 * Delete all shares received by this group. As well as any custom group
-	 * shares for group members.
-	 *
-	 * @param string $gid
-	 */
-	public function groupDeleted($gid) {
-		/*
+            $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_LINK)));
+
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($uid))
+                )
+            );
+        } else {
+            $e = new \InvalidArgumentException('Default share provider tried to delete all shares for type: ' . $shareType);
+            $this->logger->error($e->getMessage(), ['exception' => $e]);
+            return;
+        }
+
+        $qb->executeStatement();
+    }
+
+    /**
+     * Delete all shares received by this group. As well as any custom group
+     * shares for group members.
+     *
+     * @param string $gid
+     */
+    public function groupDeleted($gid) {
+        /*
 		 * First delete all custom group shares for group members
 		 */
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('id')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
-
-		$cursor = $qb->executeQuery();
-		$ids = [];
-		while ($row = $cursor->fetch()) {
-			$ids[] = (int)$row['id'];
-		}
-		$cursor->closeCursor();
-
-		if (!empty($ids)) {
-			$chunks = array_chunk($ids, 100);
-
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->delete('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
-				->andWhere($qb->expr()->in('parent', $qb->createParameter('parents')));
-
-			foreach ($chunks as $chunk) {
-				$qb->setParameter('parents', $chunk, IQueryBuilder::PARAM_INT_ARRAY);
-				$qb->executeStatement();
-			}
-		}
-
-		/*
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('id')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+
+        $cursor = $qb->executeQuery();
+        $ids = [];
+        while ($row = $cursor->fetch()) {
+            $ids[] = (int)$row['id'];
+        }
+        $cursor->closeCursor();
+
+        if (!empty($ids)) {
+            $chunks = array_chunk($ids, 100);
+
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->delete('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->in('parent', $qb->createParameter('parents')));
+
+            foreach ($chunks as $chunk) {
+                $qb->setParameter('parents', $chunk, IQueryBuilder::PARAM_INT_ARRAY);
+                $qb->executeStatement();
+            }
+        }
+
+        /*
 		 * Now delete all the group shares
 		 */
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
-		$qb->executeStatement();
-	}
-
-	/**
-	 * Delete custom group shares to this group for this user
-	 *
-	 * @param string $uid
-	 * @param string $gid
-	 * @return void
-	 */
-	public function userDeletedFromGroup($uid, $gid) {
-		/*
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+        $qb->executeStatement();
+    }
+
+    /**
+     * Delete custom group shares to this group for this user
+     *
+     * @param string $uid
+     * @param string $gid
+     * @return void
+     */
+    public function userDeletedFromGroup($uid, $gid) {
+        /*
 		 * Get all group shares
 		 */
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('id')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
-
-		$cursor = $qb->executeQuery();
-		$ids = [];
-		while ($row = $cursor->fetch()) {
-			$ids[] = (int)$row['id'];
-		}
-		$cursor->closeCursor();
-
-		if (!empty($ids)) {
-			$chunks = array_chunk($ids, 100);
-
-			/*
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('id')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+
+        $cursor = $qb->executeQuery();
+        $ids = [];
+        while ($row = $cursor->fetch()) {
+            $ids[] = (int)$row['id'];
+        }
+        $cursor->closeCursor();
+
+        if (!empty($ids)) {
+            $chunks = array_chunk($ids, 100);
+
+            /*
 			 * Delete all special shares with this user for the found group shares
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->delete('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($uid)))
-				->andWhere($qb->expr()->in('parent', $qb->createParameter('parents')));
-
-			foreach ($chunks as $chunk) {
-				$qb->setParameter('parents', $chunk, IQueryBuilder::PARAM_INT_ARRAY);
-				$qb->executeStatement();
-			}
-		}
-
-		if ($this->shareManager->shareWithGroupMembersOnly()) {
-			$user = $this->userManager->get($uid);
-			if ($user === null) {
-				return;
-			}
-			$userGroups = $this->groupManager->getUserGroupIds($user);
-			$userGroups = array_diff($userGroups, $this->shareManager->shareWithGroupMembersOnlyExcludeGroupsList());
-
-			// Delete user shares received by the user from users in the group.
-			$userReceivedShares = $this->shareManager->getSharedWith($uid, IShare::TYPE_USER, null, -1);
-			foreach ($userReceivedShares as $share) {
-				$owner = $this->userManager->get($share->getSharedBy());
-				if ($owner === null) {
-					continue;
-				}
-				$ownerGroups = $this->groupManager->getUserGroupIds($owner);
-				$mutualGroups = array_intersect($userGroups, $ownerGroups);
-
-				if (count($mutualGroups) === 0) {
-					$this->shareManager->deleteShare($share);
-				}
-			}
-
-			// Delete user shares from the user to users in the group.
-			$userEmittedShares = $this->shareManager->getSharesBy($uid, IShare::TYPE_USER, null, true, -1);
-			foreach ($userEmittedShares as $share) {
-				$recipient = $this->userManager->get($share->getSharedWith());
-				if ($recipient === null) {
-					continue;
-				}
-				$recipientGroups = $this->groupManager->getUserGroupIds($recipient);
-				$mutualGroups = array_intersect($userGroups, $recipientGroups);
-
-				if (count($mutualGroups) === 0) {
-					$this->shareManager->deleteShare($share);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAccessList($nodes, $currentAccess) {
-		$ids = [];
-		foreach ($nodes as $node) {
-			$ids[] = $node->getId();
-		}
-
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$shareTypes = [IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK];
-
-		if ($currentAccess) {
-			$shareTypes[] = IShare::TYPE_USERGROUP;
-		}
-
-		$qb->select('id', 'parent', 'share_type', 'share_with', 'file_source', 'file_target', 'permissions')
-			->from('share')
-			->where(
-				$qb->expr()->in('share_type', $qb->createNamedParameter($shareTypes, IQueryBuilder::PARAM_INT_ARRAY))
-			)
-			->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
-
-		// Ensure accepted is true for user and usergroup type
-		$qb->andWhere(
-			$qb->expr()->orX(
-				$qb->expr()->andX(
-					$qb->expr()->neq('share_type', $qb->createNamedParameter(IShare::TYPE_USER)),
-					$qb->expr()->neq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)),
-				),
-				$qb->expr()->eq('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED, IQueryBuilder::PARAM_INT)),
-			),
-		);
-
-		$cursor = $qb->executeQuery();
-
-		$users = [];
-		$link = false;
-		while ($row = $cursor->fetch()) {
-			$type = (int)$row['share_type'];
-			if ($type === IShare::TYPE_USER) {
-				$uid = $row['share_with'];
-				$users[$uid] = $users[$uid] ?? [];
-				$users[$uid][$row['id']] = $row;
-			} elseif ($type === IShare::TYPE_GROUP) {
-				$gid = $row['share_with'];
-				$group = $this->groupManager->get($gid);
-
-				if ($group === null) {
-					continue;
-				}
-
-				$userList = $group->getUsers();
-				foreach ($userList as $user) {
-					$uid = $user->getUID();
-					$users[$uid] = $users[$uid] ?? [];
-					$users[$uid][$row['id']] = $row;
-				}
-			} elseif ($type === IShare::TYPE_LINK) {
-				$link = true;
-			} elseif ($type === IShare::TYPE_USERGROUP && $currentAccess === true) {
-				$uid = $row['share_with'];
-				$users[$uid] = $users[$uid] ?? [];
-				$users[$uid][$row['id']] = $row;
-			}
-		}
-		$cursor->closeCursor();
-
-		if ($currentAccess === true) {
-			$users = array_map([$this, 'filterSharesOfUser'], $users);
-			$users = array_filter($users);
-		} else {
-			$users = array_keys($users);
-		}
-
-		return ['users' => $users, 'public' => $link];
-	}
-
-	/**
-	 * For each user the path with the fewest slashes is returned
-	 * @param array $shares
-	 * @return array
-	 */
-	protected function filterSharesOfUser(array $shares) {
-		// Group shares when the user has a share exception
-		foreach ($shares as $id => $share) {
-			$type = (int)$share['share_type'];
-			$permissions = (int)$share['permissions'];
-
-			if ($type === IShare::TYPE_USERGROUP) {
-				unset($shares[$share['parent']]);
-
-				if ($permissions === 0) {
-					unset($shares[$id]);
-				}
-			}
-		}
-
-		$best = [];
-		$bestDepth = 0;
-		foreach ($shares as $id => $share) {
-			$depth = substr_count(($share['file_target'] ?? ''), '/');
-			if (empty($best) || $depth < $bestDepth) {
-				$bestDepth = $depth;
-				$best = [
-					'node_id' => $share['file_source'],
-					'node_path' => $share['file_target'],
-				];
-			}
-		}
-
-		return $best;
-	}
-
-	/**
-	 * propagate notes to the recipients
-	 *
-	 * @param IShare $share
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function propagateNote(IShare $share) {
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			$user = $this->userManager->get($share->getSharedWith());
-			$this->sendNote([$user], $share);
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$groupMembers = $group->getUsers();
-			$this->sendNote($groupMembers, $share);
-		}
-	}
-
-	public function sendMailNotification(IShare $share): bool {
-		try {
-			// Check user
-			$user = $this->userManager->get($share->getSharedWith());
-			if ($user === null) {
-				$this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because user could not be found.', ['app' => 'share']);
-				return false;
-			}
-
-			// Handle user shares
-			if ($share->getShareType() === IShare::TYPE_USER) {
-				// Check email address
-				$emailAddress = $user->getEMailAddress();
-				if ($emailAddress === null || $emailAddress === '') {
-					$this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because email address is not set.', ['app' => 'share']);
-					return false;
-				}
-
-				$userLang = $this->l10nFactory->getUserLanguage($user);
-				$l = $this->l10nFactory->get('lib', $userLang);
-				$this->sendUserShareMail(
-					$l,
-					$share->getNode()->getName(),
-					$this->urlGenerator->linkToRouteAbsolute('files_sharing.Accept.accept', ['shareId' => $share->getFullId()]),
-					$share->getSharedBy(),
-					$emailAddress,
-					$share->getExpirationDate(),
-					$share->getNote()
-				);
-				$this->logger->debug('Sent share notification to ' . $emailAddress . ' for share with ID ' . $share->getId() . '.', ['app' => 'share']);
-				return true;
-			}
-		} catch (\Exception $e) {
-			$this->logger->error('Share notification mail could not be sent.', ['exception' => $e]);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Send mail notifications for the user share type
-	 *
-	 * @param IL10N $l Language of the recipient
-	 * @param string $filename file/folder name
-	 * @param string $link link to the file/folder
-	 * @param string $initiator user ID of share sender
-	 * @param string $shareWith email address of share receiver
-	 * @param \DateTime|null $expiration
-	 * @param string $note
-	 * @throws \Exception
-	 */
-	protected function sendUserShareMail(
-		IL10N $l,
-		$filename,
-		$link,
-		$initiator,
-		$shareWith,
-		?\DateTime $expiration = null,
-		$note = '') {
-		$initiatorUser = $this->userManager->get($initiator);
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-
-		$message = $this->mailer->createMessage();
-
-		$emailTemplate = $this->mailer->createEMailTemplate('files_sharing.RecipientNotification', [
-			'filename' => $filename,
-			'link' => $link,
-			'initiator' => $initiatorDisplayName,
-			'expiration' => $expiration,
-			'shareWith' => $shareWith,
-		]);
-
-		$emailTemplate->setSubject($l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename]), false);
-
-		if ($note !== '') {
-			$emailTemplate->addBodyText(htmlspecialchars($note), $note);
-		}
-
-		$emailTemplate->addBodyButton(
-			$l->t('Open %s', [$filename]),
-			$link
-		);
-
-		$message->setTo([$shareWith]);
-
-		// The "From" contains the sharers name
-		$instanceName = $this->defaults->getName();
-		$senderName = $l->t(
-			'%1$s via %2$s',
-			[
-				$initiatorDisplayName,
-				$instanceName,
-			]
-		);
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress('noreply') => $senderName]);
-
-		// The "Reply-To" is set to the sharer if an mail address is configured
-		// also the default footer contains a "Do not reply" which needs to be adjusted.
-		if ($initiatorUser) {
-			$initiatorEmail = $initiatorUser->getEMailAddress();
-			if ($initiatorEmail !== null) {
-				$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
-			} else {
-				$emailTemplate->addFooter();
-			}
-		} else {
-			$emailTemplate->addFooter();
-		}
-
-		$message->useTemplate($emailTemplate);
-		$failedRecipients = $this->mailer->send($message);
-		if (!empty($failedRecipients)) {
-			$this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
-			return;
-		}
-	}
-
-	/**
-	 * send note by mail
-	 *
-	 * @param array $recipients
-	 * @param IShare $share
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function sendNote(array $recipients, IShare $share) {
-		$toListByLanguage = [];
-
-		foreach ($recipients as $recipient) {
-			/** @var IUser $recipient */
-			$email = $recipient->getEMailAddress();
-			if ($email) {
-				$language = $this->l10nFactory->getUserLanguage($recipient);
-				if (!isset($toListByLanguage[$language])) {
-					$toListByLanguage[$language] = [];
-				}
-				$toListByLanguage[$language][$email] = $recipient->getDisplayName();
-			}
-		}
-
-		if (empty($toListByLanguage)) {
-			return;
-		}
-
-		foreach ($toListByLanguage as $l10n => $toList) {
-			$filename = $share->getNode()->getName();
-			$initiator = $share->getSharedBy();
-			$note = $share->getNote();
-
-			$l = $this->l10nFactory->get('lib', $l10n);
-
-			$initiatorUser = $this->userManager->get($initiator);
-			$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-			$initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-			$plainHeading = $l->t('%1$s shared %2$s with you and wants to add:', [$initiatorDisplayName, $filename]);
-			$htmlHeading = $l->t('%1$s shared %2$s with you and wants to add', [$initiatorDisplayName, $filename]);
-			$message = $this->mailer->createMessage();
-
-			$emailTemplate = $this->mailer->createEMailTemplate('defaultShareProvider.sendNote');
-
-			$emailTemplate->setSubject($l->t('%s added a note to a file shared with you', [$initiatorDisplayName]));
-			$emailTemplate->addHeader();
-			$emailTemplate->addHeading($htmlHeading, $plainHeading);
-			$emailTemplate->addBodyText(htmlspecialchars($note), $note);
-
-			$link = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]);
-			$emailTemplate->addBodyButton(
-				$l->t('Open %s', [$filename]),
-				$link
-			);
-
-
-			// The "From" contains the sharers name
-			$instanceName = $this->defaults->getName();
-			$senderName = $l->t(
-				'%1$s via %2$s',
-				[
-					$initiatorDisplayName,
-					$instanceName
-				]
-			);
-			$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-			if ($initiatorEmailAddress !== null) {
-				$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
-			} else {
-				$emailTemplate->addFooter();
-			}
-
-			if (count($toList) === 1) {
-				$message->setTo($toList);
-			} else {
-				$message->setTo([]);
-				$message->setBcc($toList);
-			}
-			$message->useTemplate($emailTemplate);
-			$this->mailer->send($message);
-		}
-	}
-
-	public function getAllShares(): iterable {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK], IQueryBuilder::PARAM_INT_ARRAY)));
-
-		$cursor = $qb->executeQuery();
-		while ($data = $cursor->fetch()) {
-			try {
-				$share = $this->createShare($data);
-			} catch (InvalidShare $e) {
-				continue;
-			}
-
-			yield $share;
-		}
-		$cursor->closeCursor();
-	}
-
-	/**
-	 * Load from database format (JSON string) to IAttributes
-	 *
-	 * @return IShare the modified share
-	 */
-	protected function updateShareAttributes(IShare $share, ?string $data): IShare {
-		if ($data !== null && $data !== '') {
-			$attributes = new ShareAttributes();
-			$compressedAttributes = \json_decode($data, true);
-			if ($compressedAttributes === false || $compressedAttributes === null) {
-				return $share;
-			}
-			foreach ($compressedAttributes as $compressedAttribute) {
-				$attributes->setAttribute(
-					$compressedAttribute[0],
-					$compressedAttribute[1],
-					$compressedAttribute[2]
-				);
-			}
-			$share->setAttributes($attributes);
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Format IAttributes to database format (JSON string)
-	 */
-	protected function formatShareAttributes(?IAttributes $attributes): ?string {
-		if ($attributes === null || empty($attributes->toArray())) {
-			return null;
-		}
-
-		$compressedAttributes = [];
-		foreach ($attributes->toArray() as $attribute) {
-			$compressedAttributes[] = [
-				0 => $attribute['scope'],
-				1 => $attribute['key'],
-				2 => $attribute['value']
-			];
-		}
-		return \json_encode($compressedAttributes);
-	}
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->delete('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($uid)))
+                ->andWhere($qb->expr()->in('parent', $qb->createParameter('parents')));
+
+            foreach ($chunks as $chunk) {
+                $qb->setParameter('parents', $chunk, IQueryBuilder::PARAM_INT_ARRAY);
+                $qb->executeStatement();
+            }
+        }
+
+        if ($this->shareManager->shareWithGroupMembersOnly()) {
+            $user = $this->userManager->get($uid);
+            if ($user === null) {
+                return;
+            }
+            $userGroups = $this->groupManager->getUserGroupIds($user);
+            $userGroups = array_diff($userGroups, $this->shareManager->shareWithGroupMembersOnlyExcludeGroupsList());
+
+            // Delete user shares received by the user from users in the group.
+            $userReceivedShares = $this->shareManager->getSharedWith($uid, IShare::TYPE_USER, null, -1);
+            foreach ($userReceivedShares as $share) {
+                $owner = $this->userManager->get($share->getSharedBy());
+                if ($owner === null) {
+                    continue;
+                }
+                $ownerGroups = $this->groupManager->getUserGroupIds($owner);
+                $mutualGroups = array_intersect($userGroups, $ownerGroups);
+
+                if (count($mutualGroups) === 0) {
+                    $this->shareManager->deleteShare($share);
+                }
+            }
+
+            // Delete user shares from the user to users in the group.
+            $userEmittedShares = $this->shareManager->getSharesBy($uid, IShare::TYPE_USER, null, true, -1);
+            foreach ($userEmittedShares as $share) {
+                $recipient = $this->userManager->get($share->getSharedWith());
+                if ($recipient === null) {
+                    continue;
+                }
+                $recipientGroups = $this->groupManager->getUserGroupIds($recipient);
+                $mutualGroups = array_intersect($userGroups, $recipientGroups);
+
+                if (count($mutualGroups) === 0) {
+                    $this->shareManager->deleteShare($share);
+                }
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAccessList($nodes, $currentAccess) {
+        $ids = [];
+        foreach ($nodes as $node) {
+            $ids[] = $node->getId();
+        }
+
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $shareTypes = [IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK];
+
+        if ($currentAccess) {
+            $shareTypes[] = IShare::TYPE_USERGROUP;
+        }
+
+        $qb->select('id', 'parent', 'share_type', 'share_with', 'file_source', 'file_target', 'permissions')
+            ->from('share')
+            ->where(
+                $qb->expr()->in('share_type', $qb->createNamedParameter($shareTypes, IQueryBuilder::PARAM_INT_ARRAY))
+            )
+            ->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
+
+        // Ensure accepted is true for user and usergroup type
+        $qb->andWhere(
+            $qb->expr()->orX(
+                $qb->expr()->andX(
+                    $qb->expr()->neq('share_type', $qb->createNamedParameter(IShare::TYPE_USER)),
+                    $qb->expr()->neq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP)),
+                ),
+                $qb->expr()->eq('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED, IQueryBuilder::PARAM_INT)),
+            ),
+        );
+
+        $cursor = $qb->executeQuery();
+
+        $users = [];
+        $link = false;
+        while ($row = $cursor->fetch()) {
+            $type = (int)$row['share_type'];
+            if ($type === IShare::TYPE_USER) {
+                $uid = $row['share_with'];
+                $users[$uid] = $users[$uid] ?? [];
+                $users[$uid][$row['id']] = $row;
+            } elseif ($type === IShare::TYPE_GROUP) {
+                $gid = $row['share_with'];
+                $group = $this->groupManager->get($gid);
+
+                if ($group === null) {
+                    continue;
+                }
+
+                $userList = $group->getUsers();
+                foreach ($userList as $user) {
+                    $uid = $user->getUID();
+                    $users[$uid] = $users[$uid] ?? [];
+                    $users[$uid][$row['id']] = $row;
+                }
+            } elseif ($type === IShare::TYPE_LINK) {
+                $link = true;
+            } elseif ($type === IShare::TYPE_USERGROUP && $currentAccess === true) {
+                $uid = $row['share_with'];
+                $users[$uid] = $users[$uid] ?? [];
+                $users[$uid][$row['id']] = $row;
+            }
+        }
+        $cursor->closeCursor();
+
+        if ($currentAccess === true) {
+            $users = array_map([$this, 'filterSharesOfUser'], $users);
+            $users = array_filter($users);
+        } else {
+            $users = array_keys($users);
+        }
+
+        return ['users' => $users, 'public' => $link];
+    }
+
+    /**
+     * For each user the path with the fewest slashes is returned
+     * @param array $shares
+     * @return array
+     */
+    protected function filterSharesOfUser(array $shares) {
+        // Group shares when the user has a share exception
+        foreach ($shares as $id => $share) {
+            $type = (int)$share['share_type'];
+            $permissions = (int)$share['permissions'];
+
+            if ($type === IShare::TYPE_USERGROUP) {
+                unset($shares[$share['parent']]);
+
+                if ($permissions === 0) {
+                    unset($shares[$id]);
+                }
+            }
+        }
+
+        $best = [];
+        $bestDepth = 0;
+        foreach ($shares as $id => $share) {
+            $depth = substr_count(($share['file_target'] ?? ''), '/');
+            if (empty($best) || $depth < $bestDepth) {
+                $bestDepth = $depth;
+                $best = [
+                    'node_id' => $share['file_source'],
+                    'node_path' => $share['file_target'],
+                ];
+            }
+        }
+
+        return $best;
+    }
+
+    /**
+     * propagate notes to the recipients
+     *
+     * @param IShare $share
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function propagateNote(IShare $share) {
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            $user = $this->userManager->get($share->getSharedWith());
+            $this->sendNote([$user], $share);
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $groupMembers = $group->getUsers();
+            $this->sendNote($groupMembers, $share);
+        }
+    }
+
+    public function sendMailNotification(IShare $share): bool {
+        try {
+            // Check user
+            $user = $this->userManager->get($share->getSharedWith());
+            if ($user === null) {
+                $this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because user could not be found.', ['app' => 'share']);
+                return false;
+            }
+
+            // Handle user shares
+            if ($share->getShareType() === IShare::TYPE_USER) {
+                // Check email address
+                $emailAddress = $user->getEMailAddress();
+                if ($emailAddress === null || $emailAddress === '') {
+                    $this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because email address is not set.', ['app' => 'share']);
+                    return false;
+                }
+
+                $userLang = $this->l10nFactory->getUserLanguage($user);
+                $l = $this->l10nFactory->get('lib', $userLang);
+                $this->sendUserShareMail(
+                    $l,
+                    $share->getNode()->getName(),
+                    $this->urlGenerator->linkToRouteAbsolute('files_sharing.Accept.accept', ['shareId' => $share->getFullId()]),
+                    $share->getSharedBy(),
+                    $emailAddress,
+                    $share->getExpirationDate(),
+                    $share->getNote()
+                );
+                $this->logger->debug('Sent share notification to ' . $emailAddress . ' for share with ID ' . $share->getId() . '.', ['app' => 'share']);
+                return true;
+            }
+        } catch (\Exception $e) {
+            $this->logger->error('Share notification mail could not be sent.', ['exception' => $e]);
+        }
+
+        return false;
+    }
+
+    /**
+     * Send mail notifications for the user share type
+     *
+     * @param IL10N $l Language of the recipient
+     * @param string $filename file/folder name
+     * @param string $link link to the file/folder
+     * @param string $initiator user ID of share sender
+     * @param string $shareWith email address of share receiver
+     * @param \DateTime|null $expiration
+     * @param string $note
+     * @throws \Exception
+     */
+    protected function sendUserShareMail(
+        IL10N $l,
+        $filename,
+        $link,
+        $initiator,
+        $shareWith,
+        ?\DateTime $expiration = null,
+        $note = '') {
+        $initiatorUser = $this->userManager->get($initiator);
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+
+        $message = $this->mailer->createMessage();
+
+        $emailTemplate = $this->mailer->createEMailTemplate('files_sharing.RecipientNotification', [
+            'filename' => $filename,
+            'link' => $link,
+            'initiator' => $initiatorDisplayName,
+            'expiration' => $expiration,
+            'shareWith' => $shareWith,
+        ]);
+
+        $emailTemplate->setSubject($l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename]), false);
+
+        if ($note !== '') {
+            $emailTemplate->addBodyText(htmlspecialchars($note), $note);
+        }
+
+        $emailTemplate->addBodyButton(
+            $l->t('Open %s', [$filename]),
+            $link
+        );
+
+        $message->setTo([$shareWith]);
+
+        // The "From" contains the sharers name
+        $instanceName = $this->defaults->getName();
+        $senderName = $l->t(
+            '%1$s via %2$s',
+            [
+                $initiatorDisplayName,
+                $instanceName,
+            ]
+        );
+        $message->setFrom([\OCP\Util::getDefaultEmailAddress('noreply') => $senderName]);
+
+        // The "Reply-To" is set to the sharer if an mail address is configured
+        // also the default footer contains a "Do not reply" which needs to be adjusted.
+        if ($initiatorUser) {
+            $initiatorEmail = $initiatorUser->getEMailAddress();
+            if ($initiatorEmail !== null) {
+                $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
+                $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+            } else {
+                $emailTemplate->addFooter();
+            }
+        } else {
+            $emailTemplate->addFooter();
+        }
+
+        $message->useTemplate($emailTemplate);
+        $failedRecipients = $this->mailer->send($message);
+        if (!empty($failedRecipients)) {
+            $this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
+            return;
+        }
+    }
+
+    /**
+     * send note by mail
+     *
+     * @param array $recipients
+     * @param IShare $share
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function sendNote(array $recipients, IShare $share) {
+        $toListByLanguage = [];
+
+        foreach ($recipients as $recipient) {
+            /** @var IUser $recipient */
+            $email = $recipient->getEMailAddress();
+            if ($email) {
+                $language = $this->l10nFactory->getUserLanguage($recipient);
+                if (!isset($toListByLanguage[$language])) {
+                    $toListByLanguage[$language] = [];
+                }
+                $toListByLanguage[$language][$email] = $recipient->getDisplayName();
+            }
+        }
+
+        if (empty($toListByLanguage)) {
+            return;
+        }
+
+        foreach ($toListByLanguage as $l10n => $toList) {
+            $filename = $share->getNode()->getName();
+            $initiator = $share->getSharedBy();
+            $note = $share->getNote();
+
+            $l = $this->l10nFactory->get('lib', $l10n);
+
+            $initiatorUser = $this->userManager->get($initiator);
+            $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+            $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+            $plainHeading = $l->t('%1$s shared %2$s with you and wants to add:', [$initiatorDisplayName, $filename]);
+            $htmlHeading = $l->t('%1$s shared %2$s with you and wants to add', [$initiatorDisplayName, $filename]);
+            $message = $this->mailer->createMessage();
+
+            $emailTemplate = $this->mailer->createEMailTemplate('defaultShareProvider.sendNote');
+
+            $emailTemplate->setSubject($l->t('%s added a note to a file shared with you', [$initiatorDisplayName]));
+            $emailTemplate->addHeader();
+            $emailTemplate->addHeading($htmlHeading, $plainHeading);
+            $emailTemplate->addBodyText(htmlspecialchars($note), $note);
+
+            $link = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]);
+            $emailTemplate->addBodyButton(
+                $l->t('Open %s', [$filename]),
+                $link
+            );
+
+
+            // The "From" contains the sharers name
+            $instanceName = $this->defaults->getName();
+            $senderName = $l->t(
+                '%1$s via %2$s',
+                [
+                    $initiatorDisplayName,
+                    $instanceName
+                ]
+            );
+            $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+            if ($initiatorEmailAddress !== null) {
+                $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
+                $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+            } else {
+                $emailTemplate->addFooter();
+            }
+
+            if (count($toList) === 1) {
+                $message->setTo($toList);
+            } else {
+                $message->setTo([]);
+                $message->setBcc($toList);
+            }
+            $message->useTemplate($emailTemplate);
+            $this->mailer->send($message);
+        }
+    }
+
+    public function getAllShares(): iterable {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK], IQueryBuilder::PARAM_INT_ARRAY)));
+
+        $cursor = $qb->executeQuery();
+        while ($data = $cursor->fetch()) {
+            try {
+                $share = $this->createShare($data);
+            } catch (InvalidShare $e) {
+                continue;
+            }
+
+            yield $share;
+        }
+        $cursor->closeCursor();
+    }
+
+    /**
+     * Load from database format (JSON string) to IAttributes
+     *
+     * @return IShare the modified share
+     */
+    protected function updateShareAttributes(IShare $share, ?string $data): IShare {
+        if ($data !== null && $data !== '') {
+            $attributes = new ShareAttributes();
+            $compressedAttributes = \json_decode($data, true);
+            if ($compressedAttributes === false || $compressedAttributes === null) {
+                return $share;
+            }
+            foreach ($compressedAttributes as $compressedAttribute) {
+                $attributes->setAttribute(
+                    $compressedAttribute[0],
+                    $compressedAttribute[1],
+                    $compressedAttribute[2]
+                );
+            }
+            $share->setAttributes($attributes);
+        }
+
+        return $share;
+    }
+
+    /**
+     * Format IAttributes to database format (JSON string)
+     */
+    protected function formatShareAttributes(?IAttributes $attributes): ?string {
+        if ($attributes === null || empty($attributes->toArray())) {
+            return null;
+        }
+
+        $compressedAttributes = [];
+        foreach ($attributes->toArray() as $attribute) {
+            $compressedAttributes[] = [
+                0 => $attribute['scope'],
+                1 => $attribute['key'],
+                2 => $attribute['value']
+            ];
+        }
+        return \json_encode($compressedAttributes);
+    }
 }

Spacing +34 added lines, -34 removed lines

@@ -177,7 +177,7 @@ 
 
 		// Update mandatory data
 		$id = $qb->getLastInsertId();
-		$share->setId((string)$id);
+		$share->setId((string) $id);
 		$share->setProviderId($this->identifier());
 
 		$share->setShareTime(\DateTime::createFromImmutable($shareTime));
@@ -308,7 +308,7 @@ 
 			$user = $this->userManager->get($recipient);
 
 			if (is_null($group)) {
-				throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
+				throw new ProviderException('Group "'.$share->getSharedWith().'" does not exist');
 			}
 
 			if (!$group->inGroup($user)) {
@@ -421,7 +421,7 @@ 
 			$user = $this->userManager->get($recipient);
 
 			if (is_null($group)) {
-				throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
+				throw new ProviderException('Group "'.$share->getSharedWith().'" does not exist');
 			}
 
 			if (!$group->inGroup($user)) {
@@ -482,7 +482,7 @@ 
 			$shareFolder = $this->config->getUserValue($recipient, Application::APP_ID, 'share_folder', $shareFolder);
 		}
 
-		$target = $shareFolder . '/' . $share->getNode()->getName();
+		$target = $shareFolder.'/'.$share->getNode()->getName();
 		$target = \OC\Files\Filesystem::normalizePath($target);
 
 		$qb = $this->dbConn->getQueryBuilder();
@@ -643,10 +643,10 @@ 
 		}
 
 		// todo? maybe get these from the oc_mounts table
-		$childMountNodes = array_filter($node->getDirectoryListing(), function (Node $node): bool {
+		$childMountNodes = array_filter($node->getDirectoryListing(), function(Node $node): bool {
 			return $node->getInternalPath() === '';
 		});
-		$childMountRootIds = array_map(function (Node $node): int {
+		$childMountRootIds = array_map(function(Node $node): int {
 			return $node->getId();
 		}, $childMountNodes);
 
@@ -766,7 +766,7 @@ 
 
 		// If the recipient is set for a group share resolve to that user
 		if ($recipientId !== null && $share->getShareType() === IShare::TYPE_GROUP) {
-			$share = $this->resolveGroupShares([(int)$share->getId() => $share], $recipientId)[0];
+			$share = $this->resolveGroupShares([(int) $share->getId() => $share], $recipientId)[0];
 		}
 
 		return $share;
@@ -865,9 +865,9 @@ 
 
 			while ($data = $cursor->fetch()) {
 				if ($data['fileid'] && $data['path'] === null) {
-					$data['path'] = (string)$data['path'];
-					$data['name'] = (string)$data['name'];
-					$data['checksum'] = (string)$data['checksum'];
+					$data['path'] = (string) $data['path'];
+					$data['name'] = (string) $data['name'];
+					$data['checksum'] = (string) $data['checksum'];
 				}
 				if ($this->isAccessibleResult($data)) {
 					$shares[] = $this->createShare($data);
@@ -990,16 +990,16 @@ 
 	private function createShare($data) {
 		$share = new Share($this->rootFolder, $this->userManager);
 		$share->setId($data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
+			->setShareType((int) $data['share_type'])
+			->setPermissions((int) $data['permissions'])
 			->setTarget($data['file_target'])
-			->setNote((string)$data['note'])
-			->setMailSend((bool)$data['mail_send'])
-			->setStatus((int)$data['accepted'])
+			->setNote((string) $data['note'])
+			->setMailSend((bool) $data['mail_send'])
+			->setStatus((int) $data['accepted'])
 			->setLabel($data['label'] ?? '');
 
 		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
+		$shareTime->setTimestamp((int) $data['stime']);
 		$share->setShareTime($shareTime);
 
 		if ($share->getShareType() === IShare::TYPE_USER) {
@@ -1016,7 +1016,7 @@ 
 			}
 		} elseif ($share->getShareType() === IShare::TYPE_LINK) {
 			$share->setPassword($data['password']);
-			$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
+			$share->setSendPasswordByTalk((bool) $data['password_by_talk']);
 			$share->setToken($data['token']);
 		}
 
@@ -1025,7 +1025,7 @@ 
 		$share->setSharedBy($data['uid_initiator']);
 		$share->setShareOwner($data['uid_owner']);
 
-		$share->setNodeId((int)$data['file_source']);
+		$share->setNodeId((int) $data['file_source']);
 		$share->setNodeType($data['item_type']);
 
 		if ($data['expiration'] !== null) {
@@ -1042,8 +1042,8 @@ 
 		}
 
 		$share->setProviderId($this->identifier());
-		$share->setHideDownload((int)$data['hide_download'] === 1);
-		$share->setReminderSent((bool)$data['reminder_sent']);
+		$share->setHideDownload((int) $data['hide_download'] === 1);
+		$share->setReminderSent((bool) $data['reminder_sent']);
 
 		return $share;
 	}
@@ -1075,8 +1075,8 @@ 
 
 		while ($data = $stmt->fetch()) {
 			if (array_key_exists($data['parent'], $shareMap)) {
-				$shareMap[$data['parent']]->setPermissions((int)$data['permissions']);
-				$shareMap[$data['parent']]->setStatus((int)$data['accepted']);
+				$shareMap[$data['parent']]->setPermissions((int) $data['permissions']);
+				$shareMap[$data['parent']]->setStatus((int) $data['accepted']);
 				$shareMap[$data['parent']]->setTarget($data['file_target']);
 				$shareMap[$data['parent']]->setParent($data['parent']);
 			}
@@ -1143,7 +1143,7 @@ 
 				)
 			);
 		} else {
-			$e = new \InvalidArgumentException('Default share provider tried to delete all shares for type: ' . $shareType);
+			$e = new \InvalidArgumentException('Default share provider tried to delete all shares for type: '.$shareType);
 			$this->logger->error($e->getMessage(), ['exception' => $e]);
 			return;
 		}
@@ -1170,7 +1170,7 @@ 
 		$cursor = $qb->executeQuery();
 		$ids = [];
 		while ($row = $cursor->fetch()) {
-			$ids[] = (int)$row['id'];
+			$ids[] = (int) $row['id'];
 		}
 		$cursor->closeCursor();
 
@@ -1218,7 +1218,7 @@ 
 		$cursor = $qb->executeQuery();
 		$ids = [];
 		while ($row = $cursor->fetch()) {
-			$ids[] = (int)$row['id'];
+			$ids[] = (int) $row['id'];
 		}
 		$cursor->closeCursor();
 
@@ -1321,7 +1321,7 @@ 
 		$users = [];
 		$link = false;
 		while ($row = $cursor->fetch()) {
-			$type = (int)$row['share_type'];
+			$type = (int) $row['share_type'];
 			if ($type === IShare::TYPE_USER) {
 				$uid = $row['share_with'];
 				$users[$uid] = $users[$uid] ?? [];
@@ -1368,8 +1368,8 @@ 
 	protected function filterSharesOfUser(array $shares) {
 		// Group shares when the user has a share exception
 		foreach ($shares as $id => $share) {
-			$type = (int)$share['share_type'];
-			$permissions = (int)$share['permissions'];
+			$type = (int) $share['share_type'];
+			$permissions = (int) $share['permissions'];
 
 			if ($type === IShare::TYPE_USERGROUP) {
 				unset($shares[$share['parent']]);
@@ -1418,7 +1418,7 @@ 
 			// Check user
 			$user = $this->userManager->get($share->getSharedWith());
 			if ($user === null) {
-				$this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because user could not be found.', ['app' => 'share']);
+				$this->logger->debug('Share notification not sent to '.$share->getSharedWith().' because user could not be found.', ['app' => 'share']);
 				return false;
 			}
 
@@ -1427,7 +1427,7 @@ 
 				// Check email address
 				$emailAddress = $user->getEMailAddress();
 				if ($emailAddress === null || $emailAddress === '') {
-					$this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because email address is not set.', ['app' => 'share']);
+					$this->logger->debug('Share notification not sent to '.$share->getSharedWith().' because email address is not set.', ['app' => 'share']);
 					return false;
 				}
 
@@ -1442,7 +1442,7 @@ 
 					$share->getExpirationDate(),
 					$share->getNote()
 				);
-				$this->logger->debug('Sent share notification to ' . $emailAddress . ' for share with ID ' . $share->getId() . '.', ['app' => 'share']);
+				$this->logger->debug('Sent share notification to '.$emailAddress.' for share with ID '.$share->getId().'.', ['app' => 'share']);
 				return true;
 			}
 		} catch (\Exception $e) {
@@ -1517,7 +1517,7 @@ 
 			$initiatorEmail = $initiatorUser->getEMailAddress();
 			if ($initiatorEmail !== null) {
 				$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+				$emailTemplate->addFooter($instanceName.($this->defaults->getSlogan() !== '' ? ' - '.$this->defaults->getSlogan() : ''));
 			} else {
 				$emailTemplate->addFooter();
 			}
@@ -1528,7 +1528,7 @@ 
 		$message->useTemplate($emailTemplate);
 		$failedRecipients = $this->mailer->send($message);
 		if (!empty($failedRecipients)) {
-			$this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
+			$this->logger->error('Share notification mail could not be sent to: '.implode(', ', $failedRecipients));
 			return;
 		}
 	}
@@ -1599,7 +1599,7 @@ 
 			$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 			if ($initiatorEmailAddress !== null) {
 				$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+				$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 			} else {
 				$emailTemplate->addFooter();
 			}