Merge remote-tracking branch 'upstream/develop' into reduce-update-contacts

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

diff --git a/src/Worker/UpdateServerDirectory.php b/src/Worker/UpdateServerDirectory.php
index 1244e2c2c0737a57e27eed1a3df1d21c2c5e4ca5..c5a1a078b82453dbb9056b92dbb8cacbc6fa9aa2 100644 (file)
--- a/src/Worker/UpdateServerDirectory.php
+++ b/src/Worker/UpdateServerDirectory.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,10 +22,10 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
-use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\GServer;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 
 class UpdateServerDirectory
 {
@@ -45,7 +45,7 @@ class UpdateServerDirectory
 
        private static function discoverPoCo(array $gserver)
        {
-               $result = DI::httpRequest()->fetch($gserver['poco'] . '?fields=urls');
+               $result = DI::httpClient()->fetch($gserver['poco'] . '?fields=urls', HttpClientAccept::JSON);
                if (empty($result)) {
                        Logger::info('Empty result', ['url' => $gserver['url']]);
                        return;
@@ -60,8 +60,8 @@ class UpdateServerDirectory
                Logger::info('PoCo discovery started', ['poco' => $gserver['poco']]);
 
                $urls = [];
-               foreach (array_column($contacts['entry'], 'urls') as $urls) {
-                       foreach ($urls as $url_entry) {
+               foreach (array_column($contacts['entry'], 'urls') as $url_entries) {
+                       foreach ($url_entries as $url_entry) {
                                if (empty($url_entry['type']) || empty($url_entry['value'])) {
                                        continue;
                                }
@@ -73,12 +73,12 @@ class UpdateServerDirectory
 
                $result = Contact::addByUrls($urls);
 
-               Logger::info('PoCo discovery ended', ['count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'poco' => $gserver['poco']]);
+               Logger::info('PoCo discovery ended', ['count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'unchanged' => $result['unchanged'], 'poco' => $gserver['poco']]);
        }
 
        private static function discoverMastodonDirectory(array $gserver)
        {               
-               $result = DI::httpRequest()->fetch($gserver['url'] . '/api/v1/directory?order=new&local=true&limit=200&offset=0');
+               $result = DI::httpClient()->fetch($gserver['url'] . '/api/v1/directory?order=new&local=true&limit=200&offset=0', HttpClientAccept::JSON);
                if (empty($result)) {
                        Logger::info('Empty result', ['url' => $gserver['url']]);
                        return;
@@ -101,6 +101,6 @@ class UpdateServerDirectory
 
                $result = Contact::addByUrls($urls);
 
-               Logger::info('Account discovery ended', ['count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'url' => $gserver['url']]);
+               Logger::info('Account discovery ended', ['count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'unchanged' => $result['unchanged'], 'url' => $gserver['url']]);
        }
 }