Merge pull request #4777 from Rudloff/feature/list_api

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index c66ce5b9d32c423835a3a00cbe221309b190f8cc..f5fb96cb470286a089d74030dfbb59acdb8da9c2 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -1702,7 +1702,7 @@ function api_statuses_home_timeline($type)
        unset($_GET["screen_name"]);
 
        $user_info = api_get_user($a);
-       // get last newtork messages
+       // get last network messages
 
        // params
        $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
@@ -1798,7 +1798,7 @@ function api_statuses_public_timeline($type)
        }
 
        $user_info = api_get_user($a);
-       // get last newtork messages
+       // get last network messages
 
        // params
        $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
@@ -2270,7 +2270,7 @@ function api_statuses_mentions($type)
        unset($_GET["screen_name"]);
 
        $user_info = api_get_user($a);
-       // get last newtork messages
+       // get last network messages
 
 
        // params
@@ -3354,7 +3354,9 @@ function api_lists_statuses($type)
        unset($_GET["screen_name"]);
 
        $user_info = api_get_user($a);
-       // get last newtork messages
+       if (empty($_REQUEST, 'list_id')) {
+               throw new BadRequestException('list_id not specified');
+       }
 
        // params
        $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
@@ -3364,7 +3366,6 @@ function api_lists_statuses($type)
        }
        $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);
 
@@ -3392,6 +3393,7 @@ function api_lists_statuses($type)
                STRAIGHT_JOIN `group_member` ON `group_member`.`contact-id` = `item`.`contact-id`
                WHERE `item`.`uid` = ? AND `verb` = ?
                AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
+               $sql_extra
                AND `item`.`id`>?
                AND `group_member`.`gid` = ?
                ORDER BY `item`.`id` DESC LIMIT ".intval($start)." ,".intval($count),