X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=d98ad970d59532a51a304fe6c63251758126a697;hb=f663676cca64639202a76b599a1932c9de45f6fa;hp=9c3bb15244aa7d33366adffdf79b0a98805f1326;hpb=aed28a24f158535cff11a60bad45b0b4fd4ef2ce;p=friendica.git diff --git a/include/api.php b/include/api.php index 9c3bb15244..d98ad970d5 100644 --- a/include/api.php +++ b/include/api.php @@ -34,8 +34,11 @@ function api_register_func($path, $func, $auth=false){ global $API; - $API[$path] = array('func'=>$func, - 'auth'=>$auth); + $API[$path] = array('func'=>$func, 'auth'=>$auth); + + // Workaround for hotot + $path = str_replace("api/", "api/1.1/", $path); + $API[$path] = array('func'=>$func, 'auth'=>$auth); } /** @@ -301,6 +304,8 @@ } } + logger("api_get_user: user ".$user, LOGGER_DEBUG); + if (!$user) { if (api_user()===false) { api_login($a); return False; @@ -338,6 +343,7 @@ $ret = array( 'id' => $r[0]["id"], + 'id_str' => (string) $r[0]["id"], 'name' => $r[0]["name"], 'screen_name' => (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']), 'location' => NULL, @@ -379,7 +385,7 @@ ); // count public wall messages - $r = q("SELECT COUNT(`id`) as `count` FROM `item` USE INDEX (uid, type) + $r = q("SELECT COUNT(`id`) as `count` FROM `item` WHERE `uid` = %d AND `type`='wall' AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''", @@ -446,11 +452,15 @@ $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", dbesc(normalise_link($uinfo[0]['url']))); } + require_once('include/contact_selectors.php'); + $network_name = network_to_name($uinfo[0]['network']); + $ret = Array( 'id' => intval($r[0]['id']), + 'id_str' => (string) intval($r[0]['id']), 'name' => (($uinfo[0]['name']) ? $uinfo[0]['name'] : $uinfo[0]['nick']), 'screen_name' => (($uinfo[0]['nick']) ? $uinfo[0]['nick'] : $uinfo[0]['name']), - 'location' => ($usr) ? $usr[0]['default-location'] : NULL, + 'location' => ($usr) ? $usr[0]['default-location'] : $network_name, 'description' => (($profile) ? $profile[0]['pdesc'] : NULL), 'profile_image_url' => $uinfo[0]['micro'], 'profile_image_url_https' => $uinfo[0]['micro'], @@ -458,13 +468,13 @@ 'protected' => false, 'followers_count' => intval($countfollowers), 'friends_count' => intval($countfriends), - 'created_at' => api_date($uinfo[0]['name-date']), + 'created_at' => api_date($uinfo[0]['created']), 'favourites_count' => intval($starred), - 'utc_offset' => "0", // To-Do - 'time_zone' => 'UTC', // To-Do $uinfo[0]['timezone'], + 'utc_offset' => "0", + 'time_zone' => 'UTC', 'statuses_count' => intval($countitms), - 'following' => true, //#XXX: fix me - 'verified' => true, //#XXX: fix me + 'following' => (($uinfo[0]['rel'] == CONTACT_IS_FOLLOWER) OR ($uinfo[0]['rel'] == CONTACT_IS_FRIEND)), + 'verified' => true, 'statusnet_blocking' => false, 'notifications' => false, 'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'], @@ -511,9 +521,16 @@ // 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); } @@ -541,6 +558,7 @@ $ret = $data; break; } + return $ret; } @@ -578,8 +596,7 @@ unset($user_info["status"]["user"]); } - // "cid", "uid" and "self" are only needed for some internal stuff, so remove it from here - unset($user_info["cid"]); + // "uid" and "self" are only needed for some internal stuff, so remove it from here unset($user_info["uid"]); unset($user_info["self"]); @@ -724,10 +741,14 @@ function api_status_show(&$a, $type){ $user_info = api_get_user($a); + + logger('api_status_show: user_info: '.print_r($user_info, true), LOGGER_DEBUG); + // get last public wall message $lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `c`.`nick` as `reply_author`, `i`.`author-link` AS `item-author` FROM `item`, `contact`, `item` as `i`, `contact` as `c` - WHERE `item`.`contact-id` = %d AND `item`.`owner-link` = '%s' + WHERE `item`.`contact-id` = %d + AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s'))) AND `i`.`id` = `item`.`parent` AND `contact`.`id`=`item`.`contact-id` AND `c`.`id`=`i`.`contact-id` AND `contact`.`self`=1 AND `item`.`type`!='activity' @@ -735,7 +756,10 @@ ORDER BY `item`.`created` DESC LIMIT 1", intval($user_info['cid']), - dbesc($user_info['url']) + dbesc($user_info['url']), + dbesc(normalise_link($user_info['url'])), + dbesc($user_info['url']), + dbesc(normalise_link($user_info['url'])) ); if (count($lastwall)>0){ @@ -743,9 +767,12 @@ $in_reply_to_status_id = NULL; $in_reply_to_user_id = NULL; + $in_reply_to_status_id_str = NULL; + $in_reply_to_user_id_str = NULL; $in_reply_to_screen_name = NULL; if ($lastwall['parent']!=$lastwall['id']) { - $in_reply_to_status_id=$lastwall['parent']; + $in_reply_to_status_id= intval($lastwall['parent']); + $in_reply_to_status_id_str = (string) intval($lastwall['parent']); //$in_reply_to_user_id = $lastwall['reply_uid']; //$in_reply_to_screen_name = $lastwall['reply_author']; @@ -755,17 +782,22 @@ $r[0]['nick'] = api_get_nick($r[0]["url"]); $in_reply_to_screen_name = (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']); - $in_reply_to_user_id = $r[0]['id']; + $in_reply_to_user_id = intval($r[0]['id']); + $in_reply_to_user_id_str = (string) intval($r[0]['id']); } } + $status_info = array( 'text' => trim(html2plain(bbcode(api_clean_plain_items($lastwall['body']), false, false, 2, true), 0)), 'truncated' => false, 'created_at' => api_date($lastwall['created']), 'in_reply_to_status_id' => $in_reply_to_status_id, + 'in_reply_to_status_id_str' => $in_reply_to_status_id_str, 'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'), - 'id' => $lastwall['id'], + 'id' => intval($lastwall['id']), + 'id_str' => (string) $lastwall['id'], 'in_reply_to_user_id' => $in_reply_to_user_id, + 'in_reply_to_user_id_str' => $in_reply_to_user_id_str, 'in_reply_to_screen_name' => $in_reply_to_screen_name, 'geo' => NULL, 'favorited' => false, @@ -775,13 +807,16 @@ '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"])) $status_info["source"] = trim($status_info["source"].' ('.network_to_name($lastwall['item_network']).')'); - // "cid", "uid" and "self" are only needed for some internal stuff, so remove it from here - unset($status_info["user"]["cid"]); + // "uid" and "self" are only needed for some internal stuff, so remove it from here unset($status_info["user"]["uid"]); unset($status_info["user"]["self"]); } @@ -807,36 +842,43 @@ $lastwall = q("SELECT `item`.* FROM `item`, `contact` - WHERE `item`.`contact-id` = %d AND `item`.`owner-link` = '%s' + WHERE `item`.`contact-id` = %d + AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s'))) AND `contact`.`id`=`item`.`contact-id` AND `type`!='activity' AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`='' ORDER BY `created` DESC LIMIT 1", intval($user_info['cid']), - dbesc($user_info['url']) + dbesc($user_info['url']), + dbesc(normalise_link($user_info['url'])), + dbesc($user_info['url']), + dbesc(normalise_link($user_info['url'])) ); - +//print_r($user_info); if (count($lastwall)>0){ $lastwall = $lastwall[0]; $in_reply_to_status_id = NULL; $in_reply_to_user_id = NULL; + $in_reply_to_status_id_str = NULL; + $in_reply_to_user_id_str = NULL; $in_reply_to_screen_name = NULL; if ($lastwall['parent']!=$lastwall['id']) { $reply = q("SELECT `item`.`id`, `item`.`contact-id` as `reply_uid`, `contact`.`nick` as `reply_author`, `item`.`author-link` AS `item-author` FROM `item`,`contact` WHERE `contact`.`id`=`item`.`contact-id` AND `item`.`id` = %d", intval($lastwall['parent'])); if (count($reply)>0) { - $in_reply_to_status_id=$lastwall['parent']; - //$in_reply_to_user_id = $reply[0]['reply_uid']; - //$in_reply_to_screen_name = $reply[0]['reply_author']; + $in_reply_to_status_id = intval($lastwall['parent']); + $in_reply_to_status_id_str = (string) intval($lastwall['parent']); + $r = q("SELECT * FROM unique_contacts WHERE `url` = '%s'", dbesc(normalise_link($reply[0]['item-author']))); if ($r) { if ($r[0]['nick'] == "") $r[0]['nick'] = api_get_nick($r[0]["url"]); $in_reply_to_screen_name = (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']); - $in_reply_to_user_id = $r[0]['id']; + $in_reply_to_user_id = intval($r[0]['id']); + $in_reply_to_user_id_str = (string) intval($r[0]['id']); } } } @@ -845,9 +887,12 @@ 'truncated' => false, 'created_at' => api_date($lastwall['created']), 'in_reply_to_status_id' => $in_reply_to_status_id, + 'in_reply_to_status_id_str' => $in_reply_to_status_id_str, 'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'), - 'id' => $lastwall['contact-id'], + 'id' => intval($lastwall['contact-id']), + 'id_str' => (string) $lastwall['contact-id'], 'in_reply_to_user_id' => $in_reply_to_user_id, + 'in_reply_to_user_id_str' => $in_reply_to_user_id_str, 'in_reply_to_screen_name' => $in_reply_to_screen_name, 'geo' => NULL, 'favorited' => false, @@ -855,6 +900,10 @@ '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"])) @@ -862,8 +911,7 @@ } - // "cid", "uid" and "self" are only needed for some internal stuff, so remove it from here - unset($user_info["cid"]); + // "uid" and "self" are only needed for some internal stuff, so remove it from here unset($user_info["uid"]); unset($user_info["self"]); @@ -904,8 +952,6 @@ $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); @@ -925,7 +971,7 @@ 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), @@ -983,8 +1029,6 @@ $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) @@ -1006,7 +1050,7 @@ 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)); @@ -1046,9 +1090,12 @@ if ($id == 0) $id = intval($_REQUEST["id"]); + // Hotot workaround + if ($id == 0) + $id = intval($a->argv[4]); + logger('API: api_statuses_show: '.$id); - //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); $conversation = (x($_REQUEST,'conversation')?1:0); $sql_extra = ''; @@ -1091,9 +1138,70 @@ /** - * + * + */ + 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); + + + /** + * */ function api_statuses_repeat(&$a, $type){ + global $called_api; + if (api_user()===false) return false; $user_info = api_get_user($a); @@ -1104,9 +1212,11 @@ if ($id == 0) $id = intval($_REQUEST["id"]); - logger('API: api_statuses_repeat: '.$id); + // Hotot workaround + if ($id == 0) + $id = intval($a->argv[4]); - //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); + logger('API: api_statuses_repeat: '.$id); $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`, @@ -1123,13 +1233,17 @@ if ($r[0]['body'] != "") { if (!intval(get_config('system','old_share'))) { - $post = "[share author='".str_replace("'", "'", $r[0]['reply_author']). - "' profile='".$r[0]['reply_url']. - "' avatar='".$r[0]['reply_photo']. - "' link='".$r[0]['plink']."']"; - - $post .= $r[0]['body']; - $post .= "[/share]"; + if (strpos($r[0]['body'], "[/share]") !== false) { + $pos = strpos($r[0]['body'], "[share"); + $post = substr($r[0]['body'], $pos); + } else { + $post = "[share author='".str_replace("'", "'", $r[0]['author-name']). + "' profile='".$r[0]['author-link']. + "' avatar='".$r[0]['author-avatar']. + "' link='".$r[0]['plink']."']"; + $post .= $r[0]['body']; + $post .= "[/share]"; + } $_REQUEST['body'] = $post; } else $_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body']; @@ -1142,17 +1256,14 @@ item_post($a); } - if ($type == 'xml') - $ok = "true"; - else - $ok = "ok"; - - return api_apply_template('test', $type, array('$ok' => $ok)); + // this should output the last post (the one we just posted). + $called_api = null; + return(api_status_show($a,$type)); } api_register_func('api/statuses/retweet','api_statuses_repeat', true); /** - * + * */ function api_statuses_destroy(&$a, $type){ if (api_user()===false) return false; @@ -1165,17 +1276,18 @@ if ($id == 0) $id = intval($_REQUEST["id"]); + // Hotot workaround + if ($id == 0) + $id = intval($a->argv[4]); + logger('API: api_statuses_destroy: '.$id); + $ret = api_statuses_show($a, $type); + require_once('include/items.php'); drop_item($id, false); - if ($type == 'xml') - $ok = "true"; - else - $ok = "ok"; - - return api_apply_template('test', $type, array('$ok' => $ok)); + return($ret); } api_register_func('api/statuses/destroy','api_statuses_destroy', true); @@ -1207,8 +1319,6 @@ $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); @@ -1235,7 +1345,7 @@ 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), @@ -1308,7 +1418,7 @@ 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), @@ -1372,7 +1482,7 @@ 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), @@ -1474,11 +1584,9 @@ 'recipient' => $recipient, ); - // "cid", "uid" and "self" are only needed for some internal stuff, so remove it from here - unset($ret["sender"]["cid"]); + // "uid" and "self" are only needed for some internal stuff, so remove it from here unset($ret["sender"]["uid"]); unset($ret["sender"]["self"]); - unset($ret["recipient"]["cid"]); unset($ret["recipient"]["uid"]); unset($ret["recipient"]["self"]); @@ -1504,6 +1612,132 @@ 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(); @@ -1524,12 +1758,15 @@ intval(api_user()), dbesc($item['thr-parent'])); if ($r) - $in_reply_to_status_id = $r[0]['id']; + $in_reply_to_status_id = intval($r[0]['id']); else - $in_reply_to_status_id = $item['parent']; + $in_reply_to_status_id = intval($item['parent']); + + $in_reply_to_status_id_str = (string) intval($item['parent']); $in_reply_to_screen_name = NULL; $in_reply_to_user_id = NULL; + $in_reply_to_user_id_str = NULL; $r = q("SELECT `author-link` FROM item WHERE uid=%d AND id=%d LIMIT 1", intval(api_user()), @@ -1542,17 +1779,22 @@ $r[0]['nick'] = api_get_nick($r[0]["url"]); $in_reply_to_screen_name = (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']); - $in_reply_to_user_id = $r[0]['id']; + $in_reply_to_user_id = intval($r[0]['id']); + $in_reply_to_user_id_str = (string) intval($r[0]['id']); } } } else { $in_reply_to_screen_name = NULL; $in_reply_to_user_id = NULL; $in_reply_to_status_id = NULL; + $in_reply_to_user_id_str = NULL; + $in_reply_to_status_id_str = NULL; } // 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']); @@ -1569,18 +1811,26 @@ 'truncated' => False, 'created_at'=> api_date($item['created']), 'in_reply_to_status_id' => $in_reply_to_status_id, + 'in_reply_to_status_id_str' => $in_reply_to_status_id, 'source' => (($item['app']) ? $item['app'] : 'web'), 'id' => intval($item['id']), + 'id_str' => (string) intval($item['id']), 'in_reply_to_user_id' => $in_reply_to_user_id, + 'in_reply_to_user_id_str' => $in_reply_to_user_id, 'in_reply_to_screen_name' => $in_reply_to_screen_name, 'geo' => NULL, '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"])) @@ -1588,15 +1838,19 @@ // 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"]); $status["retweeted_status"] = $retweeted_status; } - // "cid", "uid" and "self" are only needed for some internal stuff, so remove it from here - unset($status["user"]["cid"]); + // "uid" and "self" are only needed for some internal stuff, so remove it from here unset($status["user"]["uid"]); unset($status["user"]["self"]); @@ -1655,15 +1909,29 @@ else $ok = "ok"; - return api_apply_template('test', $type, array('$ok' => $ok)); + return api_apply_template('test', $type, array("$ok" => $ok)); } 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 + * https://dev.twitter.com/docs/api/1/get/statuses/friends * This function is deprecated by Twitter - * returns: json, xml + * returns: json, xml **/ function api_statuses_f(&$a, $type, $qtype) { if (api_user()===false) return false; @@ -1696,8 +1964,7 @@ $ret = array(); foreach($r as $cid){ $user = api_get_user($a, $cid['nurl']); - // "cid", "uid" and "self" are only needed for some internal stuff, so remove it from here - unset($user["cid"]); + // "uid" and "self" are only needed for some internal stuff, so remove it from here unset($user["uid"]); unset($user["self"]); @@ -1934,7 +2201,7 @@ 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) @@ -2125,25 +2392,36 @@ function api_get_nick($profile) { } 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 = ""; @@ -2151,21 +2429,24 @@ function api_cleanup_share($shared) { 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) { $best_contact = array(); + if (count($contact) == 0) + return; + foreach ($contacts AS $contact) if ($contact["network"] == "") { $contact["network"] = "dfrn";