diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php index acd5bf92..2cc0cacd 100644 --- a/app/Http/Controllers/Api/BaseApiController.php +++ b/app/Http/Controllers/Api/BaseApiController.php @@ -309,9 +309,13 @@ class BaseApiController extends Controller public function verifyCredentials(Request $request) { - $profile = Auth::user()->profile; - $resource = new Fractal\Resource\Item($profile, new AccountTransformer()); - $res = $this->fractal->createData($resource)->toArray(); + $id = Auth::id(); + + $res = Cache::remember('user:account:id:'.$id, now()->addHours(6), function() use($id) { + $profile = Profile::whereNull('status')->whereUserId($id)->firstOrFail(); + $resource = new Fractal\Resource\Item($profile, new AccountTransformer()); + return $this->fractal->createData($resource)->toArray(); + }); return response()->json($res); } diff --git a/app/Http/Controllers/AvatarController.php b/app/Http/Controllers/AvatarController.php index 49a3515f..ef63afa1 100644 --- a/app/Http/Controllers/AvatarController.php +++ b/app/Http/Controllers/AvatarController.php @@ -41,6 +41,7 @@ class AvatarController extends Controller $avatar->save(); Cache::forget("avatar:{$profile->id}"); + Cache::forget('user:account:id:'.$user->id); AvatarOptimize::dispatch($user->profile, $currentAvatar); } catch (Exception $e) { } diff --git a/app/Http/Controllers/FollowerController.php b/app/Http/Controllers/FollowerController.php index f8cec93b..c6d4f9a3 100644 --- a/app/Http/Controllers/FollowerController.php +++ b/app/Http/Controllers/FollowerController.php @@ -76,5 +76,7 @@ class FollowerController extends Controller Cache::forget('profile:following:'.$user->id); Cache::forget('profile:followers:'.$user->id); Cache::forget('api:local:exp:rec:'.$user->id); + Cache::forget('user:account:id:'.$target->user_id); + Cache::forget('user:account:id:'.$user->user_id); } } diff --git a/app/Http/Controllers/InternalApiController.php b/app/Http/Controllers/InternalApiController.php index e66b61db..8f728acc 100644 --- a/app/Http/Controllers/InternalApiController.php +++ b/app/Http/Controllers/InternalApiController.php @@ -400,7 +400,7 @@ class InternalApiController extends Controller $status->save(); NewStatusPipeline::dispatch($status); - + Cache::forget('user:account:id:'.$profile->user_id); return $status->url(); } } diff --git a/app/Http/Controllers/Settings/HomeSettings.php b/app/Http/Controllers/Settings/HomeSettings.php index 9b4656ba..a996a854 100644 --- a/app/Http/Controllers/Settings/HomeSettings.php +++ b/app/Http/Controllers/Settings/HomeSettings.php @@ -10,6 +10,7 @@ use App\User; use App\UserFilter; use App\Util\Lexer\PrettyNumber; use Auth; +use Cache; use DB; use Purify; use Illuminate\Http\Request; @@ -101,6 +102,7 @@ trait HomeSettings } if ($changes === true) { + Cache::forget('user:account:id:'.$user->id); $user->save(); $profile->save();