*
* @param string $url
* @param boolean $no_check Don't check if the server hadn't been found
- * @return int gserver id
+ * @return int|null gserver id or NULL on empty URL or failed check
*/
public static function getID(string $url, bool $no_check = false)
{
*
* @return boolean 'true' if server seems vital
*/
- public static function reachable(string $profile, string $server = '', string $network = '', bool $force = false)
+ public static function reachable(string $profile, string $server = '', string $network = '', bool $force = false): bool
{
if ($server == '') {
$contact = Contact::getByURL($profile, null, ['baseurl']);
return self::check($server, $network, $force);
}
- public static function getNextUpdateDate(bool $success, string $created = '', string $last_contact = '')
+ public static function getNextUpdateDate(bool $success, string $created = '', string $last_contact = ''): string
{
// On successful contact process check again next week
if ($success) {
*
* @return boolean 'true' if server seems vital
*/
- public static function check(string $server_url, string $network = '', bool $force = false, bool $only_nodeinfo = false)
+ public static function check(string $server_url, string $network = '', bool $force = false, bool $only_nodeinfo = false): bool
{
$server_url = self::cleanURL($server_url);
if ($server_url == '') {
* @param string $url
* @return string cleaned URL
*/
- public static function cleanURL(string $url)
+ public static function cleanURL(string $url): string
{
$url = trim($url, '/');
$url = str_replace('/index.php', '', $url);
* @param string $url
* @return string base URL
*/
- private static function getBaseURL(string $url)
+ private static function getBaseURL(string $url): string
{
$urlparts = parse_url(self::cleanURL($url));
unset($urlparts['path']);
*
* @return boolean 'true' if server could be detected
*/
- public static function detect(string $url, string $network = '', bool $only_nodeinfo = false)
+ public static function detect(string $url, string $network = '', bool $only_nodeinfo = false): bool
{
Logger::info('Detect server type', ['server' => $url]);
$serverdata = ['detection-method' => self::DETECT_MANUAL];
}
}
- if (empty($serverdata['network']) || ($serverdata['network'] == Protocol::ACTIVITYPUB)) {
+ if (empty($nodeinfo['network']) && (empty($serverdata['network']) || ($serverdata['network'] == Protocol::ACTIVITYPUB))) {
$serverdata = self::detectMastodonAlikes($url, $serverdata);
}
$serverdata = self::detectNextcloud($url, $serverdata);
}
- if (empty($serverdata['network'])) {
+ if (empty($nodeinfo['network']) && empty($serverdata['network'])) {
$serverdata = self::detectGNUSocial($url, $serverdata);
}
$serverdata['last_contact'] = DateTimeFormat::utcNow();
$serverdata['failed'] = false;
- $gserver = DBA::selectFirst('gserver', ['network'], ['nurl' => Strings::normaliseLink($url)]);
+ $gserver = DBA::selectFirst('gserver', ['network'], ['nurl' => $serverdata['nurl']]);
if (!DBA::isResult($gserver)) {
$serverdata['created'] = DateTimeFormat::utcNow();
$ret = DBA::insert('gserver', $serverdata);
* Fetch relay data from a given server url
*
* @param string $server_url address of the server
+ * @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function discoverRelay(string $server_url)
*
* @return array server data
*/
- private static function fetchStatistics(string $url)
+ private static function fetchStatistics(string $url): array
{
$curlResult = DI::httpClient()->get($url . '/statistics.json', HttpClientAccept::JSON);
if (!$curlResult->isSuccess()) {
* @return array Server data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function fetchNodeinfo(string $url, ICanHandleHttpResponses $httpResult)
+ private static function fetchNodeinfo(string $url, ICanHandleHttpResponses $httpResult): array
{
if (!$httpResult->isSuccess()) {
return [];
* @return array Server data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function parseNodeinfo1(string $nodeinfo_url)
+ private static function parseNodeinfo1(string $nodeinfo_url): array
{
$curlResult = DI::httpClient()->get($nodeinfo_url, HttpClientAccept::JSON);
if (!$curlResult->isSuccess()) {
* @return array Server data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function parseNodeinfo2(string $nodeinfo_url)
+ private static function parseNodeinfo2(string $nodeinfo_url): array
{
$curlResult = DI::httpClient()->get($nodeinfo_url, HttpClientAccept::JSON);
if (!$curlResult->isSuccess()) {
return [];
}
- $server = ['detection-method' => self::DETECT_NODEINFO_2,
- 'register_policy' => Register::CLOSED];
+ $server = [
+ 'detection-method' => self::DETECT_NODEINFO_2,
+ 'register_policy' => Register::CLOSED,
+ 'platform' => 'unknown',
+ ];
if (!empty($nodeinfo['openRegistrations'])) {
$server['register_policy'] = Register::OPEN;
// Version numbers on Nodeinfo are presented with additional info, e.g.:
// 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191.
$server['version'] = preg_replace('=(.+)-(.{4,})=ism', '$1', $server['version']);
+
+ // qoto advertises itself as Mastodon
+ if (($server['platform'] == 'mastodon') && substr($nodeinfo['software']['version'], -5) == '-qoto') {
+ $server['platform'] = 'qoto';
+ }
}
}
*
* @param string $url URL of the given server
* @param array $serverdata array with server data
- *
* @return array server data
*/
- private static function fetchSiteinfo(string $url, array $serverdata)
+ private static function fetchSiteinfo(string $url, array $serverdata): array
{
$curlResult = DI::httpClient()->get($url . '/siteinfo.json', HttpClientAccept::JSON);
if (!$curlResult->isSuccess()) {
* Checks if the server contains a valid host meta file
*
* @param string $url URL of the given server
- *
* @return boolean 'true' if the server seems to be vital
*/
- private static function validHostMeta(string $url)
+ private static function validHostMeta(string $url): bool
{
$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
$curlResult = DI::httpClient()->get($url . '/.well-known/host-meta', HttpClientAccept::XRD_XML, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
*
* @param string $url URL of the given server
* @param array $serverdata array with server data
- *
* @return array server data
*/
- private static function detectNetworkViaContacts(string $url, array $serverdata)
+ private static function detectNetworkViaContacts(string $url, array $serverdata): array
{
$contacts = [];
*
* @param string $url URL of the given server
* @param array $serverdata array with server data
- *
* @return array server data
*/
- private static function checkPoCo(string $url, array $serverdata)
+ private static function checkPoCo(string $url, array $serverdata): array
{
$serverdata['poco'] = '';
*
* @param string $url URL of the given server
* @param array $serverdata array with server data
- *
* @return array server data
*/
- public static function checkMastodonDirectory(string $url, array $serverdata)
+ public static function checkMastodonDirectory(string $url, array $serverdata): array
{
$curlResult = DI::httpClient()->get($url . '/api/v1/directory?limit=1', HttpClientAccept::JSON);
if (!$curlResult->isSuccess()) {
*
* @return array server data
*/
- private static function detectPeertube(string $url, array $serverdata)
+ private static function detectPeertube(string $url, array $serverdata): array
{
$curlResult = DI::httpClient()->get($url . '/api/v1/config', HttpClientAccept::JSON);
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
*
* @param string $url URL of the given server
* @param array $serverdata array with server data
- *
* @return array server data
*/
- private static function detectNextcloud(string $url, array $serverdata)
+ private static function detectNextcloud(string $url, array $serverdata): array
{
$curlResult = DI::httpClient()->get($url . '/status.php', HttpClientAccept::JSON);
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
return $serverdata;
}
- private static function fetchWeeklyUsage(string $url, array $serverdata) {
+ /**
+ * Fetches weekly usage data
+ *
+ * @param string $url URL of the given server
+ * @param array $serverdata array with server data
+ * @return array server data
+ */
+ private static function fetchWeeklyUsage(string $url, array $serverdata): array
+ {
$curlResult = DI::httpClient()->get($url . '/api/v1/instance/activity', HttpClientAccept::JSON);
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
return $serverdata;
*
* @param string $url URL of the given server
* @param array $serverdata array with server data
- *
* @return array server data
*/
- private static function detectFromContacts(string $url, array $serverdata)
+ private static function detectFromContacts(string $url, array $serverdata): array
{
$gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => Strings::normaliseLink($url)]);
if (empty($gserver)) {
*
* @param string $url URL of the given server
* @param array $serverdata array with server data
- *
* @return array server data
*/
- private static function detectMastodonAlikes(string $url, array $serverdata)
+ private static function detectMastodonAlikes(string $url, array $serverdata): array
{
$curlResult = DI::httpClient()->get($url . '/api/v1/instance', HttpClientAccept::JSON);
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
*
* @param string $url URL of the given server
* @param array $serverdata array with server data
- *
* @return array server data
*/
- private static function detectHubzilla(string $url, array $serverdata)
+ private static function detectHubzilla(string $url, array $serverdata): array
{
$curlResult = DI::httpClient()->get($url . '/api/statusnet/config.json', HttpClientAccept::JSON);
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
* Converts input value to a boolean value
*
* @param string|integer $val
- *
* @return boolean
*/
- private static function toBoolean($val)
+ private static function toBoolean($val): bool
{
if (($val == 'true') || ($val == 1)) {
return true;
*
* @param string $url URL of the given server
* @param array $serverdata array with server data
- *
* @return array server data
*/
- private static function detectPumpIO(string $url, array $serverdata)
+ private static function detectPumpIO(string $url, array $serverdata): array
{
$curlResult = DI::httpClient()->get($url . '/.well-known/host-meta.json', HttpClientAccept::JSON);
if (!$curlResult->isSuccess()) {
$data = json_decode($curlResult->getBody(), true);
if (empty($data['links'])) {
return $serverdata;
-
}
// We are looking for some endpoints that are typical for pump.io
*
* @param string $url URL of the given server
* @param array $serverdata array with server data
- *
* @return array server data
*/
- private static function detectGNUSocial(string $url, array $serverdata)
+ private static function detectGNUSocial(string $url, array $serverdata): array
{
// Test for GNU Social
$curlResult = DI::httpClient()->get($url . '/api/gnusocial/version.json', HttpClientAccept::JSON);
*
* @param string $url URL of the given server
* @param array $serverdata array with server data
- *
* @return array server data
*/
- private static function detectFriendica(string $url, array $serverdata)
+ private static function detectFriendica(string $url, array $serverdata): array
{
// There is a bug in some versions of Friendica that will return an ActivityStream actor when the content type "application/json" is requested.
// Because of this me must not use ACCEPT_JSON here.
* @param object $curlResult result of curl execution
* @param array $serverdata array with server data
* @param string $url Server URL
- *
* @return array server data
*/
- private static function analyseRootBody($curlResult, array $serverdata, string $url)
+ private static function analyseRootBody($curlResult, array $serverdata, string $url): array
{
if (empty($curlResult->getBody())) {
return $serverdata;
*
* @return array server data
*/
- private static function analyseRootHeader($curlResult, array $serverdata)
+ private static function analyseRootHeader($curlResult, array $serverdata): array
{
if ($curlResult->getHeader('server') == 'Mastodon') {
$serverdata['platform'] = 'mastodon';
* @return int
* @throws Exception
*/
- public static function getProtocol(int $gsid)
+ public static function getProtocol(int $gsid): int
{
if (empty($gsid)) {
return null;
projects / friendica.git / blobdiff