X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=c2cb8e03fc848db9379114e949027546b1968a1b;hb=bf0b98017decf73123891e935993f2921d3b0acf;hp=3013e94984101597289ee99d94b1f101e20493c2;hpb=2e03a3a47fe46fd953f3dbbe3486579f90dcd5f8;p=friendica.git

diff --git a/mod/network.php b/mod/network.php
index 3013e94984..c2cb8e03fc 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -340,12 +340,12 @@ function networkSetSeen($condition)
  * @param integer $update Used for the automatic reloading
  * @return string HTML of the conversation
  */
-function networkConversation($a, $items, $mode, $update)
+function networkConversation($a, $items, $mode, $update, $ordering = '')
 {
 	// Set this so that the conversation function can find out contact info for our wall-wall items
 	$a->page_contact = $a->contact;
 
-	$o = conversation($a, $items, $mode, $update);
+	$o = conversation($a, $items, $mode, $update, false, $ordering);
 
 	if (!$update) {
 		if (PConfig::get(local_user(), 'system', 'infinite_scroll')) {
@@ -358,7 +358,7 @@ function networkConversation($a, $items, $mode, $update)
 	return $o;
 }
 
-function network_content(App $a, $update = 0)
+function network_content(App $a, $update = 0, $parent = 0)
 {
 	if (!local_user()) {
 		return Login::form();
@@ -385,7 +385,7 @@ function network_content(App $a, $update = 0)
 	if ($nouveau) {
 		$o = networkFlatView($a, $update);
 	} else {
-		$o = networkThreadedView($a, $update);
+		$o = networkThreadedView($a, $update, $parent);
 	}
 
 	return $o;
@@ -439,7 +439,7 @@ function networkFlatView(App $a, $update = 0)
 
 		if (!Config::get('theme', 'hide_eventlist')) {
 			$o .= Profile::getBirthdays();
-			$o .= Profile::getEvents();
+			$o .= Profile::getEventsReminderHTML();
 		}
 	}
 
@@ -476,7 +476,7 @@ function networkFlatView(App $a, $update = 0)
  * @param integer $update Used for the automatic reloading
  * @return string HTML of the network content in flat view
  */
-function networkThreadedView(App $a, $update = 0)
+function networkThreadedView(App $a, $update, $parent)
 {
 	// Rawmode is used for fetching new content at the end of the page
 	$rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw'));
@@ -677,7 +677,7 @@ function networkThreadedView(App $a, $update = 0)
 
 	if (!$gid && !$cid && !$update && !Config::get('theme', 'hide_eventlist')) {
 		$o .= Profile::getBirthdays();
-		$o .= Profile::getEvents();
+		$o .= Profile::getEventsReminderHTML();
 	}
 
 	if ($datequery) {
@@ -689,9 +689,6 @@ function networkThreadedView(App $a, $update = 0)
 				dbesc(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
 	}
 
-	$sql_order = '';
-	$order_mode = 'received';
-
 	if ($conv) {
 		$sql_extra3 .= " AND $sql_table.`mention`";
 	}
@@ -699,14 +696,10 @@ function networkThreadedView(App $a, $update = 0)
 	// Normal conversation view
 	if ($order === 'post') {
 		$ordering = '`created`';
-		if ($sql_order == '') {
-			$order_mode = 'created';
-		}
+		$order_mode = 'created';
 	} else {
 		$ordering = '`commented`';
-		if ($sql_order == '') {
-			$order_mode = 'commented';
-		}
+		$order_mode = 'commented';
 	}
 
 	if ($sql_order == '') {
@@ -759,28 +752,41 @@ function networkThreadedView(App $a, $update = 0)
 
 	// Fetch a page full of parent items for this page
 	if ($update) {
-		if (Config::get('system', 'like_no_comment')) {
-			$sql_extra4 = " AND `item`.`verb` = '" . ACTIVITY_POST . "'";
+		if (!empty($parent)) {
+			// Load only a single thread
+			$sql_extra4 = "`item`.`id` = ".intval($parent);
 		} else {
-			$sql_extra4 = '';
+			// Load all unseen items
+			$sql_extra4 = "`item`.`unseen`";
+			if (Config::get("system", "like_no_comment")) {
+				$sql_extra4 .= " AND `item`.`verb` = '".ACTIVITY_POST."'";
+			}
+			if ($order === 'post') {
+				// Only show toplevel posts when updating posts in this order mode
+				$sql_extra4 .= " AND `item`.`id` = `item`.`parent`";
+			}
 		}
-		$r = q("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`, $sql_order AS `order_date`
-			FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-			WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` $sql_extra4
-			AND NOT `item`.`moderated` AND `item`.`unseen`
+
+		$r = q("SELECT `item`.`parent-uri` AS `uri`, `item`.`parent` AS `item_id`, $sql_order AS `order_date`
+			FROM `item` $sql_post_table
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+			WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted`
+			AND NOT `item`.`moderated` AND $sql_extra4
 			$sql_extra3 $sql_extra $sql_range $sql_nets
 			ORDER BY `order_date` DESC LIMIT 100",
 			intval(local_user())
 		);
 	} else {
-		$r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`, $sql_order AS `order_date`
-			FROM $sql_table $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+		$r = q("SELECT `item`.`uri`, `thread`.`iid` AS `item_id`, $sql_order AS `order_date`
+			FROM `thread` $sql_post_table
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
+				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+			STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
 			WHERE `thread`.`uid` = %d AND `thread`.`visible` AND NOT `thread`.`deleted`
 			AND NOT `thread`.`moderated`
 			$sql_extra2 $sql_extra3 $sql_range $sql_extra $sql_nets
-			ORDER BY $sql_order DESC $pager_sql",
+			ORDER BY `order_date` DESC $pager_sql",
 			intval(local_user())
 		);
 	}
@@ -790,16 +796,24 @@ function networkThreadedView(App $a, $update = 0)
 		if (DBM::is_result($r)) {
 			$top_limit = current($r)['order_date'];
 			$bottom_limit = end($r)['order_date'];
+			if (empty($_SESSION['network_last_top_limit']) || ($_SESSION['network_last_top_limit'] < $top_limit)) {
+				$_SESSION['network_last_top_limit'] = $top_limit;
+			}
 		} else {
-			$top_limit = DateTimeFormat::utcNow();
-			$bottom_limit = DateTimeFormat::utcNow();
+			$top_limit = $bottom_limit = DateTimeFormat::utcNow();
 		}
 
 		// When checking for updates we need to fetch from the newest date to the newest date before
-		if ($update && !empty($_SESSION['network_last_date']) && ($bottom_limit > $_SESSION['network_last_date'])) {
+		// Only do this, when the last stored date isn't too long ago (10 times the update interval)
+		$browser_update = PConfig::get(local_user(), 'system', 'update_interval', 40000) / 1000;
+
+		if (($browser_update > 0) && $update && !empty($_SESSION['network_last_date']) &&
+			(($bottom_limit < $_SESSION['network_last_date']) || ($top_limit == $bottom_limit)) &&
+			((time() - $_SESSION['network_last_date_timestamp']) < ($browser_update * 10))) {
 			$bottom_limit = $_SESSION['network_last_date'];
 		}
-		$_SESSION['network_last_date'] = $top_limit;
+		$_SESSION['network_last_date'] = defaults($_SESSION, 'network_last_top_limit', $top_limit);
+		$_SESSION['network_last_date_timestamp'] = time();
 
 		if ($last_date > $top_limit) {
 			$top_limit = $last_date;
@@ -808,66 +822,56 @@ function networkThreadedView(App $a, $update = 0)
 			$top_limit = DateTimeFormat::utcNow();
 		}
 
-		$items = dba::p("SELECT `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid` FROM `item`
-			INNER JOIN (SELECT `oid` FROM `term` WHERE `term` IN
+		$items = dba::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date` FROM `item`
+			STRAIGHT_JOIN (SELECT `oid` FROM `term` WHERE `term` IN
 				(SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term`
 			ON `item`.`id` = `term`.`oid`
-			INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`author-id`
 			WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ?
-				AND NOT `author`.`hidden` AND NOT `author`.`blocked`" . $sql_tag_nets,
+				AND NOT `contact`.`hidden` AND NOT `contact`.`blocked`" . $sql_tag_nets,
 			local_user(), TERM_OBJ_POST, TERM_HASHTAG, $top_limit, $bottom_limit);
+
 		$data = dba::inArray($items);
 
 		if (count($data) > 0) {
-			logger('Tagged items: ' . count($data) . ' - ' . $bottom_limit . ' - ' . $top_limit . ' - ' . local_user()); //$last_date);
-			$r = array_merge($data, $r);
+			$tag_top_limit = current($data)['order_date'];
+			if ($_SESSION['network_last_date'] < $tag_top_limit) {
+				$_SESSION['network_last_date'] = $tag_top_limit;
+			}
+
+			logger('Tagged items: ' . count($data) . ' - ' . $bottom_limit . ' - ' . $top_limit . ' - ' . local_user().' - '.(int)$update);
+			$s = [];
+			foreach ($r as $item) {
+				$s[$item['uri']] = $item;
+			}
+			foreach ($data as $item) {
+				$s[$item['uri']] = $item;
+			}
+			$r = $s;
 		}
 	}
 
-	// Then fetch all the children of the parents that are on this page
-
-	$parents_arr = [];
 	$parents_str = '';
 	$date_offset = '';
 
-	$items = [];
-	if (DBM::is_result($r)) {
-		foreach ($r as $rr) {
-			if (!in_array($rr['item_id'], $parents_arr)) {
-				$parents_arr[] = $rr['item_id'];
-			}
-		}
-
-		$parents_str = implode(', ', $parents_arr);
-
-		// splitted into separate queries to avoid the problem with very long threads
-		// so always the last X comments are loaded
-		// This problem can occur expecially with imported facebook posts
-		$max_comments = Config::get('system', 'max_comments');
-		if ($max_comments == 0) {
-			$max_comments = 100;
-		}
+	$items = $r;
 
-		foreach ($parents_arr AS $parents) {
-			$thread_items = dba::p(item_query() . " AND `item`.`parent` = ?
-				ORDER BY `item`.`commented` DESC LIMIT " . intval($max_comments + 1),
-				$parents
-			);
+	if (DBM::is_result($items)) {
+		$parents_arr = [];
 
-			if (DBM::is_result($thread_items)) {
-				$items = array_merge($items, dba::inArray($thread_items));
+		foreach ($items as $item) {
+			if ($date_offset < $item['order_date']) {
+				$date_offset = $item['order_date'];
+			}
+			if (!in_array($item['item_id'], $parents_arr) && ($item['item_id'] > 0)) {
+				$parents_arr[] = $item['item_id'];
 			}
 		}
-		$items = conv_sort($items, $ordering);
+		$parents_str = implode(', ', $parents_arr);
 	}
 
 	if (x($_GET, 'offset')) {
 		$date_offset = $_GET['offset'];
-	} elseif (count($items)) {
-		$date_offset = $items[0][$order_mode];
-	} else {
-		$date_offset = '';
 	}
 
 	$a->page_offset = $date_offset;
@@ -886,7 +890,7 @@ function networkThreadedView(App $a, $update = 0)
 
 
 	$mode = 'network';
-	$o .= networkConversation($a, $items, $mode, $update);
+	$o .= networkConversation($a, $items, $mode, $update, $ordering);
 
 	return $o;
 }