// Comments in threads may appear as wall-to-wall postings.
// So only take the owner at the top posting.
if ($item["id"] == $item["parent"])
- return api_get_user($a,$item["owner-link"]);
+ $status_user = api_get_user($a,$item["owner-link"]);
else
- return api_get_user($a,$item["author-link"]);
+ $status_user = api_get_user($a,$item["author-link"]);
+
+ $status_user["protected"] = (($item["allow_cid"] != "") OR
+ ($item["allow_gid"] != "") OR
+ ($item["deny_cid"] != "") OR
+ ($item["deny_gid"] != ""));
+
+ return ($status_user);
}
'statusnet_conversation_id' => $lastwall['parent'],
);
+ $entities = api_get_entitities($status_info['text'], $lastwall['body']);
+ if (count($entities) > 0)
+ $status_info['entities'] = $entities;
+
if (($lastwall['item_network'] != "") AND ($status["source"] == 'web'))
$status_info["source"] = network_to_name($lastwall['item_network']);
elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network']) != $status_info["source"]))
'statusnet_conversation_id' => $lastwall['parent'],
);
+ $entities = api_get_entitities($user_info['text'], $lastwall['body']);
+ if (count($entities) > 0)
+ $user_info['entities'] = $entities;
+
if (($lastwall['item_network'] != "") AND ($user_info["status"]["source"] == 'web'))
$user_info["status"]["source"] = network_to_name($lastwall['item_network']);
if (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network']) != $user_info["status"]["source"]))
$start = $page*$count;
- //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
-
$sql_extra = '';
if ($max_id > 0)
$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
AND `item`.`id`>%d
- ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
+ ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
//intval($user_info['uid']),
intval(api_user()),
intval($since_id),
$start = $page*$count;
- //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
-
if ($max_id > 0)
$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
if ($exclude_replies > 0)
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
AND `item`.`id`>%d
- ORDER BY `received` DESC LIMIT %d, %d ",
+ ORDER BY `item`.`id` DESC LIMIT %d, %d ",
intval($since_id),
intval($start),
intval($count));
logger('API: api_statuses_show: '.$id);
- //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
$conversation = (x($_REQUEST,'conversation')?1:0);
$sql_extra = '';
api_register_func('api/statuses/show','api_statuses_show', true);
+ /**
+ *
+ */
+ function api_conversation_show(&$a, $type){
+ if (api_user()===false) return false;
+
+ $user_info = api_get_user($a);
+
+ // params
+ $id = intval($a->argv[3]);
+ $count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
+ $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
+ if ($page<0) $page=0;
+ $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+ $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
+
+ $start = $page*$count;
+
+ if ($id == 0)
+ $id = intval($_REQUEST["id"]);
+
+ // Hotot workaround
+ if ($id == 0)
+ $id = intval($a->argv[4]);
+
+ logger('API: api_conversation_show: '.$id);
+
+ $sql_extra = '';
+
+ if ($max_id > 0)
+ $sql_extra = ' AND `item`.`id` <= '.intval($max_id);
+
+ $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
+ `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+ `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+ `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+ FROM `item` INNER JOIN (SELECT `uri`,`parent` FROM `item` WHERE `id` = %d) AS `temp1`
+ ON (`item`.`thr-parent` = `temp1`.`uri` AND `item`.`parent` = `temp1`.`parent`), `contact`
+ WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+ AND `item`.`uid` = %d AND `contact`.`id` = `item`.`contact-id`
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND `item`.`id`>%d $sql_extra
+ ORDER BY `item`.`id` DESC LIMIT %d ,%d",
+ intval($id), intval(api_user()),
+ intval($since_id),
+ intval($start), intval($count)
+ );
+
+ if (!$r)
+ die(api_error($a, $type, t("There is no conversation with this id.")));
+
+ $ret = api_format_items($r,$user_info);
+
+ $data = array('$statuses' => $ret);
+ return api_apply_template("timeline", $type, $data);
+ }
+ api_register_func('api/conversation/show','api_conversation_show', true);
+
+
/**
*
*/
logger('API: api_statuses_repeat: '.$id);
- //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
-
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`nick` as `reply_author`,
`contact`.`name`, `contact`.`photo` as `reply_photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
$start = $page*$count;
- //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
-
// Ugly code - should be changed
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
$myurl = substr($myurl,strpos($myurl,'://')+3);
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
AND `item`.`id`>%d
- ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
+ ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
//intval($user_info['uid']),
intval(api_user()),
intval($since_id),
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
AND `item`.`id`>%d
- ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
+ ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
intval(api_user()),
intval($user_info['cid']),
intval($since_id),
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
AND `item`.`id`>%d
- ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
+ ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
//intval($user_info['uid']),
intval(api_user()),
intval($since_id),
return $ret;
}
+ function api_get_entitities($text, $bbcode) {
+ /*
+ To-Do:
+ * Links at the first character of the post
+ * different sizes of pictures
+ * caching picture data (using the id for that?) (See privacy_image_cache)
+ */
+
+ $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false");
+
+ if ($include_entities != "true")
+ return array();
+
+ $bbcode = bb_CleanPictureLinks($bbcode);
+
+ // Change pure links in text to bbcode uris
+ $bbcode = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2]$2[/url]', $bbcode);
+
+ $entities = array();
+ $entities["hashtags"] = array();
+ $entities["symbols"] = array();
+ $entities["urls"] = array();
+ $entities["user_mentions"] = array();
+
+ $URLSearchString = "^\[\]";
+
+ $bbcode = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'#$2',$bbcode);
+
+ $bbcode = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$bbcode);
+ //$bbcode = preg_replace("/\[url\](.*?)\[\/url\]/ism",'[url=$1]$1[/url]',$bbcode);
+ $bbcode = preg_replace("/\[video\](.*?)\[\/video\]/ism",'[url=$1]$1[/url]',$bbcode);
+
+ $bbcode = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism",
+ '[url=https://www.youtube.com/watch?v=$1]https://www.youtube.com/watch?v=$1[/url]', $bbcode);
+ $bbcode = preg_replace("/\[youtube\](.*?)\[\/youtube\]/ism",'[url=$1]$1[/url]',$bbcode);
+
+ $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism",
+ '[url=https://vimeo.com/$1]https://vimeo.com/$1[/url]', $bbcode);
+ $bbcode = preg_replace("/\[vimeo\](.*?)\[\/vimeo\]/ism",'[url=$1]$1[/url]',$bbcode);
+
+ $bbcode = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $bbcode);
+
+ //preg_match_all("/\[url\]([$URLSearchString]*)\[\/url\]/ism", $bbcode, $urls1);
+ preg_match_all("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $bbcode, $urls);
+
+ $ordered_urls = array();
+ foreach ($urls[1] AS $id=>$url) {
+ //$start = strpos($text, $url, $offset);
+ $start = iconv_strpos($text, $url, 0, "UTF-8");
+ if (!($start === false))
+ $ordered_urls[$start] = array("url" => $url, "title" => $urls[2][$id]);
+ }
+
+ ksort($ordered_urls);
+
+ $offset = 0;
+ //foreach ($urls[1] AS $id=>$url) {
+ foreach ($ordered_urls AS $url) {
+ if ((substr($url["title"], 0, 7) != "http://") AND (substr($url["title"], 0, 8) != "https://") AND
+ !strpos($url["title"], "http://") AND !strpos($url["title"], "https://"))
+ $display_url = $url["title"];
+ else {
+ $display_url = str_replace(array("http://www.", "https://www."), array("", ""), $url["url"]);
+ $display_url = str_replace(array("http://", "https://"), array("", ""), $display_url);
+
+ if (strlen($display_url) > 26)
+ $display_url = substr($display_url, 0, 25)."…";
+ }
+
+ //$start = strpos($text, $url, $offset);
+ $start = iconv_strpos($text, $url["url"], $offset, "UTF-8");
+ if (!($start === false)) {
+ $entities["urls"][] = array("url" => $url["url"],
+ "expanded_url" => $url["url"],
+ "display_url" => $display_url,
+ "indices" => array($start, $start+strlen($url["url"])));
+ $offset = $start + 1;
+ }
+ }
+
+ preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
+ $ordered_images = array();
+ foreach ($images[1] AS $image) {
+ //$start = strpos($text, $url, $offset);
+ $start = iconv_strpos($text, $image, 0, "UTF-8");
+ if (!($start === false))
+ $ordered_images[$start] = $image;
+ }
+ //$entities["media"] = array();
+ $offset = 0;
+
+ foreach ($ordered_images AS $url) {
+ $display_url = str_replace(array("http://www.", "https://www."), array("", ""), $url);
+ $display_url = str_replace(array("http://", "https://"), array("", ""), $display_url);
+
+ if (strlen($display_url) > 26)
+ $display_url = substr($display_url, 0, 25)."…";
+
+ $start = iconv_strpos($text, $url, $offset, "UTF-8");
+ if (!($start === false)) {
+ $redirects = 0;
+ $img_str = fetch_url($url,true, $redirects, 10);
+ $image = @imagecreatefromstring($img_str);
+ if ($image) {
+ $entities["media"][] = array(
+ "id" => $start+1,
+ "id_str" => (string)$start+1,
+ "indices" => array($start, $start+strlen($url)),
+ "media_url" => $url,
+ "media_url_https" => $url,
+ "url" => $url,
+ "display_url" => $display_url,
+ "expanded_url" => $url,
+ "type" => "photo",
+ "sizes" => array("medium" => array(
+ "w" => imagesx($image),
+ "h" => imagesy($image),
+ "resize" => "fit")));
+ }
+ $offset = $start + 1;
+ }
+ }
+
+ return($entities);
+ }
+
function api_format_items($r,$user_info, $filter_user = false) {
$a = get_app();
}
// Workaround for ostatus messages where the title is identically to the body
- $statusbody = trim(html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 2, true), 0));
+ //$statusbody = trim(html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 5, true), 0));
+ $html = bbcode(api_clean_plain_items($item['body']), false, false, 2, true);
+ $statusbody = trim(html2plain($html, 0));
$statustitle = trim($item['title']);
'favorited' => $item['starred'] ? true : false,
//'attachments' => array(),
'user' => $status_user ,
+ //'entities' => NULL,
'statusnet_html' => trim(bbcode($item['body'], false, false)),
'statusnet_conversation_id' => $item['parent'],
);
+ $entities = api_get_entitities($status['text'], $item['body']);
+ if (count($entities) > 0)
+ $status['entities'] = $entities;
+
if (($item['item_network'] != "") AND ($status["source"] == 'web'))
$status["source"] = network_to_name($item['item_network']);
else if (($item['item_network'] != "") AND (network_to_name($item['item_network']) != $status["source"]))
// Retweets are only valid for top postings
- if (($item['owner-link'] != $item['author-link']) AND ($item["id"] == $item["parent"])) {
+ // It doesn't work reliable with the link if its a feed
+ $IsRetweet = ($item['owner-link'] != $item['author-link']);
+ if ($IsRetweet)
+ $IsRetweet = (($item['owner-name'] != $item['author-name']) OR ($item['owner-avatar'] != $item['author-avatar']));
+
+ if ($IsRetweet AND ($item["id"] == $item["parent"])) {
$retweeted_status = $status;
$retweeted_status["user"] = api_get_user($a,$item["author-link"]);
}
api_register_func('api/help/test','api_help_test',false);
+ function api_lists(&$a,$type) {
+
+ $ret = array();
+ return array($ret);
+ }
+ api_register_func('api/lists','api_lists',true);
+
+ function api_lists_list(&$a,$type) {
+
+ $ret = array();
+ return array($ret);
+ }
+ api_register_func('api/lists/list','api_lists_list',true);
+
/**
* https://dev.twitter.com/docs/api/1/get/statuses/friends
* This function is deprecated by Twitter
if ($max_id > 0)
$sql_extra .= ' AND `mail`.`id` <= '.intval($max_id);
- $r = q("SELECT `mail`.*, `contact`.`nurl` AS `contact-url` FROM `mail`,`contact` WHERE `mail`.`contact-id` = `contact`.`id` AND `mail`.`uid`=%d AND $sql_extra AND `mail`.`id` > %d ORDER BY `mail`.`created` DESC LIMIT %d,%d",
+ $r = q("SELECT `mail`.*, `contact`.`nurl` AS `contact-url` FROM `mail`,`contact` WHERE `mail`.`contact-id` = `contact`.`id` AND `mail`.`uid`=%d AND $sql_extra AND `mail`.`id` > %d ORDER BY `mail`.`id` DESC LIMIT %d,%d",
intval(api_user()),
intval($since_id),
intval($start), intval($count)
}
function api_clean_plain_items($Text) {
+ $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false");
+
+ $Text = bb_CleanPictureLinks($Text);
+
+ if ($include_entities == "true") {
+ $URLSearchString = "^\[\]";
+
+ $Text = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'#$2',$Text);
+ $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'[url=$1]$1[/url]',$Text);
+ }
+
$Text = preg_replace_callback("((.*?)\[class=(.*?)\](.*?)\[\/class\])ism","api_cleanup_share",$Text);
return($Text);
}
function api_cleanup_share($shared) {
- if ($shared[2] != "type-link")
- return($shared[3]);
+ if ($shared[2] != "type-link")
+ return($shared[0]);
- if (!preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$shared[3], $bookmark))
- return($shared[3]);
+ if (!preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$shared[3], $bookmark))
+ return($shared[0]);
- $title = "";
- $link = "";
+ $title = "";
+ $link = "";
- if (isset($bookmark[2][0]))
- $title = $bookmark[2][0];
+ if (isset($bookmark[2][0]))
+ $title = $bookmark[2][0];
- if (isset($bookmark[1][0]))
- $link = $bookmark[1][0];
+ if (isset($bookmark[1][0]))
+ $link = $bookmark[1][0];
if (strpos($shared[1],$title) !== false)
$title = "";
if (strpos($shared[1],$link) !== false)
$link = "";
- $text = trim($shared[1]);
+ $text = trim($shared[1]);
//if (strlen($text) < strlen($title))
if (($text == "") AND ($title != ""))
$text .= "\n\n".trim($title);
- if ($link != "")
- $text .= "\n".trim($link);
+ if ($link != "")
+ $text .= "\n".trim($link);
- return(trim($text));
+ return(trim($text));
}
function api_best_nickname(&$contacts) {
projects / friendica.git / blobdiff