Merge pull request #344 from ridcully/master
exclude_replies for twitter api
This commit is contained in:
commit
961c633773
|
@ -719,14 +719,18 @@
|
||||||
if ($page<0) $page=0;
|
if ($page<0) $page=0;
|
||||||
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||||
$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_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);
|
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||||
|
|
||||||
$start = $page*$count;
|
$start = $page*$count;
|
||||||
|
|
||||||
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
||||||
|
|
||||||
|
$sql_extra = '';
|
||||||
if ($max_id > 0)
|
if ($max_id > 0)
|
||||||
$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
|
$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
|
||||||
|
if ($exclude_replies > 0)
|
||||||
|
$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
|
||||||
|
|
||||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||||
|
@ -1061,11 +1065,14 @@
|
||||||
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
|
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
|
||||||
if ($page<0) $page=0;
|
if ($page<0) $page=0;
|
||||||
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']: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);
|
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||||
|
|
||||||
$start = $page*$count;
|
$start = $page*$count;
|
||||||
|
|
||||||
if ($user_info['self']==1) $sql_extra = "AND `item`.`wall` = 1 ";
|
$sql_extra = '';
|
||||||
|
if ($user_info['self']==1) $sql_extra .= " AND `item`.`wall` = 1 ";
|
||||||
|
if ($exclude_replies > 0) $sql_extra .= ' AND `item`.`parent` = `item`.`id`';
|
||||||
|
|
||||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||||
|
|
Loading…
Reference in a new issue