From 5f5227952fa5edcabc53f3dc2658e494169fc2c4 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Fri, 11 Jul 2025 13:53:42 +0200 Subject: [PATCH 1/2] fix(AdminController): Fix psalm issue Signed-off-by: Marcel Klehr --- lib/Controller/AdminController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php index bab6b569..cb295412 100644 --- a/lib/Controller/AdminController.php +++ b/lib/Controller/AdminController.php @@ -78,9 +78,9 @@ class AdminController extends Controller { if (!isset($this->previewers[$previewer])) { return new JSONResponse([], Http::STATUS_BAD_REQUEST); } - $previewer = $this->previewers[$previewer]; + $previewerImp = $this->previewers[$previewer]; $test = new Bookmark(); $test->setUrl('https://nextcloud.com/'); - return new Http\DataDisplayResponse($previewer->getImage($test)?->getData() ?? ''); + return new Http\DataDisplayResponse($previewerImp->getImage($test)?->getData() ?? ''); } } From f5a70fc870e76a700594fbb32306fc948312c222 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Fri, 11 Jul 2025 13:54:31 +0200 Subject: [PATCH 2/2] fix(BookmarkPreviewer): Do not store guaranteed null responses in cache when cacheOnly === true Signed-off-by: Marcel Klehr --- lib/Service/BookmarkPreviewer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Service/BookmarkPreviewer.php b/lib/Service/BookmarkPreviewer.php index 035fed1a..ac6dd1f0 100644 --- a/lib/Service/BookmarkPreviewer.php +++ b/lib/Service/BookmarkPreviewer.php @@ -99,12 +99,14 @@ class BookmarkPreviewer implements IBookmarkPreviewer { } catch (NotFoundException $e) { } catch (NotPermittedException $e) { } + if ($cacheOnly) { + continue; + } $image = $previewer->getImage($bookmark, $cacheOnly); if (isset($image)) { $this->cache->set($key, $image->serialize(), self::CACHE_TTL); return $image; } - $this->cache->set($key, 'null', self::CACHE_TTL); }