]> git.mxchange.org Git - friendica.git/blobdiff - include/api.php
api: add support to star/unstar items
[friendica.git] / include / api.php
index 0e638779b5d9774ddc657140de03fff384ddf625..bacbd65338162fb7be99e168113214a11de8d978 100644 (file)
        $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;
+       }
+
+       function api_source() {
+               if (requestdata('source'))
+                       return (requestdata('source'));
 
-          return false;
-        }
+               // Support for known clients that doesn't send a source name
+               if (strstr($_SERVER['HTTP_USER_AGENT'], "Twidere"))
+                       return ("Twidere");
+
+               logger("Unrecognized user-agent ".$_SERVER['HTTP_USER_AGENT'], LOGGER_DEBUG);
+
+               return ("api");
+       }
 
        function api_date($str){
                //Wed May 23 06:01:13 +0000 2007
@@ -65,9 +78,9 @@
 
                // workaround for HTTP-auth in CGI mode
                if(x($_SERVER,'REDIRECT_REMOTE_USER')) {
-                       $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"],6)) ;
+                       $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"],6)) ;
                        if(strlen($userpass)) {
-                               list($name, $password) = explode(':', $userpass);
+                               list($name, $password) = explode(':', $userpass);
                                $_SERVER['PHP_AUTH_USER'] = $name;
                                $_SERVER['PHP_AUTH_PW'] = $password;
                        }
                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');
 
                // preset
                $type="json";
-
                foreach ($API as $p=>$info){
                        if (strpos($a->query_string, $p)===0){
                                $called_api= explode("/",$p);
                                        case "json":
                                                header ("Content-Type: application/json");
                                                foreach($r as $rr)
-                                                   return json_encode($rr);
+                                                       $json = json_encode($rr);
+                                                       if ($_GET['callback'])
+                                                               $json = $_GET['callback']."(".$json.")";
+                                                       return $json;
                                                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;
 
        }
 
        function api_error(&$a, $type, $error) {
+               # TODO:  https://dev.twitter.com/overview/api/response-codes
                $r = "<status><error>".$error."</error><request>".$a->query_string."</request></status>";
                switch($type){
                        case "xml":
                                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",
                                intval($uinfo[0]['uid']),
                );
                $countfriends = $r[0]['count'];
 
-               $r = q("SELECT COUNT(`id`) as `count` FROM `contact`
+               $r = q("SELECT count(*) as `count` FROM `contact`
                                WHERE  `uid` = %d AND `rel` IN ( %d, %d )
                                AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0",
                                intval($uinfo[0]['uid']),
                );
                $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'];
                // Add a nick if it isn't present there
                if (($uinfo[0]['nick'] == "") OR ($uinfo[0]['name'] == $uinfo[0]['nick'])) {
                        $uinfo[0]['nick'] = api_get_nick($uinfo[0]["url"]);
-                       //if ($uinfo[0]['nick'] != "")
-                       //      q("UPDATE contact SET nick = '%s' WHERE id = %d",
-                       //              dbesc($uinfo[0]['nick']), intval($uinfo[0]["id"]));
                }
 
                // Fetching unique id
                $status_user["protected"] = (($item["allow_cid"] != "") OR
                                                ($item["allow_gid"] != "") OR
                                                ($item["deny_cid"] != "") OR
-                                               ($item["deny_gid"] != ""));
+                                               ($item["deny_gid"] != "") OR
+                                               $item["private"]);
 
                return ($status_user);
        }
        }
 
 /*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*/
 
 
                        logger('api_statuses_update: no user');
                        return false;
                }
+
                $user_info = api_get_user($a);
 
                // convert $_POST array items to the form we use for web posts.
                if($parent)
                        $_REQUEST['type'] = 'net-comment';
                else {
+                       // Check for throttling (maximum posts per day, week and month)
+                       $throttle_day = get_config('system','throttle_limit_day');
+                       if ($throttle_day > 0) {
+                               $datefrom = date("Y-m-d H:i:s", time() - 24*60*60);
+
+                               $r = q("SELECT COUNT(*) AS `posts_day` FROM `item` WHERE `uid`=%d AND `wall`
+                                       AND `created` > '%s' AND `id` = `parent`",
+                                       intval(api_user()), dbesc($datefrom));
+
+                               if ($r)
+                                       $posts_day = $r[0]["posts_day"];
+                               else
+                                       $posts_day = 0;
+
+                               if ($posts_day > $throttle_day) {
+                                       logger('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG);
+                                       die(api_error($a, $type, sprintf(t("Daily posting limit of %d posts reached. The post was rejected."), $throttle_day)));
+                               }
+                       }
+
+                       $throttle_week = get_config('system','throttle_limit_week');
+                       if ($throttle_week > 0) {
+                               $datefrom = date("Y-m-d H:i:s", time() - 24*60*60*7);
+
+                               $r = q("SELECT COUNT(*) AS `posts_week` FROM `item` WHERE `uid`=%d AND `wall`
+                                       AND `created` > '%s' AND `id` = `parent`",
+                                       intval(api_user()), dbesc($datefrom));
+
+                               if ($r)
+                                       $posts_week = $r[0]["posts_week"];
+                               else
+                                       $posts_week = 0;
+
+                               if ($posts_week > $throttle_week) {
+                                       logger('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG);
+                                       die(api_error($a, $type, sprintf(t("Weekly posting limit of %d posts reached. The post was rejected."), $throttle_week)));
+                               }
+                       }
+
+                       $throttle_month = get_config('system','throttle_limit_month');
+                       if ($throttle_month > 0) {
+                               $datefrom = date("Y-m-d H:i:s", time() - 24*60*60*30);
+
+                               $r = q("SELECT COUNT(*) AS `posts_month` FROM `item` WHERE `uid`=%d AND `wall`
+                                       AND `created` > '%s' AND `id` = `parent`",
+                                       intval(api_user()), dbesc($datefrom));
+
+                               if ($r)
+                                       $posts_month = $r[0]["posts_month"];
+                               else
+                                       $posts_month = 0;
+
+                               if ($posts_month > $throttle_month) {
+                                       logger('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG);
+                                       die(api_error($a, $type, sprintf(t("Monthly posting limit of %d posts reached. The post was rejected."), $throttle_month)));
+                               }
+                       }
+
                        $_REQUEST['type'] = 'wall';
                        if(x($_FILES,'media')) {
                                // upload the image if we have one
 
                $_REQUEST['api_source'] = true;
 
+               if (!x($_REQUEST, "source"))
+                       $_REQUEST["source"] = api_source();
+
                // call out normal post function
 
                require_once('mod/item.php');
                logger('api_status_show: user_info: '.print_r($user_info, true), LOGGER_DEBUG);
 
                // get last public wall message
-               $lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `c`.`nick` as `reply_author`, `i`.`author-link` AS `item-author`
-                               FROM `item`, `contact`, `item` as `i`, `contact` as `c`
+               $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
                        $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']) {
+                       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']);
-                               //$in_reply_to_user_id = $lastwall['reply_uid'];
-                               //$in_reply_to_screen_name = $lastwall['reply_author'];
 
                                $r = q("SELECT * FROM unique_contacts WHERE `url` = '%s'", dbesc(normalise_link($lastwall['item-author'])));
                                if ($r) {
                                }
                        }
 
+                       // There seems to be situation, where both fields are identical:
+                       // https://github.com/friendica/friendica/issues/1010
+                       // This is a bugfix for that.
+                       if (intval($in_reply_to_status_id) == intval($lastwall['id'])) {
+                               logger('api_status_show: this message should never appear: id: '.$lastwall['id'].' similar to reply-to: '.$in_reply_to_status_id, LOGGER_DEBUG);
+                               $in_reply_to_status_id = NULL;
+                               $in_reply_to_user_id = NULL;
+                               $in_reply_to_status_id_str = NULL;
+                               $in_reply_to_user_id_str = NULL;
+                               $in_reply_to_screen_name = NULL;
+                       }
+
                        $status_info = array(
                                'text' => trim(html2plain(bbcode(api_clean_plain_items($lastwall['body']), false, false, 2, true), 0)),
                                'truncated' => false,
                                'in_reply_to_user_id_str' => $in_reply_to_user_id_str,
                                'in_reply_to_screen_name' => $in_reply_to_screen_name,
                                'geo' => NULL,
-                               'favorited' => false,
+                               'favorited' => $lastwall['starred'] ? true : false,
                                // attachments
                                'user' => $user_info,
                                'statusnet_html'                => trim(bbcode($lastwall['body'], false, false)),
                                'statusnet_conversation_id'     => $lastwall['parent'],
                        );
 
+                       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;
 
                $lastwall = q("SELECT `item`.*
                                FROM `item`, `contact`
-                               WHERE `item`.`contact-id` = %d
+                               WHERE `item`.`uid` = %d AND `verb` = '%s' AND `item`.`contact-id` = %d
                                        AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s')))
                                        AND `contact`.`id`=`item`.`contact-id`
                                        AND `type`!='activity'
                                        AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
                                ORDER BY `created` DESC
                                LIMIT 1",
+                               intval(api_user()),
+                               dbesc(ACTIVITY_POST),
                                intval($user_info['cid']),
                                dbesc($user_info['url']),
                                dbesc(normalise_link($user_info['url'])),
                                dbesc($user_info['url']),
                                dbesc(normalise_link($user_info['url']))
                );
-//print_r($user_info);
                if (count($lastwall)>0){
                        $lastwall = $lastwall[0];
 
                        $in_reply_to_screen_name = NULL;
                        if ($lastwall['parent']!=$lastwall['id']) {
                                $reply = q("SELECT `item`.`id`, `item`.`contact-id` as `reply_uid`, `contact`.`nick` as `reply_author`, `item`.`author-link` AS `item-author`
-                                            FROM `item`,`contact` WHERE `contact`.`id`=`item`.`contact-id` AND `item`.`id` = %d", intval($lastwall['parent']));
+                                               FROM `item`,`contact` WHERE `contact`.`id`=`item`.`contact-id` AND `item`.`id` = %d", intval($lastwall['parent']));
                                if (count($reply)>0) {
                                        $in_reply_to_status_id = intval($lastwall['parent']);
                                        $in_reply_to_status_id_str = (string) intval($lastwall['parent']);
                                'in_reply_to_user_id_str' => $in_reply_to_user_id_str,
                                'in_reply_to_screen_name' => $in_reply_to_screen_name,
                                'geo' => NULL,
-                               'favorited' => false,
+                               'favorited' => $lastwall['starred'] ? true : 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;
        }
        api_register_func('api/users/show','api_users_show');
 
+
+       function api_users_search(&$a, $type) {
+               $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
+
+               $userlist = array();
+
+               if (isset($_GET["q"])) {
+                       $r = q("SELECT id FROM unique_contacts WHERE name='%s'", dbesc($_GET["q"]));
+                       if (!count($r))
+                               $r = q("SELECT id FROM unique_contacts WHERE nick='%s'", dbesc($_GET["q"]));
+
+                       if (count($r)) {
+                               foreach ($r AS $user) {
+                                       $user_info = api_get_user($a, $user["id"]);
+                                       //echo print_r($user_info, true)."\n";
+                                       $userdata = api_apply_template("user", $type, array('user' => $user_info));
+                                       $userlist[] = $userdata["user"];
+                               }
+                               $userlist = array("users" => $userlist);
+                       } else
+                               die(api_error($a, $type, t("User not found.")));
+               } else
+                       die(api_error($a, $type, t("User not found.")));
+
+               return ($userlist);
+       }
+
+       api_register_func('api/users/search','api_users_search');
+
        /**
         *
         * http://developer.twitter.com/doc/get/statuses/home_timeline
                        `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`.`id` DESC LIMIT %d ,%d ",
-                       //intval($user_info['uid']),
                        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. 
+               // at the network timeline just mark everything seen.
 
-               $r = q("UPDATE `item` SET `unseen` = 0 
+               $r = q("UPDATE `item` SET `unseen` = 0
                        WHERE `unseen` = 1 AND `uid` = %d",
                        //intval($user_info['uid'])
                        intval(api_user())
                if ($conversation_id > 0)
                        $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
 
-               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-                       `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-                       `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
-                       `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
-                       `user`.`nickname`, `user`.`hidewall`
-                       FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-                       LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
-                       WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-                       AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-                       AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-                       AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
-                       AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
+                       `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+                       `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
+                       `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
+                       `user`.`nickname`, `user`.`hidewall`
+                       FROM `item` STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+                       STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
+                       WHERE `verb` = '%s' AND `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                       AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
+                       AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
+                       AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
+                       AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                        $sql_extra
                        AND `item`.`id`>%d
-                       ORDER BY `item`.`id` DESC LIMIT %d, %d ",
+                       ORDER BY `item`.`id` DESC LIMIT %d, %d ",
+                       dbesc(ACTIVITY_POST),
                        intval($since_id),
-                       intval($start),
-                       intval($count));
+                       intval($start),
+                       intval($count));
 
                $ret = api_format_items($r,$user_info);
 
        api_register_func('api/statuses/public_timeline','api_statuses_public_timeline', true);
 
        /**
-        * 
+        *
         */
        function api_statuses_show(&$a, $type){
                if (api_user()===false) return false;
                        `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)
                );
 
                        FROM `item` INNER JOIN (SELECT `uri`,`parent` FROM `item` WHERE `id` = %d) AS `temp1`
                        ON (`item`.`thr-parent` = `temp1`.`uri` AND `item`.`parent` = `temp1`.`parent`), `contact`
                        WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
-                       AND `item`.`uid` = %d AND `contact`.`id` = `item`.`contact-id`
+                       AND `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()),
-                        intval($since_id),
-                        intval($start), intval($count)
+                       dbesc(ACTIVITY_POST),
+                       intval($since_id),
+                       intval($start), intval($count)
                );
 
                if (!$r)
                        $_REQUEST['type'] = 'wall';
                        $_REQUEST['api_source'] = true;
 
+                       if (!x($_REQUEST, "source"))
+                               $_REQUEST["source"] = api_source();
+
                        require_once('mod/item.php');
                        item_post($a);
                }
        api_register_func('api/statuses/destroy','api_statuses_destroy', true);
 
        /**
-        * 
+        *
         * http://developer.twitter.com/doc/get/statuses/mentions
-        * 
+        *
         */
        function api_statuses_mentions(&$a, $type){
                if (api_user()===false) return false;
                $myurl = str_replace('www.','',$myurl);
                $diasp_url = str_replace('/profile/','/u/',$myurl);
 
-               $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where `author-link` IN ('https://%s', 'http://%s') OR `mention`)",
-                       dbesc(protect_sprintf($myurl)),
-                       dbesc(protect_sprintf($myurl))
-               );
-
                if ($max_id > 0)
-                       $sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
+                       $sql_extra = ' AND `item`.`id` <= '.intval($max_id);
 
                $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                        `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                        FROM `item`, `contact`
-                       WHERE `item`.`uid` = %d
+                       WHERE `item`.`uid` = %d AND `verb` = '%s'
+                       AND NOT (`item`.`author-link` IN ('https://%s', 'http://%s'))
                        AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
                        AND `contact`.`id` = `item`.`contact-id`
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+                       AND `item`.`parent` IN (SELECT `iid` from thread where uid = %d AND `mention` AND !`ignored`)
                        $sql_extra
                        AND `item`.`id`>%d
                        ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
-                       //intval($user_info['uid']),
+                       intval(api_user()),
+                       dbesc(ACTIVITY_POST),
+                       dbesc(protect_sprintf($myurl)),
+                       dbesc(protect_sprintf($myurl)),
                        intval(api_user()),
                        intval($since_id),
                        intval($start), intval($count)
                        `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 `item`.`id`>%d
                        ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
                        intval(api_user()),
+                       dbesc(ACTIVITY_POST),
                        intval($user_info['cid']),
                        intval($since_id),
                        intval($start), intval($count)
        api_register_func('api/statuses/user_timeline','api_statuses_user_timeline', true);
 
 
+       /**
+        * Star/unstar an item
+        * param: id : id of the item
+        *
+        * api v1 : https://web.archive.org/web/20131019055350/https://dev.twitter.com/docs/api/1/post/favorites/create/%3Aid
+        */
+       function api_favorites_create_destroy(&$a, $type){
+               if (api_user()===false) return false;
+
+               # for versioned api.
+               # TODO: we need a better global soluton
+               $action_argv_id=2;
+               if ($a->argv[1]=="1.1") $action_argv_id=3;
+
+               if ($a->argc<=$action_argv_id) die(api_error($a, $type, t("Invalid request.")));
+               $action = str_replace(".".$type,"",$a->argv[$action_argv_id]);
+               if ($a->argc==$action_argv_id+2) {
+                       $itemid = intval($a->argv[$action_argv_id+1]);
+               } else {
+                       $itemid = intval($_REQUEST['id']);
+               }
+               if ($action!="create" && $action!="destroy") die(api_error($a, $type, t("Invalid action. ".$action)));
+
+               $item = q("SELECT * FROM item WHERE id=%d AND uid=%d",
+                               $itemid, api_user());
+
+               if ($item===false || count($item)==0) die(api_error($a, $type, t("Invalid item.")));
+
+               switch($action){
+                       case "create":
+                               $r = q("UPDATE item SET starred=1 WHERE id=%d AND uid=%d",
+                                               $itemid, api_user());
+                               $item[0]['starred']=1;
+                               break;
+                       case "destroy":
+                               $r = q("UPDATE item SET starred=0 WHERE id=%d AND uid=%d",
+                                               $itemid, api_user());
+                               $item[0]['starred']=0;
+                               break;
+               }
+
+               if ($r===false) die(api_error($a, $type, t("DB error")));
+
+
+               $user_info = api_get_user($a);
+               $ret = api_format_items($item,$user_info)[0];
+
+               $data = array('$status' => $ret);
+               switch($type){
+                       case "atom":
+                       case "rss":
+                               $data = api_rss_extra($a, $data, $user_info);
+               }
+
+               return  api_apply_template("status", $type, $data);
+       }
+
+       api_register_func('api/favorites/create', 'api_favorites_create_destroy', true);
+       api_register_func('api/favorites/destroy', 'api_favorites_create_destroy', true);
+
        function api_favorites(&$a, $type){
                global $called_api;
 
                                $sql_extra
                                AND `item`.`id`>%d
                                ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
-                               //intval($user_info['uid']),
                                intval(api_user()),
                                intval($since_id),
                                intval($start), intval($count)
 
        api_register_func('api/favorites','api_favorites', true);
 
+
+
+
        function api_format_as($a, $ret, $user_info) {
 
                $as = array();
                        $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";
                return $ret;
        }
 
-       function api_get_entitities($text, $bbcode) {
+       function api_get_entitities(&$text, $bbcode) {
                /*
                To-Do:
                * Links at the first character of the post
-               * different sizes of pictures
-               * caching picture data (using the id for that?) (See privacy_image_cache)
                */
 
+               $a = get_app();
+
                $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false");
 
-               if ($include_entities != "true")
-                       return 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);
                                        '[url=https://www.youtube.com/watch?v=$1]https://www.youtube.com/watch?v=$1[/url]', $bbcode);
                $bbcode = preg_replace("/\[youtube\](.*?)\[\/youtube\]/ism",'[url=$1]$1[/url]',$bbcode);
 
-                $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism",
+               $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);
 
 
                        $start = iconv_strpos($text, $url, $offset, "UTF-8");
                        if (!($start === false)) {
-                               $redirects = 0;
-                               $img_str = fetch_url($url,true, $redirects, 10);
-                               $image = @imagecreatefromstring($img_str);
+                               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" => $url,
-                                                               "media_url_https" => $url,
+                                                               "media_url" => normalise_link($media_url),
+                                                               "media_url_https" => $media_url,
                                                                "url" => $url,
                                                                "display_url" => $display_url,
                                                                "expanded_url" => $url,
                                                                "type" => "photo",
-                                                               "sizes" => array("medium" => array(
-                                                                                               "w" => imagesx($image),
-                                                                                               "h" => imagesy($image),
-                                                                                               "resize" => "fit")));
+                                                               "sizes" => $sizes);
                                }
                                $offset = $start + 1;
                        }
 
                return($entities);
        }
+       function api_format_items_embeded_images($item, $text){
+               $a = get_app();
+               $text = preg_replace_callback(
+                               "|data:image/([^;]+)[^=]+=*|m",
+                               function($match) use ($a, $item) {
+                                       return $a->get_baseurl()."/display/".$item['guid'];
+                               },
+                               $text);
+               return $text;
+       }
 
        function api_format_items($r,$user_info, $filter_user = false) {
 
                        $html = bbcode(api_clean_plain_items($item['body']), false, false, 2, true);
                        $statusbody = trim(html2plain($html, 0));
 
+                       // handle data: images
+                       $statusbody = api_format_items_embeded_images($item,$statusbody);
+
                        $statustitle = trim($item['title']);
 
                        if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false))
                        if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000))
                                $statustext = substr($statustext, 0, 1000)."... \n".$item["plink"];
 
+                       $statushtml = trim(bbcode($item['body'], false, false));
+
+
                        $status = array(
                                'text'          => $statustext,
                                '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,
+                               '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,
+                               'in_reply_to_user_id_str' => $in_reply_to_user_id_str,
                                'in_reply_to_screen_name' => $in_reply_to_screen_name,
                                'geo' => NULL,
                                'favorited' => $item['starred'] ? true : false,
                                //'attachments' => array(),
                                'user' =>  $status_user ,
                                //'entities' => NULL,
-                               'statusnet_html'                => trim(bbcode($item['body'], false, false)),
+                               'statusnet_html'                => $statushtml,
                                'statusnet_conversation_id'     => $item['parent'],
                        );
 
+                       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;
                        unset($status["user"]["self"]);
 
                        // 'geo' => array('type' => 'Point',
-                        //                   'coordinates' => array((float) $notice->lat,
-                        //                                          (float) $notice->lon));
-
-                       // Seesmic doesn't like the following content
-                       // completely disabled to make friendica totally compatible to the statusnet API
-                       /*if ($_SERVER['HTTP_USER_AGENT'] != 'Seesmic') {
-                               $status2 = array(
-                                       'updated'   => api_date($item['edited']),
-                                       'published' => api_date($item['created']),
-                                       'message_id' => $item['uri'],
-                                       'url'           => ($item['plink']!=''?$item['plink']:$item['author-link']),
-                                       'coordinates' => $item['coord'],
-                                       'place' => $item['location'],
-                                       'contributors' => '',
-                                       'annotations'  => '',
-                                       'entities'  => '',
-                                       'objecttype' => (($item['object-type']) ? $item['object-type'] : ACTIVITY_OBJ_NOTE),
-                                       'verb' => (($item['verb']) ? $item['verb'] : ACTIVITY_POST),
-                                       'self' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type,
-                                       'edit' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type,
-                               );
-
-                               $status = array_merge($status, $status2);
-                       }*/
+                       //                   'coordinates' => array((float) $notice->lat,
+                       //                                          (float) $notice->lon));
 
                        $ret[] = $status;
                };
        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);
                $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
                $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
 
-               $start = $page*$count;
+               $user_id = (x($_REQUEST,'user_id')?$_REQUEST['user_id']:"");
+               $screen_name = (x($_REQUEST,'screen_name')?$_REQUEST['screen_name']:"");
+
+               //  caller user info
+               unset($_REQUEST["user_id"]);
+               unset($_GET["user_id"]);
+
+               unset($_REQUEST["screen_name"]);
+               unset($_GET["screen_name"]);
 
+               $user_info = api_get_user($a);
                //$profile_url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
                $profile_url = $user_info["url"];
 
+
+               // pagination
+               $start = $page*$count;
+
+               // filters
                if ($box=="sentbox") {
                        $sql_extra = "`mail`.`from-url`='".dbesc( $profile_url )."'";
                }
                if ($max_id > 0)
                        $sql_extra .= ' AND `mail`.`id` <= '.intval($max_id);
 
+               if ($user_id !="") {
+                       $sql_extra .= ' AND `mail`.`contact-id` = ' . intval($user_id);
+               }
+               elseif($screen_name !=""){
+                       $sql_extra .= " AND `contact`.`nick` = '" . dbesc($screen_name). "'";
+               }
+
                $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,normalise_link($item['contact-url']));
                        }
-                       elseif ($box == "sentbox" || $item['from-url'] != $profile_url){
+                       elseif ($box == "sentbox" || $item['from-url'] == $profile_url){
                                $recipient = api_get_user($a,normalise_link($item['contact-url']));
                                $sender = $user_info;
 
                        }
-
                        $ret[]=api_format_messages($item, $recipient, $sender);
                }
 
        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"]);
 
@@ -2374,7 +2649,7 @@ function api_get_nick($profile) {
        // To-Do: look at the page if its really a pumpio site
        //if (!$nick == "") {
        //      $pumpio = preg_replace("=https?://(.*)/(.*)/=ism", "$2", $profile."/");
-        //     if ($pumpio != $profile)
+       //      if ($pumpio != $profile)
        //              $nick = $pumpio;
                //      <div class="media" id="profile-block" data-profile-id="acct:kabniel@microca.st">
 
@@ -2386,16 +2661,19 @@ function api_get_nick($profile) {
                return($nick);
        }
 
-        return(false);
+       return(false);
 }
 
 function api_clean_plain_items($Text) {
        $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false");
 
-       if ($include_entities == "true") {
-               $URLSearchString = "^\[\]";
+       $Text = bb_CleanPictureLinks($Text);
 
-               $Text = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'#$2',$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);
        }
 
@@ -2482,9 +2760,6 @@ function api_best_nickname(&$contacts) {
 
 /*
 Not implemented by now:
-favorites
-favorites/create
-favorites/destroy
 statuses/retweets_of_me
 friendships/create
 friendships/destroy