Merge remote-tracking branch 'upstream/2022.09-rc' into maxload

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

diff --git a/src/Model/FContact.php b/src/Model/FContact.php
index 97b1e98efb81a8b91e54365dca67dbd1d7b99514..62f2f983648e824e33e12958a0eda4fa4c592b8e 100644 (file)
--- a/src/Model/FContact.php
+++ b/src/Model/FContact.php
@@ -24,6 +24,7 @@ namespace Friendica\Model;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
@@ -53,8 +54,8 @@ class FContact
 
                        if (is_null($update)) {
                                // update record occasionally so it doesn't get stale
-                               $d = strtotime($person["updated"]." +00:00");
-                               if ($d < strtotime("now - 14 days")) {
+                               $d = strtotime($person['updated'] . ' +00:00');
+                               if ($d < strtotime('now - 14 days')) {
                                        $update = true;
                                }
 
@@ -95,26 +96,42 @@ class FContact
                $uriid = ItemURI::insert(['uri' => $arr['url'], 'guid' => $arr['guid']]);
 
                $contact = Contact::getByUriId($uriid, ['id']);
-               if (!empty($contact['id'])) {
+               $apcontact = APContact::getByURL($arr['url'], false);
+               if (!empty($apcontact)) {
+                       $interacted  = $apcontact['following_count'];
+                       $interacting = $apcontact['followers_count'];
+                       $posts       = $apcontact['statuses_count'];
+               } elseif (!empty($contact['id'])) {
                        $last_interaction = DateTimeFormat::utc('now - 180 days');
 
                        $interacted  = DBA::count('contact-relation', ["`cid` = ? AND NOT `follows` AND `last-interaction` > ?", $contact['id'], $last_interaction]);
                        $interacting = DBA::count('contact-relation', ["`relation-cid` = ? AND NOT `follows` AND `last-interaction` > ?", $contact['id'], $last_interaction]);
-                       $posts       = Post::countPosts(['author-id' => $contact['id'], 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]]);
+                       $posts       = DBA::count('post', ['author-id' => $contact['id'], 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]]);
                }
 
-               $fields = ['name' => $arr["name"], 'photo' => $arr["photo"],
-                       'request' => $arr["request"], 'nick' => $arr["nick"],
-                       'addr' => strtolower($arr["addr"]), 'guid' => $arr["guid"],
-                       'batch' => $arr["batch"], 'notify' => $arr["notify"],
-                       'poll' => $arr["poll"], 'confirm' => $arr["confirm"],
-                       'alias' => $arr["alias"], 'pubkey' => $arr["pubkey"],
-                       'uri-id' => $uriid, 'interacting_count' => $interacting ?? 0,
-                       'interacted_count' => $interacted ?? 0, 'post_count' => $posts ?? 0,
-                       'updated' => DateTimeFormat::utcNow()];
-
-               $condition = ['url' => $arr["url"], 'network' => $arr["network"]];
-
+               $fields = [
+                       'name' => $arr['name'],
+                       'photo' => $arr['photo'],
+                       'request' => $arr['request'],
+                       'nick' => $arr['nick'],
+                       'addr' => strtolower($arr['addr']),
+                       'guid' => $arr['guid'],
+                       'batch' => $arr['batch'],
+                       'notify' => $arr['notify'],
+                       'poll' => $arr['poll'],
+                       'confirm' => $arr['confirm'],
+                       'alias' => $arr['alias'],
+                       'pubkey' => $arr['pubkey'],
+                       'uri-id' => $uriid,
+                       'interacting_count' => $interacting ?? 0,
+                       'interacted_count' => $interacted ?? 0,
+                       'post_count' => $posts ?? 0,
+                       'updated' => DateTimeFormat::utcNow(),
+               ];
+
+               $condition = ['url' => $arr['url'], 'network' => $arr['network']];
+
+               $fields = DI::dbaDefinition()->truncateFieldsForTable('fcontact', $fields);
                DBA::update('fcontact', $fields, $condition, true);
        }
 
@@ -123,7 +140,6 @@ class FContact
         * fcontact guid
         *
         * @param string $fcontact_guid Hexadecimal string guid
-        *
         * @return string|null the contact url or null
         * @throws \Exception
         */