initialize settings when using API or starting app

nextcloud · Aug 14, 2022 · 67edbc1 · 67edbc1
1 parent bab1e77
commit 67edbc1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/lib/Controller/Helper.php b/lib/Controller/Helper.php
@@ -74,7 +74,7 @@ public function getNotesAndCategories(
 		$userId = $this->getUID();
 		$chunkCursor = $chunkCursorStr ? ChunkCursor::fromString($chunkCursorStr) : null;
 		$lastUpdate = $chunkCursor->timeStart ?? new \DateTime();
-		$data = $this->notesService->getAll($userId, true);
+		$data = $this->notesService->getAll($userId, true); // auto-create notes folder if not exists
 		$metaNotes = $this->metaService->getAll($userId, $data['notes']);
 
 		// if a category is requested, then ignore all other notes

diff --git a/lib/Controller/NotesApiController.php b/lib/Controller/NotesApiController.php
@@ -55,6 +55,10 @@ public function index(
 			$chunkSize,
 			$chunkCursor
 		) {
+			// initialize settings
+			$userId = $this->helper->getUID();
+			$this->settingsService->getAll($userId, true);
+			// load notes and categories
 			$exclude = explode(',', $exclude);
 			$data = $this->helper->getNotesAndCategories($pruneBefore, $exclude, $category, $chunkSize, $chunkCursor);
 			$notesData = $data['notesData'];

diff --git a/lib/Controller/NotesController.php b/lib/Controller/NotesController.php
@@ -49,6 +49,7 @@ public function __construct(
 	public function index(int $pruneBefore = 0) : JSONResponse {
 		return $this->helper->handleErrorResponse(function () use ($pruneBefore) {
 			$userId = $this->helper->getUID();
+			// initialize and load settings
 			$settings = $this->settingsService->getAll($userId, true);
 
 			$lastViewedNote = (int) $this->settings->getUserValue(

diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
@@ -168,7 +168,9 @@ public function get(string $uid, string $name) : string {
 	}
 
 	public function getPublic(string $uid) : \stdClass {
-		$settings = $this->getAll($uid);
+		// initialize and load settings
+		$settings = $this->getAll($uid, true);
+		// translate internal settings to public settings
 		if ($settings->fileSuffix === 'custom') {
 			$settings->fileSuffix = $settings->customSuffix;
 		}