From a2a041a47b5bc427833441d5bba5fafbb2c58403 Mon Sep 17 00:00:00 2001 From: "Cleopatra Enjeck M." Date: Wed, 19 Feb 2025 05:22:40 +0000 Subject: [PATCH 1/2] fix: catch exception when getting notes folder Signed-off-by: Cleopatra Enjeck M. --- lib/Service/NoteUtil.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/Service/NoteUtil.php b/lib/Service/NoteUtil.php index 6cb52711b..2bf85f132 100644 --- a/lib/Service/NoteUtil.php +++ b/lib/Service/NoteUtil.php @@ -186,7 +186,12 @@ public function getOrCreateFolder(string $path, bool $create = true) : Folder { public function getNotesFolderUserPath(string $userId): ?string { /** @psalm-suppress MissingDependency */ $userFolder = $this->getRoot()->getUserFolder($userId); - $nodesFolder = $this->getOrCreateNotesFolder($userId, false); + try { + $nodesFolder = $this->getOrCreateNotesFolder($userId, false); + } catch (NotesFolderException $e) { + $this->util->logger->error("Failed to get notes folder for user $userId: " . $e->getMessage()); + return null; + } return $userFolder->getRelativePath($nodesFolder->getPath()); } From 2385a9b411bc27696caa0335fcc1c2701dba0b5e Mon Sep 17 00:00:00 2001 From: "Cleopatra Enjeck M." Date: Thu, 20 Feb 2025 06:12:09 +0000 Subject: [PATCH 2/2] refactor: Use warning instead of error Signed-off-by: Cleopatra Enjeck M. --- lib/Service/NoteUtil.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Service/NoteUtil.php b/lib/Service/NoteUtil.php index 2bf85f132..14a972b58 100644 --- a/lib/Service/NoteUtil.php +++ b/lib/Service/NoteUtil.php @@ -189,7 +189,7 @@ public function getNotesFolderUserPath(string $userId): ?string { try { $nodesFolder = $this->getOrCreateNotesFolder($userId, false); } catch (NotesFolderException $e) { - $this->util->logger->error("Failed to get notes folder for user $userId: " . $e->getMessage()); + $this->util->logger->warning("Failed to get notes folder for user $userId: " . $e->getMessage()); return null; } return $userFolder->getRelativePath($nodesFolder->getPath());