]> git.mxchange.org Git - friendica.git/blobdiff - src/Protocol/Diaspora.php
Merge pull request #9590 from MrPetovan/bug/fatal-errors
[friendica.git] / src / Protocol / Diaspora.php
index 04d076c03a44ac62a7d1df0d3e9e926fef5ff033..7ab41eb52b08ea6bd1b2d9bdbf41e442df4b5f65 100644 (file)
@@ -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
         *
@@ -1755,7 +1565,6 @@ class Diaspora
                $datarray["gravity"] = GRAVITY_COMMENT;
 
                $datarray['thr-parent'] = $thr_parent ?: $toplevel_parent_item['uri'];
-               $datarray['parent-uri'] = $toplevel_parent_item['uri'];
 
                $datarray["object-type"] = Activity\ObjectType::COMMENT;
 
@@ -2153,7 +1962,6 @@ class Diaspora
                $datarray["verb"] = Activity::FOLLOW;
                $datarray["gravity"] = GRAVITY_ACTIVITY;
                $datarray['thr-parent'] = $toplevel_parent_item['uri'];
-               $datarray['parent-uri'] = $toplevel_parent_item['parent-uri'];
 
                $datarray["object-type"] = Activity\ObjectType::NOTE;
 
@@ -2546,7 +2354,6 @@ class Diaspora
                $datarray['guid'] = $parent['guid'] . '-' . $guid;
                $datarray['uri'] = self::getUriFromGuid($author, $datarray['guid']);
                $datarray['thr-parent'] = $parent['uri'];
-               $datarray['parent-uri'] = $parent['parent-uri'];
 
                $datarray['verb'] = $datarray['body'] = Activity::ANNOUNCE;
                $datarray['gravity'] = GRAVITY_ACTIVITY;