Update ProfileController, preserve deleted actor objects for federated account deletion and use more efficient account cache lookup

app/Http/Controllers/ProfileController.php

@@ -2,33 +2,36 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Auth;
-use Cache;
-use DB;
-use View;
 use App\AccountInterstitial;
 use App\Follower;
 use App\FollowRequest;
 use App\Profile;
-use App\Story;
-use App\Status;
-use App\User;
-use App\UserSetting;
-use App\UserFilter;
-use League\Fractal;
 use App\Services\AccountService;
 use App\Services\FollowerService;
 use App\Services\StatusService;
-use App\Util\Lexer\Nickname;
+use App\Status;
-use App\Util\Webfinger\Webfinger;
+use App\Story;
-use App\Transformer\ActivityPub\ProfileOutbox;
 use App\Transformer\ActivityPub\ProfileTransformer;
+use App\User;
+use App\UserFilter;
+use App\UserSetting;
+use Auth;
+use Cache;
+use Illuminate\Http\Request;
+use League\Fractal;
+use View;
 
 class ProfileController extends Controller
 {
     public function show(Request $request, $username)
     {
+        if ($request->wantsJson() && (bool) config_cache('federation.activitypub.enabled')) {
+            $user = $this->getCachedUser($username, true);
+            abort_if(! $user, 404, 'Not found');
+
+            return $this->showActivityPub($request, $user);
+        }
+
         // redirect authed users to Metro 2.0
         if ($request->user()) {
             // unless they force static view
@@ -40,17 +43,11 @@ class ProfileController extends Controller
             }
         }
 
-		$user = Profile::whereNull('domain')
+        $user = $this->getCachedUser($username);
-			->whereNull('status')
-			->whereUsername($username)
-			->firstOrFail();
 
+        abort_unless($user, 404);
 
-		if($request->wantsJson() && config_cache('federation.activitypub.enabled')) {
+        $aiCheck = Cache::remember('profile:ai-check:spam-login:'.$user->id, 3600, function () use ($user) {
-			return $this->showActivityPub($request, $user);
-		}
-
-		$aiCheck = Cache::remember('profile:ai-check:spam-login:' . $user->id, 86400, function() use($user) {
             $exists = AccountInterstitial::whereUserId($user->user_id)->where('is_spam', 1)->count();
             if ($exists) {
                 return true;
@@ -61,6 +58,7 @@ class ProfileController extends Controller
         if ($aiCheck) {
             return redirect('/login');
         }
+
         return $this->buildProfile($request, $user);
     }
 
@@ -79,6 +77,7 @@ class ProfileController extends Controller
 
             if ($user->is_private == true) {
                 $profile = null;
+
                 return view('profile.private', compact('user'));
             }
 
@@ -90,13 +89,14 @@ class ProfileController extends Controller
                 'crawlable' => $settings->crawlable,
                 'following' => [
                     'count' => $settings->show_profile_following_count,
-					'list' => $settings->show_profile_following
+                    'list' => $settings->show_profile_following,
                 ],
                 'followers' => [
                     'count' => $settings->show_profile_follower_count,
-					'list' => $settings->show_profile_followers
+                    'list' => $settings->show_profile_followers,
-				]
+                ],
             ];
+
             return view('profile.show', compact('profile', 'settings'));
         } else {
             $key = 'profile:settings:'.$user->id;
@@ -118,6 +118,7 @@ class ProfileController extends Controller
                 $requested = Auth::check() ? FollowRequest::whereFollowerId(Auth::user()->profile_id)
                     ->whereFollowingId($user->id)
                     ->exists() : false;
+
                 return view('profile.private', compact('user', 'is_following', 'requested'));
             }
 
@@ -127,25 +128,50 @@ class ProfileController extends Controller
                 'crawlable' => $settings->crawlable,
                 'following' => [
                     'count' => $settings->show_profile_following_count,
-					'list' => $settings->show_profile_following
+                    'list' => $settings->show_profile_following,
                 ],
                 'followers' => [
                     'count' => $settings->show_profile_follower_count,
-					'list' => $settings->show_profile_followers
+                    'list' => $settings->show_profile_followers,
-				]
+                ],
             ];
+
             return view('profile.show', compact('profile', 'settings'));
         }
     }
 
+    protected function getCachedUser($username, $withTrashed = false)
+    {
+        $val = str_replace(['_', '.', '-'], '', $username);
+        if (! ctype_alnum($val)) {
+            return;
+        }
+        $hash = ($withTrashed ? 'wt:' : 'wot:').strtolower($username);
+
+        return Cache::remember('pfc:cached-user:'.$hash, ($withTrashed ? 14400 : 900), function () use ($username, $withTrashed) {
+            if (! $withTrashed) {
+                return Profile::whereNull(['domain', 'status'])
+                    ->whereUsername($username)
+                    ->first();
+            } else {
+                return Profile::withTrashed()
+                    ->whereNull('domain')
+                    ->whereUsername($username)
+                    ->first();
+            }
+        });
+    }
+
     public function permalinkRedirect(Request $request, $username)
     {
-		$user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
+        if ($request->wantsJson() && (bool) config_cache('federation.activitypub.enabled')) {
+            $user = $this->getCachedUser($username, true);
 
-		if ($request->wantsJson() && config_cache('federation.activitypub.enabled')) {
             return $this->showActivityPub($request, $user);
         }
 
+        $user = $this->getCachedUser($username);
+
         return redirect($user->url());
     }
 
@@ -180,6 +206,7 @@ class ProfileController extends Controller
             default:
                 break;
         }
+
         return abort(404);
     }
 
@@ -201,12 +228,14 @@ class ProfileController extends Controller
     public function showActivityPub(Request $request, $user)
     {
         abort_if(! config_cache('federation.activitypub.enabled'), 404);
+        abort_if(! $user, 404, 'Not found');
         abort_if($user->domain, 404);
 
-		return Cache::remember('pf:activitypub:user-object:by-id:' . $user->id, 3600, function() use($user) {
+        return Cache::remember('pf:activitypub:user-object:by-id:'.$user->id, 1800, function () use ($user) {
             $fractal = new Fractal\Manager();
             $resource = new Fractal\Resource\Item($user, new ProfileTransformer);
             $res = $fractal->createData($resource)->toArray();
+
             return response(json_encode($res['data']))->header('Content-Type', 'application/activity+json');
         });
     }
@@ -253,7 +282,7 @@ class ProfileController extends Controller
 
         abort_if(! $enabled, 404);
 
-		$data = Cache::remember('pf:atom:user-feed:by-id:' . $profile['id'], 900, function() use($pid, $profile) {
+        $data = Cache::remember('pf:atom:user-feed:by-id:'.$profile['id'], 14400, function () use ($pid, $profile) {
             $items = Status::whereProfileId($pid)
                 ->whereScope('public')
                 ->whereIn('type', ['photo', 'photo:album'])
@@ -280,12 +309,13 @@ class ProfileController extends Controller
             return compact('items', 'permalink', 'headers');
         });
         abort_if(! $data || ! isset($data['items']) || ! isset($data['permalink']), 404);
+
         return response()
             ->view('atom.user',
                 [
                     'profile' => $profile,
                     'items' => $data['items'],
-					'permalink' => $data['permalink']
+                    'permalink' => $data['permalink'],
                 ]
             )
             ->withHeaders($data['headers']);
@@ -294,6 +324,7 @@ class ProfileController extends Controller
     public function meRedirect()
     {
         abort_if(! Auth::check(), 404);
+
         return redirect(Auth::user()->url());
     }
 
@@ -309,13 +340,9 @@ class ProfileController extends Controller
             return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
         }
 
-		$profile = Profile::whereUsername($username)
+        $profile = $this->getCachedUser($username);
-			->whereIsPrivate(false)
-			->whereNull('status')
-			->whereNull('domain')
-			->first();
 
-		if(!$profile) {
+        if (! $profile || $profile->is_private) {
             return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
         }
 
@@ -338,6 +365,7 @@ class ProfileController extends Controller
 
         $profile = AccountService::get($profile->id);
         $res = view('profile.embed', compact('profile'));
+
         return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
     }
 
@@ -352,6 +380,7 @@ class ProfileController extends Controller
             ->whereActive(true)
             ->exists();
         abort_unless($exists, 404);
+
         return view('profile.story', compact('pid', 'profile'));
     }
 }