X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGServer.php;h=c4138cc2d01aba5f6eeb8670acf6d8018baf65f6;hb=40259c7f04e70e9c6488e7d17f01cb2033cb73e1;hp=57b533a93a7f33a4c3dade9ee99440f2e7e6a66e;hpb=94439a3b429dd9312dcb3aa8ee8f20df7ff6281c;p=friendica.git diff --git a/src/Model/GServer.php b/src/Model/GServer.php index 57b533a93a..c4138cc2d0 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -1,6 +1,6 @@ $serverdata['nurl']]); $gserver = DBA::selectFirst('gserver', ['id'], ['nurl' => $serverdata['nurl']]); if (DBA::isResult($gserver)) { @@ -527,11 +537,12 @@ class GServer } } - if (!empty($serverdata['network']) && !empty($id) && ($serverdata['network'] != Protocol::PHANTOM)) { + // Count the number of known contacts from this server + if (!empty($id) && !in_array($serverdata['network'], [Protocol::PHANTOM, Protocol::FEED])) { $apcontacts = DBA::count('apcontact', ['gsid' => $id]); - $contacts = DBA::count('contact', ['uid' => 0, 'gsid' => $id]); - $max_users = max($apcontacts, $contacts, $registeredUsers, 1); - if ($max_users > $registeredUsers) { + $contacts = DBA::count('contact', ['uid' => 0, 'gsid' => $id, 'failed' => false]); + $max_users = max($apcontacts, $contacts); + if ($max_users > $serverdata['registered-users']) { Logger::info('Update registered users', ['id' => $id, 'url' => $serverdata['nurl'], 'registered-users' => $max_users]); DBA::update('gserver', ['registered-users' => $max_users], ['id' => $id]); } @@ -686,6 +697,21 @@ class GServer } } + if (!empty($data['total_users'])) { + $serverdata['registered-users'] = max($data['total_users'], 1); + } + + if (!empty($data['active_users_monthly'])) { + $serverdata['active-month-users'] = max($data['active_users_monthly'], 0); + } + + if (!empty($data['active_users_halfyear'])) { + $serverdata['active-halfyear-users'] = max($data['active_users_halfyear'], 0); + } + + if (!empty($data['local_posts'])) { + $serverdata['local-posts'] = max($data['local_posts'], 0); + } if (!empty($data['registrations_open'])) { $serverdata['register_policy'] = Register::OPEN; @@ -800,6 +826,22 @@ class GServer $server['registered-users'] = max($nodeinfo['usage']['users']['total'], 1); } + if (!empty($nodeinfo['usage']['users']['activeMonth'])) { + $server['active-month-users'] = max($nodeinfo['usage']['users']['activeMonth'], 0); + } + + if (!empty($nodeinfo['usage']['users']['activeHalfyear'])) { + $server['active-halfyear-users'] = max($nodeinfo['usage']['users']['activeHalfyear'], 0); + } + + if (!empty($nodeinfo['usage']['localPosts'])) { + $server['local-posts'] = max($nodeinfo['usage']['localPosts'], 0); + } + + if (!empty($nodeinfo['usage']['localComments'])) { + $server['local-comments'] = max($nodeinfo['usage']['localComments'], 0); + } + if (!empty($nodeinfo['protocols']['inbound']) && is_array($nodeinfo['protocols']['inbound'])) { $protocols = []; foreach ($nodeinfo['protocols']['inbound'] as $protocol) { @@ -877,6 +919,22 @@ class GServer $server['registered-users'] = max($nodeinfo['usage']['users']['total'], 1); } + if (!empty($nodeinfo['usage']['users']['activeMonth'])) { + $server['active-month-users'] = max($nodeinfo['usage']['users']['activeMonth'], 0); + } + + if (!empty($nodeinfo['usage']['users']['activeHalfyear'])) { + $server['active-halfyear-users'] = max($nodeinfo['usage']['users']['activeHalfyear'], 0); + } + + if (!empty($nodeinfo['usage']['localPosts'])) { + $server['local-posts'] = max($nodeinfo['usage']['localPosts'], 0); + } + + if (!empty($nodeinfo['usage']['localComments'])) { + $server['local-comments'] = max($nodeinfo['usage']['localComments'], 0); + } + if (!empty($nodeinfo['protocols'])) { $protocols = []; foreach ($nodeinfo['protocols'] as $protocol) { @@ -956,6 +1014,22 @@ class GServer $serverdata['registered-users'] = max($data['channels_total'], 1); } + if (!empty($data['channels_active_monthly'])) { + $serverdata['active-month-users'] = max($data['channels_active_monthly'], 0); + } + + if (!empty($data['channels_active_halfyear'])) { + $serverdata['active-halfyear-users'] = max($data['channels_active_halfyear'], 0); + } + + if (!empty($data['local_posts'])) { + $serverdata['local-posts'] = max($data['local_posts'], 0); + } + + if (!empty($data['local_comments'])) { + $serverdata['local-comments'] = max($data['local_comments'], 0); + } + if (!empty($data['register_policy'])) { switch ($data['register_policy']) { case 'REGISTER_OPEN': @@ -1049,16 +1123,18 @@ class GServer return $serverdata; } + $time = time(); foreach ($contacts as $contact) { - $probed = Contact::getByURL($contact); - if (!empty($probed) && in_array($probed['network'], Protocol::FEDERATED)) { + $probed = Contact::getByURL($contact, true); + if (!empty($probed) && !$probed['failed'] && in_array($probed['network'], Protocol::FEDERATED)) { $serverdata['network'] = $probed['network']; break; + } elseif ((time() - $time) > 10) { + // To reduce the stress on remote systems we probe a maximum of 10 seconds + break; } } - $serverdata['registered-users'] = max($serverdata['registered-users'], count($contacts), 1); - return $serverdata; } @@ -1205,6 +1281,38 @@ class GServer return $serverdata; } + private static function fetchWeeklyUsage(string $url, array $serverdata) { + $curlResult = DI::httpClient()->get($url . '/api/v1/instance/activity'); + + if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) { + return $serverdata; + } + + $data = json_decode($curlResult->getBody(), true); + if (empty($data)) { + return $serverdata; + } + + $current_week = []; + foreach ($data as $week) { + // Use only data from a full week + if (empty($week['week']) || (time() - $week['week']) < 7 * 24 * 60 * 60) { + continue; + } + + // Most likely the data is sorted correctly. But we better are safe than sorry + if (empty($current_week['week']) || ($current_week['week'] < $week['week'])) { + $current_week = $week; + } + } + + if (!empty($current_week['logins'])) { + $serverdata['active-week-users'] = max($current_week['logins'], 0); + } + + return $serverdata; + } + /** * Detects data from a given server url if it was a mastodon alike system * @@ -1366,7 +1474,57 @@ class GServer } return $val; - } + } + + /** + * Detect if the URL belongs to a pump.io server + * + * @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) + { + $curlResult = DI::httpClient()->get($url . '/.well-known/host-meta.json'); + if (!$curlResult->isSuccess()) { + return $serverdata; + } + + $data = json_decode($curlResult->getBody(), true); + if (empty($data['links'])) { + return $serverdata; + + } + + // We are looking for some endpoints that are typical for pump.io + $trust = 0; + foreach ($data['links'] as $link) { + if (empty($link['rel'])) { + continue; + } + if (in_array($link['rel'], ['registration_endpoint', 'dialback', 'http://apinamespace.org/activitypub/whoami'])) { + ++$trust; + } + } + + if ($trust == 3) { + $serverdata['detection-method'] = self::DETECT_PUMPIO; + + $serverdata['platform'] = 'pumpio'; + $serverdata['version'] = ''; + $serverdata['network'] = Protocol::PUMPIO; + + $servers = $curlResult->getHeader('Server'); + foreach ($servers as $server) { + if (preg_match("#pump.io/(.*)\s#U", $server, $matches)) { + $serverdata['version'] = $matches[1]; + } + } + } + + return $serverdata; + } /** * Detect if the URL belongs to a GNU Social server @@ -1511,6 +1669,10 @@ class GServer return $serverdata; } + // Using only body information we cannot safely detect a lot of systems. + // So we define a list of platforms that we can detect safely. + $valid_platforms = ['friendica', 'friendika', 'diaspora', 'mastodon', 'hubzilla', 'misskey', 'peertube', 'wordpress', 'write.as']; + $doc = new DOMDocument(); @$doc->loadHTML($curlResult->getBody()); $xpath = new DOMXPath($doc); @@ -1560,11 +1722,8 @@ class GServer $serverdata['version'] = $version_part[1]; // We still do need a reliable test if some AP plugin is activated - if (DBA::exists('apcontact', ['baseurl' => $url])) { - $serverdata['network'] = Protocol::ACTIVITYPUB; - } else { - $serverdata['network'] = Protocol::FEED; - } + // By now we just check in a later process for some known contacts + $serverdata['network'] = Protocol::FEED; if ($serverdata['detection-method'] == self::DETECT_MANUAL) { $serverdata['detection-method'] = self::DETECT_BODY; @@ -1624,7 +1783,11 @@ class GServer } } - if (!empty($serverdata['network']) && ($serverdata['detection-method'] == self::DETECT_MANUAL)) { + if (!empty($serverdata['platform']) && in_array($serverdata['detection-method'], [self::DETECT_MANUAL, self::DETECT_BODY]) && !in_array($serverdata['platform'], $valid_platforms)) { + $serverdata['network'] = Protocol::PHANTOM; + $serverdata['version'] = ''; + $serverdata['detection-method'] = self::DETECT_MANUAL; + } elseif (!empty($serverdata['network']) && ($serverdata['detection-method'] == self::DETECT_MANUAL)) { $serverdata['detection-method'] = self::DETECT_BODY; }