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

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index bab85515bc..d56bacc675 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -12,6 +12,7 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Lock;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -73,9 +74,19 @@ class OStatus
 		$author["contact-id"] = $contact["id"];
 
 		$contact = null;
+
+/*
+		This here would be better, but we would get problems with contacts from the statusnet addon
+		This is kept here as a reminder for the future
+
+		$cid = Contact::getIdForURL($author["author-link"], $importer["uid"]);
+		if ($cid) {
+			$contact = DBA::selectFirst('contact', [], ['id' => $cid]);
+		}
+*/
 		if ($aliaslink != '') {
 			$condition = ["`uid` = ? AND `alias` = ? AND `network` != ? AND `rel` IN (?, ?)",
-					$importer["uid"], $aliaslink, NETWORK_STATUSNET,
+					$importer["uid"], $aliaslink, Protocol::STATUSNET,
 					Contact::SHARING, Contact::FRIEND];
 			$contact = DBA::selectFirst('contact', [], $condition);
 		}
@@ -87,13 +98,13 @@ class OStatus
 
 			$condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)",
 					$importer["uid"], normalise_link($author["author-link"]), normalise_link($aliaslink),
-					NETWORK_STATUSNET, Contact::SHARING, Contact::FRIEND];
+					Protocol::STATUSNET, Contact::SHARING, Contact::FRIEND];
 			$contact = DBA::selectFirst('contact', [], $condition);
 		}
 
 		if (!DBA::isResult($contact) && ($addr != '')) {
 			$condition = ["`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)",
-					$importer["uid"], $addr, NETWORK_STATUSNET,
+					$importer["uid"], $addr, Protocol::STATUSNET,
 					Contact::SHARING, Contact::FRIEND];
 			$contact = DBA::selectFirst('contact', [], $condition);
 		}
@@ -135,7 +146,7 @@ class OStatus
 		$author["owner-id"] = $author["author-id"];
 
 		// Only update the contacts if it is an OStatus contact
-		if (DBA::isResult($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
+		if (DBA::isResult($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == Protocol::OSTATUS)) {
 
 			// Update contact data
 			$current = $contact;
@@ -218,7 +229,7 @@ class OStatus
 			$gcid = GContact::update($contact);
 
 			GContact::link($gcid, $contact["uid"], $contact["id"]);
-		} else {
+		} elseif ($contact["network"] != Protocol::DFRN) {
 			$contact = null;
 		}
 
@@ -311,7 +322,7 @@ class OStatus
 			self::$conv_list = [];
 		}
 
-		logger("Import OStatus message", LOGGER_DEBUG);
+		logger('Import OStatus message for user ' . $importer['uid'], LOGGER_DEBUG);
 
 		if ($xml == "") {
 			return false;
@@ -345,12 +356,12 @@ class OStatus
 
 		$header = [];
 		$header["uid"] = $importer["uid"];
-		$header["network"] = NETWORK_OSTATUS;
+		$header["network"] = Protocol::OSTATUS;
 		$header["wall"] = 0;
 		$header["origin"] = 0;
 		$header["gravity"] = GRAVITY_COMMENT;
 
-		if (!is_object($doc->firstChild)) {
+		if (!is_object($doc->firstChild) || empty($doc->firstChild->tagName)) {
 			return false;
 		}
 
@@ -799,7 +810,7 @@ class OStatus
 			$conv_data = [];
 
 			$conv_data['protocol'] = Conversation::PARCEL_SPLIT_CONVERSATION;
-			$conv_data['network'] = NETWORK_OSTATUS;
+			$conv_data['network'] = Protocol::OSTATUS;
 			$conv_data['uri'] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
 
 			$inreplyto = $xpath->query('thr:in-reply-to', $entry);
@@ -1350,13 +1361,15 @@ class OStatus
 
 		switch ($siteinfo["type"]) {
 			case 'photo':
-				$imgdata = Image::getInfoFromURL($siteinfo["image"]);
-				if ($imgdata) {
-					$attributes = ["rel" => "enclosure",
-							"href" => $siteinfo["image"],
-							"type" => $imgdata["mime"],
-							"length" => intval($imgdata["size"])];
-					XML::addElement($doc, $root, "link", "", $attributes);
+				if (!empty($siteinfo["image"])) {
+					$imgdata = Image::getInfoFromURL($siteinfo["image"]);
+					if ($imgdata) {
+						$attributes = ["rel" => "enclosure",
+								"href" => $siteinfo["image"],
+								"type" => $imgdata["mime"],
+								"length" => intval($imgdata["size"])];
+						XML::addElement($doc, $root, "link", "", $attributes);
+					}
 				}
 				break;
 			case 'video':
@@ -1594,12 +1607,9 @@ class OStatus
 		}
 
 		if (!DBA::isResult($r)) {
-			$r = q(
-				"SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-				DBA::escape(normalise_link($url))
-			);
+			$gcontact = DBA::selectFirst('gcontact', [], ['nurl' => normalise_link($url)]);
 			if (DBA::isResult($r)) {
-				$contact = $r[0];
+				$contact = $gcontact;
 				$contact["uid"] = -1;
 				$contact["success_update"] = $contact["updated"];
 			}
@@ -1647,7 +1657,7 @@ class OStatus
 		$title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
 
 		$condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => false,
-			'network' => [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]];
+			'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]];
 		$repeated_item = Item::selectFirst([], $condition);
 		if (!DBA::isResult($repeated_item)) {
 			return false;
@@ -1745,7 +1755,7 @@ class OStatus
 		$object = $doc->createElement("activity:object");
 		XML::addElement($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON);
 
-		if ($contact['network'] == NETWORK_PHANTOM) {
+		if ($contact['network'] == Protocol::PHANTOM) {
 			XML::addElement($doc, $object, "id", $contact['url']);
 			return $object;
 		}
@@ -1800,14 +1810,11 @@ class OStatus
 			$item['follow'] = $contact['alias'];
 		}
 
-		$r = q(
-			"SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
-			intval($owner['uid']),
-			DBA::escape(normalise_link($contact["url"]))
-		);
+		$condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($contact["url"])];
+		$user_contact = DBA::selectFirst('contact', ['id'], $condition);
 
-		if (DBA::isResult($r)) {
-			$connect_id = $r[0]['id'];
+		if (DBA::isResult($user_contact)) {
+			$connect_id = $user_contact['id'];
 		} else {
 			$connect_id = 0;
 		}
@@ -1997,8 +2004,7 @@ class OStatus
 		}
 
 		if (intval($item["parent"]) > 0) {
-			$conversation_href = System::baseUrl()."/display/".$owner["nick"]."/".$item["parent"];
-			$conversation_uri = $conversation_href;
+			$conversation_href = $conversation_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
 
 			if (isset($parent_item)) {
 				$conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]);
@@ -2161,7 +2167,7 @@ class OStatus
 
 		$condition = ["`uid` = ? AND `created` > ? AND NOT `deleted`
 			AND NOT `private` AND `visible` AND `wall` AND `parent-network` IN (?, ?)",
-			$owner["uid"], $check_date, NETWORK_OSTATUS, NETWORK_DFRN];
+			$owner["uid"], $check_date, Protocol::OSTATUS, Protocol::DFRN];
 
 		if ($filter === 'comments') {
 			$condition[0] .= " AND `object-type` = ? ";