From bc755171aff7ee2f75b1abbf0622191aac0ccaee Mon Sep 17 00:00:00 2001
From: NopeCharon <115794254+NopeCharon@users.noreply.github.com>
Date: Fri, 23 Oct 2026 13:30:19 +0530
Subject: [PATCH] [xExtension-YouTube] Add an option to disable embedding
 videos

Some users enable the extension only for its other features, such as
automatically using the channels' icons or converting channel and user
URLs to feed URLs, and prefer to keep the original feed content instead
of an embedded player.

Add an "Embed videos in articles" checkbox to the configuration page,
stored in the `yt_embed_videos` user attribute. When it is unchecked,
the `entry_before_display` hook leaves YouTube and PeerTube entries
untouched. The option defaults to enabled when the attribute is unset,
so existing installations keep their current behaviour.

Add translations for all supported languages and bump the extension
version to 1.4.0.

Fixes #517
---
 xExtension-YouTube/README.md       |  3 +++
 xExtension-YouTube/configure.phtml |  7 +++++++
 xExtension-YouTube/extension.php   | 22 ++++++++++++++++++++++
 xExtension-YouTube/i18n/de/ext.php |  1 +
 xExtension-YouTube/i18n/en/ext.php |  1 +
 xExtension-YouTube/i18n/fr/ext.php |  1 +
 xExtension-YouTube/i18n/pl/ext.php |  1 +
 xExtension-YouTube/i18n/tr/ext.php |  1 +
 xExtension-YouTube/metadata.json   |  2 +-
 9 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/xExtension-YouTube/README.md b/xExtension-YouTube/README.md
index 8be79fc7..b8b8a026 100644
--- a/xExtension-YouTube/README.md
+++ b/xExtension-YouTube/README.md
@@ -23,6 +23,9 @@ With activated Youtube extension:
 
 ## Changelog
 
+1.4.0:
+- Added an option to disable embedding videos, e.g. to only use the channel icons and URL conversion
+
 1.3.1:
 - Refactored registerHook calls to use first class callable syntax
 
diff --git a/xExtension-YouTube/configure.phtml b/xExtension-YouTube/configure.phtml
index 5a4b15b8..247800e2 100644
--- a/xExtension-YouTube/configure.phtml
+++ b/xExtension-YouTube/configure.phtml
@@ -6,6 +6,13 @@ declare(strict_types=1);
 	<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 	<div class="form-group">
 
+		<div class="group-controls">
+			<label class="checkbox" for="yt_embed_videos">
+				<input type="checkbox" id="yt_embed_videos" name="yt_embed_videos" <?= $this->isEmbedVideos() ? 'checked="checked"' : '' ?> />
+				<?= _t('ext.yt_videos.embed_videos') ?>
+			</label>
+		</div>
+
 		<div class="group-controls">
 			<label class="checkbox" for="yt_autosize">
 				<input type="checkbox" id="yt_autosize" name="yt_autosize" <?= $this->isAutoSize() ? 'checked="checked"' : '' ?> />
diff --git a/xExtension-YouTube/extension.php b/xExtension-YouTube/extension.php
index 277f1895..3076fae9 100644
--- a/xExtension-YouTube/extension.php
+++ b/xExtension-YouTube/extension.php
@@ -9,6 +9,10 @@
  */
 final class YouTubeExtension extends Minz_Extension
 {
+	/**
+	 * Whether videos should be embedded in the article content
+	 */
+	private bool $embedVideos = true;
 	/**
 	 * Whether the video player should use responsive sizing
 	 */
@@ -317,6 +321,11 @@ public function loadConfigValues(): void {
 			return;
 		}
 
+		$embedVideos = FreshRSS_Context::userConf()->attributeBool('yt_embed_videos');
+		if ($embedVideos !== null) {
+			$this->embedVideos = $embedVideos;
+		}
+
 		$autoSize = FreshRSS_Context::userConf()->attributeBool('yt_player_autosize');
 		if ($autoSize !== null) {
 			$this->autoSize = $autoSize;
@@ -348,6 +357,14 @@ public function loadConfigValues(): void {
 		}
 	}
 
+	/**
+	 * Returns whether videos are embedded in the article content.
+	 * You have to call loadConfigValues() before this one, otherwise you get the default value.
+	 */
+	public function isEmbedVideos(): bool {
+		return $this->embedVideos;
+	}
+
 	/**
 	 * Returns whether responsive sizing is enabled for the video player iframe.
 	 * You have to call loadConfigValues() before this one, otherwise you get the default value.
@@ -413,6 +430,10 @@ public function embedYouTubeVideo(FreshRSS_Entry $entry): FreshRSS_Entry {
 
 		$this->loadConfigValues();
 
+		if (!$this->embedVideos) {
+			return $entry;
+		}
+
 		if (stripos($entry->content(), '<iframe class="youtube-plugin-video"') !== false) {
 			return $entry;
 		}
@@ -588,6 +609,7 @@ public function handleConfigureAction(): void {
 					$this->resetAllIcons();
 					break;
 			}
+			FreshRSS_Context::userConf()->_attribute('yt_embed_videos', Minz_Request::paramBoolean('yt_embed_videos'));
 			FreshRSS_Context::userConf()->_attribute('yt_player_autosize', Minz_Request::paramBoolean('yt_autosize'));
 			FreshRSS_Context::userConf()->_attribute('yt_player_height', Minz_Request::paramInt('yt_height'));
 			FreshRSS_Context::userConf()->_attribute('yt_player_width', Minz_Request::paramInt('yt_width'));
diff --git a/xExtension-YouTube/i18n/de/ext.php b/xExtension-YouTube/i18n/de/ext.php
index 5f20418d..05a76cd9 100644
--- a/xExtension-YouTube/i18n/de/ext.php
+++ b/xExtension-YouTube/i18n/de/ext.php
@@ -2,6 +2,7 @@
 
 return array(
 	'yt_videos' => array(
+		'embed_videos' => 'Videos in Artikel einbetten',
 		'autosize' => 'Automatische Größe des Players',
 		'height' => 'Höhe des Players',
 		'width' => 'Breite des Players',
diff --git a/xExtension-YouTube/i18n/en/ext.php b/xExtension-YouTube/i18n/en/ext.php
index 202be5e7..56a85ec1 100644
--- a/xExtension-YouTube/i18n/en/ext.php
+++ b/xExtension-YouTube/i18n/en/ext.php
@@ -2,6 +2,7 @@
 
 return array(
 	'yt_videos' => array(
+		'embed_videos' => 'Embed videos in articles',
 		'autosize' => 'Automatically size the player',
 		'height' => 'Player height',
 		'width' => 'Player width',
diff --git a/xExtension-YouTube/i18n/fr/ext.php b/xExtension-YouTube/i18n/fr/ext.php
index e9b792d7..32f8937e 100644
--- a/xExtension-YouTube/i18n/fr/ext.php
+++ b/xExtension-YouTube/i18n/fr/ext.php
@@ -2,6 +2,7 @@
 
 return array(
 	'yt_videos' => array(
+		'embed_videos' => 'Intégrer les vidéos dans les articles',
 		'autosize' => 'Taille automatique du lecteur',
 		'height' => 'Hauteur du lecteur',
 		'width' => 'Largeur du lecteur',
diff --git a/xExtension-YouTube/i18n/pl/ext.php b/xExtension-YouTube/i18n/pl/ext.php
index e8a3c246..0f1f7768 100644
--- a/xExtension-YouTube/i18n/pl/ext.php
+++ b/xExtension-YouTube/i18n/pl/ext.php
@@ -2,6 +2,7 @@
 
 return array(
 	'yt_videos' => array(
+		'embed_videos' => 'Osadzaj filmy w artykułach',
 		'autosize' => 'Automatyczny rozmiar odtwarzacza',
 		'height' => 'Wysokość odtwarzacza wideo',
 		'width' => 'Szerokość odtwarzacza wideo',
diff --git a/xExtension-YouTube/i18n/tr/ext.php b/xExtension-YouTube/i18n/tr/ext.php
index f7611e97..0d4e0434 100644
--- a/xExtension-YouTube/i18n/tr/ext.php
+++ b/xExtension-YouTube/i18n/tr/ext.php
@@ -2,6 +2,7 @@
 
 return array(
 	'yt_videos' => array(
+		'embed_videos' => 'Videoları makalelere yerleştir',
 		'autosize' => 'Oynatıcıyı otomatik boyutlandır',
 		'height' => 'Oynatıcı yükseklik',
 		'width' => 'Oynatıcı genişlik',
diff --git a/xExtension-YouTube/metadata.json b/xExtension-YouTube/metadata.json
index 46a1be78..f158b8f7 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": "1.3.1",
+	"version": "1.4.0",
 	"entrypoint": "YouTube",
 	"type": "user"
 }