Add max_id support for statuses/user_timeline API
- Add documentation - Improve formatting
This commit is contained in:
parent
dc7bff0235
commit
78c053c6b9
|
@ -2019,6 +2019,13 @@ function api_statuses_mentions($type)
|
||||||
api_register_func('api/statuses/mentions', 'api_statuses_mentions', true);
|
api_register_func('api/statuses/mentions', 'api_statuses_mentions', true);
|
||||||
api_register_func('api/statuses/replies', 'api_statuses_mentions', true);
|
api_register_func('api/statuses/replies', 'api_statuses_mentions', true);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Returns a user's public timeline
|
||||||
|
*
|
||||||
|
* @param string $type Either "json" or "xml"
|
||||||
|
* @return string|array
|
||||||
|
* @throws ForbiddenException
|
||||||
|
*/
|
||||||
function api_statuses_user_timeline($type)
|
function api_statuses_user_timeline($type)
|
||||||
{
|
{
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
@ -2028,7 +2035,6 @@ function api_statuses_user_timeline($type)
|
||||||
}
|
}
|
||||||
|
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
// get last network messages
|
|
||||||
|
|
||||||
logger(
|
logger(
|
||||||
"api_statuses_user_timeline: api_user: ". api_user() .
|
"api_statuses_user_timeline: api_user: ". api_user() .
|
||||||
|
@ -2037,18 +2043,18 @@ function api_statuses_user_timeline($type)
|
||||||
LOGGER_DEBUG
|
LOGGER_DEBUG
|
||||||
);
|
);
|
||||||
|
|
||||||
// params
|
$since_id = x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0;
|
||||||
$count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
|
$max_id = x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0;
|
||||||
$page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
|
$exclude_replies = x($_REQUEST, 'exclude_replies') ? 1 : 0;
|
||||||
if ($page < 0) {
|
$conversation_id = x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0;
|
||||||
$page = 0;
|
|
||||||
}
|
|
||||||
$since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_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;
|
// pagination
|
||||||
|
$count = x($_REQUEST, 'count') ? $_REQUEST['count'] : 20;
|
||||||
|
$page = x($_REQUEST, 'page') ? $_REQUEST['page'] : 1;
|
||||||
|
if ($page < 1) {
|
||||||
|
$page = 1;
|
||||||
|
}
|
||||||
|
$start = ($page - 1) * $count;
|
||||||
|
|
||||||
$sql_extra = '';
|
$sql_extra = '';
|
||||||
if ($user_info['self'] == 1) {
|
if ($user_info['self'] == 1) {
|
||||||
|
@ -2058,10 +2064,15 @@ function api_statuses_user_timeline($type)
|
||||||
if ($exclude_replies > 0) {
|
if ($exclude_replies > 0) {
|
||||||
$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
|
$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($conversation_id > 0) {
|
if ($conversation_id > 0) {
|
||||||
$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
|
$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($max_id > 0) {
|
||||||
|
$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id);
|
||||||
|
}
|
||||||
|
|
||||||
$r = q(
|
$r = q(
|
||||||
"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
|
"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user