Merge pull request #746 from fabrixxm/bug740

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index 60015566659452dc00782b26608f43d1ec18d323..5e80e0f0a317c54020177d021e4250c4d028e164 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -649,7 +649,7 @@
                                'created_at' => api_date($lastwall['created']),
                                'in_reply_to_status_id' => $in_reply_to_status_id,
                                'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
-                               'id' => $lastwall['contact-id'],
+                               'id' => $lastwall['id'],
                                'in_reply_to_user_id' => $in_reply_to_user_id,
                                'in_reply_to_screen_name' => $in_reply_to_screen_name,
                                'geo' => '',
@@ -741,8 +741,9 @@
                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);
-               $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
                //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+               $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
+               $conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0);
 
                $start = $page*$count;
 
@@ -753,6 +754,8 @@
                        $sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
                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`,
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -816,6 +819,8 @@
                $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
                $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
                //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+               $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
+               $conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0);
 
                $start = $page*$count;
 
@@ -823,6 +828,10 @@
 
                if ($max_id > 0)
                        $sql_extra = 'AND `item`.`id` <= '.intval($max_id);
+               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`,
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -1124,14 +1133,19 @@
                $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
                if ($page<0) $page=0;
                $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
-               $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
                //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
-               
+               $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
+               $conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0);
+
                $start = $page*$count;
 
                $sql_extra = '';
                if ($user_info['self']==1) $sql_extra .= " AND `item`.`wall` = 1 ";
-               if ($exclude_replies > 0)  $sql_extra .= ' AND `item`.`parent` = `item`.`id`';
+
+               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`, 
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -1433,7 +1447,7 @@
                return api_apply_template('test', $type, array('$ok' => $ok));
 
        }
-       api_register_func('api/help/test','api_help_test',true);
+       api_register_func('api/help/test','api_help_test',false);
 
        /**
         *  https://dev.twitter.com/docs/api/1/get/statuses/friends