From eeecb412aa9296be1f61e99db7695e672b08861f Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 6 Sep 2011 00:55:24 -0700 Subject: view bookmarks --- mod/network.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'mod/network.php') diff --git a/mod/network.php b/mod/network.php index 1434f5d31..624fb8793 100644 --- a/mod/network.php +++ b/mod/network.php @@ -14,6 +14,9 @@ function network_init(&$a) { $a->page['aside'] = ''; $search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : ''); + + // We need a better way of managing a growing argument list + $srchurl = '/network' . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '') @@ -44,8 +47,9 @@ function network_init(&$a) { $a->page['aside'] .= ''; + } else { $a->page['aside'] .= '' . t('View New Items') . ''; @@ -65,6 +69,14 @@ function network_init(&$a) { . '' . '
'; + if(! $_GET['bmark']) + $a->page['aside'] .= ''; + + } $a->page['aside'] .= ''; -- cgit v1.2.3 From 694e74d54df36fd035854cd52fa4f9bb700ca491 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 8 Sep 2011 11:18:44 +0200 Subject: Show conversations in network default view ordered by activity --- mod/network.php | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'mod/network.php') diff --git a/mod/network.php b/mod/network.php index 624fb8793..7d2f48d0c 100644 --- a/mod/network.php +++ b/mod/network.php @@ -311,21 +311,29 @@ function network_content(&$a, $update = 0) { else { // Normal conversation view + // Show conversation by activity date + + // 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` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + , (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` + FROM `item` AS `_com` + WHERE `_com`.`uid`=%d AND `_com`.`parent`!=`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 - AND `item`.`parent` = `item`.`id` + $sql_extra - ORDER BY `item`.`created` DESC LIMIT %d ,%d ", + 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(); @@ -340,13 +348,18 @@ function network_content(&$a, $update = 0) { `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` + FROM `item`, `contact`, + (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` + FROM `item` AS `_com` + WHERE `_com`.`uid`=%d AND `_com`.`parent`!=`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` = `parentitem`.`id` AND `item`.`parent` IN ( %s ) + AND `item`.`parent` = `com`.`parent` AND `item`.`parent` IN ( %s ) $sql_extra - ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + ORDER BY `com`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + intval(local_user()), intval(local_user()), dbesc($parents_str) ); -- cgit v1.2.3 From ad7c111c7c0388678c6479ce9a282ce18a291c29 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 8 Sep 2011 14:39:53 +0200 Subject: deal with messages without comments or likes --- mod/network.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mod/network.php') diff --git a/mod/network.php b/mod/network.php index 7d2f48d0c..6684889e3 100644 --- a/mod/network.php +++ b/mod/network.php @@ -320,7 +320,8 @@ function network_content(&$a, $update = 0) { 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`!=`id` + 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 @@ -333,7 +334,6 @@ function network_content(&$a, $update = 0) { intval($a->pager['start']), intval($a->pager['itemspage']) ); - // Then fetch all the children of the parents that are on this page $parents_arr = array(); @@ -351,7 +351,8 @@ function network_content(&$a, $update = 0) { FROM `item`, `contact`, (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` FROM `item` AS `_com` - WHERE `_com`.`uid`=%d AND `_com`.`parent`!=`id` + 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` -- cgit v1.2.3