X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fostatus.php;h=6bec3987bb794ea4dfc3fb67682b749ed8e4d664;hb=217a8ce6ee8fd163d81c71044d9497646296862f;hp=d41974709dcf084366d32c7b25eeda1635db7976;hpb=6680ce1dd77b5b4b6fbfcd6d5b58b65710e52079;p=friendica.git

diff --git a/include/ostatus.php b/include/ostatus.php
index d41974709d..6bec3987bb 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -21,6 +21,7 @@ require_once 'include/follow.php';
 require_once 'include/api.php';
 require_once 'mod/proxy.php';
 require_once 'include/xml.php';
+require_once 'include/cache.php';
 
 /**
  * @brief This class contain functions for the OStatus protocol
@@ -54,7 +55,7 @@ class ostatus {
 		$alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes;
 		if (is_object($alternate)) {
 			foreach ($alternate AS $attributes) {
-				if (($attributes->name == "href") AND ($attributes->textContent != "")) {
+				if (($attributes->name == "href") && ($attributes->textContent != "")) {
 					$author["author-link"] = $attributes->textContent;
 				}
 			}
@@ -70,6 +71,7 @@ class ostatus {
 			$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` IN ('%s', '%s') AND `network` != '%s'",
 				intval($importer["uid"]), dbesc(normalise_link($author["author-link"])),
 				dbesc(normalise_link($aliaslink)), dbesc(NETWORK_STATUSNET));
+
 			if (dbm::is_result($r)) {
 				$contact = $r[0];
 				$author["contact-id"] = $r[0]["id"];
@@ -79,6 +81,7 @@ class ostatus {
 			// Should not happen
 			$contact = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `addr` = ? AND `network` != ?",
 					$importer["uid"], $addr, NETWORK_STATUSNET);
+
 			if (dbm::is_result($contact)) {
 				$author["contact-id"] = $contact["id"];
 				$author["author-link"] = $contact["url"];
@@ -87,33 +90,37 @@ class ostatus {
 
 		$avatarlist = array();
 		$avatars = $xpath->query("atom:author/atom:link[@rel='avatar']", $context);
-		foreach($avatars AS $avatar) {
+		foreach ($avatars AS $avatar) {
 			$href = "";
 			$width = 0;
-			foreach($avatar->attributes AS $attributes) {
-				if ($attributes->name == "href")
+			foreach ($avatar->attributes AS $attributes) {
+				if ($attributes->name == "href") {
 					$href = $attributes->textContent;
-				if ($attributes->name == "width")
+				}
+				if ($attributes->name == "width") {
 					$width = $attributes->textContent;
+				}
 			}
-			if (($width > 0) AND ($href != ""))
+			if (($width > 0) && ($href != "")) {
 				$avatarlist[$width] = $href;
+			}
 		}
 		if (count($avatarlist) > 0) {
 			krsort($avatarlist);
-			$author["author-avatar"] = Probe::fix_avatar(current($avatarlist), $author["author-link"]);
+			$author["author-avatar"] = Probe::fixAvatar(current($avatarlist), $author["author-link"]);
 		}
 
 		$displayname = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
-		if ($displayname != "")
+		if ($displayname != "") {
 			$author["author-name"] = $displayname;
+		}
 
 		$author["owner-name"] = $author["author-name"];
 		$author["owner-link"] = $author["author-link"];
 		$author["owner-avatar"] = $author["author-avatar"];
 
 		// Only update the contacts if it is an OStatus contact
-		if ($r AND !$onlyfetch AND ($contact["network"] == NETWORK_OSTATUS)) {
+		if ($r && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
 
 			// Update contact data
 
@@ -147,8 +154,8 @@ class ostatus {
 			if ($value != "")
 				$contact["location"] = $value;
 
-			if (($contact["name"] != $r[0]["name"]) OR ($contact["nick"] != $r[0]["nick"]) OR ($contact["about"] != $r[0]["about"]) OR
-				($contact["alias"] != $r[0]["alias"]) OR ($contact["location"] != $r[0]["location"])) {
+			if (($contact["name"] != $r[0]["name"]) || ($contact["nick"] != $r[0]["nick"]) || ($contact["about"] != $r[0]["about"]) ||
+				($contact["alias"] != $r[0]["alias"]) || ($contact["location"] != $r[0]["location"])) {
 
 				logger("Update contact data for contact ".$contact["id"], LOGGER_DEBUG);
 
@@ -158,7 +165,7 @@ class ostatus {
 					dbesc(datetime_convert()), intval($contact["id"]));
 			}
 
-			if (isset($author["author-avatar"]) AND ($author["author-avatar"] != $r[0]['avatar'])) {
+			if (isset($author["author-avatar"]) && ($author["author-avatar"] != $r[0]['avatar'])) {
 				logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG);
 
 				update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]);
@@ -189,7 +196,7 @@ class ostatus {
 			link_gcontact($gcid, $contact["uid"], $contact["id"]);
 		}
 
-		return($author);
+		return $author;
 	}
 
 	/**
@@ -348,13 +355,13 @@ class ostatus {
 			$item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
 
 			// Mastodon Content Warning
-			if (($item["verb"] == ACTIVITY_POST) AND $xpath->evaluate('boolean(atom:summary)', $entry)) {
+			if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $entry)) {
 				$clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
 
 				$item["body"] = html2bbcode($clear_text) . '[spoiler]' . $item["body"] . '[/spoiler]';
 			}
 
-			if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) OR ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
+			if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) || ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
 				$item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
 				$item["body"] = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
 			} elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION) {
@@ -446,7 +453,7 @@ class ostatus {
 					foreach ($category->attributes AS $attributes) {
 						if ($attributes->name == "term") {
 							$term = $attributes->textContent;
-							if(strlen($item["tag"])) {
+							if (strlen($item["tag"])) {
 								$item["tag"] .= ',';
 							}
 							$item["tag"] .= "#[url=".App::get_baseurl()."/search?tag=".$term."]".$term."[/url]";
@@ -463,11 +470,11 @@ class ostatus {
 				foreach ($links AS $link) {
 					$attribute = self::read_attributes($link);
 
-					if (($attribute['rel'] != "") AND ($attribute['href'] != "")) {
+					if (($attribute['rel'] != "") && ($attribute['href'] != "")) {
 						switch ($attribute['rel']) {
 							case "alternate":
 								$item["plink"] = $attribute['href'];
-								if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) OR
+								if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) ||
 									($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
 									$item["body"] .= add_page_info($attribute['href']);
 								}
@@ -519,7 +526,7 @@ class ostatus {
 			$repeat_of = "";
 
 			$notice_info = $xpath->query('statusnet:notice_info', $entry);
-			if ($notice_info AND ($notice_info->length > 0)) {
+			if ($notice_info && ($notice_info->length > 0)) {
 				foreach ($notice_info->item(0)->attributes AS $attributes) {
 					if ($attributes->name == "source") {
 						$item["app"] = strip_tags($attributes->textContent);
@@ -534,7 +541,7 @@ class ostatus {
 			}
 
 			// Is it a repeated post?
-			if (($repeat_of != "") OR ($item["verb"] == ACTIVITY_SHARE)) {
+			if (($repeat_of != "") || ($item["verb"] == ACTIVITY_SHARE)) {
 				$activityobjects = $xpath->query('activity:object', $entry)->item(0);
 
 				if (is_object($activityobjects)) {
@@ -544,7 +551,7 @@ class ostatus {
 						$orig_uri = $xpath->query('atom:id/text()', $activityobjects)->item(0)->nodeValue;
 					}
 					$orig_links = $xpath->query("activity:object/atom:link[@rel='alternate']", $activityobjects);
-					if ($orig_links AND ($orig_links->length > 0)) {
+					if ($orig_links && ($orig_links->length > 0)) {
 						foreach ($orig_links->item(0)->attributes AS $attributes) {
 							if ($attributes->name == "href") {
 								$orig_link = $attributes->textContent;
@@ -615,8 +622,8 @@ class ostatus {
 					intval($importer["uid"]), dbesc($item["parent-uri"]));
 
 				// Only fetch missing stuff if it is a comment or reshare.
-				if (in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_SHARE)) AND
-					!dbm::is_result($r) AND ($related != "")) {
+				if (in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_SHARE)) &&
+					!dbm::is_result($r) && ($related != "")) {
 					$reply_path = str_replace("/notice/", "/api/statuses/show/", $related).".atom";
 
 					if ($reply_path != $related) {
@@ -641,6 +648,9 @@ class ostatus {
 			$item_id = self::completion($conversation, $importer["uid"], $item, $self);
 
 			if (!$item_id) {
+				// Store the conversation data. This is normally done in "item_store"
+				// but since something went wrong, we want to be sure to save the data.
+				store_conversation($item);
 				logger("Error storing item", LOGGER_DEBUG);
 				continue;
 			}
@@ -659,23 +669,23 @@ class ostatus {
 	public static function convert_href($href) {
 		$elements = explode(":",$href);
 
-		if ((count($elements) <= 2) OR ($elements[0] != "tag"))
+		if ((count($elements) <= 2) || ($elements[0] != "tag"))
 			return $href;
 
 		$server = explode(",", $elements[1]);
 		$conversation = explode("=", $elements[2]);
 
-		if ((count($elements) == 4) AND ($elements[2] == "post"))
+		if ((count($elements) == 4) && ($elements[2] == "post"))
 			return "http://".$server[0]."/notice/".$elements[3];
 
-		if ((count($conversation) != 2) OR ($conversation[1] ==""))
+		if ((count($conversation) != 2) || ($conversation[1] =="")) {
 			return $href;
-
-		if ($elements[3] == "objectType=thread")
+		}
+		if ($elements[3] == "objectType=thread") {
 			return "http://".$server[0]."/conversation/".$conversation[1];
-		else
+		} else {
 			return "http://".$server[0]."/notice/".$conversation[1];
-
+		}
 		return $href;
 	}
 
@@ -694,7 +704,7 @@ class ostatus {
 		}
 
 		// Don't poll if the interval is set negative
-		if (($poll_interval < 0) AND !$override) {
+		if (($poll_interval < 0) && !$override) {
 			return;
 		}
 
@@ -711,7 +721,7 @@ class ostatus {
 		}
 
 
-		if ($last AND !$override) {
+		if ($last && !$override) {
 			$next = $last + ($poll_interval * 60);
 			if ($next > time()) {
 				logger('poll interval not reached');
@@ -809,7 +819,7 @@ class ostatus {
 		if ($conversation_id != "") {
 			$elements = explode(":", $conversation_id);
 
-			if ((count($elements) <= 2) OR ($elements[0] != "tag"))
+			if ((count($elements) <= 2) || ($elements[0] != "tag"))
 				return $conversation_id;
 		}
 
@@ -834,6 +844,30 @@ class ostatus {
 		return $base_url."/conversation/".$conversation_id;
 	}
 
+	/**
+	 * @brief Fetches a shared object from a given conversation object
+	 *
+	 * Sometimes GNU Social seems to fail when returning shared objects.
+	 * Then they don't contains all needed data.
+	 * We then try to find this object in the conversation
+	 *
+	 * @param string $id Message id
+	 * @param object $conversation Conversation object
+	 *
+	 * @return object The shared object
+	 */
+	private function shared_object($id, $conversation) {
+		if (!is_array($conversation->items)) {
+			return false;
+		}
+		foreach ($conversation->items AS $single_conv) {
+			if ($single_conv->id == $id) {
+				return $single_conv;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * @brief Fetches actor details of a given actor and user id
 	 *
@@ -900,12 +934,10 @@ class ostatus {
 
 		// If the thread shouldn't be completed then store the item and go away
 		// Don't do a completion on liked content
-		if (((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) OR
-			($item["verb"] == ACTIVITY_LIKE) OR ($conversation_url == "")) {
+		if (((intval(get_config('system','ostatus_poll_interval')) == -2) && (count($item) > 0)) ||
+			($item["verb"] == ACTIVITY_LIKE) || ($conversation_url == "")) {
 			$item_stored = item_store($item, $all_threads);
 			return $item_stored;
-		} elseif (count($item) > 0) {
-			$item = store_conversation($item);
 		}
 
 		// Get the parent
@@ -915,17 +947,9 @@ class ostatus {
 				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)
+		if ($parents) {
 			$parent = $parents[0];
-		elseif (count($item) > 0) {
+		} elseif (count($item) > 0) {
 			$parent = $item;
 			$parent["type"] = "remote";
 			$parent["verb"] = ACTIVITY_POST;
@@ -933,9 +957,9 @@ class ostatus {
 		} else {
 			// Preset the parent
 			$r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid`=%d", $uid);
-			if (!$r)
-				return(-2);
-
+			if (!dbm::is_result($r)) {
+				return -2;
+			}
 			$parent = array();
 			$parent["id"] = 0;
 			$parent["parent"] = 0;
@@ -956,15 +980,15 @@ class ostatus {
 			$conv_arr = z_fetch_url($conv."?page=".$pageno);
 
 			// If it is a non-ssl site and there is an error, then try ssl or vice versa
-			if (!$conv_arr["success"] AND (substr($conv, 0, 7) == "http://")) {
+			if (!$conv_arr["success"] && (substr($conv, 0, 7) == "http://")) {
 				$conv = str_replace("http://", "https://", $conv);
 				$conv_as = fetch_url($conv."?page=".$pageno);
-			} elseif (!$conv_arr["success"] AND (substr($conv, 0, 8) == "https://")) {
+			} elseif (!$conv_arr["success"] && (substr($conv, 0, 8) == "https://")) {
 				$conv = str_replace("https://", "http://", $conv);
 				$conv_as = fetch_url($conv."?page=".$pageno);
-			} else
+			} else {
 				$conv_as = $conv_arr["body"];
-
+			}
 			$conv_as = str_replace(',"statusnet:notice_info":', ',"statusnet_notice_info":', $conv_as);
 			$conv_as = json_decode($conv_as);
 
@@ -992,9 +1016,10 @@ class ostatus {
 					self::store_conversation($item_id, $conversation_url);
 				}
 
-				return($item_stored);
-			} else
-				return(-3);
+				return $item_stored;
+			} else {
+				return -3;
+			}
 		}
 
 		$items = array_reverse($items);
@@ -1034,7 +1059,7 @@ class ostatus {
 				// 1. Our conversation hasn't the "real" thread starter
 				// 2. This first post is a post inside our thread
 				// 3. This first post is a post inside another thread
-				if (($first_id != $parent["uri"]) AND ($parent["uri"] != "")) {
+				if (($first_id != $parent["uri"]) && ($parent["uri"] != "")) {
 
 					$new_parent = true;
 
@@ -1121,7 +1146,7 @@ class ostatus {
 				}
 
 				// The item we are having on the system is the one that we wanted to store via the item array
-				if (isset($item["uri"]) AND ($item["uri"] == $existing_message["uri"])) {
+				if (isset($item["uri"]) && ($item["uri"] == $existing_message["uri"])) {
 					$item = array();
 					$item_stored = 0;
 				}
@@ -1130,7 +1155,7 @@ class ostatus {
 			}
 
 			if (is_array($single_conv->to))
-				foreach($single_conv->to AS $to)
+				foreach ($single_conv->to AS $to)
 					if ($importer["nurl"] == normalise_link($to->id))
 						$mention = true;
 
@@ -1141,11 +1166,12 @@ class ostatus {
 			$details = self::get_actor_details($actor, $uid, $parent["contact-id"]);
 
 			// Do we only want to import threads that were started by our contacts?
-			if ($details["not_following"] AND $new_parent AND get_config('system','ostatus_full_threads')) {
+			if ($details["not_following"] && $new_parent && get_config('system','ostatus_full_threads')) {
 				logger("Don't import uri ".$first_id." because user ".$uid." doesn't follow the person ".$actor, LOGGER_DEBUG);
 				continue;
 			}
 
+			/// @TODO One statment is okay (until if () )
 			$arr = array();
 			$arr["network"] = $details["network"];
 			$arr["uri"] = $single_conv->id;
@@ -1162,7 +1188,7 @@ class ostatus {
 				$arr["owner-name"] = $single_conv->actor->portablecontacts_net->displayName;
 
 			$arr["owner-link"] = $actor;
-			$arr["owner-avatar"] = Probe::fix_avatar($single_conv->actor->image->url, $arr["owner-link"]);
+			$arr["owner-avatar"] = Probe::fixAvatar($single_conv->actor->image->url, $arr["owner-link"]);
 
 			$arr["author-name"] = $arr["owner-name"];
 			$arr["author-link"] = $arr["owner-link"];
@@ -1173,17 +1199,17 @@ class ostatus {
 				$arr['conversation-uri'] = $single_conv->status_net->conversation;
 			}
 
-			if (isset($single_conv->status_net->notice_info->source))
+			if (isset($single_conv->status_net->notice_info->source)) {
 				$arr["app"] = strip_tags($single_conv->status_net->notice_info->source);
-			elseif (isset($single_conv->statusnet->notice_info->source))
+			} elseif (isset($single_conv->statusnet->notice_info->source)) {
 				$arr["app"] = strip_tags($single_conv->statusnet->notice_info->source);
-			elseif (isset($single_conv->statusnet_notice_info->source))
+			} elseif (isset($single_conv->statusnet_notice_info->source)) {
 				$arr["app"] = strip_tags($single_conv->statusnet_notice_info->source);
-			elseif (isset($single_conv->provider->displayName))
+			} elseif (isset($single_conv->provider->displayName)) {
 				$arr["app"] = $single_conv->provider->displayName;
-			else
+			} else {
 				$arr["app"] = "OStatus";
-
+			}
 
 			$arr["source"] = json_encode($single_conv);
 			$arr["protocol"] = PROTOCOL_GS_CONVERSATION;
@@ -1194,46 +1220,56 @@ class ostatus {
 			$arr["coord"] = trim($single_conv->location->lat." ".$single_conv->location->lon);
 
 			// Is it a reshared item?
-			if (isset($single_conv->verb) AND ($single_conv->verb == "share") AND isset($single_conv->object)) {
+			if (isset($single_conv->verb) && ($single_conv->verb == "share") && isset($single_conv->object)) {
 				if (is_array($single_conv->object))
 					$single_conv->object = $single_conv->object[0];
 
-				logger("Found reshared item ".$single_conv->object->id);
+				// Sometimes GNU Social doesn't returns a complete object
+				if (!isset($single_conv->object->actor->url)) {
+					$object = self::shared_object($single_conv->object->id, $conversation);
+					if (is_object($object)) {
+						$single_conv->object = $object;
+					}
+				}
 
-				// $single_conv->object->context->conversation;
+				if (isset($single_conv->object->actor->url)) {
+					logger("Found reshared item ".$single_conv->object->id);
 
-				if (isset($single_conv->object->object->id))
-					$arr["uri"] = $single_conv->object->object->id;
-				else
-					$arr["uri"] = $single_conv->object->id;
+					// $single_conv->object->context->conversation;
 
-				if (isset($single_conv->object->object->url))
-					$plink = self::convert_href($single_conv->object->object->url);
-				else
-					$plink = self::convert_href($single_conv->object->url);
+					if (isset($single_conv->object->object->id)) {
+						$arr["uri"] = $single_conv->object->object->id;
+					} else {
+						$arr["uri"] = $single_conv->object->id;
+					}
+					if (isset($single_conv->object->object->url)) {
+						$plink = self::convert_href($single_conv->object->object->url);
+					} else {
+						$plink = self::convert_href($single_conv->object->url);
+					}
+					if (isset($single_conv->object->object->content)) {
+						$arr["body"] = add_page_info_to_body(html2bbcode($single_conv->object->object->content));
+					} else {
+						$arr["body"] = add_page_info_to_body(html2bbcode($single_conv->object->content));
+					}
+					$arr["plink"] = $plink;
 
-				if (isset($single_conv->object->object->content))
-					$arr["body"] = add_page_info_to_body(html2bbcode($single_conv->object->object->content));
-				else
-					$arr["body"] = add_page_info_to_body(html2bbcode($single_conv->object->content));
+					$arr["created"] = $single_conv->object->published;
+					$arr["edited"] = $single_conv->object->published;
 
-				$arr["plink"] = $plink;
+					$arr["author-name"] = $single_conv->object->actor->displayName;
+					if ($arr["owner-name"] == '') {
+						$arr["author-name"] = $single_conv->object->actor->contact->displayName;
+					}
+					$arr["author-link"] = $single_conv->object->actor->url;
+					$arr["author-avatar"] = Probe::fixAvatar($single_conv->object->actor->image->url, $arr["author-link"]);
 
-				$arr["created"] = $single_conv->object->published;
-				$arr["edited"] = $single_conv->object->published;
+					$arr["app"] = $single_conv->object->provider->displayName."#";
+					//$arr["verb"] = $single_conv->object->verb;
 
-				$arr["author-name"] = $single_conv->object->actor->displayName;
-				if ($arr["owner-name"] == '') {
-					$arr["author-name"] = $single_conv->object->actor->contact->displayName;
+					$arr["location"] = $single_conv->object->location->displayName;
+					$arr["coord"] = trim($single_conv->object->location->lat." ".$single_conv->object->location->lon);
 				}
-				$arr["author-link"] = $single_conv->object->actor->url;
-				$arr["author-avatar"] = Probe::fix_avatar($single_conv->object->actor->image->url, $arr["author-link"]);
-
-				$arr["app"] = $single_conv->object->provider->displayName."#";
-				//$arr["verb"] = $single_conv->object->verb;
-
-				$arr["location"] = $single_conv->object->location->displayName;
-				$arr["coord"] = trim($single_conv->object->location->lat." ".$single_conv->object->location->lon);
 			}
 
 			if ($arr["location"] == "")
@@ -1243,27 +1279,20 @@ class ostatus {
 				unset($arr["coord"]);
 
 			// Copy fields from given item array
-			if (isset($item["uri"]) AND (($item["uri"] == $arr["uri"]) OR ($item["uri"] ==  $single_conv->id))) {
-				$copy_fields = array("owner-name", "owner-link", "owner-avatar", "author-name", "author-link", "author-avatar",
-							"gravity", "body", "object-type", "object", "verb", "created", "edited", "coord", "tag",
-							"title", "attach", "app", "type", "location", "contact-id", "uri");
-				foreach ($copy_fields AS $field)
-					if (isset($item[$field]))
-						$arr[$field] = $item[$field];
-
+			if (isset($item["uri"]) && (($item["uri"] == $arr["uri"]) || ($item["uri"] ==  $single_conv->id))) {
+				logger('Use stored item array for item with URI '.$item["uri"], LOGGER_DEBUG);
+				$newitem = item_store($item);
+				$item = array();
+				$item_stored = $newitem;
+			} else {
+				$newitem = item_store($arr);
 			}
 
-			$newitem = item_store($arr);
 			if (!$newitem) {
 				logger("Item wasn't stored ".print_r($arr, true), LOGGER_DEBUG);
 				continue;
 			}
 
-			if (isset($item["uri"]) AND ($item["uri"] == $arr["uri"])) {
-				$item = array();
-				$item_stored = $newitem;
-			}
-
 			logger('Stored new item '.$plink.' for parent '.$arr["parent-uri"].' under id '.$newitem, LOGGER_DEBUG);
 
 			// Add the conversation entry (but don't fetch the whole conversation)
@@ -1280,7 +1309,7 @@ class ostatus {
 			}
 		}
 
-		if (($item_stored < 0) AND (count($item) > 0)) {
+		if (($item_stored < 0) && (count($item) > 0)) {
 
 			if (get_config('system','ostatus_full_threads')) {
 				$details = self::get_actor_details($item["owner-link"], $uid, $item["contact-id"]);
@@ -1297,7 +1326,7 @@ class ostatus {
 			}
 		}
 
-		return($item_stored);
+		return $item_stored;
 	}
 
 	/**
@@ -1340,16 +1369,16 @@ class ostatus {
 		// Skip if it isn't a pure repeated messages
 		// Does it start with a share?
 		if (strpos($body, "[share") > 0)
-			return("");
+			return "";
 
 		// Does it end with a share?
 		if (strlen($body) > (strrpos($body, "[/share]") + 8))
-			return("");
+			return "";
 
 		$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
 		// Skip if there is no shared message in there
 		if ($body == $attributes)
-			return(false);
+			return false;
 
 		$guid = "";
 		preg_match("/guid='(.*?)'/ism", $attributes, $matches);
@@ -1469,12 +1498,12 @@ class ostatus {
 		$hub = get_config('system','huburl');
 
 		$hubxml = '';
-		if(strlen($hub)) {
+		if (strlen($hub)) {
 			$hubs = explode(',', $hub);
-			if(count($hubs)) {
-				foreach($hubs as $h) {
+			if (count($hubs)) {
+				foreach ($hubs as $h) {
 					$h = trim($h);
-					if(! strlen($h))
+					if (! strlen($h))
 						continue;
 					if ($h === '[internal]')
 						$h = App::get_baseurl() . '/pubsubhubbub';
@@ -1516,7 +1545,7 @@ class ostatus {
 				break;
 		}
 
-		if (($siteinfo["type"] != "photo") AND isset($siteinfo["image"])) {
+		if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) {
 			$imgdata = get_photo_info($siteinfo["image"]);
 			$attributes = array("rel" => "enclosure",
 					"href" => $siteinfo["image"],
@@ -1559,9 +1588,9 @@ class ostatus {
 	private function add_author($doc, $owner) {
 
 		$r = q("SELECT `homepage`, `publish` FROM `profile` WHERE `uid` = %d AND `is-default` LIMIT 1", intval($owner["uid"]));
-		if ($r)
+		if (dbm::is_result($r)) {
 			$profile = $r[0];
-
+		}
 		$author = $doc->createElement("author");
 		xml::add_element($doc, $author, "id", $owner["url"]);
 		xml::add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
@@ -1716,22 +1745,22 @@ class ostatus {
 
 		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1",
 			dbesc(normalise_link($url)), intval($owner["uid"]));
-		if ($r) {
+		if (dbm::is_result($r)) {
 			$contact = $r[0];
 			$contact["uid"] = -1;
 		}
 
-		if (!$r) {
+		if (!dbm::is_result($r)) {
 			$r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
 				dbesc(normalise_link($url)));
-			if ($r) {
+			if (dbm::is_result($r)) {
 				$contact = $r[0];
 				$contact["uid"] = -1;
 				$contact["success_update"] = $contact["updated"];
 			}
 		}
 
-		if (!$r)
+		if (!dbm::is_result($r))
 			$contact = owner;
 
 		if (!isset($contact["poll"])) {
@@ -1761,7 +1790,7 @@ class ostatus {
 	 */
 	private function reshare_entry($doc, $item, $owner, $repeated_guid, $toplevel) {
 
-		if (($item["id"] != $item["parent"]) AND (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
+		if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
 			logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
 		}
 
@@ -1770,11 +1799,11 @@ class ostatus {
 		$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' AND NOT `private` AND `network` IN ('%s', '%s', '%s') LIMIT 1",
 			intval($owner["uid"]), dbesc($repeated_guid),
 			dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
-		if ($r)
+		if (dbm::is_result($r)) {
 			$repeated_item = $r[0];
-		else
+		} else {
 			return false;
-
+		}
 		$contact = self::contact_entry($repeated_item['author-link'], $owner);
 
 		$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
@@ -1827,7 +1856,7 @@ class ostatus {
 	 */
 	private function like_entry($doc, $item, $owner, $toplevel) {
 
-		if (($item["id"] != $item["parent"]) AND (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
+		if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
 			logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
 		}
 
@@ -1972,7 +2001,7 @@ class ostatus {
 	 */
 	private function note_entry($doc, $item, $owner, $toplevel) {
 
-		if (($item["id"] != $item["parent"]) AND (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
+		if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
 			logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
 		}
 
@@ -2053,7 +2082,7 @@ class ostatus {
 		xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
 								"href" => App::get_baseurl()."/display/".$item["guid"]));
 
-		if ($complete AND ($item["id"] > 0))
+		if ($complete && ($item["id"] > 0))
 			xml::add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
 
 		xml::add_element($doc, $entry, "activity:verb", $verb);
@@ -2075,7 +2104,7 @@ class ostatus {
 
 		$mentioned = array();
 
-		if (($item['parent'] != $item['id']) OR ($item['parent-uri'] !== $item['uri']) OR (($item['thr-parent'] !== '') AND ($item['thr-parent'] !== $item['uri']))) {
+		if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
 			$parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"]));
 			$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
 
@@ -2131,8 +2160,8 @@ class ostatus {
 
 		$tags = item_getfeedtags($item);
 
-		if(count($tags))
-			foreach($tags as $t)
+		if (count($tags))
+			foreach ($tags as $t)
 				if ($t[0] == "@")
 					$mentioned[$t[1]] = $t[1];
 
@@ -2148,7 +2177,7 @@ class ostatus {
 			$r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
 				intval($owner["uid"]),
 				dbesc(normalise_link($mention)));
-			if ($r[0]["forum"] OR $r[0]["prv"])
+			if ($r[0]["forum"] || $r[0]["prv"])
 				xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
 											"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
 											"href" => $mention));
@@ -2167,14 +2196,14 @@ class ostatus {
 			xml::add_element($doc, $entry, "mastodon:scope", "public");
 		}
 
-		if(count($tags))
-			foreach($tags as $t)
+		if (count($tags))
+			foreach ($tags as $t)
 				if ($t[0] != "@")
 					xml::add_element($doc, $entry, "category", "", array("term" => $t[2]));
 
 		self::get_attachment($doc, $entry, $item);
 
-		if ($complete AND ($item["id"] > 0)) {
+		if ($complete && ($item["id"] > 0)) {
 			$app = $item["app"];
 			if ($app == "")
 				$app = "web";
@@ -2200,19 +2229,33 @@ class ostatus {
 	 *
 	 * @return string XML feed
 	 */
-	public static function feed(App $a, $owner_nick, $last_update) {
+	public static function feed(App $a, $owner_nick, &$last_update) {
+		$stamp = microtime(true);
+
+		$cachekey = "ostatus:feed:".$owner_nick.":".$last_update;
+
+		$previous_created = $last_update;
+
+		$result = Cache::get($cachekey);
+		if (!is_null($result)) {
+			logger('Feed duration: '.number_format(microtime(true) - $stamp, 3).' - '.$owner_nick.' - '.$previous_created.' (cached)', LOGGER_DEBUG);
+			$last_update = $result['last_update'];
+			return $result['feed'];
+		}
 
 		$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
 				FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
 				WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
 				dbesc($owner_nick));
-		if (!$r)
+		if (!dbm::is_result($r)) {
 			return;
+		}
 
 		$owner = $r[0];
 
-		if(!strlen($last_update))
+		if (!strlen($last_update)) {
 			$last_update = 'now -30 days';
+		}
 
 		$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
 		$authorid = get_contact($owner["url"], 0);
@@ -2228,28 +2271,6 @@ class ostatus {
 				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`  = ''
-					AND ((`item`.`wall` AND (`item`.`parent` = `item`.`id`))
-						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`.`id` DESC
-				LIMIT 0, 300",
-				intval($owner["uid"]), dbesc($check_date), dbesc(NETWORK_DFRN),
-				//dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
-				//dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
-				dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN),
-				dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN),
-				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;
 
@@ -2261,9 +2282,20 @@ class ostatus {
 			}
 			$entry = self::entry($doc, $item, $owner);
 			$root->appendChild($entry);
+
+			if ($last_update < $item['created']) {
+				$last_update = $item['created'];
+			}
 		}
 
-		return(trim($doc->saveXML()));
+		$feeddata = trim($doc->saveXML());
+
+		$msg = array('feed' => $feeddata, 'last_update' => $last_update);
+		Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
+
+		logger('Feed duration: '.number_format(microtime(true) - $stamp, 3).' - '.$owner_nick.' - '.$previous_created, LOGGER_DEBUG);
+
+		return $feeddata;
 	}
 
 	/**
@@ -2287,6 +2319,6 @@ class ostatus {
 
 		$doc->appendChild($entry);
 
-		return(trim($doc->saveXML()));
+		return trim($doc->saveXML());
 	}
 }