Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-06 07:04:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14946 from haheute/youtube-links-mobile
Some checks failed
Code Quality / PHP-CS-Fixer (PHP 8.3) (push) Has been cancelled
Details
Code Quality / PHPStan (PHP 8.4) (push) Has been cancelled
Details
Code Quality / PHPStan in addons (PHP 8.4) (push) Has been cancelled
Details
Code Quality / PHPMD (PHP 8.4) (push) Has been cancelled
Details
CI tests / Unit-Tests (PHP 7.4) (push) Has been cancelled
Details
CI tests / Unit-Tests (PHP 8.0) (push) Has been cancelled
Details
CI tests / Unit-Tests (PHP 8.1) (push) Has been cancelled
Details
CI tests / Unit-Tests (PHP 8.2) (push) Has been cancelled
Details
CI tests / Unit-Tests (PHP 8.3) (push) Has been cancelled
Details
CI tests / Unit-Tests (PHP 8.4) (push) Has been cancelled
Details
CI tests / Unit-Tests (PHP 8.5) (push) Has been cancelled
Details
CI tests / Database-Tests (PHP 7.4) (push) Has been cancelled
Details
CI tests / Database-Tests (PHP 8.0) (push) Has been cancelled
Details
CI tests / Database-Tests (PHP 8.1) (push) Has been cancelled
Details
CI tests / Database-Tests (PHP 8.2) (push) Has been cancelled
Details
CI tests / Database-Tests (PHP 8.3) (push) Has been cancelled
Details
CI tests / Database-Tests (PHP 8.4) (push) Has been cancelled
Details
CI tests / Database-Tests (PHP 8.5) (push) Has been cancelled
Details

Browse source 
Support YouTube mobile links
This commit is contained in:
Philipp 2025-05-29 20:54:16 +02:00 • committed by GitHub
commit 544b926c9e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Content/Text/BBCode.php
View file

@ -1214,7 +1214,7 @@ class BBCode
$text = preg_replace("/\[youtube\]https?:\/\/(www\.)?youtube\.com\/embed\/(.*?)\[\/youtube\]/ism", '[youtube]$2[/youtube]', $text);
$text = preg_replace("/\[youtube\]https?:\/\/(www\.)?youtube\.com\/shorts\/(.*?)\[\/youtube\]/ism", '[youtube]$2[/youtube]', $text);
$text = preg_replace("/\[youtube\]https?:\/\/youtu\.be\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text);
$text = preg_replace("/\[youtube\]https?:\/\/m\.youtube\.com\/watch\?v\=(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text);
$text = preg_replace("/\[vimeo\]https?:\/\/player\.vimeo\.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $text);
$text = preg_replace("/\[vimeo\]https?:\/\/vimeo\.com\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $text);

1
src/Content/Text/Markdown.php
View file

@ -125,6 +125,7 @@ class Markdown
$s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/(www\.)?youtube\.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism', '[youtube]$2[/youtube]', 'url', $s);
$s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/(www\.)?youtube\.com\/embed\/(.*?)\].*?\[\/url\]/ism', '[youtube]$2[/youtube]', 'url', $s);
$s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/(www\.)?youtube\.com\/shorts\/(.*?)\].*?\[\/url\]/ism', '[youtube]$2[/youtube]', 'url', $s);
$s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/m\.youtube\.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism', '[youtube]$1[/youtube]', 'url', $s);
$s = BBCode::pregReplaceInTag('/\[url\=?(.*?)\]https?:\/\/vimeo\.com\/([0-9]+)(.*?)\[\/url\]/ism', '[vimeo]$2[/vimeo]', 'url', $s);
$s = BBCode::pregReplaceInTag('/\[url\=?(.*?)\]https?:\/\/player\.vimeo\.com\/video\/([0-9]+)(.*?)\[\/url\]/ism', '[vimeo]$2[/vimeo]', 'url', $s);
$s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/vimeo\.com\/([0-9]+)\](.*?)\[\/url\]/ism', '[vimeo]$1[/vimeo]', 'url', $s);

4
tests/src/Content/Text/BBCodeTest.php
View file

@ -395,6 +395,10 @@ Karl Marx - Die ursprüngliche Akkumulation
'expectedBBCode' => '[url=https://www.youtube.com/watch?v=hfwbmTzBFT0]https://www.youtube.com/watch?v=hfwbmTzBFT0[/url]',
'text' => '[youtube]https://youtube.com/embed/hfwbmTzBFT0[/youtube]',
],
'task-14940-youtube-mobile' => [
'expectedBBCode' => '[url=https://www.youtube.com/watch?v=hfwbmTzBFT0]https://www.youtube.com/watch?v=hfwbmTzBFT0[/url]',
'text' => '[youtube]https://m.youtube.com/watch?v=hfwbmTzBFT0[/youtube]',
],
'task-14940-vimeo' => [
'expectedBBCode' => '[url=https://vimeo.com/2345345]https://vimeo.com/2345345[/url]',
'text' => '[vimeo]https://vimeo.com/2345345[/vimeo]',

4
tests/src/Content/Text/MarkdownTest.php
View file

@ -78,6 +78,10 @@ class MarkdownTest extends FixtureTestCase
'expectedBBCode' => '[youtube]hfwbmTzBFT0[/youtube]',
'markdown' => '[url=https://youtube.com/embed/hfwbmTzBFT0]https://youtube.com/embed/hfwbmTzBFT0[/url]',
],
'task-14940-youtube-mobile' => [
'expectedBBCode' => '[youtube]hfwbmTzBFT0[/youtube]',
'markdown' => '[url=https://m.youtube.com/watch?v=hfwbmTzBFT0]https://m.youtube.com/watch?v=hfwbmTzBFT0[/url]',
],
// @todo - should we really ignore the URL content in favor of parsing the link of the body?
'task-14940-vimeo-custom-url' => [
'expectedBBCode' => '[vimeo]2345345[/vimeo]',