Merge pull request #392 from annando/1612-twitter-video
Twitter: Videos are embedded, mirrored posts are improved
This commit is contained in:
Tobias Diekershoff
GitHub
commit
6eee37e193
1 changed files with 129 additions and 117 deletions
|
|
@ -734,6 +734,51 @@ function twitter_prepare_body(&$a,&$b) {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Build the item array for the mirrored post
|
||||
*
|
||||
* @param object $a Application class
|
||||
* @param integer $uid User id
|
||||
* @param object $post Twitter object with the post
|
||||
*
|
||||
* @return array item data to be posted
|
||||
*/
|
||||
function twitter_do_mirrorpost($a, $uid, $post) {
|
||||
$datarray["type"] = "wall";
|
||||
$datarray["api_source"] = true;
|
||||
$datarray["profile_uid"] = $uid;
|
||||
$datarray["extid"] = NETWORK_TWITTER;
|
||||
$datarray['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id);
|
||||
$datarray["title"] = "";
|
||||
|
||||
if (is_object($post->retweeted_status)) {
|
||||
// We don't support nested shares, so we mustn't show quotes as shares on retweets
|
||||
$item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, true);
|
||||
|
||||
$datarray['body'] = "\n".share_header($item['author-name'], $item['author-link'], $item['author-avatar'], "",
|
||||
$item['created'], $item['plink']);
|
||||
|
||||
$datarray['body'] .= $item['body'].'[/share]';
|
||||
} else {
|
||||
$item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, false);
|
||||
|
||||
$datarray['body'] = $item['body'];
|
||||
}
|
||||
|
||||
$datarray["source"] = $item['app'];
|
||||
$datarray["verb"] = $item['verb'];
|
||||
|
||||
if (isset($item["location"])) {
|
||||
$datarray["location"] = $item["location"];
|
||||
}
|
||||
|
||||
if (isset($item["coord"])) {
|
||||
$datarray["coord"] = $item["coord"];
|
||||
}
|
||||
|
||||
return $datarray;
|
||||
}
|
||||
|
||||
function twitter_fetchtimeline($a, $uid) {
|
||||
$ckey = get_config('twitter', 'consumerkey');
|
||||
$csecret = get_config('twitter', 'consumersecret');
|
||||
|
|
@ -755,7 +800,7 @@ function twitter_fetchtimeline($a, $uid) {
|
|||
require_once('library/twitteroauth.php');
|
||||
$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
|
||||
|
||||
$parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true);
|
||||
$parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended");
|
||||
|
||||
$first_time = ($lastid == "");
|
||||
|
||||
|
|
@ -780,102 +825,14 @@ function twitter_fetchtimeline($a, $uid) {
|
|||
continue;
|
||||
|
||||
if (!stristr($post->source, $application_name)) {
|
||||
|
||||
$_SESSION["authenticated"] = true;
|
||||
$_SESSION["uid"] = $uid;
|
||||
|
||||
unset($_REQUEST);
|
||||
$_REQUEST["type"] = "wall";
|
||||
$_REQUEST["api_source"] = true;
|
||||
$_REQUEST["profile_uid"] = $uid;
|
||||
//$_REQUEST["source"] = "Twitter";
|
||||
$_REQUEST["source"] = $post->source;
|
||||
$_REQUEST["extid"] = NETWORK_TWITTER;
|
||||
$_REQUEST = twitter_do_mirrorpost($a, $uid, $post);
|
||||
|
||||
if (isset($post->id)) {
|
||||
$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id);
|
||||
}
|
||||
|
||||
//$_REQUEST["date"] = $post->created_at;
|
||||
|
||||
$_REQUEST["title"] = "";
|
||||
|
||||
if (is_object($post->retweeted_status)) {
|
||||
|
||||
$_REQUEST['body'] = $post->retweeted_status->text;
|
||||
|
||||
$picture = "";
|
||||
|
||||
// media
|
||||
if (is_array($post->retweeted_status->entities->media)) {
|
||||
foreach($post->retweeted_status->entities->media AS $media) {
|
||||
switch($media->type) {
|
||||
case 'photo':
|
||||
//$_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
|
||||
//$has_picture = true;
|
||||
$_REQUEST['body'] = str_replace($media->url, "", $_REQUEST['body']);
|
||||
$picture = $media->media_url_https;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$converted = twitter_expand_entities($a, $_REQUEST['body'], $post->retweeted_status, true, $picture);
|
||||
$_REQUEST['body'] = $converted["body"];
|
||||
|
||||
if (function_exists("share_header"))
|
||||
$_REQUEST['body'] = share_header($post->retweeted_status->user->name, "https://twitter.com/".$post->retweeted_status->user->screen_name,
|
||||
$post->retweeted_status->user->profile_image_url_https, "",
|
||||
datetime_convert('UTC','UTC',$post->retweeted_status->created_at),
|
||||
"https://twitter.com/".$post->retweeted_status->user->screen_name."/status/".$post->retweeted_status->id_str).
|
||||
$_REQUEST['body'];
|
||||
else
|
||||
$_REQUEST['body'] = "[share author='".$post->retweeted_status->user->name.
|
||||
"' profile='https://twitter.com/".$post->retweeted_status->user->screen_name.
|
||||
"' avatar='".$post->retweeted_status->user->profile_image_url_https.
|
||||
"' posted='".datetime_convert('UTC','UTC',$post->retweeted_status->created_at).
|
||||
"' link='https://twitter.com/".$post->retweeted_status->user->screen_name."/status/".$post->retweeted_status->id_str."']".
|
||||
$_REQUEST['body'];
|
||||
|
||||
$_REQUEST['body'] .= "[/share]";
|
||||
} else {
|
||||
$_REQUEST["body"] = $post->text;
|
||||
|
||||
$picture = "";
|
||||
|
||||
if (is_array($post->entities->media)) {
|
||||
foreach($post->entities->media AS $media) {
|
||||
switch($media->type) {
|
||||
case 'photo':
|
||||
//$_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
|
||||
//$has_picture = true;
|
||||
$_REQUEST['body'] = str_replace($media->url, "", $_REQUEST['body']);
|
||||
$picture = $media->media_url_https;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$converted = twitter_expand_entities($a, $_REQUEST["body"], $post, true, $picture);
|
||||
$_REQUEST['body'] = $converted["body"];
|
||||
}
|
||||
|
||||
if (is_string($post->place->name))
|
||||
$_REQUEST["location"] = $post->place->name;
|
||||
|
||||
if (is_string($post->place->full_name))
|
||||
$_REQUEST["location"] = $post->place->full_name;
|
||||
|
||||
if (is_array($post->geo->coordinates))
|
||||
$_REQUEST["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
|
||||
|
||||
if (is_array($post->coordinates->coordinates))
|
||||
$_REQUEST["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
|
||||
|
||||
//print_r($_REQUEST);
|
||||
logger('twitter: posting for user '.$uid);
|
||||
|
||||
// require_once('mod/item.php');
|
||||
|
||||
item_post($a);
|
||||
}
|
||||
}
|
||||
|
|
@ -1325,9 +1282,71 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
|
|||
return array("body" => $body, "tags" => $tags, "plain" => $plain);
|
||||
}
|
||||
|
||||
function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact) {
|
||||
/**
|
||||
* @brief Fetch media entities and add media links to the body
|
||||
*
|
||||
* @param object $post Twitter object with the post
|
||||
* @param array $postarray Array of the item that is about to be posted
|
||||
*
|
||||
* @return $picture string Returns a a single picture string if it isn't a media post
|
||||
*/
|
||||
function twitter_media_entities($post, &$postarray) {
|
||||
|
||||
$has_picture = false;
|
||||
// There are no media entities? So we quit.
|
||||
if (!is_array($post->extended_entities->media)) {
|
||||
return "";
|
||||
}
|
||||
|
||||
// When the post links to an external page, we only take one picture.
|
||||
// We only do this when there is exactly one media.
|
||||
if ((count($post->entities->urls) > 0) AND (count($post->extended_entities->media) == 1)) {
|
||||
$picture = "";
|
||||
foreach($post->extended_entities->media AS $medium) {
|
||||
if (isset($medium->media_url_https)) {
|
||||
$picture = $medium->media_url_https;
|
||||
$postarray['body'] = str_replace($medium->url, "", $postarray['body']);
|
||||
}
|
||||
}
|
||||
return $picture;
|
||||
}
|
||||
|
||||
// This is a pure media post, first search for all media urls
|
||||
$media = array();
|
||||
foreach($post->extended_entities->media AS $medium) {
|
||||
switch($medium->type) {
|
||||
case 'photo':
|
||||
$media[$medium->url] .= "\n[img]".$medium->media_url_https."[/img]";
|
||||
$postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
|
||||
break;
|
||||
case 'video':
|
||||
case 'animated_gif':
|
||||
$media[$medium->url] .= "\n[img]".$medium->media_url_https."[/img]";
|
||||
$postarray['object-type'] = ACTIVITY_OBJ_VIDEO;
|
||||
if (is_array($medium->video_info->variants)) {
|
||||
$bitrate = 0;
|
||||
// We take the video with the highest bitrate
|
||||
foreach ($medium->video_info->variants AS $variant) {
|
||||
if (($variant->content_type == "video/mp4") AND ($variant->bitrate >= $bitrate)) {
|
||||
$media[$medium->url] = "\n[video]".$variant->url."[/video]";
|
||||
$bitrate = $variant->bitrate;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
// The following code will only be activated for test reasons
|
||||
//default:
|
||||
// $postarray['body'] .= print_r($medium, true);
|
||||
}
|
||||
}
|
||||
|
||||
// Now we replace the media urls.
|
||||
foreach ($media AS $key => $value) {
|
||||
$postarray['body'] = str_replace($key, "\n".$value."\n", $postarray['body']);
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact, $noquote) {
|
||||
|
||||
$postarray = array();
|
||||
$postarray['network'] = NETWORK_TWITTER;
|
||||
|
|
@ -1337,6 +1356,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
|
|||
$postarray['uri'] = "twitter::".$post->id_str;
|
||||
$postarray['object'] = json_encode($post);
|
||||
|
||||
// Don't import our own comments
|
||||
$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
|
||||
dbesc($postarray['uri']),
|
||||
intval($uid)
|
||||
|
|
@ -1436,24 +1456,13 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
|
|||
$postarray['body'] = $post->text;
|
||||
}
|
||||
|
||||
$picture = "";
|
||||
// When the post contains links then use the correct object type
|
||||
if (count($post->entities->urls) > 0) {
|
||||
$postarray['object-type'] = ACTIVITY_OBJ_BOOKMARK;
|
||||
}
|
||||
|
||||
// media
|
||||
if (is_array($post->entities->media)) {
|
||||
foreach($post->entities->media AS $media) {
|
||||
switch($media->type) {
|
||||
case 'photo':
|
||||
//$postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']);
|
||||
//$has_picture = true;
|
||||
$postarray['body'] = str_replace($media->url, "", $postarray['body']);
|
||||
$postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
|
||||
$picture = $media->media_url_https;
|
||||
break;
|
||||
default:
|
||||
$postarray['body'] .= print_r($media, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Search for media links
|
||||
$picture = twitter_media_entities($post, $postarray);
|
||||
|
||||
$converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture);
|
||||
$postarray['body'] = $converted["body"];
|
||||
|
|
@ -1476,8 +1485,11 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
|
|||
$postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
|
||||
}
|
||||
if (is_object($post->retweeted_status)) {
|
||||
$retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false);
|
||||
$retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote);
|
||||
|
||||
$retweet['object'] = $postarray['object'];
|
||||
$retweet['private'] = $postarray['private'];
|
||||
$retweet['allow_cid'] = $postarray['allow_cid'];
|
||||
$retweet['contact-id'] = $postarray['contact-id'];
|
||||
$retweet['owner-name'] = $postarray['owner-name'];
|
||||
$retweet['owner-link'] = $postarray['owner-link'];
|
||||
|
|
@ -1486,8 +1498,8 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
|
|||
$postarray = $retweet;
|
||||
}
|
||||
|
||||
if (is_object($post->quoted_status)) {
|
||||
$quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false);
|
||||
if (is_object($post->quoted_status) AND !$noquote) {
|
||||
$quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true);
|
||||
|
||||
$postarray['body'] = $statustext;
|
||||
|
||||
|
|
@ -1573,7 +1585,7 @@ function twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id)
|
|||
$posts = array();
|
||||
|
||||
while ($post->in_reply_to_status_id_str != "") {
|
||||
$parameters = array("trim_user" => false, "id" => $post->in_reply_to_status_id_str);
|
||||
$parameters = array("trim_user" => false, "tweet_mode" => "extended", "id" => $post->in_reply_to_status_id_str);
|
||||
|
||||
$post = $connection->get('statuses/show', $parameters);
|
||||
|
||||
|
|
@ -1599,7 +1611,7 @@ function twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id)
|
|||
|
||||
if (count($posts)) {
|
||||
foreach ($posts as $post) {
|
||||
$postarray = twitter_createpost($a, $uid, $post, $self, false, false);
|
||||
$postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
|
||||
|
||||
if (trim($postarray['body']) == "")
|
||||
continue;
|
||||
|
|
@ -1711,7 +1723,7 @@ function twitter_fetchhometimeline($a, $uid) {
|
|||
if ($post->in_reply_to_status_id_str != "")
|
||||
twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id);
|
||||
|
||||
$postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true);
|
||||
$postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true, false);
|
||||
|
||||
if (trim($postarray['body']) == "")
|
||||
continue;
|
||||
|
|
@ -1758,7 +1770,7 @@ function twitter_fetchhometimeline($a, $uid) {
|
|||
if ($post->in_reply_to_status_id_str != "")
|
||||
twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id);
|
||||
|
||||
$postarray = twitter_createpost($a, $uid, $post, $self, false, false);
|
||||
$postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
|
||||
|
||||
if (trim($postarray['body']) == "")
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Reference in a new issue