X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=bab85515bcd99290644af5d95d2aa88717153404;hb=d60eb25ba789fa00c3f39e0a6337d0e11e22f449;hp=f02ddb5968bf3ef92052a91f04e0d6c3c4544bf0;hpb=b552b711eee382df5d3fb8b312dab4d45844025a;p=friendica.git

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index f02ddb5968..bab85515bc 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -370,7 +370,7 @@ class OStatus
 			$doc2->formatOutput = true;
 			$xml2 = $doc2->saveXML();
 
-			$header["protocol"] = PROTOCOL_OSTATUS_SALMON;
+			$header["protocol"] = Conversation::PARCEL_SALMON;
 			$header["source"] = $xml2;
 		} elseif (!$initialize) {
 			return false;
@@ -798,7 +798,7 @@ class OStatus
 
 			$conv_data = [];
 
-			$conv_data['protocol'] = PROTOCOL_SPLITTED_CONV;
+			$conv_data['protocol'] = Conversation::PARCEL_SPLIT_CONVERSATION;
 			$conv_data['network'] = NETWORK_OSTATUS;
 			$conv_data['uri'] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
 
@@ -839,7 +839,7 @@ class OStatus
 
 			$conv_data['source'] = $doc2->saveXML();
 
-			$condition = ['item-uri' => $conv_data['uri'],'protocol' => PROTOCOL_OSTATUS_FEED];
+			$condition = ['item-uri' => $conv_data['uri'],'protocol' => Conversation::PARCEL_FEED];
 			if (DBA::exists('conversation', $condition)) {
 				logger('Delete deprecated entry for URI '.$conv_data['uri'], LOGGER_DEBUG);
 				DBA::delete('conversation', ['item-uri' => $conv_data['uri']]);
@@ -863,7 +863,7 @@ class OStatus
 	 */
 	private static function fetchSelf($self, array &$item)
 	{
-		$condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON];
+		$condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, Conversation::PARCEL_DFRN, Conversation::PARCEL_SALMON];
 		if (DBA::exists('conversation', $condition)) {
 			logger('Conversation '.$item['uri'].' is already stored.', LOGGER_DEBUG);
 			return;
@@ -882,7 +882,7 @@ class OStatus
 		$doc->formatOutput = true;
 		$xml = $doc->saveXML();
 
-		$item["protocol"] = PROTOCOL_OSTATUS_SALMON;
+		$item["protocol"] = Conversation::PARCEL_SALMON;
 		$item["source"] = $xml;
 
 		logger('Conversation '.$item['uri'].' is now fetched.', LOGGER_DEBUG);
@@ -898,7 +898,7 @@ class OStatus
 	 */
 	private static function fetchRelated($related, $related_uri, $importer)
 	{
-		$condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON];
+		$condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, Conversation::PARCEL_DFRN, Conversation::PARCEL_SALMON];
 		$conversation = DBA::selectFirst('conversation', ['source', 'protocol'], $condition);
 		if (DBA::isResult($conversation)) {
 			$stored = true;
@@ -907,7 +907,7 @@ class OStatus
 				logger('Got valid cached XML for URI '.$related_uri, LOGGER_DEBUG);
 				return;
 			}
-			if ($conversation['protocol'] == PROTOCOL_OSTATUS_SALMON) {
+			if ($conversation['protocol'] == Conversation::PARCEL_SALMON) {
 				logger('Delete invalid cached XML for URI '.$related_uri, LOGGER_DEBUG);
 				DBA::delete('conversation', ['item-uri' => $related_uri]);
 			}
@@ -978,7 +978,7 @@ class OStatus
 
 		// Finally we take the data that we fetched from "ostatus:conversation"
 		if ($xml == '') {
-			$condition = ['item-uri' => $related_uri, 'protocol' => PROTOCOL_SPLITTED_CONV];
+			$condition = ['item-uri' => $related_uri, 'protocol' => Conversation::PARCEL_SPLIT_CONVERSATION];
 			$conversation = DBA::selectFirst('conversation', ['source'], $condition);
 			if (DBA::isResult($conversation)) {
 				$stored = true;
@@ -1007,26 +1007,26 @@ class OStatus
 	 */
 	private static function processRepeatedItem(DOMXPath $xpath, $entry, array &$item, array $importer)
 	{
-		$activityobjects = $xpath->query('activity:object', $entry)->item(0);
+		$activityobject = $xpath->query('activity:object', $entry)->item(0);
 
-		if (!is_object($activityobjects)) {
+		if (!is_object($activityobject)) {
 			return [];
 		}
 
 		$link_data = [];
 
-		$orig_uri = XML::getFirstNodeValue($xpath, 'atom:id/text()', $activityobjects);
+		$orig_uri = XML::getFirstNodeValue($xpath, 'atom:id/text()', $activityobject);
 
-		$links = $xpath->query("atom:link", $activityobjects);
+		$links = $xpath->query("atom:link", $activityobject);
 		if ($links) {
 			$link_data = self::processLinks($links, $item);
 		}
 
-		$orig_body = XML::getFirstNodeValue($xpath, 'atom:content/text()', $activityobjects);
-		$orig_created = XML::getFirstNodeValue($xpath, 'atom:published/text()', $activityobjects);
-		$orig_edited = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $activityobjects);
+		$orig_body = XML::getFirstNodeValue($xpath, 'atom:content/text()', $activityobject);
+		$orig_created = XML::getFirstNodeValue($xpath, 'atom:published/text()', $activityobject);
+		$orig_edited = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $activityobject);
 
-		$orig_author = self::fetchAuthor($xpath, $activityobjects, $importer, $dummy, false);
+		$orig_author = self::fetchAuthor($xpath, $activityobject, $importer, $dummy, false);
 
 		$item["author-name"] = $orig_author["author-name"];
 		$item["author-link"] = $orig_author["author-link"];
@@ -1038,11 +1038,19 @@ class OStatus
 
 		$item["uri"] = $orig_uri;
 
-		$item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobjects);
+		$item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobject);
 
-		$item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobjects);
+		$item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobject);
 
-		$inreplyto = $xpath->query('thr:in-reply-to', $activityobjects);
+		// Mastodon Content Warning
+		if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $activityobject)) {
+			$clear_text = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $activityobject);
+			if (!empty($clear_text)) {
+				$item['content-warning'] = HTML::toBBCode($clear_text);
+			}
+		}
+
+		$inreplyto = $xpath->query('thr:in-reply-to', $activityobject);
 		if (is_object($inreplyto->item(0))) {
 			foreach ($inreplyto->item(0)->attributes as $attributes) {
 				if ($attributes->name == "ref") {
@@ -1356,7 +1364,7 @@ class OStatus
 						"href" => $siteinfo["url"],
 						"type" => "text/html; charset=UTF-8",
 						"length" => "",
-						"title" => $siteinfo["title"]];
+						"title" => defaults($siteinfo, "title", $siteinfo["url"])];
 				XML::addElement($doc, $root, "link", "", $attributes);
 				break;
 			default: