diff options
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 152 |
1 files changed, 76 insertions, 76 deletions
diff --git a/mod/network.php b/mod/network.php index 072b20b92..ef97fb895 100644 --- a/mod/network.php +++ b/mod/network.php @@ -131,6 +131,8 @@ function network_content(&$a, $update = 0) { $star = ((x($_GET['star'])) ? intval($_GET['star']) : 0); $bmark = ((x($_GET['bmark'])) ? intval($_GET['bmark']) : 0); + $order = 'comment'; + if(($a->argc > 2) && $a->argv[2] === 'new') $nouveau = true; @@ -312,96 +314,94 @@ function network_content(&$a, $update = 0) { // Normal conversation view // 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` - FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - , (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` - FROM `item` AS `_com` - WHERE `_com`.`uid`=%d AND - (`_com`.`parent`!=`_com`.`id` OR `_com`.`id` NOT IN (SELECT `__com`.`parent` FROM `item` as `__com` WHERE `__com`.`parent`!=`__com`.`id`)) - GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` - WHERE `item`.`id`=`com`.`parent` AND - `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - - $sql_extra - ORDER BY `com`.`created` DESC LIMIT %d ,%d ", - intval(local_user()), - intval(local_user()), - intval($a->pager['start']), - intval($a->pager['itemspage']) - ); - // Then fetch all the children of the parents that are on this page - - $parents_arr = array(); - $parents_str = ''; - - if(count($r)) { - foreach($r as $rr) - $parents_arr[] = $rr['item_id']; - $parents_str = implode(', ', $parents_arr); - -/* created order -$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, -`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, -`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, -`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` -FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact` -WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 -AND `contact`.`id` = `item`.`contact-id` -AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 -AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s ) -$sql_extra -ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", -intval(local_user()), -dbesc($parents_str) -*/ - - - - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, - `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, - `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` - FROM `item`, `contact`, - (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` + $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid` + FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` + , (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` FROM `item` AS `_com` WHERE `_com`.`uid`=%d AND (`_com`.`parent`!=`_com`.`id` OR `_com`.`id` NOT IN (SELECT `__com`.`parent` FROM `item` as `__com` WHERE `__com`.`parent`!=`__com`.`id`)) GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - AND `contact`.`id` = `item`.`contact-id` - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`parent` = `com`.`parent` AND `item`.`parent` IN ( %s ) + WHERE `item`.`id`=`com`.`parent` AND + `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $sql_extra - ORDER BY `com`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + ORDER BY `com`.`created` DESC LIMIT %d ,%d ", intval(local_user()), intval(local_user()), - dbesc($parents_str) + intval($a->pager['start']), + intval($a->pager['itemspage']) ); + } + // Then fetch all the children of the parents that are on this page + $parents_arr = array(); + $parents_str = ''; + if(count($r)) { + foreach($r as $rr) + $parents_arr[] = $rr['item_id']; + $parents_str = implode(', ', $parents_arr); + if($order === 'post') { + // parent created order + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, + `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, + `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` + FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact` + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + AND `contact`.`id` = `item`.`contact-id` + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s ) + $sql_extra + ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + intval(local_user()), + dbesc($parents_str) + ); + } + else { + // $order === 'comment' + + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, + `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, + `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` + FROM `item`, `contact`, + (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` + FROM `item` AS `_com` + WHERE `_com`.`uid`=%d AND + (`_com`.`parent`!=`_com`.`id` OR `_com`.`id` NOT IN (SELECT `__com`.`parent` FROM `item` as `__com` WHERE `__com`.`parent`!=`__com`.`id`)) + GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + AND `contact`.`id` = `item`.`contact-id` + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`parent` = `com`.`parent` AND `item`.`parent` IN ( %s ) + $sql_extra + ORDER BY `com`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + intval(local_user()), + intval(local_user()), + dbesc($parents_str) + ); + } } } |