X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGServer.php;h=c4138cc2d01aba5f6eeb8670acf6d8018baf65f6;hb=40259c7f04e70e9c6488e7d17f01cb2033cb73e1;hp=90b023f6fd3f50a0f0e8d9a661a4b6f4fd1b3570;hpb=00c23ad5d2b25caa598092774a7d7e0a384cb873;p=friendica.git

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 90b023f6fd..c4138cc2d0 100644
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -377,6 +377,12 @@ class GServer
 		if (empty($nodeinfo['network']) || in_array($nodeinfo['network'], [Protocol::DFRN, Protocol::ZOT])) {
 			if (!empty($nodeinfo['detection-method'])) {
 				$serverdata['detection-method'] = $nodeinfo['detection-method'];
+
+				foreach (['registered-users', 'active_users_monthly', 'active-halfyear-users', 'local-posts'] as $field) {
+					if (!empty($nodeinfo[$field])) {
+						$serverdata[$field] = $nodeinfo[$field];
+					}
+				}
 			}
 
 			// Fetch the landing page, possibly it reveals some data
@@ -500,6 +506,10 @@ class GServer
 			$serverdata = self::detectNetworkViaContacts($url, $serverdata);
 		}
 
+		if ($serverdata['network'] == Protocol::ACTIVITYPUB) {
+			$serverdata = self::fetchWeeklyUsage($url, $serverdata);
+		}
+
 		$serverdata['registered-users'] = $serverdata['registered-users'] ?? 0;
 
 		// On an active server there has to be at least a single user
@@ -687,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;
@@ -801,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) {
@@ -878,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) {
@@ -957,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':
@@ -1208,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
 	 *