*
* Register a function to be the endpont for defined API path.
*
- * @param string $path API URL path, relative to $a->get_baseurl()
+ * @param string $path API URL path, relative to App::get_baseurl()
* @param string $func Function name to call on path request
* @param bool $auth API need logged user
* @param string $method
else {
// process normal login request
- $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
- AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
+ $r = q("SELECT * FROM `user` WHERE (`email` = '%s' OR `nickname` = '%s')
+ AND `password` = '%s' AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified` LIMIT 1",
dbesc(trim($user)),
dbesc(trim($user)),
dbesc($encrypted)
throw new UnauthorizedException("This API requires login");
}
- authenticate_success($record); $_SESSION["allow_api"] = true;
+ authenticate_success($record);
+
+ $_SESSION["allow_api"] = true;
call_hooks('logged_in', $a->user);
logger('API parameters: ' . print_r($_REQUEST,true));
$stamp = microtime(true);
- $r = call_user_func($info['func'], $a, $type);
+ $r = call_user_func($info['func'], $type);
$duration = (float)(microtime(true)-$stamp);
logger("API call duration: ".round($duration, 2)."\t".$a->query_string, LOGGER_DEBUG);
+ if (get_config("system", "profiler")) {
+ $duration = microtime(true)-$a->performance["start"];
+
+ logger(parse_url($a->query_string, PHP_URL_PATH).": ".sprintf("Database: %s/%s, Network: %s, I/O: %s, Other: %s, Total: %s",
+ round($a->performance["database"] - $a->performance["database_write"], 3),
+ round($a->performance["database_write"], 3),
+ round($a->performance["network"], 2),
+ round($a->performance["file"], 2),
+ round($duration - ($a->performance["database"] + $a->performance["network"]
+ + $a->performance["file"]), 2),
+ round($duration, 2)),
+ LOGGER_DEBUG);
+
+ if (get_config("rendertime", "callstack")) {
+ $o = "Database Read:\n";
+ foreach ($a->callstack["database"] AS $func => $time) {
+ $time = round($time, 3);
+ if ($time > 0)
+ $o .= $func.": ".$time."\n";
+ }
+ $o .= "\nDatabase Write:\n";
+ foreach ($a->callstack["database_write"] AS $func => $time) {
+ $time = round($time, 3);
+ if ($time > 0)
+ $o .= $func.": ".$time."\n";
+ }
+
+ $o .= "\nNetwork:\n";
+ foreach ($a->callstack["network"] AS $func => $time) {
+ $time = round($time, 3);
+ if ($time > 0)
+ $o .= $func.": ".$time."\n";
+ }
+ logger($o, LOGGER_DEBUG);
+ }
+ }
+
+
if ($r===false) {
// api function returned false withour throw an
// exception. This should not happend, throw a 500
throw new NotImplementedException();
} catch (HTTPException $e) {
header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}");
- return api_error($a, $type, $e);
+ return api_error($type, $e);
}
}
/**
* @brief Format API error string
*
- * @param Api $a
* @param string $type Return type (xml, json, rss, as)
* @param HTTPException $error Error object
* @return strin error message formatted as $type
*/
- function api_error(&$a, $type, $e) {
+ function api_error($type, $e) {
+
+ $a = get_app();
+
$error = ($e->getMessage()!==""?$e->getMessage():$e->httpdesc);
# TODO: https://dev.twitter.com/overview/api/response-codes
$arr['$user'] = $user_info;
$arr['$rss'] = array(
'alternate' => $user_info['url'],
- 'self' => $a->get_baseurl(). "/". $a->query_string,
- 'base' => $a->get_baseurl(),
+ 'self' => App::get_baseurl(). "/". $a->query_string,
+ 'base' => App::get_baseurl(),
'updated' => api_date(null),
'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME),
'language' => $user_info['language'],
- 'logo' => $a->get_baseurl()."/images/friendica-32.png",
+ 'logo' => App::get_baseurl()."/images/friendica-32.png",
);
return $arr;
* Contact url or False if contact id is unknown
*/
function api_unique_id_to_url($id){
- $r = q("SELECT `url` FROM `gcontact` WHERE `id`=%d LIMIT 1",
+ $r = q("SELECT `url` FROM `contact` WHERE `uid` = 0 AND `id` = %d LIMIT 1",
intval($id));
if ($r)
return ($r[0]["url"]);
if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user());
}
- // Searching for unique contact id
+ // Searching for contact id with uid = 0
if(!is_null($contact_id) AND (intval($contact_id) != 0)){
$user = dbesc(api_unique_id_to_url($contact_id));
return False;
} else {
$user = $_SESSION['uid'];
- $extra_query = "AND `contact`.`uid` = %d AND `contact`.`self` = 1 ";
+ $extra_query = "AND `contact`.`uid` = %d AND `contact`.`self` ";
}
}
// Selecting the id by priority, friendica first
api_best_nickname($uinfo);
- // if the contact wasn't found, fetch it from the unique contacts
+ // if the contact wasn't found, fetch it from the contacts with uid = 0
if (count($uinfo)==0) {
$r = array();
if ($url != "")
- $r = q("SELECT * FROM `gcontact` WHERE `nurl`='%s' LIMIT 1", dbesc(normalise_link($url)));
+ $r = q("SELECT * FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' LIMIT 1", dbesc(normalise_link($url)));
if ($r) {
+ $network_name = network_to_name($r[0]['network'], $r[0]['url']);
+
// If no nick where given, extract it from the address
if (($r[0]['nick'] == "") OR ($r[0]['name'] == $r[0]['nick']))
$r[0]['nick'] = api_get_nick($r[0]["url"]);
'id_str' => (string) $r[0]["id"],
'name' => $r[0]["name"],
'screen_name' => (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']),
- 'location' => $r[0]["location"],
+ 'location' => ($r[0]["location"] != "") ? $r[0]["location"] : $network_name,
'description' => $r[0]["about"],
+ 'profile_image_url' => $r[0]["micro"],
+ 'profile_image_url_https' => $r[0]["micro"],
'url' => $r[0]["url"],
'protected' => false,
'followers_count' => 0,
'contributors_enabled' => false,
'is_translator' => false,
'is_translation_enabled' => false,
- 'profile_image_url' => $r[0]["photo"],
- 'profile_image_url_https' => $r[0]["photo"],
'following' => false,
'follow_request_sent' => false,
- 'notifications' => false,
'statusnet_blocking' => false,
'notifications' => false,
'statusnet_profile_url' => $r[0]["url"],
'uid' => 0,
- 'cid' => get_contact($r[0]["url"], api_user()),
+ 'cid' => get_contact($r[0]["url"], api_user(), true),
'self' => 0,
'network' => $r[0]["network"],
);
}
if($uinfo[0]['self']) {
+
+ if ($uinfo[0]['network'] == "")
+ $uinfo[0]['network'] = NETWORK_DFRN;
+
$usr = q("select * from user where uid = %d limit 1",
intval(api_user())
);
intval(api_user())
);
- //AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+ // Counting is deactivated by now, due to performance issues
// count public wall messages
- $r = q("SELECT count(*) as `count` FROM `item`
- WHERE `uid` = %d
- AND `type`='wall'",
- intval($uinfo[0]['uid'])
- );
- $countitms = $r[0]['count'];
- }
- else {
- //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'];
+ //$r = q("SELECT COUNT(*) as `count` FROM `item` WHERE `uid` = %d AND `wall`",
+ // intval($uinfo[0]['uid'])
+ //);
+ //$countitms = $r[0]['count'];
+ $countitms = 0;
+ } else {
+ // Counting is deactivated by now, due to performance issues
+ //$r = q("SELECT count(*) as `count` FROM `item`
+ // WHERE `contact-id` = %d",
+ // intval($uinfo[0]['id'])
+ //);
+ //$countitms = $r[0]['count'];
+ $countitms = 0;
}
-
+/*
+ // Counting is deactivated by now, due to performance issues
// count friends
$r = q("SELECT count(*) as `count` FROM `contact`
WHERE `uid` = %d AND `rel` IN ( %d, %d )
$countfollowers = 0;
$starred = 0;
}
+*/
+ $countfriends = 0;
+ $countfollowers = 0;
+ $starred = 0;
// Add a nick if it isn't present there
if (($uinfo[0]['nick'] == "") OR ($uinfo[0]['name'] == $uinfo[0]['nick'])) {
$network_name = network_to_name($uinfo[0]['network'], $uinfo[0]['url']);
- $gcontact_id = get_gcontact_id(array("url" => $uinfo[0]['url'], "network" => $uinfo[0]['network'],
- "photo" => $uinfo[0]['micro'], "name" => $uinfo[0]['name']));
+ $pcontact_id = get_contact($uinfo[0]['url'], 0, true);
$ret = Array(
- 'id' => intval($gcontact_id),
- 'id_str' => (string) intval($gcontact_id),
+ 'id' => intval($pcontact_id),
+ 'id_str' => (string) intval($pcontact_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'] : $network_name,
'protected' => false,
'followers_count' => intval($countfollowers),
'friends_count' => intval($countfriends),
+ 'listed_count' => 0,
'created_at' => api_date($uinfo[0]['created']),
'favourites_count' => intval($starred),
'utc_offset' => "0",
'time_zone' => 'UTC',
+ 'geo_enabled' => false,
+ 'verified' => true,
'statuses_count' => intval($countitms),
+ 'lang' => '',
+ 'contributors_enabled' => false,
+ 'is_translator' => false,
+ 'is_translation_enabled' => false,
'following' => (($uinfo[0]['rel'] == CONTACT_IS_FOLLOWER) OR ($uinfo[0]['rel'] == CONTACT_IS_FRIEND)),
- 'verified' => true,
+ 'follow_request_sent' => false,
'statusnet_blocking' => false,
'notifications' => false,
- //'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
+ //'statusnet_profile_url' => App::get_baseurl()."/contacts/".$uinfo[0]['cid'],
'statusnet_profile_url' => $uinfo[0]['url'],
'uid' => intval($uinfo[0]['uid']),
'cid' => intval($uinfo[0]['cid']),
*/
function api_item_get_user(&$a, $item) {
- // Make sure that there is an entry in the global contacts for author and owner
- get_gcontact_id(array("url" => $item['author-link'], "network" => $item['network'],
- "photo" => $item['author-avatar'], "name" => $item['author-name']));
-
- get_gcontact_id(array("url" => $item['owner-link'], "network" => $item['network'],
- "photo" => $item['owner-avatar'], "name" => $item['owner-name']));
+ $status_user = 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"]);
- $owner_user = api_get_user($a,$item["owner-link"]);
+ $owner_user = api_get_user($a, $item["owner-link"]);
return (array($status_user, $owner_user));
}
}
$data3 = array($root_element => $data2);
+
$ret = xml::from_array($data3, $xml, false, $namespaces);
return $ret;
}
* returns a 401 status code and an error message if not.
* http://developer.twitter.com/doc/get/account/verify_credentials
*/
- function api_account_verify_credentials(&$a, $type){
+ function api_account_verify_credentials($type){
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
unset($_REQUEST["user_id"]);
// - Adding last status
if (!$skip_status) {
- $user_info["status"] = api_status_show($a,"raw");
+ $user_info["status"] = api_status_show("raw");
if (!count($user_info["status"]))
unset($user_info["status"]);
else
}
/*Waitman Gobble Mod*/
- function api_statuses_mediap(&$a, $type) {
+ function api_statuses_mediap($type) {
+
+ $a = get_app();
+
if (api_user()===false) {
logger('api_statuses_update: no user');
throw new ForbiddenException();
item_post($a);
// this should output the last post (the one we just posted).
- return api_status_show($a,$type);
+ return api_status_show($type);
}
api_register_func('api/statuses/mediap','api_statuses_mediap', true, API_METHOD_POST);
/*Waitman Gobble Mod*/
- function api_statuses_update(&$a, $type) {
+ function api_statuses_update($type) {
+
+ $a = get_app();
+
if (api_user()===false) {
logger('api_statuses_update: no user');
throw new ForbiddenException();
if ($posts_day > $throttle_day) {
logger('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG);
- #die(api_error($a, $type, sprintf(t("Daily posting limit of %d posts reached. The post was rejected."), $throttle_day)));
+ #die(api_error($type, sprintf(t("Daily posting limit of %d posts reached. The post was rejected."), $throttle_day)));
throw new TooManyRequestsException(sprintf(t("Daily posting limit of %d posts reached. The post was rejected."), $throttle_day));
}
}
if ($posts_week > $throttle_week) {
logger('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG);
- #die(api_error($a, $type, sprintf(t("Weekly posting limit of %d posts reached. The post was rejected."), $throttle_week)));
+ #die(api_error($type, sprintf(t("Weekly posting limit of %d posts reached. The post was rejected."), $throttle_week)));
throw new TooManyRequestsException(sprintf(t("Weekly posting limit of %d posts reached. The post was rejected."), $throttle_week));
}
if ($posts_month > $throttle_month) {
logger('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG);
- #die(api_error($a, $type, sprintf(t("Monthly posting limit of %d posts reached. The post was rejected."), $throttle_month)));
+ #die(api_error($type, sprintf(t("Monthly posting limit of %d posts reached. The post was rejected."), $throttle_month)));
throw new TooManyRequestsException(sprintf(t("Monthly posting limit of %d posts reached. The post was rejected."), $throttle_month));
}
}
if ($r) {
$phototypes = Photo::supportedTypes();
$ext = $phototypes[$r[0]['type']];
- $_REQUEST['body'] .= "\n\n".'[url='.$a->get_baseurl().'/photos/'.$r[0]['nickname'].'/image/'.$r[0]['resource-id'].']';
- $_REQUEST['body'] .= '[img]'.$a->get_baseurl()."/photo/".$r[0]['resource-id']."-".$r[0]['scale'].".".$ext."[/img][/url]";
+ $_REQUEST['body'] .= "\n\n".'[url='.App::get_baseurl().'/photos/'.$r[0]['nickname'].'/image/'.$r[0]['resource-id'].']';
+ $_REQUEST['body'] .= '[img]'.App::get_baseurl()."/photo/".$r[0]['resource-id']."-".$r[0]['scale'].".".$ext."[/img][/url]";
}
}
item_post($a);
// this should output the last post (the one we just posted).
- return api_status_show($a,$type);
+ return api_status_show($type);
}
api_register_func('api/statuses/update','api_statuses_update', true, API_METHOD_POST);
api_register_func('api/statuses/update_with_media','api_statuses_update', true, API_METHOD_POST);
- function api_media_upload(&$a, $type) {
+ function api_media_upload($type) {
+
+ $a = get_app();
+
if (api_user()===false) {
logger('no user');
throw new ForbiddenException();
}
api_register_func('api/media/upload','api_media_upload', true, API_METHOD_POST);
- function api_status_show(&$a, $type){
+ function api_status_show($type){
+
+ $a = get_app();
+
$user_info = api_get_user($a);
logger('api_status_show: user_info: '.print_r($user_info, true), LOGGER_DEBUG);
$privacy_sql = "";
// get last public wall message
- $lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `i`.`author-link` AS `item-author`
- FROM `item`, `item` as `i`
+ $lastwall = q("SELECT `item`.*
+ FROM `item`
WHERE `item`.`contact-id` = %d AND `item`.`uid` = %d
AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s')))
- AND `i`.`id` = `item`.`parent`
- AND `item`.`type`!='activity' $privacy_sql
- ORDER BY `item`.`created` DESC
+ AND `item`.`type` != 'activity' $privacy_sql
+ ORDER BY `item`.`id` DESC
LIMIT 1",
intval($user_info['cid']),
intval(api_user()),
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 (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 `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($lastwall['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 = 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;
- }
+ $in_reply_to = api_in_reply_to($lastwall);
$converted = api_convert_item($lastwall);
'text' => $converted["text"],
'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
'truncated' => false,
- 'in_reply_to_status_id' => $in_reply_to_status_id,
- 'in_reply_to_status_id_str' => $in_reply_to_status_id_str,
- '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,
+ 'in_reply_to_status_id' => $in_reply_to['status_id'],
+ 'in_reply_to_status_id_str' => $in_reply_to['status_id_str'],
+ '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'],
'user' => $user_info,
$geo => NULL,
'coordinates' => "",
* The author's most recent status will be returned inline.
* http://developer.twitter.com/doc/get/users/show
*/
- function api_users_show(&$a, $type){
- $user_info = api_get_user($a);
+ function api_users_show($type){
+ $a = get_app();
+
+ $user_info = api_get_user($a);
$lastwall = q("SELECT `item`.*
FROM `item`
INNER JOIN `contact` ON `contact`.`id`=`item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s')))
AND `type`!='activity'
AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
- ORDER BY `created` DESC
+ ORDER BY `id` DESC
LIMIT 1",
intval(api_user()),
dbesc(ACTIVITY_POST),
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 = intval($lastwall['parent']);
- $in_reply_to_status_id_str = (string) intval($lastwall['parent']);
-
- $r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%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 = intval($r[0]['id']);
- $in_reply_to_user_id_str = (string) intval($r[0]['id']);
- }
- }
- }
+ $in_reply_to = api_in_reply_to($lastwall);
$converted = api_convert_item($lastwall);
'text' => $converted["text"],
'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,
+ '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' => 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,
+ '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' => $lastwall['starred'] ? true : false,
'statusnet_html' => $converted["html"],
api_register_func('api/users/show','api_users_show');
- function api_users_search(&$a, $type) {
+ function api_users_search($type) {
+
+ $a = get_app();
+
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
$userlist = array();
if (isset($_GET["q"])) {
- $r = q("SELECT id FROM `gcontact` WHERE `name`='%s'", dbesc($_GET["q"]));
+ $r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", dbesc($_GET["q"]));
if (!count($r))
- $r = q("SELECT `id` FROM `gcontact` WHERE `nick`='%s'", dbesc($_GET["q"]));
+ $r = q("SELECT `id` FROM `contact` WHERE `uid` = 0 AND `nick` = '%s'", dbesc($_GET["q"]));
if (count($r)) {
$k = 0;
* TODO: Optional parameters
* TODO: Add reply info
*/
- function api_statuses_home_timeline(&$a, $type){
+ function api_statuses_home_timeline($type){
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
unset($_REQUEST["user_id"]);
$user_info = api_get_user($a);
// get last newtork messages
-
// params
$count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
- function api_statuses_public_timeline(&$a, $type){
+ function api_statuses_public_timeline($type){
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
$user_info = api_get_user($a);
/**
*
*/
- function api_statuses_show(&$a, $type){
+ function api_statuses_show($type){
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
$user_info = api_get_user($a);
$sql_extra = '';
if ($conversation)
- $sql_extra .= " AND `item`.`parent` = %d ORDER BY `received` ASC ";
+ $sql_extra .= " AND `item`.`parent` = %d ORDER BY `id` ASC ";
else
$sql_extra .= " AND `item`.`id` = %d";
/**
*
*/
- function api_conversation_show(&$a, $type){
+ function api_conversation_show($type){
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
$user_info = api_get_user($a);
/**
*
*/
- function api_statuses_repeat(&$a, $type){
+ function api_statuses_repeat($type){
global $called_api;
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
$user_info = api_get_user($a);
// this should output the last post (the one we just posted).
$called_api = null;
- return(api_status_show($a,$type));
+ return(api_status_show($type));
}
api_register_func('api/statuses/retweet','api_statuses_repeat', true, API_METHOD_POST);
/**
*
*/
- function api_statuses_destroy(&$a, $type){
+ function api_statuses_destroy($type){
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
$user_info = api_get_user($a);
logger('API: api_statuses_destroy: '.$id);
- $ret = api_statuses_show($a, $type);
+ $ret = api_statuses_show($type);
drop_item($id, false);
* http://developer.twitter.com/doc/get/statuses/mentions
*
*/
- function api_statuses_mentions(&$a, $type){
+ function api_statuses_mentions($type){
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
unset($_REQUEST["user_id"]);
$start = $page*$count;
// Ugly code - should be changed
- $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
+ $myurl = App::get_baseurl() . '/profile/'. $a->user['nickname'];
$myurl = substr($myurl,strpos($myurl,'://')+3);
//$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
$myurl = str_replace('www.','',$myurl);
api_register_func('api/statuses/replies','api_statuses_mentions', true);
- function api_statuses_user_timeline(&$a, $type){
+ function api_statuses_user_timeline($type){
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
$user_info = api_get_user($a);
*
* api v1 : https://web.archive.org/web/20131019055350/https://dev.twitter.com/docs/api/1/post/favorites/create/%3Aid
*/
- function api_favorites_create_destroy(&$a, $type){
+ function api_favorites_create_destroy($type){
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
// for versioned api.
$user_info = api_get_user($a);
- $rets = api_format_items($item,$user_info, false, $type);
+ $rets = api_format_items($item, $user_info, false, $type);
$ret = $rets[0];
$data = array('status' => $ret);
api_register_func('api/favorites/create', 'api_favorites_create_destroy', true, API_METHOD_POST);
api_register_func('api/favorites/destroy', 'api_favorites_create_destroy', true, API_METHOD_DELETE);
- function api_favorites(&$a, $type){
+ function api_favorites($type){
global $called_api;
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
$called_api= array();
'recipient_screen_name' => $recipient['screen_name'],
'sender' => $sender,
'recipient' => $recipient,
+ 'title' => "",
+ 'friendica_seen' => $item['seen'],
+ 'friendica_parent_uri' => $item['parent-uri'],
);
// "uid" and "self" are only needed for some internal stuff, so remove it from here
return($entities);
}
function api_format_items_embeded_images(&$item, $text){
- $a = get_app();
$text = preg_replace_callback(
"|data:image/([^;]+)[^=]+=*|m",
- function($match) use ($a, $item) {
- return $a->get_baseurl()."/display/".$item['guid'];
+ function($match) use ($item) {
+ return App::get_baseurl()."/display/".$item['guid'];
},
$text);
return $text;
'attendno' => array(),
'attendmaybe' => array()
);
+
$items = q('SELECT * FROM item
WHERE uid=%d AND `thr-parent`="%s" AND visible AND NOT deleted',
intval($item['uid']),
dbesc($item['uri']));
+
foreach ($items as $i){
- builtin_activity_puller($i, $activities);
+ // not used as result should be structured like other user data
+ //builtin_activity_puller($i, $activities);
+
+ // get user data and add it to the array of the activity
+ $user = api_get_user($a, $i['author-link']);
+ switch($i['verb']) {
+ case ACTIVITY_LIKE:
+ $activities['like'][] = $user;
+ break;
+ case ACTIVITY_DISLIKE:
+ $activities['dislike'][] = $user;
+ break;
+ case ACTIVITY_ATTEND:
+ $activities['attendyes'][] = $user;
+ break;
+ case ACTIVITY_ATTENDNO:
+ $activities['attendno'][] = $user;
+ break;
+ case ACTIVITY_ATTENDMAYBE:
+ $activities['attendmaybe'][] = $user;
+ break;
+ default:
+ break;
+ }
}
if ($type == "xml") {
$xml_activities = array();
- foreach ($activities as $k => $v)
+ foreach ($activities as $k => $v) {
+ // change xml element from "like" to "friendica:like"
$xml_activities["friendica:".$k] = $v;
-
+ // add user data into xml output
+ $k_user = 0;
+ foreach ($v as $user)
+ $xml_activities["friendica:".$k][$k_user++.":user"] = $user;
+ }
$activities = $xml_activities;
}
- $res = array();
- $uri = $item['uri']."-l";
- foreach($activities as $k => $v) {
- $res[$k] = ( x($v,$uri) ? array_map("api_contactlink_to_array", $v[$uri]) : array() );
- }
+ return $activities;
- return $res;
+ }
+
+
+ /**
+ * @brief return data from profiles
+ *
+ * @param array $profile array containing data from db table 'profile'
+ * @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
+ * @return array
+ */
+ function api_format_items_profiles(&$profile = null, $type = "json") {
+ if ($profile != null) {
+ $profile = array('profile_id' => $profile['id'],
+ 'profile_name' => $profile['profile-name'],
+ 'is_default' => $profile['is-default'] ? true : false,
+ 'hide_friends'=> $profile['hide-friends'] ? true : false,
+ 'profile_photo' => $profile['photo'],
+ 'profile_thumb' => $profile['thumb'],
+ 'publish' => $profile['publish'] ? true : false,
+ 'net_publish' => $profile['net-publish'] ? true : false,
+ 'description' => $profile['pdesc'],
+ 'date_of_birth' => $profile['dob'],
+ 'address' => $profile['address'],
+ 'city' => $profile['locality'],
+ 'region' => $profile['region'],
+ 'postal_code' => $profile['postal-code'],
+ 'country' => $profile['country-name'],
+ 'hometown' => $profile['hometown'],
+ 'gender' => $profile['gender'],
+ 'marital' => $profile['marital'],
+ 'marital_with' => $profile['with'],
+ 'marital_since' => $profile['howlong'],
+ 'sexual' => $profile['sexual'],
+ 'politic' => $profile['politic'],
+ 'religion' => $profile['religion'],
+ 'public_keywords' => $profile['pub_keywords'],
+ 'private_keywords' => $profile['prv_keywords'],
+ 'likes' => bbcode(api_clean_plain_items($profile['likes']), false, false, 2, true),
+ 'dislikes' => bbcode(api_clean_plain_items($profile['dislikes']), false, false, 2, true),
+ 'about' => bbcode(api_clean_plain_items($profile['about']), false, false, 2, true),
+ 'music' => bbcode(api_clean_plain_items($profile['music']), false, false, 2, true),
+ 'book' => bbcode(api_clean_plain_items($profile['book']), false, false, 2, true),
+ 'tv' => bbcode(api_clean_plain_items($profile['tv']), false, false, 2, true),
+ 'film' => bbcode(api_clean_plain_items($profile['film']), false, false, 2, true),
+ 'interest' => bbcode(api_clean_plain_items($profile['interest']), false, false, 2, true),
+ 'romance' => bbcode(api_clean_plain_items($profile['romance']), false, false, 2, true),
+ 'work' => bbcode(api_clean_plain_items($profile['work']), false, false, 2, true),
+ 'education' => bbcode(api_clean_plain_items($profile['education']), false, false, 2, true),
+ 'social_networks' => bbcode(api_clean_plain_items($profile['contact']), false, false, 2, true),
+ 'homepage' => $profile['homepage'],
+ 'users' => null);
+ return $profile;
+ }
}
/**
function api_format_items($r,$user_info, $filter_user = false, $type = "json") {
$a = get_app();
+
$ret = Array();
foreach($r as $item) {
if ($filter_user AND ($status_user["id"] != $user_info["id"]))
continue;
- if ($item['thr-parent'] != $item['uri']) {
- $r = q("SELECT id FROM item WHERE uid=%d AND uri='%s' LIMIT 1",
- intval(api_user()),
- dbesc($item['thr-parent']));
- if ($r)
- $in_reply_to_status_id = intval($r[0]['id']);
- else
- $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()),
- intval($in_reply_to_status_id));
- if ($r) {
- $r = q("SELECT * FROM `gcontact` WHERE `url` = '%s'", dbesc(normalise_link($r[0]['author-link'])));
-
- 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 = 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;
- }
+ $in_reply_to = api_in_reply_to($item);
$converted = api_convert_item($item);
'text' => $converted["text"],
'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,
+ '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,
+ '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,
'user' => $status_user ,
}
- function api_account_rate_limit_status(&$a,$type) {
+ function api_account_rate_limit_status($type) {
if ($type == "xml")
$hash = array(
}
api_register_func('api/account/rate_limit_status','api_account_rate_limit_status',true);
- function api_help_test(&$a,$type) {
+ function api_help_test($type) {
if ($type == 'xml')
$ok = "true";
else
}
api_register_func('api/help/test','api_help_test',false);
- function api_lists(&$a,$type) {
+ function api_lists($type) {
$ret = array();
return api_format_data('lists', $type, array("lists_list" => $ret));
}
api_register_func('api/lists','api_lists',true);
- function api_lists_list(&$a,$type) {
+ function api_lists_list($type) {
$ret = array();
return api_format_data('lists', $type, array("lists_list" => $ret));
}
* This function is deprecated by Twitter
* returns: json, xml
**/
- function api_statuses_f(&$a, $type, $qtype) {
+ function api_statuses_f($type, $qtype) {
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
$user_info = api_get_user($a);
return array('user' => $ret);
}
- function api_statuses_friends(&$a, $type){
- $data = api_statuses_f($a,$type,"friends");
+ function api_statuses_friends($type){
+ $data = api_statuses_f($type, "friends");
if ($data===false) return false;
return api_format_data("users", $type, $data);
}
- function api_statuses_followers(&$a, $type){
- $data = api_statuses_f($a,$type,"followers");
+ function api_statuses_followers($type){
+ $data = api_statuses_f($type, "followers");
if ($data===false) return false;
return api_format_data("users", $type, $data);
}
- function api_statusnet_config(&$a,$type) {
+ function api_statusnet_config($type) {
+
+ $a = get_app();
+
$name = $a->config['sitename'];
$server = $a->get_hostname();
- $logo = $a->get_baseurl() . '/images/friendica-64.png';
+ $logo = App::get_baseurl() . '/images/friendica-64.png';
$email = $a->config['admin_email'];
$closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false');
$private = (($a->config['system']['block_public']) ? 'true' : 'false');
if($a->config['api_import_size'])
$texlimit = string($a->config['api_import_size']);
$ssl = (($a->config['system']['have_ssl']) ? 'true' : 'false');
- $sslserver = (($ssl === 'true') ? str_replace('http:','https:',$a->get_baseurl()) : '');
+ $sslserver = (($ssl === 'true') ? str_replace('http:','https:',App::get_baseurl()) : '');
$config = array(
'site' => array('name' => $name,'server' => $server, 'theme' => 'default', 'path' => '',
}
api_register_func('api/statusnet/config','api_statusnet_config',false);
- function api_statusnet_version(&$a,$type) {
+ function api_statusnet_version($type) {
// liar
$fake_statusnet_version = "0.9.7";
/**
* @todo use api_format_data() to return data
*/
- function api_ff_ids(&$a,$type,$qtype) {
+ function api_ff_ids($type,$qtype) {
+
+ $a = get_app();
+
if(! api_user()) throw new ForbiddenException();
$user_info = api_get_user($a);
$stringify_ids = (x($_REQUEST,'stringify_ids')?$_REQUEST['stringify_ids']:false);
- $r = q("SELECT `gcontact`.`id` FROM `contact`, `gcontact` WHERE `contact`.`nurl` = `gcontact`.`nurl` AND `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` $sql_extra",
+ $r = q("SELECT `pcontact`.`id` FROM `contact`
+ INNER JOIN `contact` AS `pcontact` ON `contact`.`nurl` = `pcontact`.`nurl` AND `pcontact`.`uid` = 0
+ WHERE `contact`.`uid` = %s AND NOT `contact`.`self`",
intval(api_user())
);
return api_format_data("ids", $type, array('id' => $ids));
}
- function api_friends_ids(&$a,$type) {
- return api_ff_ids($a,$type,'friends');
+ function api_friends_ids($type) {
+ return api_ff_ids($type,'friends');
}
- function api_followers_ids(&$a,$type) {
- return api_ff_ids($a,$type,'followers');
+ function api_followers_ids($type) {
+ return api_ff_ids($type,'followers');
}
api_register_func('api/friends/ids','api_friends_ids',true);
api_register_func('api/followers/ids','api_followers_ids',true);
- function api_direct_messages_new(&$a, $type) {
+ function api_direct_messages_new($type) {
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
if (!x($_POST, "text") OR (!x($_POST,"screen_name") AND !x($_POST,"user_id"))) return;
}
api_register_func('api/direct_messages/new','api_direct_messages_new',true, API_METHOD_POST);
- function api_direct_messages_box(&$a, $type, $box) {
+
+ /**
+ * @brief delete a direct_message from mail table through api
+ *
+ * @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
+ * @return string
+ */
+ function api_direct_messages_destroy($type){
+ $a = get_app();
+
+ if (api_user()===false) throw new ForbiddenException();
+
+ // params
+ $user_info = api_get_user($a);
+ //required
+ $id = (x($_REQUEST,'id') ? $_REQUEST['id'] : 0);
+ // optional
+ $parenturi = (x($_REQUEST, 'friendica_parenturi') ? $_REQUEST['friendica_parenturi'] : "");
+ $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false");
+ /// @todo optional parameter 'include_entities' from Twitter API not yet implemented
+
+ $uid = $user_info['uid'];
+ // error if no id or parenturi specified (for clients posting parent-uri as well)
+ if ($verbose == "true") {
+ if ($id == 0 || $parenturi == "") {
+ $answer = array('result' => 'error', 'message' => 'message id or parenturi not specified');
+ return api_format_data("direct_messages_delete", $type, array('$result' => $answer));
+ }
+ }
+
+ // BadRequestException if no id specified (for clients using Twitter API)
+ if ($id == 0) throw new BadRequestException('Message id not specified');
+
+ // add parent-uri to sql command if specified by calling app
+ $sql_extra = ($parenturi != "" ? " AND `parent-uri` = '" . dbesc($parenturi) . "'" : "");
+
+ // get data of the specified message id
+ $r = q("SELECT `id` FROM `mail` WHERE `uid` = %d AND `id` = %d" . $sql_extra,
+ intval($uid),
+ intval($id));
+
+ // error message if specified id is not in database
+ if (!dbm::is_result($r)) {
+ if ($verbose == "true") {
+ $answer = array('result' => 'error', 'message' => 'message id not in database');
+ return api_format_data("direct_messages_delete", $type, array('$result' => $answer));
+ }
+ /// @todo BadRequestException ok for Twitter API clients?
+ throw new BadRequestException('message id not in database');
+ }
+
+ // delete message
+ $result = q("DELETE FROM `mail` WHERE `uid` = %d AND `id` = %d" . $sql_extra,
+ intval($uid),
+ intval($id));
+
+ if ($verbose == "true") {
+ if ($result) {
+ // return success
+ $answer = array('result' => 'ok', 'message' => 'message deleted');
+ return api_format_data("direct_message_delete", $type, array('$result' => $answer));
+ }
+ else {
+ $answer = array('result' => 'error', 'message' => 'unknown error');
+ return api_format_data("direct_messages_delete", $type, array('$result' => $answer));
+ }
+ }
+ /// @todo return JSON data like Twitter API not yet implemented
+
+ }
+ api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy', true, API_METHOD_DELETE);
+
+
+ function api_direct_messages_box($type, $box, $verbose) {
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
// params
unset($_GET["screen_name"]);
$user_info = api_get_user($a);
- //$profile_url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
$profile_url = $user_info["url"];
intval($since_id),
intval($start), intval($count)
);
-
+ if ($verbose == "true") {
+ // stop execution and return error message if no mails available
+ if($r == null) {
+ $answer = array('result' => 'error', 'message' => 'no mails available');
+ return api_format_data("direct_messages_all", $type, array('$result' => $answer));
+ }
+ }
$ret = Array();
foreach($r as $item) {
}
- function api_direct_messages_sentbox(&$a, $type){
- return api_direct_messages_box($a, $type, "sentbox");
+ function api_direct_messages_sentbox($type){
+ $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false");
+ return api_direct_messages_box($type, "sentbox", $verbose);
}
- function api_direct_messages_inbox(&$a, $type){
- return api_direct_messages_box($a, $type, "inbox");
+ function api_direct_messages_inbox($type){
+ $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false");
+ return api_direct_messages_box($type, "inbox", $verbose);
}
- function api_direct_messages_all(&$a, $type){
- return api_direct_messages_box($a, $type, "all");
+ function api_direct_messages_all($type){
+ $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false");
+ return api_direct_messages_box($type, "all", $verbose);
}
- function api_direct_messages_conversation(&$a, $type){
- return api_direct_messages_box($a, $type, "conversation");
+ function api_direct_messages_conversation($type){
+ $verbose = (x($_GET,'friendica_verbose')?strtolower($_GET['friendica_verbose']):"false");
+ return api_direct_messages_box($type, "conversation", $verbose);
}
api_register_func('api/direct_messages/conversation','api_direct_messages_conversation',true);
api_register_func('api/direct_messages/all','api_direct_messages_all',true);
- function api_oauth_request_token(&$a, $type){
+ function api_oauth_request_token($type){
try{
$oauth = new FKOAuth1();
$r = $oauth->fetch_request_token(OAuthRequest::from_request());
echo $r;
killme();
}
- function api_oauth_access_token(&$a, $type){
+ function api_oauth_access_token($type){
try{
$oauth = new FKOAuth1();
$r = $oauth->fetch_access_token(OAuthRequest::from_request());
api_register_func('api/oauth/access_token', 'api_oauth_access_token', false);
- function api_fr_photos_list(&$a,$type) {
+ function api_fr_photos_list($type) {
if (api_user()===false) throw new ForbiddenException();
$r = q("select `resource-id`, max(scale) as scale, album, filename, type from photo
where uid = %d and album != 'Contact Photos' group by `resource-id`",
$photo['album'] = $rr['album'];
$photo['filename'] = $rr['filename'];
$photo['type'] = $rr['type'];
- $thumb = $a->get_baseurl()."/photo/".$rr['resource-id']."-".$rr['scale'].".".$typetoext[$rr['type']];
+ $thumb = App::get_baseurl()."/photo/".$rr['resource-id']."-".$rr['scale'].".".$typetoext[$rr['type']];
if ($type == "xml")
$data['photo'][] = array("@attributes" => $photo, "1" => $thumb);
return api_format_data("photos", $type, $data);
}
- function api_fr_photo_detail(&$a,$type) {
+ function api_fr_photo_detail($type) {
if (api_user()===false) throw new ForbiddenException();
if(!x($_REQUEST,'photo_id')) throw new BadRequestException("No photo id.");
for ($k=intval($data['photo']['minscale']); $k<=intval($data['photo']['maxscale']); $k++)
$data['photo']['links'][$k.":link"]["@attributes"] = array("type" => $data['photo']['type'],
"scale" => $k,
- "href" => $a->get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']]);
+ "href" => App::get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']]);
} else {
$data['photo']['link'] = array();
for ($k=intval($data['photo']['minscale']); $k<=intval($data['photo']['maxscale']); $k++) {
- $data['photo']['link'][$k] = $a->get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']];
+ $data['photo']['link'][$k] = App::get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']];
}
}
unset($data['photo']['resource-id']);
* c_url: url of remote contact to auth to
* url: string, url to redirect after auth
*/
- function api_friendica_remoteauth(&$a) {
+ function api_friendica_remoteauth() {
$url = ((x($_GET,'url')) ? $_GET['url'] : '');
$c_url = ((x($_GET,'c_url')) ? $_GET['c_url'] : '');
}
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
- // Skip if there is no shared message in there
- // we already checked this in diaspora::is_reshare()
- // but better one more than one less...
- if ($body == $attributes)
+ // Skip if there is no shared message in there
+ // we already checked this in diaspora::is_reshare()
+ // but better one more than one less...
+ if ($body == $attributes)
return false;
$nick = "";
- $r = q("SELECT `nick` FROM `gcontact` WHERE `nurl` = '%s'",
+ $r = q("SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
dbesc(normalise_link($profile)));
if ($r)
$nick = $r[0]["nick"];
return(false);
}
+ function api_in_reply_to($item) {
+ $in_reply_to = array();
+
+ $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 (($item['thr-parent'] != $item['uri']) AND (intval($item['parent']) != intval($item['id']))) {
+ $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
+ intval($item['uid']),
+ dbesc($item['thr-parent']));
+
+ if (dbm::is_result($r)) {
+ $in_reply_to['status_id'] = intval($r[0]['id']);
+ } else {
+ $in_reply_to['status_id'] = intval($item['parent']);
+ }
+
+ $in_reply_to['status_id_str'] = (string) intval($in_reply_to['status_id']);
+
+ $r = q("SELECT `contact`.`nick`, `contact`.`name`, `contact`.`id`, `contact`.`url` FROM item
+ STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`author-id`
+ WHERE `item`.`id` = %d LIMIT 1",
+ intval($in_reply_to['status_id'])
+ );
+
+ if (dbm::is_result($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'] = 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($item['id'])) {
+ logger('this message should never appear: id: '.$item['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;
+ }
+ }
+
+ return $in_reply_to;
+ }
+
function api_clean_plain_items($Text) {
$include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false");
}
// return all or a specified group of the user with the containing contacts
- function api_friendica_group_show(&$a, $type) {
+ function api_friendica_group_show($type) {
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
// params
// delete the specified group of the user
- function api_friendica_group_delete(&$a, $type) {
+ function api_friendica_group_delete($type) {
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
// params
// create the specified group with the posted array of contacts
- function api_friendica_group_create(&$a, $type) {
+ function api_friendica_group_create($type) {
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
// params
// update the specified group with the posted array of contacts
- function api_friendica_group_update(&$a, $type) {
+ function api_friendica_group_update($type) {
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
// params
api_register_func('api/friendica/group_update', 'api_friendica_group_update', true, API_METHOD_POST);
- function api_friendica_activity(&$a, $type) {
+ function api_friendica_activity($type) {
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
$verb = strtolower($a->argv[3]);
$verb = preg_replace("|\..*$|", "", $verb);
/**
* @brief Returns notifications
*
- * @param App $a
* @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
* @return string
*/
- function api_friendica_notification(&$a, $type) {
+ function api_friendica_notification($type) {
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
if ($a->argc!==3) throw new BadRequestException("Invalid argument count");
$nm = new NotificationsManager();
*
* POST request with 'id' param as notification id
*
- * @param App $a
* @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
* @return string
*/
- function api_friendica_notification_seen(&$a, $type){
+ function api_friendica_notification_seen($type){
+
+ $a = get_app();
+
if (api_user()===false) throw new ForbiddenException();
if ($a->argc!==4) throw new BadRequestException("Invalid argument count");
api_register_func('api/friendica/notification', 'api_friendica_notification', true, API_METHOD_GET);
+ /**
+ * @brief update a direct_message to seen state
+ *
+ * @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
+ * @return string (success result=ok, error result=error with error message)
+ */
+ function api_friendica_direct_messages_setseen($type){
+ $a = get_app();
+ if (api_user()===false) throw new ForbiddenException();
+
+ // params
+ $user_info = api_get_user($a);
+ $uid = $user_info['uid'];
+ $id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0);
+
+ // return error if id is zero
+ if ($id == "") {
+ $answer = array('result' => 'error', 'message' => 'message id not specified');
+ return api_format_data("direct_messages_setseen", $type, array('$result' => $answer));
+ }
+
+ // get data of the specified message id
+ $r = q("SELECT `id` FROM `mail` WHERE `id` = %d AND `uid` = %d",
+ intval($id),
+ intval($uid));
+ // error message if specified id is not in database
+ if (!dbm::is_result($r)) {
+ $answer = array('result' => 'error', 'message' => 'message id not in database');
+ return api_format_data("direct_messages_setseen", $type, array('$result' => $answer));
+ }
+
+ // update seen indicator
+ $result = q("UPDATE `mail` SET `seen` = 1 WHERE `id` = %d AND `uid` = %d",
+ intval($id),
+ intval($uid));
+
+ if ($result) {
+ // return success
+ $answer = array('result' => 'ok', 'message' => 'message set to seen');
+ return api_format_data("direct_message_setseen", $type, array('$result' => $answer));
+ } else {
+ $answer = array('result' => 'error', 'message' => 'unknown error');
+ return api_format_data("direct_messages_setseen", $type, array('$result' => $answer));
+ }
+ }
+ api_register_func('api/friendica/direct_messages_setseen', 'api_friendica_direct_messages_setseen', true);
+
+
+
+
+ /**
+ * @brief search for direct_messages containing a searchstring through api
+ *
+ * @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
+ * @return string (success: success=true if found and search_result contains found messages
+ * success=false if nothing was found, search_result='nothing found',
+ * error: result=error with error message)
+ */
+ function api_friendica_direct_messages_search($type){
+ $a = get_app();
+
+ if (api_user()===false) throw new ForbiddenException();
+
+ // params
+ $user_info = api_get_user($a);
+ $searchstring = (x($_REQUEST,'searchstring') ? $_REQUEST['searchstring'] : "");
+ $uid = $user_info['uid'];
+
+ // error if no searchstring specified
+ if ($searchstring == "") {
+ $answer = array('result' => 'error', 'message' => 'searchstring not specified');
+ return api_format_data("direct_messages_search", $type, array('$result' => $answer));
+ }
+
+ // get data for the specified searchstring
+ $r = q("SELECT `mail`.*, `contact`.`nurl` AS `contact-url` FROM `mail`,`contact` WHERE `mail`.`contact-id` = `contact`.`id` AND `mail`.`uid`=%d AND `body` LIKE '%s' ORDER BY `mail`.`id` DESC",
+ intval($uid),
+ dbesc('%'.$searchstring.'%')
+ );
+
+ $profile_url = $user_info["url"];
+ // message if nothing was found
+ if (count($r) == 0)
+ $success = array('success' => false, 'search_results' => 'nothing found');
+ else {
+ $ret = Array();
+ foreach($r as $item) {
+ if ($box == "inbox" || $item['from-url'] != $profile_url){
+ $recipient = $user_info;
+ $sender = api_get_user($a,normalise_link($item['contact-url']));
+ }
+ elseif ($box == "sentbox" || $item['from-url'] == $profile_url){
+ $recipient = api_get_user($a,normalise_link($item['contact-url']));
+ $sender = $user_info;
+ }
+ $ret[]=api_format_messages($item, $recipient, $sender);
+ }
+ $success = array('success' => true, 'search_results' => $ret);
+ }
+
+ return api_format_data("direct_message_search", $type, array('$result' => $success));
+ }
+ api_register_func('api/friendica/direct_messages_search', 'api_friendica_direct_messages_search', true);
+
+
+ /**
+ * @brief return data of all the profiles a user has to the client
+ *
+ * @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
+ * @return string
+ */
+ function api_friendica_profile_show($type){
+ $a = get_app();
+
+ if (api_user()===false) throw new ForbiddenException();
+
+ // input params
+ $profileid = (x($_REQUEST,'profile_id') ? $_REQUEST['profile_id'] : 0);
+
+ // retrieve general information about profiles for user
+ $multi_profiles = feature_enabled(api_user(),'multi_profiles');
+ $directory = get_config('system', 'directory');
+
+// get data of the specified profile id or all profiles of the user if not specified
+ if ($profileid != 0) {
+ $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d",
+ intval(api_user()),
+ intval($profileid));
+ // error message if specified gid is not in database
+ if (count($r) == 0)
+ throw new BadRequestException("profile_id not available");
+ }
+ else
+ $r = q("SELECT * FROM `profile` WHERE `uid` = %d",
+ intval(api_user()));
+
+ // loop through all returned profiles and retrieve data and users
+ $k = 0;
+ foreach ($r as $rr) {
+ $profile = api_format_items_profiles($rr, $type);
+
+ // select all users from contact table, loop and prepare standard return for user data
+ $users = array();
+ $r = q("SELECT `id`, `nurl` FROM `contact` WHERE `uid`= %d AND `profile-id` = %d",
+ intval(api_user()),
+ intval($rr['profile_id']));
+
+ foreach ($r as $rr) {
+ $user = api_get_user($a, $rr['nurl']);
+ ($type == "xml") ? $users[$k++.":user"] = $user : $users[] = $user;
+ }
+ $profile['users'] = $users;
+
+ // add prepared profile data to array for final return
+ if ($type == "xml") {
+ $profiles[$k++.":profile"] = $profile;
+ } else {
+ $profiles[] = $profile;
+ }
+ }
+
+ // return settings, authenticated user and profiles data
+ $result = array('multi_profiles' => $multi_profiles ? true : false,
+ 'global_dir' => $directory,
+ 'friendica_owner' => api_get_user($a, intval(api_user())),
+ 'profiles' => $profiles);
+ return api_format_data("friendica_profiles", $type, array('$result' => $result));
+ }
+ api_register_func('api/friendica/profile/show', 'api_friendica_profile_show', true, API_METHOD_GET);
+
/*
To.Do:
[pagename] => api/1.1/statuses/lookup.json
account/update_profile_image
blocks/create
blocks/destroy
+friendica/profile/update
+friendica/profile/create
+friendica/profile/delete
Not implemented in status.net:
statuses/retweeted_to_me