From 80428a33d559cb163390ca471f32919a3bbb0768 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 12 Dec 2011 14:39:25 -0800 Subject: refactor updates --- mod/profile.php | 61 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 23 deletions(-) (limited to 'mod/profile.php') diff --git a/mod/profile.php b/mod/profile.php index e7cac7959..be608e3e9 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -148,12 +148,6 @@ function profile_content(&$a, $update = 0) { } - if($is_owner) { - $r = q("UPDATE `item` SET `unseen` = 0 - WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d", - intval(local_user()) - ); - } /** * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups @@ -162,31 +156,44 @@ function profile_content(&$a, $update = 0) { $sql_extra = permissions_sql($a->profile['profile_uid'],$remote_contact,$groups); - $r = q("SELECT COUNT(*) AS `total` - 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`.`id` = `item`.`parent` AND `item`.`wall` = 1 - $sql_extra ", - intval($a->profile['profile_uid']) + if($update) { - ); + // only setup pagination on initial page view + $pager_sql = ''; + $update_sql = " AND unseen = 1 "; + + } + else { + + $r = q("SELECT COUNT(*) AS `total` + 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`.`id` = `item`.`parent` AND `item`.`wall` = 1 + $sql_extra ", + intval($a->profile['profile_uid']) + ); + + if(count($r)) { + $a->set_pager_total($r[0]['total']); + $a->set_pager_itemspage(40); + } + + $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); + $update_sql = ''; - if(count($r)) { - $a->set_pager_total($r[0]['total']); - $a->set_pager_itemspage(40); } + $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 + $update_sql AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1 $sql_extra - ORDER BY `item`.`created` DESC LIMIT %d ,%d ", - intval($a->profile['profile_uid']), - intval($a->pager['start']), - intval($a->pager['itemspage']) + ORDER BY `item`.`created` DESC $pager_sql ", + intval($a->profile['profile_uid']) ); @@ -198,7 +205,7 @@ function profile_content(&$a, $update = 0) { $parents_arr[] = $rr['item_id']; $parents_str = implode(', ', $parents_arr); - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + $items = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` @@ -229,7 +236,15 @@ function profile_content(&$a, $update = 0) { . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; \r\n"; } - $o .= conversation($a,$r,'profile',$update); + + if($is_owner) { + $r = q("UPDATE `item` SET `unseen` = 0 + WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d", + intval(local_user()) + ); + } + + $o .= conversation($a,$items,'profile',$update); if(! $update) { $o .= paginate($a); -- cgit v1.2.3 From c45b903178f5dd0a6b98697db52de444c4a5d66a Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 12 Dec 2011 16:11:03 -0800 Subject: live update improvements --- mod/profile.php | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'mod/profile.php') diff --git a/mod/profile.php b/mod/profile.php index be608e3e9..b7f2c9662 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -158,9 +158,16 @@ function profile_content(&$a, $update = 0) { if($update) { - // only setup pagination on initial page view - $pager_sql = ''; - $update_sql = " AND unseen = 1 "; + $r = q("SELECT distinct(parent) 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 `item`.`parent` in (select parent from item where unseen = 1 ) + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`wall` = 1 + $sql_extra + ORDER BY `item`.`created` DESC", + intval($a->profile['profile_uid']) + ); } else { @@ -180,22 +187,18 @@ function profile_content(&$a, $update = 0) { } $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); - $update_sql = ''; - - } - - $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 - $update_sql - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1 - $sql_extra - ORDER BY `item`.`created` DESC $pager_sql ", - intval($a->profile['profile_uid']) + $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`.`id` = `item`.`parent` AND `item`.`wall` = 1 + $sql_extra + ORDER BY `item`.`created` DESC $pager_sql ", + intval($a->profile['profile_uid']) - ); + ); + } $parents_arr = array(); $parents_str = ''; -- cgit v1.2.3 From ee4975f1cd9f205e2300f3e22e51079c5e26f155 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 12 Dec 2011 19:08:13 -0800 Subject: unnecessary slash in profile update path --- mod/profile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/profile.php') diff --git a/mod/profile.php b/mod/profile.php index b7f2c9662..642e198b7 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -236,7 +236,7 @@ function profile_content(&$a, $update = 0) { $o .= '
' . "\r\n"; $o .= "\r\n"; + . "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; \r\n"; } -- cgit v1.2.3