Merge pull request #12116 from annando/issue-11846

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

diff --git a/src/Model/FContact.php b/src/Model/FContact.php
index 62f2f983648e824e33e12958a0eda4fa4c592b8e..e13dcd46c931825dcef747506f59a85835b9cfb9 100644 (file)
--- a/src/Model/FContact.php
+++ b/src/Model/FContact.php
@@ -23,8 +23,10 @@ namespace Friendica\Model;
 
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
@@ -43,6 +45,7 @@ class FContact
         */
        public static function getByURL(string $handle, $update = null): array
        {
+               Logger::debug('Fetch fcontact', ['handle' => $handle, 'update' => $update]);
                $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
                if (!DBA::isResult($person)) {
                        $urls = [$handle, str_replace('http://', 'https://', $handle), Strings::normaliseLink($handle)];
@@ -50,21 +53,17 @@ class FContact
                }
 
                if (DBA::isResult($person)) {
-                       Logger::debug('In cache', ['person' => $person]);
+                       Logger::debug('In cache', ['handle' => $handle]);
 
                        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')) {
-                                       $update = true;
-                               }
-
-                               if (empty($person['guid']) || empty($person['uri-id'])) {
-                                       $update = true;
+                               $update = empty($person['guid']) || empty($person['uri-id']) || ($person['created'] <= DBA::NULL_DATETIME);
+                               if (GServer::getNextUpdateDate(true, $person['created'], $person['updated'], false) < DateTimeFormat::utcNow()) {
+                                       Logger::debug('Start background update', ['handle' => $handle]);
+                                       Worker::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], 'UpdateFContact', $handle);
                                }
                        }
                } elseif (is_null($update)) {
-                       $update = !DBA::isResult($person);
+                       $update = true;
                } else {
                        $person = [];
                }
@@ -95,7 +94,8 @@ class FContact
        {
                $uriid = ItemURI::insert(['uri' => $arr['url'], 'guid' => $arr['guid']]);
 
-               $contact = Contact::getByUriId($uriid, ['id']);
+               $fcontact  = DBA::selectFirst('fcontact', ['created'], ['url' => $arr['url'], 'network' => $arr['network']]);
+               $contact   = Contact::getByUriId($uriid, ['id', 'created']);
                $apcontact = APContact::getByURL($arr['url'], false);
                if (!empty($apcontact)) {
                        $interacted  = $apcontact['following_count'];
@@ -106,33 +106,37 @@ class FContact
 
                        $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       = DBA::count('post', ['author-id' => $contact['id'], 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]]);
+                       $posts       = DBA::count('post', ['author-id' => $contact['id'], 'gravity' => [Item::GRAVITY_PARENT, Item::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,
+                       '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(),
+                       'interacted_count'  => $interacted ?? 0,
+                       'post_count'        => $posts ?? 0,
+                       'updated'           => DateTimeFormat::utcNow(),
                ];
 
-               $condition = ['url' => $arr['url'], 'network' => $arr['network']];
+               if (empty($fcontact['created'])) {
+                       $fields['created'] = $fields['updated'];
+               } elseif (!empty($contact['created']) && ($fcontact['created'] <= DBA::NULL_DATETIME)) {
+                       $fields['created'] = $contact['created'];
+               }
 
                $fields = DI::dbaDefinition()->truncateFieldsForTable('fcontact', $fields);
-               DBA::update('fcontact', $fields, $condition, true);
+               DBA::update('fcontact', $fields, ['url' => $arr['url'], 'network' => $arr['network']], true);
        }
 
        /**