Added statuses/show parameter ?conversation=true
This commit is contained in:
parent
53c9ea7606
commit
0f5a6bfcdb
1 changed files with 17 additions and 10 deletions
|
@ -864,6 +864,8 @@
|
||||||
logger('API: api_statuses_show: '.$id);
|
logger('API: api_statuses_show: '.$id);
|
||||||
|
|
||||||
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
||||||
|
//$sql_extra = "";
|
||||||
|
if ($_GET["conversation"] == "true") $sql_extra .= " AND `item`.`parent` = %d"; else $sql_extra .= " AND `item`.`id` = %d";
|
||||||
|
|
||||||
$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`,
|
||||||
|
@ -874,12 +876,16 @@
|
||||||
AND `contact`.`id` = `item`.`contact-id`
|
AND `contact`.`id` = `item`.`contact-id`
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
$sql_extra
|
$sql_extra
|
||||||
AND `item`.`id`=%d",
|
",
|
||||||
intval($id)
|
intval($id)
|
||||||
);
|
);
|
||||||
|
//var_dump($r);
|
||||||
$ret = api_format_items($r,$user_info);
|
$ret = api_format_items($r,$user_info);
|
||||||
|
//var_dump($ret);
|
||||||
|
if ($_GET["conversation"] == "true") {
|
||||||
|
$data = array('$statuses' => $ret);
|
||||||
|
return api_apply_template("timeline", $type, $data);
|
||||||
|
} else {
|
||||||
$data = array('$status' => $ret[0]);
|
$data = array('$status' => $ret[0]);
|
||||||
/*switch($type){
|
/*switch($type){
|
||||||
case "atom":
|
case "atom":
|
||||||
|
@ -888,6 +894,7 @@
|
||||||
}*/
|
}*/
|
||||||
return api_apply_template("status", $type, $data);
|
return api_apply_template("status", $type, $data);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
api_register_func('api/statuses/show','api_statuses_show', true);
|
api_register_func('api/statuses/show','api_statuses_show', true);
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue