require_once("include/conversation.php");
require_once("include/oauth.php");
require_once("include/html2plain.php");
+ require_once("mod/share.php");
+ require_once("include/Photo.php");
+ require_once("mod/item.php");
+ require_once('include/security.php');
+ require_once('include/contact_selectors.php');
+ require_once('include/html2bbcode.php');
+ require_once('mod/wall_upload.php');
+ require_once("mod/proxy.php");
+ require_once("include/message.php");
+
+
/*
* Twitter-Like API
*
$password = $_SERVER['PHP_AUTH_PW'];
$encrypted = hash('whirlpool',trim($password));
+ // allow "user@server" login (but ignore 'server' part)
+ $at=strstr($user, "@", true);
+ if ( $at ) $user=$at;
/**
* next code from mod/auth.php. needs better solution
$record = null;
$addon_auth = array(
- 'username' => trim($user),
+ 'username' => trim($user),
'password' => trim($password),
'authenticated' => 0,
'user_record' => null
die('This api requires login');
}
- require_once('include/security.php');
authenticate_success($record); $_SESSION["allow_api"] = true;
call_hooks('logged_in', $a->user);
if (strpos($a->query_string, ".atom")>0) $type="atom";
if (strpos($a->query_string, ".as")>0) $type="as";
+ $stamp = microtime(true);
$r = call_user_func($info['func'], $a, $type);
+ $duration = (float)(microtime(true)-$stamp);
+ logger("API call duration: ".round($duration, 2)."\t".$a->query_string, LOGGER_DEBUG);
+
if ($r===false) return;
switch($type){
* Unique contact to contact url.
*/
function api_unique_id_to_url($id){
- $r = q("SELECT url FROM unique_contacts WHERE id=%d LIMIT 1",
+ $r = q("SELECT `url` FROM `unique_contacts` WHERE `id`=%d LIMIT 1",
intval($id));
if ($r)
return ($r[0]["url"]);
$r = array();
if ($url != "")
- $r = q("SELECT * FROM unique_contacts WHERE url='%s' LIMIT 1", $url);
+ $r = q("SELECT * FROM `unique_contacts` WHERE `url`='%s' LIMIT 1", $url);
elseif ($nick != "")
- $r = q("SELECT * FROM unique_contacts WHERE nick='%s' LIMIT 1", $nick);
+ $r = q("SELECT * FROM `unique_contacts` WHERE `nick`='%s' LIMIT 1", $nick);
if ($r) {
// If no nick where given, extract it from the address
'screen_name' => (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']),
'location' => NULL,
'description' => NULL,
- 'profile_image_url' => $r[0]["avatar"],
- 'profile_image_url_https' => $r[0]["avatar"],
'url' => $r[0]["url"],
'protected' => false,
'followers_count' => 0,
'friends_count' => 0,
+ 'listed_count' => 0,
'created_at' => api_date(0),
'favourites_count' => 0,
'utc_offset' => 0,
'time_zone' => 'UTC',
+ 'geo_enabled' => false,
+ 'verified' => false,
'statuses_count' => 0,
+ 'lang' => '',
+ 'contributors_enabled' => false,
+ 'is_translator' => false,
+ 'is_translation_enabled' => false,
+ 'profile_image_url' => $r[0]["avatar"],
+ 'profile_image_url_https' => $r[0]["avatar"],
'following' => false,
- 'verified' => false,
+ 'follow_request_sent' => false,
+ 'notifications' => false,
'statusnet_blocking' => false,
'notifications' => false,
'statusnet_profile_url' => $r[0]["url"],
}
// Fetching unique id
- $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", dbesc(normalise_link($uinfo[0]['url'])));
+ $r = q("SELECT id FROM `unique_contacts` WHERE `url`='%s' LIMIT 1", dbesc(normalise_link($uinfo[0]['url'])));
// If not there, then add it
if (count($r) == 0) {
- q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
+ q("INSERT INTO `unique_contacts` (`url`, `name`, `nick`, `avatar`) VALUES ('%s', '%s', '%s', '%s')",
dbesc(normalise_link($uinfo[0]['url'])), dbesc($uinfo[0]['name']),dbesc($uinfo[0]['nick']), dbesc($uinfo[0]['micro']));
- $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", dbesc(normalise_link($uinfo[0]['url'])));
+ $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']);
+ $network_name = network_to_name($uinfo[0]['network'], $uinfo[0]['url']);
$ret = Array(
'id' => intval($r[0]['id']),
'verified' => true,
'statusnet_blocking' => false,
'notifications' => false,
- 'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
+ //'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
+ 'statusnet_profile_url' => $uinfo[0]['url'],
'uid' => intval($uinfo[0]['uid']),
'cid' => intval($uinfo[0]['cid']),
'self' => $uinfo[0]['self'],
function api_item_get_user(&$a, $item) {
- $author = q("SELECT * FROM unique_contacts WHERE url='%s' LIMIT 1",
+ $author = q("SELECT * FROM `unique_contacts` WHERE `url`='%s' LIMIT 1",
dbesc(normalise_link($item['author-link'])));
if (count($author) == 0) {
- q("INSERT INTO unique_contacts (url, name, avatar) VALUES ('%s', '%s', '%s')",
- dbesc(normalise_link($item["author-link"])), dbesc($item["author-name"]), dbesc($item["author-avatar"]));
+ q("INSERT INTO `unique_contacts` (`url`, `name`, `avatar`) VALUES ('%s', '%s', '%s')",
+ dbesc(normalise_link($item["author-link"])), dbesc($item["author-name"]), dbesc($item["author-avatar"]));
- $author = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
+ $author = q("SELECT `id` FROM `unique_contacts` WHERE `url`='%s' LIMIT 1",
dbesc(normalise_link($item['author-link'])));
} else if ($item["author-link"].$item["author-name"] != $author[0]["url"].$author[0]["name"]) {
- q("UPDATE unique_contacts SET name = '%s', avatar = '%s' WHERE url = '%s'",
- dbesc($item["author-name"]), dbesc($item["author-avatar"]), dbesc(normalise_link($item["author-link"])));
+ $r = q("SELECT `id` FROM `unique_contacts` WHERE `name` = '%s' AND `avatar` = '%s' AND url = '%s'",
+ dbesc($item["author-name"]), dbesc($item["author-avatar"]),
+ dbesc(normalise_link($item["author-link"])));
+
+ if (!$r)
+ q("UPDATE `unique_contacts` SET `name` = '%s', `avatar` = '%s' WHERE `url` = '%s'",
+ dbesc($item["author-name"]), dbesc($item["author-avatar"]),
+ dbesc(normalise_link($item["author-link"])));
}
- $owner = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
+ $owner = q("SELECT `id` FROM `unique_contacts` WHERE `url`='%s' LIMIT 1",
dbesc(normalise_link($item['owner-link'])));
if (count($owner) == 0) {
- q("INSERT INTO unique_contacts (url, name, avatar) VALUES ('%s', '%s', '%s')",
- dbesc(normalise_link($item["owner-link"])), dbesc($item["owner-name"]), dbesc($item["owner-avatar"]));
+ q("INSERT INTO `unique_contacts` (`url`, `name`, `avatar`) VALUES ('%s', '%s', '%s')",
+ dbesc(normalise_link($item["owner-link"])), dbesc($item["owner-name"]), dbesc($item["owner-avatar"]));
- $owner = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
+ $owner = q("SELECT `id` FROM `unique_contacts` WHERE `url`='%s' LIMIT 1",
dbesc(normalise_link($item['owner-link'])));
} else if ($item["owner-link"].$item["owner-name"] != $owner[0]["url"].$owner[0]["name"]) {
- q("UPDATE unique_contacts SET name = '%s', avatar = '%s' WHERE url = '%s'",
- dbesc($item["owner-name"]), dbesc($item["owner-avatar"]), dbesc(normalise_link($item["owner-link"])));
+ $r = q("SELECT `id` FROM `unique_contacts` WHERE `name` = '%s' AND `avatar` = '%s' AND url = '%s'",
+ dbesc($item["owner-name"]), dbesc($item["owner-avatar"]),
+ dbesc(normalise_link($item["owner-link"])));
+
+ if (!$r)
+ q("UPDATE `unique_contacts` SET `name` = '%s', `avatar` = '%s' WHERE `url` = '%s'",
+ dbesc($item["owner-name"]), dbesc($item["owner-avatar"]),
+ dbesc(normalise_link($item["owner-link"])));
}
// Comments in threads may appear as wall-to-wall postings.
$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)) {
+
+ require_once('library/HTMLPurifier.auto.php');
+
$txt = html2bb_video($txt);
$config = HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null);
$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');
$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).
// logger('api_post: ' . print_r($_POST,true));
if(requestdata('htmlstatus')) {
- require_once('library/HTMLPurifier.auto.php');
- require_once('include/html2bbcode.php');
-
$txt = requestdata('htmlstatus');
if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) {
+ require_once('library/HTMLPurifier.auto.php');
+
$txt = html2bb_video($txt);
$config = HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null);
-
$purifier = new HTMLPurifier($config);
$txt = $purifier->purify($txt);
$_REQUEST['title'] = requestdata('title');
$parent = requestdata('in_reply_to_status_id');
+
+ // Twidere sends "-1" if it is no reply ...
+ if ($parent == -1)
+ $parent = "";
+
if(ctype_digit($parent))
$_REQUEST['parent'] = $parent;
else
if(x($_FILES,'media')) {
// upload the image if we have one
$_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
- require_once('mod/wall_upload.php');
$media = wall_upload_post($a);
if(strlen($media)>0)
$_REQUEST['body'] .= "\n\n".$media;
}
+ // To-Do: Multiple IDs
+ if (requestdata('media_ids')) {
+ $r = q("SELECT `resource-id`, `scale`, `nickname`, `type` FROM `photo` INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = %d) AND `scale` > 0 AND `photo`.`uid` = %d ORDER BY `photo`.`width` DESC LIMIT 1",
+ intval(requestdata('media_ids')), api_user());
+ 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]";
+ }
+ }
+
// set this so that the item_post() function is quiet and doesn't redirect or emit json
$_REQUEST['api_source'] = true;
// call out normal post function
- require_once('mod/item.php');
item_post($a);
// this should output the last post (the one we just posted).
api_register_func('api/statuses/update_with_media','api_statuses_update', true);
+ function api_media_upload(&$a, $type) {
+ if (api_user()===false) {
+ logger('no user');
+ return false;
+ }
+
+ $user_info = api_get_user($a);
+
+ if(!x($_FILES,'media')) {
+ // Output error
+ return false;
+ }
+
+ $media = wall_upload_post($a, false);
+ if(!$media) {
+ // Output error
+ return false;
+ }
+
+ $returndata = array();
+ $returndata["media_id"] = $media["id"];
+ $returndata["media_id_string"] = (string)$media["id"];
+ $returndata["size"] = $media["size"];
+ $returndata["image"] = array("w" => $media["width"],
+ "h" => $media["height"],
+ "image_type" => $media["type"]);
+
+ logger("Media uploaded: ".print_r($returndata, true), LOGGER_DEBUG);
+
+ return array("media" => $returndata);
+ }
+
+ api_register_func('api/media/upload','api_media_upload', true);
+
function api_status_show(&$a, $type){
$user_info = api_get_user($a);
logger('api_status_show: user_info: '.print_r($user_info, true), LOGGER_DEBUG);
+ if ($type == "raw")
+ $privacy_sql = "AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''";
+ else
+ $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`
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'
- AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
+ AND `item`.`type`!='activity' $privacy_sql
ORDER BY `item`.`created` DESC
LIMIT 1",
intval($user_info['cid']),
$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'])));
+ $r = q("SELECT * FROM `unique_contacts` WHERE `url` = '%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 = NULL;
}
- $converted = api_convert_item($item);
+ $converted = api_convert_item($lastwall);
$status_info = array(
+ 'created_at' => api_date($lastwall['created']),
+ 'id' => intval($lastwall['id']),
+ 'id_str' => (string) $lastwall['id'],
'text' => $converted["text"],
+ 'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
'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' => 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,
+ 'user' => $user_info,
'geo' => NULL,
+ 'coordinates' => "",
+ 'place' => "",
+ 'contributors' => "",
+ 'is_quote_status' => false,
+ 'retweet_count' => 0,
+ 'favorite_count' => 0,
'favorited' => $lastwall['starred'] ? true : false,
- 'user' => $user_info,
+ 'retweeted' => false,
+ 'possibly_sensitive' => false,
+ 'lang' => "",
'statusnet_html' => $converted["html"],
'statusnet_conversation_id' => $lastwall['parent'],
);
$status_info["entities"] = $converted["entities"];
if (($lastwall['item_network'] != "") AND ($status["source"] == 'web'))
- $status_info["source"] = network_to_name($lastwall['item_network']);
- elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network']) != $status_info["source"]))
- $status_info["source"] = trim($status_info["source"].' ('.network_to_name($lastwall['item_network']).')');
+ $status_info["source"] = network_to_name($lastwall['item_network'], $user_info['url']);
+ elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $status_info["source"]))
+ $status_info["source"] = trim($status_info["source"].' ('.network_to_name($lastwall['item_network'], $user_info['url']).')');
// "uid" and "self" are only needed for some internal stuff, so remove it from here
unset($status_info["user"]["uid"]);
unset($status_info["user"]["self"]);
}
+ logger('status_info: '.print_r($status_info, true), LOGGER_DEBUG);
+
if ($type == "raw")
return($status_info);
$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'])));
+ $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"]);
}
}
- $converted = api_convert_item($item);
+ $converted = api_convert_item($lastwall);
$user_info['status'] = array(
'text' => $converted["text"],
$user_info["status"]["entities"] = $converted["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"]))
- $user_info["status"]["source"] = trim($user_info["status"]["source"].' ('.network_to_name($lastwall['item_network']).')');
+ $user_info["status"]["source"] = network_to_name($lastwall['item_network'], $user_info['url']);
+ if (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $user_info["status"]["source"]))
+ $user_info["status"]["source"] = trim($user_info["status"]["source"].' ('.network_to_name($lastwall['item_network'], $user_info['url']).')');
}
$userlist = array();
if (isset($_GET["q"])) {
- $r = q("SELECT id FROM unique_contacts WHERE name='%s'", dbesc($_GET["q"]));
+ $r = q("SELECT id FROM `unique_contacts` WHERE `name`='%s'", dbesc($_GET["q"]));
if (!count($r))
- $r = q("SELECT id FROM unique_contacts WHERE nick='%s'", dbesc($_GET["q"]));
+ $r = q("SELECT `id` FROM `unique_contacts` WHERE `nick`='%s'", dbesc($_GET["q"]));
if (count($r)) {
foreach ($r AS $user) {
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`,
+ $r = q("SELECT STRAIGHT_JOIN `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`
$ret = api_format_items($r,$user_info);
- // We aren't going to try to figure out at the item, group, and page
- // level which items you've seen and which you haven't. If you're looking
- // at the network timeline just mark everything seen.
+ // Set all posts from the query above to seen
+ $idarray = array();
+ foreach ($r AS $item)
+ $idarray[] = intval($item["id"]);
- $r = q("UPDATE `item` SET `unseen` = 0
- WHERE `unseen` = 1 AND `uid` = %d",
- //intval($user_info['uid'])
- intval(api_user())
- );
+ $idlist = implode(",", $idarray);
+
+ if ($idlist != "")
+ $r = q("UPDATE `item` SET `unseen` = 0 WHERE `unseen` AND `id` IN (%s)", $idlist);
$data = array('$statuses' => $ret);
logger('API: api_conversation_show: '.$id);
+ $r = q("SELECT `parent` FROM `item` WHERE `id` = %d", intval($id));
+ if ($r)
+ $id = $r[0]["parent"];
+
$sql_extra = '';
if ($max_id > 0)
$pos = strpos($r[0]['body'], "[share");
$post = substr($r[0]['body'], $pos);
} else {
- $post = "[share author='".str_replace("'", "'", $r[0]['author-name']).
- "' profile='".$r[0]['author-link'].
- "' avatar='".$r[0]['author-avatar'].
- "' link='".$r[0]['plink']."']";
+ $post = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
+
$post .= $r[0]['body'];
$post .= "[/share]";
}
if (!x($_REQUEST, "source"))
$_REQUEST["source"] = api_source();
- require_once('mod/item.php');
item_post($a);
}
$ret = api_statuses_show($a, $type);
- require_once('include/items.php');
drop_item($id, false);
return($ret);
if (!$ret)
return false;
- require_once("include/Photo.php");
-
$attachments = array();
foreach ($images[1] AS $image) {
$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);
$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();
intval(api_user()),
intval($in_reply_to_status_id));
if ($r) {
- $r = q("SELECT * FROM unique_contacts WHERE `url` = '%s'", dbesc(normalise_link($r[0]['author-link'])));
+ $r = q("SELECT * FROM `unique_contacts` WHERE `url` = '%s'", dbesc(normalise_link($r[0]['author-link'])));
if ($r) {
if ($r[0]['nick'] == "")
$status["entities"] = $converted["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"]))
- $status["source"] = trim($status["source"].' ('.network_to_name($item['item_network']).')');
+ $status["source"] = network_to_name($item['item_network'], $user_info['url']);
+ else if (($item['item_network'] != "") AND (network_to_name($item['item_network'], $user_info['url']) != $status["source"]))
+ $status["source"] = trim($status["source"].' ('.network_to_name($item['item_network'], $user_info['url']).')');
// Retweets are only valid for top postings
unset($status["user"]["uid"]);
unset($status["user"]["self"]);
- // 'geo' => array('type' => 'Point',
- // 'coordinates' => array((float) $notice->lat,
- // (float) $notice->lon));
+ if ($item["coord"] != "") {
+ $coords = explode(' ',$item["coord"]);
+ if (count($coords) == 2) {
+ $status["geo"] = array('type' => 'Point',
+ 'coordinates' => array((float) $coords[0],
+ (float) $coords[1]));
+ }
+ }
$ret[] = $status;
};
$stringify_ids = (x($_REQUEST,'stringify_ids')?$_REQUEST['stringify_ids']:false);
- $r = q("SELECT unique_contacts.id FROM contact, unique_contacts WHERE contact.nurl = unique_contacts.url AND `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
+ $r = q("SELECT `unique_contact`.`id` FROM contact, `unique_contacts` WHERE contact.nurl = unique_contacts.url AND `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
intval(api_user())
);
$sender = api_get_user($a);
- require_once("include/message.php");
-
if ($_POST['screen_name']) {
$r = q("SELECT `id`, `nurl`, `network` FROM `contact` WHERE `uid`=%d AND `nick`='%s'",
intval(api_user()),
+ /**
+ * similar as /mod/redir.php
+ * redirect to 'url' after dfrn auth
+ *
+ * why this when there is mod/redir.php already?
+ * This use api_user() and api_login()
+ *
+ * params
+ * c_url: url of remote contact to auth to
+ * url: string, url to redirect after auth
+ */
+ function api_friendica_remoteauth(&$a) {
+ $url = ((x($_GET,'url')) ? $_GET['url'] : '');
+ $c_url = ((x($_GET,'c_url')) ? $_GET['c_url'] : '');
+
+ if ($url === '' || $c_url === '')
+ die((api_error($a, 'json', "Wrong parameters")));
+
+ $c_url = normalise_link($c_url);
+
+ // traditional DFRN
+
+ $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `nurl` = '%s' LIMIT 1",
+ dbesc($c_url),
+ intval(api_user())
+ );
+
+ if ((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
+ die((api_error($a, 'json', "Unknown contact")));
+
+ $cid = $r[0]['id'];
+
+ $dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+
+ if($r[0]['duplex'] && $r[0]['issued-id']) {
+ $orig_id = $r[0]['issued-id'];
+ $dfrn_id = '1:' . $orig_id;
+ }
+ if($r[0]['duplex'] && $r[0]['dfrn-id']) {
+ $orig_id = $r[0]['dfrn-id'];
+ $dfrn_id = '0:' . $orig_id;
+ }
+
+ $sec = random_string();
+
+ q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`)
+ VALUES( %d, %s, '%s', '%s', %d )",
+ intval(api_user()),
+ intval($cid),
+ dbesc($dfrn_id),
+ dbesc($sec),
+ intval(time() + 45)
+ );
+
+ logger($r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
+ $dest = (($url) ? '&destination_url=' . $url : '');
+ goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
+ . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
+ . '&type=profile&sec=' . $sec . $dest . $quiet );
+ }
+ api_register_func('api/friendica/remoteauth', 'api_friendica_remoteauth', true);
+
+
+
function api_share_as_retweet(&$item) {
$body = trim($item["body"]);
function api_get_nick($profile) {
/* To-Do:
- - remove trailing jung from profile url
+ - remove trailing junk from profile url
- pump.io check has to check the website
*/
$nick = "";
- $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2", $profile);
- if ($friendica != $profile)
- $nick = $friendica;
+ $r = q("SELECT `nick` FROM `gcontact` WHERE `nurl` = '%s'",
+ dbesc(normalise_link($profile)));
+ if ($r)
+ $nick = $r[0]["nick"];
+
+ if (!$nick == "") {
+ $r = q("SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
+ dbesc(normalise_link($profile)));
+ if ($r)
+ $nick = $r[0]["nick"];
+ }
+
+ if (!$nick == "") {
+ $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2", $profile);
+ if ($friendica != $profile)
+ $nick = $friendica;
+ }
if (!$nick == "") {
$diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2", $profile);
//}
if ($nick != "") {
- q("UPDATE unique_contacts SET nick = '%s' WHERE url = '%s'",
- dbesc($nick), dbesc(normalise_link($profile)));
+ q("UPDATE `unique_contacts` SET `nick` = '%s' WHERE `nick` != '%s' AND url = '%s'",
+ dbesc($nick), dbesc($nick), dbesc(normalise_link($profile)));
return($nick);
}
$contacts = array($contacts[0]);
}
+
/*
+To.Do:
+ [pagename] => api/1.1/statuses/lookup.json
+ [id] => 605138389168451584
+ [include_cards] => true
+ [cards_platform] => Android-12
+ [include_entities] => true
+ [include_my_retweet] => 1
+ [include_rts] => 1
+ [include_reply_count] => true
+ [include_descendent_reply_count] => true
+
+
+
Not implemented by now:
statuses/retweets_of_me
friendships/create
projects / friendica.git / blobdiff