live update improvements

diff --git a/mod/network.php b/mod/network.php
index 3a2d3cb8c343051715c8d913f4fc051a3ec5688b..e9e761c3ffd5eb5ab5c42649a735916bbddaee9b 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -376,7 +376,6 @@ function network_content(&$a, $update = 0) {
 
                // only setup pagination on initial page view
                $pager_sql = '';
-               $update_sql = " AND unseen = 1 ";
 
        }
        else {
@@ -393,11 +392,11 @@ function network_content(&$a, $update = 0) {
                        $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 = '';
        }
 
+       $simple_update = (($update) ? " and `item`.`unseen` = 1 " : '');
+
        if($nouveau) {
 
                // "New Item View" - show all items unthreaded in reverse created date order
@@ -408,7 +407,7 @@ function network_content(&$a, $update = 0) {
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                        FROM `item`, `contact`
                        WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-                       $update_sql
+                       $simple_update
                        AND `contact`.`id` = `item`.`contact-id`
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                        $sql_extra
@@ -429,16 +428,27 @@ function network_content(&$a, $update = 0) {
 
                // Fetch a page full of parent items for this page
 
-               $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`.`parent` = `item`.`id`
-                       $sql_extra
-                       ORDER BY `item`.$ordering DESC $pager_sql ",
-                       intval(local_user())
-               );
+               if($update) {
+                       $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
+                               $sql_extra ",
+                               intval(local_user())
+                       );
+               }
+               else {
+                       $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`.$ordering DESC $pager_sql ",
+                               intval(local_user())
+                       );
+               }
 
                // Then fetch all the children of the parents that are on this page
 

diff --git a/mod/profile.php b/mod/profile.php
index be608e3e90f5368e21fd9591953db962a4ad8ab6..b7f2c96624af17bc672992b4d3322664a7c679ab 100644 (file)
--- 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 = '';