refactor: replace short facade aliases with fully-qualified imports

Convert all 273 short facade alias imports (e.g. 'use Cache;') to their fully-qualified class names (e.g. 'use Illuminate\Support\Facades\Cache;') across 193 files. This resolves 643 PHPStan 'class.notFound' errors caused by the static analyzer being unable to resolve global aliases, and aligns with modern Laravel conventions. It also unblocks removing the aliases array from config/app.php in a future change. All 107 tests pass.
4 weeks ago · c807a8524c
parent 443f29acc9
commit c807a8524c
194 changed files with 449 additions and 428 deletions
--- a/app/Console/Commands/AvatarDefaultMigration.php
+++ b/app/Console/Commands/AvatarDefaultMigration.php
@ -3,9 +3,9 @@
 namespace App\Console\Commands;

 use App\Avatar;
-use Cache;
-use DB;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;

 class AvatarDefaultMigration extends Command
--- a/app/Console/Commands/AvatarStorage.php
+++ b/app/Console/Commands/AvatarStorage.php
@ -7,10 +7,10 @@ use App\Jobs\AvatarPipeline\RemoteAvatarFetch;
 use App\Profile;
 use App\Services\AccountService;
 use App\Util\Lexer\PrettyNumber;
-use Cache;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use Storage;

 class AvatarStorage extends Command
 {
--- a/app/Console/Commands/AvatarStorageDeepClean.php
+++ b/app/Console/Commands/AvatarStorageDeepClean.php
@ -4,9 +4,9 @@ namespace App\Console\Commands;

 use App\Avatar;
 use App\Jobs\AvatarPipeline\AvatarStorageCleanup;
-use Cache;
 use Illuminate\Console\Command;
-use Storage;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;

 class AvatarStorageDeepClean extends Command
 {
--- a/app/Console/Commands/FixDuplicateProfiles.php
+++ b/app/Console/Commands/FixDuplicateProfiles.php
@ -28,9 +28,9 @@ use App\Story;
 use App\StoryView;
 use App\User;
 use App\UserFilter;
-use Cache;
-use DB;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;

 class FixDuplicateProfiles extends Command
 {
@ -239,7 +239,7 @@ class FixDuplicateProfiles extends Command
    protected function checkUserFilter($id, $oid)
    {
        UserFilter::whereUserId($oid)->update(['user_id' => $id]);
-        UserFilter::whereFilterableType(\App\Profile::class)->whereFilterableId($oid)->update(['filterable_id' => $id]);
+        UserFilter::whereFilterableType(Profile::class)->whereFilterableId($oid)->update(['filterable_id' => $id]);
    }

    protected function checkUserPronoun($id, $oid)
--- a/app/Console/Commands/FixMissingUserProfile.php
+++ b/app/Console/Commands/FixMissingUserProfile.php
@ -10,8 +10,8 @@ use App\Models\UserDomainBlock;
 use App\Profile;
 use App\User;
 use App\UserSetting;
-use DB;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;

 use function Laravel\Prompts\search;

--- a/app/Console/Commands/FixUsernames.php
+++ b/app/Console/Commands/FixUsernames.php
@ -5,8 +5,8 @@ namespace App\Console\Commands;
 use App\Profile;
 use App\User;
 use App\Util\Lexer\RestrictedNames;
-use DB;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;

 class FixUsernames extends Command
--- a/app/Console/Commands/GenerateInstanceActor.php
+++ b/app/Console/Commands/GenerateInstanceActor.php
@ -3,8 +3,8 @@
 namespace App\Console\Commands;

 use App\Models\InstanceActor;
-use Cache;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Schema;

 class GenerateInstanceActor extends Command
--- a/app/Console/Commands/HashtagCachedCountUpdate.php
+++ b/app/Console/Commands/HashtagCachedCountUpdate.php
@ -3,8 +3,8 @@
 namespace App\Console\Commands;

 use App\Hashtag;
-use DB;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;

 class HashtagCachedCountUpdate extends Command
 {
--- a/app/Console/Commands/ImportCities.php
+++ b/app/Console/Commands/ImportCities.php
@ -3,9 +3,10 @@
 namespace App\Console\Commands;

 use App\Place;
-use DB;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
+use League\ISO3166\ISO3166;

 class ImportCities extends Command
 {
@ -153,7 +154,7 @@ class ImportCities extends Command
            return $countries[$code];
        }

-        $country = (new \League\ISO3166\ISO3166)->alpha2($code);
+        $country = (new ISO3166)->alpha2($code);
        $this->countries[$code] = $country['name'];

        return $this->countries[$code];
--- a/app/Console/Commands/ImportUploadCleanStorage.php
+++ b/app/Console/Commands/ImportUploadCleanStorage.php
@ -4,7 +4,7 @@ namespace App\Console\Commands;

 use App\User;
 use Illuminate\Console\Command;
-use Storage;
+use Illuminate\Support\Facades\Storage;

 class ImportUploadCleanStorage extends Command
 {
--- a/app/Console/Commands/InstanceUpdateTotalLocalPosts.php
+++ b/app/Console/Commands/InstanceUpdateTotalLocalPosts.php
@ -3,10 +3,10 @@
 namespace App\Console\Commands;

 use App\Services\ConfigCacheService;
-use Cache;
-use DB;
 use Illuminate\Console\Command;
-use Storage;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;

 class InstanceUpdateTotalLocalPosts extends Command
 {
--- a/app/Console/Commands/MediaCloudUrlRewrite.php
+++ b/app/Console/Commands/MediaCloudUrlRewrite.php
@ -6,7 +6,7 @@ use App\Avatar;
 use App\Media;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\PromptsForMissingInput;
-use Storage;
+use Illuminate\Support\Facades\Storage;

 use function Laravel\Prompts\select;

--- a/app/Console/Commands/RegenerateThumbnails.php
+++ b/app/Console/Commands/RegenerateThumbnails.php
@ -2,9 +2,10 @@

 namespace App\Console\Commands;

+use App\Jobs\ImageOptimizePipeline\ImageThumbnail;
 use App\Media;
-use DB;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;

 class RegenerateThumbnails extends Command
 {
@ -43,7 +44,7 @@ class RegenerateThumbnails extends Command
            Media::whereIn('mime', ['image/jpeg', 'image/png', 'image/jpg'])
                ->chunk(50, function ($medias) {
                    foreach ($medias as $media) {
-                        \App\Jobs\ImageOptimizePipeline\ImageThumbnail::dispatch($media);
+                        ImageThumbnail::dispatch($media);
                    }
                });
        });
--- a/app/Console/Commands/SendUpdateActor.php
+++ b/app/Console/Commands/SendUpdateActor.php
@ -7,7 +7,7 @@ use App\Profile;
 use App\User;
 use App\Util\ActivityPub\Helpers;
 use Illuminate\Console\Command;
-use Storage;
+use Illuminate\Support\Facades\Storage;
 use Symfony\Component\HttpKernel\Exception\HttpException;

 class SendUpdateActor extends Command
--- a/app/Console/Commands/SoftwareUpdateRefresh.php
+++ b/app/Console/Commands/SoftwareUpdateRefresh.php
@ -3,8 +3,8 @@
 namespace App\Console\Commands;

 use App\Services\Internal\SoftwareUpdateService;
-use Cache;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;

 class SoftwareUpdateRefresh extends Command
 {
--- a/app/Console/Commands/StatusDedupe.php
+++ b/app/Console/Commands/StatusDedupe.php
@ -4,8 +4,8 @@ namespace App\Console\Commands;

 use App\Jobs\StatusPipeline\StatusDelete;
 use App\Status;
-use DB;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;

 class StatusDedupe extends Command
 {
--- a/app/Console/Commands/TransformImports.php
+++ b/app/Console/Commands/TransformImports.php
@ -12,8 +12,8 @@ use App\Status;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use Storage;

 class TransformImports extends Command
 {
--- a/app/DirectMessage.php
+++ b/app/DirectMessage.php
@ -2,8 +2,8 @@

 namespace App;

-use Auth;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;

 class DirectMessage extends Model
 {
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@ -19,15 +19,15 @@ use App\Services\UserFilterService;
 use App\Transformer\Api\Mastodon\v1\AccountTransformer;
 use App\User;
 use App\UserFilter;
-use Auth;
-use Cache;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use Mail;
 use PragmaRX\Google2FA\Google2FA;

 class AccountController extends Controller
--- a/app/Http/Controllers/Admin/AdminAutospamController.php
+++ b/app/Http/Controllers/Admin/AdminAutospamController.php
@ -12,9 +12,10 @@ use App\Profile;
 use App\Services\AccountService;
 use App\Services\AutospamService;
 use App\Services\ConfigCacheService;
-use Cache;
-use DB;
+use App\Status;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;

 trait AdminAutospamController
@ -114,7 +115,7 @@ trait AdminAutospamController

    public function postAutospamTrainSpamApi(Request $request)
    {
-        $aiCount = AccountInterstitial::whereItemType(\App\Status::class)
+        $aiCount = AccountInterstitial::whereItemType(Status::class)
            ->whereIsSpam(true)
            ->count();
        abort_if($aiCount < 100, 422, 'You don\'t have enough data to pre-train against.');
--- a/app/Http/Controllers/Admin/AdminDirectoryController.php
+++ b/app/Http/Controllers/Admin/AdminDirectoryController.php
@ -9,8 +9,8 @@ use App\Services\ConfigCacheService;
 use App\Services\StatusService;
 use App\Status;
 use App\User;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
--- a/app/Http/Controllers/Admin/AdminGroupsController.php
+++ b/app/Http/Controllers/Admin/AdminGroupsController.php
@ -8,8 +8,8 @@ use App\Models\GroupInteraction;
 use App\Models\GroupMember;
 use App\Models\GroupPost;
 use App\Models\GroupReport;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;

 trait AdminGroupsController
 {
--- a/app/Http/Controllers/Admin/AdminInstanceController.php
+++ b/app/Http/Controllers/Admin/AdminInstanceController.php
@ -7,8 +7,8 @@ use App\Http\Resources\AdminProfile;
 use App\Instance;
 use App\Profile;
 use App\Services\InstanceService;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Validation\Rule;

 trait AdminInstanceController
--- a/app/Http/Controllers/Admin/AdminReportController.php
+++ b/app/Http/Controllers/Admin/AdminReportController.php
@ -27,12 +27,12 @@ use App\Status;
 use App\Story;
 use App\User;
 use App\Util\ActivityPub\Helpers;
-use Cache;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redis;
-use Storage;
+use Illuminate\Support\Facades\Storage;

 trait AdminReportController
 {
@ -230,7 +230,7 @@ trait AdminReportController

        AccountInterstitial::chunk(500, function ($reports) {
            foreach ($reports as $report) {
-                if ($report->item_type != \App\Status::class) {
+                if ($report->item_type != Status::class) {
                    continue;
                }

@ -326,7 +326,7 @@ trait AdminReportController

        if ($action == 'dismiss-all') {
            AccountInterstitial::whereType('post.autospam')
-                ->whereItemType(\App\Status::class)
+                ->whereItemType(Status::class)
                ->whereNull('appeal_handled_at')
                ->whereUserId($appeal->user_id)
                ->update(['appeal_handled_at' => $now, 'is_spam' => true]);
@ -339,7 +339,7 @@ trait AdminReportController

        if ($action == 'approve-all') {
            AccountInterstitial::whereType('post.autospam')
-                ->whereItemType(\App\Status::class)
+                ->whereItemType(Status::class)
                ->whereNull('appeal_handled_at')
                ->whereUserId($appeal->user_id)
                ->get()
@ -365,7 +365,7 @@ trait AdminReportController

        if ($action == 'mark-spammer') {
            AccountInterstitial::whereType('post.autospam')
-                ->whereItemType(\App\Status::class)
+                ->whereItemType(Status::class)
                ->whereNull('appeal_handled_at')
                ->whereUserId($appeal->user_id)
                ->update(['appeal_handled_at' => $now, 'is_spam' => true]);
@ -777,7 +777,7 @@ trait AdminReportController
                    ->save();

                Report::where('reported_profile_id', $profile->id)
-                    ->whereObjectType(\App\Story::class)
+                    ->whereObjectType(Story::class)
                    ->whereNull('admin_seen')
                    ->update([
                        'admin_seen' => now(),
@ -803,9 +803,9 @@ trait AdminReportController
                return [200];

            case 'nsfw':
-                if ($report->object_type === \App\Profile::class) {
+                if ($report->object_type === Profile::class) {
                    $profile = Profile::find($report->object_id);
-                } elseif ($report->object_type === \App\Status::class) {
+                } elseif ($report->object_type === Status::class) {
                    $status = Status::find($report->object_id);
                    if (! $status) {
                        return [200];
@ -862,9 +862,9 @@ trait AdminReportController
                return [200];

            case 'unlist':
-                if ($report->object_type === \App\Profile::class) {
+                if ($report->object_type === Profile::class) {
                    $profile = Profile::find($report->object_id);
-                } elseif ($report->object_type === \App\Status::class) {
+                } elseif ($report->object_type === Status::class) {
                    $status = Status::find($report->object_id);
                    if (! $status) {
                        return [200];
@ -921,9 +921,9 @@ trait AdminReportController
                return [200];

            case 'private':
-                if ($report->object_type === \App\Profile::class) {
+                if ($report->object_type === Profile::class) {
                    $profile = Profile::find($report->object_id);
-                } elseif ($report->object_type === \App\Status::class) {
+                } elseif ($report->object_type === Status::class) {
                    $status = Status::find($report->object_id);
                    if (! $status) {
                        return [200];
@ -984,9 +984,9 @@ trait AdminReportController
                    abort(404);
                }

-                if ($report->object_type === \App\Profile::class) {
+                if ($report->object_type === Profile::class) {
                    $profile = Profile::find($report->object_id);
-                } elseif ($report->object_type === \App\Status::class) {
+                } elseif ($report->object_type === Status::class) {
                    $status = Status::find($report->object_id);
                    if (! $status) {
                        return [200];
@ -1297,7 +1297,7 @@ trait AdminReportController

        if ($action == 'mark-all-read') {
            AccountInterstitial::whereType('post.autospam')
-                ->whereItemType(\App\Status::class)
+                ->whereItemType(Status::class)
                ->whereNull('appeal_handled_at')
                ->whereUserId($appeal->user_id)
                ->update([
@ -1308,7 +1308,7 @@ trait AdminReportController

        if ($action == 'mark-all-not-spam') {
            AccountInterstitial::whereType('post.autospam')
-                ->whereItemType(\App\Status::class)
+                ->whereItemType(Status::class)
                ->whereUserId($appeal->user_id)
                ->get()
                ->each(function ($report) use ($meta) {
--- a/app/Http/Controllers/Admin/AdminSettingsController.php
+++ b/app/Http/Controllers/Admin/AdminSettingsController.php
@ -12,10 +12,10 @@ use App\Services\ConfigCacheService;
 use App\Services\FilesystemService;
 use App\User;
 use App\Util\Site\Config;
-use Artisan;
-use Cache;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;

 trait AdminSettingsController
 {
--- a/app/Http/Controllers/Admin/AdminUserController.php
+++ b/app/Http/Controllers/Admin/AdminUserController.php
@ -9,8 +9,8 @@ use App\Profile;
 use App\Services\AccountService;
 use App\Services\ModLogService;
 use App\User;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Mail;

 trait AdminUserController
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@ -27,13 +27,13 @@ use App\Services\StoryService;
 use App\Status;
 use App\Story;
 use App\User;
-use Cache;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
-use Mail;
-use Storage;

 class AdminController extends Controller
 {
--- a/app/Http/Controllers/Api/AdminApiController.php
+++ b/app/Http/Controllers/Api/AdminApiController.php
@ -27,9 +27,9 @@ use App\Services\SnowflakeService;
 use App\Services\StatusService;
 use App\Status;
 use App\User;
-use Cache;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;

 class AdminApiController extends Controller
 {
@ -77,7 +77,7 @@ class AdminApiController extends Controller
                    'item_type' => $report->item_type,
                    'created_at' => $report->created_at,
                ];
-                if ($report->item_type === \App\Status::class) {
+                if ($report->item_type === Status::class) {
                    $status = StatusService::get($report->item_id, false);
                    if (! $status) {
                        return;
@ -172,7 +172,7 @@ class AdminApiController extends Controller

        if ($action == 'dismiss-all') {
            AccountInterstitial::whereType('post.autospam')
-                ->whereItemType(\App\Status::class)
+                ->whereItemType(Status::class)
                ->whereNull('appeal_handled_at')
                ->whereUserId($appeal->user_id)
                ->update(['appeal_handled_at' => $now, 'is_spam' => true]);
@ -213,7 +213,7 @@ class AdminApiController extends Controller

        if ($action == 'approve-all') {
            AccountInterstitial::whereType('post.autospam')
-                ->whereItemType(\App\Status::class)
+                ->whereItemType(Status::class)
                ->whereNull('appeal_handled_at')
                ->whereUserId($appeal->user_id)
                ->get()
@ -272,7 +272,7 @@ class AdminApiController extends Controller
                    $r['reported_by_account'] = AccountService::get($report->profile_id, true);
                }

-                if ($report->object_type === \App\Status::class) {
+                if ($report->object_type === Status::class) {
                    $status = StatusService::get($report->object_id, false);
                    if (! $status) {
                        return;
@ -285,7 +285,7 @@ class AdminApiController extends Controller
                    }
                }

-                if ($report->object_type === \App\Profile::class) {
+                if ($report->object_type === Profile::class) {
                    $acct = AccountService::get($report->object_id, true);
                    if ($acct) {
                        $r['account'] = $acct;
--- a/app/Http/Controllers/Api/ApiV1Controller.php
+++ b/app/Http/Controllers/Api/ApiV1Controller.php
@ -80,16 +80,16 @@ use App\Util\Lexer\PrettyNumber;
 use App\Util\Localization\Localization;
 use App\Util\Media\Filter;
 use App\Util\Media\License;
-use Cache;
 use Carbon\Carbon;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Laravel\Passport\Client;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use Storage;

 class ApiV1Controller extends Controller
 {
--- a/app/Http/Controllers/Api/ApiV1Dot1Controller.php
+++ b/app/Http/Controllers/Api/ApiV1Dot1Controller.php
@ -44,15 +44,15 @@ use App\Transformer\Api\AccountTransformer;
 use App\User;
 use App\UserSetting;
 use App\Util\Lexer\RestrictedNames;
-use Cache;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Str;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use Mail;

 class ApiV1Dot1Controller extends Controller
 {
--- a/app/Http/Controllers/Api/BaseApiController.php
+++ b/app/Http/Controllers/Api/BaseApiController.php
@ -13,9 +13,9 @@ use App\Services\StatusService;
 use App\Status;
 use App\StatusArchived;
 use App\Transformer\Api\StatusStatelessTransformer;
-use Auth;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;

--- a/app/Http/Controllers/AvatarController.php
+++ b/app/Http/Controllers/AvatarController.php
@ -4,9 +4,9 @@ namespace App\Http\Controllers;

 use App\Avatar;
 use App\Jobs\AvatarPipeline\AvatarOptimize;
-use Auth;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;

 class AvatarController extends Controller
--- a/app/Http/Controllers/CircleController.php
+++ b/app/Http/Controllers/CircleController.php
@ -3,8 +3,8 @@
 namespace App\Http\Controllers;

 use App\Circle;
-use Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Validation\Rule;

 class CircleController extends Controller
--- a/app/Http/Controllers/CollectionController.php
+++ b/app/Http/Controllers/CollectionController.php
@ -9,8 +9,8 @@ use App\Services\CollectionService;
 use App\Services\FollowerService;
 use App\Services\StatusService;
 use App\Status;
-use Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;

 class CollectionController extends Controller
 {
@ -155,7 +155,7 @@ class CollectionController extends Controller

        $item = CollectionItem::firstOrCreate([
            'collection_id' => $collection->id,
-            'object_type' => \App\Status::class,
+            'object_type' => Status::class,
            'object_id' => $status->id,
        ], [
            'order' => $count,
@ -294,7 +294,7 @@ class CollectionController extends Controller
            ->findOrFail($postId);

        $item = CollectionItem::whereCollectionId($collection->id)
-            ->whereObjectType(\App\Status::class)
+            ->whereObjectType(Status::class)
            ->whereObjectId($status->id)
            ->firstOrFail();

--- a/app/Http/Controllers/CommentController.php
+++ b/app/Http/Controllers/CommentController.php
@ -4,13 +4,14 @@ namespace App\Http\Controllers;

 use App\Jobs\CommentPipeline\CommentPipeline;
 use App\Jobs\StatusPipeline\NewStatusPipeline;
+use App\Profile;
 use App\Services\StatusService;
 use App\Status;
 use App\Transformer\Api\StatusTransformer;
 use App\UserFilter;
-use Auth;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
 use Purify;
@ -29,7 +30,7 @@ class CommentController extends Controller
        }
        $this->validate($request, [
            'item' => 'required|integer|min:1',
-            'comment' => 'required|string|max:' . config_cache('pixelfed.max_caption_length'),
+            'comment' => 'required|string|max:'.config_cache('pixelfed.max_caption_length'),
            'sensitive' => 'nullable|boolean',
        ]);
        $comment = $request->input('comment');
@ -48,7 +49,7 @@ class CommentController extends Controller
        }

        $filtered = UserFilter::whereUserId($status->profile_id)
-            ->whereFilterableType(\App\Profile::class)
+            ->whereFilterableType(Profile::class)
            ->whereIn('filter_type', ['block'])
            ->whereFilterableId($profile->id)
            ->exists();
--- a/app/Http/Controllers/ComposeController.php
+++ b/app/Http/Controllers/ComposeController.php
@ -28,10 +28,10 @@ use App\Transformer\Api\MediaTransformer;
 use App\UserFilter;
 use App\Util\Media\Filter;
 use App\Util\Media\License;
-use Auth;
-use Cache;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
@ -260,7 +260,7 @@ class ComposeController extends Controller

        abort_if($user->has_roles && ! UserRoleService::can('can-post', $user->id), 403, 'Invalid permissions for this action');

-        $blocked = UserFilter::whereFilterableType(\App\Profile::class)
+        $blocked = UserFilter::whereFilterableType(Profile::class)
            ->whereFilterType('block')
            ->whereFilterableId($request->user()->profile_id)
            ->pluck('user_id');
@ -326,7 +326,7 @@ class ComposeController extends Controller
        if (! $tag) {
            return [];
        }
-        Notification::whereItemType(\App\MediaTag::class)
+        Notification::whereItemType(MediaTag::class)
            ->whereItemId($tag->id)
            ->whereProfileId($profile_id)
            ->whereAction('tagged')
@ -440,7 +440,7 @@ class ComposeController extends Controller
            return [];
        }

-        $blocked = UserFilter::whereFilterableType(\App\Profile::class)
+        $blocked = UserFilter::whereFilterableType(Profile::class)
            ->whereFilterType('block')
            ->whereFilterableId($request->user()->profile_id)
            ->pluck('user_id')
@ -662,7 +662,7 @@ class ComposeController extends Controller
                    $count = $collection->items()->count();
                    CollectionItem::firstOrCreate([
                        'collection_id' => $collection->id,
-                        'object_type' => \App\Status::class,
+                        'object_type' => Status::class,
                        'object_id' => $status->id,
                    ], [
                        'order' => $count,
--- a/app/Http/Controllers/ContactController.php
+++ b/app/Http/Controllers/ContactController.php
@ -5,8 +5,8 @@ namespace App\Http\Controllers;
 use App\Contact;
 use App\Jobs\ContactPipeline\ContactPipeline;
 use App\Rules\MaxMultiLine;
-use Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;

 class ContactController extends Controller
 {
--- a/app/Http/Controllers/DiscoverController.php
+++ b/app/Http/Controllers/DiscoverController.php
@ -20,10 +20,10 @@ use App\Services\StatusService;
 use App\Services\TrendingHashtagService;
 use App\Services\UserFilterService;
 use App\Status;
-use Auth;
-use Cache;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;

 class DiscoverController extends Controller
 {
--- a/app/Http/Controllers/FederationController.php
+++ b/app/Http/Controllers/FederationController.php
@ -12,8 +12,8 @@ use App\Status;
 use App\Util\Lexer\Nickname;
 use App\Util\Site\Nodeinfo;
 use App\Util\Webfinger\Webfinger;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;

 class FederationController extends Controller
 {
--- a/app/Http/Controllers/GroupController.php
+++ b/app/Http/Controllers/GroupController.php
@ -20,8 +20,8 @@ use App\Services\StatusService;
 use App\Status;
 use App\User;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use Storage;

 class GroupController extends GroupFederationController
 {
--- a/app/Http/Controllers/HashtagFollowController.php
+++ b/app/Http/Controllers/HashtagFollowController.php
@ -5,8 +5,8 @@ namespace App\Http\Controllers;
 use App\Hashtag;
 use App\HashtagFollow;
 use App\Services\HashtagService;
-use Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;

 class HashtagFollowController extends Controller
 {
--- a/app/Http/Controllers/Import/Instagram.php
+++ b/app/Http/Controllers/Import/Instagram.php
@ -5,9 +5,9 @@ namespace App\Http\Controllers\Import;
 use App\ImportData;
 use App\ImportJob;
 use App\Jobs\ImportPipeline\ImportInstagram;
-use Auth;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;

 trait Instagram
--- a/app/Http/Controllers/InstanceActorController.php
+++ b/app/Http/Controllers/InstanceActorController.php
@ -3,7 +3,7 @@
 namespace App\Http\Controllers;

 use App\Models\InstanceActor;
-use Cache;
+use Illuminate\Support\Facades\Cache;

 class InstanceActorController extends Controller
 {
--- a/app/Http/Controllers/InternalApiController.php
+++ b/app/Http/Controllers/InternalApiController.php
@ -19,9 +19,9 @@ use App\Services\UserFilterService;
 use App\Status; // StatusMediaContainerTransformer,
 use App\Transformer\Api\StatusTransformer;
 use App\User;
-use Auth;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Validation\Rule;
 use League\Fractal;
@ -107,6 +107,7 @@ class InternalApiController extends Controller
                    return $user && ($s->profile_id === $user->profile_id
                        || FollowerService::follows($user->profile_id, $s->profile_id));
                }
+
                return false;
            })->take($limit);
        $resource = new Fractal\Resource\Collection($children, new StatusTransformer);
@ -184,7 +185,7 @@ class InternalApiController extends Controller
                    $ai->user_id = $status->profile->user_id;
                    $ai->type = 'post.cw';
                    $ai->view = 'account.moderation.post.cw';
-                    $ai->item_type = \App\Status::class;
+                    $ai->item_type = Status::class;
                    $ai->item_id = $status->id;
                    $ai->has_media = (bool) $media->count();
                    $ai->blurhash = $media->count() ? $media->first()->blurhash : null;
@ -226,7 +227,7 @@ class InternalApiController extends Controller
                    $ai = AccountInterstitial::whereUserId($status->profile->user_id)
                        ->whereType('post.cw')
                        ->whereItemId($status->id)
-                        ->whereItemType(\App\Status::class)
+                        ->whereItemType(Status::class)
                        ->first();
                    $ai->delete();
                }
@ -255,7 +256,7 @@ class InternalApiController extends Controller
                    $ai->user_id = $status->profile->user_id;
                    $ai->type = 'post.unlist';
                    $ai->view = 'account.moderation.post.unlist';
-                    $ai->item_type = \App\Status::class;
+                    $ai->item_type = Status::class;
                    $ai->item_id = $status->id;
                    $ai->has_media = (bool) $media->count();
                    $ai->blurhash = $media->count() ? $media->first()->blurhash : null;
@ -338,9 +339,9 @@ class InternalApiController extends Controller
            'only_media' => 'nullable',
            'pinned' => 'nullable',
            'exclude_replies' => 'nullable',
-            'max_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-            'since_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-            'min_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
+            'max_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'since_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'min_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
            'limit' => 'nullable|integer|min:1|max:24',
        ]);

@ -358,7 +359,7 @@ class InternalApiController extends Controller
                return response()->json([]);
            }
            $pid = Auth::user()->profile->id;
-            $following = Cache::remember('profile:following:' . $pid, now()->addMinutes(1440), function () use ($pid) {
+            $following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function () use ($pid) {
                $following = Follower::whereProfileId($pid)->pluck('following_id');

                return $following->push($pid)->toArray();
@ -367,7 +368,7 @@ class InternalApiController extends Controller
        } else {
            if (Auth::check()) {
                $pid = Auth::user()->profile->id;
-                $following = Cache::remember('profile:following:' . $pid, now()->addMinutes(1440), function () use ($pid) {
+                $following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function () use ($pid) {
                    $following = Follower::whereProfileId($pid)->pluck('following_id');

                    return $following->push($pid)->toArray();
@ -411,12 +412,12 @@ class InternalApiController extends Controller

    public function remoteProfile(Request $request, $id)
    {
-        return redirect('/i/web/profile/' . $id);
+        return redirect('/i/web/profile/'.$id);
    }

    public function remoteStatus(Request $request, $profileId, $statusId)
    {
-        return redirect('/i/web/post/' . $statusId);
+        return redirect('/i/web/post/'.$statusId);
    }

    public function requestEmailVerification(Request $request)
--- a/app/Http/Controllers/LikeController.php
+++ b/app/Http/Controllers/LikeController.php
@ -7,9 +7,9 @@ use App\Jobs\LikePipeline\UnlikePipeline;
 use App\Like;
 use App\Services\StatusService;
 use App\Status;
-use Auth;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;

 class LikeController extends Controller
 {
--- a/app/Http/Controllers/MicroController.php
+++ b/app/Http/Controllers/MicroController.php
@ -3,10 +3,14 @@
 namespace App\Http\Controllers;

 use App\Status;
-use Auth;
-use DB;
+use App\Transformer\Api\StatusTransformer;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\Rule;
+use League\Fractal\Manager;
+use League\Fractal\Resource\Item;
+use League\Fractal\Serializer\ArraySerializer;

 class MicroController extends Controller
 {
@ -57,9 +61,9 @@ class MicroController extends Controller
            return $status;
        });

-        $fractal = new \League\Fractal\Manager;
-        $fractal->setSerializer(new \League\Fractal\Serializer\ArraySerializer);
-        $s = new \League\Fractal\Resource\Item($status, new \App\Transformer\Api\StatusTransformer);
+        $fractal = new Manager;
+        $fractal->setSerializer(new ArraySerializer);
+        $s = new Item($status, new StatusTransformer);

        return $fractal->createData($s)->toArray();
    }
--- a/app/Http/Controllers/MobileController.php
+++ b/app/Http/Controllers/MobileController.php
@ -3,9 +3,9 @@
 namespace App\Http\Controllers;

 use App\Page;
-use Cache;
 use Illuminate\Http\Request;
-use View;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\View;

 class MobileController extends Controller
 {
--- a/app/Http/Controllers/NewsroomController.php
+++ b/app/Http/Controllers/NewsroomController.php
@ -3,8 +3,8 @@
 namespace App\Http\Controllers;

 use App\Newsroom;
-use Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Str;

--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@ -4,9 +4,9 @@ namespace App\Http\Controllers;

 use App\Page;
 use App\Services\ConfigCacheService;
-use Auth;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;

 class PageController extends Controller
 {
--- a/app/Http/Controllers/PixelfedDirectoryController.php
+++ b/app/Http/Controllers/PixelfedDirectoryController.php
@ -7,10 +7,10 @@ use App\Services\AccountService;
 use App\Services\InstanceService;
 use App\Services\StatusService;
 use App\User;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use Storage;

 class PixelfedDirectoryController extends Controller
 {
--- a/app/Http/Controllers/PortfolioController.php
+++ b/app/Http/Controllers/PortfolioController.php
@ -7,9 +7,9 @@ use App\Services\AccountService;
 use App\Services\StatusService;
 use App\Status;
 use App\User;
-use Cache;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;

 class PortfolioController extends Controller
 {
--- a/app/Http/Controllers/ProfileAliasController.php
+++ b/app/Http/Controllers/ProfileAliasController.php
@ -7,8 +7,8 @@ use App\Models\ProfileMigration;
 use App\Services\AccountService;
 use App\Services\WebfingerService;
 use App\Util\Lexer\Nickname;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;

 class ProfileAliasController extends Controller
 {
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@ -15,11 +15,11 @@ use App\Transformer\ActivityPub\ProfileTransformer;
 use App\User;
 use App\UserFilter;
 use App\UserSetting;
-use Auth;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\View;
 use League\Fractal;
-use View;

 class ProfileController extends Controller
 {
@ -224,7 +224,7 @@ class ProfileController extends Controller
        $pid = Auth::user()->profile->id;
        $blocks = UserFilter::whereUserId($profile->id)
            ->whereFilterType('block')
-            ->whereFilterableType(\App\Profile::class)
+            ->whereFilterableType(Profile::class)
            ->pluck('filterable_id')
            ->toArray();
        if (in_array($pid, $blocks)) {
--- a/app/Http/Controllers/ProfileMigrationController.php
+++ b/app/Http/Controllers/ProfileMigrationController.php
@ -10,9 +10,9 @@ use App\Models\ProfileMigration;
 use App\Services\AccountService;
 use App\Services\WebfingerService;
 use App\Util\ActivityPub\Helpers;
-use Cache;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Cache;

 class ProfileMigrationController extends Controller
 {
--- a/app/Http/Controllers/ProfileSponsorController.php
+++ b/app/Http/Controllers/ProfileSponsorController.php
@ -2,16 +2,16 @@

 namespace App\Http\Controllers;

-use Illuminate\Http\Request;
 use App\ProfileSponsor;
-use Auth;
+use Illuminate\Http\Request;

 class ProfileSponsorController extends Controller
 {
-	public function get(Request $request, $id)
-	{
-		$profile = ProfileSponsor::whereProfileId($id)->first();
-		$res = $profile ? $profile->sponsors : [];
-		return response()->json($res);
-	}
+    public function get(Request $request, $id)
+    {
+        $profile = ProfileSponsor::whereProfileId($id)->first();
+        $res = $profile ? $profile->sponsors : [];
+
+        return response()->json($res);
+    }
 }
--- a/app/Http/Controllers/PublicApiController.php
+++ b/app/Http/Controllers/PublicApiController.php
@ -18,9 +18,9 @@ use App\Services\StatusService;
 use App\Services\UserFilterService;
 use App\Status;
 use App\Transformer\Api\StatusStatelessTransformer;
-use Auth;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use League\Fractal;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Serializer\ArraySerializer;
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@ -7,8 +7,8 @@ use App\Models\Group;
 use App\Profile;
 use App\Report;
 use App\Status;
-use Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;

 class ReportController extends Controller
 {
@ -150,10 +150,10 @@ class ReportController extends Controller
            case 'post':
            case 'comment':
                $object = Status::findOrFail($object_id);
-                $object_type = \App\Status::class;
+                $object_type = Status::class;
                $exists = Report::whereUserId(Auth::id())
                    ->whereObjectId($object->id)
-                    ->whereObjectType(\App\Status::class)
+                    ->whereObjectType(Status::class)
                    ->count();

                $rpid = $object->profile_id;
@ -161,20 +161,20 @@ class ReportController extends Controller

            case 'user':
                $object = Profile::findOrFail($object_id);
-                $object_type = \App\Profile::class;
+                $object_type = Profile::class;
                $exists = Report::whereUserId(Auth::id())
                    ->whereObjectId($object->id)
-                    ->whereObjectType(\App\Profile::class)
+                    ->whereObjectType(Profile::class)
                    ->count();
                $rpid = $object->id;
                break;

            case 'group':
                $object = Group::findOrFail($object_id);
-                $object_type = \App\Models\Group::class;
+                $object_type = Group::class;
                $exists = Report::whereUserId(Auth::id())
                    ->whereObjectId($object->id)
-                    ->whereObjectType(\App\Models\Group::class)
+                    ->whereObjectType(Group::class)
                    ->count();
                $rpid = $object->profile_id;
                break;
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@ -9,8 +9,8 @@ use App\Services\WebfingerService;
 use App\Status;
 use App\Util\ActivityPub\Helpers;
 use App\Util\Lexer\Autolink;
-use Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;

--- a/app/Http/Controllers/SeasonalController.php
+++ b/app/Http/Controllers/SeasonalController.php
@ -7,8 +7,9 @@ use App\Follower;
 use App\Like;
 use App\Status;
 use App\StatusHashtag;
-use Auth;
+use App\User;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;

 class SeasonalController extends Controller
@ -225,7 +226,7 @@ class SeasonalController extends Controller

        $log = AccountLog::firstOrCreate([
            [
-                'item_type' => \App\User::class,
+                'item_type' => User::class,
                'item_id' => $user->id,
                'user_id' => $user->id,
                'action' => 'seasonal.my2020.view',
--- a/app/Http/Controllers/Settings/ExportSettings.php
+++ b/app/Http/Controllers/Settings/ExportSettings.php
@ -6,12 +6,12 @@ use App\Status;
 use App\Transformer\ActivityPub\ProfileTransformer;
 use App\Transformer\Api\StatusTransformer as StatusApiTransformer;
 use App\UserFilter;
-use Auth;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use Storage;

 trait ExportSettings
 {
--- a/app/Http/Controllers/Settings/HomeSettings.php
+++ b/app/Http/Controllers/Settings/HomeSettings.php
@ -8,11 +8,13 @@ use App\Mail\PasswordChange;
 use App\Media;
 use App\Services\AccountService;
 use App\Services\PronounService;
+use App\User;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\PrettyNumber;
-use Cache;
+use App\Util\Localization\Localization;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Mail;
 use Purify;

@ -78,7 +80,7 @@ trait HomeSettings
            }

            if ($user->language != $language &&
-                in_array($language, \App\Util\Localization\Localization::languages())
+                in_array($language, Localization::languages())
            ) {
                $changes = true;
                $user->language = $language;
@ -128,7 +130,7 @@ trait HomeSettings

        $user = $request->user();

-        if (!password_verify($current, $user->password)) {
+        if (! password_verify($current, $user->password)) {
            return redirect()->back()->with('error', 'There was an error with your request! Please try again.');
        }

@ -138,7 +140,7 @@ trait HomeSettings
        $log = new AccountLog;
        $log->user_id = $user->id;
        $log->item_id = $user->id;
-        $log->item_type = \App\User::class;
+        $log->item_type = User::class;
        $log->action = 'account.edit.password';
        $log->message = $revokeSessions
            ? 'Password changed and all sessions revoked'
@ -193,7 +195,7 @@ trait HomeSettings
            $log = new AccountLog;
            $log->user_id = $user->id;
            $log->item_id = $user->id;
-            $log->item_type = \App\User::class;
+            $log->item_type = User::class;
            $log->action = 'account.edit.email';
            $log->message = 'Email changed';
            $log->link = null;
--- a/app/Http/Controllers/Settings/LabsSettings.php
+++ b/app/Http/Controllers/Settings/LabsSettings.php
@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Settings;

 use App\Services\SuggestionService;
-use Cookie;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cookie;

 trait LabsSettings
 {
--- a/app/Http/Controllers/Settings/PrivacySettings.php
+++ b/app/Http/Controllers/Settings/PrivacySettings.php
@ -7,10 +7,10 @@ use App\Profile;
 use App\Services\AccountService;
 use App\Services\RelationshipService;
 use App\UserFilter;
-use Auth;
-use Cache;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;

 trait PrivacySettings
 {
@ -133,7 +133,7 @@ trait PrivacySettings
        DB::transaction(function () use ($fid, $pid) {
            $filter = UserFilter::whereUserId($pid)
                ->whereFilterableId($fid)
-                ->whereFilterableType(\App\Profile::class)
+                ->whereFilterableType(Profile::class)
                ->whereFilterType('mute')
                ->firstOrFail();
            $filter->delete();
@ -162,7 +162,7 @@ trait PrivacySettings
        DB::transaction(function () use ($fid, $pid) {
            $filter = UserFilter::whereUserId($pid)
                ->whereFilterableId($fid)
-                ->whereFilterableType(\App\Profile::class)
+                ->whereFilterableType(Profile::class)
                ->whereFilterType('block')
                ->firstOrFail();
            $filter->delete();
--- a/app/Http/Controllers/Settings/RelationshipSettings.php
+++ b/app/Http/Controllers/Settings/RelationshipSettings.php
@ -2,8 +2,8 @@

 namespace App\Http\Controllers\Settings;

-use Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;

 trait RelationshipSettings
 {
--- a/app/Http/Controllers/Settings/SecuritySettings.php
+++ b/app/Http/Controllers/Settings/SecuritySettings.php
@ -4,13 +4,13 @@ namespace App\Http\Controllers\Settings;

 use App\AccountLog;
 use App\UserDevice;
-use Auth;
 use BaconQrCode\Renderer\Image\SvgImageBackEnd;
 use BaconQrCode\Renderer\ImageRenderer;
 use BaconQrCode\Renderer\RendererStyle\RendererStyle;
 use BaconQrCode\Writer;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
 use PragmaRX\Google2FA\Google2FA;

--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@ -13,11 +13,11 @@ use App\Jobs\MediaPipeline\MediaSyncLicensePipeline;
 use App\ProfileSponsor;
 use App\Services\AccountService;
 use App\UserSetting;
-use Auth;
-use Cache;
 use Carbon\Carbon;
-use Cookie;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Cookie;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Str;

@ -133,11 +133,11 @@ class SettingsController extends Controller
        $user = Auth::user();
        abort_if(! config('pixelfed.account_deletion'), 403);
        abort_if($user->is_admin, 403);
-    
+
        $this->validate($request, [
            'confirm' => 'required|accepted',
        ]);
-    
+
        $profile = $user->profile;
        $ts = Carbon::now()->addMonth();
        $user->email = $user->id;
--- a/app/Http/Controllers/SiteController.php
+++ b/app/Http/Controllers/SiteController.php
@ -9,11 +9,11 @@ use App\Services\StatusService;
 use App\User;
 use App\Util\ActivityPub\Helpers;
 use App\Util\Localization\Localization;
-use Auth;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\View;
 use Illuminate\Support\Str;
-use View;

 class SiteController extends Controller
 {
--- a/app/Http/Controllers/SpaController.php
+++ b/app/Http/Controllers/SpaController.php
@ -5,8 +5,8 @@ namespace App\Http\Controllers;
 use App\Services\AccountService;
 use App\Services\StatusService;
 use App\Util\Localization\Localization;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use League\CommonMark\CommonMarkConverter;

 class SpaController extends Controller
--- a/app/Http/Controllers/StatusController.php
+++ b/app/Http/Controllers/StatusController.php
@ -17,10 +17,10 @@ use App\StatusView;
 use App\Transformer\ActivityPub\Verb\Note;
 use App\Transformer\ActivityPub\Verb\Question;
 use App\Util\Media\License;
-use Auth;
-use Cache;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use League\Fractal;

 class StatusController extends Controller
--- a/app/Http/Controllers/StoryComposeController.php
+++ b/app/Http/Controllers/StoryComposeController.php
@ -22,10 +22,10 @@ use App\Story;
 use App\Util\Media\ImageDriverManager;
 use FFMpeg;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Intervention\Image\Encoders\JpegEncoder;
 use Intervention\Image\Encoders\PngEncoder;
-use Storage;

 class StoryComposeController extends Controller
 {
--- a/app/Http/Controllers/StoryController.php
+++ b/app/Http/Controllers/StoryController.php
@ -13,12 +13,12 @@ use App\Services\UserRoleService;
 use App\Story;
 use App\StoryView;
 use App\Transformer\ActivityPub\Verb\StoryVerb;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
 use League\Fractal\Manager;
 use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\ArraySerializer;
-use Storage;

 class StoryController extends StoryComposeController
 {
--- a/app/Http/Controllers/TimelineController.php
+++ b/app/Http/Controllers/TimelineController.php
@ -2,12 +2,13 @@

 namespace App\Http\Controllers;

+use App\Profile;
 use App\Status;
 use App\Transformer\Api\StatusTimelineTransformer;
 use App\UserFilter;
-use Auth;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;

@ -72,7 +73,7 @@ class TimelineController extends Controller
        });

        $filtered = UserFilter::whereUserId($user->profile_id)
-            ->whereFilterableType(\App\Profile::class)
+            ->whereFilterableType(Profile::class)
            ->whereIn('filter_type', ['mute', 'block'])
            ->pluck('filterable_id')->toArray();

--- a/app/Http/Controllers/UserInviteController.php
+++ b/app/Http/Controllers/UserInviteController.php
@ -6,8 +6,8 @@ use App\Mail\UserInviteMail;
 use App\Services\EmailService;
 use App\User;
 use App\UserInvite;
-use Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;

--- a/app/Http/Middleware/AccountInterstitial.php
+++ b/app/Http/Middleware/AccountInterstitial.php
@ -2,15 +2,16 @@

 namespace App\Http\Middleware;

-use Auth;
 use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;

 class AccountInterstitial
 {
    /**
     * Handle an incoming request.
     *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
     * @return mixed
     */
    public function handle($request, Closure $next)
--- a/app/Http/Middleware/Admin.php
+++ b/app/Http/Middleware/Admin.php
@ -2,15 +2,16 @@

 namespace App\Http\Middleware;

-use Auth;
 use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;

 class Admin
 {
    /**
     * Handle an incoming request.
     *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
     * @return mixed
     */
    public function handle($request, Closure $next)
--- a/app/Http/Middleware/Api/Admin.php
+++ b/app/Http/Middleware/Api/Admin.php
@ -2,15 +2,16 @@

 namespace App\Http\Middleware\Api;

-use Auth;
 use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;

 class Admin
 {
    /**
     * Handle an incoming request.
     *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
     * @return mixed
     */
    public function handle($request, Closure $next)
--- a/app/Http/Middleware/DangerZone.php
+++ b/app/Http/Middleware/DangerZone.php
@ -2,16 +2,17 @@

 namespace App\Http\Middleware;

-use Auth;
 use Carbon\Carbon;
 use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;

 class DangerZone
 {
    /**
     * Handle an incoming request.
     *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
     * @return mixed
     */
    public function handle($request, Closure $next)
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@ -3,14 +3,15 @@
 namespace App\Http\Middleware;

 use Closure;
-use Session;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Session;

 class Localization
 {
    /**
     * Handle an incoming request.
     *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
     * @return mixed
     */
    public function handle($request, Closure $next)
--- a/app/Http/Middleware/TwoFactorAuth.php
+++ b/app/Http/Middleware/TwoFactorAuth.php
@ -2,15 +2,16 @@

 namespace App\Http\Middleware;

-use Auth;
 use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;

 class TwoFactorAuth
 {
    /**
     * Handle an incoming request.
     *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
     * @return mixed
     */
    public function handle($request, Closure $next)
--- a/app/Jobs/AutospamPipeline/AutospamUpdateCachedDataPipeline.php
+++ b/app/Jobs/AutospamPipeline/AutospamUpdateCachedDataPipeline.php
@ -4,12 +4,12 @@ namespace App\Jobs\AutospamPipeline;

 use App\Models\AutospamCustomTokens;
 use App\Services\AutospamService;
-use Cache;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;

 class AutospamUpdateCachedDataPipeline implements ShouldQueue
--- a/app/Jobs/AvatarPipeline/AvatarOptimize.php
+++ b/app/Jobs/AvatarPipeline/AvatarOptimize.php
@ -5,19 +5,19 @@ namespace App\Jobs\AvatarPipeline;
 use App\Avatar;
 use App\Profile;
 use App\Util\Media\ImageDriverManager;
-use Cache;
 use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Intervention\Image\Encoders\AvifEncoder;
 use Intervention\Image\Encoders\JpegEncoder;
 use Intervention\Image\Encoders\PngEncoder;
 use Intervention\Image\Encoders\WebpEncoder;
-use Storage;

 class AvatarOptimize implements ShouldQueue
 {
--- a/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php
+++ b/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php
@ -6,12 +6,12 @@ use App\Avatar;
 use App\Profile;
 use App\Services\AccountService;
 use App\Services\MediaStorageService;
-use Cache;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Cache;

 class RemoteAvatarFetchFromUrl implements ShouldQueue
 {
--- a/app/Jobs/CommentPipeline/CommentPipeline.php
+++ b/app/Jobs/CommentPipeline/CommentPipeline.php
@ -3,18 +3,19 @@
 namespace App\Jobs\CommentPipeline;

 use App\Notification;
+use App\Profile;
 use App\Services\NotificationService;
 use App\Services\StatusService;
 use App\Status;
 use App\UserFilter;
-use Cache;
-use DB;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Log;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;

 class CommentPipeline implements ShouldQueue
 {
@ -106,7 +107,7 @@ class CommentPipeline implements ShouldQueue
        }

        $filtered = UserFilter::whereUserId($target->id)
-            ->whereFilterableType(\App\Profile::class)
+            ->whereFilterableType(Profile::class)
            ->whereIn('filter_type', ['mute', 'block'])
            ->whereFilterableId($actor->id)
            ->exists();
@ -122,7 +123,7 @@ class CommentPipeline implements ShouldQueue
                $notification->actor_id = $actor->id;
                $notification->action = 'comment';
                $notification->item_id = $comment->id;
-                $notification->item_type = \App\Status::class;
+                $notification->item_type = Status::class;
                $notification->save();

                NotificationService::setNotification($notification);
--- a/app/Jobs/ContactPipeline/ContactPipeline.php
+++ b/app/Jobs/ContactPipeline/ContactPipeline.php
@ -10,7 +10,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
-use Mail;
+use Illuminate\Support\Facades\Mail;

 class ContactPipeline implements ShouldQueue
 {
--- a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php
+++ b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php
@ -45,14 +45,14 @@ use App\User;
 use App\UserDevice;
 use App\UserFilter;
 use App\UserSetting;
-use DB;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use Storage;
+use Illuminate\Support\Facades\Storage;

 class DeleteAccountPipeline implements ShouldQueue
 {
@ -138,7 +138,7 @@ class DeleteAccountPipeline implements ShouldQueue

        RemoteAuth::whereUserId($user->id)->delete();

-        AccountLog::whereItemType(\App\User::class)->whereItemId($user->id)->forceDelete();
+        AccountLog::whereItemType(User::class)->whereItemId($user->id)->forceDelete();

        AccountInterstitial::whereUserId($user->id)->delete();

--- a/app/Jobs/DeletePipeline/FanoutDeletePipeline.php
+++ b/app/Jobs/DeletePipeline/FanoutDeletePipeline.php
@ -4,7 +4,6 @@ namespace App\Jobs\DeletePipeline;

 use App\Profile;
 use App\Util\ActivityPub\HttpSignature;
-use Cache;
 use GuzzleHttp\Client;
 use GuzzleHttp\Pool;
 use Illuminate\Bus\Queueable;
@ -12,6 +11,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;

 class FanoutDeletePipeline implements ShouldQueue
--- a/app/Jobs/FollowPipeline/FollowPipeline.php
+++ b/app/Jobs/FollowPipeline/FollowPipeline.php
@ -5,18 +5,19 @@ namespace App\Jobs\FollowPipeline;
 use App\Follower;
 use App\Jobs\PushNotificationPipeline\FollowPushNotifyPipeline;
 use App\Notification;
+use App\Profile;
 use App\Services\AccountService;
 use App\Services\FollowerService;
 use App\Services\NotificationAppGatewayService;
 use App\Services\PushNotificationService;
 use App\User;
-use Cache;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Log;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Log;

 class FollowPipeline implements ShouldQueue
 {
@ -82,7 +83,7 @@ class FollowPipeline implements ShouldQueue
                $notification->actor_id = $actor->id;
                $notification->action = 'follow';
                $notification->item_id = $target->id;
-                $notification->item_type = \App\Profile::class;
+                $notification->item_type = Profile::class;
                $notification->save();
            } catch (\Exception $e) {
                Log::error($e);
--- a/app/Jobs/FollowPipeline/FollowServiceWarmCache.php
+++ b/app/Jobs/FollowPipeline/FollowServiceWarmCache.php
@ -6,15 +6,15 @@ use App\Follower;
 use App\Profile;
 use App\Services\AccountService;
 use App\Services\FollowerService;
-use Cache;
-use DB;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
-use Storage;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;

 class FollowServiceWarmCache implements ShouldQueue
 {
--- a/app/Jobs/FollowPipeline/FollowServiceWarmCacheLargeIngestPipeline.php
+++ b/app/Jobs/FollowPipeline/FollowServiceWarmCacheLargeIngestPipeline.php
@ -8,7 +8,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Storage;
+use Illuminate\Support\Facades\Storage;

 class FollowServiceWarmCacheLargeIngestPipeline implements ShouldQueue
 {
--- a/app/Jobs/FollowPipeline/UnfollowPipeline.php
+++ b/app/Jobs/FollowPipeline/UnfollowPipeline.php
@ -10,12 +10,12 @@ use App\Profile;
 use App\Services\AccountService;
 use App\Services\FollowerService;
 use App\Services\NotificationService;
-use Cache;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Cache;

 class UnfollowPipeline implements ShouldQueue
 {
@ -95,7 +95,7 @@ class UnfollowPipeline implements ShouldQueue
                ->whereAction('follow')
                ->whereActorId($actor)
                ->whereItemId($target)
-                ->whereItemType(\App\Profile::class)
+                ->whereItemType(Profile::class)
                ->get()
                ->each(function ($n) {
                    NotificationService::del($n->profile_id, $n->id);
--- a/app/Jobs/GroupPipeline/GroupCommentPipeline.php
+++ b/app/Jobs/GroupPipeline/GroupCommentPipeline.php
@ -7,12 +7,12 @@ use App\Notification;
 use App\Services\NotificationService;
 use App\Services\StatusService;
 use App\Status;
-use DB;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\DB;

 class GroupCommentPipeline implements ShouldQueue
 {
@ -87,7 +87,7 @@ class GroupCommentPipeline implements ShouldQueue
            $notification->actor_id = $actor->id;
            $notification->action = 'group:comment';
            $notification->item_id = $comment->id;
-            $notification->item_type = \App\Status::class;
+            $notification->item_type = Status::class;
            $notification->save();

            return $notification;
--- a/app/Jobs/GroupPipeline/GroupMediaPipeline.php
+++ b/app/Jobs/GroupPipeline/GroupMediaPipeline.php
@ -4,13 +4,13 @@ namespace App\Jobs\GroupPipeline;

 use App\Media;
 use App\Services\MediaStorageService;
-use Cache;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Http\File;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;

 class GroupMediaPipeline implements ShouldQueue
--- a/app/Jobs/GroupPipeline/NewStatusPipeline.php
+++ b/app/Jobs/GroupPipeline/NewStatusPipeline.php
@ -12,12 +12,12 @@ use App\Services\StatusService;
 use App\Status;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\Extractor;
-use DB;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;

 class NewStatusPipeline implements ShouldQueue
--- a/app/Jobs/GroupsPipeline/DeleteCommentPipeline.php
+++ b/app/Jobs/GroupsPipeline/DeleteCommentPipeline.php
@ -2,28 +2,21 @@

 namespace App\Jobs\GroupsPipeline;

-use App\Util\Media\Image;
+use App\Models\GroupComment;
+use App\Services\GroupFeedService;
+use App\Services\GroupPostService;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use App\Models\Group;
-use App\Models\GroupComment;
-use App\Models\GroupPost;
-use App\Models\GroupHashtag;
-use App\Models\GroupPostHashtag;
-use App\Services\GroupFeedService;
-use App\Services\GroupPostService;
-use App\Util\Lexer\Autolink;
-use App\Util\Lexer\Extractor;
-use DB;

 class DeleteCommentPipeline implements ShouldQueue
 {
    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

    protected $parent;
+
    protected $status;

    /**
@ -54,6 +47,6 @@ class DeleteCommentPipeline implements ShouldQueue
        GroupPostService::del($groupId, $postId);
        GroupFeedService::del($groupId, $postId);
        GroupPostService::del($groupId, $parent->id);
-        return;
+
    }
 }
--- a/app/Jobs/GroupsPipeline/ImageResizePipeline.php
+++ b/app/Jobs/GroupsPipeline/ImageResizePipeline.php
@ -10,10 +10,10 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
 use Intervention\Image\Encoders\JpegEncoder;
 use Intervention\Image\Encoders\PngEncoder;
-use Log;
-use Storage;

 class ImageResizePipeline implements ShouldQueue
 {
--- a/app/Jobs/GroupsPipeline/ImageS3DeletePipeline.php
+++ b/app/Jobs/GroupsPipeline/ImageS3DeletePipeline.php
@ -8,7 +8,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Storage;
+use Illuminate\Support\Facades\Storage;

 class ImageS3DeletePipeline implements ShouldQueue
 {
--- a/app/Jobs/GroupsPipeline/ImageS3UploadPipeline.php
+++ b/app/Jobs/GroupsPipeline/ImageS3UploadPipeline.php
@ -14,8 +14,8 @@ use Illuminate\Http\File;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
 use League\Flysystem\UnableToWriteFile;
-use Storage;

 class ImageS3UploadPipeline implements ShouldQueue
 {
--- a/app/Jobs/GroupsPipeline/NewCommentPipeline.php
+++ b/app/Jobs/GroupsPipeline/NewCommentPipeline.php
@ -10,12 +10,12 @@ use App\Services\GroupFeedService;
 use App\Services\GroupPostService;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\Extractor;
-use DB;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\DB;

 class NewCommentPipeline implements ShouldQueue
 {
@ -61,12 +61,12 @@ class NewCommentPipeline implements ShouldQueue
        $groupId = $status->group_id;
        $postId = $status->id;

-        if ($parentClass === \App\Models\GroupPost::class) {
+        if ($parentClass === GroupPost::class) {
            $parent->reply_count = GroupPostService::getCommentCount($parent->id, false);
            $parent->save();
            GroupPostService::del($groupId, $postId);
            GroupFeedService::del($groupId, $postId);
-        } elseif ($parentClass === \App\Models\GroupComment::class) {
+        } elseif ($parentClass === GroupComment::class) {
            $gp = GroupPost::whereId($parent->status_id)->firstOrFail();
            if ($gp->group_id !== $status->group_id) {
                return;
--- a/app/Jobs/GroupsPipeline/NewPostPipeline.php
+++ b/app/Jobs/GroupsPipeline/NewPostPipeline.php
@ -7,12 +7,12 @@ use App\Models\GroupPost;
 use App\Models\GroupPostHashtag;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\Extractor;
-use DB;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;

 class NewPostPipeline implements ShouldQueue
--- a/app/Jobs/ImageOptimizePipeline/ImageOptimize.php
+++ b/app/Jobs/ImageOptimizePipeline/ImageOptimize.php
@ -9,7 +9,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
-use Storage;
+use Illuminate\Support\Facades\Storage;

 class ImageOptimize implements ShouldQueue
 {
--- a/Show More
+++ b/Show More