X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fostatus.php;h=bcd8fd671302bffd4527ab1160d277d7095602ef;hb=d49325d177cf03b97df250ca3cb081421c541049;hp=7ac26846d246ab575259e89e5c6fa9a8fde632e7;hpb=4e1c51500404de5a6b33c95cfeafe3710b752c7f;p=friendica.git

diff --git a/include/ostatus.php b/include/ostatus.php
index 7ac26846d2..bcd8fd6713 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -806,11 +806,20 @@ class ostatus {
 		}
 
 		// Get the parent
+		$parents = q("SELECT `item`.`id`, `item`.`parent`, `item`.`uri`, `item`.`contact-id`, `item`.`type`,
+				`item`.`verb`, `item`.`visible` FROM `term`
+				STRAIGHT_JOIN `item` AS `thritem` ON `thritem`.`parent` = `term`.`oid`
+				STRAIGHT_JOIN `item` ON `item`.`parent` = `thritem`.`parent`
+				WHERE `term`.`uid` = %d AND `term`.`otype` = %d AND `term`.`type` = %d AND `term`.`url` = '%s'",
+				intval($uid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION), dbesc($conversation_url));
+
+/*		2016-10-23: The old query will be kept until we are sure that the query above is a good and fast replacement
+
 		$parents = q("SELECT `id`, `parent`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `id` IN
 				(SELECT `parent` FROM `item` WHERE `id` IN
 					(SELECT `oid` FROM `term` WHERE `uid` = %d AND `otype` = %d AND `type` = %d AND `url` = '%s'))",
 				intval($uid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION), dbesc($conversation_url));
-
+*/
 		if ($parents)
 			$parent = $parents[0];
 		elseif (count($item) > 0) {
@@ -1961,9 +1970,23 @@ class ostatus {
 			$last_update = 'now -30 days';
 
 		$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
-
-		$items = q("SELECT STRAIGHT_JOIN `item`.*, `item`.`id` AS `item_id` FROM `item`
-				INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`
+		$authorid = get_contact($owner["url"], 0);
+
+		$items = q("SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`)
+				STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent`
+				WHERE `item`.`uid` = %d AND `item`.`contact-id` = %d AND
+					`item`.`author-id` = %d AND `item`.`created` > '%s' AND
+					NOT `item`.`deleted` AND NOT `item`.`private` AND
+					`thread`.`network` IN ('%s', '%s')
+				ORDER BY `item`.`created` DESC LIMIT 300",
+				intval($owner["uid"]), intval($owner["id"]),
+				intval($authorid), dbesc($check_date),
+				dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
+
+/*		2016-10-23: The old query will be kept until we are sure that the query above is a good and fast replacement
+
+		$items = q("SELECT `item`.*, `item`.`id` AS `item_id` FROM `item`
+				STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent`
 				LEFT JOIN `item` AS `thritem` ON `thritem`.`uri`=`item`.`thr-parent` AND `thritem`.`uid`=`item`.`uid`
 				WHERE `item`.`uid` = %d AND `item`.`received` > '%s' AND NOT `item`.`private` AND NOT `item`.`deleted`
 					AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
@@ -1971,7 +1994,7 @@ class ostatus {
 						OR (`item`.`network` = '%s' AND ((`thread`.`network` IN ('%s', '%s')) OR (`thritem`.`network` IN ('%s', '%s')))) AND `thread`.`mention`)
 					AND ((`item`.`owner-link` IN ('%s', '%s') AND (`item`.`parent` = `item`.`id`))
 						OR (`item`.`author-link` IN ('%s', '%s')))
-				ORDER BY `item`.`received` DESC
+				ORDER BY `item`.`id` DESC
 				LIMIT 0, 300",
 				intval($owner["uid"]), dbesc($check_date), dbesc(NETWORK_DFRN),
 				//dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
@@ -1981,7 +2004,7 @@ class ostatus {
 				dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"])),
 				dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"]))
 			);
-
+*/
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;