Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 06:40:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7626 from annando/issue-6553

Browse source 
Issue 6553: Restructured code for treating removed accounts
This commit is contained in:
Tobias Diekershoff 2019-09-14 09:48:38 +02:00 committed by GitHub
commit a78ffd5b7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Module/Profile.php
View file

@ -57,21 +57,22 @@ class Profile extends BaseModule
{ {
if (ActivityPub::isRequest()) { if (ActivityPub::isRequest()) {
$user = DBA::selectFirst('user', ['uid'], ['nickname' => self::$which]); $user = DBA::selectFirst('user', ['uid'], ['nickname' => self::$which]);
$data = [];
if (DBA::isResult($user)) { if (DBA::isResult($user)) {
// The function returns an empty array when the account is removed, expired or blocked
$data = ActivityPub\Transmitter::getProfile($user['uid']); $data = ActivityPub\Transmitter::getProfile($user['uid']);
if (!empty($data)) {
System::jsonExit($data, 'application/activity+json');
}
} }
if (!empty($data)) { if (DBA::exists('userd', ['username' => self::$which])) {
System::jsonExit($data, 'application/activity+json');
} elseif (DBA::exists('userd', ['username' => self::$which])) {
// Known deleted user // Known deleted user
$data = ActivityPub\Transmitter::getDeletedUser(self::$which); $data = ActivityPub\Transmitter::getDeletedUser(self::$which);
System::jsonError(410, $data); System::jsonError(410, $data);
} else { } else {
// Any other case (unknown, blocked, unverified, expired, no profile, no self contact) // Any other case (unknown, blocked, unverified, expired, no profile, no self contact)
System::jsonError(404, $data); System::jsonError(404, []);
} }
} }
} }