friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #14085 from annando/generator 

Use similar values for generator and system actor
pull/14089/head
Tobias Diekershoff 2024-04-09 18:38:22 +02:00 committed by GitHub
parent 02d8cc2f71 d7e8ee51ae
commit b02a5ed701
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/User.php
View File

@ -25,6 +25,7 @@ use DivineOmega\DOFileCachePSR6\CacheItemPool;
use DivineOmega\PasswordExposed; use DivineOmega\PasswordExposed;
use ErrorException; use ErrorException;
use Exception; use Exception;
use Friendica\App;
use Friendica\Content\Pager; use Friendica\Content\Pager;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\L10n; 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['sprvkey'] = $system['uprvkey'] = $system['prvkey'];
$system['spubkey'] = $system['upubkey'] = $system['pubkey']; $system['spubkey'] = $system['upubkey'] = $system['pubkey'];
$system['nickname'] = $system['nick']; $system['nickname'] = $system['nick'];

7
src/Protocol/ActivityPub/Transmitter.php
View File

@ -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 * @return array with service data
*/ */
public static function getService(): array public static function getService(): array
{ {
return [ return [
'type' => 'Service', 'id' => (string)DI::baseUrl() . '/friendica',
'type' => 'Application',
'name' => App::PLATFORM . " '" . App::CODENAME . "' " . App::VERSION . '-' . DB_UPDATE_VERSION, 'name' => App::PLATFORM . " '" . App::CODENAME . "' " . App::VERSION . '-' . DB_UPDATE_VERSION,
'url' => (string)DI::baseUrl() 'url' => (string)DI::baseUrl(),
]; ];
} }