<?php
/**
- * @file src/Model/GlobalContact.php
- * @brief This file includes the GlobalContact class with directory related functions
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
*/
+
namespace Friendica\Model;
use DOMDocument;
use DOMXPath;
use Exception;
-use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
+use Friendica\Core\Search;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Network\Probe;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\PortableContact;
use Friendica\Util\Strings;
/**
- * @brief This class handles GlobalContact related functions
+ * This class handles GlobalContact related functions
*/
class GContact
{
/**
- * @brief Search global contact table by nick or name
+ * Search global contact table by nick or name
*
* @param string $search Name or nick
* @param string $mode Search mode (e.g. "community")
}
// check supported networks
- if (Config::get('system', 'diaspora_enabled')) {
+ if (DI::config()->get('system', 'diaspora_enabled')) {
$diaspora = Protocol::DIASPORA;
} else {
$diaspora = Protocol::DFRN;
}
- if (!Config::get('system', 'ostatus_disabled')) {
+ if (!DI::config()->get('system', 'ostatus_disabled')) {
$ostatus = Protocol::OSTATUS;
} else {
$ostatus = Protocol::DFRN;
$results = DBA::p("SELECT `nurl` FROM `gcontact`
WHERE NOT `hide` AND `network` IN (?, ?, ?, ?) AND
- ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND
+ NOT `failed` AND
(`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?) $extra_sql
GROUP BY `nurl` ORDER BY `nurl` DESC LIMIT 1000",
Protocol::DFRN, Protocol::ACTIVITYPUB, $ostatus, $diaspora, $search, $search, $search
// Ignore results that look strange.
// For historic reasons the gcontact table does contain some garbage.
- if (!empty($urlparts['query']) || !empty($urlparts['fragment'])) {
+ if (empty($result['nurl']) || !empty($urlparts['query']) || !empty($urlparts['fragment'])) {
continue;
}
- $gcontacts[] = Contact::getDetailsByURL($result['nurl'], local_user());
+ $gcontacts[] = Contact::getByURLForUser($result['nurl'], local_user());
}
+ DBA::close($results);
return $gcontacts;
}
/**
- * @brief Link the gcontact entry with user, contact and global contact
+ * Link the gcontact entry with user, contact and global contact
*
* @param integer $gcid Global contact ID
* @param integer $uid User ID
}
/**
- * @brief Sanitize the given gcontact data
+ * Sanitize the given gcontact data
*
* Generation:
* 0: No definition
}
// 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'] = '';
}
throw new Exception('Probing for URL ' . $gcontact['url'] . ' failed');
}
- $orig_profile = $gcontact['url'];
-
$gcontact['server_url'] = $data['baseurl'];
+ $gcontact['failed'] = false;
$gcontact = array_merge($gcontact, $data);
}
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 != '') {
"SELECT count(*) as `total`
FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
WHERE `glink`.`cid` = %d AND `glink`.`uid` = %d AND
- ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR
- (`gcontact`.`updated` >= `gcontact`.`last_failure`))
+ NOT `gcontact`.`failed`
AND `gcontact`.`nurl` IN (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d) ",
intval($cid),
intval($uid),
WHERE `glink`.`cid` = %d and `glink`.`uid` = %d
AND `contact`.`uid` = %d AND `contact`.`self` = 0 AND `contact`.`blocked` = 0
AND `contact`.`hidden` = 0 AND `contact`.`id` != %d
- AND ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`))
+ AND NOT `gcontact`.`failed`
$sql_extra LIMIT %d, %d",
intval($cid),
intval($uid),
"SELECT count(*) as `total`
FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
where `glink`.`cid` = %d and `glink`.`uid` = %d AND
- ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`))",
+ NOT `gcontact`.`failed`",
intval($cid),
intval($uid)
);
INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl` AND `contact`.`uid` = %d
WHERE `glink`.`cid` = %d AND `glink`.`uid` = %d AND
- ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`))
+ NOT `gcontact`.`failed`
ORDER BY `gcontact`.`name` ASC LIMIT %d, %d ",
intval($uid),
intval($cid),
$network = [Protocol::DFRN, Protocol::ACTIVITYPUB];
- if (Config::get('system', 'diaspora_enabled')) {
+ if (DI::config()->get('system', 'diaspora_enabled')) {
$network[] = Protocol::DIASPORA;
}
- if (!Config::get('system', 'ostatus_disabled')) {
+ if (!DI::config()->get('system', 'ostatus_disabled')) {
$network[] = Protocol::OSTATUS;
}
AND NOT `gcontact`.`name` IN (SELECT `name` FROM `contact` WHERE `uid` = %d)
AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d)
AND `gcontact`.`updated` >= '%s' AND NOT `gcontact`.`hide`
- AND `gcontact`.`last_contact` >= `gcontact`.`last_failure`
+ AND NOT `gcontact`.`failed`
AND `gcontact`.`network` IN (%s)
GROUP BY `glink`.`gcid` ORDER BY `gcontact`.`updated` DESC,`total` DESC LIMIT %d, %d",
intval($uid),
AND NOT `gcontact`.`name` IN (SELECT `name` FROM `contact` WHERE `uid` = %d)
AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d)
AND `gcontact`.`updated` >= '%s'
- AND `gcontact`.`last_contact` >= `gcontact`.`last_failure`
+ AND NOT `gcontact`.`failed`
AND `gcontact`.`network` IN (%s)
ORDER BY rand() LIMIT %d, %d",
intval($uid),
$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');
+ if (strlen(DI::config()->get('system', 'directory'))) {
+ $x = DI::httpRequest()->fetch(Search::getGlobalDirectory() . '/pubsites');
if (!empty($x)) {
$j = json_decode($x);
if (!empty($j->entries)) {
PortableContact::loadWorker(0, 0, 0, $base);
}
}
+ DBA::close($contacts);
}
/**
- * @brief Removes unwanted parts from a contact url
+ * Removes unwanted parts from a contact url
*
* @param string $url Contact url
*
}
/**
- * @brief Fetch the gcontact id, add an entry if not existed
+ * Fetch the gcontact id, add an entry if not existed
*
* @param array $contact contact array
*
*/
public static function getId($contact)
{
- $gcontact_id = 0;
- $doprobing = false;
- $last_failure_str = '';
- $last_contact_str = '';
-
if (empty($contact['network'])) {
Logger::notice('Empty network', ['url' => $contact['url'], 'callstack' => System::callstack()]);
return false;
$contact['network'] = Protocol::OSTATUS;
}
- // All new contacts are hidden by default
- if (!isset($contact['hide'])) {
- $contact['hide'] = true;
- }
-
// Remove unwanted parts from the contact url (e.g. '?zrl=...')
if (in_array($contact['network'], Protocol::FEDERATED)) {
$contact['url'] = self::cleanContactUrl($contact['url']);
}
- DBA::lock('gcontact');
- $fields = ['id', 'last_contact', 'last_failure', 'network'];
- $gcnt = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($contact['url'])]);
- if (DBA::isResult($gcnt)) {
- $gcontact_id = $gcnt['id'];
-
- // Update every 90 days
- if (empty($gcnt['network']) || in_array($gcnt['network'], Protocol::FEDERATED)) {
- $last_failure_str = $gcnt['last_failure'];
- $last_failure = strtotime($gcnt['last_failure']);
- $last_contact_str = $gcnt['last_contact'];
- $last_contact = strtotime($gcnt['last_contact']);
- $doprobing = (((time() - $last_contact) > (90 * 86400)) && ((time() - $last_failure) > (90 * 86400)));
- }
- } else {
- $contact['location'] = $contact['location'] ?? '';
- $contact['about'] = $contact['about'] ?? '';
- $contact['generation'] = $contact['generation'] ?? 0;
-
- $fields = ['name' => $contact['name'], 'nick' => $contact['nick'] ?? '', 'addr' => $contact['addr'] ?? '', 'network' => $contact['network'],
- 'url' => $contact['url'], 'nurl' => Strings::normaliseLink($contact['url']), 'photo' => $contact['photo'],
- 'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(), 'location' => $contact['location'],
- 'about' => $contact['about'], 'hide' => $contact['hide'], 'generation' => $contact['generation']];
-
- DBA::insert('gcontact', $fields);
-
- $condition = ['nurl' => Strings::normaliseLink($contact['url'])];
- $cnt = DBA::selectFirst('gcontact', ['id', 'network'], $condition, ['order' => ['id']]);
- if (DBA::isResult($cnt)) {
- $gcontact_id = $cnt['id'];
- $doprobing = (empty($cnt['network']) || in_array($cnt['network'], Protocol::FEDERATED));
- }
+ $condition = ['nurl' => Strings::normaliseLink($contact['url'])];
+ $gcontact = DBA::selectFirst('gcontact', ['id'], $condition, ['order' => ['id']]);
+ if (DBA::isResult($gcontact)) {
+ return $gcontact['id'];
}
- DBA::unlock();
- if ($doprobing) {
- Logger::notice('Probing', ['contact' => $last_contact_str, "failure" => $last_failure_str, "checking" => $contact['url']]);
- Worker::add(PRIORITY_LOW, 'GProbe', $contact['url']);
- }
+ $contact['location'] = $contact['location'] ?? '';
+ $contact['about'] = $contact['about'] ?? '';
+ $contact['generation'] = $contact['generation'] ?? 0;
+ $contact['hide'] = $contact['hide'] ?? true;
- return $gcontact_id;
+ $fields = ['name' => $contact['name'], 'nick' => $contact['nick'] ?? '', 'addr' => $contact['addr'] ?? '', 'network' => $contact['network'],
+ 'url' => $contact['url'], 'nurl' => Strings::normaliseLink($contact['url']), 'photo' => $contact['photo'],
+ 'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(), 'location' => $contact['location'],
+ 'about' => $contact['about'], 'hide' => $contact['hide'], 'generation' => $contact['generation'], 'failed' => false];
+
+ DBA::insert('gcontact', $fields);
+
+ // We intentionally aren't using lastInsertId here. There is a chance for duplicates.
+ $gcontact = DBA::selectFirst('gcontact', ['id'], $condition, ['order' => ['id']]);
+ if (!DBA::isResult($gcontact)) {
+ Logger::info('GContact creation failed', $fields);
+ // Shouldn't happen
+ return 0;
+ }
+ return $gcontact['id'];
}
/**
- * @brief Updates the gcontact table from a given array
+ * Updates the gcontact table from a given array
*
* @param array $contact contact array
*
}
$public_contact = DBA::selectFirst('gcontact', [
- 'name', 'nick', 'photo', 'location', 'about', 'addr', 'generation', 'birthday', 'gender', 'keywords',
+ 'name', 'nick', 'photo', 'location', 'about', 'addr', 'generation', 'birthday', 'keywords', 'gsid', 'failed',
'contact-type', 'hide', 'nsfw', 'network', 'alias', 'notify', 'server_url', 'connect', 'updated', 'url'
], ['id' => $gcontact_id]);
$contact['server_url'] = Strings::normaliseLink($contact['server_url']);
}
+ if (!empty($contact['server_url']) && empty($contact['gsid'])) {
+ $contact['gsid'] = GServer::getID($contact['server_url']);
+ }
+
if (empty($contact['addr']) && !empty($contact['server_url']) && !empty($contact['nick'])) {
$hostname = str_replace('http://', '', $contact['server_url']);
$contact['addr'] = $contact['nick'] . '@' . $hostname;
'photo' => $contact['photo'], 'name' => $contact['name'],
'nick' => $contact['nick'], 'addr' => $contact['addr'],
'network' => $contact['network'], 'birthday' => $contact['birthday'],
- 'gender' => $contact['gender'], 'keywords' => $contact['keywords'],
+ 'keywords' => $contact['keywords'],
'hide' => $contact['hide'], 'nsfw' => $contact['nsfw'],
'contact-type' => $contact['contact-type'], 'alias' => $contact['alias'],
'notify' => $contact['notify'], 'url' => $contact['url'],
'location' => $contact['location'], 'about' => $contact['about'],
'generation' => $contact['generation'], 'updated' => $contact['updated'],
- 'server_url' => $contact['server_url'], 'connect' => $contact['connect']
+ 'server_url' => $contact['server_url'], 'connect' => $contact['connect'],
+ 'failed' => $contact['failed'], 'gsid' => $contact['gsid']
];
DBA::update('gcontact', $updated, $condition, $fields);
return;
}
- if (!$force && !PortableContact::updateNeeded($gcontact['created'], $gcontact['updated'], $gcontact['last_failure'], $gcontact['last_contact'])) {
+ if (!$force && !GServer::updateNeeded($gcontact['created'], $gcontact['updated'], $gcontact['last_failure'], $gcontact['last_contact'])) {
Logger::info("Don't update profile", ['url' => $data['url'], 'updated' => $gcontact['updated']]);
return;
}
return false;
}
- $curlResult = Network::curl($gserver['noscrape'] . '/' . $data['nick']);
+ $curlResult = DI::httpRequest()->get($gserver['noscrape'] . '/' . $data['nick']);
if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
$noscrape = json_decode($curlResult->getBody(), true);
if (!empty($noscrape) && !empty($noscrape['updated'])) {
$noscrape['updated'] = DateTimeFormat::utc($noscrape['updated'], DateTimeFormat::MYSQL);
- $fields = ['last_contact' => DateTimeFormat::utcNow(), 'updated' => $noscrape['updated']];
+ $fields = ['failed' => false, 'last_contact' => DateTimeFormat::utcNow(), 'updated' => $noscrape['updated']];
DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
return true;
}
} elseif ($curlResult->isTimeout()) {
// On a timeout return the existing value, but mark the contact as failure
- $fields = ['last_failure' => DateTimeFormat::utcNow()];
+ $fields = ['failed' => true, 'last_failure' => DateTimeFormat::utcNow()];
DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
return true;
}
$items = $outbox['orderedItems'];
} elseif (!empty($outbox['first']['orderedItems'])) {
$items = $outbox['first']['orderedItems'];
- } elseif (!empty($outbox['first']['href'])) {
+ } elseif (!empty($outbox['first']['href']) && ($outbox['first']['href'] != $feed)) {
self::updateFromOutbox($outbox['first']['href'], $data);
return;
} elseif (!empty($outbox['first'])) {
- if (is_string($outbox['first'])) {
+ if (is_string($outbox['first']) && ($outbox['first'] != $feed)) {
self::updateFromOutbox($outbox['first'], $data);
} else {
Logger::warning('Unexpected data', ['outbox' => $outbox]);
return;
}
- $fields = ['last_contact' => DateTimeFormat::utcNow(), 'updated' => $last_updated];
+ $fields = ['failed' => false, 'last_contact' => DateTimeFormat::utcNow(), 'updated' => $last_updated];
DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
}
private static function updateFromFeed(array $data)
{
// Search for the newest entry in the feed
- $curlResult = Network::curl($data['poll']);
+ $curlResult = DI::httpRequest()->get($data['poll']);
if (!$curlResult->isSuccess()) {
- $fields = ['last_failure' => DateTimeFormat::utcNow()];
- DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($profile)]);
+ $fields = ['failed' => true, 'last_failure' => DateTimeFormat::utcNow()];
+ DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
Logger::info("Profile wasn't reachable (no feed)", ['url' => $data['url']]);
return;
return;
}
- $fields = ['last_contact' => DateTimeFormat::utcNow(), 'updated' => $last_updated];
+ $fields = ['failed' => false, 'last_contact' => DateTimeFormat::utcNow(), 'updated' => $last_updated];
DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
}
/**
- * @brief Updates the gcontact entry from a given public contact id
+ * Updates the gcontact entry from a given public contact id
*
* @param integer $cid contact id
* @return void
}
/**
- * @brief Updates the gcontact entry from a given public contact url
+ * Updates the gcontact entry from a given public contact url
*
* @param string $url contact url
* @return integer gcontact id
}
/**
- * @brief Helper function for updateFromPublicContactID and updateFromPublicContactURL
+ * Helper function for updateFromPublicContactID and updateFromPublicContactURL
*
* @param array $condition contact condition
* @return integer gcontact id
*/
private static function updateFromPublicContact($condition)
{
- $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gender',
+ $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords',
'bd', 'contact-type', 'network', 'addr', 'notify', 'alias', 'archive', 'term-date',
'created', 'updated', 'avatar', 'success_update', 'failure_update', 'forum', 'prv',
- 'baseurl', 'sensitive', 'unsearchable'];
+ 'baseurl', 'gsid', 'sensitive', 'unsearchable', 'failed'];
$contact = DBA::selectFirst('contact', $fields, array_merge($condition, ['uid' => 0, 'network' => Protocol::FEDERATED]));
if (!DBA::isResult($contact)) {
return 0;
}
- $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gender', 'generation',
+ $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'generation',
'birthday', 'contact-type', 'network', 'addr', 'notify', 'alias', 'archived', 'archive_date',
'created', 'updated', 'photo', 'last_contact', 'last_failure', 'community', 'connect',
- 'server_url', 'nsfw', 'hide', 'id'];
+ 'server_url', 'gsid', 'nsfw', 'hide', 'id', 'failed'];
$old_gcontact = DBA::selectFirst('gcontact', $fields, ['nurl' => $contact['nurl']]);
$do_insert = !DBA::isResult($old_gcontact);
$gcontact = [];
// These fields are identical in both contact and gcontact
- $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gender',
- 'contact-type', 'network', 'addr', 'notify', 'alias', 'created', 'updated'];
+ $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gsid',
+ 'contact-type', 'network', 'addr', 'notify', 'alias', 'created', 'updated', 'failed'];
foreach ($fields as $field) {
$gcontact[$field] = $contact[$field];
}
/**
- * @brief Updates the gcontact entry from probe
+ * Updates the gcontact entry from probe
*
* @param string $url profile link
* @param boolean $force Optional forcing of network probing (otherwise we use the cached data)
$data = Probe::uri($url, $force);
if (in_array($data['network'], [Protocol::PHANTOM])) {
- $fields = ['last_failure' => DateTimeFormat::utcNow()];
+ $fields = ['failed' => true, 'last_failure' => DateTimeFormat::utcNow()];
DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]);
Logger::info('Invalid network for contact', ['url' => $data['url'], 'callstack' => System::callstack()]);
return false;
}
$data['server_url'] = $data['baseurl'];
+ $data['failed'] = false;
self::update($data);
}
/**
- * @brief Update the gcontact entry for a given user id
+ * Update the gcontact entry for a given user id
*
* @param int $uid User ID
* @return bool
);
$gcontact = ['name' => $userdata['name'], 'location' => $location, 'about' => $userdata['about'],
- 'gender' => $userdata['gender'], 'keywords' => $userdata['pub_keywords'],
+ 'keywords' => $userdata['pub_keywords'],
'birthday' => $userdata['dob'], 'photo' => $userdata['photo'],
"notify" => $userdata['notify'], 'url' => $userdata['url'],
- "hide" => ($userdata['hidewall'] || !$userdata['net-publish']),
+ "hide" => !$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 Fetches users of given GNU Social server
+ * 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'];
+ }
+
+ /**
+ * Fetches users of given GNU Social server
*
* If the "Statistics" addon is enabled (See http://gstools.org/ for details) we query user data with this.
*
$url = $server . '/main/statistics';
- $curlResult = Network::curl($url);
+ $curlResult = DI::httpRequest()->get($url);
if (!$curlResult->isSuccess()) {
return false;
}
'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;
}
/**
- * @brief Asking GNU Social server on a regular base for their user data
+ * Asking GNU Social server on a regular base for their user data
+ *
* @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function discoverGsUsers()
{
- $requery_days = intval(Config::get('system', 'poco_requery_days'));
+ $requery_days = intval(DI::config()->get('system', 'poco_requery_days'));
$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
$r = DBA::select('gserver', ['nurl', 'url'], [
'`network` = ?
- AND `last_contact` >= `last_failure`
+ AND NOT `failed`
AND `last_poco_query` < ?',
Protocol::OSTATUS,
$last_update
public static function getRandomUrl()
{
$r = DBA::selectFirst('gcontact', ['url'], [
- '`network` = ?
- AND `last_contact` >= `last_failure`
+ '`network` = ?
+ AND NOT `failed`
AND `updated` > ?',
Protocol::DFRN,
DateTimeFormat::utc('now - 1 month'),