X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fostatus.php;h=ec53141dc7d06c386c8d070baddbfc1748e08c6a;hb=5efab810f5ac961995940e8ca4051123334111c2;hp=d6e2e1773550e4d4c33059972d75f9fd440bc7d5;hpb=fd965b046aa12bad60330c4c5655dd21a325f998;p=friendica.git

diff --git a/include/ostatus.php b/include/ostatus.php
index d6e2e17735..ec53141dc7 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -149,12 +149,11 @@ class ostatus {
 			if ($cid) {
 				// Update it with the current values
 				q("UPDATE `contact` SET `url` = '%s', `name` = '%s', `nick` = '%s', `alias` = '%s',
-						`about` = '%s', `location` = '%s', `notify` = '%s', `poll` = '%s',
+						`about` = '%s', `location` = '%s',
 						`success_update` = '%s', `last-update` = '%s'
 					WHERE `id` = %d",
 					dbesc($author["author-link"]), dbesc($contact["name"]), dbesc($contact["nick"]),
 					dbesc($contact["alias"]), dbesc($contact["about"]), dbesc($contact["location"]),
-					dbesc($contact["notify"]), dbesc($contact["poll"]),
 					dbesc(datetime_convert()), dbesc(datetime_convert()), intval($cid));
 
 				// Update the avatar
@@ -162,6 +161,7 @@ class ostatus {
 			}
 
 			$contact["generation"] = 2;
+			$contact["hide"] = false; // OStatus contacts are never hidden
 			$contact["photo"] = $author["author-avatar"];
 			update_gcontact($contact);
 		}
@@ -493,6 +493,7 @@ class ostatus {
 						$orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue;
 
 					$orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue;
+					$orig_edited = $xpath->query('atom:updated/text()', $activityobjects)->item(0)->nodeValue;
 
 					$orig_contact = $contact;
 					$orig_author = self::fetchauthor($xpath, $activityobjects, $importer, $orig_contact, false);
@@ -502,6 +503,7 @@ class ostatus {
 					$item["author-avatar"] = $orig_author["author-avatar"];
 					$item["body"] = add_page_info_to_body(html2bbcode($orig_body));
 					$item["created"] = $orig_created;
+					$item["edited"] = $orig_edited;
 
 					$item["uri"] = $orig_uri;
 					$item["plink"] = $orig_link;
@@ -692,6 +694,7 @@ class ostatus {
 				}
 			}
 
+		$contact["hide"] = false; // OStatus contacts are never hidden
 		update_gcontact($contact);
 	}
 
@@ -1713,7 +1716,8 @@ class ostatus {
 
 		$as_object = $doc->createElement("activity:object");
 
-		$parent = q("SELECT * FROM `item` WHERE `id` = %d", intval($item["parent"]));
+		$parent = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
+			dbesc($item["thr-parent"]), intval($item["uid"]));
 		$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
 
 		xml::add_element($doc, $as_object, "activity:object-type", self::construct_objecttype($parent[0]));
@@ -1967,7 +1971,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),