Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 13:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use "getActorName"

Browse source
This commit is contained in:
Michael 2020-08-22 18:52:37 +00:00
parent 6d9302fbe4
commit b12a2c486e
3 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Model/User.php
View file

@ -102,7 +102,7 @@ class User
/**
* Fetch the system account
*
* @return return system account
* @return array system account
*/
public static function getSystemAccount()
{
@ -128,12 +128,9 @@ class User
*/
private static function createSystemAccount()
{
$system_actor_name = DI::config()->get('system', 'actor_name');
$system_actor_name = self::getActorName();
if (empty($system_actor_name)) {
$system_actor_name = self::getActorName();
if (empty($system_actor_name)) {
return;
}
return;
}
$keys = Crypto::newKeypair(4096);
@ -176,6 +173,11 @@ class User
*/
public static function getActorName()
{
$system_actor_name = DI::config()->get('system', 'actor_name');
if (!empty($system_actor_name)) {
return $system_actor_name;
}
// List of possible actor names
$possible_accounts = ['friendica', 'actor', 'system', 'internal'];
foreach ($possible_accounts as $name) {
@ -686,7 +688,7 @@ class User
}
// Add the name of the internal actor to the "forbidden" list
$actor_name = DI::config()->get('system', 'actor_name');
$actor_name = self::getActorName();
if (!empty($actor_name)) {
$forbidden[] = $actor_name;
}