diff options
author | friendica <info@friendica.com> | 2012-06-20 01:01:55 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-06-20 01:01:55 -0700 |
commit | 961c63377365b1cb05c3260cdec921b5825a495e (patch) | |
tree | 8de2776603a19635f926e593f822f9e617d40324 /include | |
parent | 1dd33770ed906c5c264166ae592779023ad2f919 (diff) | |
parent | eab3938471cd6d27b37be1b6f13dc4418c8ad020 (diff) | |
download | volse-hubzilla-961c63377365b1cb05c3260cdec921b5825a495e.tar.gz volse-hubzilla-961c63377365b1cb05c3260cdec921b5825a495e.tar.bz2 volse-hubzilla-961c63377365b1cb05c3260cdec921b5825a495e.zip |
Merge pull request #344 from ridcully/master
exclude_replies for twitter api
Diffstat (limited to 'include')
-rw-r--r-- | include/api.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/api.php b/include/api.php index 855e4efa3..691543907 100644 --- a/include/api.php +++ b/include/api.php @@ -719,14 +719,18 @@ 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); $start = $page*$count; //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); + $sql_extra = ''; 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`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -1061,11 +1065,14 @@ $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); $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`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, |