Issue 6553: Restructured code for treating removed accounts

diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index 9387276d0bf7e650b10c03d013179b11fd95d0f8..0d14adcf90c9327617e3ebbb0498061599a68817 100644 (file)
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -57,21 +57,21 @@ class Profile extends BaseModule
        {
                if (ActivityPub::isRequest()) {
                        $user = DBA::selectFirst('user', ['uid'], ['nickname' => self::$which]);
-                       $data = [];
                        if (DBA::isResult($user)) {
                                $data = ActivityPub\Transmitter::getProfile($user['uid']);
+                               if (!empty($data)) {
+                                       System::jsonExit($data, 'application/activity+json');
+                               }
                        }
 
-                       if (!empty($data)) {
-                               System::jsonExit($data, 'application/activity+json');
-                       } elseif (DBA::exists('userd', ['username' => self::$which])) {
+                       if (DBA::exists('userd', ['username' => self::$which])) {
                                // Known deleted user
                                $data = ActivityPub\Transmitter::getDeletedUser(self::$which);
 
                                System::jsonError(410, $data);
                        } else {
                                // Any other case (unknown, blocked, unverified, expired, no profile, no self contact)
-                               System::jsonError(404, $data);
+                               System::jsonError(404, []);
                        }
                }
        }