Issue 8735: Ensure the correct data type for "hide"

[friendica.git] / src / Model / GContact.php

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 19ab87ca45f09ca6f4486e0ca4f48fecc94e3d68..fb4df9a63ae834d0bbab4dde8c0409859702a36f 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -43,6 +43,19 @@ use Friendica\Util\Strings;
  */
 class GContact
 {
+       /**
+        * No discovery of followers/followings
+        */
+       const DISCOVERY_NONE = 0;
+       /**
+        * Only discover followers/followings from direct contacts
+        */
+       const DISCOVERY_DIRECT = 1;
+       /**
+        * Recursive discovery of followers/followings
+        */
+       const DISCOVERY_RECURSIVE = 2;
+
        /**
         * Search global contact table by nick or name
         *
@@ -94,12 +107,13 @@ class GContact
 
                        // Ignore results that look strange.
                        // For historic reasons the gcontact table does contain some garbage.
-                       if (!empty($urlparts['query']) || !empty($urlparts['fragment'])) {
+                       if (empty($result['nurl']) || !empty($urlparts['query']) || !empty($urlparts['fragment'])) {
                                continue;
                        }
 
                        $gcontacts[] = Contact::getDetailsByURL($result['nurl'], local_user());
                }
+               DBA::close($results);
                return $gcontacts;
        }
 
@@ -550,6 +564,7 @@ class GContact
                                PortableContact::loadWorker(0, 0, 0, $base);
                        }
                }
+               DBA::close($contacts);
        }
 
        /**
@@ -612,11 +627,6 @@ class GContact
                        $contact['network'] = Protocol::OSTATUS;
                }
 
-               // All new contacts are hidden by default
-               if (!isset($contact['hide'])) {
-                       $contact['hide'] = true;
-               }
-
                // Remove unwanted parts from the contact url (e.g. '?zrl=...')
                if (in_array($contact['network'], Protocol::FEDERATED)) {
                        $contact['url'] = self::cleanContactUrl($contact['url']);
@@ -631,6 +641,7 @@ class GContact
                        $contact['location'] = $contact['location'] ?? '';
                        $contact['about'] = $contact['about'] ?? '';
                        $contact['generation'] = $contact['generation'] ?? 0;
+                       $contact['hide'] = $contact['hide'] ?? true;
 
                        $fields = ['name' => $contact['name'], 'nick' => $contact['nick'] ?? '', 'addr' => $contact['addr'] ?? '', 'network' => $contact['network'],
                                'url' => $contact['url'], 'nurl' => Strings::normaliseLink($contact['url']), 'photo' => $contact['photo'],
@@ -675,7 +686,7 @@ class GContact
                }
 
                $public_contact = DBA::selectFirst('gcontact', [
-                       'name', 'nick', 'photo', 'location', 'about', 'addr', 'generation', 'birthday', 'keywords',
+                       'name', 'nick', 'photo', 'location', 'about', 'addr', 'generation', 'birthday', 'keywords', 'gsid',
                        'contact-type', 'hide', 'nsfw', 'network', 'alias', 'notify', 'server_url', 'connect', 'updated', 'url'
                ], ['id' => $gcontact_id]);
 
@@ -737,6 +748,10 @@ class GContact
                        $contact['server_url'] = Strings::normaliseLink($contact['server_url']);
                }
 
+               if (!empty($contact['server_url']) && empty($contact['gsid'])) {
+                       $contact['gsid'] = GServer::getID($contact['server_url']);
+               }
+
                if (empty($contact['addr']) && !empty($contact['server_url']) && !empty($contact['nick'])) {
                        $hostname = str_replace('http://', '', $contact['server_url']);
                        $contact['addr'] = $contact['nick'] . '@' . $hostname;
@@ -776,7 +791,8 @@ class GContact
                                'notify' => $contact['notify'], 'url' => $contact['url'],
                                'location' => $contact['location'], 'about' => $contact['about'],
                                'generation' => $contact['generation'], 'updated' => $contact['updated'],
-                               'server_url' => $contact['server_url'], 'connect' => $contact['connect']
+                               'server_url' => $contact['server_url'], 'connect' => $contact['connect'],
+                               'gsid' => $contact['gsid']
                        ];
 
                        DBA::update('gcontact', $updated, $condition, $fields);
@@ -871,11 +887,11 @@ class GContact
                        $items = $outbox['orderedItems'];
                } elseif (!empty($outbox['first']['orderedItems'])) {
                        $items = $outbox['first']['orderedItems'];
-               } elseif (!empty($outbox['first']['href'])) {
+               } elseif (!empty($outbox['first']['href']) && ($outbox['first']['href'] != $feed)) {
                        self::updateFromOutbox($outbox['first']['href'], $data);
                        return;
                } elseif (!empty($outbox['first'])) {
-                       if (is_string($outbox['first'])) {
+                       if (is_string($outbox['first']) && ($outbox['first'] != $feed)) {
                                self::updateFromOutbox($outbox['first'], $data);
                        } else {
                                Logger::warning('Unexpected data', ['outbox' => $outbox]);
@@ -1001,7 +1017,7 @@ class GContact
                $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords',
                        'bd', 'contact-type', 'network', 'addr', 'notify', 'alias', 'archive', 'term-date',
                        'created', 'updated', 'avatar', 'success_update', 'failure_update', 'forum', 'prv',
-                       'baseurl', 'sensitive', 'unsearchable'];
+                       'baseurl', 'gsid', 'sensitive', 'unsearchable'];
 
                $contact = DBA::selectFirst('contact', $fields, array_merge($condition, ['uid' => 0, 'network' => Protocol::FEDERATED]));
                if (!DBA::isResult($contact)) {
@@ -1011,7 +1027,7 @@ class GContact
                $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'generation',
                        'birthday', 'contact-type', 'network', 'addr', 'notify', 'alias', 'archived', 'archive_date',
                        'created', 'updated', 'photo', 'last_contact', 'last_failure', 'community', 'connect',
-                       'server_url', 'nsfw', 'hide', 'id'];
+                       'server_url', 'gsid', 'nsfw', 'hide', 'id'];
 
                $old_gcontact = DBA::selectFirst('gcontact', $fields, ['nurl' => $contact['nurl']]);
                $do_insert = !DBA::isResult($old_gcontact);
@@ -1022,7 +1038,7 @@ class GContact
                $gcontact = [];
 
                // These fields are identical in both contact and gcontact
-               $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords',
+               $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gsid',
                        'contact-type', 'network', 'addr', 'notify', 'alias', 'created', 'updated'];
 
                foreach ($fields as $field) {
@@ -1330,19 +1346,23 @@ class GContact
                        foreach ($contacts as $contact) {
                                $gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => Strings::normaliseLink(($contact))]);
                                if (DBA::isResult($gcontact)) {
+                                       $fields = [];
                                        if (in_array($contact, $followers)) {
                                                $fields = ['gcid' => $gcid, 'follower-gcid' => $gcontact['id']];
                                        } elseif (in_array($contact, $followings)) {
                                                $fields = ['gcid' => $gcontact['id'], 'follower-gcid' => $gcid];
                                        }
-                                       Logger::info('Set relation between contacts', $fields);
-                                       DBA::update('gfollower', ['deleted' => false], $fields, true);
-                                       continue;
+
+                                       if (!empty($fields)) {
+                                               Logger::info('Set relation between contacts', $fields);
+                                               DBA::update('gfollower', ['deleted' => false], $fields, true);
+                                               continue;
+                                       }
                                }
 
                                if (!Network::isUrlBlocked($contact)) {
                                        Logger::info('Discover new AP contact', ['url' => $contact]);
-                                       Worker::add(PRIORITY_LOW, 'UpdateGContact', $contact);
+                                       Worker::add(PRIORITY_LOW, 'UpdateGContact', $contact, 'nodiscover');
                                } else {
                                        Logger::info('No discovery, the URL is blocked.', ['url' => $contact]);
                                }
@@ -1382,7 +1402,7 @@ class GContact
                                                }
                                                if (!Network::isUrlBlocked($entry['value'])) {
                                                        Logger::info('Discover new PoCo contact', ['url' => $entry['value']]);
-                                                       Worker::add(PRIORITY_LOW, 'UpdateGContact', $entry['value']);
+                                                       Worker::add(PRIORITY_LOW, 'UpdateGContact', $entry['value'], 'nodiscover');
                                                } else {
                                                        Logger::info('No discovery, the URL is blocked.', ['url' => $entry['value']]);
                                                }