Merge fa938cd into 447d523

Author: luka-nextcloud

lib/FilesHooks.php

@@ -816,7 +816,7 @@ protected function shareWithTeam(string $shareWith, int $fileSource, string $ite
 	 * @throws \OCP\Files\NotFoundException
 	 */
 	public function unShare(IShare $share) {
-		if (in_array($share->getNodeType(), ['file', 'folder'], true)) {
+		if (in_array($share->getNodeType(), ['file', 'folder'], true) && !$this->isDeletedNode($share->getShareOwner(), $share->getNodeId())) {
 			if ($share->getShareType() === IShare::TYPE_USER) {
 				$this->unshareFromUser($share);
 			} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
@@ -1397,4 +1397,14 @@ private function getUnrelatedUsers(int $fileId, array $cachedMounts): array {
 
 		return $filteredUsers;
 	}
+
+	private function isDeletedNode(string $owner, int $nodeId): bool {
+		try {
+			$userFolder = $this->rootFolder->getUserFolder($owner);
+			$node = $userFolder->getFirstNodeById($nodeId);
+			return $node === null;
+		} catch (NotFoundException $e) {
+			return true;
+		}
+	}
 }