friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Issue 6553: Restructured code for treating removed accounts

This commit is contained in:
Michael 2019-09-14 07:12:25 +00:00
parent c11bf8a14f
commit 9d87bc94a6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Module/Profile.php
View File

@ -57,21 +57,21 @@ 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)) {
$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, []);
} }
} }
} }