Use similar values for generator and system actor

diff --git a/src/Model/User.php b/src/Model/User.php
index 5b06f5e77a6367f678620c0ccc89ad077701f7a9..df8173133d9862b636f2f1fa64d2817b61416172 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -25,6 +25,7 @@ use DivineOmega\DOFileCachePSR6\CacheItemPool;
 use DivineOmega\PasswordExposed;
 use ErrorException;
 use Exception;
+use Friendica\App;
 use Friendica\Content\Pager;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -161,6 +162,7 @@ class User
                        }
                }
 
+               $system['name'] = App::PLATFORM . " '" . App::CODENAME . "' " . App::VERSION . '-' . DB_UPDATE_VERSION;
                $system['sprvkey'] = $system['uprvkey'] = $system['prvkey'];
                $system['spubkey'] = $system['upubkey'] = $system['pubkey'];
                $system['nickname'] = $system['nick'];

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index d3be608ade58ae567ecbe81a2fbe958e47970539..ba0998b520a4c5df8827b8804a2367a25c07d498 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -322,16 +322,17 @@ class Transmitter
        }
 
        /**
-        * Return the service array containing information the used software and it's url
+        * Return the service array containing information the used software and its url
         *
         * @return array with service data
         */
        public static function getService(): array
        {
                return [
-                       'type' => 'Service',
+                       'id'   => (string)DI::baseUrl() . '/friendica',
+                       'type' => 'Application',
                        'name' =>  App::PLATFORM . " '" . App::CODENAME . "' " . App::VERSION . '-' . DB_UPDATE_VERSION,
-                       'url' => (string)DI::baseUrl()
+                       'url'  => (string)DI::baseUrl(),
                ];
        }