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 cc6b2d2a7a43d9a4d6093a2357e7f5922486f058..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,12 +96,17 @@ 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 = [
@@ -125,6 +131,7 @@ class FContact
 
                $condition = ['url' => $arr['url'], 'network' => $arr['network']];
 
+               $fields = DI::dbaDefinition()->truncateFieldsForTable('fcontact', $fields);
                DBA::update('fcontact', $fields, $condition, true);
        }