]> git.mxchange.org Git - friendica.git/blobdiff - src/Module/Admin/Federation.php
Merge pull request #11003 from annando/fix-api
[friendica.git] / src / Module / Admin / Federation.php
index fd60b071526b88fc65e3b8106342db0554c72548..65d0453d933f67e78113408bf2b66ceda3ec7496 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -28,9 +28,9 @@ use Friendica\Module\BaseAdmin;
 
 class Federation extends BaseAdmin
 {
-       public static function content(array $parameters = [])
+       public function content(): string
        {
-               parent::content($parameters);
+               parent::content();
 
                // get counts on active federation systems this node is knowing
                // We list the more common systems by name. The rest is counted as "other"
@@ -42,6 +42,8 @@ class Federation extends BaseAdmin
                        'hubzilla'    => ['name' => 'Hubzilla/Red Matrix', 'color' => '#43488a'], // blue from the logo
                        'mastodon'    => ['name' => 'Mastodon', 'color' => '#1a9df9'], // blue from the Mastodon logo
                        'misskey'     => ['name' => 'Misskey', 'color' => '#ccfefd'], // Font color of the homepage
+                       'mobilizon'   => ['name' => 'Mobilizon', 'color' => '#ffd599'], // Background color of parts of the homepage
+                       'nextcloud'   => ['name' => 'Nextcloud', 'color' => '#1cafff'], // Logo color
                        'peertube'    => ['name' => 'Peertube', 'color' => '#ffad5c'], // One of the logo colors
                        'pixelfed'    => ['name' => 'Pixelfed', 'color' => '#11da47'], // One of the logo colors
                        'pleroma'     => ['name' => 'Pleroma', 'color' => '#E46F0F'], // Orange from the text that is used on Pleroma instances
@@ -49,6 +51,8 @@ class Federation extends BaseAdmin
                        'socialhome'  => ['name' => 'SocialHome', 'color' => '#52056b'], // lilac from the Django Image used at the Socialhome homepage
                        'wordpress'   => ['name' => 'WordPress', 'color' => '#016087'], // Background color of the homepage
                        'writefreely' => ['name' => 'WriteFreely', 'color' => '#292929'], // Font color of the homepage
+                       'mistpark'    => ['name' => 'Nomad projects (Mistpark, Osada, Roadhouse, Zap)', 'color' => '#348a4a'], // Green like the Mistpark green
+                       'relay'       => ['name' => 'ActivityPub Relay', 'color' => '#888888'], // Grey like the second color of the ActivityPub logo
                        'other'       => ['name' => DI::l10n()->t('Other'), 'color' => '#F1007E'], // ActivityPub main color
                ];
 
@@ -78,6 +82,10 @@ class Federation extends BaseAdmin
 
                                if (in_array($gserver['platform'], ['Red Matrix', 'redmatrix', 'red'])) {
                                        $version['version'] = 'Red ' . $version['version'];
+                               } elseif (in_array($gserver['platform'], ['osada', 'mistpark', 'roadhouse', 'zap'])) {
+                                       $version['version'] = $gserver['platform'] . ' ' . $version['version'];
+                               } elseif (in_array($gserver['platform'], ['activityrelay', 'pub-relay', 'selective-relay', 'aoderelay'])) {
+                                       $version['version'] = $gserver['platform'] . '-' . $version['version'];
                                }
 
                                $versionCounts[] = $version;
@@ -90,12 +98,16 @@ class Federation extends BaseAdmin
                                $platform = 'friendica';
                        } elseif (in_array($platform, ['red matrix', 'redmatrix', 'red'])) {
                                $platform = 'hubzilla';
+                       } elseif (in_array($platform, ['mistpark', 'osada', 'roadhouse', 'zap'])) {
+                               $platform = 'mistpark';
                        } elseif(stristr($platform, 'pleroma')) {
                                $platform = 'pleroma';
                        } elseif(stristr($platform, 'statusnet')) {
                                $platform = 'gnusocial';
                        } elseif(stristr($platform, 'wordpress')) {
                                $platform = 'wordpress';
+                       } elseif (in_array($platform, ['activityrelay', 'pub-relay', 'selective-relay', 'aoderelay'])) {
+                               $platform = 'relay';
                        } elseif (!in_array($platform, $platforms)) {
                                $platform = 'other';
                        }
@@ -120,9 +132,17 @@ class Federation extends BaseAdmin
                                $versionCounts = self::reformaPleromaVersions($versionCounts);
                        } elseif ($platform == 'diaspora') {
                                $versionCounts = self::reformaDiasporaVersions($versionCounts);
+                       } elseif ($platform == 'relay') {
+                               $versionCounts = self::reformatRelayVersions($versionCounts);
+                       } elseif (in_array($platform, ['funkwhale', 'mastodon', 'mobilizon', 'misskey'])) {
+                               $versionCounts = self::removeVersionSuffixes($versionCounts);
                        }
 
-                       $versionCounts = self::sortVersion($versionCounts);
+                       if (!in_array($platform, ['other', 'relay', 'mistpark'])) {
+                               $versionCounts = self::sortVersion($versionCounts);
+                       } else {
+                               ksort($versionCounts);
+                       }
 
                        $gserver['platform'] = $systems[$platform]['name'];
 
@@ -132,7 +152,6 @@ class Federation extends BaseAdmin
 
                // some helpful text
                $intro = DI::l10n()->t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.');
-               $hint = DI::l10n()->t('The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here.');
 
                // load the template, replace the macros and return the page content
                $t = Renderer::getMarkupTemplate('admin/federation.tpl');
@@ -140,8 +159,6 @@ class Federation extends BaseAdmin
                        '$title' => DI::l10n()->t('Administration'),
                        '$page' => DI::l10n()->t('Federation Statistics'),
                        '$intro' => $intro,
-                       '$hint' => $hint,
-                       '$autoactive' => DI::config()->get('system', 'poco_completion'),
                        '$counts' => $counts,
                        '$version' => FRIENDICA_VERSION,
                        '$legendtext' => DI::l10n()->t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users),
@@ -163,8 +180,9 @@ class Federation extends BaseAdmin
                        $newVC = $vv['total'];
                        $newVV = $vv['version'];
                        $lastDot = strrpos($newVV, '.');
+                       $firstDash = strpos($newVV, '-');
                        $len = strlen($newVV) - 1;
-                       if (($lastDot == $len - 4) && (!strrpos($newVV, '-rc') == $len - 3)) {
+                       if (($lastDot == $len - 4) && (!strrpos($newVV, '-rc') == $len - 3) && (!$firstDash == $len - 1)) {
                                $newVV = substr($newVV, 0, $lastDot);
                        }
                        if (isset($newV[$newVV])) {
@@ -250,6 +268,68 @@ class Federation extends BaseAdmin
                return $versionCounts;
        }
 
+       /**
+        * Clean up version numbers
+        *
+        * @param array $versionCounts list of version numbers
+        * @return array with cleaned version numbers
+        */
+       private static function removeVersionSuffixes(array $versionCounts)
+       {
+               $compacted = [];
+               foreach ($versionCounts as $key => $value) {
+                       $version = $versionCounts[$key]['version'];
+
+                       foreach ([' ', '+', '-', '#', '_', '~'] as $delimiter) {
+                               $parts = explode($delimiter, trim($version));
+                               $version = array_shift($parts);
+                       }
+
+                       if (empty($compacted[$version])) {
+                               $compacted[$version] = $versionCounts[$key]['total'];
+                       } else {
+                               $compacted[$version] += $versionCounts[$key]['total'];
+                       }
+               }
+
+               $versionCounts = [];
+               foreach ($compacted as $version => $pl_total) {
+                       $versionCounts[] = ['version' => $version, 'total' => $pl_total];
+               }
+
+               return $versionCounts;
+       }
+
+       /**
+        * Clean up relay version numbers
+        *
+        * @param array $versionCounts list of version numbers
+        * @return array with cleaned version numbers
+        */
+       private static function reformatRelayVersions(array $versionCounts)
+       {
+               $compacted = [];
+               foreach ($versionCounts as $key => $value) {
+                       $version = $versionCounts[$key]['version'];
+
+                       $parts = explode(' ', trim($version));
+                       $version = array_shift($parts);
+
+                       if (empty($compacted[$version])) {
+                               $compacted[$version] = $versionCounts[$key]['total'];
+                       } else {
+                               $compacted[$version] += $versionCounts[$key]['total'];
+                       }
+               }
+
+               $versionCounts = [];
+               foreach ($compacted as $version => $pl_total) {
+                       $versionCounts[] = ['version' => $version, 'total' => $pl_total];
+               }
+
+               return $versionCounts;
+       }
+
        /**
         * Reformat, sort and compact version numbers
         *