<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\GServer;
+use Friendica\Network\HTTPClient\Client\HttpClient;
class UpdateServerDirectory
{
private static function discoverPoCo(array $gserver)
{
- $result = DI::httpRequest()->fetch($gserver['poco'] . '?fields=urls');
+ $result = DI::httpClient()->fetch($gserver['poco'] . '?fields=urls', 0, HttpClient::ACCEPT_JSON);
if (empty($result)) {
Logger::info('Empty result', ['url' => $gserver['url']]);
return;
Logger::info('PoCo discovery started', ['poco' => $gserver['poco']]);
$urls = [];
- foreach ($contacts['entry'] as $entry) {
- if (empty($entry['urls'])) {
- continue;
- }
- foreach ($entry['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;
}
$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', 0, HttpClient::ACCEPT_JSON);
if (empty($result)) {
Logger::info('Empty result', ['url' => $gserver['url']]);
return;
$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']]);
}
}