MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

provide option for viewing by parent created order

Browse source
This commit is contained in:
Friendika 2011-09-13 05:13:01 -07:00
parent 43da1429cc
commit 21d35e52dd
1 changed files with 76 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
mod/network.php
View file

@ -131,6 +131,8 @@ function network_content(&$a, $update = 0) {
$star = ((x($_GET['star'])) ? intval($_GET['star']) : 0); $star = ((x($_GET['star'])) ? intval($_GET['star']) : 0);
$bmark = ((x($_GET['bmark'])) ? intval($_GET['bmark']) : 0); $bmark = ((x($_GET['bmark'])) ? intval($_GET['bmark']) : 0);
$order = 'comment';
if(($a->argc > 2) && $a->argv[2] === 'new') if(($a->argc > 2) && $a->argv[2] === 'new')
$nouveau = true; $nouveau = true;
@ -313,24 +315,22 @@ function network_content(&$a, $update = 0) {
// Normal conversation view // Normal conversation view
// Show conversation by activity date // Show conversation by activity date
/* created date order
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `item`.`parent` = `item`.`id`
$sql_extra
ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
intval(local_user()),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
*/
if($order === 'post') {
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `item`.`parent` = `item`.`id`
$sql_extra
ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
intval(local_user()),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
}
else {
// $order === 'comment'
// First fetch a known number of parent items // First fetch a known number of parent items
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid` $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid`
@ -343,7 +343,6 @@ intval($a->pager['itemspage'])
WHERE `item`.`id`=`com`.`parent` AND WHERE `item`.`id`=`com`.`parent` AND
`item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra $sql_extra
ORDER BY `com`.`created` DESC LIMIT %d ,%d ", ORDER BY `com`.`created` DESC LIMIT %d ,%d ",
intval(local_user()), intval(local_user()),
@ -351,6 +350,7 @@ intval($a->pager['itemspage'])
intval($a->pager['start']), intval($a->pager['start']),
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
); );
}
// Then fetch all the children of the parents that are on this page // Then fetch all the children of the parents that are on this page
$parents_arr = array(); $parents_arr = array();
@ -361,23 +361,25 @@ intval($a->pager['itemspage'])
$parents_arr[] = $rr['item_id']; $parents_arr[] = $rr['item_id'];
$parents_str = implode(', ', $parents_arr); $parents_str = implode(', ', $parents_arr);
/* created order if($order === 'post') {
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, // parent created order
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact` `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact`
AND `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`id` = `item`.`contact-id`
AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s ) AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s )
ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", $sql_extra
intval(local_user()), ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ",
dbesc($parents_str) intval(local_user()),
*/ dbesc($parents_str)
);
}
else {
// $order === 'comment'
$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`.`writable`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
@ -399,9 +401,7 @@ dbesc($parents_str)
intval(local_user()), intval(local_user()),
dbesc($parents_str) dbesc($parents_str)
); );
}
} }
} }