Skip to content

fix: YouTubeFeedExpanderBridge getIcon() null pointer and performance #5011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thrawn-sh wants to merge 1 commit into
base: master
Choose a base branch
from
+109 −1
Open

fix: YouTubeFeedExpanderBridge getIcon() null pointer and performance #5011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion bridges/YouTubeFeedExpanderBridge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,21 @@ class YouTubeFeedExpanderBridge extends FeedExpander

public function getIcon()
{
$cacheKey = 'icon_' . $this->getInput('channel');
$icon = $this->loadCacheValue($cacheKey);
if ($icon) {
return $icon;
}

if ($this->getInput('channel') != null) {
$html = getSimpleHTMLDOMCached($this->getURI());
return $html->find('[itemprop="thumbnailUrl"]', 0)->href;
$thumbnail = $html->find('[itemprop="thumbnailUrl"]', 0);
if ($thumbnail) {
$this->saveCacheValue($cacheKey, $thumbnail->href);
return $thumbnail->href;
}
}

return parent::getIcon();
}

Expand Down
97 changes: 97 additions & 0 deletions tests/YouTubeFeedExpanderBridgeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?php

declare(strict_types=1);

namespace RssBridge\Tests;

use PHPUnit\Framework\TestCase;

class YouTubeFeedExpanderBridgeTest extends TestCase
{
public function testParseItem()
{
$bridge = new \YouTubeFeedExpanderBridge(new \ArrayCache(), new \NullLogger());
$bridge->setInput(['channel' => 'UCtest']);

$item = [
'uri' => 'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
'id' => 'yt:video:dQw4w9WgXcQ',
'yt' => ['videoId' => 'dQw4w9WgXcQ'],
'media' => ['group' => ['description' => "line1\nline2"]],
];

$method = new \ReflectionMethod($bridge, 'parseItem');
$method->setAccessible(true);
$result = $method->invoke($bridge, $item);

$this->assertSame(['https://img.youtube.com/vi/dQw4w9WgXcQ/maxresdefault.jpg'], $result['enclosures']);
$this->assertSame('https://www.youtube.com/watch?v=dQw4w9WgXcQ#comments', $result['comments']);
$this->assertSame('yt:video:dQw4w9WgXcQ', $result['uid']);
$this->assertStringContainsString('line1<br>line2', $result['content']);
$this->assertArrayNotHasKey('media', $result);
}

public function testHideShorts()
{
$bridge = new \YouTubeFeedExpanderBridge(new \ArrayCache(), new \NullLogger());
$bridge->setInput(['channel' => 'UCtest', 'hideshorts' => 'on']);

$method = new \ReflectionMethod($bridge, 'parseItem');
$method->setAccessible(true);

$shortsItem = [
'uri' => 'https://www.youtube.com/shorts/abc123',
'id' => 'yt:video:abc123',
'yt' => ['videoId' => 'abc123'],
'media' => ['group' => ['description' => 'A short']],
];
$this->assertNull($method->invoke($bridge, $shortsItem));

$regularItem = [
'uri' => 'https://www.youtube.com/watch?v=abc123',
'id' => 'yt:video:abc123',
'yt' => ['videoId' => 'abc123'],
'media' => ['group' => ['description' => 'A video']],
];
$this->assertNotNull($method->invoke($bridge, $regularItem));
}

public function testEmbedUrl()
{
$method = new \ReflectionMethod(\YouTubeFeedExpanderBridge::class, 'parseItem');
$method->setAccessible(true);

$item = [
'uri' => 'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
'id' => 'yt:video:dQw4w9WgXcQ',
'yt' => ['videoId' => 'dQw4w9WgXcQ'],
'media' => ['group' => ['description' => 'A video']],
];

$bridge = new \YouTubeFeedExpanderBridge(new \ArrayCache(), new \NullLogger());
$bridge->setInput(['channel' => 'UCtest', 'embedurl' => 'on']);
$result = $method->invoke($bridge, $item);
$this->assertSame('https://www.youtube.com/embed/dQw4w9WgXcQ', $result['uri']);

$bridge = new \YouTubeFeedExpanderBridge(new \ArrayCache(), new \NullLogger());
$bridge->setInput(['channel' => 'UCtest', 'embedurl' => 'on', 'nocookie' => 'on']);
$result = $method->invoke($bridge, $item);
$this->assertSame('https://www.youtube-nocookie.com/embed/dQw4w9WgXcQ', $result['uri']);
}

public function testGetIconCache()
{
$cache = new \ArrayCache();
$bridge = new \YouTubeFeedExpanderBridge($cache, new \NullLogger());
$bridge->setInput(['channel' => 'UCtest']);

$cache->set('YouTubeFeedExpanderBridge_icon_UCtest', 'https://example.com/icon.jpg');
$this->assertSame('https://example.com/icon.jpg', $bridge->getIcon());
}

public function testGetIconFallback()
{
$bridge = new \YouTubeFeedExpanderBridge(new \ArrayCache(), new \NullLogger());
$this->assertSame('https://www.youtube.com/favicon.ico', $bridge->getIcon());
}
}
Loading