]> git.mxchange.org Git - friendica.git/blobdiff - include/api.php
Mentions are now displayed much faster. Attention: The related database update can...
[friendica.git] / include / api.php
index 691543907b29e2d33e61239a86c6a0df1d4f7fa4..1b33378b0a59fb92a955d3322bda93b763120db1 100644 (file)
@@ -1,9 +1,9 @@
 <?php
-       require_once("bbcode.php");
-       require_once("datetime.php");
-       require_once("conversation.php");
-       require_once("oauth.php");
-       require_once("html2plain.php");
+       require_once("include/bbcode.php");
+       require_once("include/datetime.php");
+       require_once("include/conversation.php");
+       require_once("include/oauth.php");
+       require_once("include/html2plain.php");
        /*
         * Twitter-Like API
         *
        $API = Array();
        $called_api = Null;
 
+        function api_user() {
+          // It is not sufficient to use local_user() to check whether someone is allowed to use the API,
+          // because this will open CSRF holes (just embed an image with src=friendicasite.com/api/statuses/update?status=CSRF
+          // into a page, and visitors will post something without noticing it).
+          // Instead, use this function.
+          if ($_SESSION["allow_api"])
+            return local_user();
+
+          return false;
+        }
+
        function api_date($str){
                //Wed May 23 06:01:13 +0000 2007
                return datetime_convert('UTC', 'UTC', $str, "D M d H:i:s +0000 Y" );
@@ -74,7 +85,7 @@
                // process normal login request
 
                $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
-                       AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
+                       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)),
                        dbesc($encrypted)
                }
 
                require_once('include/security.php');
-               authenticate_success($record);
+               authenticate_success($record); $_SESSION["allow_api"] = true;
 
                call_hooks('logged_in', $a->user);
 
                        if (strpos($a->query_string, $p)===0){
                                $called_api= explode("/",$p);
                                //unset($_SERVER['PHP_AUTH_USER']);
-                               if ($info['auth']===true && local_user()===false) {
+                               if ($info['auth']===true && api_user()===false) {
                                                api_login($a);
                                }
 
-                               load_contact_links(local_user());
+                               load_contact_links(api_user());
 
                                logger('API call for ' . $a->user['username'] . ': ' . $a->query_string);
                                logger('API parameters: ' . print_r($_REQUEST,true));
                                //echo "<pre>"; var_dump($r); die();
                        }
                }
+               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>';
                switch($type){
                if(is_null($user) && x($_GET, 'screen_name')) {
                        $user = dbesc($_GET['screen_name']);    
                        $extra_query = "AND `contact`.`nick` = '%s' ";
-                       if (local_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(local_user());
+                       if (api_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(api_user());
                        
                }
                
                        } else {
                                $user = dbesc($user);
                                $extra_query = "AND `contact`.`nick` = '%s' ";
-                               if (local_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(local_user());
+                               if (api_user()!==false)  $extra_query .= "AND `contact`.`uid`=".intval(api_user());
                        }
                }
                
                if (! $user) {
-                       if (local_user()===false) {
+                       if (api_user()===false) {
                                api_login($a); return False;
                        } else {
                                $user = $_SESSION['uid'];
                
                if($uinfo[0]['self']) {
                        $usr = q("select * from user where uid = %d limit 1",
-                               intval(local_user())
+                               intval(api_user())
                        );
                        $profile = q("select * from profile where uid = %d and `is-default` = 1 limit 1",
-                               intval(local_user())
+                               intval(api_user())
                        );
 
                        // count public wall messages
         * http://developer.twitter.com/doc/get/account/verify_credentials
         */
        function api_account_verify_credentials(&$a, $type){
-               if (local_user()===false) return false;
+               if (api_user()===false) return false;
                $user_info = api_get_user($a);
                
                return api_apply_template("user", $type, array('$user' => $user_info));
 
 /*Waitman Gobble Mod*/
         function api_statuses_mediap(&$a, $type) {
-                if (local_user()===false) {
+                if (api_user()===false) {
                         logger('api_statuses_update: no user');
                         return false;
                 }
                 $user_info = api_get_user($a);
 
                 $_REQUEST['type'] = 'wall';
-                $_REQUEST['profile_uid'] = local_user();
+                $_REQUEST['profile_uid'] = api_user();
                 $_REQUEST['api_source'] = true;
-                $txt = urldecode(requestdata('status'));
+                $txt = requestdata('status');
+                //$txt = urldecode(requestdata('status'));
 
                 require_once('library/HTMLPurifier.auto.php');
                 require_once('include/html2bbcode.php');
 
 
        function api_statuses_update(&$a, $type) {
-               if (local_user()===false) {
+               if (api_user()===false) {
                        logger('api_statuses_update: no user');
                        return false;
                }
 
                }
                else
-                       $_REQUEST['body'] = urldecode(requestdata('status'));
+                       $_REQUEST['body'] = requestdata('status');
+                       //$_REQUEST['body'] = urldecode(requestdata('status'));
+
+               $_REQUEST['title'] = requestdata('title');
 
                $parent = requestdata('in_reply_to_status_id');
                if(ctype_digit($parent))
 
                if(requestdata('lat') && requestdata('long'))
                        $_REQUEST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long'));
-               $_REQUEST['profile_uid'] = local_user();
-               if(requestdata('parent'))
+               $_REQUEST['profile_uid'] = api_user();
+
+               if($parent)
                        $_REQUEST['type'] = 'net-comment';
                else {
                        $_REQUEST['type'] = 'wall';
-                        if(x($_FILES,'media')) {
-                               // upload the image if we have one
-                               $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
-                               require_once('mod/wall_upload.php');
-                               $media = wall_upload_post($a);
-                               if(strlen($media)>0)
-                                       $_REQUEST['body'] .= "\n\n".$media;
-                               }
+                       if(x($_FILES,'media')) {
+                               // upload the image if we have one
+                               $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
+                               require_once('mod/wall_upload.php');
+                               $media = wall_upload_post($a);
+                               if(strlen($media)>0)
+                                       $_REQUEST['body'] .= "\n\n".$media;
+                       }
                }
 
                // set this so that the item_post() function is quiet and doesn't redirect or emit json
         * TODO: Add reply info
         */
        function api_statuses_home_timeline(&$a, $type){
-               if (local_user()===false) return false;
+               if (api_user()===false) return false;
 
                $user_info = api_get_user($a);
                // get last newtork messages
 
                $ret = api_format_items($r,$user_info);
 
+               // We aren't going to try to figure out at the item, group, and page
+               // level which items you've seen and which you haven't. If you're looking
+               // at the network timeline just mark everything seen. 
+       
+               $r = q("UPDATE `item` SET `unseen` = 0 
+                       WHERE `unseen` = 1 AND `uid` = %d",
+                       intval($user_info['uid'])
+               );
+
 
                $data = array('$statuses' => $ret);
                switch($type){
        api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
 
        function api_statuses_public_timeline(&$a, $type){
-               if (local_user()===false) return false;
+               if (api_user()===false) return false;
 
                $user_info = api_get_user($a);
                // get last newtork messages
         * 
         */
        function api_statuses_show(&$a, $type){
-               if (local_user()===false) return false;
+               if (api_user()===false) return false;
 
                $user_info = api_get_user($a);
 
                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 ";
+               else
+                       $sql_extra .= " AND `item`.`id` = %d";
 
                $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                        WHERE `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",
+                       $sql_extra",
                        intval($id)
                );
 
                $ret = api_format_items($r,$user_info);
 
-               $data = array('$status' => $ret[0]);
-               /*switch($type){
-                       case "atom":
-                       case "rss":
-                               $data = api_rss_extra($a, $data, $user_info);
-               }*/
-               return  api_apply_template("status", $type, $data);
+               if ($conversation) {
+                       $data = array('$statuses' => $ret);
+                       return api_apply_template("timeline", $type, $data);
+               } else {
+                       $data = array('$status' => $ret[0]);
+                       /*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/statuses/show','api_statuses_show', true);
 
         * 
         */
        function api_statuses_repeat(&$a, $type){
-               if (local_user()===false) return false;
+               if (api_user()===false) return false;
 
                $user_info = api_get_user($a);
 
                //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
 
                $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`nick` as `reply_author`,
-                       `contact`.`name`, `contact`.`photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
+                       `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`
                        FROM `item`, `contact`
                );
 
                if ($r[0]['body'] != "") {
-                       $_REQUEST['body'] = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
-                       $_REQUEST['profile_uid'] = local_user();
+                       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]";
+                               $_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'];
+
+                       $_REQUEST['profile_uid'] = api_user();
                        $_REQUEST['type'] = 'wall';
                        $_REQUEST['api_source'] = true;
 
         * 
         */
        function api_statuses_destroy(&$a, $type){
-               if (local_user()===false) return false;
+               if (api_user()===false) return false;
 
                $user_info = api_get_user($a);
 
         * 
         */
        function api_statuses_mentions(&$a, $type){
-               if (local_user()===false) return false;
+               if (api_user()===false) return false;
                                
                $user_info = api_get_user($a);
                // get last newtork messages
                $myurl = str_replace(array('www.','.'),array('','\\.'),$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 . ']%'))
-                        );
+               /*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);
 
 
        function api_statuses_user_timeline(&$a, $type){
-               if (local_user()===false) return false;
+               if (api_user()===false) return false;
                
                $user_info = api_get_user($a);
                // get last newtork messages
 
 
-               logger("api_statuses_user_timeline: local_user: ". local_user() .
+               logger("api_statuses_user_timeline: api_user: ". api_user() .
                           "\nuser_info: ".print_r($user_info, true) .
                           "\n_REQUEST:  ".print_r($_REQUEST, true),
                           LOGGER_DEBUG);
                        $sql_extra
                        AND `item`.`id`>%d
                        ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
-                       intval(local_user()),
+                       intval(api_user()),
                        intval($user_info['id']),
                        intval($since_id),
                        intval($start), intval($count)
 
 
        function api_favorites(&$a, $type){
-               if (local_user()===false) return false;
+               if (api_user()===false) return false;
 
                $user_info = api_get_user($a);
                // in friendica starred item are private
                return($as);
        }
 
+       function api_format_messages($item, $recipient, $sender) {
+               // 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,
+                               'recipient_id'          => $recipient['id'],
+                               'recipient_screen_name' => $recipient['screen_name'],
+                               'recipient'             => $recipient,
+               );
+
+               //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']);
+                       }
+                       elseif ($_GET["getText"] == "plain") {
+                               $ret['text'] = html2plain(bbcode($item['body']), 0);
+                       }
+               }
+               else {
+                       $ret['text'] = $item['title']."\n".html2plain(bbcode($item['body']), 0);
+               }
+               if (isset($_GET["getUserObjects"]) && $_GET["getUserObjects"] == "false") {
+                       unset($ret['sender']);
+                       unset($ret['recipient']);
+               }
+
+               return $ret;
+       }
+
        function api_format_items($r,$user_info) {
 
                //logger('api_format_items: ' . print_r($r,true));
         *  returns: json, xml 
         **/
        function api_statuses_f(&$a, $type, $qtype) {
-               if (local_user()===false) return false;
+               if (api_user()===false) return false;
                $user_info = api_get_user($a);
                
                
                        $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",
-                       intval(local_user())
+                       intval(api_user())
                );
 
                $ret = array();
                                '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'
+                               'shorturllength' => '30',
+        'friendica' => array(
+                             'FRIENDICA_PLATFORM' => FRIENDICA_PLATFORM,
+                             'FRIENDICA_VERSION' => FRIENDICA_VERSION,
+                             'DFRN_PROTOCOL_VERSION' => DFRN_PROTOCOL_VERSION,
+                             'DB_UPDATE_VERSION' => DB_UPDATE_VERSION
+                             )
                        ),
                );  
 
 
 
        function api_ff_ids(&$a,$type,$qtype) {
-               if(! local_user())
+               if(! api_user())
                        return false;
 
                if($qtype == 'friends')
  
 
                $r = q("SELECT id FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
-                       intval(local_user())
+                       intval(api_user())
                );
 
                if(is_array($r)) {
 
 
        function api_direct_messages_new(&$a, $type) {
-               if (local_user()===false) return false;
+               if (api_user()===false) return false;
                
                if (!x($_POST, "text") || !x($_POST,"screen_name")) return;
-               
+
                $sender = api_get_user($a);
                
+               require_once("include/message.php");
+
                $r = q("SELECT `id` FROM `contact` WHERE `uid`=%d AND `nick`='%s'",
-                               intval(local_user()),
+                               intval(api_user()),
                                dbesc($_POST['screen_name']));
-               
+
                $recipient = api_get_user($a, $r[0]['id']);                     
-               
+               $replyto = '';
+               $sub     = '';
+               if (x($_REQUEST,'replyto')) {
+                       $r = q('SELECT `parent-uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d',
+                                       intval(api_user()),
+                                       intval($_REQUEST['replyto']));
+                       $replyto = $r[0]['parent-uri'];
+                       $sub     = $r[0]['title'];
+               }
+               else {
+                       if (x($_REQUEST,'title')) {
+                               $sub = $_REQUEST['title'];
+                       }
+                       else {
+                               $sub = ((strlen($_POST['text'])>10)?substr($_POST['text'],0,10)."...":$_POST['text']);
+                       }
+               }
+
+               $id = send_message($recipient['id'], $_POST['text'], $sub, $replyto);
 
-               require_once("include/message.php");
-               $sub = ( (strlen($_POST['text'])>10)?substr($_POST['text'],0,10)."...":$_POST['text']);
-               $id = send_message($recipient['id'], $_POST['text'], $sub);
-               
-               
                if ($id>-1) {
                        $r = q("SELECT * FROM `mail` WHERE id=%d", intval($id));
-                       $item = $r[0];
-                       $ret=Array(
-                                       'id' => $item['id'],
-                                       'created_at'=> api_date($item['created']),
-                                       'sender_id'=> $sender['id'] ,
-                                       'sender_screen_name'=> $sender['screen_name'],
-                                       'sender'=> $sender,
-                                       'recipient_id'=> $recipient['id'],
-                                       'recipient_screen_name'=> $recipient['screen_name'],
-                                       'recipient'=> $recipient,
-                                       
-                                       'text'=> $item['title']."\n".html2plain(bbcode($item['body']), 0) ,
-                                       
-                       );
+                       $ret = api_format_messages($r[0], $recipient, $sender);
                
                } else {
                        $ret = array("error"=>$id);     
        }
        api_register_func('api/direct_messages/new','api_direct_messages_new',true);
 
-    function api_direct_messages_box(&$a, $type, $box) {
-               if (local_user()===false) return false;
+       function api_direct_messages_box(&$a, $type, $box) {
+               if (api_user()===false) return false;
                
                $user_info = api_get_user($a);
                
                
                $start = $page*$count;
                
-       
+               $profile_url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
                if ($box=="sentbox") {
-                       $sql_extra = "`from-url`='%s'";
-               } else {
-                       $sql_extra = "`from-url`!='%s'";
+                       $sql_extra = "`from-url`='".dbesc( $profile_url )."'";
+               }
+               elseif ($box=="conversation") {
+                       $sql_extra = "`parent-uri`='".dbesc( $_GET["uri"] )  ."'";
+               }
+               elseif ($box=="all") {
+                       $sql_extra = "true";
+               }
+               elseif ($box=="inbox") {
+                       $sql_extra = "`from-url`!='".dbesc( $profile_url )."'";
                }
                
                $r = q("SELECT * FROM `mail` WHERE uid=%d AND $sql_extra ORDER BY created DESC LIMIT %d,%d",
-                               intval(local_user()),
-                               dbesc( $a->get_baseurl() . '/profile/' . $a->user['nickname'] ),
+                               intval(api_user()),
                                intval($start), intval($count)
-                          );
+               );
                
                $ret = Array();
-               foreach($r as $item){
-                       switch ($box){
-                               case "inbox":
-                                       $recipient = $user_info;
-                                       $sender = api_get_user($a,$item['contact-id']);
-                                       break;
-                               case "sentbox":
-                                       $recipient = api_get_user($a,$item['contact-id']);
-                                       $sender = $user_info;
-                                       break;
+               foreach($r as $item) {
+                       if ($box == "inbox" || $item['from-url'] != $profile_url){
+                               $recipient = $user_info;
+                               $sender = api_get_user($a,$item['contact-id']);
                        }
-                               
-                       $ret[]=Array(
-                               'id' => $item['id'],
-                               'created_at'=> api_date($item['created']),
-                               'sender_id'=> $sender['id'] ,
-                               'sender_screen_name'=> $sender['screen_name'],
-                               'sender'=> $sender,
-                               'recipient_id'=> $recipient['id'],
-                               'recipient_screen_name'=> $recipient['screen_name'],
-                               'recipient'=> $recipient,
-                               
-                               'text'=> $item['title']."\n".html2plain(bbcode($item['body']), 0) ,
-                               
-                       );
-                       
+                       elseif ($box == "sentbox" || $item['from-url'] != $profile_url){
+                               $recipient = api_get_user($a,$item['contact-id']);
+                               $sender = $user_info;
+                       }
+
+                       $ret[]=api_format_messages($item, $recipient, $sender);
                }
                
 
        function api_direct_messages_inbox(&$a, $type){
                return api_direct_messages_box($a, $type, "inbox");
        }
+       function api_direct_messages_all(&$a, $type){
+               return api_direct_messages_box($a, $type, "all");
+       }
+       function api_direct_messages_conversation(&$a, $type){
+               return api_direct_messages_box($a, $type, "conversation");
+       }
+       api_register_func('api/direct_messages/conversation','api_direct_messages_conversation',true);
+       api_register_func('api/direct_messages/all','api_direct_messages_all',true);
        api_register_func('api/direct_messages/sent','api_direct_messages_sentbox',true);
        api_register_func('api/direct_messages','api_direct_messages_inbox',true);
 
@@ -1672,4 +1766,6 @@ notifications/follow
 notifications/leave
 blocks/exists
 blocks/blocking
+lists
 */
+