From d7e8ee51ae1a9648f460738ea6e3b5f159079555 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 8 Apr 2024 06:24:41 +0000
Subject: [PATCH] Use similar values for generator and system actor

---
 src/Model/User.php                       | 2 ++
 src/Protocol/ActivityPub/Transmitter.php | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Model/User.php b/src/Model/User.php
index 5b06f5e77a..df8173133d 100644
--- 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 d3be608ade..ba0998b520 100644
--- 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(),
 		];
 	}