revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-17 01:08:41 +01:00
Code Issues Releases Wiki Activity

Fix ambiguous URI parsing in Youtube Remarkup rule

Browse source 
Summary:
Fixes T12867. Also:

  - Simplify the code a little.
  - Stop mutating this on text/mobile -- there's no inherent value in the "youtu.be" link so I think this just changes the text the user wrote unnecessarily.

Test Plan: {F5013804}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12867

Differential Revision: https://secure.phabricator.com/D18149
This commit is contained in:
epriestley 2017-06-23 07:34:29 -07:00
parent 219ae8b6c9
commit 988a52cf1a
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/infrastructure/markup/rule/PhabricatorYoutubeRemarkupRule.php
View file

@ -2,34 +2,37 @@
final class PhabricatorYoutubeRemarkupRule extends PhutilRemarkupRule { final class PhabricatorYoutubeRemarkupRule extends PhutilRemarkupRule {
private $uri;
public function getPriority() { public function getPriority() {
return 350.0; return 350.0;
} }
public function apply($text) { public function apply($text) {
$this->uri = new PhutilURI($text); try {
$uri = new PhutilURI($text);
if ($this->uri->getDomain() && } catch (Exception $ex) {
preg_match('/(^|\.)youtube\.com$/', $this->uri->getDomain()) && return $text;
idx($this->uri->getQueryParams(), 'v')) {
return $this->markupYoutubeLink();
} }
return $text; $domain = $uri->getDomain();
} if (!preg_match('/(^|\.)youtube\.com\z/', $domain)) {
return $text;
}
$params = $uri->getQueryParams();
$v_param = idx($params, 'v');
if (!strlen($v_param)) {
return $text;
}
public function markupYoutubeLink() {
$v = idx($this->uri->getQueryParams(), 'v');
$text_mode = $this->getEngine()->isTextMode(); $text_mode = $this->getEngine()->isTextMode();
$mail_mode = $this->getEngine()->isHTMLMailMode(); $mail_mode = $this->getEngine()->isHTMLMailMode();
if ($text_mode || $mail_mode) { if ($text_mode || $mail_mode) {
return $this->getEngine()->storeText('http://youtu.be/'.$v); return $text;
} }
$youtube_src = 'https://www.youtube.com/embed/'.$v; $youtube_src = 'https://www.youtube.com/embed/'.$v_param;
$iframe = $this->newTag( $iframe = $this->newTag(
'div', 'div',
array( array(
@ -45,6 +48,7 @@ final class PhabricatorYoutubeRemarkupRule extends PhutilRemarkupRule {
'frameborder' => 0, 'frameborder' => 0,
), ),
'')); ''));
return $this->getEngine()->storeText($iframe); return $this->getEngine()->storeText($iframe);
} }