From 706be9a4297517a3103d53c71d6247419b31f888 Mon Sep 17 00:00:00 2001
From: emindemir1541 <emindemir1541@proton.me>
Date: Sat, 6 Sep 2025 17:04:58 +0300
Subject: [PATCH 1/6] check if it is short youtube video; if it is short,
 convert to youtube watch link

---
 xExtension-YouTube/extension.php | 55 +++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/xExtension-YouTube/extension.php b/xExtension-YouTube/extension.php
index f33d436..b82f75c 100644
--- a/xExtension-YouTube/extension.php
+++ b/xExtension-YouTube/extension.php
@@ -61,6 +61,20 @@ public function isYtFeed(string $website): bool {
 		return str_starts_with($website, 'https://www.youtube.com/');
 	}
 
+    public function isShort(string $website): bool {
+            return str_starts_with($website, 'https://www.youtube.com/shorts');
+    }
+    public function convertShortToWatch(string $shortUrl): string {
+        $prefix = 'https://www.youtube.com/shorts/';
+
+        if (str_starts_with($shortUrl, $prefix)) {
+            $videoId = str_replace($prefix, '', $shortUrl);
+            return 'https://www.youtube.com/watch?v=' . $videoId;
+        }
+
+        return $shortUrl;
+    }
+
 	public function iconBtnUrl(FreshRSS_Feed $feed): ?string {
 		if (!$this->isYtFeed($feed->website()) || $feed->attributeString('customFaviconExt') === $this->getName()) {
 			return null;
@@ -373,31 +387,34 @@ public function isUseNoCookieDomain(): bool
 	 * Inserts the YouTube video iframe into the content of an entry, if the entries link points to a YouTube watch URL.
 	 * @throws FreshRSS_Context_Exception
 	 */
-	public function embedYouTubeVideo(FreshRSS_Entry $entry): FreshRSS_Entry
-	{
-		$link = $entry->link();
+public function embedYouTubeVideo(FreshRSS_Entry $entry): FreshRSS_Entry
+{
+    $link = $entry->link();
 
-		if (preg_match('#^https?://www\.youtube\.com/watch\?v=|/videos/watch/[0-9a-f-]{36}$#', $link) !== 1) {
-			return $entry;
-		}
+    if ($this->isShort($link)) {
+        $link = $this->convertShortToWatch($link);
+    }
 
-		$this->loadConfigValues();
+    if (preg_match('#^https?://www\.youtube\.com/watch\?v=|/videos/watch/[0-9a-f-]{36}$#', $link) !== 1) {
+        return $entry;
+    }
 
-		if (stripos($entry->content(), '<iframe class="youtube-plugin-video"') !== false) {
-			return $entry;
-		}
-		if (stripos($link, 'www.youtube.com/watch?v=') !== false) {
-			$html = $this->getHtmlContentForLink($entry, $link);
-		}
-		else { //peertube
-			$html = $this->getHtmlPeerTubeContentForLink($entry, $link);
-		}
+    $this->loadConfigValues();
 
-		$entry->_content($html);
+    if (stripos($entry->content(), '<iframe class="youtube-plugin-video"') !== false) {
+        return $entry;
+    }
 
-		return $entry;
-	}
+    if (stripos($link, 'www.youtube.com/watch?v=') !== false) {
+        $html = $this->getHtmlContentForLink($entry, $link);
+    }
+    else { //peertube
+        $html = $this->getHtmlPeerTubeContentForLink($entry, $link);
+    }
 
+    $entry->_content($html);
+    return $entry;
+}
 	/**
 	 * Returns an HTML <iframe> for a given Youtube watch URL (www.youtube.com/watch?v=)
 	 */

From a8bf42a4e144554a5ad2d14cf567b12110644955 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 15 Sep 2025 14:47:51 +0200
Subject: [PATCH 2/6] Whitespace

---
 xExtension-YouTube/extension.php | 67 ++++++++++++++++----------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/xExtension-YouTube/extension.php b/xExtension-YouTube/extension.php
index b82f75c..f261451 100644
--- a/xExtension-YouTube/extension.php
+++ b/xExtension-YouTube/extension.php
@@ -61,19 +61,19 @@ public function isYtFeed(string $website): bool {
 		return str_starts_with($website, 'https://www.youtube.com/');
 	}
 
-    public function isShort(string $website): bool {
-            return str_starts_with($website, 'https://www.youtube.com/shorts');
-    }
-    public function convertShortToWatch(string $shortUrl): string {
-        $prefix = 'https://www.youtube.com/shorts/';
+	public function isShort(string $website): bool {
+		return str_starts_with($website, 'https://www.youtube.com/shorts');
+	}
+	public function convertShortToWatch(string $shortUrl): string {
+		$prefix = 'https://www.youtube.com/shorts/';
 
-        if (str_starts_with($shortUrl, $prefix)) {
-            $videoId = str_replace($prefix, '', $shortUrl);
-            return 'https://www.youtube.com/watch?v=' . $videoId;
-        }
+		if (str_starts_with($shortUrl, $prefix)) {
+			$videoId = str_replace($prefix, '', $shortUrl);
+			return 'https://www.youtube.com/watch?v=' . $videoId;
+		}
 
-        return $shortUrl;
-    }
+		return $shortUrl;
+	}
 
 	public function iconBtnUrl(FreshRSS_Feed $feed): ?string {
 		if (!$this->isYtFeed($feed->website()) || $feed->attributeString('customFaviconExt') === $this->getName()) {
@@ -387,34 +387,35 @@ public function isUseNoCookieDomain(): bool
 	 * Inserts the YouTube video iframe into the content of an entry, if the entries link points to a YouTube watch URL.
 	 * @throws FreshRSS_Context_Exception
 	 */
-public function embedYouTubeVideo(FreshRSS_Entry $entry): FreshRSS_Entry
-{
-    $link = $entry->link();
+	public function embedYouTubeVideo(FreshRSS_Entry $entry): FreshRSS_Entry
+	{
+		$link = $entry->link();
+
+		if ($this->isShort($link)) {
+			$link = $this->convertShortToWatch($link);
+		}
 
-    if ($this->isShort($link)) {
-        $link = $this->convertShortToWatch($link);
-    }
+		if (preg_match('#^https?://www\.youtube\.com/watch\?v=|/videos/watch/[0-9a-f-]{36}$#', $link) !== 1) {
+			return $entry;
+		}
 
-    if (preg_match('#^https?://www\.youtube\.com/watch\?v=|/videos/watch/[0-9a-f-]{36}$#', $link) !== 1) {
-        return $entry;
-    }
+		$this->loadConfigValues();
 
-    $this->loadConfigValues();
+		if (stripos($entry->content(), '<iframe class="youtube-plugin-video"') !== false) {
+			return $entry;
+		}
 
-    if (stripos($entry->content(), '<iframe class="youtube-plugin-video"') !== false) {
-        return $entry;
-    }
+		if (stripos($link, 'www.youtube.com/watch?v=') !== false) {
+			$html = $this->getHtmlContentForLink($entry, $link);
+		}
+		else { //peertube
+			$html = $this->getHtmlPeerTubeContentForLink($entry, $link);
+		}
 
-    if (stripos($link, 'www.youtube.com/watch?v=') !== false) {
-        $html = $this->getHtmlContentForLink($entry, $link);
-    }
-    else { //peertube
-        $html = $this->getHtmlPeerTubeContentForLink($entry, $link);
-    }
+		$entry->_content($html);
+		return $entry;
+	}
 
-    $entry->_content($html);
-    return $entry;
-}
 	/**
 	 * Returns an HTML <iframe> for a given Youtube watch URL (www.youtube.com/watch?v=)
 	 */

From ab4891f8e878a76a3daf7483c85859a6762f3c9a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 15 Sep 2025 14:50:16 +0200
Subject: [PATCH 3/6] Better typing

---
 xExtension-YouTube/extension.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/xExtension-YouTube/extension.php b/xExtension-YouTube/extension.php
index f261451..22a1118 100644
--- a/xExtension-YouTube/extension.php
+++ b/xExtension-YouTube/extension.php
@@ -248,19 +248,20 @@ public function setIconForFeed(FreshRSS_Feed $feed, bool $setValues = false): Fr
 		}
 
 		$xpath = new DOMXPath($dom);
-		$iconElem = $xpath->query('//meta[@name="twitter:image"]');
+		$metaElem = $xpath->query('//meta[@name="twitter:image"]');
 
-		if ($iconElem === false) {
+		if ($metaElem === false) {
 			$this->warnLog('fail while downloading icon for feed "' . $feed->name(true) . '": icon URL couldn\'t be found');
 			return $feed;
 		}
+		$iconElem = $metaElem->item(0);
 
-		if (!($iconElem->item(0) instanceof DOMElement)) {
+		if (!($iconElem instanceof DOMElement)) {
 			$this->warnLog('fail while downloading icon for feed "' . $feed->name(true) . '": icon URL couldn\'t be found');
 			return $feed;
 		}
 
-		$iconUrl = $iconElem->item(0)->getAttribute('content');
+		$iconUrl = $iconElem->getAttribute('content');
 		if ($iconUrl == '') {
 			$this->warnLog('fail while downloading icon for feed "' . $feed->name(true) . '": icon URL is empty');
 			return $feed;

From 69f31d4d34012b88c53caf200cdfe13ab704254a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 15 Sep 2025 14:54:39 +0200
Subject: [PATCH 4/6] Typography

---
 xExtension-YouTube/extension.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/xExtension-YouTube/extension.php b/xExtension-YouTube/extension.php
index 22a1118..7b67c42 100644
--- a/xExtension-YouTube/extension.php
+++ b/xExtension-YouTube/extension.php
@@ -155,7 +155,7 @@ public function resetAllIcons(): void {
 				try {
 					$feed->resetCustomFavicon(values: $v);
 				} catch (FreshRSS_Feed_Exception $_) {
-					$this->warnLog('failed to reset favicon for feed "' . $feed->name(true) . '": feed error');
+					$this->warnLog('Failed to reset favicon for feed “' . $feed->name(true) . '”: feed error!');
 				}
 			}
 		}
@@ -208,17 +208,17 @@ public function setIconForFeed(FreshRSS_Feed $feed, bool $setValues = false): Fr
 				$feed->_attributes($oldAttributes);
 				return $feed;
 			} elseif (file_exists($path)) {
-				$this->debugLog('icon had already been downloaded before for feed "' . $feed->name(true) . '" - returning early!');
+				$this->debugLog('Icon had already been downloaded before for feed “' . $feed->name(true) . '”: returning early!');
 				return $feed;
 			}
 		} catch (FreshRSS_Feed_Exception $_) {
-			$this->warnLog('failed to set custom favicon for feed "' . $feed->name(true) . '": feed error');
+			$this->warnLog('Failed to set custom favicon for feed “' . $feed->name(true) . '”: feed error!');
 			$feed->_attributes($oldAttributes);
 			return $feed;
 		}
 
 		$feed->_attributes($oldAttributes);
-		$this->debugLog('downloading icon for feed "' . $feed->name(true) . '"');
+		$this->debugLog('downloading icon for feed “' . $feed->name(true) . '"');
 
 		$url = $feed->website();
 		/** @var array<int, bool|int|string> */
@@ -243,7 +243,7 @@ public function setIconForFeed(FreshRSS_Feed $feed, bool $setValues = false): Fr
 		$dom = new DOMDocument();
 
 		if (!is_string($html) || !@$dom->loadHTML($html, LIBXML_NONET | LIBXML_NOERROR | LIBXML_NOWARNING)) {
-			$this->warnLog('fail while downloading icon for feed "' . $feed->name(true) . '": failed to load HTML');
+			$this->warnLog('Fail while downloading icon for feed “' . $feed->name(true) . '”: failed to load HTML!');
 			return $feed;
 		}
 
@@ -251,36 +251,36 @@ public function setIconForFeed(FreshRSS_Feed $feed, bool $setValues = false): Fr
 		$metaElem = $xpath->query('//meta[@name="twitter:image"]');
 
 		if ($metaElem === false) {
-			$this->warnLog('fail while downloading icon for feed "' . $feed->name(true) . '": icon URL couldn\'t be found');
+			$this->warnLog('Fail while downloading icon for feed “' . $feed->name(true) . '”: icon URL couldn’t be found!');
 			return $feed;
 		}
 		$iconElem = $metaElem->item(0);
 
 		if (!($iconElem instanceof DOMElement)) {
-			$this->warnLog('fail while downloading icon for feed "' . $feed->name(true) . '": icon URL couldn\'t be found');
+			$this->warnLog('Fail while downloading icon for feed “' . $feed->name(true) . '”: icon URL couldn’t be found!');
 			return $feed;
 		}
 
 		$iconUrl = $iconElem->getAttribute('content');
 		if ($iconUrl == '') {
-			$this->warnLog('fail while downloading icon for feed "' . $feed->name(true) . '": icon URL is empty');
+			$this->warnLog('Fail while downloading icon for feed “' . $feed->name(true) . '”: icon URL is empty!');
 			return $feed;
 		}
 
 		curl_setopt($ch, CURLOPT_URL, $iconUrl);
 		$contents = curl_exec($ch);
 		if (!is_string($contents)) {
-			$this->warnLog('fail while downloading icon for feed "' . $feed->name(true) . '": empty contents');
+			$this->warnLog('Fail while downloading icon for feed “' . $feed->name(true) . '”: empty contents!');
 			return $feed;
 		}
 
 		try {
 			$feed->setCustomFavicon($contents, extName: $this->getName(), disallowDelete: true, values: $v, overrideCustomIcon: true);
 		} catch (FreshRSS_UnsupportedImageFormat_Exception $_) {
-			$this->warnLog('failed to set custom favicon for feed "' . $feed->name(true) . '": unsupported image format');
+			$this->warnLog('Failed to set custom favicon for feed “' . $feed->name(true) . '”: unsupported image format!');
 			return $feed;
 		} catch (FreshRSS_Feed_Exception $_) {
-			$this->warnLog('failed to set custom favicon for feed "' . $feed->name(true) . '": feed error');
+			$this->warnLog('Failed to set custom favicon for feed “' . $feed->name(true) . '”: feed error!');
 			return $feed;
 		}
 

From b91049ba182b3d13d41e8c327c704d2d0bd066ea Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 15 Sep 2025 14:55:32 +0200
Subject: [PATCH 5/6] declare(strict_types=1);

---
 xExtension-YouTube/extension.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xExtension-YouTube/extension.php b/xExtension-YouTube/extension.php
index 7b67c42..e67a30a 100644
--- a/xExtension-YouTube/extension.php
+++ b/xExtension-YouTube/extension.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * Class YouTubeExtension
  *

From 7108200ca7dbc477758f93656c63f9364dc57331 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 15 Sep 2025 14:57:21 +0200
Subject: [PATCH 6/6] Bump version

---
 xExtension-YouTube/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xExtension-YouTube/metadata.json b/xExtension-YouTube/metadata.json
index 46b57d2..9456e0d 100644
--- a/xExtension-YouTube/metadata.json
+++ b/xExtension-YouTube/metadata.json
@@ -2,7 +2,7 @@
 	"name": "YouTube Video Feed",
 	"author": "Kevin Papst, Inverle",
 	"description": "Embed YouTube feeds inside article content.",
-	"version": "0.14",
+	"version": "0.2",
 	"entrypoint": "YouTube",
 	"type": "user"
 }