address feedback

Signed-off-by: Roberto Vidal <[email protected]>

Author: jrvidal

lib/AppInfo/BeforeShareCreatedListener.php

@@ -50,11 +50,11 @@ public function overwriteShareTarget(IShare $share): void {
 			$itemTarget = $share->getTarget();
 			$uidOwner = $share->getSharedBy();
 			$ownerPath = $this->noteUtil->getRoot()->getUserFolder($uidOwner)->getPath();
-			$ownerNotesPath = $ownerPath . '/' . $this->settings->get($uidOwner, 'notesPath');
+			$ownerNotesPath = $ownerPath . '/' . $this->settings->getValueString($uidOwner, 'notesPath');
 
 			$receiver = $share->getSharedWith();
 			$receiverPath = $this->noteUtil->getRoot()->getUserFolder($receiver)->getPath();
-			$receiverNotesInternalPath = $this->settings->get($receiver, 'notesPath');
+			$receiverNotesInternalPath = $this->settings->getValueString($receiver, 'notesPath');
 			$this->noteUtil->getOrCreateNotesFolder($receiver);
 
 			if ($itemType !== 'file' || strpos($fileSourcePath, $ownerNotesPath) !== 0) {

lib/Controller/NotesController.php

@@ -359,7 +359,7 @@ public function uploadFile(int $noteid): JSONResponse {
 	}
 
 	private function inLockScope(Note $note, callable $callback) {
-		$isRichText = $this->settingsService->get($this->helper->getUID(), 'noteMode') === 'rich';
+		$isRichText = $this->settingsService->getValueString($this->helper->getUID(), 'noteMode') === 'rich';
 		$lockContext = new LockContext(
 			$note->getFile(),
 			$isRichText ? ILock::TYPE_APP : ILock::TYPE_USER,

lib/Service/NoteUtil.php

@@ -197,7 +197,7 @@ public function getNotesFolderUserPath(string $userId): ?string {
 
 	public function getOrCreateNotesFolder(string $userId, bool $create = true) : Folder {
 		$userFolder = $this->getRoot()->getUserFolder($userId);
-		$notesPath = $this->settingsService->get($userId, 'notesPath');
+		$notesPath = $this->settingsService->getValueString($userId, 'notesPath');
 		$allowShared = $notesPath !== $this->settingsService->getDefaultNotesPath($userId);
 
 		$folder = null;

lib/Service/NotesService.php

@@ -35,7 +35,7 @@ public function getAll(string $userId, bool $autoCreateNotesFolder = false, ?boo
 		try {
 			$notesFolder = $this->getNotesFolder($userId, $autoCreateNotesFolder);
 			if ($showHidden === null) {
-				$showHidden = $this->settings->get($userId, 'showHidden');
+				$showHidden = $this->settings->getValueBool($userId, 'showHidden');
 			}
 			$data = self::gatherNoteFiles($customExtension, $notesFolder, $showHidden);
 			$fileIds = array_keys($data['files']);
@@ -69,7 +69,7 @@ public function countNotes(string $userId) : int {
 		$customExtension = $this->getCustomExtension($userId);
 		try {
 			$notesFolder = $this->getNotesFolder($userId, false);
-			$showHidden = $this->settings->get($userId, 'showHidden');
+			$showHidden = $this->settings->getValueBool($userId, 'showHidden');
 			$data = self::gatherNoteFiles($customExtension, $notesFolder, $showHidden);
 			return count($data['files']);
 		} catch (NotesFolderException $e) {
@@ -132,9 +132,9 @@ public function create(string $userId, string $title, string $category) : Note {
 		$this->noteUtil->ensureSufficientStorage($folder, 1);
 
 		// get file name
-		$fileSuffix = $this->settings->get($userId, 'fileSuffix');
+		$fileSuffix = $this->settings->getValueString($userId, 'fileSuffix');
 		if ($fileSuffix === 'custom') {
-			$fileSuffix = $this->settings->get($userId, 'customSuffix');
+			$fileSuffix = $this->settings->getValueString($userId, 'customSuffix');
 		}
 		$filename = $this->noteUtil->generateFileName($folder, $title, $fileSuffix, -1);
 		// create file
@@ -211,7 +211,7 @@ private static function isNote(FileInfo $file, string $customExtension) : bool {
 	 * Retrieve the value of user defined files extension
 	 */
 	private function getCustomExtension(string $userId) {
-		$suffix = $this->settings->get($userId, 'customSuffix');
+		$suffix = $this->settings->getValueString($userId, 'customSuffix');
 		return ltrim($suffix, '.');
 	}
 

lib/Service/SettingsService.php

@@ -69,8 +69,8 @@ public function __construct(
 				},
 			],
 			'showHidden' => [
-				'default' => true,
-				'validate' => function ($value) {
+				'default' => false,
+				'validate' => function (mixed $value) : bool {
 					return (bool)$value;
 				}
 			],
@@ -175,13 +175,15 @@ public function getAll(string $uid, $saveInitial = false) : \stdClass {
 	/**
 	 * @throws \OCP\PreConditionNotMetException
 	 */
-	public function get(string $uid, string $name) : string|bool {
-		$settings = $this->getAll($uid);
-		if (property_exists($settings, $name)) {
-			return $settings->{$name};
-		} else {
-			throw new \OCP\PreConditionNotMetException('Setting ' . $name . ' not found for user ' . $uid . '.');
-		}
+	public function getValueString(string $uid, string $name) : string {
+		return $this->get($uid, $name, 'string');
+	}
+
+	/**
+	 * @throws \OCP\PreConditionNotMetException
+	 */
+	public function getValueBool(string $uid, string $name) : bool {
+		return $this->get($uid, $name, 'boolean');
 	}
 
 	public function delete(string $uid, string $name): void {
@@ -204,4 +206,22 @@ private function getAvailableEditorModes(): array {
 			? ['rich', 'edit', 'preview']
 			: ['edit', 'preview'];
 	}
+
+	/**
+	 * @throws \OCP\PreConditionNotMetException
+	 */
+	private function get(string $uid, string $name, string $type) : mixed {
+		$settings = $this->getAll($uid);
+		if (property_exists($settings, $name)) {
+			$value = $settings->{$name};
+			if (gettype($value) !== $type) {
+				throw new \TypeError('Invalid type');
+			}
+
+			return $value;
+		} else {
+			throw new \OCP\PreConditionNotMetException('Setting ' . $name . ' not found for user ' . $uid . '.');
+		}
+	}
+
 }

src/components/AppSettings.vue

@@ -22,7 +22,7 @@
 				{{ t('notes', 'Organize your notes in categories.') }}
 			</div>
 		</NcAppSettingsSection>
-		<NcAppSettingsSection id="notes-path-section" :name="t('notes', 'Notes folder')">
+		<NcAppSettingsSection id="notes-path-section" :name="t('notes', 'Notes path')">
 			<p class="app-settings-section__desc">
 				{{ t('notes', 'Folder to store your notes') }}
 			</p>