X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=0c096c25a8cedba197dec79d21a46611b789f5e2;hb=4894e89f036be1f8a82523ac69d56ae36e7685df;hp=2eb8c55390afd2bcb0e26ff30e719227a7c5edbf;hpb=406b46b63531bb45d73eda3badc7ba657c1ab8c0;p=friendica.git

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 2eb8c55390..0c096c25a8 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -11,6 +11,7 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\Lock;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -25,6 +26,7 @@ use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 require_once 'include/dba.php';
@@ -97,7 +99,7 @@ class OStatus
 			}
 
 			$condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)",
-					$importer["uid"], normalise_link($author["author-link"]), normalise_link($aliaslink),
+					$importer["uid"], Strings::normaliseLink($author["author-link"]), Strings::normaliseLink($aliaslink),
 					Protocol::STATUSNET, Contact::SHARING, Contact::FRIEND];
 			$contact = DBA::selectFirst('contact', [], $condition);
 		}
@@ -163,7 +165,7 @@ class OStatus
 			//	$contact["poll"] = $value;
 
 			$contact['url'] = $author["author-link"];
-			$contact['nurl'] = normalise_link($contact['url']);
+			$contact['nurl'] = Strings::normaliseLink($contact['url']);
 
 			$value = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context);
 			if ($value != "") {
@@ -195,7 +197,7 @@ class OStatus
 			DBA::update('contact', $contact, ['id' => $contact["id"]], $current);
 
 			if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) {
-				logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG);
+				Logger::log("Update profile picture for contact ".$contact["id"], Logger::DEBUG);
 				Contact::updateAvatar($author["author-avatar"], $importer["uid"], $contact["id"]);
 			}
 
@@ -208,7 +210,7 @@ class OStatus
 
 				// Update it with the current values
 				$fields = ['url' => $author["author-link"], 'name' => $contact["name"],
-						'nurl' => normalise_link($author["author-link"]),
+						'nurl' => Strings::normaliseLink($author["author-link"]),
 						'nick' => $contact["nick"], 'alias' => $contact["alias"],
 						'about' => $contact["about"], 'location' => $contact["location"],
 						'success_update' => DateTimeFormat::utcNow(), 'last-update' => DateTimeFormat::utcNow()];
@@ -322,7 +324,7 @@ class OStatus
 			self::$conv_list = [];
 		}
 
-		logger('Import OStatus message for user ' . $importer['uid'], LOGGER_DEBUG);
+		Logger::log('Import OStatus message for user ' . $importer['uid'], Logger::DEBUG);
 
 		if ($xml == "") {
 			return false;
@@ -348,7 +350,7 @@ class OStatus
 				foreach ($hub_attributes as $hub_attribute) {
 					if ($hub_attribute->name == "href") {
 						$hub = $hub_attribute->textContent;
-						logger("Found hub ".$hub, LOGGER_DEBUG);
+						Logger::log("Found hub ".$hub, Logger::DEBUG);
 					}
 				}
 			}
@@ -433,27 +435,27 @@ class OStatus
 
 			if (in_array($item["verb"], [NAMESPACE_OSTATUS."/unfavorite", ACTIVITY_UNFAVORITE])) {
 				// Ignore "Unfavorite" message
-				logger("Ignore unfavorite message ".print_r($item, true), LOGGER_DEBUG);
+				Logger::log("Ignore unfavorite message ".print_r($item, true), Logger::DEBUG);
 				continue;
 			}
 
 			// Deletions come with the same uri, so we check for duplicates after processing deletions
 			if (Item::exists(['uid' => $importer["uid"], 'uri' => $item["uri"]])) {
-				logger('Post with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', LOGGER_DEBUG);
+				Logger::log('Post with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', Logger::DEBUG);
 				continue;
 			} else {
-				logger('Processing post with URI '.$item["uri"].' for user '.$importer["uid"].'.', LOGGER_DEBUG);
+				Logger::log('Processing post with URI '.$item["uri"].' for user '.$importer["uid"].'.', Logger::DEBUG);
 			}
 
 			if ($item["verb"] == ACTIVITY_JOIN) {
 				// ignore "Join" messages
-				logger("Ignore join message ".print_r($item, true), LOGGER_DEBUG);
+				Logger::log("Ignore join message ".print_r($item, true), Logger::DEBUG);
 				continue;
 			}
 
 			if ($item["verb"] == "http://mastodon.social/schema/1.0/block") {
 				// ignore mastodon "block" messages
-				logger("Ignore block message ".print_r($item, true), LOGGER_DEBUG);
+				Logger::log("Ignore block message ".print_r($item, true), Logger::DEBUG);
 				continue;
 			}
 
@@ -470,7 +472,7 @@ class OStatus
 
 			if ($item["verb"] == ACTIVITY_FAVORITE) {
 				$orig_uri = $xpath->query("activity:object/atom:id", $entry)->item(0)->nodeValue;
-				logger("Favorite ".$orig_uri." ".print_r($item, true));
+				Logger::log("Favorite ".$orig_uri." ".print_r($item, true));
 
 				$item["verb"] = ACTIVITY_LIKE;
 				$item["parent-uri"] = $orig_uri;
@@ -480,7 +482,7 @@ class OStatus
 
 			// http://activitystrea.ms/schema/1.0/rsvp-yes
 			if (!in_array($item["verb"], [ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE])) {
-				logger("Unhandled verb ".$item["verb"]." ".print_r($item, true), LOGGER_DEBUG);
+				Logger::log("Unhandled verb ".$item["verb"]." ".print_r($item, true), Logger::DEBUG);
 			}
 
 			self::processPost($xpath, $entry, $item, $importer);
@@ -493,10 +495,10 @@ class OStatus
 						// If not, then it depends on this setting
 						$valid = !Config::get('system', 'ostatus_full_threads');
 						if ($valid) {
-							logger("Item with uri ".self::$itemlist[0]['uri']." will be imported due to the system settings.", LOGGER_DEBUG);
+							Logger::log("Item with uri ".self::$itemlist[0]['uri']." will be imported due to the system settings.", Logger::DEBUG);
 						}
 					} else {
-						logger("Item with uri ".self::$itemlist[0]['uri']." belongs to a contact (".self::$itemlist[0]['contact-id']."). It will be imported.", LOGGER_DEBUG);
+						Logger::log("Item with uri ".self::$itemlist[0]['uri']." belongs to a contact (".self::$itemlist[0]['contact-id']."). It will be imported.", Logger::DEBUG);
 					}
 					if ($valid) {
 						// Never post a thread when the only interaction by our contact was a like
@@ -508,14 +510,14 @@ class OStatus
 							}
 						}
 						if ($valid) {
-							logger("Item with uri ".self::$itemlist[0]['uri']." will be imported since the thread contains posts or shares.", LOGGER_DEBUG);
+							Logger::log("Item with uri ".self::$itemlist[0]['uri']." will be imported since the thread contains posts or shares.", Logger::DEBUG);
 						}
 					}
 				} else {
 					// But we will only import complete threads
 					$valid = Item::exists(['uid' => $importer["uid"], 'uri' => self::$itemlist[0]['parent-uri']]);
 					if ($valid) {
-						logger("Item with uri ".self::$itemlist[0]["uri"]." belongs to parent ".self::$itemlist[0]['parent-uri']." of user ".$importer["uid"].". It will be imported.", LOGGER_DEBUG);
+						Logger::log("Item with uri ".self::$itemlist[0]["uri"]." belongs to parent ".self::$itemlist[0]['parent-uri']." of user ".$importer["uid"].". It will be imported.", Logger::DEBUG);
 					}
 				}
 
@@ -532,25 +534,25 @@ class OStatus
 					foreach (self::$itemlist as $item) {
 						$found = Item::exists(['uid' => $importer["uid"], 'uri' => $item["uri"]]);
 						if ($found) {
-							logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already exists.", LOGGER_DEBUG);
+							Logger::log("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already exists.", Logger::DEBUG);
 						} elseif ($item['contact-id'] < 0) {
-							logger("Item with uri ".$item["uri"]." is from a blocked contact.", LOGGER_DEBUG);
+							Logger::log("Item with uri ".$item["uri"]." is from a blocked contact.", Logger::DEBUG);
 						} else {
 							// We are having duplicated entries. Hopefully this solves it.
 							if (Lock::acquire('ostatus_process_item_insert')) {
 								$ret = Item::insert($item);
 								Lock::release('ostatus_process_item_insert');
-								logger("Item with uri ".$item["uri"]." for user ".$importer["uid"].' stored. Return value: '.$ret);
+								Logger::log("Item with uri ".$item["uri"]." for user ".$importer["uid"].' stored. Return value: '.$ret);
 							} else {
 								$ret = Item::insert($item);
-								logger("We couldn't lock - but tried to store the item anyway. Return value is ".$ret);
+								Logger::log("We couldn't lock - but tried to store the item anyway. Return value is ".$ret);
 							}
 						}
 					}
 				}
 				self::$itemlist = [];
 			}
-			logger('Processing done for post with URI '.$item["uri"].' for user '.$importer["uid"].'.', LOGGER_DEBUG);
+			Logger::log('Processing done for post with URI '.$item["uri"].' for user '.$importer["uid"].'.', Logger::DEBUG);
 		}
 		return true;
 	}
@@ -564,13 +566,13 @@ class OStatus
 	{
 		$condition = ['uid' => $item['uid'], 'author-id' => $item['author-id'], 'uri' => $item['uri']];
 		if (!Item::exists($condition)) {
-			logger('Item from '.$item['author-link'].' with uri '.$item['uri'].' for user '.$item['uid']." wasn't found. We don't delete it.");
+			Logger::log('Item from '.$item['author-link'].' with uri '.$item['uri'].' for user '.$item['uid']." wasn't found. We don't delete it.");
 			return;
 		}
 
 		Item::delete($condition);
 
-		logger('Deleted item with uri '.$item['uri'].' for user '.$item['uid']);
+		Logger::log('Deleted item with uri '.$item['uri'].' for user '.$item['uid']);
 	}
 
 	/**
@@ -706,7 +708,7 @@ class OStatus
 					self::fetchRelated($related, $item["parent-uri"], $importer);
 				}
 			} else {
-				logger('Reply with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', LOGGER_DEBUG);
+				Logger::log('Reply with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', Logger::DEBUG);
 			}
 		} else {
 			$item["parent-uri"] = $item["uri"];
@@ -736,21 +738,21 @@ class OStatus
 
 		self::$conv_list[$conversation] = true;
 
-		$conversation_data = Network::curl($conversation, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
+		$curlResult = Network::curl($conversation, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
 
-		if (!$conversation_data['success']) {
+		if (!$curlResult->isSuccess()) {
 			return;
 		}
 
 		$xml = '';
 
-		if (stristr($conversation_data['header'], 'Content-Type: application/atom+xml')) {
-			$xml = $conversation_data['body'];
+		if (stristr($curlResult->getHeader(), 'Content-Type: application/atom+xml')) {
+			$xml = $curlResult->getBody();
 		}
 
 		if ($xml == '') {
 			$doc = new DOMDocument();
-			if (!@$doc->loadHTML($conversation_data['body'])) {
+			if (!@$doc->loadHTML($curlResult->getBody())) {
 				return;
 			}
 			$xpath = new DOMXPath($doc);
@@ -767,8 +769,8 @@ class OStatus
 				if ($file != '') {
 					$conversation_atom = Network::curl($attribute['href']);
 
-					if ($conversation_atom['success']) {
-						$xml = $conversation_atom['body'];
+					if ($conversation_atom->isSuccess()) {
+						$xml = $conversation_atom->getBody();
 					}
 				}
 			}
@@ -852,11 +854,11 @@ class OStatus
 
 			$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);
+				Logger::log('Delete deprecated entry for URI '.$conv_data['uri'], Logger::DEBUG);
 				DBA::delete('conversation', ['item-uri' => $conv_data['uri']]);
 			}
 
-			logger('Store conversation data for uri '.$conv_data['uri'], LOGGER_DEBUG);
+			Logger::log('Store conversation data for uri '.$conv_data['uri'], Logger::DEBUG);
 			Conversation::insert($conv_data);
 		}
 	}
@@ -876,19 +878,19 @@ class OStatus
 	{
 		$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);
+			Logger::log('Conversation '.$item['uri'].' is already stored.', Logger::DEBUG);
 			return;
 		}
 
-		$self_data = Network::curl($self);
+		$curlResult = Network::curl($self);
 
-		if (!$self_data['success']) {
+		if (!$curlResult->isSuccess()) {
 			return;
 		}
 
 		// We reformat the XML to make it better readable
 		$doc = new DOMDocument();
-		$doc->loadXML($self_data['body']);
+		$doc->loadXML($curlResult->getBody());
 		$doc->preserveWhiteSpace = false;
 		$doc->formatOutput = true;
 		$xml = $doc->saveXML();
@@ -896,7 +898,7 @@ class OStatus
 		$item["protocol"] = Conversation::PARCEL_SALMON;
 		$item["source"] = $xml;
 
-		logger('Conversation '.$item['uri'].' is now fetched.', LOGGER_DEBUG);
+		Logger::log('Conversation '.$item['uri'].' is now fetched.', Logger::DEBUG);
 	}
 
 	/**
@@ -915,32 +917,32 @@ class OStatus
 			$stored = true;
 			$xml = $conversation['source'];
 			if (self::process($xml, $importer, $contact, $hub, $stored, false)) {
-				logger('Got valid cached XML for URI '.$related_uri, LOGGER_DEBUG);
+				Logger::log('Got valid cached XML for URI '.$related_uri, Logger::DEBUG);
 				return;
 			}
 			if ($conversation['protocol'] == Conversation::PARCEL_SALMON) {
-				logger('Delete invalid cached XML for URI '.$related_uri, LOGGER_DEBUG);
+				Logger::log('Delete invalid cached XML for URI '.$related_uri, Logger::DEBUG);
 				DBA::delete('conversation', ['item-uri' => $related_uri]);
 			}
 		}
 
 		$stored = false;
-		$related_data = Network::curl($related, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
+		$curlResult = Network::curl($related, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
 
-		if (!$related_data['success']) {
+		if (!$curlResult->isSuccess()) {
 			return;
 		}
 
 		$xml = '';
 
-		if (stristr($related_data['header'], 'Content-Type: application/atom+xml')) {
-			logger('Directly fetched XML for URI '.$related_uri, LOGGER_DEBUG);
-			$xml = $related_data['body'];
+		if (stristr($curlResult->getHeader(), 'Content-Type: application/atom+xml')) {
+			Logger::log('Directly fetched XML for URI ' . $related_uri, Logger::DEBUG);
+			$xml = $curlResult->getBody();
 		}
 
 		if ($xml == '') {
 			$doc = new DOMDocument();
-			if (!@$doc->loadHTML($related_data['body'])) {
+			if (!@$doc->loadHTML($curlResult->getBody())) {
 				return;
 			}
 			$xpath = new DOMXPath($doc);
@@ -956,11 +958,11 @@ class OStatus
 					}
 				}
 				if ($atom_file != '') {
-					$related_atom = Network::curl($atom_file);
+					$curlResult = Network::curl($atom_file);
 
-					if ($related_atom['success']) {
-						logger('Fetched XML for URI '.$related_uri, LOGGER_DEBUG);
-						$xml = $related_atom['body'];
+					if ($curlResult->isSuccess()) {
+						Logger::log('Fetched XML for URI ' . $related_uri, Logger::DEBUG);
+						$xml = $curlResult->getBody();
 					}
 				}
 			}
@@ -968,22 +970,22 @@ class OStatus
 
 		// Workaround for older GNU Social servers
 		if (($xml == '') && strstr($related, '/notice/')) {
-			$related_atom = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related).'.atom');
+			$curlResult = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related).'.atom');
 
-			if ($related_atom['success']) {
-				logger('GNU Social workaround to fetch XML for URI '.$related_uri, LOGGER_DEBUG);
-				$xml = $related_atom['body'];
+			if ($curlResult->isSuccess()) {
+				Logger::log('GNU Social workaround to fetch XML for URI ' . $related_uri, Logger::DEBUG);
+				$xml = $curlResult->getBody();
 			}
 		}
 
 		// Even more worse workaround for GNU Social ;-)
 		if ($xml == '') {
 			$related_guess = OStatus::convertHref($related_uri);
-			$related_atom = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related_guess).'.atom');
+			$curlResult = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related_guess).'.atom');
 
-			if ($related_atom['success']) {
-				logger('GNU Social workaround 2 to fetch XML for URI '.$related_uri, LOGGER_DEBUG);
-				$xml = $related_atom['body'];
+			if ($curlResult->isSuccess()) {
+				Logger::log('GNU Social workaround 2 to fetch XML for URI ' . $related_uri, Logger::DEBUG);
+				$xml = $curlResult->getBody();
 			}
 		}
 
@@ -993,7 +995,7 @@ class OStatus
 			$conversation = DBA::selectFirst('conversation', ['source'], $condition);
 			if (DBA::isResult($conversation)) {
 				$stored = true;
-				logger('Got cached XML from conversation for URI '.$related_uri, LOGGER_DEBUG);
+				Logger::log('Got cached XML from conversation for URI '.$related_uri, Logger::DEBUG);
 				$xml = $conversation['source'];
 			}
 		}
@@ -1001,7 +1003,7 @@ class OStatus
 		if ($xml != '') {
 			self::process($xml, $importer, $contact, $hub, $stored, false);
 		} else {
-			logger("XML couldn't be fetched for URI: ".$related_uri." - href: ".$related, LOGGER_DEBUG);
+			Logger::log("XML couldn't be fetched for URI: ".$related_uri." - href: ".$related, Logger::DEBUG);
 		}
 		return;
 	}
@@ -1450,8 +1452,8 @@ class OStatus
 		$attributes = [
 				"rel" => "avatar",
 				"type" => "image/jpeg", // To-Do?
-				"media:width" => 175,
-				"media:height" => 175,
+				"media:width" => 300,
+				"media:height" => 300,
 				"href" => $owner["photo"]];
 		XML::addElement($doc, $author, "link", "", $attributes);
 
@@ -1598,7 +1600,7 @@ class OStatus
 	{
 		$r = q(
 			"SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1",
-			DBA::escape(normalise_link($url)),
+			DBA::escape(Strings::normaliseLink($url)),
 			intval($owner["uid"])
 		);
 		if (DBA::isResult($r)) {
@@ -1607,7 +1609,7 @@ class OStatus
 		}
 
 		if (!DBA::isResult($r)) {
-			$gcontact = DBA::selectFirst('gcontact', [], ['nurl' => normalise_link($url)]);
+			$gcontact = DBA::selectFirst('gcontact', [], ['nurl' => Strings::normaliseLink($url)]);
 			if (DBA::isResult($r)) {
 				$contact = $gcontact;
 				$contact["uid"] = -1;
@@ -1650,8 +1652,8 @@ class OStatus
 	 */
 	private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid, $toplevel)
 	{
-		if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
-			logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
+		if (($item["id"] != $item["parent"]) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
+			Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
 		}
 
 		$title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
@@ -1713,8 +1715,8 @@ class OStatus
 	 */
 	private static function likeEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
 	{
-		if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
-			logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
+		if (($item["id"] != $item["parent"]) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
+			Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
 		}
 
 		$title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
@@ -1769,8 +1771,8 @@ class OStatus
 		$attributes = [
 				"rel" => "avatar",
 				"type" => "image/jpeg", // To-Do?
-				"media:width" => 175,
-				"media:height" => 175,
+				"media:width" => 300,
+				"media:height" => 300,
 				"href" => $contact["photo"]];
 		XML::addElement($doc, $object, "link", "", $attributes);
 
@@ -1810,7 +1812,7 @@ class OStatus
 			$item['follow'] = $contact['alias'];
 		}
 
-		$condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($contact["url"])];
+		$condition = ['uid' => $owner['uid'], 'nurl' => Strings::normaliseLink($contact["url"])];
 		$user_contact = DBA::selectFirst('contact', ['id'], $condition);
 
 		if (DBA::isResult($user_contact)) {
@@ -1830,7 +1832,7 @@ class OStatus
 		}
 
 		$item["uri"] = $item['parent-uri'] = $item['thr-parent']
-				= 'tag:'.get_app()->get_hostname().
+				= 'tag:'.get_app()->getHostName().
 				','.date('Y-m-d').':'.$action.':'.$owner['uid'].
 				':person:'.$connect_id.':'.$item['created'];
 
@@ -1860,8 +1862,8 @@ class OStatus
 	 */
 	private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
 	{
-		if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
-			logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
+		if (($item["id"] != $item["parent"]) && (Strings::normaliseLink($item["author-link"]) != Strings::normaliseLink($owner["url"]))) {
+			Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
 		}
 
 		$title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
@@ -2004,7 +2006,7 @@ class OStatus
 		}
 
 		if (intval($item["parent"]) > 0) {
-			$conversation_href = $conversation_uri = str_replace('/object/', '/context/', $item['parent-uri']);
+			$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]);
@@ -2047,7 +2049,7 @@ class OStatus
 		$mentioned = $newmentions;
 
 		foreach ($mentioned as $mention) {
-			$condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($mention)];
+			$condition = ['uid' => $owner['uid'], 'nurl' => Strings::normaliseLink($mention)];
 			$contact = DBA::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
 			if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) ||
 				($contact['self'] && ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY))) {
@@ -2152,7 +2154,7 @@ class OStatus
 		if ((time() - strtotime($owner['last-item'])) < 15*60) {
 			$result = Cache::get($cachekey);
 			if (!$nocache && !is_null($result)) {
-				logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)', LOGGER_DEBUG);
+				Logger::log('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)', Logger::DEBUG);
 				$last_update = $result['last_update'];
 				return $result['feed'];
 			}
@@ -2210,9 +2212,9 @@ class OStatus
 		$feeddata = trim($doc->saveXML());
 
 		$msg = ['feed' => $feeddata, 'last_update' => $last_update];
-		Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
+		Cache::set($cachekey, $msg, Cache::QUARTER_HOUR);
 
-		logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created, LOGGER_DEBUG);
+		Logger::log('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created, Logger::DEBUG);
 
 		return $feeddata;
 	}