bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Move user tombstone activity data to ActivityPub\Transmitter

Browse source
This commit is contained in:
Hypolite Petovan 2019-04-04 07:38:40 -04:00
parent d51b9226a6
commit 5b12bccb45
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Module/Profile.php
View file

@ -63,14 +63,7 @@ class Profile extends BaseModule
System::jsonExit($data, 'application/activity+json'); System::jsonExit($data, 'application/activity+json');
} elseif (DBA::exists('userd', ['username' => self::$which])) { } elseif (DBA::exists('userd', ['username' => self::$which])) {
// Known deleted user // Known deleted user
$data = [ $data = ActivityPub\Transmitter::getDeletedUser(self::$which);
'@context' => ActivityPub::CONTEXT,
'id' => self::getApp()->getBaseUrl() . '/profile/' . self::$which,
'type' => 'Tombstone',
'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
'updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
'deleted' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
];
System::jsonError(410, $data); System::jsonError(410, $data);
} else { } else {

17
src/Protocol/ActivityPub/Transmitter.php
View file

@ -247,6 +247,23 @@ class Transmitter
return $data; return $data;
} }
/**
* @param string $username
* @return array
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function getDeletedUser($username)
{
return [
'@context' => ActivityPub::CONTEXT,
'id' => System::baseUrl() . '/profile/' . $username,
'type' => 'Tombstone',
'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
'updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
'deleted' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
];
}
/** /**
* Returns an array with permissions of a given item array * Returns an array with permissions of a given item array
* *