]> git.mxchange.org Git - friendica.git/blobdiff - include/api.php
Merge remote-tracking branch 'upstream/master'
[friendica.git] / include / api.php
index cfbf7a7e5c78eedb47977ef8c75ce84c3fc998b9..ade783662bd5d15e08dea74bc80bbadf302c8cc4 100644 (file)
@@ -1,4 +1,7 @@
 <?php
+/* To-Do:
+ - Automatically detect if incoming data is HTML or BBCode
+*/
        require_once("include/bbcode.php");
        require_once("include/datetime.php");
        require_once("include/conversation.php");
        $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();
+       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;
-        }
+               return false;
+       }
 
        function api_date($str){
                //Wed May 23 06:01:13 +0000 2007
 
        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);
        }
 
        /**
                        //die(__file__.__line__.__function__."<pre>".$e); die();
                }
 
-               
-               
+
+
                // 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;
                        }
                }
 
                if (!isset($_SERVER['PHP_AUTH_USER'])) {
-                  logger('API_login: ' . 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: ' . print_r($_SERVER,true), LOGGER_DEBUG);
+                       header('WWW-Authenticate: Basic realm="Friendica"');
+                       header('HTTP/1.0 401 Unauthorized');
+                       die((api_error($a, 'json', "This api requires login")));
+
+                       //die('This api requires login');
                }
-               
+
                $user = $_SERVER['PHP_AUTH_USER'];
                $encrypted = hash('whirlpool',trim($_SERVER['PHP_AUTH_PW']));
-               
-               
-                       /**
-                        *  next code from mod/auth.php. needs better solution
-                        */
-                       
+
+
+               /**
+                *  next code from mod/auth.php. needs better solution
+                */
+
                // process normal login request
 
-               $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
+               $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",
                        dbesc(trim($user)),
                        dbesc(trim($user)),
                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');
                call_hooks('logged_in', $a->user);
 
        }
-       
+
        /**************************
         *  MAIN API ENTRY POINT  *
         **************************/
                                                return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
                                                break;
                                        case "json":
-                                               //header ("Content-Type: application/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");
                                        case "as":
                                                //header ("Content-Type: application/json");
                                                //foreach($r as $rr)
-                                               //    return json_encode($rr);
+                                               //      return json_encode($rr);
                                                return json_encode($r);
                                                break;
 
                }
                header("HTTP/1.1 404 Not Found");
                logger('API call not implemented: '.$a->query_string." - ".print_r($_REQUEST,true));
-               $r = '<status><error>not implemented</error></status>';
+               return(api_error($a, $type, "not implemented"));
+
+       }
+
+       function api_error(&$a, $type, $error) {
+               $r = "<status><error>".$error."</error><request>".$a->query_string."</request></status>";
                switch($type){
                        case "xml":
                                header ("Content-Type: text/xml");
                                break;
                        case "json":
                                header ("Content-Type: application/json");
-                           return json_encode(array('error' => 'not implemented'));
+                               return json_encode(array('error' => $error, 'request' => $a->query_string));
                                break;
                        case "rss":
                                header ("Content-Type: application/rss+xml");
                        'language' => $user_info['language'],
                        'logo'  => $a->get_baseurl()."/images/friendica-32.png",
                );
-               
+
                return $arr;
        }
-        
+
+
+       /**
+        * Unique contact to contact url.
+        */
+       function api_unique_id_to_url($id){
+               $r = q("SELECT url FROM unique_contacts WHERE id=%d LIMIT 1",
+                       intval($id));
+               if ($r)
+                       return ($r[0]["url"]);
+               else
+                       return false;
+       }
+
        /**
         * Returns user info array.
         */
-       function api_get_user(&$a, $contact_id = Null){
+       function api_get_user(&$a, $contact_id = Null, $type = "json"){
                global $called_api;
                $user = null;
                $extra_query = "";
+               $url = "";
+               $nick = "";
+
+               logger("api_get_user: Fetching user data for user ".$contact_id, LOGGER_DEBUG);
+
+               // Searching for contact URL
+               if(!is_null($contact_id) AND (intval($contact_id) == 0)){
+                       $user = dbesc(normalise_link($contact_id));
+                       $url = $user;
+                       $extra_query = "AND `contact`.`nurl` = '%s' ";
+                       if (api_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(api_user());
+               }
 
+               // Searching for unique contact id
+               if(!is_null($contact_id) AND (intval($contact_id) != 0)){
+                       $user = dbesc(api_unique_id_to_url($contact_id));
 
-               if(!is_null($contact_id)){
-                       $user=$contact_id;
-                       $extra_query = "AND `contact`.`id` = %d ";
+                       if ($user == "")
+                               die(api_error($a, $type, t("User not found.")));
+
+                       $url = $user;
+                       $extra_query = "AND `contact`.`nurl` = '%s' ";
+                       if (api_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(api_user());
                }
-               
+
                if(is_null($user) && x($_GET, 'user_id')) {
-                       $user = intval($_GET['user_id']);       
-                       $extra_query = "AND `contact`.`id` = %d ";
+                       $user = dbesc(api_unique_id_to_url($_GET['user_id']));
+
+                       if ($user == "")
+                               die(api_error($a, $type, t("User not found.")));
+
+                       $url = $user;
+                       $extra_query = "AND `contact`.`nurl` = '%s' ";
+                       if (api_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(api_user());
                }
                if(is_null($user) && x($_GET, 'screen_name')) {
-                       $user = dbesc($_GET['screen_name']);    
+                       $user = dbesc($_GET['screen_name']);
+                       $nick = $user;
                        $extra_query = "AND `contact`.`nick` = '%s' ";
                        if (api_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(api_user());
-                       
                }
-               
-               if (is_null($user) && $a->argc > (count($called_api)-1)){
+
+               if (is_null($user) AND ($a->argc > (count($called_api)-1)) AND (count($called_api) > 0)){
                        $argid = count($called_api);
                        list($user, $null) = explode(".",$a->argv[$argid]);
                        if(is_numeric($user)){
-                               $user = intval($user);
-                               $extra_query = "AND `contact`.`id` = %d ";
+                               $user = dbesc(api_unique_id_to_url($user));
+
+                               if ($user == "")
+                                       return false;
+
+                               $url = $user;
+                               $extra_query = "AND `contact`.`nurl` = '%s' ";
+                               if (api_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(api_user());
                        } else {
                                $user = dbesc($user);
+                               $nick = $user;
                                $extra_query = "AND `contact`.`nick` = '%s' ";
                                if (api_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(api_user());
                        }
                }
-               
-               if (! $user) {
+
+               logger("api_get_user: user ".$user, LOGGER_DEBUG);
+
+               if (!$user) {
                        if (api_user()===false) {
                                api_login($a); return False;
                        } else {
                                $user = $_SESSION['uid'];
                                $extra_query = "AND `contact`.`uid` = %d AND `contact`.`self` = 1 ";
                        }
-                       
+
                }
-               
+
                logger('api_user: ' . $extra_query . ', user: ' . $user);
-               // user info            
+               // user info
                $uinfo = q("SELECT *, `contact`.`id` as `cid` FROM `contact`
                                WHERE 1
                                $extra_query",
                                $user
                );
+
+               // Selecting the id by priority, friendica first
+               api_best_nickname($uinfo);
+
+               // if the contact wasn't found, fetch it from the unique contacts
                if (count($uinfo)==0) {
-                       return False;
+                       $r = array();
+
+                       if ($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);
+
+                       if ($r) {
+                               // 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"]);
+
+                               $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,
+                                       '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,
+                                       'created_at' => api_date(0),
+                                       'favourites_count' => 0,
+                                       'utc_offset' => 0,
+                                       'time_zone' => 'UTC',
+                                       'statuses_count' => 0,
+                                       'following' => false,
+                                       'verified' => false,
+                                       'statusnet_blocking' => false,
+                                       'notifications' => false,
+                                       'statusnet_profile_url' => $r[0]["url"],
+                                       'uid' => 0,
+                                       'cid' => 0,
+                                       'self' => 0,
+                                       'network' => '',
+                               );
+
+                               return $ret;
+                       } else
+                               die(api_error($a, $type, t("User not found.")));
+
                }
-               
+
                if($uinfo[0]['self']) {
                        $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`=''",
                        // count public wall messages
-                       $r = q("SELECT COUNT(`id`) as `count` FROM `item`
+                       $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", 
+                               AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0",
                                intval($uinfo[0]['uid']),
                                intval(CONTACT_IS_SHARING),
                                intval(CONTACT_IS_FRIEND)
                );
                $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", 
+                               AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0",
                                intval($uinfo[0]['uid']),
                                intval(CONTACT_IS_FOLLOWER),
                                intval(CONTACT_IS_FRIEND)
                );
                $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'];
-       
+
 
                if(! $uinfo[0]['self']) {
                        $countfriends = 0;
                        $starred = 0;
                }
 
+               // 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"]);
+               }
+
+               // Fetching unique id
+               $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')",
+                               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'])));
+               }
+
+               require_once('include/contact_selectors.php');
+               $network_name = network_to_name($uinfo[0]['network']);
+
                $ret = Array(
-                       'id' => intval($uinfo[0]['cid']),
-                       'self' => intval($uinfo[0]['self']),
-                       'uid' => intval($uinfo[0]['uid']),
+                       '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'] : '',
+                       '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'],
                        'url' => $uinfo[0]['url'],
-                       'contact_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
-                       'protected' => false,   
-                       'friends_count' => intval($countfriends),
-                       'created_at' => api_date($uinfo[0]['name-date']),
-                       'utc_offset' => "+00:00",
-                       'time_zone' => 'UTC', //$uinfo[0]['timezone'],
-                       'geo_enabled' => false,
-                       'statuses_count' => intval($countitms), #XXX: fix me 
-                       'lang' => 'en', #XXX: fix me
-                       'description' => (($profile) ? $profile[0]['pdesc'] : ''),
+                       'protected' => false,
                        'followers_count' => intval($countfollowers),
+                       'friends_count' => intval($countfriends),
+                       'created_at' => api_date($uinfo[0]['created']),
                        'favourites_count' => intval($starred),
-                       'contributors_enabled' => false,
-                       'follow_request_sent' => true,
-                       'profile_background_color' => 'cfe8f6',
-                       'profile_text_color' => '000000',
-                       'profile_link_color' => 'FF8500',
-                       'profile_sidebar_fill_color' =>'AD0066',
-                       'profile_sidebar_border_color' => 'AD0066',
-                       'profile_background_image_url' => '',
-                       'profile_background_tile' => false,
-                       'profile_use_background_image' => false,
+                       'utc_offset' => "0",
+                       'time_zone' => 'UTC',
+                       'statuses_count' => intval($countitms),
+                       'following' => (($uinfo[0]['rel'] == CONTACT_IS_FOLLOWER) OR ($uinfo[0]['rel'] == CONTACT_IS_FRIEND)),
+                       'verified' => true,
+                       'statusnet_blocking' => false,
                        'notifications' => false,
-                       'following' => '', #XXX: fix me
-                       'verified' => true, #XXX: fix me
-                       'status' => array()
+                       'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
+                       'uid' => intval($uinfo[0]['uid']),
+                       'cid' => intval($uinfo[0]['cid']),
+                       'self' => $uinfo[0]['self'],
+                       'network' => $uinfo[0]['network'],
                );
-       
+
                return $ret;
-               
+
        }
 
        function api_item_get_user(&$a, $item) {
-               global $usercache;
 
-               // The author is our direct contact, in a conversation with us.
-               if(link_compare($item['url'],$item['author-link'])) {
-                       return api_get_user($a,$item['cid']);
+               $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"]));
+
+                       $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"])));
                }
-               else {
-                       // The author may be a contact of ours, but is replying to somebody else. 
-                       // Figure out if we know him/her.
-                       $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
-            if(($normalised != 'mailbox') && (x($a->contacts[$normalised])))
-                               return api_get_user($a,$a->contacts[$normalised]['id']);
-               }
-               // We don't know this person directly.
-               
-               list($nick, $name) = array_map("trim",explode("(",$item['author-name']));
-               $name=str_replace(")","",$name);
-
-               if ($name == '')
-                       $name = $nick;
-
-               if ($nick == '')
-                       $nick = $name;
-
-               // Generating a random ID
-               if (is_null($usercache[$nick]) or !array_key_exists($nick, $usercache))
-                       $usercache[$nick] = mt_rand(2000000, 2100000);
-
-               $ret = array(
-                       'id' => $usercache[$nick],
-                       'name' => $name,
-                       'screen_name' => $nick,
-                       'location' => '', //$uinfo[0]['default-location'],
-                       'description' => '',
-                       'profile_image_url' => $item['author-avatar'],
-                       'url' => $item['author-link'],
-                       'protected' => false,   #
-                       'followers_count' => 0,
-                       'friends_count' => 0,
-                       'created_at' => '',
-                       'favourites_count' => 0,
-                       'utc_offset' => 0, #XXX: fix me
-                       'time_zone' => '', //$uinfo[0]['timezone'],
-                       'statuses_count' => 0,
-                       'following' => 1,
-                       'statusnet_blocking' => false,
-                       'notifications' => false,
-                       'uid' => 0,
-                       'contact_url' => 0,
-                       'geo_enabled' => false,
-                       'lang' => 'en', #XXX: fix me
-                       'contributors_enabled' => false,
-                       'follow_request_sent' => false,
-                       'profile_background_color' => 'cfe8f6',
-                       'profile_text_color' => '000000',
-                       'profile_link_color' => 'FF8500',
-                       'profile_sidebar_fill_color' =>'AD0066',
-                       'profile_sidebar_border_color' => 'AD0066',
-                       'profile_background_image_url' => '',
-                       'profile_background_tile' => false,
-                       'profile_use_background_image' => false,
-                       'verified' => true, #XXX: fix me
-                       'followers' => '', #XXX: fix me
-                       'status' => array()
-               );
 
-               return $ret; 
+               $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"]));
+
+                       $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"])));
+               }
+
+               // Comments in threads may appear as wall-to-wall postings.
+               // So only take the owner at the top posting.
+               if ($item["id"] == $item["parent"])
+                       $status_user = api_get_user($a,$item["owner-link"]);
+               else
+                       $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);
        }
 
 
                                $ret = $data;
                                break;
                }
+
                return $ret;
        }
-       
+
        /**
         ** TWITTER API
         */
-       
+
        /**
-        * Returns an HTTP 200 OK response code and a representation of the requesting user if authentication was successful; 
-        * returns a 401 status code and an error message if not. 
+        * Returns an HTTP 200 OK response code and a representation of the requesting user if authentication was successful;
+        * 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){
                if (api_user()===false) return false;
+
+               unset($_REQUEST["user_id"]);
+               unset($_GET["user_id"]);
+
+               unset($_REQUEST["screen_name"]);
+               unset($_GET["screen_name"]);
+
+               $skip_status = (x($_REQUEST,'skip_status')?$_REQUEST['skip_status']:false);
+
                $user_info = api_get_user($a);
-               
+
+               // "verified" isn't used here in the standard
+               unset($user_info["verified"]);
+
+               // - Adding last status
+               if (!$skip_status) {
+                       $user_info["status"] = api_status_show($a,"raw");
+                       if (!count($user_info["status"]))
+                               unset($user_info["status"]);
+                       else
+                               unset($user_info["status"]["user"]);
+               }
+
+               // "uid" and "self" are only needed for some internal stuff, so remove it from here
+               unset($user_info["uid"]);
+               unset($user_info["self"]);
+
                return api_apply_template("user", $type, array('$user' => $user_info));
 
        }
        api_register_func('api/account/verify_credentials','api_account_verify_credentials', true);
-               
+
 
        /**
         * get data from $_POST or $_GET
        }
 
 /*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*/
 
 
                }
                else
                        $_REQUEST['body'] = requestdata('status');
-                       //$_REQUEST['body'] = urldecode(requestdata('status'));
 
                $_REQUEST['title'] = requestdata('title');
 
                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
                // call out normal post function
 
                require_once('mod/item.php');
-               item_post($a);  
+               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/update','api_statuses_update', true);
+       api_register_func('api/statuses/update_with_media','api_statuses_update', true);
 
 
        function api_status_show(&$a, $type){
                $user_info = api_get_user($a);
-               // get last public wall message
 
-               $lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `c`.`nick` as `reply_author`
-                               FROM `item`, `contact`, `item` as `i`, `contact` as `c`
+               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`, `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['id'])
+                               intval($user_info['cid']),
+                               dbesc($user_info['url']),
+                               dbesc(normalise_link($user_info['url'])),
+                               dbesc($user_info['url']),
+                               dbesc(normalise_link($user_info['url']))
                );
 
-//             $lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `i`.`nick` as `reply_author`
-//                             FROM `item`, `contact`,
-//                                     (SELECT `item`.`id`, `item`.`contact-id`, `contact`.`nick` FROM `item`,`contact` WHERE `contact`.`id`=`item`.`contact-id`) as `i` 
-//                             WHERE `item`.`contact-id` = %d
-//                                     AND `i`.`id` = `item`.`parent`
-//                                     AND `contact`.`id`=`item`.`contact-id` AND `contact`.`self`=1
-//                                     AND `type`!='activity'
-//                                     AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
-//                             ORDER BY `created` DESC
-//                             LIMIT 1",
-//                             intval($user_info['id'])
-//             );
-
                if (count($lastwall)>0){
                        $lastwall = $lastwall[0];
 
-                       $in_reply_to_status_id = '';
-                       $in_reply_to_user_id = '';
-                       $in_reply_to_screen_name = '';
-                       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'];
+                       $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 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 = (($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;
+                       }
+
                        $status_info = array(
-                               'text' => html2plain(bbcode($lastwall['body'], false, false, true), 0),
+                               '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' => '',
+                               'geo' => NULL,
                                'favorited' => false,
-                               'coordinates' => $lastwall['coord'],
-                               'place' => $lastwall['location'],
-                               'contributors' => ''                                    
+                               // attachments
+                               'user' => $user_info,
+                               'statusnet_html'                => trim(bbcode($lastwall['body'], false, false)),
+                               'statusnet_conversation_id'     => $lastwall['parent'],
                        );
-                       $status_info['user'] = $user_info;
+
+                       if ($lastwall['title'] != "")
+                               $status_info['statusnet_html'] = "<h4>".bbcode($lastwall['title'])."</h4>\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"]))
+                               $status_info["source"] = trim($status_info["source"].' ('.network_to_name($lastwall['item_network']).')');
+
+                       // "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"]);
                }
+
+               if ($type == "raw")
+                       return($status_info);
+
                return  api_apply_template("status", $type, array('$status' => $status_info));
-               
+
        }
 
 
 
 
-               
+
        /**
         * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
         * The author's most recent status will be returned inline.
         */
        function api_users_show(&$a, $type){
                $user_info = api_get_user($a);
-               // get last public wall message
-               $lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `i`.`nick` as `reply_author`
-                               FROM `item`, `contact`,
-                                       (SELECT `item`.`id`, `item`.`contact-id`, `contact`.`nick` FROM `item`,`contact` WHERE `contact`.`id`=`item`.`contact-id`) as `i` 
-                               WHERE `item`.`contact-id` = %d
-                                       AND `i`.`id` = `item`.`parent`
-                                       AND `contact`.`id`=`item`.`contact-id` AND `contact`.`self`=1
+
+               $lastwall = q("SELECT `item`.*
+                               FROM `item`, `contact`
+                               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 
+                               ORDER BY `created` DESC
                                LIMIT 1",
-                               intval($user_info['id'])
+                               intval(api_user()),
+                               dbesc(ACTIVITY_POST),
+                               intval($user_info['cid']),
+                               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 = '';
-                       $in_reply_to_user_id = '';
-                       $in_reply_to_screen_name = '';
+
+                       $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'];
+                               $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 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 = intval($r[0]['id']);
+                                               $in_reply_to_user_id_str = (string) intval($r[0]['id']);
+                                       }
+                               }
                        }
                        $user_info['status'] = array(
-                               'created_at' => api_date($lastwall['created']),
-                               'id' => $lastwall['contact-id'],
-                               'text' => html2plain(bbcode($lastwall['body'], false, false, true), 0),
-                               'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
+                               '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' => intval($lastwall['contact-id']),
+                               'id_str' => (string) $lastwall['contact-id'],
                                'in_reply_to_user_id' => $in_reply_to_user_id,
-                               'favorited' => false,
+                               'in_reply_to_user_id_str' => $in_reply_to_user_id_str,
                                'in_reply_to_screen_name' => $in_reply_to_screen_name,
-                               'geo' => '',
-                               'coordinates' => $lastwall['coord'],
-                               'place' => $lastwall['location'],
-                               'contributors' => ''
+                               'geo' => NULL,
+                               'favorited' => false,
+                               'statusnet_html'                => trim(bbcode($lastwall['body'], false, false)),
+                               'statusnet_conversation_id'     => $lastwall['parent'],
                        );
+
+                       if ($lastwall['title'] != "")
+                               $user_info['statusnet_html'] = "<h4>".bbcode($lastwall['title'])."</h4>\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"]))
+                               $user_info["status"]["source"] = trim($user_info["status"]["source"].' ('.network_to_name($lastwall['item_network']).')');
+
                }
+
+               // "uid" and "self" are only needed for some internal stuff, so remove it from here
+               unset($user_info["uid"]);
+               unset($user_info["self"]);
+
                return  api_apply_template("user", $type, array('$user' => $user_info));
 
        }
        function api_statuses_home_timeline(&$a, $type){
                if (api_user()===false) return false;
 
+               unset($_REQUEST["user_id"]);
+               unset($_GET["user_id"]);
+
+               unset($_REQUEST["screen_name"]);
+               unset($_GET["screen_name"]);
+
                $user_info = api_get_user($a);
                // get last newtork messages
 
 
                $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);
                if ($conversation_id > 0)
                        $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
 
-               $r = q("SELECT `item`.*, `item`.`id` AS `item_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 `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)
                );
                // 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. 
-       
+
                $r = q("UPDATE `item` SET `unseen` = 0 
                        WHERE `unseen` = 1 AND `uid` = %d",
-                       intval($user_info['uid'])
+                       //intval($user_info['uid'])
+                       intval(api_user())
                );
 
 
 
                $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)
                if ($conversation_id > 0)
                        $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
 
-               /*$r = q("SELECT `item`.*, `item`.`id` AS `item_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`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
-                       AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-                       AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
+                       `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`.`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 ",
+                       dbesc(ACTIVITY_POST),
                        intval($since_id),
-                       intval($start), intval($count)
-               );*/
-               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
-                       `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
-                       $sql_extra
-                       AND `item`.`id`>%d
-                       ORDER BY `received` DESC LIMIT %d, %d ",
-                       intval($since_id),
-                       intval($start),
-                       intval($count));
+                       intval($start),
+                       intval($count));
 
                $ret = api_format_items($r,$user_info);
 
                // params
                $id = intval($a->argv[3]);
 
+               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 = '';
                if ($conversation)
-                       $sql_extra .= " AND `item`.`parent` = %d  ORDER BY `received` ASC ";
+                       $sql_extra .= " AND `item`.`parent` = %d ORDER BY `received` ASC ";
                else
                        $sql_extra .= " AND `item`.`id` = %d";
 
-               $r = q("SELECT `item`.*, `item`.`id` AS `item_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`.`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)
                );
 
+               if (!$r)
+                       die(api_error($a, $type, t("There is no status with this id.")));
+
                $ret = api_format_items($r,$user_info);
 
                if ($conversation) {
 
 
        /**
-        * 
+        *
+        */
+       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);
+
+
+       /**
+        *
         */
        function api_statuses_repeat(&$a, $type){
+               global $called_api;
+
                if (api_user()===false) return false;
 
                $user_info = api_get_user($a);
                // params
                $id = intval($a->argv[3]);
 
-               logger('API: api_statuses_repeat: '.$id);
+               if ($id == 0)
+                       $id = intval($_REQUEST["id"]);
 
-               //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
+               // Hotot workaround
+               if ($id == 0)
+                       $id = intval($a->argv[4]);
 
-               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`nick` as `reply_author`,
+               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`,
                        `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                );
 
                if ($r[0]['body'] != "") {
-                       if (intval(get_config('system','new_share'))) {
-                               $post = "[share author='".str_replace("'", "&#039;", $r[0]['reply_author']).
-                                               "' profile='".$r[0]['reply_url'].
-                                               "' avatar='".$r[0]['reply_photo'].
-                                               "' link='".$r[0]['plink']."']";
-
-                               $post .= $r[0]['body'];
-                               $post .= "[/share]";
+                       if (!intval(get_config('system','old_share'))) {
+                               if (strpos($r[0]['body'], "[/share]") !== false) {
+                                       $pos = strpos($r[0]['body'], "[share");
+                                       $post = substr($r[0]['body'], $pos);
+                               } else {
+                                       $post = "[share author='".str_replace("'", "&#039;", $r[0]['author-name']).
+                                                       "' profile='".$r[0]['author-link'].
+                                                       "' avatar='".$r[0]['author-avatar'].
+                                                       "' link='".$r[0]['plink']."']";
+                                       $post .= $r[0]['body'];
+                                       $post .= "[/share]";
+                               }
                                $_REQUEST['body'] = $post;
                        } else
                                $_REQUEST['body'] = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
                        item_post($a);
                }
 
-               if ($type == 'xml')
-                       $ok = "true";
-               else
-                       $ok = "ok";
-
-               return api_apply_template('test', $type, array('$ok' => $ok));
+               // this should output the last post (the one we just posted).
+               $called_api = null;
+               return(api_status_show($a,$type));
        }
        api_register_func('api/statuses/retweet','api_statuses_repeat', true);
 
        /**
-        * 
+        *
         */
        function api_statuses_destroy(&$a, $type){
                if (api_user()===false) return false;
                // params
                $id = intval($a->argv[3]);
 
+               if ($id == 0)
+                       $id = intval($_REQUEST["id"]);
+
+               // Hotot workaround
+               if ($id == 0)
+                       $id = intval($a->argv[4]);
+
                logger('API: api_statuses_destroy: '.$id);
 
+               $ret = api_statuses_show($a, $type);
+
                require_once('include/items.php');
                drop_item($id, false);
 
-               if ($type == 'xml')
-                       $ok = "true";
-               else
-                       $ok = "ok";
-
-               return api_apply_template('test', $type, array('$ok' => $ok));
+               return($ret);
        }
        api_register_func('api/statuses/destroy','api_statuses_destroy', true);
 
         */
        function api_statuses_mentions(&$a, $type){
                if (api_user()===false) return false;
-                               
+
+               unset($_REQUEST["user_id"]);
+               unset($_GET["user_id"]);
+
+               unset($_REQUEST["screen_name"]);
+               unset($_GET["screen_name"]);
+
                $user_info = api_get_user($a);
                // get last newtork messages
 
 
                $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);
                //$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
                $myurl = str_replace('www.','',$myurl);
                $diasp_url = str_replace('/profile/','/u/',$myurl);
 
-/*             if (get_config('system','use_fulltext_engine'))
-                       $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
-                               dbesc(protect_sprintf($myurl)),
-                               dbesc(protect_sprintf($myurl)),
-                               dbesc(protect_sprintf($diasp_url))
-                       );
-               else
-                       $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
-                               dbesc(protect_sprintf('%' . $myurl)),
-                               dbesc(protect_sprintf('%' . $myurl . ']%')),
-                               dbesc(protect_sprintf('%' . $diasp_url . ']%'))
-                       );
-*/
-               $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`, 
+               $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)
                );
 
        function api_statuses_user_timeline(&$a, $type){
                if (api_user()===false) return false;
-               
-               $user_info = api_get_user($a);
-               // get last newtork messages
 
+               $user_info = api_get_user($a);
+               // get last network messages
 
                logger("api_statuses_user_timeline: api_user: ". api_user() .
                           "\nuser_info: ".print_r($user_info, true) .
                $start = $page*$count;
 
                $sql_extra = '';
-               if ($user_info['self']==1) $sql_extra .= " AND `item`.`wall` = 1 ";
+               if ($user_info['self']==1)
+                       $sql_extra .= " AND `item`.`wall` = 1 ";
 
                if ($exclude_replies > 0)
                        $sql_extra .= ' AND `item`.`parent` = `item`.`id`';
                if ($conversation_id > 0)
                        $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
 
-               $r = q("SELECT `item`.*, `item`.`id` AS `item_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 `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()),
-                       intval($user_info['id']),
+                       dbesc(ACTIVITY_POST),
+                       intval($user_info['cid']),
                        intval($since_id),
                        intval($start), intval($count)
                );
 
-               $ret = api_format_items($r,$user_info);
-
+               $ret = api_format_items($r,$user_info, true);
 
                $data = array('$statuses' => $ret);
                switch($type){
 
 
        function api_favorites(&$a, $type){
+               global $called_api;
+
                if (api_user()===false) return false;
 
+               $called_api= array();
+
                $user_info = api_get_user($a);
+
                // in friendica starred item are private
                // return favorites only for self
                logger('api_favorites: self:' . $user_info['self']);
                if ($user_info['self']==0) {
                        $ret = array();
                } else {
-
+                       $sql_extra = "";
 
                        // params
+                       $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+                       $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
                        $count = (x($_GET,'count')?$_GET['count']:20);
                        $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
                        if ($page<0) $page=0;
 
                        $start = $page*$count;
 
-                       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+                       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`, `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
-                               ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
-                               intval($user_info['uid']),
+                               AND `item`.`id`>%d
+                               ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
+                               intval(api_user()),
+                               dbesc(ACTIVITY_POST),
+                               intval($since_id),
                                intval($start), intval($count)
                        );
 
                        $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";
                // standard meta information
                $ret=Array(
                                'id'                    => $item['id'],
-                               'created_at'            => api_date($item['created']),
                                'sender_id'             => $sender['id'] ,
-                               'sender_screen_name'    => $sender['screen_name'],
-                               'sender'                => $sender,
+                               'text'                  => "",
                                'recipient_id'          => $recipient['id'],
+                               'created_at'            => api_date($item['created']),
+                               'sender_screen_name'    => $sender['screen_name'],
                                'recipient_screen_name' => $recipient['screen_name'],
+                               'sender'                => $sender,
                                'recipient'             => $recipient,
                );
 
+               // "uid" and "self" are only needed for some internal stuff, so remove it from here
+               unset($ret["sender"]["uid"]);
+               unset($ret["sender"]["self"]);
+               unset($ret["recipient"]["uid"]);
+               unset($ret["recipient"]["self"]);
+
                //don't send title to regular StatusNET requests to avoid confusing these apps
                if (x($_GET, 'getText')) {
                        $ret['title'] = $item['title'] ;
                        if ($_GET["getText"] == "html") {
-                               $ret['text'] = bbcode($item['body']);
+                               $ret['text'] = bbcode($item['body'], false, false);
                        }
                        elseif ($_GET["getText"] == "plain") {
-                               $ret['text'] = html2plain(bbcode($item['body'], false, false, true), 0);
+                               //$ret['text'] = html2plain(bbcode($item['body'], false, false, true), 0);
+                               $ret['text'] = trim(html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 2, true), 0));
                        }
                }
                else {
-                       $ret['text'] = $item['title']."\n".html2plain(bbcode($item['body'], false, false, true), 0);
+                       $ret['text'] = $item['title']."\n".html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 2, true), 0);
                }
                if (isset($_GET["getUserObjects"]) && $_GET["getUserObjects"] == "false") {
                        unset($ret['sender']);
                return $ret;
        }
 
-       function api_format_items($r,$user_info) {
+       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);
 
-               //logger('api_format_items: ' . print_r($r,true));
+               $bbcode = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $bbcode);
 
-               //logger('api_format_items: ' . print_r($user_info,true));
+               //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();
                $ret = Array();
 
                foreach($r as $item) {
+                       api_share_as_retweet($a, api_user(), $item);
+
                        localize_item($item);
-                       $status_user = (($item['cid']==$user_info['id'])?$user_info: api_item_get_user($a,$item));
+                       $status_user = api_item_get_user($a,$item);
+
+                       // Look if the posts are matching if they should be filtered by user id
+                       if ($filter_user AND ($status_user["id"] != $user_info["id"]))
+                               continue;
 
-                       if ($item['parent']!=$item['id']) {
-                               $r = q("select id from item where parent=%s and id<%s order by id desc limit 1",
-                                       intval($item['parent']), intval($item['id']));
+                       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 = $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']);
 
-                               $r = q("select `item`.`contact-id`, `contact`.nick, `item`.`author-name` from item, contact
-                                       where `contact`.`id` = `item`.`contact-id` and `item`.id=%d", intval($in_reply_to_status_id));
+                               $in_reply_to_status_id_str = (string) intval($item['parent']);
 
-                               $in_reply_to_screen_name = $r[0]['author-name'];
-                               $in_reply_to_user_id = $r[0]['contact-id'];
+                               $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 unique_contacts 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 = '';
-                               $in_reply_to_user_id = 0;
-                               $in_reply_to_status_id = 0;
+                               $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($item['body'], false, false, 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']);
 
                        if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false))
                                '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' => '',
+                               'geo' => NULL,
                                'favorited' => $item['starred'] ? true : false,
+                               //'attachments' => array(),
                                'user' =>  $status_user ,
-                               'statusnet_html'                => trim(bbcode($item['body'])),
+                               //'entities' => NULL,
+                               'statusnet_html'                => trim(bbcode($item['body'], false, false)),
                                'statusnet_conversation_id'     => $item['parent'],
                        );
 
-                       // Seesmic doesn't like the following content
-                       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,
-                               );
+                       if ($item['title'] != "")
+                               $status['statusnet_html'] = "<h4>".bbcode($item['title'])."</h4>\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"]))
+                               $status["source"] = trim($status["source"].' ('.network_to_name($item['item_network']).')');
+
 
-                               $status = array_merge($status, $status2);
+                       // Retweets are only valid for top postings
+                       // It doesn't work reliable with the link if its a feed
+                       $IsRetweet = ($item['owner-link'] != $item['author-link']);
+                       if ($IsRetweet)
+                               $IsRetweet = (($item['owner-name'] != $item['author-name']) OR ($item['owner-avatar'] != $item['author-avatar']));
+
+                       if ($IsRetweet AND ($item["id"] == $item["parent"])) {
+                               $retweeted_status = $status;
+                               $retweeted_status["user"] = api_get_user($a,$item["author-link"]);
+
+                               $status["retweeted_status"] = $retweeted_status;
                        }
 
-                       $ret[]=$status;
+                       // "uid" and "self" are only needed for some internal stuff, so remove it from here
+                       unset($status["user"]["uid"]);
+                       unset($status["user"]["self"]);
+
+                       // 'geo' => array('type' => 'Point',
+                       //                   'coordinates' => array((float) $notice->lat,
+                       //                                          (float) $notice->lon));
+
+                       $ret[] = $status;
                };
                return $ret;
        }
                          'reset_time_in_seconds' => strtotime('now + 1 hour'),
                          'remaining_hits' => (string) 150,
                          'hourly_limit' => (string) 150,
-                         'reset_time' => datetime_convert('UTC','UTC','now + 1 hour',ATOM_TIME),
+                         'reset_time' => api_date(datetime_convert('UTC','UTC','now + 1 hour',ATOM_TIME)),
                );
                if ($type == "xml")
                        $hash['resettime_in_seconds'] = $hash['reset_time_in_seconds'];
                else
                        $ok = "ok";
 
-               return api_apply_template('test', $type, array('$ok' => $ok));
+               return api_apply_template('test', $type, array("$ok" => $ok));
 
        }
        api_register_func('api/help/test','api_help_test',false);
 
+       function api_lists(&$a,$type) {
+
+               $ret = array();
+               return array($ret);
+       }
+       api_register_func('api/lists','api_lists',true);
+
+       function api_lists_list(&$a,$type) {
+
+               $ret = array();
+               return array($ret);
+       }
+       api_register_func('api/lists/list','api_lists_list',true);
+
        /**
-        *  https://dev.twitter.com/docs/api/1/get/statuses/friends 
+        *  https://dev.twitter.com/docs/api/1/get/statuses/friends
         *  This function is deprecated by Twitter
-        *  returns: json, xml 
+        *  returns: json, xml
         **/
        function api_statuses_f(&$a, $type, $qtype) {
                if (api_user()===false) return false;
                $user_info = api_get_user($a);
-               
-               
-               // friends and followers only for self
-               if ($user_info['self']==0){
-                       return false;
-               }
-               
+
                if (x($_GET,'cursor') && $_GET['cursor']=='undefined'){
                        /* this is to stop Hotot to load friends multiple times
                        *  I'm not sure if I'm missing return something or
                        *  is a bug in hotot. Workaround, meantime
                        */
-                       
+
                        /*$ret=Array();
                        return array('$users' => $ret);*/
                        return false;
                }
-               
+
                if($qtype == 'friends')
                        $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND));
                if($qtype == 'followers')
                        $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND));
-               $r = q("SELECT id FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
+
+               // friends and followers only for self
+               if ($user_info['self'] == 0)
+                       $sql_extra = " AND false ";
+
+               $r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
                        intval(api_user())
                );
 
                $ret = array();
                foreach($r as $cid){
-                       $ret[] = api_get_user($a, $cid['id']);
+                       $user = api_get_user($a, $cid['nurl']);
+                       // "uid" and "self" are only needed for some internal stuff, so remove it from here
+                       unset($user["uid"]);
+                       unset($user["self"]);
+
+                       if ($user)
+                               $ret[] = $user;
                }
 
-               
                return array('$users' => $ret);
 
        }
 
                $config = array(
                        'site' => array('name' => $name,'server' => $server, 'theme' => 'default', 'path' => '',
-                               'logo' => $logo, 'fancy' => 'true', 'language' => 'en', 'email' => $email, 'broughtby' => '',
-                               'broughtbyurl' => '', 'timezone' => 'UTC', 'closed' => $closed, 'inviteonly' => 'false',
+                               'logo' => $logo, 'fancy' => true, 'language' => 'en', 'email' => $email, 'broughtby' => '',
+                               'broughtbyurl' => '', 'timezone' => 'UTC', 'closed' => $closed, 'inviteonly' => false,
                                'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl,
                                'shorturllength' => '30',
-        'friendica' => array(
-                             'FRIENDICA_PLATFORM' => FRIENDICA_PLATFORM,
-                             'FRIENDICA_VERSION' => FRIENDICA_VERSION,
-                             'DFRN_PROTOCOL_VERSION' => DFRN_PROTOCOL_VERSION,
-                             'DB_UPDATE_VERSION' => DB_UPDATE_VERSION
-                             )
+                               'friendica' => array(
+                                               'FRIENDICA_PLATFORM' => FRIENDICA_PLATFORM,
+                                               'FRIENDICA_VERSION' => FRIENDICA_VERSION,
+                                               'DFRN_PROTOCOL_VERSION' => DFRN_PROTOCOL_VERSION,
+                                               'DB_UPDATE_VERSION' => DB_UPDATE_VERSION
+                                               )
                        ),
-               );  
+               );
 
                return api_apply_template('config', $type, array('$config' => $config));
 
                if(! api_user())
                        return false;
 
+               $user_info = api_get_user($a);
+
                if($qtype == 'friends')
                        $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND));
                if($qtype == 'followers')
                        $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND));
 
-               $r = q("SELECT id FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
+               if (!$user_info["self"])
+                       $sql_extra = " AND false ";
+
+               $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",
                        intval(api_user())
                );
 
                if(is_array($r)) {
+
                        if($type === 'xml') {
                                header("Content-type: application/xml");
                                echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<ids>' . "\r\n";
                        elseif($type === 'json') {
                                $ret = array();
                                header("Content-type: application/json");
-                               foreach($r as $rr) $ret[] = $rr['id'];
+                               foreach($r as $rr)
+                                       if ($stringify_ids)
+                                               $ret[] = $rr['id'];
+                                       else
+                                               $ret[] = intval($rr['id']);
+
                                echo json_encode($ret);
                                killme();
                        }
 
        function api_direct_messages_new(&$a, $type) {
                if (api_user()===false) return false;
-               
-               if (!x($_POST, "text") || !x($_POST,"screen_name")) return;
+
+               if (!x($_POST, "text") OR (!x($_POST,"screen_name") AND !x($_POST,"user_id"))) return;
 
                $sender = api_get_user($a);
-               
+
                require_once("include/message.php");
 
-               $r = q("SELECT `id` FROM `contact` WHERE `uid`=%d AND `nick`='%s'",
-                               intval(api_user()),
-                               dbesc($_POST['screen_name']));
+               if ($_POST['screen_name']) {
+                       $r = q("SELECT `id`, `nurl`, `network` FROM `contact` WHERE `uid`=%d AND `nick`='%s'",
+                                       intval(api_user()),
+                                       dbesc($_POST['screen_name']));
+
+                       // Selecting the id by priority, friendica first
+                       api_best_nickname($r);
+
+                       $recipient = api_get_user($a, $r[0]['nurl']);
+               } else
+                       $recipient = api_get_user($a, $_POST['user_id']);
 
-               $recipient = api_get_user($a, $r[0]['id']);                     
                $replyto = '';
                $sub     = '';
                if (x($_REQUEST,'replyto')) {
                        }
                }
 
-               $id = send_message($recipient['id'], $_POST['text'], $sub, $replyto);
+               $id = send_message($recipient['cid'], $_POST['text'], $sub, $replyto);
 
                if ($id>-1) {
                        $r = q("SELECT * FROM `mail` WHERE id=%d", intval($id));
                        $ret = api_format_messages($r[0], $recipient, $sender);
-               
+
                } else {
-                       $ret = array("error"=>$id);     
+                       $ret = array("error"=>$id);
                }
-               
+
                $data = Array('$messages'=>$ret);
-               
+
                switch($type){
                        case "atom":
                        case "rss":
                                $data = api_rss_extra($a, $data, $user_info);
                }
-                               
+
                return  api_apply_template("direct_messages", $type, $data);
-                               
+
        }
        api_register_func('api/direct_messages/new','api_direct_messages_new',true);
 
        function api_direct_messages_box(&$a, $type, $box) {
                if (api_user()===false) return false;
-               
+
+               unset($_REQUEST["user_id"]);
+               unset($_GET["user_id"]);
+
+               unset($_REQUEST["screen_name"]);
+               unset($_GET["screen_name"]);
+
                $user_info = api_get_user($a);
-               
+
                // params
                $count = (x($_GET,'count')?$_GET['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;
-               
-               $profile_url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+
+               //$profile_url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+               $profile_url = $user_info["url"];
+
                if ($box=="sentbox") {
-                       $sql_extra = "`from-url`='".dbesc( $profile_url )."'";
+                       $sql_extra = "`mail`.`from-url`='".dbesc( $profile_url )."'";
                }
                elseif ($box=="conversation") {
-                       $sql_extra = "`parent-uri`='".dbesc( $_GET["uri"] )  ."'";
+                       $sql_extra = "`mail`.`parent-uri`='".dbesc( $_GET["uri"] )  ."'";
                }
                elseif ($box=="all") {
                        $sql_extra = "true";
                }
                elseif ($box=="inbox") {
-                       $sql_extra = "`from-url`!='".dbesc( $profile_url )."'";
+                       $sql_extra = "`mail`.`from-url`!='".dbesc( $profile_url )."'";
                }
-               
-               $r = q("SELECT * FROM `mail` WHERE uid=%d AND $sql_extra ORDER BY created DESC LIMIT %d,%d",
+
+               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`.`id` DESC LIMIT %d,%d",
                                intval(api_user()),
+                               intval($since_id),
                                intval($start), intval($count)
                );
-               
+
                $ret = Array();
                foreach($r as $item) {
                        if ($box == "inbox" || $item['from-url'] != $profile_url){
                                $recipient = $user_info;
-                               $sender = api_get_user($a,$item['contact-id']);
+                               $sender = api_get_user($a,normalise_link($item['contact-url']));
                        }
                        elseif ($box == "sentbox" || $item['from-url'] != $profile_url){
-                               $recipient = api_get_user($a,$item['contact-id']);
+                               $recipient = api_get_user($a,normalise_link($item['contact-url']));
                                $sender = $user_info;
+
                        }
 
                        $ret[]=api_format_messages($item, $recipient, $sender);
                }
-               
+
 
                $data = array('$messages' => $ret);
                switch($type){
                        case "rss":
                                $data = api_rss_extra($a, $data, $user_info);
                }
-                               
+
                return  api_apply_template("direct_messages", $type, $data);
-               
+
        }
 
        function api_direct_messages_sentbox(&$a, $type){
                        echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme();
                }
                echo $r;
-               killme();       
+               killme();
        }
        function api_oauth_access_token(&$a, $type){
                try{
                        echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme();
                }
                echo $r;
-               killme();                       
+               killme();
        }
 
        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"]);
+
+       // Skip if it isn't a pure repeated messages
+       // Does it start with a share?
+       if (strpos($body, "[share") > 0)
+               return(false);
+
+       // Does it end with a share?
+       if (strlen($body) > (strrpos($body, "[/share]") + 8))
+               return(false);
+
+       $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+       // Skip if there is no shared message in there
+       if ($body == $attributes)
+               return(false);
+
+       $author = "";
+       preg_match("/author='(.*?)'/ism", $attributes, $matches);
+       if ($matches[1] != "")
+               $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
+
+       preg_match('/author="(.*?)"/ism', $attributes, $matches);
+       if ($matches[1] != "")
+               $author = $matches[1];
+
+       $profile = "";
+       preg_match("/profile='(.*?)'/ism", $attributes, $matches);
+       if ($matches[1] != "")
+               $profile = $matches[1];
+
+       preg_match('/profile="(.*?)"/ism', $attributes, $matches);
+       if ($matches[1] != "")
+               $profile = $matches[1];
+
+       $avatar = "";
+       preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
+       if ($matches[1] != "")
+               $avatar = $matches[1];
+
+       preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
+       if ($matches[1] != "")
+               $avatar = $matches[1];
+
+       $shared_body = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$2",$body);
+
+       if (($shared_body == "") OR ($profile == "") OR ($author == "") OR ($avatar == ""))
+               return(false);
+
+       $item["body"] = $shared_body;
+       $item["author-name"] = $author;
+       $item["author-link"] = $profile;
+       $item["author-avatar"] = $avatar;
+
+       return(true);
+
+}
+
+function api_get_nick($profile) {
+/* To-Do:
+ - remove trailing jung 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;
+
+       if (!$nick == "") {
+               $diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2", $profile);
+               if ($diaspora != $profile)
+                       $nick = $diaspora;
+       }
+
+       if (!$nick == "") {
+               $twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $profile);
+               if ($twitter != $profile)
+                       $nick = $twitter;
+       }
+
+
+       if (!$nick == "") {
+               $StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile);
+               if ($StatusnetHost != $profile) {
+                       $StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile);
+                       if ($StatusnetUser != $profile) {
+                               $UserData = fetch_url("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
+                               $user = json_decode($UserData);
+                               if ($user)
+                                       $nick = $user->screen_name;
+                       }
+               }
+       }
+
+       // To-Do: look at the page if its really a pumpio site
+       //if (!$nick == "") {
+       //      $pumpio = preg_replace("=https?://(.*)/(.*)/=ism", "$2", $profile."/");
+       //      if ($pumpio != $profile)
+       //              $nick = $pumpio;
+               //      <div class="media" id="profile-block" data-profile-id="acct:kabniel@microca.st">
+
+       //}
+
+       if ($nick != "") {
+               q("UPDATE unique_contacts SET nick = '%s' WHERE url = '%s'",
+                       dbesc($nick), dbesc(normalise_link($profile)));
+               return($nick);
+       }
+
+       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[0]);
+
+       if (!preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$shared[3], $bookmark))
+               return($shared[0]);
+
+       $title = "";
+       $link = "";
+
+       if (isset($bookmark[2][0]))
+               $title = $bookmark[2][0];
+
+       if (isset($bookmark[1][0]))
+               $link = $bookmark[1][0];
+
+       if (strpos($shared[1],$title) !== false)
+               $title = "";
+
+       if (strpos($shared[1],$link) !== false)
+               $link = "";
+
+       $text = trim($shared[1]);
+
+       //if (strlen($text) < strlen($title))
+       if (($text == "") AND ($title != ""))
+               $text .= "\n\n".trim($title);
+
+       if ($link != "")
+               $text .= "\n".trim($link);
+
+       return(trim($text));
+}
+
+function api_best_nickname(&$contacts) {
+       $best_contact = array();
+
+       if (count($contact) == 0)
+               return;
+
+       foreach ($contacts AS $contact)
+               if ($contact["network"] == "") {
+                       $contact["network"] = "dfrn";
+                       $best_contact = array($contact);
+               }
+
+       if (sizeof($best_contact) == 0)
+               foreach ($contacts AS $contact)
+                       if ($contact["network"] == "dfrn")
+                               $best_contact = array($contact);
+
+       if (sizeof($best_contact) == 0)
+               foreach ($contacts AS $contact)
+                       if ($contact["network"] == "dspr")
+                               $best_contact = array($contact);
+
+       if (sizeof($best_contact) == 0)
+               foreach ($contacts AS $contact)
+                       if ($contact["network"] == "stat")
+                               $best_contact = array($contact);
+
+       if (sizeof($best_contact) == 0)
+               foreach ($contacts AS $contact)
+                       if ($contact["network"] == "pump")
+                               $best_contact = array($contact);
+
+       if (sizeof($best_contact) == 0)
+               foreach ($contacts AS $contact)
+                       if ($contact["network"] == "twit")
+                               $best_contact = array($contact);
+
+       if (sizeof($best_contact) == 1)
+               $contacts = $best_contact;
+       else
+               $contacts = array($contacts[0]);
+}
+
 /*
 Not implemented by now:
 favorites
@@ -1801,4 +2589,3 @@ blocks/exists
 blocks/blocking
 lists
 */
-