use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
+use Friendica\Core\Search;
use Friendica\Database\DBA;
use Friendica\Model\GContact;
-use Friendica\Model\Contact;
use Friendica\Model\GServer;
use Friendica\Network\Probe;
use Friendica\Util\Network;
return;
}
- self::discoverDirectory($search);
- return;
- }
-
- private static function discoverDirectory($search)
- {
- $data = Cache::get('discoverDirectory' . $search);
+ $data = Cache::get('SearchDirectory:' . $search);
if (!is_null($data)) {
// Only search for the same item every 24 hours
if (time() < $data + (60 * 60 * 24)) {
}
}
- $x = Network::fetchUrl(get_server() . '/lsearch?p=1&n=500&search=' . urlencode($search));
+ $x = Network::fetchUrl(Search::getGlobalDirectory() . '/lsearch?p=1&n=500&search=' . urlencode($search));
$j = json_decode($x);
if (!empty($j->results)) {
continue;
}
- $server_url = Contact::getBasepath($jj->url);
+ $server_url = GContact::getBasepath($jj->url, true);
if ($server_url != '') {
if (!GServer::check($server_url)) {
- Logger::log("Friendica server doesn't answer.", ['server' => $server_url]);
+ Logger::info("Friendica server doesn't answer.", ['server' => $server_url]);
continue;
}
- Logger::log('Friendica server seems to be okay.', ['server' => $server_url]);
+ Logger::info('Friendica server seems to be okay.', ['server' => $server_url]);
}
$data = Probe::uri($jj->url);
if ($data['network'] == Protocol::DFRN) {
- Logger::log('Add profile to local directory', ['profile' => $jj->url]);
+ Logger::info('Add profile to local directory', ['profile' => $jj->url]);
if ($jj->tags != '') {
$data['keywords'] = $jj->tags;
GContact::update($data);
} else {
- Logger::log('Profile is not responding or no Friendica contact', ['profile' => $jj->url, 'network' => $data['network']]);
+ Logger::info('Profile is not responding or no Friendica contact', ['profile' => $jj->url, 'network' => $data['network']]);
}
}
}
- Cache::set('discoverDirectory' . $search, time(), Cache::DAY);
+ Cache::set('SearchDirectory:' . $search, time(), Cache::DAY);
}
}