fixup! add notes path to capabilities

nextcloud · Feb 3, 2025 · 8113c57 · 8113c57
1 parent ebc02c8
commit 8113c57
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/AppInfo/Capabilities.php b/lib/AppInfo/Capabilities.php
@@ -15,17 +15,19 @@
 use OCP\IUserSession;
 
 class Capabilities implements ICapability {
-	public function __construct(private IAppManager $appManager,
-								private NoteUtil $noteUtil,
-								private IUserSession $userSession) {
+	public function __construct(
+		private IAppManager $appManager,
+		private NoteUtil $noteUtil,
+		private ?string $userId
+	) {
 	}
 
 	public function getCapabilities(): array {
 		return [
 			Application::APP_ID => [
 				'api_version' => Application::$API_VERSIONS,
 				'version' => $this->appManager->getAppVersion(Application::APP_ID),
-				'notes_path' => $this->noteUtil->getOrCreateNotesFolder($this->userSession->getUser()->getUID())->getInternalPath()
+				'notes_path' => $this->userId ? $this->noteUtil->getNotesFolderUserPath($this->userId) : null,
 			],
 		];
 	}

diff --git a/lib/Service/NoteUtil.php b/lib/Service/NoteUtil.php
@@ -183,6 +183,12 @@ public function getOrCreateFolder(string $path, bool $create = true) : Folder {
 		return $folder;
 	}
 
+	public function getNotesFolderUserPath(string $userId): string {
+		$userFolder = $this->getRoot()->getUserFolder($userId);
+		$nodesFolder = $this->getOrCreateNotesFolder($userId, false);
+		return $userFolder->getRelativePath($nodesFolder->getPath());
+	}
+
 	public function getOrCreateNotesFolder(string $userId, bool $create = true) : Folder {
 		$userFolder = $this->getRoot()->getUserFolder($userId);
 		$notesPath = $this->settingsService->get($userId, 'notesPath');