X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDiaspora.php;h=7ab41eb52b08ea6bd1b2d9bdbf41e442df4b5f65;hb=32f70abf9a7913df1ddb28b9745eb37941d09d80;hp=1077238f711c6961e9a12b37e58d5df8e9d307e6;hpb=d383f49f1efaca841e78afdfa31d1952a7cce433;p=friendica.git

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 1077238f71..7ab41eb52b 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -56,196 +56,6 @@ use SimpleXMLElement;
  */
 class Diaspora
 {
-	/**
-	 * Mark the relay contact of the given contact for archival
-	 * This is called whenever there is a communication issue with the server.
-	 * It avoids sending stuff to servers who don't exist anymore.
-	 * The relay contact is a technical contact entry that exists once per server.
-	 *
-	 * @param array $contact of the relay contact
-	 */
-	public static function markRelayForArchival(array $contact)
-	{
-		if (!empty($contact['contact-type']) && ($contact['contact-type'] == Contact::TYPE_RELAY)) {
-			// This is already the relay contact, we don't need to fetch it
-			$relay_contact = $contact;
-		} elseif (empty($contact['baseurl'])) {
-			if (!empty($contact['batch'])) {
-				$condition = ['uid' => 0, 'network' => Protocol::FEDERATED, 'batch' => $contact['batch'], 'contact-type' => Contact::TYPE_RELAY];
-				$relay_contact = DBA::selectFirst('contact', [], $condition);
-			} else {
-				return;
-			}
-		} else {
-			$relay_contact = self::getRelayContact($contact['baseurl'], []);
-		}
-
-		if (!empty($relay_contact)) {
-			Logger::info('Relay contact will be marked for archival', ['id' => $relay_contact['id'], 'url' => $relay_contact['url']]);
-			Contact::markForArchival($relay_contact);
-		}
-	}
-
-	/**
-	 * Return a list of relay servers
-	 *
-	 * The list contains not only the official relays but also servers that we serve directly
-	 *
-	 * @param integer $item_id  The id of the item that is sent
-	 * @param array   $contacts The previously fetched contacts
-	 *
-	 * @return array of relay servers
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public static function relayList($item_id, array $contacts = [])
-	{
-		$serverlist = [];
-
-		// Fetching relay servers
-		$serverdata = DI::config()->get("system", "relay_server");
-
-		if (!empty($serverdata)) {
-			$servers = explode(",", $serverdata);
-			foreach ($servers as $server) {
-				$serverlist[$server] = trim($server);
-			}
-		}
-
-		if (DI::config()->get("system", "relay_directly", false)) {
-			// We distribute our stuff based on the parent to ensure that the thread will be complete
-			$parent = Item::selectFirst(['uri-id'], ['id' => $item_id]);
-			if (!DBA::isResult($parent)) {
-				return;
-			}
-
-			// Servers that want to get all content
-			$servers = DBA::select('gserver', ['url'], ['relay-subscribe' => true, 'relay-scope' => 'all']);
-			while ($server = DBA::fetch($servers)) {
-				$serverlist[$server['url']] = $server['url'];
-			}
-			DBA::close($servers);
-
-			// All tags of the current post
-			$tags = DBA::select('tag-view', ['name'], ['uri-id' => $parent['uri-id'], 'type' => Tag::HASHTAG]);
-			$taglist = [];
-			while ($tag = DBA::fetch($tags)) {
-				$taglist[] = $tag['name'];
-			}
-			DBA::close($tags);
-
-			// All servers who wants content with this tag
-			$tagserverlist = [];
-			if (!empty($taglist)) {
-				$tagserver = DBA::select('gserver-tag', ['gserver-id'], ['tag' => $taglist]);
-				while ($server = DBA::fetch($tagserver)) {
-					$tagserverlist[] = $server['gserver-id'];
-				}
-				DBA::close($tagserver);
-			}
-
-			// All adresses with the given id
-			if (!empty($tagserverlist)) {
-				$servers = DBA::select('gserver', ['url'], ['relay-subscribe' => true, 'relay-scope' => 'tags', 'id' => $tagserverlist]);
-				while ($server = DBA::fetch($servers)) {
-					$serverlist[$server['url']] = $server['url'];
-				}
-				DBA::close($servers);
-			}
-		}
-
-		// Now we are collecting all relay contacts
-		foreach ($serverlist as $server_url) {
-			// We don't send messages to ourselves
-			if (Strings::compareLink($server_url, DI::baseUrl())) {
-				continue;
-			}
-			$contact = self::getRelayContact($server_url);
-			if (is_bool($contact)) {
-				continue;
-			}
-
-			$exists = false;
-			foreach ($contacts as $entry) {
-				if ($entry['batch'] == $contact['batch']) {
-					$exists = true;
-				}
-			}
-
-			if (!$exists) {
-				$contacts[] = $contact;
-			}
-		}
-
-		return $contacts;
-	}
-
-	/**
-	 * Return a contact for a given server address or creates a dummy entry
-	 *
-	 * @param string $server_url The url of the server
-	 * @param array $fields Fieldlist
-	 * @return array with the contact
-	 * @throws \Exception
-	 */
-	private static function getRelayContact(string $server_url, array $fields = ['batch', 'id', 'url', 'name', 'network', 'protocol', 'archive', 'blocked'])
-	{
-		// Fetch the relay contact
-		$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($server_url),
-			'contact-type' => Contact::TYPE_RELAY];
-		$contact = DBA::selectFirst('contact', $fields, $condition);
-
-		if (DBA::isResult($contact)) {
-			if ($contact['archive'] || $contact['blocked']) {
-				return false;
-			}
-			return $contact;
-		} else {
-			self::setRelayContact($server_url);
-
-			$contact = DBA::selectFirst('contact', $fields, $condition);
-			if (DBA::isResult($contact)) {
-				return $contact;
-			}
-		}
-
-		// It should never happen that we arrive here
-		return [];
-	}
-
-	/**
-	 * Update or insert a relay contact
-	 *
-	 * @param string $server_url     The url of the server
-	 * @param array  $network_fields Optional network specific fields
-	 * @throws \Exception
-	 */
-	public static function setRelayContact($server_url, array $network_fields = [])
-	{
-		$fields = ['created' => DateTimeFormat::utcNow(),
-			'name' => 'relay', 'nick' => 'relay', 'url' => $server_url,
-			'nurl' => Strings::normaliseLink($server_url),
-			'network' => Protocol::DIASPORA, 'uid' => 0,
-			'batch' => $server_url . '/receive/public',
-			'rel' => Contact::FOLLOWER, 'blocked' => false,
-			'pending' => false, 'writable' => true,
-			'baseurl' => $server_url, 'contact-type' => Contact::TYPE_RELAY];
-
-		$fields = array_merge($fields, $network_fields);
-
-		$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($server_url)];
-		$old = DBA::selectFirst('contact', [], $condition);
-		if (DBA::isResult($old)) {
-			unset($fields['created']);
-			$condition = ['id' => $old['id']];
-
-			Logger::info('Update relay contact', ['fields' => $fields, 'condition' => $condition]);
-			DBA::update('contact', $fields, $condition, $old);
-		} else {
-			Logger::info('Create relay contact', ['fields' => $fields]);
-			Contact::insert($fields);
-		}
-	}
-
 	/**
 	 * Return a list of participating contacts for a thread
 	 *
@@ -1697,9 +1507,9 @@ class Diaspora
 
 		if (isset($data->thread_parent_guid)) {
 			$thread_parent_guid = Strings::escapeTags(XML::unescape($data->thread_parent_guid));
-			$thr_uri = self::getUriFromGuid("", $thread_parent_guid, true);
+			$thr_parent = self::getUriFromGuid("", $thread_parent_guid, true);
 		} else {
-			$thr_uri = "";
+			$thr_parent = "";
 		}
 
 		$contact = self::allowedContactByHandle($importer, $sender, true);
@@ -1712,8 +1522,8 @@ class Diaspora
 			return true;
 		}
 
-		$parent_item = self::parentItem($importer["uid"], $parent_guid, $author, $contact);
-		if (!$parent_item) {
+		$toplevel_parent_item = self::parentItem($importer["uid"], $parent_guid, $author, $contact);
+		if (!$toplevel_parent_item) {
 			return false;
 		}
 
@@ -1754,11 +1564,7 @@ class Diaspora
 		$datarray["verb"] = Activity::POST;
 		$datarray["gravity"] = GRAVITY_COMMENT;
 
-		if ($thr_uri != "") {
-			$datarray["parent-uri"] = $thr_uri;
-		} else {
-			$datarray["parent-uri"] = $parent_item["uri"];
-		}
+		$datarray['thr-parent'] = $thr_parent ?: $toplevel_parent_item['uri'];
 
 		$datarray["object-type"] = Activity\ObjectType::COMMENT;
 
@@ -1767,7 +1573,7 @@ class Diaspora
 
 		$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
 
-		$datarray["plink"] = self::plink($author, $guid, $parent_item['guid']);
+		$datarray["plink"] = self::plink($author, $guid, $toplevel_parent_item['guid']);
 		$body = Markdown::toBBCode($text);
 
 		$datarray["body"] = self::replacePeopleGuid($body, $person["url"]);
@@ -1779,7 +1585,7 @@ class Diaspora
 
 		// If we are the origin of the parent we store the original data.
 		// We notify our followers during the item storage.
-		if ($parent_item["origin"]) {
+		if ($toplevel_parent_item["origin"]) {
 			$datarray['diaspora_signed_text'] = json_encode($data);
 		}
 
@@ -1953,8 +1759,8 @@ class Diaspora
 			return true;
 		}
 
-		$parent_item = self::parentItem($importer["uid"], $parent_guid, $author, $contact);
-		if (!$parent_item) {
+		$toplevel_parent_item = self::parentItem($importer["uid"], $parent_guid, $author, $contact);
+		if (!$toplevel_parent_item) {
 			return false;
 		}
 
@@ -1991,7 +1797,7 @@ class Diaspora
 
 		$datarray["verb"] = $verb;
 		$datarray["gravity"] = GRAVITY_ACTIVITY;
-		$datarray["parent-uri"] = $parent_item["uri"];
+		$datarray['thr-parent'] = $toplevel_parent_item['uri'];
 
 		$datarray["object-type"] = Activity\ObjectType::NOTE;
 
@@ -2001,11 +1807,11 @@ class Diaspora
 		$datarray["changed"] = $datarray["created"] = $datarray["edited"] = DateTimeFormat::utcNow();
 
 		// like on comments have the comment as parent. So we need to fetch the toplevel parent
-		if ($parent_item['gravity'] != GRAVITY_PARENT) {
-			$toplevel = Item::selectFirst(['origin'], ['id' => $parent_item['parent']]);
+		if ($toplevel_parent_item['gravity'] != GRAVITY_PARENT) {
+			$toplevel = Item::selectFirst(['origin'], ['id' => $toplevel_parent_item['parent']]);
 			$origin = $toplevel["origin"];
 		} else {
-			$origin = $parent_item["origin"];
+			$origin = $toplevel_parent_item["origin"];
 		}
 
 		// If we are the origin of the parent we store the original data.
@@ -2116,16 +1922,16 @@ class Diaspora
 			return true;
 		}
 
-		$parent_item = self::parentItem($importer["uid"], $parent_guid, $author, $contact);
-		if (!$parent_item) {
+		$toplevel_parent_item = self::parentItem($importer["uid"], $parent_guid, $author, $contact);
+		if (!$toplevel_parent_item) {
 			return false;
 		}
 
-		if (!$parent_item['origin']) {
+		if (!$toplevel_parent_item['origin']) {
 			Logger::info('Not our origin. Participation is ignored', ['parent_guid' => $parent_guid, 'guid' => $guid, 'author' => $author]);
 		}
 
-		if (!in_array($parent_item['private'], [Item::PUBLIC, Item::UNLISTED])) {
+		if (!in_array($toplevel_parent_item['private'], [Item::PUBLIC, Item::UNLISTED])) {
 			Logger::info('Item is not public, participation is ignored', ['parent_guid' => $parent_guid, 'guid' => $guid, 'author' => $author]);
 			return false;
 		}
@@ -2155,7 +1961,7 @@ class Diaspora
 
 		$datarray["verb"] = Activity::FOLLOW;
 		$datarray["gravity"] = GRAVITY_ACTIVITY;
-		$datarray["parent-uri"] = $parent_item["uri"];
+		$datarray['thr-parent'] = $toplevel_parent_item['uri'];
 
 		$datarray["object-type"] = Activity\ObjectType::NOTE;
 
@@ -2170,7 +1976,7 @@ class Diaspora
 
 		// Send all existing comments and likes to the requesting server
 		$comments = Item::select(['id', 'uri-id', 'parent-author-network', 'author-network', 'verb'],
-			['parent' => $parent_item['id'], 'gravity' => [GRAVITY_COMMENT, GRAVITY_ACTIVITY]]);
+			['parent' => $toplevel_parent_item['id'], 'gravity' => [GRAVITY_COMMENT, GRAVITY_ACTIVITY]]);
 		while ($comment = Item::fetch($comments)) {
 			if (in_array($comment['verb'], [Activity::FOLLOW, Activity::TAG])) {
 				Logger::info('participation messages are not relayed', ['item' => $comment['id']]);
@@ -2458,8 +2264,8 @@ class Diaspora
 		}
 
 		// Do we already have this item?
-		$fields = ['body', 'title', 'attach', 'app', 'created', 'object-type', 'uri', 'guid',
-			'author-name', 'author-link', 'author-avatar', 'plink'];
+		$fields = ['body', 'title', 'app', 'created', 'object-type', 'uri', 'guid',
+			'author-name', 'author-link', 'author-avatar', 'plink', 'uri-id'];
 		$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
 		$item = Item::selectFirst($fields, $condition);
 
@@ -2502,8 +2308,8 @@ class Diaspora
 			}
 
 			if ($stored) {
-				$fields = ['body', 'title', 'attach', 'app', 'created', 'object-type', 'uri', 'guid',
-					'author-name', 'author-link', 'author-avatar', 'plink'];
+				$fields = ['body', 'title', 'app', 'created', 'object-type', 'uri', 'guid',
+					'author-name', 'author-link', 'author-avatar', 'plink', 'uri-id'];
 				$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
 				$item = Item::selectFirst($fields, $condition);
 
@@ -2547,7 +2353,7 @@ class Diaspora
 
 		$datarray['guid'] = $parent['guid'] . '-' . $guid;
 		$datarray['uri'] = self::getUriFromGuid($author, $datarray['guid']);
-		$datarray['parent-uri'] = $parent['uri'];
+		$datarray['thr-parent'] = $parent['uri'];
 
 		$datarray['verb'] = $datarray['body'] = Activity::ANNOUNCE;
 		$datarray['gravity'] = GRAVITY_ACTIVITY;
@@ -2618,7 +2424,7 @@ class Diaspora
 		$datarray["owner-id"] = $datarray["author-id"];
 
 		$datarray["guid"] = $guid;
-		$datarray["uri"] = $datarray["parent-uri"] = self::getUriFromGuid($author, $guid);
+		$datarray["uri"] = $datarray["thr-parent"] = self::getUriFromGuid($author, $guid);
 		$datarray['uri-id'] = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
 
 		$datarray["verb"] = Activity::POST;
@@ -2646,7 +2452,7 @@ class Diaspora
 
 		Tag::storeFromBody($datarray['uri-id'], $datarray["body"]);
 
-		$datarray["attach"] = $original_item["attach"];
+		Post\Media::copy($original_item['uri-id'], $datarray['uri-id']);
 		$datarray["app"]  = $original_item["app"];
 
 		$datarray["plink"] = self::plink($author, $guid);
@@ -2703,7 +2509,7 @@ class Diaspora
 		}
 
 		// Fetch items that are about to be deleted
-		$fields = ['uid', 'id', 'parent', 'parent-uri', 'author-link', 'file'];
+		$fields = ['uid', 'id', 'parent', 'author-link', 'file'];
 
 		// When we receive a public retraction, we delete every item that we find.
 		if ($importer['uid'] == 0) {
@@ -2872,7 +2678,7 @@ class Diaspora
 		$datarray = [];
 
 		$datarray["guid"] = $guid;
-		$datarray["uri"] = $datarray["parent-uri"] = self::getUriFromGuid($author, $guid);
+		$datarray["uri"] = $datarray["thr-parent"] = self::getUriFromGuid($author, $guid);
 		$datarray['uri-id'] = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
 
 		// Attach embedded pictures to the body
@@ -3681,12 +3487,12 @@ class Diaspora
 	 */
 	private static function constructLike(array $item, array $owner)
 	{
-		$parent = Item::selectFirst(['guid', 'uri', 'parent-uri'], ['uri' => $item["thr-parent"]]);
+		$parent = Item::selectFirst(['guid', 'uri', 'thr-parent'], ['uri' => $item["thr-parent"]]);
 		if (!DBA::isResult($parent)) {
 			return false;
 		}
 
-		$target_type = ($parent["uri"] === $parent["parent-uri"] ? "Post" : "Comment");
+		$target_type = ($parent["uri"] === $parent["thr-parent"] ? "Post" : "Comment");
 		$positive = null;
 		if ($item['verb'] === Activity::LIKE) {
 			$positive = "true";
@@ -3713,7 +3519,7 @@ class Diaspora
 	 */
 	private static function constructAttend(array $item, array $owner)
 	{
-		$parent = Item::selectFirst(['guid', 'uri', 'parent-uri'], ['uri' => $item["thr-parent"]]);
+		$parent = Item::selectFirst(['guid'], ['uri' => $item['thr-parent']]);
 		if (!DBA::isResult($parent)) {
 			return false;
 		}
@@ -4242,10 +4048,7 @@ class Diaspora
 			return false;
 		}
 
-		// This is a workaround for the behaviour of the "insert" function, see mod/item.php
-		$item['thr-parent'] = $item['parent-uri'];
-
-		$parent = Item::selectFirst(['parent-uri'], ['uri' => $item['parent-uri']]);
+		$parent = Item::selectFirst(['parent-uri'], ['uri' => $item['thr-parent']]);
 		if (!DBA::isResult($parent)) {
 			return;
 		}