Merge pull request #10551 from annando/profiler

[friendica.git] / src / Model / Contact / Relation.php

diff --git a/src/Model/Contact/Relation.php b/src/Model/Contact/Relation.php
index 4d57fe250292ada8bfdad244169d3599156e5821..b9d38790db5bf4b1a88a1f55a9cd7d3b60ff6e44 100644 (file)
--- a/src/Model/Contact/Relation.php
+++ b/src/Model/Contact/Relation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -78,19 +78,22 @@ class Relation
        {
                $contact = Contact::getByURL($url);
                if (empty($contact)) {
+                       Logger::info('Contact not found', ['url' => $url]);
                        return;
                }
 
                if (!self::isDiscoverable($url, $contact)) {
+                       Logger::info('Contact is not discoverable', ['url' => $url]);
                        return;
                }
 
                $uid = User::getIdForURL($url);
                if (!empty($uid)) {
-                       // Fetch the followers/followings locally
+                       Logger::info('Fetch the followers/followings locally', ['url' => $url]);
                        $followers = self::getContacts($uid, [Contact::FOLLOWER, Contact::FRIEND]);
                        $followings = self::getContacts($uid, [Contact::SHARING, Contact::FRIEND]);
-               } else {
+               } elseif (!Contact::isLocal($url)) {
+                       Logger::info('Fetch the followers/followings by polling the endpoints', ['url' => $url]);
                        $apcontact = APContact::getByURL($url, false);
 
                        if (!empty($apcontact['followers']) && is_string($apcontact['followers'])) {
@@ -104,6 +107,10 @@ class Relation
                        } else {
                                $followings = [];
                        }
+               } else {
+                       Logger::notice('Contact seems to be local but could not be found here', ['url' => $url]);
+                       $followers = [];
+                       $followings = [];
                }
 
                if (empty($followers) && empty($followings)) {
@@ -137,16 +144,14 @@ class Relation
                        $actor = Contact::getIdForURL($contact);
                        if (!empty($actor)) {
                                if (in_array($contact, $followers)) {
-                                       $condition = ['cid' => $target, 'relation-cid' => $actor];
-                                       DBA::insert('contact-relation', $condition, Database::INSERT_IGNORE);
-                                       DBA::update('contact-relation', ['follows' => true, 'follow-updated' => DateTimeFormat::utcNow()], $condition);
+                                       $fields = ['cid' => $target, 'relation-cid' => $actor, 'follows' => true, 'follow-updated' => DateTimeFormat::utcNow()];
+                                       DBA::insert('contact-relation', $fields, Database::INSERT_UPDATE);
                                        $follower_counter++;
                                }
 
                                if (in_array($contact, $followings)) {
-                                       $condition = ['cid' => $actor, 'relation-cid' => $target];
-                                       DBA::insert('contact-relation', $condition, Database::INSERT_IGNORE);
-                                       DBA::update('contact-relation', ['follows' => true, 'follow-updated' => DateTimeFormat::utcNow()], $condition);
+                                       $fields = ['cid' => $actor, 'relation-cid' => $target, 'follows' => true, 'follow-updated' => DateTimeFormat::utcNow()];
+                                       DBA::insert('contact-relation', $fields, Database::INSERT_UPDATE);
                                        $following_counter++;
                                }
                        }