Use a constant for the avatar base path

[friendica.git] / src / Worker / PullDirectory.php

diff --git a/src/Worker/PullDirectory.php b/src/Worker/PullDirectory.php
index a83b0a13be383e7615c03e17a522054c78c5f749..8a22e504c0454fa72e89b3c6bdc55a1672ea8d3e 100644 (file)
--- a/src/Worker/PullDirectory.php
+++ b/src/Worker/PullDirectory.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
  *
@@ -22,9 +22,10 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
-use Friendica\Core\Worker;
+use Friendica\Core\Search;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 
 class PullDirectory
 {
@@ -38,7 +39,7 @@ class PullDirectory
                        return;
                }
 
-               $directory = DI::config()->get('system', 'directory');
+               $directory = Search::getGlobalDirectory();
                if (empty($directory)) {
                        Logger::info('No directory configured');
                        return;
@@ -48,7 +49,7 @@ class PullDirectory
 
                Logger::info('Synchronization started.', ['now' => $now, 'directory' => $directory]);
 
-               $result = DI::httpRequest()->fetch($directory . '/sync/pull/since/' . $now);
+               $result = DI::httpClient()->fetch($directory . '/sync/pull/since/' . $now, HttpClientAccept::JSON);
                if (empty($result)) {
                        Logger::info('Directory server return empty result.', ['directory' => $directory]);
                        return;
@@ -60,22 +61,11 @@ class PullDirectory
                        return;
                }
 
+               $result = Contact::addByUrls($contacts['results']);
+
                $now = $contacts['now'] ?? 0;
-               $count = $contacts['count'] ?? 0;
-               $added = 0;
-               $updated = 0;
-               foreach ($contacts['results'] as $url) {
-                       $contact = Contact::getByURL($url, false, ['id']); 
-                       if (empty($contact['id'])) {
-                               Worker::add(PRIORITY_LOW, 'AddContact', 0, $url);
-                               ++$added;
-                       } else {
-                               Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id']);
-                               ++$updated;
-                       }
-               }
                DI::config()->set('system', 'last-directory-sync', $now);
 
-               Logger::info('Synchronization ended.', ['now' => $now, 'count' => $count, 'added' => $added, 'updated' => $updated, 'directory' => $directory]);
+               Logger::info('Synchronization ended', ['now' => $now, 'count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'unchanged' => $result['unchanged'], 'directory' => $directory]);
        }
 }