X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fostatus.php;h=f9911bfaab7622925fff20a6b2718eaa734dcd16;hb=8039ad0e2318c28a22f87c31dbbdb3165f1ef058;hp=bcd8fd671302bffd4527ab1160d277d7095602ef;hpb=4eeb5a0a17fd394d27faf0315196d6916a22d31b;p=friendica.git

diff --git a/include/ostatus.php b/include/ostatus.php
index bcd8fd6713..f9911bfaab 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -467,7 +467,7 @@ class ostatus {
 			}
 
 			// Is it a repeated post?
-			if ($repeat_of != "") {
+			if (($repeat_of != "") OR ($item["verb"] == ACTIVITY_SHARE)) {
 				$activityobjects = $xpath->query('activity:object', $entry)->item(0);
 
 				if (is_object($activityobjects)) {
@@ -1561,10 +1561,13 @@ class ostatus {
 		if ($xml)
 			return $xml;
 
-		if ($item["verb"] == ACTIVITY_LIKE)
+		if ($item["verb"] == ACTIVITY_LIKE) {
 			return self::like_entry($doc, $item, $owner, $toplevel);
-		else
+		} elseif (in_array($item["verb"], array(ACTIVITY_FOLLOW, NAMESPACE_OSTATUS."/unfollow"))) {
+			return self::follow_entry($doc, $item, $owner, $toplevel);
+		} else {
 			return self::note_entry($doc, $item, $owner, $toplevel);
+		}
 	}
 
 	/**
@@ -1740,6 +1743,113 @@ class ostatus {
 		return $entry;
 	}
 
+	/**
+	 * @brief Adds the person object element to the XML document
+	 *
+	 * @param object $doc XML document
+	 * @param array $owner Contact data of the poster
+	 * @param array $contact Contact data of the target
+	 *
+	 * @return object author element
+	 */
+	private function add_person_object($doc, $owner, $contact) {
+
+		$object = $doc->createElement("activity:object");
+		xml::add_element($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON);
+
+		if ($contact['network'] == NETWORK_PHANTOM) {
+			xml::add_element($doc, $object, "id", $contact['url']);
+			return $object;
+		}
+
+		xml::add_element($doc, $object, "id", $contact["alias"]);
+		xml::add_element($doc, $object, "title", $contact["nick"]);
+
+		$attributes = array("rel" => "alternate", "type" => "text/html", "href" => $contact["url"]);
+		xml::add_element($doc, $object, "link", "", $attributes);
+
+		$attributes = array(
+				"rel" => "avatar",
+				"type" => "image/jpeg", // To-Do?
+				"media:width" => 175,
+				"media:height" => 175,
+				"href" => $contact["photo"]);
+		xml::add_element($doc, $object, "link", "", $attributes);
+
+		xml::add_element($doc, $object, "poco:preferredUsername", $contact["nick"]);
+		xml::add_element($doc, $object, "poco:displayName", $contact["name"]);
+
+		if (trim($contact["location"]) != "") {
+			$element = $doc->createElement("poco:address");
+			xml::add_element($doc, $element, "poco:formatted", $contact["location"]);
+			$object->appendChild($element);
+		}
+
+		return $object;
+	}
+
+	/**
+	 * @brief Adds a follow/unfollow entry element
+	 *
+	 * @param object $doc XML document
+	 * @param array $item Data of the follow/unfollow message
+	 * @param array $owner Contact data of the poster
+	 * @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
+	 *
+	 * @return object Entry element
+	 */
+	private function follow_entry($doc, $item, $owner, $toplevel) {
+
+		$item["id"] = $item["parent"] = 0;
+		$item["created"] = $item["edited"] = date("c");
+		$item["private"] = true;
+
+		$contact = Probe::uri($item['follow']);
+
+		if ($contact['alias'] == '') {
+			$contact['alias'] = $contact["url"];
+		} else {
+			$item['follow'] = $contact['alias'];
+		}
+
+		$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
+			intval($owner['uid']), dbesc(normalise_link($contact["url"])));
+
+		if (dbm::is_result($r)) {
+			$connect_id = $r[0]['id'];
+		} else {
+			$connect_id = 0;
+		}
+
+		if ($item['verb'] == ACTIVITY_FOLLOW) {
+			$message = t('%s is now following %s.');
+			$title = t('following');
+			$action = "subscription";
+		} else {
+			$message = t('%s stopped following %s.');
+			$title = t('stopped following');
+			$action = "unfollow";
+		}
+
+		$item["uri"] = $item['parent-uri'] = $item['thr-parent'] =
+				'tag:'.get_app()->get_hostname().
+				','.date('Y-m-d').':'.$action.':'.$owner['uid'].
+				':person:'.$connect_id.':'.$item['created'];
+
+		$item["body"] = sprintf($message, $owner["nick"], $contact["nick"]);
+
+		self::entry_header($doc, $entry, $owner, $toplevel);
+
+		self::entry_content($doc, $entry, $item, $owner, $title);
+
+		$object = self::add_person_object($doc, $owner, $contact);
+		$entry->appendChild($object);
+
+		self::entry_footer($doc, $entry, $item, $owner);
+
+		return $entry;
+	}
+
 	/**
 	 * @brief Adds a regular entry element
 	 *
@@ -1832,7 +1942,7 @@ class ostatus {
 		xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
 								"href" => App::get_baseurl()."/display/".$item["guid"]));
 
-		if ($complete)
+		if ($complete AND ($item["id"] > 0))
 			xml::add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
 
 		xml::add_element($doc, $entry, "activity:verb", $verb);
@@ -1881,9 +1991,11 @@ class ostatus {
 			}
 		}
 
-		xml::add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation",
-							"href" => App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]));
-		xml::add_element($doc, $entry, "ostatus:conversation", App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]);
+		if (intval($item["parent"]) > 0) {
+			$conversation = App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"];
+			xml::add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation", "href" => $conversation));
+			xml::add_element($doc, $entry, "ostatus:conversation", $conversation);
+		}
 
 		$tags = item_getfeedtags($item);
 
@@ -1929,7 +2041,7 @@ class ostatus {
 
 		self::get_attachment($doc, $entry, $item);
 
-		if ($complete) {
+		if ($complete AND ($item["id"] > 0)) {
 			$app = $item["app"];
 			if ($app == "")
 				$app = "web";