X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=ade783662bd5d15e08dea74bc80bbadf302c8cc4;hb=de75d8ca7f3179fabcec1c954b92bce10080bfba;hp=579449fc85fc3cb6b9907f6a0441cc7ec1e62984;hpb=63b8b5761d9fa3a8a382328bfbb6a5a4d5a184c6;p=friendica.git
diff --git a/include/api.php b/include/api.php
index 579449fc85..ade783662b 100644
--- a/include/api.php
+++ b/include/api.php
@@ -15,16 +15,16 @@
$API = Array();
$called_api = Null;
- function api_user() {
- // It is not sufficient to use local_user() to check whether someone is allowed to use the API,
- // because this will open CSRF holes (just embed an image with src=friendicasite.com/api/statuses/update?status=CSRF
- // into a page, and visitors will post something without noticing it).
- // Instead, use this function.
- if ($_SESSION["allow_api"])
- return local_user();
-
- return false;
- }
+ function api_user() {
+ // It is not sufficient to use local_user() to check whether someone is allowed to use the API,
+ // because this will open CSRF holes (just embed an image with src=friendicasite.com/api/statuses/update?status=CSRF
+ // into a page, and visitors will post something without noticing it).
+ // Instead, use this function.
+ if ($_SESSION["allow_api"])
+ return local_user();
+
+ return false;
+ }
function api_date($str){
//Wed May 23 06:01:13 +0000 2007
@@ -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);
}
/**
@@ -62,9 +65,9 @@
// workaround for HTTP-auth in CGI mode
if(x($_SERVER,'REDIRECT_REMOTE_USER')) {
- $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"],6)) ;
+ $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"],6)) ;
if(strlen($userpass)) {
- list($name, $password) = explode(':', $userpass);
+ list($name, $password) = explode(':', $userpass);
$_SERVER['PHP_AUTH_USER'] = $name;
$_SERVER['PHP_AUTH_PW'] = $password;
}
@@ -98,10 +101,10 @@
if(count($r)){
$record = $r[0];
} else {
- logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
- header('WWW-Authenticate: Basic realm="Friendica"');
- header('HTTP/1.0 401 Unauthorized');
- die('This api requires login');
+ logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
+ header('WWW-Authenticate: Basic realm="Friendica"');
+ header('HTTP/1.0 401 Unauthorized');
+ die('This api requires login');
}
require_once('include/security.php');
@@ -151,7 +154,7 @@
case "json":
header ("Content-Type: application/json");
foreach($r as $rr)
- return json_encode($rr);
+ return json_encode($rr);
break;
case "rss":
header ("Content-Type: application/rss+xml");
@@ -164,7 +167,7 @@
case "as":
//header ("Content-Type: application/json");
//foreach($r as $rr)
- // return json_encode($rr);
+ // return json_encode($rr);
return json_encode($r);
break;
@@ -340,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,
@@ -380,26 +384,26 @@
intval(api_user())
);
+ //AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
// count public wall messages
- $r = q("SELECT COUNT(`id`) as `count` FROM `item` USE INDEX (uid, type)
+ $r = q("SELECT count(*) as `count` FROM `item`
WHERE `uid` = %d
- AND `type`='wall'
- AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+ AND `type`='wall'",
intval($uinfo[0]['uid'])
);
$countitms = $r[0]['count'];
}
else {
- $r = q("SELECT COUNT(`id`) as `count` FROM `item`
- WHERE `contact-id` = %d
- AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+ //AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+ $r = q("SELECT count(*) as `count` FROM `item`
+ WHERE `contact-id` = %d",
intval($uinfo[0]['id'])
);
$countitms = $r[0]['count'];
}
// count friends
- $r = q("SELECT COUNT(`id`) as `count` FROM `contact`
+ $r = q("SELECT count(*) as `count` FROM `contact`
WHERE `uid` = %d AND `rel` IN ( %d, %d )
AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0",
intval($uinfo[0]['uid']),
@@ -408,7 +412,7 @@
);
$countfriends = $r[0]['count'];
- $r = q("SELECT COUNT(`id`) as `count` FROM `contact`
+ $r = q("SELECT count(*) as `count` FROM `contact`
WHERE `uid` = %d AND `rel` IN ( %d, %d )
AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0",
intval($uinfo[0]['uid']),
@@ -417,7 +421,7 @@
);
$countfollowers = $r[0]['count'];
- $r = q("SELECT count(`id`) as `count` FROM item where starred = 1 and uid = %d and deleted = 0",
+ $r = q("SELECT count(*) as `count` FROM item where starred = 1 and uid = %d and deleted = 0",
intval($uinfo[0]['uid'])
);
$starred = $r[0]['count'];
@@ -432,9 +436,6 @@
// Add a nick if it isn't present there
if (($uinfo[0]['nick'] == "") OR ($uinfo[0]['name'] == $uinfo[0]['nick'])) {
$uinfo[0]['nick'] = api_get_nick($uinfo[0]["url"]);
- //if ($uinfo[0]['nick'] != "")
- // q("UPDATE contact SET nick = '%s' WHERE id = %d",
- // dbesc($uinfo[0]['nick']), intval($uinfo[0]["id"]));
}
// Fetching unique id
@@ -448,11 +449,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'],
@@ -460,13 +465,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'],
@@ -513,9 +518,17 @@
// 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"] != "") OR
+ $item["private"]);
+
+ return ($status_user);
}
@@ -605,46 +618,46 @@
}
/*Waitman Gobble Mod*/
- function api_statuses_mediap(&$a, $type) {
- if (api_user()===false) {
- logger('api_statuses_update: no user');
- return false;
- }
- $user_info = api_get_user($a);
-
- $_REQUEST['type'] = 'wall';
- $_REQUEST['profile_uid'] = api_user();
- $_REQUEST['api_source'] = true;
- $txt = requestdata('status');
- //$txt = urldecode(requestdata('status'));
-
- require_once('library/HTMLPurifier.auto.php');
- require_once('include/html2bbcode.php');
-
- if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) {
+ function api_statuses_mediap(&$a, $type) {
+ if (api_user()===false) {
+ logger('api_statuses_update: no user');
+ return false;
+ }
+ $user_info = api_get_user($a);
+
+ $_REQUEST['type'] = 'wall';
+ $_REQUEST['profile_uid'] = api_user();
+ $_REQUEST['api_source'] = true;
+ $txt = requestdata('status');
+ //$txt = urldecode(requestdata('status'));
+
+ require_once('library/HTMLPurifier.auto.php');
+ require_once('include/html2bbcode.php');
+
+ if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) {
$txt = html2bb_video($txt);
$config = HTMLPurifier_Config::createDefault();
- $config->set('Cache.DefinitionImpl', null);
+ $config->set('Cache.DefinitionImpl', null);
$purifier = new HTMLPurifier($config);
- $txt = $purifier->purify($txt);
+ $txt = $purifier->purify($txt);
}
$txt = html2bbcode($txt);
- $a->argv[1]=$user_info['screen_name']; //should be set to username?
+ $a->argv[1]=$user_info['screen_name']; //should be set to username?
$_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
- require_once('mod/wall_upload.php');
+ require_once('mod/wall_upload.php');
$bebop = wall_upload_post($a);
//now that we have the img url in bbcode we can add it to the status and insert the wall item.
- $_REQUEST['body']=$txt."\n\n".$bebop;
- require_once('mod/item.php');
- item_post($a);
-
- // this should output the last post (the one we just posted).
- return api_status_show($a,$type);
- }
- api_register_func('api/statuses/mediap','api_statuses_mediap', true);
+ $_REQUEST['body']=$txt."\n\n".$bebop;
+ require_once('mod/item.php');
+ item_post($a);
+
+ // this should output the last post (the one we just posted).
+ return api_status_show($a,$type);
+ }
+ api_register_func('api/statuses/mediap','api_statuses_mediap', true);
/*Waitman Gobble Mod*/
@@ -697,6 +710,8 @@
if($parent)
$_REQUEST['type'] = 'net-comment';
else {
+// logger("api_statuses_update: upload ".print_r($_FILES, true)." ".print_r($_POST, true)." ".print_r($_GET, true), LOGGER_DEBUG);
+//die("blubb");
$_REQUEST['type'] = 'wall';
if(x($_FILES,'media')) {
// upload the image if we have one
@@ -730,17 +745,20 @@
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'
+ $lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `i`.`author-link` AS `item-author`
+ FROM `item`, `item` as `i`
+ 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'
AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
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){
@@ -748,11 +766,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_user_id = $lastwall['reply_uid'];
- //$in_reply_to_screen_name = $lastwall['reply_author'];
+ if (intval($lastwall['parent']) != intval($lastwall['id'])) {
+ $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($lastwall['item-author'])));
if ($r) {
@@ -760,18 +779,34 @@
$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']);
}
}
+ // There seems to be situation, where both fields are identical:
+ // https://github.com/friendica/friendica/issues/1010
+ // This is a bugfix for that.
+ if (intval($in_reply_to_status_id) == intval($lastwall['id'])) {
+ logger('api_status_show: this message should never appear: id: '.$lastwall['id'].' similar to reply-to: '.$in_reply_to_status_id, LOGGER_DEBUG);
+ $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;
+ }
+
$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,
@@ -781,6 +816,13 @@
'statusnet_conversation_id' => $lastwall['parent'],
);
+ if ($lastwall['title'] != "")
+ $status_info['statusnet_html'] = "".bbcode($lastwall['title'])."
\n".$status_info['statusnet_html'];
+
+ $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"]))
@@ -812,36 +854,44 @@
$lastwall = q("SELECT `item`.*
FROM `item`, `contact`
- WHERE `item`.`contact-id` = %d AND `item`.`owner-link` = '%s'
+ WHERE `item`.`uid` = %d AND `verb` = '%s' AND `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(api_user()),
+ dbesc(ACTIVITY_POST),
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){
$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']));
+ 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']);
}
}
}
@@ -850,9 +900,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,
@@ -860,6 +913,13 @@
'statusnet_conversation_id' => $lastwall['parent'],
);
+ if ($lastwall['title'] != "")
+ $user_info['statusnet_html'] = "".bbcode($lastwall['title'])."
\n".$user_info['statusnet_html'];
+
+ $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"]))
@@ -908,8 +968,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);
@@ -923,15 +981,15 @@
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item`, `contact`
- WHERE `item`.`uid` = %d
+ WHERE `item`.`uid` = %d AND `verb` = '%s'
AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
AND `item`.`id`>%d
- ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
- //intval($user_info['uid']),
+ ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
intval(api_user()),
+ dbesc(ACTIVITY_POST),
intval($since_id),
intval($start), intval($count)
);
@@ -987,8 +1045,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)
@@ -996,24 +1052,25 @@
if ($conversation_id > 0)
$sql_extra .= ' AND `item`.`parent` = '.intval($conversation_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`.`self`, `contact`.`writable`,
- `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
- `user`.`nickname`, `user`.`hidewall`
- FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
- WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
- AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
- AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
- AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ $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`.`self`, `contact`.`writable`,
+ `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
+ `user`.`nickname`, `user`.`hidewall`
+ FROM `item` STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
+ WHERE `verb` = '%s' AND `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+ AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
+ AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
+ AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 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 ",
+ dbesc(ACTIVITY_POST),
intval($since_id),
- intval($start),
- intval($count));
+ intval($start),
+ intval($count));
$ret = api_format_items($r,$user_info);
@@ -1050,9 +1107,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 = '';
@@ -1067,9 +1127,11 @@
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item`, `contact`
WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
- AND `contact`.`id` = `item`.`contact-id`
+ AND `contact`.`id` = `item`.`contact-id` AND `item`.`uid` = %d AND `item`.`verb` = '%s'
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra",
+ intval(api_user()),
+ dbesc(ACTIVITY_POST),
intval($id)
);
@@ -1094,6 +1156,66 @@
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 `item`.`verb` = '%s' 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()),
+ dbesc(ACTIVITY_POST),
+ 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);
+
+
/**
*
*/
@@ -1110,9 +1232,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`,
@@ -1172,6 +1296,10 @@
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);
@@ -1211,8 +1339,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);
@@ -1220,27 +1346,27 @@
$myurl = str_replace('www.','',$myurl);
$diasp_url = str_replace('/profile/','/u/',$myurl);
- $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where `author-link` IN ('https://%s', 'http://%s') OR `mention`)",
- dbesc(protect_sprintf($myurl)),
- dbesc(protect_sprintf($myurl))
- );
-
if ($max_id > 0)
- $sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
+ $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`, `contact`
- WHERE `item`.`uid` = %d
+ WHERE `item`.`uid` = %d AND `verb` = '%s'
+ AND NOT (`item`.`author-link` IN ('https://%s', 'http://%s'))
AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND `item`.`parent` IN (SELECT `iid` from thread where uid = %d AND `mention`)
$sql_extra
AND `item`.`id`>%d
- ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
- //intval($user_info['uid']),
+ ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
+ intval(api_user()),
+ dbesc(ACTIVITY_POST),
+ dbesc(protect_sprintf($myurl)),
+ dbesc(protect_sprintf($myurl)),
intval(api_user()),
intval($since_id),
intval($start), intval($count)
@@ -1305,15 +1431,16 @@
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item`, `contact`
- WHERE `item`.`uid` = %d
+ WHERE `item`.`uid` = %d AND `verb` = '%s'
AND `item`.`contact-id` = %d
AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `contact`.`id` = `item`.`contact-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()),
+ dbesc(ACTIVITY_POST),
intval($user_info['cid']),
intval($since_id),
intval($start), intval($count)
@@ -1369,16 +1496,16 @@
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item`, `contact`
- WHERE `item`.`uid` = %d
+ WHERE `item`.`uid` = %d AND `verb` = '%s'
AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `item`.`starred` = 1
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
AND `item`.`id`>%d
- ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
- //intval($user_info['uid']),
+ ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
intval(api_user()),
+ dbesc(ACTIVITY_POST),
intval($since_id),
intval($start), intval($count)
);
@@ -1451,11 +1578,11 @@
$singleitem["title"] = $item["text"];
$singleitem["verb"] = "post";
$singleitem["statusnet:notice_info"]["local_id"] = $item["id"];
- $singleitem["statusnet:notice_info"]["source"] = $item["source"];
- $singleitem["statusnet:notice_info"]["favorite"] = "false";
- $singleitem["statusnet:notice_info"]["repeated"] = "false";
- //$singleitem["original"] = $item;
- $items[] = $singleitem;
+ $singleitem["statusnet:notice_info"]["source"] = $item["source"];
+ $singleitem["statusnet:notice_info"]["favorite"] = "false";
+ $singleitem["statusnet:notice_info"]["repeated"] = "false";
+ //$singleitem["original"] = $item;
+ $items[] = $singleitem;
}
$as['items'] = $items;
$as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
@@ -1506,6 +1633,164 @@
return $ret;
}
+ function api_get_entitities(&$text, $bbcode) {
+ /*
+ To-Do:
+ * Links at the first character of the post
+ */
+
+ $a = get_app();
+
+ $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false");
+
+ if ($include_entities != "true") {
+ require_once("mod/proxy.php");
+
+ preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
+
+ foreach ($images[1] AS $image) {
+ $replace = proxy_url($image);
+ $text = str_replace($image, $replace, $text);
+ }
+ 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);
+
+ $bbcode = 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)) {
+ require_once("include/Photo.php");
+ $image = get_photo_info($url);
+ if ($image) {
+ // If image cache is activated, then use the following sizes:
+ // thumb (150), small (340), medium (600) and large (1024)
+ if (!get_config("system", "proxy_disabled")) {
+ require_once("mod/proxy.php");
+ $media_url = proxy_url($url);
+
+ $sizes = array();
+ $scale = scale_image($image[0], $image[1], 150);
+ $sizes["thumb"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
+
+ if (($image[0] > 150) OR ($image[1] > 150)) {
+ $scale = scale_image($image[0], $image[1], 340);
+ $sizes["small"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
+ }
+
+ $scale = scale_image($image[0], $image[1], 600);
+ $sizes["medium"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
+
+ if (($image[0] > 600) OR ($image[1] > 600)) {
+ $scale = scale_image($image[0], $image[1], 1024);
+ $sizes["large"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
+ }
+ } else {
+ $media_url = $url;
+ $sizes["medium"] = array("w" => $image[0], "h" => $image[1], "resize" => "fit");
+ }
+
+ $entities["media"][] = array(
+ "id" => $start+1,
+ "id_str" => (string)$start+1,
+ "indices" => array($start, $start+strlen($url)),
+ "media_url" => normalise_link($media_url),
+ "media_url_https" => $media_url,
+ "url" => $url,
+ "display_url" => $display_url,
+ "expanded_url" => $url,
+ "type" => "photo",
+ "sizes" => $sizes);
+ }
+ $offset = $start + 1;
+ }
+ }
+
+ return($entities);
+ }
+
function api_format_items($r,$user_info, $filter_user = false) {
$a = get_app();
@@ -1526,12 +1811,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()),
@@ -1544,17 +1832,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']);
@@ -1571,18 +1864,29 @@
'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_str,
'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_str,
'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'],
);
+ if ($item['title'] != "")
+ $status['statusnet_html'] = "".bbcode($item['title'])."
\n".$status['statusnet_html'];
+
+ $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"]))
@@ -1590,7 +1894,12 @@
// 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"]);
@@ -1602,30 +1911,8 @@
unset($status["user"]["self"]);
// 'geo' => array('type' => 'Point',
- // 'coordinates' => array((float) $notice->lat,
- // (float) $notice->lon));
-
- // Seesmic doesn't like the following content
- // completely disabled to make friendica totally compatible to the statusnet API
- /*if ($_SERVER['HTTP_USER_AGENT'] != 'Seesmic') {
- $status2 = array(
- 'updated' => api_date($item['edited']),
- 'published' => api_date($item['created']),
- 'message_id' => $item['uri'],
- 'url' => ($item['plink']!=''?$item['plink']:$item['author-link']),
- 'coordinates' => $item['coord'],
- 'place' => $item['location'],
- 'contributors' => '',
- 'annotations' => '',
- 'entities' => '',
- 'objecttype' => (($item['object-type']) ? $item['object-type'] : ACTIVITY_OBJ_NOTE),
- 'verb' => (($item['verb']) ? $item['verb'] : ACTIVITY_POST),
- 'self' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type,
- 'edit' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type,
- );
-
- $status = array_merge($status, $status2);
- }*/
+ // 'coordinates' => array((float) $notice->lat,
+ // (float) $notice->lon));
$ret[] = $status;
};
@@ -1661,6 +1948,20 @@
}
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
@@ -1934,7 +2235,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)
@@ -2010,6 +2311,48 @@
api_register_func('api/oauth/request_token', 'api_oauth_request_token', false);
api_register_func('api/oauth/access_token', 'api_oauth_access_token', false);
+
+ function api_fr_photos_list(&$a,$type) {
+ if (api_user()===false) return false;
+ $r = q("select distinct `resource-id` from photo where uid = %d and album != 'Contact Photos' ",
+ intval(local_user())
+ );
+ if($r) {
+ $ret = array();
+ foreach($r as $rr)
+ $ret[] = $rr['resource-id'];
+ header("Content-type: application/json");
+ echo json_encode($ret);
+ }
+ killme();
+ }
+
+ function api_fr_photo_detail(&$a,$type) {
+ if (api_user()===false) return false;
+ if(! $_REQUEST['photo_id']) return false;
+ $scale = ((array_key_exists('scale',$_REQUEST)) ? intval($_REQUEST['scale']) : 0);
+ $r = q("select * from photo where uid = %d and `resource-id` = '%s' and scale = %d limit 1",
+ intval(local_user()),
+ dbesc($_REQUEST['photo_id']),
+ intval($scale)
+ );
+ if($r) {
+ header("Content-type: application/json");
+ $r[0]['data'] = base64_encode($r[0]['data']);
+ echo json_encode($r[0]);
+ }
+
+ killme();
+ }
+
+ api_register_func('api/friendica/photos/list', 'api_fr_photos_list', true);
+ api_register_func('api/friendica/photo', 'api_fr_photo_detail', true);
+
+
+
+
+
+
function api_share_as_retweet($a, $uid, &$item) {
$body = trim($item["body"]);
@@ -2109,7 +2452,7 @@ function api_get_nick($profile) {
// To-Do: look at the page if its really a pumpio site
//if (!$nick == "") {
// $pumpio = preg_replace("=https?://(.*)/(.*)/=ism", "$2", $profile."/");
- // if ($pumpio != $profile)
+ // if ($pumpio != $profile)
// $nick = $pumpio;
//
@@ -2121,29 +2464,41 @@ function api_get_nick($profile) {
return($nick);
}
- return(false);
+ return(false);
}
function api_clean_plain_items($Text) {
+ $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false");
+
+ $Text = bb_CleanPictureLinks($Text);
+
+ $URLSearchString = "^\[\]";
+
+ $Text = preg_replace("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'$1$3',$Text);
+
+ if ($include_entities == "true") {
+ $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,16 +2506,16 @@ 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) {