Merge pull request #6892 from pixelfed/refactor/move-models-to-namespace

Refactor/move models to namespace

app/Console/Commands/AccountPostCountStatUpdate.php

@@ -2,10 +2,10 @@
 
 namespace App\Console\Commands;
 
-use App\Profile;
+use App\Models\Profile;
+use App\Models\Status;
 use App\Services\Account\AccountStatService;
 use App\Services\AccountService;
-use App\Status;
 use Illuminate\Console\Command;
 
 class AccountPostCountStatUpdate extends Command

app/Console/Commands/AddUserDomainBlock.php

@@ -3,8 +3,8 @@
 namespace App\Console\Commands;
 
 use App\Models\DefaultDomainBlock;
+use App\Models\User;
 use App\Models\UserDomainBlock;
-use App\User;
 use Illuminate\Console\Command;
 
 use function Laravel\Prompts\confirm;

app/Console/Commands/AvatarDefaultMigration.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Avatar;
+use App\Models\Avatar;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;

app/Console/Commands/AvatarStorage.php

@@ -2,9 +2,9 @@
 
 namespace App\Console\Commands;
 
-use App\Avatar;
 use App\Jobs\AvatarPipeline\RemoteAvatarFetch;
-use App\Profile;
+use App\Models\Avatar;
+use App\Models\Profile;
 use App\Services\AccountService;
 use App\Util\Lexer\PrettyNumber;
 use Illuminate\Console\Command;

app/Console/Commands/AvatarStorageDeepClean.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Avatar;
 use App\Jobs\AvatarPipeline\AvatarStorageCleanup;
+use App\Models\Avatar;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;

app/Console/Commands/BannedEmailCheck.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
+use App\Models\User;
 use App\Services\EmailService;
-use App\User;
 use Illuminate\Console\Command;
 
 class BannedEmailCheck extends Command

app/Console/Commands/CatchUnoptimizedMedia.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Jobs\ImageOptimizePipeline\ImageOptimize;
-use App\Media;
+use App\Models\Media;
 use Illuminate\Console\Command;
 
 class CatchUnoptimizedMedia extends Command

app/Console/Commands/CloudMediaMigrate.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Media;
+use App\Models\Media;
 use App\Services\MediaStorageService;
 use App\Util\Lexer\PrettyNumber;
 use Illuminate\Console\Command;

app/Console/Commands/DeleteRemoteProfile.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Jobs\DeletePipeline\DeleteRemoteProfilePipeline;
-use App\Profile;
+use App\Models\Profile;
 use Illuminate\Console\Command;
 
 use function Laravel\Prompts\confirm;

app/Console/Commands/FailedJobGC.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\FailedJob;
+use App\Models\FailedJob;
 use Illuminate\Console\Command;
 
 class FailedJobGC extends Command

app/Console/Commands/FetchMissingMediaMimeType.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Media;
+use App\Models\Media;
 use App\Services\MediaService;
 use App\Services\StatusService;
 use Illuminate\Console\Command;

app/Console/Commands/FixDuplicateProfiles.php

@@ -2,32 +2,32 @@
 
 namespace App\Console\Commands;
 
-use App\Avatar;
-use App\Bookmark;
-use App\Collection;
-use App\DirectMessage;
-use App\Follower;
-use App\FollowRequest;
-use App\HashtagFollow;
-use App\Like;
-use App\Media;
-use App\MediaTag;
-use App\Mention;
+use App\Models\Avatar;
+use App\Models\Bookmark;
+use App\Models\Collection;
 use App\Models\Conversation;
+use App\Models\DirectMessage;
+use App\Models\Follower;
+use App\Models\FollowRequest;
+use App\Models\HashtagFollow;
+use App\Models\Like;
+use App\Models\Media;
+use App\Models\MediaTag;
+use App\Models\Mention;
 use App\Models\Portfolio;
+use App\Models\Profile;
+use App\Models\Report;
+use App\Models\ReportComment;
+use App\Models\ReportLog;
+use App\Models\Status;
+use App\Models\StatusArchived;
+use App\Models\StatusHashtag;
+use App\Models\StatusView;
+use App\Models\Story;
+use App\Models\StoryView;
+use App\Models\User;
+use App\Models\UserFilter;
 use App\Models\UserPronoun;
-use App\Profile;
-use App\Report;
-use App\ReportComment;
-use App\ReportLog;
-use App\Status;
-use App\StatusArchived;
-use App\StatusHashtag;
-use App\StatusView;
-use App\Story;
-use App\StoryView;
-use App\User;
-use App\UserFilter;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;

app/Console/Commands/FixHashtags.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Hashtag;
-use App\StatusHashtag;
+use App\Models\Hashtag;
+use App\Models\StatusHashtag;
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
 

app/Console/Commands/FixLikes.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Like;
-use App\Status;
+use App\Models\Like;
+use App\Models\Status;
 use Illuminate\Console\Command;
 
 class FixLikes extends Command

app/Console/Commands/FixMediaDriver.php

@@ -4,7 +4,7 @@ namespace App\Console\Commands;
 
 use App\Jobs\ImageOptimizePipeline\ImageOptimize;
 use App\Jobs\MediaPipeline\MediaFixLocalFilesystemCleanupPipeline;
-use App\Media;
+use App\Models\Media;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;
 use League\Flysystem\MountManager;

app/Console/Commands/FixMissingUserProfile.php

@@ -2,14 +2,14 @@
 
 namespace App\Console\Commands;
 
-use App\Follower;
 use App\Jobs\AvatarPipeline\CreateAvatar;
 use App\Jobs\FollowPipeline\FollowPipeline;
 use App\Models\DefaultDomainBlock;
+use App\Models\Follower;
+use App\Models\Profile;
+use App\Models\User;
 use App\Models\UserDomainBlock;
-use App\Profile;
-use App\User;
-use App\UserSetting;
+use App\Models\UserSetting;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 

app/Console/Commands/FixRemotePostCount.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Profile;
-use App\Status;
+use App\Models\Profile;
+use App\Models\Status;
 use Illuminate\Console\Command;
 
 class FixRemotePostCount extends Command

app/Console/Commands/FixStatusCount.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Profile;
+use App\Models\Profile;
 use Illuminate\Console\Command;
 
 class FixStatusCount extends Command

app/Console/Commands/FixUsernames.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Profile;
-use App\User;
+use App\Models\Profile;
+use App\Models\User;
 use App\Util\Lexer\RestrictedNames;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;

app/Console/Commands/HashtagCachedCountUpdate.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Hashtag;
+use App\Models\Hashtag;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 

app/Console/Commands/HashtagRelatedGenerate.php

@@ -2,10 +2,10 @@
 
 namespace App\Console\Commands;
 
-use App\Hashtag;
+use App\Models\Hashtag;
 use App\Models\HashtagRelated;
+use App\Models\StatusHashtag;
 use App\Services\HashtagRelatedService;
-use App\StatusHashtag;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\PromptsForMissingInput;
 

app/Console/Commands/ImportCities.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Place;
+use App\Models\Place;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;

app/Console/Commands/ImportRemoveDeletedAccounts.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Models\ImportPost;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;

app/Console/Commands/ImportUploadCleanStorage.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;
 

app/Console/Commands/InstanceManager.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Instance;
 use App\Jobs\InstancePipeline\FetchNodeinfoPipeline;
+use App\Models\Instance;
 use App\Services\InstanceService;
 use Illuminate\Console\Command;
 

app/Console/Commands/MediaCloudUrlRewrite.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Avatar;
-use App\Media;
+use App\Models\Avatar;
+use App\Models\Media;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\PromptsForMissingInput;
 use Illuminate\Support\Facades\Storage;

app/Console/Commands/MediaFix.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Media;
+use App\Models\Media;
 use App\Util\Media\Filter;
 use Illuminate\Console\Command;
 

app/Console/Commands/MediaGarbageCollector.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Media;
+use App\Models\Media;
 use App\Services\MediaStorageService;
 use Illuminate\Console\Command;
 

app/Console/Commands/MediaS3GarbageCollector.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Media;
+use App\Models\Media;
 use App\Services\MediaService;
 use App\Services\StatusService;
 use Illuminate\Console\Command;

app/Console/Commands/PasswordResetGC.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\EmailVerification;
+use App\Models\EmailVerification;
 use Illuminate\Console\Command;
 
 class PasswordResetGC extends Command

app/Console/Commands/ReclaimUsername.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Profile;
-use App\User;
+use App\Models\Profile;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 use function Laravel\Prompts\confirm;

app/Console/Commands/RegenerateThumbnails.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Jobs\ImageOptimizePipeline\ImageThumbnail;
-use App\Media;
+use App\Models\Media;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 

app/Console/Commands/SeedDevUsers.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
 

app/Console/Commands/SeedFollows.php

@@ -2,9 +2,9 @@
 
 namespace App\Console\Commands;
 
-use App\Follower;
 use App\Jobs\FollowPipeline\FollowPipeline;
-use App\Profile;
+use App\Models\Follower;
+use App\Models\Profile;
 use Exception;
 use Illuminate\Console\Command;
 

app/Console/Commands/SendUpdateActor.php

@@ -2,9 +2,9 @@
 
 namespace App\Console\Commands;
 
-use App\Instance;
-use App\Profile;
-use App\User;
+use App\Models\Instance;
+use App\Models\Profile;
+use App\Models\User;
 use App\Util\ActivityPub\Helpers;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;

app/Console/Commands/StatusDedupe.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Jobs\StatusPipeline\StatusDelete;
-use App\Status;
+use App\Models\Status;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 

app/Console/Commands/StoryGC.php

@@ -4,8 +4,8 @@ namespace App\Console\Commands;
 
 use App\Jobs\StoryPipeline\StoryExpire;
 use App\Jobs\StoryPipeline\StoryRotateMedia;
+use App\Models\Story;
 use App\Services\StoryService;
-use App\Story;
 use Illuminate\Console\Command;
 
 class StoryGC extends Command

app/Console/Commands/TransformImports.php

@@ -2,13 +2,13 @@
 
 namespace App\Console\Commands;
 
-use App\Media;
 use App\Models\ImportPost;
-use App\Profile;
+use App\Models\Media;
+use App\Models\Profile;
+use App\Models\Status;
 use App\Services\AccountService;
 use App\Services\ImportService;
 use App\Services\MediaPathService;
-use App\Status;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\DB;

app/Console/Commands/UserAccountDelete.php

@@ -2,9 +2,9 @@
 
 namespace App\Console\Commands;
 
-use App\Instance;
-use App\Profile;
-use App\User;
+use App\Models\Instance;
+use App\Models\Profile;
+use App\Models\User;
 use App\Util\ActivityPub\HttpSignature;
 use Illuminate\Console\Command;
 use Illuminate\Http\Client\PendingRequest;

app/Console/Commands/UserAdmin.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\PromptsForMissingInput;
 

app/Console/Commands/UserAvatarDelete.php

@@ -2,9 +2,9 @@
 
 namespace App\Console\Commands;
 
-use App\Avatar;
+use App\Models\Avatar;
+use App\Models\User;
 use App\Services\AccountService;
-use App\User;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\PromptsForMissingInput;
 use Illuminate\Support\Facades\Cache;

app/Console/Commands/UserCreate.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class UserCreate extends Command

app/Console/Commands/UserDelete.php

@@ -3,9 +3,9 @@
 namespace App\Console\Commands;
 
 use App\Jobs\DeletePipeline\DeleteAccountPipeline;
-use App\Profile;
+use App\Models\Profile;
+use App\Models\User;
 use App\Services\AccountService;
-use App\User;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\PromptsForMissingInput;
 

app/Console/Commands/UserRegistrationMagicLink.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\EmailVerification;
-use App\User;
+use App\Models\EmailVerification;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class UserRegistrationMagicLink extends Command

app/Console/Commands/UserShow.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class UserShow extends Command

app/Console/Commands/UserSuspend.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class UserSuspend extends Command

app/Console/Commands/UserTable.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class UserTable extends Command

app/Console/Commands/UserToggle2FA.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\PromptsForMissingInput;
 

app/Console/Commands/UserUnsuspend.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class UserUnsuspend extends Command

app/Console/Commands/UserVerifyEmail.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\PromptsForMissingInput;
 

app/Console/Commands/VideoThumbnail.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Jobs\VideoPipeline\VideoThumbnail as Pipeline;
-use App\Media;
+use App\Models\Media;
 use Illuminate\Console\Command;
 
 class VideoThumbnail extends Command

app/Console/Commands/WeeklyInstanceScan.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Instance;
 use App\Jobs\InstancePipeline\FetchNodeinfoPipeline;
+use App\Models\Instance;
 use Illuminate\Console\Command;
 
 use function Laravel\Prompts\progress;

app/Events/NewMention.php

@@ -2,7 +2,7 @@
 
 namespace App\Events;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;

app/Events/Notification/NewPublicPost.php

@@ -2,7 +2,7 @@
 
 namespace App\Events\Notification;
 
-use App\Status;
+use App\Models\Status;
 use App\Transformer\Api\StatusTransformer;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;

app/Http/Controllers/AccountController.php

@@ -2,23 +2,23 @@
 
 namespace App\Http\Controllers;
 
-use App\EmailVerification;
-use App\Follower;
-use App\FollowRequest;
 use App\Jobs\FollowPipeline\FollowAcceptPipeline;
 use App\Jobs\FollowPipeline\FollowPipeline;
 use App\Jobs\FollowPipeline\FollowRejectPipeline;
 use App\Mail\ConfirmEmail;
-use App\Notification;
-use App\Profile;
+use App\Models\EmailVerification;
+use App\Models\Follower;
+use App\Models\FollowRequest;
+use App\Models\Notification;
+use App\Models\Profile;
+use App\Models\User;
+use App\Models\UserFilter;
 use App\Services\AccountService;
 use App\Services\FollowerService;
 use App\Services\NotificationService;
 use App\Services\RelationshipService;
 use App\Services\UserFilterService;
 use App\Transformer\Api\Mastodon\v1\AccountTransformer;
-use App\User;
-use App\UserFilter;
 use Carbon\Carbon;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;

app/Http/Controllers/AccountInterstitialController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\AccountInterstitial;
-use App\Status;
+use App\Models\AccountInterstitial;
+use App\Models\Status;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;

app/Http/Controllers/Admin/AdminAutospamController.php

@@ -2,17 +2,17 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\AccountInterstitial;
 use App\Http\Resources\AdminSpamReport;
 use App\Jobs\AutospamPipeline\AutospamPretrainNonSpamPipeline;
 use App\Jobs\AutospamPipeline\AutospamPretrainPipeline;
 use App\Jobs\AutospamPipeline\AutospamUpdateCachedDataPipeline;
+use App\Models\AccountInterstitial;
 use App\Models\AutospamCustomTokens;
-use App\Profile;
+use App\Models\Profile;
+use App\Models\Status;
 use App\Services\AccountService;
 use App\Services\AutospamService;
 use App\Services\ConfigCacheService;
-use App\Status;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;

app/Http/Controllers/Admin/AdminDirectoryController.php

@@ -4,11 +4,11 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\PixelfedDirectoryController;
 use App\Models\ConfigCache;
+use App\Models\Status;
+use App\Models\User;
 use App\Services\AccountService;
 use App\Services\ConfigCacheService;
 use App\Services\StatusService;
-use App\Status;
-use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;

app/Http/Controllers/Admin/AdminDiscoverController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\DiscoverCategory;
-use App\DiscoverCategoryHashtag;
-use App\Hashtag;
-use App\Media;
+use App\Models\DiscoverCategory;
+use App\Models\DiscoverCategoryHashtag;
+use App\Models\Hashtag;
+use App\Models\Media;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 

app/Http/Controllers/Admin/AdminHashtagsController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Hashtag;
 use App\Http\Resources\AdminHashtag;
+use App\Models\Hashtag;
+use App\Models\StatusHashtag;
 use App\Services\TrendingHashtagService;
-use App\StatusHashtag;
 use Illuminate\Http\Request;
 
 trait AdminHashtagsController

app/Http/Controllers/Admin/AdminInstanceController.php

@@ -4,8 +4,8 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Resources\AdminInstance;
 use App\Http\Resources\AdminProfile;
-use App\Instance;
-use App\Profile;
+use App\Models\Instance;
+use App\Models\Profile;
 use App\Services\InstanceService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;

app/Http/Controllers/Admin/AdminMediaController.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Media;
-use App\MediaBlocklist;
-use App\Profile;
+use App\Models\Media;
+use App\Models\MediaBlocklist;
+use App\Models\Profile;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
 

app/Http/Controllers/Admin/AdminReportController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\AccountInterstitial;
 use App\Http\Resources\Admin\AdminModeratedProfileResource;
 use App\Http\Resources\AdminRemoteReport;
 use App\Http\Resources\AdminReport;
@@ -12,20 +11,21 @@ use App\Jobs\DeletePipeline\DeleteRemoteProfilePipeline;
 use App\Jobs\StatusPipeline\RemoteStatusDelete;
 use App\Jobs\StatusPipeline\StatusDelete;
 use App\Jobs\StoryPipeline\StoryDelete;
+use App\Models\AccountInterstitial;
 use App\Models\ModeratedProfile;
+use App\Models\Notification;
+use App\Models\Profile;
 use App\Models\RemoteReport;
-use App\Notification;
-use App\Profile;
-use App\Report;
+use App\Models\Report;
+use App\Models\Status;
+use App\Models\Story;
+use App\Models\User;
 use App\Services\AccountService;
 use App\Services\ModLogService;
 use App\Services\NetworkTimelineService;
 use App\Services\NotificationService;
 use App\Services\PublicTimelineService;
 use App\Services\StatusService;
-use App\Status;
-use App\Story;
-use App\User;
 use App\Util\ActivityPub\Helpers;
 use Carbon\Carbon;
 use Illuminate\Http\Request;

app/Http/Controllers/Admin/AdminSettingsController.php

@@ -4,13 +4,13 @@ namespace App\Http\Controllers\Admin;
 
 use App\Models\ConfigCache;
 use App\Models\InstanceActor;
-use App\Page;
-use App\Profile;
+use App\Models\Page;
+use App\Models\Profile;
+use App\Models\User;
 use App\Services\AccountService;
 use App\Services\AdminSettingsService;
 use App\Services\ConfigCacheService;
 use App\Services\FilesystemService;
-use App\User;
 use App\Util\Site\Config;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;

app/Http/Controllers/Admin/AdminUserController.php

@@ -4,11 +4,11 @@ namespace App\Http\Controllers\Admin;
 
 use App\Jobs\DeletePipeline\DeleteAccountPipeline;
 use App\Mail\AdminMessage;
-use App\ModLog;
-use App\Profile;
+use App\Models\ModLog;
+use App\Models\Profile;
+use App\Models\User;
 use App\Services\AccountService;
 use App\Services\ModLogService;
-use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Mail;

app/Http/Controllers/AdminController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Contact;
 use App\Http\Controllers\Admin\AdminAutospamController;
 use App\Http\Controllers\Admin\AdminDirectoryController;
 use App\Http\Controllers\Admin\AdminDiscoverController;
@@ -13,21 +12,22 @@ use App\Http\Controllers\Admin\AdminReportController;
 use App\Http\Controllers\Admin\AdminSettingsController;
 use App\Http\Controllers\Admin\AdminUserController;
 use App\Http\Resources\AdminProfile;
-use App\Instance;
 use App\Jobs\AdminPipeline\AdminProfileActionPipeline;
 use App\Mail\AdminMessageResponse;
+use App\Models\Contact;
 use App\Models\CustomEmoji;
-use App\Newsroom;
-use App\OauthClient;
-use App\Profile;
+use App\Models\Instance;
+use App\Models\Newsroom;
+use App\Models\OauthClient;
+use App\Models\Profile;
+use App\Models\Status;
+use App\Models\Story;
+use App\Models\User;
 use App\Services\AccountService;
 use App\Services\AdminStatsService;
 use App\Services\ConfigCacheService;
 use App\Services\StatusService;
 use App\Services\StoryService;
-use App\Status;
-use App\Story;
-use App\User;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;

app/Http/Controllers/AdminCuratedRegisterController.php

@@ -9,7 +9,7 @@ use App\Mail\CuratedRegisterSendMessage;
 use App\Models\CuratedRegister;
 use App\Models\CuratedRegisterActivity;
 use App\Models\CuratedRegisterTemplate;
-use App\User;
+use App\Models\User;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;

app/Http/Controllers/AdminInviteController.php

@@ -3,8 +3,8 @@
 namespace App\Http\Controllers;
 
 use App\Models\AdminInvite;
+use App\Models\User;
 use App\Services\EmailService;
-use App\User;
 use App\Util\Lexer\RestrictedNames;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Contracts\View\View;

app/Http/Controllers/AdminShadowFilterController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\AdminShadowFilter;
-use App\Profile;
+use App\Models\Profile;
 use App\Services\AccountService;
 use App\Services\AdminShadowFilterService;
 use Illuminate\Contracts\View\View;

app/Http/Controllers/Api/AdminApiController.php

@@ -2,19 +2,21 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\AccountInterstitial;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\AdminInstance;
 use App\Http\Resources\AdminUser;
-use App\Instance;
 use App\Jobs\DeletePipeline\DeleteAccountPipeline;
 use App\Jobs\DeletePipeline\DeleteRemoteProfilePipeline;
 use App\Jobs\StatusPipeline\StatusDelete;
+use App\Models\AccountInterstitial;
 use App\Models\Conversation;
+use App\Models\Instance;
+use App\Models\Notification;
+use App\Models\Profile;
 use App\Models\RemoteReport;
-use App\Notification;
-use App\Profile;
-use App\Report;
+use App\Models\Report;
+use App\Models\Status;
+use App\Models\User;
 use App\Services\AccountService;
 use App\Services\AdminStatsService;
 use App\Services\ConfigCacheService;
@@ -25,8 +27,6 @@ use App\Services\NotificationService;
 use App\Services\PublicTimelineService;
 use App\Services\SnowflakeService;
 use App\Services\StatusService;
-use App\Status;
-use App\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;

app/Http/Controllers/Api/ApiV1Controller.php

@@ -2,19 +2,10 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Avatar;
-use App\Bookmark;
-use App\Collection;
-use App\CollectionItem;
-use App\DirectMessage;
-use App\Follower;
-use App\FollowRequest;
-use App\Hashtag;
 use App\Http\Controllers\AccountController;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\FollowerController;
 use App\Http\Controllers\StatusController;
-use App\Instance;
 use App\Jobs\AvatarPipeline\AvatarOptimize;
 use App\Jobs\CommentPipeline\CommentPipeline;
 use App\Jobs\FollowPipeline\FollowAcceptPipeline;
@@ -33,12 +24,26 @@ use App\Jobs\SharePipeline\UndoSharePipeline;
 use App\Jobs\StatusPipeline\NewStatusPipeline;
 use App\Jobs\StatusPipeline\StatusDelete;
 use App\Jobs\VideoPipeline\VideoThumbnail;
-use App\Like;
-use App\Media;
+use App\Models\Avatar;
+use App\Models\Bookmark;
+use App\Models\Collection;
+use App\Models\CollectionItem;
 use App\Models\Conversation;
 use App\Models\CustomFilter;
-use App\Notification;
-use App\Profile;
+use App\Models\DirectMessage;
+use App\Models\Follower;
+use App\Models\FollowRequest;
+use App\Models\Hashtag;
+use App\Models\Instance;
+use App\Models\Like;
+use App\Models\Media;
+use App\Models\Notification;
+use App\Models\Profile;
+use App\Models\Status;
+use App\Models\StatusHashtag;
+use App\Models\User;
+use App\Models\UserFilter;
+use App\Models\UserSetting;
 use App\Services\AccountService;
 use App\Services\AdminShadowFilterService;
 use App\Services\BookmarkService;
@@ -65,16 +70,11 @@ use App\Services\StatusService;
 use App\Services\UserFilterService;
 use App\Services\UserRoleService;
 use App\Services\UserStorageService;
-use App\Status;
-use App\StatusHashtag;
 use App\Transformer\Api\Mastodon\v1\AccountTransformer;
 use App\Transformer\Api\Mastodon\v1\MediaTransformer;
 use App\Transformer\Api\Mastodon\v1\NotificationTransformer;
 use App\Transformer\Api\Mastodon\v1\StatusTransformer;
 use App\Transformer\Api\RelationshipTransformer;
-use App\User;
-use App\UserFilter;
-use App\UserSetting;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\PrettyNumber;
 use App\Util\Localization\Localization;

app/Http/Controllers/Api/ApiV1Dot1Controller.php

@@ -2,9 +2,6 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\AccountLog;
-use App\EmailVerification;
-use App\Follower;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\StatusController;
 use App\Http\Resources\StatusStateless;
@@ -16,10 +13,18 @@ use App\Jobs\StatusPipeline\StatusDelete;
 use App\Jobs\VideoPipeline\VideoThumbnail;
 use App\Mail\ConfirmAppEmail;
 use App\Mail\PasswordChange;
-use App\Media;
-use App\Place;
-use App\Profile;
-use App\Report;
+use App\Models\AccountLog;
+use App\Models\EmailVerification;
+use App\Models\Follower;
+use App\Models\Media;
+use App\Models\Place;
+use App\Models\Profile;
+use App\Models\Report;
+use App\Models\Status;
+use App\Models\StatusArchived;
+use App\Models\Story;
+use App\Models\User;
+use App\Models\UserSetting;
 use App\Rules\ExpoPushTokenRule;
 use App\Services\AccountService;
 use App\Services\BouncerService;
@@ -37,12 +42,7 @@ use App\Services\StatusService;
 use App\Services\UserAgentService;
 use App\Services\UserRoleService;
 use App\Services\UserStorageService;
-use App\Status;
-use App\StatusArchived;
-use App\Story;
 use App\Transformer\Api\AccountTransformer;
-use App\User;
-use App\UserSetting;
 use App\Util\Lexer\RestrictedNames;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;

app/Http/Controllers/Api/ApiV2Controller.php

@@ -6,7 +6,9 @@ use App\Http\Controllers\Controller;
 use App\Jobs\ImageOptimizePipeline\ImageOptimize;
 use App\Jobs\MediaPipeline\MediaDeletePipeline;
 use App\Jobs\VideoPipeline\VideoThumbnail;
-use App\Media;
+use App\Models\Media;
+use App\Models\User;
+use App\Models\UserSetting;
 use App\Services\AccountService;
 use App\Services\FollowerService;
 use App\Services\InstanceService;
@@ -20,8 +22,6 @@ use App\Services\UserFilterService;
 use App\Services\UserRoleService;
 use App\Services\UserStorageService;
 use App\Transformer\Api\Mastodon\v1\MediaTransformer;
-use App\User;
-use App\UserSetting;
 use App\Util\Media\Filter;
 use App\Util\Site\Nodeinfo;
 use Illuminate\Http\JsonResponse;

app/Http/Controllers/Api/BaseApiController.php

@@ -2,16 +2,16 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Avatar;
 use App\Http\Controllers\AvatarController;
 use App\Http\Controllers\Controller;
 use App\Jobs\AvatarPipeline\AvatarOptimize;
 use App\Jobs\NotificationPipeline\NotificationWarmUserCache;
+use App\Models\Avatar;
+use App\Models\Status;
+use App\Models\StatusArchived;
 use App\Services\AccountService;
 use App\Services\NotificationService;
 use App\Services\StatusService;
-use App\Status;
-use App\StatusArchived;
 use App\Transformer\Api\StatusStatelessTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;

app/Http/Controllers/Api/V1/Admin/DomainBlocksController.php

@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Api\V1\Admin;
 
 use App\Http\Controllers\Api\ApiController;
 use App\Http\Resources\MastoApi\Admin\DomainBlockResource;
-use App\Instance;
+use App\Models\Instance;
 use App\Services\InstanceService;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;

app/Http/Controllers/Api/V1/TagsController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Hashtag;
-use App\HashtagFollow;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\MastoApi\FollowedTagResource;
 use App\Jobs\HomeFeedPipeline\HashtagUnfollowPipeline;
+use App\Models\Hashtag;
+use App\Models\HashtagFollow;
 use App\Services\AccountService;
 use App\Services\HashtagFollowService;
 use App\Services\HashtagRelatedService;

app/Http/Controllers/AppRegisterController.php

@@ -4,8 +4,8 @@ namespace App\Http\Controllers;
 
 use App\Mail\InAppRegisterEmailVerify;
 use App\Models\AppRegister;
+use App\Models\User;
 use App\Services\AccountService;
-use App\User;
 use App\Util\Lexer\RestrictedNames;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;

app/Http/Controllers/Auth/LoginController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\AccountLog;
 use App\Http\Controllers\Controller;
+use App\Models\AccountLog;
+use App\Models\User;
 use App\Services\BouncerService;
-use App\User;
 use Illuminate\Contracts\View\View;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;

app/Http/Controllers/Auth/RegisterController.php

@@ -3,9 +3,9 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Models\User;
 use App\Services\BouncerService;
 use App\Services\EmailService;
-use App\User;
 use App\Util\Lexer\RestrictedNames;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Contracts\View\View;

app/Http/Controllers/AvatarController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Avatar;
 use App\Jobs\AvatarPipeline\AvatarOptimize;
+use App\Models\Avatar;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;

app/Http/Controllers/BookmarkController.php

@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use App\Bookmark;
+use App\Models\Bookmark;
+use App\Models\Status;
 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

app/Http/Controllers/CircleController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Circle;
+use App\Models\Circle;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;

app/Http/Controllers/CollectionController.php

@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers;
 
-use App\Collection;
-use App\CollectionItem;
+use App\Models\Collection;
+use App\Models\CollectionItem;
+use App\Models\Status;
 use App\Services\AccountService;
 use App\Services\CollectionService;
 use App\Services\FollowerService;
 use App\Services\StatusService;
-use App\Status;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
 

app/Http/Controllers/CommentController.php

@@ -4,12 +4,12 @@ namespace App\Http\Controllers;
 
 use App\Jobs\CommentPipeline\CommentPipeline;
 use App\Jobs\StatusPipeline\NewStatusPipeline;
-use App\Profile;
+use App\Models\Profile;
+use App\Models\Status;
+use App\Models\UserFilter;
 use App\Services\FollowerService;
 use App\Services\StatusService;
-use App\Status;
 use App\Transformer\Api\StatusTransformer;
-use App\UserFilter;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use League\Fractal;

app/Http/Controllers/ComposeController.php

@@ -2,17 +2,19 @@
 
 namespace App\Http\Controllers;
 
-use App\Collection;
-use App\CollectionItem;
-use App\Hashtag;
 use App\Jobs\ImageOptimizePipeline\ImageOptimize;
 use App\Jobs\StatusPipeline\NewStatusPipeline;
 use App\Jobs\VideoPipeline\VideoThumbnail;
-use App\Media;
-use App\MediaTag;
+use App\Models\Collection;
+use App\Models\CollectionItem;
+use App\Models\Hashtag;
+use App\Models\Media;
+use App\Models\MediaTag;
+use App\Models\Notification;
 use App\Models\Poll;
-use App\Notification;
-use App\Profile;
+use App\Models\Profile;
+use App\Models\Status;
+use App\Models\UserFilter;
 use App\Services\AccountService;
 use App\Services\CollectionService;
 use App\Services\MediaBlocklistService;
@@ -23,9 +25,7 @@ use App\Services\PlaceService;
 use App\Services\SnowflakeService;
 use App\Services\UserRoleService;
 use App\Services\UserStorageService;
-use App\Status;
 use App\Transformer\Api\MediaTransformer;
-use App\UserFilter;
 use App\Util\Media\Filter;
 use App\Util\Media\License;
 use Illuminate\Contracts\View\View;

app/Http/Controllers/ContactController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Contact;
 use App\Jobs\ContactPipeline\ContactPipeline;
+use App\Models\Contact;
 use App\Rules\MaxMultiLine;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;

app/Http/Controllers/DirectMessageController.php

@@ -2,14 +2,16 @@
 
 namespace App\Http\Controllers;
 
-use App\DirectMessage;
 use App\Jobs\DirectPipeline\DirectDeletePipeline;
 use App\Jobs\DirectPipeline\DirectDeliverPipeline;
 use App\Jobs\StatusPipeline\StatusDelete;
-use App\Media;
 use App\Models\Conversation;
-use App\Notification;
-use App\Profile;
+use App\Models\DirectMessage;
+use App\Models\Media;
+use App\Models\Notification;
+use App\Models\Profile;
+use App\Models\Status;
+use App\Models\UserFilter;
 use App\Services\AccountService;
 use App\Services\FollowerService;
 use App\Services\MediaBlocklistService;
@@ -20,8 +22,6 @@ use App\Services\UserFilterService;
 use App\Services\UserRoleService;
 use App\Services\UserStorageService;
 use App\Services\WebfingerService;
-use App\Status;
-use App\UserFilter;
 use App\Util\ActivityPub\Helpers;
 use App\Util\Lexer\Autolink;
 use Illuminate\Http\JsonResponse;

app/Http/Controllers/DiscoverController.php

@@ -2,9 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\Hashtag;
-use App\Instance;
-use App\Like;
+use App\Models\Hashtag;
+use App\Models\Instance;
+use App\Models\Like;
+use App\Models\Status;
 use App\Services\AccountService;
 use App\Services\AdminShadowFilterService;
 use App\Services\BookmarkService;
@@ -19,7 +20,6 @@ use App\Services\StatusHashtagService;
 use App\Services\StatusService;
 use App\Services\TrendingHashtagService;
 use App\Services\UserFilterService;
-use App\Status;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;

app/Http/Controllers/FederationController.php

@@ -5,10 +5,10 @@ namespace App\Http\Controllers;
 use App\Jobs\InboxPipeline\DeleteWorker;
 use App\Jobs\InboxPipeline\InboxValidator;
 use App\Jobs\InboxPipeline\InboxWorker;
-use App\Profile;
+use App\Models\Profile;
+use App\Models\Status;
 use App\Services\AccountService;
 use App\Services\InstanceService;
-use App\Status;
 use App\Util\Lexer\Nickname;
 use App\Util\Site\Nodeinfo;
 use App\Util\Webfinger\Webfinger;

app/Http/Controllers/GroupController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Instance;
 use App\Models\Group;
 use App\Models\GroupBlock;
 use App\Models\GroupCategory;
@@ -12,13 +11,14 @@ use App\Models\GroupLimit;
 use App\Models\GroupMember;
 use App\Models\GroupPost;
 use App\Models\GroupReport;
-use App\Profile;
+use App\Models\Instance;
+use App\Models\Profile;
+use App\Models\Status;
+use App\Models\User;
 use App\Services\AccountService;
 use App\Services\GroupService;
 use App\Services\HashidService;
 use App\Services\StatusService;
-use App\Status;
-use App\User;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;

app/Http/Controllers/GroupFederationController.php

@@ -5,8 +5,8 @@ namespace App\Http\Controllers;
 use App\Models\Group;
 use App\Models\GroupPost;
 use App\Models\InstanceActor;
+use App\Models\Status;
 use App\Services\MediaService;
-use App\Status;
 use App\Util\Lexer\Autolink;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;

app/Http/Controllers/Groups/GroupsAdminController.php

@@ -3,14 +3,14 @@
 namespace App\Http\Controllers\Groups;
 
 use App\Http\Controllers\Controller;
-use App\Instance;
 use App\Models\Group;
 use App\Models\GroupBlock;
 use App\Models\GroupInteraction;
 use App\Models\GroupMember;
 use App\Models\GroupPost;
 use App\Models\GroupReport;
-use App\Profile;
+use App\Models\Instance;
+use App\Models\Profile;
 use App\Services\Groups\GroupAccountService;
 use App\Services\Groups\GroupPostService;
 use App\Services\GroupService;

app/Http/Controllers/Groups/GroupsNotificationsController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Groups;
 
 use App\Http\Controllers\Controller;
-use App\Notification;
+use App\Models\Notification;
 use App\Services\AccountService;
 use App\Services\GroupService;
 use App\Services\StatusService;

app/Http/Controllers/Groups/GroupsPostController.php

@@ -8,12 +8,12 @@ use App\Jobs\GroupsPipeline\ImageS3UploadPipeline;
 use App\Jobs\GroupsPipeline\NewPostPipeline;
 use App\Jobs\StatusPipeline\StatusDelete;
 use App\Jobs\VideoPipeline\VideoThumbnail;
-use App\Media;
 use App\Models\Group;
 use App\Models\GroupLike;
 use App\Models\GroupMedia;
 use App\Models\GroupPost;
-use App\Profile;
+use App\Models\Media;
+use App\Models\Profile;
 use App\Services\Groups\GroupFeedService;
 use App\Services\Groups\GroupMediaService;
 use App\Services\Groups\GroupPostService;

app/Http/Controllers/Groups/GroupsSearchController.php

@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers\Groups;
 
-use App\Follower;
 use App\Http\Controllers\Controller;
+use App\Models\Follower;
 use App\Models\Group;
 use App\Models\GroupInvitation;
 use App\Models\GroupMember;
-use App\Profile;
+use App\Models\Profile;
 use App\Services\AccountService;
 use App\Services\Groups\GroupActivityPubService;
 use App\Services\GroupService;

app/Http/Controllers/HashtagFollowController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Hashtag;
-use App\HashtagFollow;
+use App\Models\Hashtag;
+use App\Models\HashtagFollow;
 use App\Services\HashtagService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;

app/Http/Controllers/Import/Instagram.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers\Import;
 
-use App\ImportData;
-use App\ImportJob;
 use App\Jobs\ImportPipeline\ImportInstagram;
+use App\Models\ImportData;
+use App\Models\ImportJob;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;

app/Http/Controllers/ImportPostController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use App\Follower;
 use App\Http\Resources\ImportStatus;
+use App\Models\Follower;
 use App\Models\ImportPost;
+use App\Models\User;
 use App\Services\ImportService;
-use App\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;

app/Http/Controllers/InstallController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;

app/Http/Controllers/InternalApiController.php

@@ -2,23 +2,23 @@
 
 namespace App\Http\Controllers;
 
-use App\AccountInterstitial;
-use App\Bookmark;
-use App\DirectMessage;
-use App\DiscoverCategory;
-use App\Follower;
 use App\Jobs\ModPipeline\HandleSpammerPipeline;
-use App\Profile;
+use App\Models\AccountInterstitial;
+use App\Models\Bookmark;
+use App\Models\DirectMessage;
+use App\Models\DiscoverCategory;
+use App\Models\Follower;
+use App\Models\Profile;
+use App\Models\Status;
+use App\Models\User;
 use App\Services\BookmarkService;
 use App\Services\DiscoverService;
 use App\Services\FollowerService;
 use App\Services\ModLogService;
 use App\Services\PublicTimelineService;
-use App\Services\StatusService;
+use App\Services\StatusService; // StatusMediaContainerTransformer,
 use App\Services\UserFilterService;
-use App\Status; // StatusMediaContainerTransformer,
 use App\Transformer\Api\StatusTransformer;
-use App\User;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;