diff --git a/app/Http/Controllers/BookmarkController.php b/app/Http/Controllers/BookmarkController.php index d1d793dd2..14b1d9e3f 100644 --- a/app/Http/Controllers/BookmarkController.php +++ b/app/Http/Controllers/BookmarkController.php @@ -3,12 +3,12 @@ namespace App\Http\Controllers; use App\Bookmark; -use App\Status; -use Auth; -use Illuminate\Http\Request; +use App\Services\AccountService; use App\Services\BookmarkService; use App\Services\FollowerService; use App\Services\UserRoleService; +use App\Status; +use Illuminate\Http\Request; class BookmarkController extends Controller { @@ -25,15 +25,16 @@ class BookmarkController extends Controller $user = $request->user(); $status = Status::findOrFail($request->input('item')); - - abort_if($user->has_roles && !UserRoleService::can('can-bookmark', $user->id), 403, 'Invalid permissions for this action'); + $account = AccountService::get($status->profile_id); + abort_if(isset($account['moved'], $account['moved']['id']), 422, 'Cannot bookmark or unbookmark a post from an account that has migrated'); + abort_if($user->has_roles && ! UserRoleService::can('can-bookmark', $user->id), 403, 'Invalid permissions for this action'); abort_if($status->in_reply_to_id || $status->reblog_of_id, 404); - abort_if(!in_array($status->scope, ['public', 'unlisted', 'private']), 404); - abort_if(!in_array($status->type, ['photo','photo:album', 'video', 'video:album', 'photo:video:album']), 404); + abort_if(! in_array($status->scope, ['public', 'unlisted', 'private']), 404); + abort_if(! in_array($status->type, ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']), 404); - if($status->scope == 'private') { - if($user->profile_id !== $status->profile_id && !FollowerService::follows($user->profile_id, $status->profile_id)) { - if($exists = Bookmark::whereStatusId($status->id)->whereProfileId($user->profile_id)->first()) { + if ($status->scope == 'private') { + if ($user->profile_id !== $status->profile_id && ! FollowerService::follows($user->profile_id, $status->profile_id)) { + if ($exists = Bookmark::whereStatusId($status->id)->whereProfileId($user->profile_id)->first()) { BookmarkService::del($user->profile_id, $status->id); $exists->delete(); @@ -51,7 +52,7 @@ class BookmarkController extends Controller ['status_id' => $status->id], ['profile_id' => $user->profile_id] ); - if (!$bookmark->wasRecentlyCreated) { + if (! $bookmark->wasRecentlyCreated) { BookmarkService::del($user->profile_id, $status->id); $bookmark->delete(); } else {