X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=21f07d46b90dcb20bff703a666d56b49766004cb;hb=6db211568ae283d152ee8fa0cfe17a2bab809779;hp=2404db2df92dcf93fdc9b1bdb9be4f52adaf3d51;hpb=7fb9e1c7c8f5f4887e44aadf6115b68c6cc66d03;p=friendica.git

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 2404db2df9..21f07d46b9 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -209,7 +209,7 @@ class OStatus
 
 			$contact['name-date'] = DateTimeFormat::utcNow();
 
-			DBA::update('contact', $contact, ['id' => $contact["id"]], $current);
+			Contact::update($contact, ['id' => $contact["id"]], $current);
 
 			if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) {
 				Logger::log("Update profile picture for contact ".$contact["id"], Logger::DEBUG);
@@ -230,7 +230,7 @@ class OStatus
 						'about' => $contact["about"], 'location' => $contact["location"],
 						'success_update' => DateTimeFormat::utcNow(), 'last-update' => DateTimeFormat::utcNow()];
 
-				DBA::update('contact', $fields, ['id' => $cid], $old_contact);
+				Contact::update($fields, ['id' => $cid], $old_contact);
 
 				// Update the avatar
 				if (!empty($author["author-avatar"])) {
@@ -471,7 +471,7 @@ class OStatus
 
 			if ($item["verb"] == Activity::O_UNFOLLOW) {
 				$dummy = null;
-				Contact::removeFollower($importer, $contact, $item, $dummy);
+				Contact::removeFollower($contact);
 				continue;
 			}
 
@@ -1275,7 +1275,7 @@ class OStatus
 		XML::addElement($doc, $root, "id", DI::baseUrl() . "/profile/" . $owner["nick"]);
 		XML::addElement($doc, $root, "title", $title);
 		XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], DI::config()->get('config', 'sitename')));
-		XML::addElement($doc, $root, "logo", Contact::getAvatarUrlForId($owner['id'], ProxyUtils::SIZE_SMALL, $owner['updated']));
+		XML::addElement($doc, $root, "logo", User::getAvatarUrl($owner, ProxyUtils::SIZE_SMALL));
 		XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
 
 		$author = self::addAuthor($doc, $owner, true);
@@ -1432,7 +1432,7 @@ class OStatus
 				"type" => "image/jpeg", // To-Do?
 				"media:width" => ProxyUtils::PIXEL_SMALL,
 				"media:height" => ProxyUtils::PIXEL_SMALL,
-				"href" => Contact::getAvatarUrlForId($owner['id'], ProxyUtils::SIZE_SMALL, $owner['updated'])];
+				"href" => User::getAvatarUrl($owner, ProxyUtils::SIZE_SMALL)];
 		XML::addElement($doc, $author, "link", "", $attributes);
 
 		if (isset($owner["thumb"])) {
@@ -1441,7 +1441,7 @@ class OStatus
 					"type" => "image/jpeg", // To-Do?
 					"media:width" => ProxyUtils::PIXEL_THUMB,
 					"media:height" => ProxyUtils::PIXEL_THUMB,
-					"href" => Contact::getAvatarUrlForId($owner['id'], ProxyUtils::SIZE_THUMB, $owner['updated'])];
+					"href" => User::getAvatarUrl($owner, ProxyUtils::SIZE_THUMB)];
 			XML::addElement($doc, $author, "link", "", $attributes);
 		}
 
@@ -1931,27 +1931,31 @@ class OStatus
 		if ($item['gravity'] != GRAVITY_PARENT) {
 			$parent = Post::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item['parent']]);
 
-			$thrparent = Post::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $item['thr-parent']]);
+			$thrparent = Post::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner['uid'], 'uri' => $item['thr-parent']]);
 
 			if (DBA::isResult($thrparent)) {
-				$mentioned[$thrparent["author-link"]] = $thrparent["author-link"];
-				$mentioned[$thrparent["owner-link"]] = $thrparent["owner-link"];
-				$parent_plink = $thrparent["plink"];
+				$mentioned[$thrparent['author-link']] = $thrparent['author-link'];
+				$mentioned[$thrparent['owner-link']]  = $thrparent['owner-link'];
+				$parent_plink                         = $thrparent['plink'];
+			} elseif (DBA::isResult($parent)) {
+				$mentioned[$parent['author-link']] = $parent['author-link'];
+				$mentioned[$parent['owner-link']]  = $parent['owner-link'];
+				$parent_plink                      = DI::baseUrl() . '/display/' . $parent['guid'];
 			} else {
-				$mentioned[$parent["author-link"]] = $parent["author-link"];
-				$mentioned[$parent["owner-link"]] = $parent["owner-link"];
-				$parent_plink = DI::baseUrl()."/display/".$parent["guid"];
+				DI::logger()->notice('Missing parent and thr-parent for child item', ['item' => $item]);
 			}
 
-			$attributes = [
-					"ref" => $item['thr-parent'],
-					"href" => $parent_plink];
-			XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
+			if (isset($parent_plink)) {
+				$attributes = [
+					'ref'  => $item['thr-parent'],
+					'href' => $parent_plink];
+				XML::addElement($doc, $entry, 'thr:in-reply-to', '', $attributes);
 
-			$attributes = [
-					"rel" => "related",
-					"href" => $parent_plink];
-			XML::addElement($doc, $entry, "link", "", $attributes);
+				$attributes = [
+					'rel'  => 'related',
+					'href' => $parent_plink];
+				XML::addElement($doc, $entry, 'link', '', $attributes);
+			}
 		}
 
 		if (intval($item['parent']) > 0) {