Use handleYoutube on all bridges

Mynacol · Mynacol · commit eb7773fc8e5b · 2025-11-02T01:07:11.000+01:00
diff --git a/bridges/AssociatedPressNewsBridge.php b/bridges/AssociatedPressNewsBridge.php
@@ -214,10 +214,7 @@ private function processMediaPlaceholders($html, $id)
                 }
 
                 if ($media['type'] === 'YouTube') {
-                    $div->outertext = <<<EOD
-	<iframe src="https://www.youtube.com/embed/{$media['externalId']}" width="560" height="315">
-	</iframe>
-EOD;
+                    $div->outertext = handleYoutube($media['externalId']);
                 }
             }
         }
@@ -249,10 +246,7 @@ private function processVideo($storyContent)
         $video = $storyContent['media'][0];
 
         if ($video['type'] === 'YouTube') {
-            $url = 'https://www.youtube.com/embed/' . $video['externalId'];
-            $html = <<<EOD
-<iframe width="560" height="315" src="{$url}" frameborder="0" allowfullscreen></iframe>
-EOD;
+            $html = handleYoutube($video['externalId']);
         } else {
             $html = <<<EOD
 <video controls poster="https://storage.googleapis.com/afs-prod/media/{$video['id']}/800.jpeg" preload="none">
diff --git a/bridges/Drive2ruBridge.php b/bridges/Drive2ruBridge.php
@@ -173,9 +173,7 @@ private function adjustContent($content)
             $node->outertext = '';
         }
         foreach ($content->find('iframe') as $node) {
-            preg_match('/embed\/(.*?)\?/', $node->src, $match);
-            $node->outertext = '<a href="https://www.youtube.com/watch?v=' . $match[1] .
-                '">https://www.youtube.com/watch?v=' . $match[1] . '</a>';
+            $node->outertext = handleYoutube($node->src);
         }
         return $content;
     }
diff --git a/bridges/EuronewsBridge.php b/bridges/EuronewsBridge.php
@@ -207,8 +207,7 @@ private function getItemContent($url)
             $player_div = $html->find('.js-player-pfp', 0);
             if ($player_div) {
                 $video_id = $player_div->getAttribute('data-video-id');
-                $video_url = 'https://www.youtube.com/watch?v=' . $video_id;
-                $content .= '<a href="' . $video_url . '">' . $video_url . '</a>';
+                $content .= handleYoutube($video_id);
             }
         }
 
diff --git a/bridges/FallGuysBridge.php b/bridges/FallGuysBridge.php
@@ -94,23 +94,18 @@ public function collectData()
                         if (count($mediaOptions) == count($mainContentOptions)) {
                             for ($i = 0; $i < count($mediaOptions); $i++) {
                                 if (property_exists($mediaOptions[$i], 'youtubeVideo')) {
-                                    $videoUrl = 'https://youtu.be/' . $mediaOptions[$i]->youtubeVideo->contentId;
-                                    $image = $mainContentOptions[$i]->image->src ?? '';
+                                    $videoID = $mediaOptions[$i]->youtubeVideo->contentId;
+                                    $videoHtml = handleYoutube($videoID);
 
-                                    $content .= '<p>';
+                                    $content .= '<p>' . $videoHtml;
 
+                                    $image = $mainContentOptions[$i]->image->src ?? '';
                                     if ($image != $headerImage) {
                                         $contentImages[] = $image;
 
-                                        $content .= <<<HTML
-                                        <a href="{$videoUrl}"><img src="{$image}"></a><br>
-                                        HTML;
+                                        $content .= '<img src="{$image}"><br>';
                                     }
 
-                                    $content .= <<<HTML
-                                    <i>(Video: <a href="{$videoUrl}">{$videoUrl}</a>)</i>
-                                    HTML;
-
                                     $content .= '</p>';
                                 }
                             }
diff --git a/bridges/GenshinImpactBridge.php b/bridges/GenshinImpactBridge.php
@@ -37,8 +37,7 @@ public function collectData()
             if (preg_match($exp_youtube, $article_html, $matches)) {
                 // Replace the YouTube embed with a YouTube link
                 $yt_embed = $article_html->find('div[class="ttr-video-frame"]', 0);
-                $yt_link = sprintf('<a href="https://www.youtube.com/watch?v=%1$s">https://www.youtube.com/watch?v=%1$s</a>', $matches[1]);
-                $article_html = str_replace($yt_embed, $yt_link, $article_html);
+                $yt_embed->outertext = handleYoutube($yt_embed);
             }
             $item = [];
             $item['title'] = $json_item['sTitle'];
diff --git a/bridges/GolemBridge.php b/bridges/GolemBridge.php
@@ -133,11 +133,7 @@ private function extractContent($page, $prevcontent)
             if (array_key_exists($i, $embedSrcs)) {
                 $src = $embedSrcs[$i];
                 if (preg_match('/youtube(-nocookie)?\.com/', $src, $match)) {
-                    $placeholders[$i]->innertext = <<<EOT
-                    <iframe width="560" height="315" src="$src" title="YouTube video player" frameborder="0"
-                    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-                    referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>';
-                    EOT;
+                    $placeholders[$i]->innertext = handleYoutube($src);
                 }
             }
         }
diff --git a/bridges/HeiseBridge.php b/bridges/HeiseBridge.php
@@ -127,6 +127,7 @@ public function collectData()
 
     protected function parseItem(array $item)
     {
+        $item['uri'] = 'https://www.heise.de/news/ChatGPT-Atlas-ist-ein-Quatsch-Browser-10964861.html';
         $sessioncookie = $this->getInput('sessioncookie');
 
         // strip rss parameter
@@ -207,19 +208,13 @@ private function addArticleToItem($item, $article)
         //fix for embbedded youtube-videos
         $oldlink = '';
         foreach ($article->find('div.video__yt-container') as &$ytvideo) {
-            if (preg_match('/www.youtube.*?\"/', $ytvideo->innertext, $link) && $link[0] != $oldlink) {
-                //save link to prevent duplicates
-                $oldlink = $link[0];
-                $ytiframe = <<<EOT
-                    <iframe width="560" height="315" src="https://$link[0] title="YouTube video player" frameborder="0"
-                    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-                    referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
-                EOT;
-                //check if video is in header or article for correct possitioning
-                if (strpos($header->innertext, $link[0])) {
-                    $item['content'] .= $ytiframe;
+            $ytResult = handleYoutube($ytvideo->innertext);
+            if ($ytResult) {
+                //check if video is in header or article for correct positioning
+                if (strpos($header->innertext, $ytvideo)) {
+                    $item['content'] .= $ytResult;
                 } else {
-                    $ytvideo->innertext .= $ytiframe;
+                    $ytvideo->innertext .= $ytResult;
                     $reloadneeded = 1;
                 }
             }
diff --git a/bridges/RedditBridge.php b/bridges/RedditBridge.php
@@ -280,8 +280,7 @@ private function collectDataInternal(): void
                     }
                 } elseif (isset($data->media) && $data->media->type == 'youtube.com') {
                     // Youtube link
-                    $item['content'] = $this->createFigureLink($data->url, $data->media->oembed->thumbnail_url, 'YouTube');
-                    //$item['content'] = htmlspecialchars_decode($data->media->oembed->html);
+                    $item['content'] = handleYoutube($data->url);
                 } elseif (explode('.', $data->domain)[0] == 'self') {
                     // Crossposted text post
                     // TODO (optionally?) Fetch content of the original post.
diff --git a/bridges/ReutersBridge.php b/bridges/ReutersBridge.php
@@ -535,17 +535,7 @@ private function handleArticleContent($contents)
 EOD;
                             break;
                         case 'youtube':
-                            $url = "https://www.youtube.com/embed/$cid";
-                            $embed .= <<<EOD
-<‌iframe
-	width="560" 
-	height="315" 
-	src="{$url}"
-	frameborder="0" 
-	allowfullscreen
->
-</iframe>
-EOD;
+                            $embed .= handleYoutube($cid);
                             break;
                     }
                     $description .= $embed;
diff --git a/bridges/SteamCommunityBridge.php b/bridges/SteamCommunityBridge.php
@@ -109,11 +109,10 @@ private function collectMedia()
             $mediaURI = $media->getAttribute('src');
             $downloadURI = $mediaURI;
 
+            $content = '';
+
             if ($category == 'videos') {
-                preg_match('/.*\/embed\/(.*)\?/', $mediaURI, $result);
-                $youtubeID = $result[1];
-                $mediaURI = 'https://img.youtube.com/vi/' . $youtubeID . '/hqdefault.jpg';
-                $downloadURI = 'https://www.youtube.com/watch?v=' . $youtubeID;
+                $content = handleYoutube($mediaURI);
             }
 
             $desc = '';
@@ -133,8 +132,12 @@ private function collectMedia()
                 $downloadURI = $htmlCard->find('a.downloadImage', 0)->href;
             }
 
-            $item['content'] = '<p><a href="' . $downloadURI . '"><img src="' . $mediaURI . '"/></a></p>';
-            $item['content'] .= '<p>' . $desc . '</p>';
+            if (empty($content)) {
+                $content = '<p><a href="' . $downloadURI . '"><img src="' . $mediaURI . '"/></a></p>';
+                $content .= '<p>' . $desc . '</p>';
+            }
+
+            $item['content'] = $content;
 
             $this->items[] = $item;
 
diff --git a/bridges/TheDriveBridge.php b/bridges/TheDriveBridge.php
@@ -35,7 +35,7 @@ protected function parseItem($feedItem)
             $videoID = $youtubeVideoDiv->getAttribute('data-video-id');
 
             //place <a> around the <div>
-            $youtubeVideoDiv->outertext = '<a href="https://www.youtube.com/watch?v=' . $videoID . '">' . $youtubeVideoDiv->outertext . '</a>';
+            $youtubeVideoDiv->outertext = handleYoutube($videoID);
         }
 
         $item['content'] = $html;
diff --git a/bridges/WebfailBridge.php b/bridges/WebfailBridge.php
@@ -127,11 +127,7 @@ private function extractArticle($html)
             } elseif (!is_null($article->find('div.wf-video', 0))) { // Video type
                 $videoId = $this->getVideoId($article->find('div.wf-play', 0)->onclick);
                 $item['uri'] = 'https://www.youtube.com/watch?v=' . $videoId;
-                $item['content'] = '<a href="'
-                . $item['uri']
-                . '"><img src="http://img.youtube.com/vi/'
-                . $videoId
-                . '/0.jpg"></a>';
+                $item['content'] = handleYoutube($videoId);
             } elseif (!is_null($article->find('video[id*=gif-]', 0))) { // Gif type
                 $item['uri'] = $this->getURI() . $article->find('a', 2)->href;
                 $item['content'] = '<video controls src="'
diff --git a/bridges/YorushikaBridge.php b/bridges/YorushikaBridge.php
@@ -107,13 +107,10 @@ public function collectData()
             $art_html = getSimpleHTMLDOMCached($url)->find('.text.inview', 0);
             $art_html = defaultLinkTo($art_html, $this->getURI());
 
-            // Check if article contains a embed YouTube video
-            $exp_youtube = '/https:\/\/[w\.]+youtube\.com\/embed\/([\w]+)/m';
-            if (preg_match($exp_youtube, $art_html, $matches)) {
-                // Replace the YouTube embed with a YouTube link
-                $yt_embed = $art_html->find('iframe[src*="youtube.com"]', 0);
-                $yt_link = sprintf('<a href="https://www.youtube.com/watch?v=%1$s">https://www.youtube.com/watch?v=%1$s</a>', $matches[1]);
-                $art_html = str_replace($yt_embed, $yt_link, $art_html);
+            // Rewrite the YouTube embed with a YouTube link
+            $yt_embed = $art_html->find('iframe[src*="youtube.com"]', 0);
+            if ($yt_embed) {
+                $yt_embed->outertext = handleYoutube($yt_embed->outertext);
             }
 
 
diff --git a/bridges/YouTubeCommunityTabBridge.php b/bridges/YouTubeCommunityTabBridge.php
@@ -238,10 +238,7 @@ private function getAttachments($details)
                     $this->itemTitle = $this->feedName . ' posted a video';
                 }
 
-                $content = <<<EOD
-<iframe width="100%" height="410" src="https://www.youtube.com/embed/{$attachments->videoRenderer->videoId}" 
-frameborder="0" allow="encrypted-media;" allowfullscreen></iframe>
-EOD;
+                $content = handleYoutube($attachments->videoRenderer->videoId);
             } elseif (isset($attachments->backstageImageRenderer)) {
                 // Image
                 if (empty($this->itemTitle)) {
diff --git a/bridges/YouTubeFeedExpanderBridge.php b/bridges/YouTubeFeedExpanderBridge.php
@@ -76,8 +76,7 @@ protected function parseItem(array $item)
         }
         $embed = $embedURI . 'embed/' . $id;
         if ($this->getInput('embed')) {
-            $iframe_fmt = '<iframe width="448" height="350" src="%s" title="%s" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>'; //phpcs:ignore
-            $iframe = sprintf($iframe_fmt, $embed, $item['title']) . '<br>';
+            $iframe = handleYoutube($id) . '<br>';
             $item['content'] = $iframe . $item['content'];
         }
         if ($this->getInput('embedurl')) {

Original file line number	Diff line number	Diff line change
`@@ -214,10 +214,7 @@ private function processMediaPlaceholders($html, $id)`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`if ($media['type'] === 'YouTube') {`
`217`		`- $div->outertext = <<<EOD`
`218`		`- <iframe src="https://www.youtube.com/embed/{$media['externalId']}" width="560" height="315">`
`219`		`- </iframe>`
`220`		`-EOD;`
	`217`	`+ $div->outertext = handleYoutube($media['externalId']);`
`221`	`218`	`}`
`222`	`219`	`}`
`223`	`220`	`}`
`@@ -249,10 +246,7 @@ private function processVideo($storyContent)`
`249`	`246`	`$video = $storyContent['media'][0];`
`250`	`247`
`251`	`248`	`if ($video['type'] === 'YouTube') {`
`252`		`- $url = 'https://www.youtube.com/embed/' . $video['externalId'];`
`253`		`- $html = <<<EOD`
`254`		`-<iframe width="560" height="315" src="{$url}" frameborder="0" allowfullscreen></iframe>`
`255`		`-EOD;`
	`249`	`+ $html = handleYoutube($video['externalId']);`
`256`	`250`	`} else {`
`257`	`251`	`$html = <<<EOD`
`258`	`252`	`<video controls poster="https://storage.googleapis.com/afs-prod/media/{$video['id']}/800.jpeg" preload="none">`
Original file line number	Diff line number	Diff line change
`@@ -173,9 +173,7 @@ private function adjustContent($content)`
`173`	`173`	`$node->outertext = '';`
`174`	`174`	`}`
`175`	`175`	`foreach ($content->find('iframe') as $node) {`
`176`		`- preg_match('/embed\/(.*?)\?/', $node->src, $match);`
`177`		`- $node->outertext = '<a href="https://www.youtube.com/watch?v=' . $match[1] .`
`178`		`- '">https://www.youtube.com/watch?v=' . $match[1] . '</a>';`
	`176`	`+ $node->outertext = handleYoutube($node->src);`
`179`	`177`	`}`
`180`	`178`	`return $content;`
`181`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,8 +207,7 @@ private function getItemContent($url)`
`207`	`207`	`$player_div = $html->find('.js-player-pfp', 0);`
`208`	`208`	`if ($player_div) {`
`209`	`209`	`$video_id = $player_div->getAttribute('data-video-id');`
`210`		`- $video_url = 'https://www.youtube.com/watch?v=' . $video_id;`
`211`		`- $content .= '<a href="' . $video_url . '">' . $video_url . '</a>';`
	`210`	`+ $content .= handleYoutube($video_id);`
`212`	`211`	`}`
`213`	`212`	`}`
`214`	`213`
Original file line number	Diff line number	Diff line change
`@@ -133,11 +133,7 @@ private function extractContent($page, $prevcontent)`
`133`	`133`	`if (array_key_exists($i, $embedSrcs)) {`
`134`	`134`	`$src = $embedSrcs[$i];`
`135`	`135`	`if (preg_match('/youtube(-nocookie)?\.com/', $src, $match)) {`
`136`		`- $placeholders[$i]->innertext = <<<EOT`
`137`		`- <iframe width="560" height="315" src="$src" title="YouTube video player" frameborder="0"`
`138`		`- allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"`
`139`		`- referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>';`
`140`		`- EOT;`
	`136`	`+ $placeholders[$i]->innertext = handleYoutube($src);`
`141`	`137`	`}`
`142`	`138`	`}`
`143`	`139`	`}`