use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
-use Friendica\Core\Worker;
+use Friendica\Core\Search;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Network\Probe;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\PortableContact;
}
// The global contacts should contain the original picture, not the cached one
- if (($gcontact['generation'] != 1) && stristr(Strings::normaliseLink($gcontact['photo']), Strings::normaliseLink(System::baseUrl() . '/photo/'))) {
+ if (($gcontact['generation'] != 1) && stristr(Strings::normaliseLink($gcontact['photo']), Strings::normaliseLink(DI::baseUrl() . '/photo/'))) {
$gcontact['photo'] = '';
}
if (empty($gcontact['server_url'])) {
// We check the server url to be sure that it is a real one
- $server_url = Contact::getBasepath($gcontact['url']);
+ $server_url = self::getBasepath($gcontact['url']);
// We are now sure that it is a correct URL. So we use it in the future
if ($server_url != '') {
$done = [];
/// @TODO Check if it is really neccessary to poll the own server
- PortableContact::loadWorker(0, 0, 0, System::baseUrl() . '/poco');
+ PortableContact::loadWorker(0, 0, 0, DI::baseUrl() . '/poco');
- $done[] = System::baseUrl() . '/poco';
+ $done[] = DI::baseUrl() . '/poco';
if (strlen(Config::get('system', 'directory'))) {
- $x = Network::fetchUrl(get_server() . '/pubsites');
+ $x = Network::fetchUrl(Search::getGlobalDirectory() . '/pubsites');
if (!empty($x)) {
$j = json_decode($x);
if (!empty($j->entries)) {
"notify" => $userdata['notify'], 'url' => $userdata['url'],
"hide" => ($userdata['hidewall'] || !$userdata['net-publish']),
'nick' => $userdata['nickname'], 'addr' => $userdata['addr'],
- "connect" => $userdata['addr'], "server_url" => System::baseUrl(),
+ "connect" => $userdata['addr'], "server_url" => DI::baseUrl(),
"generation" => 1, 'network' => Protocol::DFRN];
self::update($gcontact);
}
+ /**
+ * @brief Get the basepath for a given contact link
+ *
+ * @param string $url The gcontact link
+ * @param boolean $dont_update Don't update the contact
+ *
+ * @return string basepath
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
+ */
+ public static function getBasepath($url, $dont_update = false)
+ {
+ $gcontact = DBA::selectFirst('gcontact', ['server_url'], ['nurl' => Strings::normaliseLink($url)]);
+ if (!empty($gcontact['server_url'])) {
+ return $gcontact['server_url'];
+ } elseif ($dont_update) {
+ return '';
+ }
+
+ self::updateFromProbe($url, true);
+
+ // Fetch the result
+ $gcontact = DBA::selectFirst('gcontact', ['server_url'], ['nurl' => Strings::normaliseLink($url)]);
+ if (empty($gcontact['server_url'])) {
+ Logger::info('No baseurl for gcontact', ['url' => $url]);
+ return '';
+ }
+
+ Logger::info('Found baseurl for gcontact', ['url' => $url, 'baseurl' => $gcontact['server_url']]);
+ return $gcontact['server_url'];
+ }
+
/**
* @brief Fetches users of given GNU Social server
*
'addr' => $user->nickname . '@' . $hostname,
'nick' => $user->nickname,
"network" => Protocol::OSTATUS,
- 'photo' => System::baseUrl() . '/images/person-300.jpg'];
+ 'photo' => DI::baseUrl() . '/images/person-300.jpg'];
if (isset($user->bio)) {
$contact['about'] = $user->bio;