From eaa68be517dfb5fb2598ce49b6603506e3bd3541 Mon Sep 17 00:00:00 2001
From: Matias De lellis <mati86dl@gmail.com>
Date: Mon, 20 Sep 2021 21:26:25 -0300
Subject: [PATCH] Fix some regresions

---
 lib/Controller/SettingsController.php | 2 +-
 lib/Controller/ShareController.php    | 1 +
 lib/Db/Color.php                      | 2 +-
 lib/Db/ColorMapper.php                | 2 +-
 lib/Service/NoteService.php           | 3 ++-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 6cff97a..e6ae0d3 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -94,7 +94,7 @@ class SettingsController extends Controller {
 
 		switch ($type) {
 			case SettingsService::COLOR_FOR_NEW_NOTES_KEY:
-				$value = $this->settingsService->getColorForNewNotes($this->userId);
+				$value = $this->settingsService->getColorForNewNotes();
 				break;
 			default:
 				$status = self::STATE_FALSE;
diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php
index 1d5b6fe..47c93da 100644
--- a/lib/Controller/ShareController.php
+++ b/lib/Controller/ShareController.php
@@ -31,6 +31,7 @@ use OCP\IRequest;
 use OCA\QuickNotes\Db\NoteShare;
 use OCA\QuickNotes\Db\NoteShareMapper;
 
+use OCP\AppFramework\Db\DoesNotExistException;
 
 class ShareController extends Controller {
 
diff --git a/lib/Db/Color.php b/lib/Db/Color.php
index 07d21f1..181286c 100644
--- a/lib/Db/Color.php
+++ b/lib/Db/Color.php
@@ -7,7 +7,7 @@ use OCP\AppFramework\Db\Entity;
 
 /**
  * @method void setColor(string $color)
- * @method strinf getColor()
+ * @method string getColor()
  */
 class Color extends Entity implements JsonSerializable {
 
diff --git a/lib/Db/ColorMapper.php b/lib/Db/ColorMapper.php
index 0dc1e39..dee30ef 100644
--- a/lib/Db/ColorMapper.php
+++ b/lib/Db/ColorMapper.php
@@ -30,7 +30,7 @@ class ColorMapper extends QBMapper {
 		$qb->select('*')
 			->from($this->tableName)
 			->where(
-				$qb->expr()->eq('color', $qb->createNamedParameter($color, IQueryBuilder::PARAM_STRING))
+				$qb->expr()->eq('color', $qb->createNamedParameter($color, IQueryBuilder::PARAM_STR))
 			);
 		return $this->findEntity($qb);
 	}
diff --git a/lib/Service/NoteService.php b/lib/Service/NoteService.php
index 0a8f57f..e433235 100644
--- a/lib/Service/NoteService.php
+++ b/lib/Service/NoteService.php
@@ -43,6 +43,7 @@ use OCA\QuickNotes\Db\TagMapper;
 use OCA\QuickNotes\Service\FileService;
 use OCA\QuickNotes\Service\SettingsService;
 
+use OCP\AppFramework\Db\DoesNotExistException;
 
 class NoteService {
 
@@ -408,7 +409,7 @@ class NoteService {
 		// Get Note and Color
 		try {
 			$note = $this->notemapper->find($id, $userId);
-		} catch(Exception $e) {
+		} catch(DoesNotExistException $e) {
 			return;
 		}
 		$oldcolorid = $note->getColorId();