Use rawContent for Special Options to avoid a protected options() method

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

diff --git a/src/Model/Contact/Relation.php b/src/Model/Contact/Relation.php
index 3c95973238e1e9d43aae474927db3c2e35519529..d68555eb3e854f2df8e5e6423dd47439e47176a1 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-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,6 +24,7 @@ namespace Friendica\Model\Contact;
 use Exception;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
@@ -64,7 +65,7 @@ class Relation
                        return;
                }
 
-               DBA::update('contact-relation', ['last-interaction' => $interaction_date], ['cid' => $target, 'relation-cid' => $actor], true);
+               DBA::insert('contact-relation', ['last-interaction' => $interaction_date, 'cid' => $target, 'relation-cid' => $actor], Database::INSERT_UPDATE);
        }
 
        /**
@@ -77,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'])) {
@@ -103,10 +107,14 @@ 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)) {
-                       DBA::update('contact', ['last-discovery' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+                       Contact::update(['last-discovery' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                        Logger::info('The contact does not offer discoverable data', ['id' => $contact['id'], 'url' => $url, 'network' => $contact['network']]);
                        return;
                }
@@ -136,14 +144,14 @@ class Relation
                        $actor = Contact::getIdForURL($contact);
                        if (!empty($actor)) {
                                if (in_array($contact, $followers)) {
-                                       $fields = ['cid' => $target, 'relation-cid' => $actor];
-                                       DBA::update('contact-relation', ['follows' => true, 'follow-updated' => DateTimeFormat::utcNow()], $fields, true);
+                                       $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)) {
-                                       $fields = ['cid' => $actor, 'relation-cid' => $target];
-                                       DBA::update('contact-relation', ['follows' => true, 'follow-updated' => DateTimeFormat::utcNow()], $fields, true);
+                                       $fields = ['cid' => $actor, 'relation-cid' => $target, 'follows' => true, 'follow-updated' => DateTimeFormat::utcNow()];
+                                       DBA::insert('contact-relation', $fields, Database::INSERT_UPDATE);
                                        $following_counter++;
                                }
                        }
@@ -154,7 +162,7 @@ class Relation
                        DBA::delete('contact-relation', ['cid' => $target, 'follows' => false, 'last-interaction' => DBA::NULL_DATETIME]);
                }
 
-               DBA::update('contact', ['last-discovery' => DateTimeFormat::utcNow()], ['id' => $target]);
+               Contact::update(['last-discovery' => DateTimeFormat::utcNow()], ['id' => $target]);
                Logger::info('Contacts discovery finished', ['id' => $target, 'url' => $url, 'follower' => $follower_counter, 'following' => $following_counter]);
                return;
        }