tumblr: Now videos are detected as well.
This commit is contained in:
parent
8e6f6a1455
commit
64c68ac978
1 changed files with 25 additions and 6 deletions
|
@ -169,11 +169,26 @@ function tumblr_send(&$a,&$b) {
|
||||||
$tags = implode(',',$tag_arr);
|
$tags = implode(',',$tag_arr);
|
||||||
|
|
||||||
$link = "";
|
$link = "";
|
||||||
if ($b['title'] == '') {
|
$video = false;
|
||||||
// Take the description from the bookmark
|
|
||||||
if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
|
// Checking for a bookmark
|
||||||
$link = $matches[1];
|
if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) {
|
||||||
|
$link = $matches[1];
|
||||||
|
if ($b['title'] == '')
|
||||||
$b['title'] = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
|
$b['title'] = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
|
||||||
|
|
||||||
|
$body = $b['body'];
|
||||||
|
// splitting the text in two parts:
|
||||||
|
// before and after the bookmark
|
||||||
|
$pos = strpos($body, "[bookmark");
|
||||||
|
$body1 = substr($body, 0, $pos);
|
||||||
|
$body2 = substr($body, $pos);
|
||||||
|
|
||||||
|
// Removing the bookmark
|
||||||
|
$body2 = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'',$body2);
|
||||||
|
$body = $body1.$body2;
|
||||||
|
|
||||||
|
$video = ((stristr($link,'youtube')) || (stristr($link,'youtu.be')) || (stristr($mtch[1],'vimeo')));
|
||||||
}
|
}
|
||||||
|
|
||||||
$params = array(
|
$params = array(
|
||||||
|
@ -183,11 +198,15 @@ function tumblr_send(&$a,&$b) {
|
||||||
'generator' => 'Friendica',
|
'generator' => 'Friendica',
|
||||||
'tags' => $tags);
|
'tags' => $tags);
|
||||||
|
|
||||||
if ($link != '') {
|
if (($link != '') and $video) {
|
||||||
|
$params['type'] = "video";
|
||||||
|
$params['embed'] = $link;
|
||||||
|
$params['caption'] = bbcode($body);
|
||||||
|
} else if (($link != '') and !$video) {
|
||||||
$params['type'] = "link";
|
$params['type'] = "link";
|
||||||
$params['name'] = $b['title'];
|
$params['name'] = $b['title'];
|
||||||
$params['url'] = $link;
|
$params['url'] = $link;
|
||||||
$params['description'] = bbcode($b['body']);
|
$params['description'] = bbcode($body);
|
||||||
} else {
|
} else {
|
||||||
$params['type'] = "regular";
|
$params['type'] = "regular";
|
||||||
$params['title'] = $b['title'];
|
$params['title'] = $b['title'];
|
||||||
|
|
Loading…
Reference in a new issue