fix(BookmarksPreviewer): Add generic previewer to previewers list

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

lib/Service/BookmarkPreviewer.php

@@ -13,6 +13,7 @@
 use OCA\Bookmarks\Db\Bookmark;
 use OCA\Bookmarks\Image;
 use OCA\Bookmarks\Service\Previewers\DefaultBookmarkPreviewer;
+use OCA\Bookmarks\Service\Previewers\GenericUrlBookmarkPreviewer;
 use OCA\Bookmarks\Service\Previewers\PageresBookmarkPreviewer;
 use OCA\Bookmarks\Service\Previewers\ScreeenlyBookmarkPreviewer;
 use OCA\Bookmarks\Service\Previewers\ScreenshotMachineBookmarkPreviewer;
@@ -28,6 +29,12 @@ class BookmarkPreviewer implements IBookmarkPreviewer {
 	 * @var string
 	 */
 	private $enabled;
+
+	/**
+	 * @var FileCache
+	 */
+	private $cache;
+
 	/**
 	 * @var DefaultBookmarkPreviewer
 	 */
@@ -37,10 +44,6 @@ class BookmarkPreviewer implements IBookmarkPreviewer {
 	 */
 	private $screeenlyPreviewer;
 
-	/**
-	 * @var FileCache
-	 */
-	private $cache;
 	/**
 	 * @var Previewers\ScreenshotMachineBookmarkPreviewer
 	 */
@@ -50,19 +53,30 @@ class BookmarkPreviewer implements IBookmarkPreviewer {
 	 */
 	private $pageresPreviewer;
 
+	private Previewers\GenericUrlBookmarkPreviewer $genericUrlPreviewer;
+
 	/**
 	 * @param IConfig $config
 	 * @param ScreeenlyBookmarkPreviewer $screeenlyPreviewer
 	 * @param DefaultBookmarkPreviewer $defaultPreviewer
 	 * @param FileCache $cache
-	 * @param Previewers\ScreenshotMachineBookmarkPreviewer $screenshotMachinePreviewer
-	 * @param Previewers\PageresBookmarkPreviewer $pageresPreviewer
+	 * @param ScreenshotMachineBookmarkPreviewer $screenshotMachinePreviewer
+	 * @param PageresBookmarkPreviewer $pageresPreviewer
 	 */
-	public function __construct(IConfig $config, ScreeenlyBookmarkPreviewer $screeenlyPreviewer, DefaultBookmarkPreviewer $defaultPreviewer, FileCache $cache, ScreenshotMachineBookmarkPreviewer $screenshotMachinePreviewer, PageresBookmarkPreviewer $pageresPreviewer) {
+	public function __construct(
+		IConfig $config,
+		ScreeenlyBookmarkPreviewer $screeenlyPreviewer,
+		DefaultBookmarkPreviewer $defaultPreviewer,
+		FileCache $cache,
+		ScreenshotMachineBookmarkPreviewer $screenshotMachinePreviewer,
+		PageresBookmarkPreviewer $pageresPreviewer,
+		GenericUrlBookmarkPreviewer $genericUrlPreviewer,
+	) {
 		$this->screeenlyPreviewer = $screeenlyPreviewer;
 		$this->defaultPreviewer = $defaultPreviewer;
 		$this->screenshotMachinePreviewer = $screenshotMachinePreviewer;
 		$this->pageresPreviewer = $pageresPreviewer;
+		$this->genericUrlPreviewer = $genericUrlPreviewer;
 
 		$this->enabled = $config->getAppValue('bookmarks', 'privacy.enableScraping', 'false');
 		$this->cache = $cache;
@@ -85,7 +99,13 @@ public function getImage($bookmark, $cacheOnly = false): ?IImage {
 			return null;
 		}
 
-		$previewers = [$this->screeenlyPreviewer, $this->screenshotMachinePreviewer, $this->pageresPreviewer, $this->defaultPreviewer];
+		$previewers = [
+			$this->screeenlyPreviewer,
+			$this->screenshotMachinePreviewer,
+			$this->pageresPreviewer,
+			$this->genericUrlPreviewer,
+			$this->defaultPreviewer,
+		];
 		foreach ($previewers as $previewer) {
 			$key = $previewer::CACHE_PREFIX . '-' . md5($bookmark->getUrl());
 			// Try cache first