X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=a1857c5db7135784389cd06ed035b2e67e85ab2d;hb=dc669fa736daa2c666b6333c550ebd98083e5ca8;hp=67c3070fe25432e16d8dba0853f647c35a15d608;hpb=d6ccba79e0d80f7d5cced13e8f4d237607ba09ba;p=friendica.git

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 67c3070fe2..a1857c5db7 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -11,10 +11,11 @@ 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;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\GContact;
@@ -24,6 +25,7 @@ use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\XML;
 
 require_once 'include/dba.php';
@@ -31,7 +33,6 @@ require_once 'include/items.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
 require_once 'include/api.php';
-require_once 'mod/proxy.php';
 
 /**
  * @brief This class contain functions for the OStatus protocol
@@ -74,32 +75,42 @@ 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,
-					CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
+					$importer["uid"], $aliaslink, Protocol::STATUSNET,
+					Contact::SHARING, Contact::FRIEND];
 			$contact = DBA::selectFirst('contact', [], $condition);
 		}
 
-		if (!DBM::is_result($contact) && $author["author-link"] != '') {
+		if (!DBA::isResult($contact) && $author["author-link"] != '') {
 			if ($aliaslink == "") {
 				$aliaslink = $author["author-link"];
 			}
 
 			$condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)",
 					$importer["uid"], normalise_link($author["author-link"]), normalise_link($aliaslink),
-					NETWORK_STATUSNET, CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
+					Protocol::STATUSNET, Contact::SHARING, Contact::FRIEND];
 			$contact = DBA::selectFirst('contact', [], $condition);
 		}
 
-		if (!DBM::is_result($contact) && ($addr != '')) {
+		if (!DBA::isResult($contact) && ($addr != '')) {
 			$condition = ["`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)",
-					$importer["uid"], $addr, NETWORK_STATUSNET,
-					CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
+					$importer["uid"], $addr, Protocol::STATUSNET,
+					Contact::SHARING, Contact::FRIEND];
 			$contact = DBA::selectFirst('contact', [], $condition);
 		}
 
-		if (DBM::is_result($contact)) {
+		if (DBA::isResult($contact)) {
 			if ($contact['blocked']) {
 				$contact['id'] = -1;
 			}
@@ -136,7 +147,7 @@ class OStatus
 		$author["owner-id"] = $author["author-id"];
 
 		// Only update the contacts if it is an OStatus contact
-		if (DBM::is_result($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;
@@ -185,7 +196,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"]);
 			}
 
@@ -219,6 +230,8 @@ class OStatus
 			$gcid = GContact::update($contact);
 
 			GContact::link($gcid, $contact["uid"], $contact["id"]);
+		} elseif ($contact["network"] != Protocol::DFRN) {
+			$contact = null;
 		}
 
 		return $author;
@@ -286,7 +299,7 @@ class OStatus
 	 * @param string $hub      Called by reference, returns the fetched hub data
 	 * @return void
 	 */
-	public static function import($xml, array $importer, array &$contact, &$hub)
+	public static function import($xml, array $importer, array &$contact = null, &$hub)
 	{
 		self::process($xml, $importer, $contact, $hub);
 	}
@@ -310,7 +323,7 @@ class OStatus
 			self::$conv_list = [];
 		}
 
-		logger("Import OStatus message", LOGGER_DEBUG);
+		Logger::log('Import OStatus message for user ' . $importer['uid'], Logger::DEBUG);
 
 		if ($xml == "") {
 			return false;
@@ -336,7 +349,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);
 					}
 				}
 			}
@@ -344,11 +357,15 @@ 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) || empty($doc->firstChild->tagName)) {
+			return false;
+		}
+
 		$first_child = $doc->firstChild->tagName;
 
 		if ($first_child == "feed") {
@@ -365,7 +382,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;
@@ -417,27 +434,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;
 			}
 
@@ -454,7 +471,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;
@@ -464,7 +481,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);
@@ -477,10 +494,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
@@ -492,14 +509,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);
 					}
 				}
 
@@ -516,25 +533,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;
 	}
@@ -548,13 +565,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']);
 	}
 
 	/**
@@ -690,7 +707,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"];
@@ -720,21 +737,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);
@@ -751,8 +768,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();
 					}
 				}
 			}
@@ -793,8 +810,8 @@ class OStatus
 
 			$conv_data = [];
 
-			$conv_data['protocol'] = PROTOCOL_SPLITTED_CONV;
-			$conv_data['network'] = NETWORK_OSTATUS;
+			$conv_data['protocol'] = Conversation::PARCEL_SPLIT_CONVERSATION;
+			$conv_data['network'] = Protocol::OSTATUS;
 			$conv_data['uri'] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
 
 			$inreplyto = $xpath->query('thr:in-reply-to', $entry);
@@ -834,13 +851,13 @@ 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);
+				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);
 		}
 	}
@@ -858,29 +875,29 @@ 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);
+			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();
 
-		$item["protocol"] = PROTOCOL_OSTATUS_SALMON;
+		$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);
 	}
 
 	/**
@@ -893,38 +910,38 @@ 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 (DBM::is_result($conversation)) {
+		if (DBA::isResult($conversation)) {
 			$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'] == PROTOCOL_OSTATUS_SALMON) {
-				logger('Delete invalid cached XML for URI '.$related_uri, LOGGER_DEBUG);
+			if ($conversation['protocol'] == Conversation::PARCEL_SALMON) {
+				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);
@@ -940,11 +957,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();
 					}
 				}
 			}
@@ -952,32 +969,32 @@ 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();
 			}
 		}
 
 		// 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 (DBM::is_result($conversation)) {
+			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'];
 			}
 		}
@@ -985,7 +1002,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;
 	}
@@ -1002,26 +1019,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"];
@@ -1033,11 +1050,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()', $activityobject);
 
-		$item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $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', $activityobjects);
+		$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") {
@@ -1213,7 +1238,7 @@ class OStatus
 			}
 
 			// Is it a remote picture? Then make a smaller preview here
-			$preview = proxy_url($preview, false, PROXY_SIZE_SMALL);
+			$preview = ProxyUtils::proxifyUrl($preview, false, ProxyUtils::SIZE_SMALL);
 
 			// Is it a local picture? Then make it smaller here
 			$preview = str_replace(["-0.jpg", "-0.png"], ["-2.jpg", "-2.png"], $preview);
@@ -1298,7 +1323,7 @@ class OStatus
 			"rel" => "self", "type" => "application/atom+xml"];
 		XML::addElement($doc, $root, "link", "", $attributes);
 
-		if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+		if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
 			$condition = ['uid' => $owner['uid'], 'self' => false, 'pending' => false,
 					'archive' => false, 'hidden' => false, 'blocked' => false];
 			$members = DBA::count('contact', $condition);
@@ -1337,13 +1362,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':
@@ -1351,7 +1378,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:
@@ -1406,7 +1433,7 @@ class OStatus
 		$profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid'], 'is-default' => true]);
 		$author = $doc->createElement("author");
 		XML::addElement($doc, $author, "id", $owner["url"]);
-		if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+		if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
 			XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_GROUP);
 		} else {
 			XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
@@ -1424,8 +1451,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);
 
@@ -1451,7 +1478,7 @@ class OStatus
 			}
 		}
 
-		if (DBM::is_result($profile) && !$show_profile) {
+		if (DBA::isResult($profile) && !$show_profile) {
 			if (trim($profile["homepage"]) != "") {
 				$urls = $doc->createElement("poco:urls");
 				XML::addElement($doc, $urls, "poco:type", "homepage");
@@ -1572,27 +1599,24 @@ class OStatus
 	{
 		$r = q(
 			"SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1",
-			dbesc(normalise_link($url)),
+			DBA::escape(normalise_link($url)),
 			intval($owner["uid"])
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$contact = $r[0];
 			$contact["uid"] = -1;
 		}
 
-		if (!DBM::is_result($r)) {
-			$r = q(
-				"SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-				dbesc(normalise_link($url))
-			);
-			if (DBM::is_result($r)) {
-				$contact = $r[0];
+		if (!DBA::isResult($r)) {
+			$gcontact = DBA::selectFirst('gcontact', [], ['nurl' => normalise_link($url)]);
+			if (DBA::isResult($r)) {
+				$contact = $gcontact;
 				$contact["uid"] = -1;
 				$contact["success_update"] = $contact["updated"];
 			}
 		}
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			$contact = owner;
 		}
 
@@ -1609,6 +1633,8 @@ class OStatus
 			$contact["alias"] = $contact["url"];
 		}
 
+		$contact['account-type'] = $owner['account-type'];
+
 		return $contact;
 	}
 
@@ -1626,20 +1652,19 @@ 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);
+			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);
 
 		$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 (!DBM::is_result($repeated_item)) {
+		if (!DBA::isResult($repeated_item)) {
 			return false;
 		}
 
 		$contact = self::contactEntry($repeated_item['author-link'], $owner);
-		$contact['account-type'] = $contact['contact-type'];
 
 		$title = $owner["nick"]." repeated a notice by ".$contact["nick"];
 
@@ -1690,7 +1715,7 @@ 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);
+			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);
@@ -1702,6 +1727,10 @@ class OStatus
 
 		$parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]);
 
+		if (!$parent) {
+			$parent = [];
+		}
+
 		XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent));
 
 		self::entryContent($doc, $as_object, $parent, $owner, "New entry");
@@ -1727,7 +1756,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;
 		}
@@ -1741,8 +1770,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);
 
@@ -1782,14 +1811,11 @@ class OStatus
 			$item['follow'] = $contact['alias'];
 		}
 
-		$r = q(
-			"SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
-			intval($owner['uid']),
-			dbesc(normalise_link($contact["url"]))
-		);
+		$condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($contact["url"])];
+		$user_contact = DBA::selectFirst('contact', ['id'], $condition);
 
-		if (DBM::is_result($r)) {
-			$connect_id = $r[0]['id'];
+		if (DBA::isResult($user_contact)) {
+			$connect_id = $user_contact['id'];
 		} else {
 			$connect_id = 0;
 		}
@@ -1805,7 +1831,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'];
 
@@ -1836,7 +1862,7 @@ 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);
+			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);
@@ -1867,7 +1893,7 @@ class OStatus
 			$entry = $doc->createElement("entry");
 			$title = sprintf("New note by %s", $owner["nick"]);
 
-			if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+			if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
 				$contact = self::contactEntry($item['author-link'], $owner);
 				$author = self::addAuthor($doc, $contact, false);
 				$entry->appendChild($author);
@@ -1957,7 +1983,7 @@ class OStatus
 
 			$thrparent = Item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]);
 
-			if (DBM::is_result($thrparent)) {
+			if (DBA::isResult($thrparent)) {
 				$mentioned[$thrparent["author-link"]] = $thrparent["author-link"];
 				$mentioned[$thrparent["owner-link"]] = $thrparent["owner-link"];
 				$parent_plink = $thrparent["plink"];
@@ -1979,12 +2005,11 @@ 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]);
-				if (DBM::is_result($conversation)) {
+				if (DBA::isResult($conversation)) {
 					if ($conversation['conversation-uri'] != '') {
 						$conversation_uri = $conversation['conversation-uri'];
 					}
@@ -2025,8 +2050,8 @@ class OStatus
 		foreach ($mentioned as $mention) {
 			$condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($mention)];
 			$contact = DBA::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
-			if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == ACCOUNT_TYPE_COMMUNITY) ||
-				($contact['self'] && ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY))) {
+			if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) ||
+				($contact['self'] && ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY))) {
 				XML::addElement($doc, $entry, "link", "",
 					[
 						"rel" => "mentioned",
@@ -2043,7 +2068,7 @@ class OStatus
 			}
 		}
 
-		if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+		if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
 			XML::addElement($doc, $entry, "link", "", [
 				"rel" => "mentioned",
 				"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
@@ -2128,7 +2153,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'];
 			}
@@ -2143,14 +2168,14 @@ 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` = ? ";
 			$condition[] = ACTIVITY_OBJ_COMMENT;
 		}
 
-		if ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY) {
+		if ($owner['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY) {
 			$condition[0] .= " AND `contact-id` = ? AND `author-id` = ?";
 			$condition[] = $owner["id"];
 			$condition[] = $authorid;
@@ -2186,9 +2211,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;
 	}