Migrated User model (#960)

Migrate the user model to the new standard place --------- Co-authored-by: spitfire305 <[email protected]>
owlchester · Aug 27, 2024 · ac74a41 · ac74a41
1 parent 92aa93f
commit ac74a41
Show file tree

Hide file tree

Showing 163 changed files with 182 additions and 179 deletions.
diff --git a/app/Console/Commands/Campaigns/ExportCommand.php b/app/Console/Commands/Campaigns/ExportCommand.php
@@ -4,7 +4,7 @@
 
 use App\Models\Campaign;
 use App\Services\Campaign\ExportService;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 

diff --git a/app/Console/Commands/Migrations/MigrateTutorials.php b/app/Console/Commands/Migrations/MigrateTutorials.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands\Migrations;
 
 use App\Models\Users\Tutorial;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
 

diff --git a/app/Console/Commands/Migrations/MigrateUserPreferences.php b/app/Console/Commands/Migrations/MigrateUserPreferences.php
@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands\Migrations;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class MigrateUserPreferences extends Command

diff --git a/app/Console/Commands/Migrations/NewsletterSubCommand.php b/app/Console/Commands/Migrations/NewsletterSubCommand.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands\Migrations;
 
 use App\Services\NewsletterService;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class NewsletterSubCommand extends Command

diff --git a/app/Console/Commands/PurgeBots.php b/app/Console/Commands/PurgeBots.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Jobs\Users\DeleteUser;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;

diff --git a/app/Console/Commands/RegenerateDiscordToken.php b/app/Console/Commands/RegenerateDiscordToken.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Services\DiscordService;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use App\Models\UserApp;
 use Illuminate\Console\Command;

diff --git a/app/Console/Commands/ResetUserPassword.php b/app/Console/Commands/ResetUserPassword.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Models\UserLog;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;

diff --git a/app/Console/Commands/SendNotification.php b/app/Console/Commands/SendNotification.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Notifications\Header;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class SendNotification extends Command

diff --git a/app/Console/Commands/Subscriptions/ExpiringCardCommand.php b/app/Console/Commands/Subscriptions/ExpiringCardCommand.php
@@ -4,7 +4,7 @@
 
 use App\Jobs\Emails\Subscriptions\ExpiringCardAlert;
 use App\Traits\HasJobLog;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 

diff --git a/app/Console/Commands/Subscriptions/SubCleanupCommand.php b/app/Console/Commands/Subscriptions/SubCleanupCommand.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands\Subscriptions;
 
 use App\Jobs\SubscriptionEndJob;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class SubCleanupCommand extends Command

diff --git a/app/Console/Commands/SyncUserRoles.php b/app/Console/Commands/SyncUserRoles.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Services\DiscordService;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class SyncUserRoles extends Command

diff --git a/app/Console/Commands/TestEmail.php b/app/Console/Commands/TestEmail.php
@@ -34,7 +34,7 @@ class TestEmail extends Command
     public function handle()
     {
         $userId = $this->argument('user');
-        $user = \App\User::findOrFail($userId);
+        $user = \App\Models\User::findOrFail($userId);
 
         $template = $this->argument('template');
         if ($template === 'welcome') {

diff --git a/app/Console/Commands/Tests/Mailerlite.php b/app/Console/Commands/Tests/Mailerlite.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands\Tests;
 
 use App\Services\NewsletterService;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class Mailerlite extends Command

diff --git a/app/Http/Controllers/Api/v1/Campaign/UserApiController.php b/app/Http/Controllers/Api/v1/Campaign/UserApiController.php
@@ -6,7 +6,7 @@
 use App\Http\Requests\API\UpdateUserRole;
 use App\Http\Resources\UserResource;
 use App\Models\Campaign;
-use App\User;
+use App\Models\User;
 use App\Services\Campaign\MemberService;
 
 class UserApiController extends ApiController

diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
@@ -4,7 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Services\ReferralService;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Http\Request;

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -4,7 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Services\UserAuthenticatedService;
-use App\User;
+use App\Models\User;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -5,7 +5,7 @@
 use App\Http\Controllers\Controller;
 use App\Rules\AccountEmail;
 use App\Rules\AccountName;
-use App\User;
+use App\Models\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;

diff --git a/app/Http/Controllers/Billing/HistoryController.php b/app/Http/Controllers/Billing/HistoryController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Billing;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class HistoryController extends Controller

diff --git a/app/Http/Controllers/InvitationController.php b/app/Http/Controllers/InvitationController.php
@@ -4,7 +4,7 @@
 
 use App\Exceptions\RequireLoginException;
 use App\Services\InviteService;
-use App\User;
+use App\Models\User;
 use Exception;
 
 class InvitationController extends Controller

diff --git a/app/Http/Controllers/NotificationController.php b/app/Http/Controllers/NotificationController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Services\Layout\NavigationService;
-use App\User;
+use App\Models\User;
 
 class NotificationController extends Controller
 {

diff --git a/app/Http/Controllers/PasswordSecurityController.php b/app/Http/Controllers/PasswordSecurityController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\Settings\UserEnableTfa;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 use PragmaRX\Google2FA\Google2FA;
 use App\Models\PasswordSecurity;

diff --git a/app/Http/Controllers/Settings/AppearanceController.php b/app/Http/Controllers/Settings/AppearanceController.php
@@ -50,7 +50,7 @@ public function update(StoreSettingsLayout $request)
         if ($request->ajax()) {
             return response()->json();
         }
-        /** @var \App\User $user */
+        /** @var \App\Models\User $user */
         $user = $request->user();
         $settingFields = $request->only([
             'editor', 'advanced_mentions', 'new_entity_workflow',

diff --git a/app/Http/Controllers/Settings/BoostController.php b/app/Http/Controllers/Settings/BoostController.php
@@ -5,7 +5,7 @@
 use App\Facades\CampaignCache;
 use App\Http\Controllers\Controller;
 use App\Models\Campaign;
-use App\User;
+use App\Models\User;
 
 class BoostController extends Controller
 {

diff --git a/app/Http/Controllers/Settings/PremiumController.php b/app/Http/Controllers/Settings/PremiumController.php
@@ -7,7 +7,7 @@
 use App\Http\Controllers\Controller;
 use App\Models\Campaign;
 use App\Services\Campaign\BoostService;
-use App\User;
+use App\Models\User;
 
 class PremiumController extends Controller
 {

diff --git a/app/Http/Controllers/Settings/ProfileController.php b/app/Http/Controllers/Settings/ProfileController.php
@@ -5,7 +5,7 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\StoreBillingSettings;
 use App\Http\Requests\StoreSettingsProfile;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class ProfileController extends Controller

diff --git a/app/Http/Controllers/Settings/SubscriptionApiController.php b/app/Http/Controllers/Settings/SubscriptionApiController.php
@@ -5,7 +5,7 @@
 use App\Http\Requests\ValidateCoupon;
 use App\Services\Subscription\CouponService;
 use App\Services\SubscriptionService;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;

diff --git a/app/Http/Controllers/Settings/SubscriptionController.php b/app/Http/Controllers/Settings/SubscriptionController.php
@@ -12,7 +12,7 @@
 use App\Services\SubscriptionUpgradeService;
 use App\Services\Users\CurrencyService;
 use App\Services\Users\EmailValidationService;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;

diff --git a/app/Http/Controllers/User/ProfileController.php b/app/Http/Controllers/User/ProfileController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 
 class ProfileController extends Controller
 {

diff --git a/app/Http/Controllers/WebhookController.php b/app/Http/Controllers/WebhookController.php
@@ -8,7 +8,7 @@
 use App\Models\UserLog;
 use App\Services\Subscription\PaymentMethodService;
 use App\Services\SubscriptionService;
-use App\User;
+use App\Models\User;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Log;
 use Laravel\Cashier\Http\Controllers\WebhookController as CashierController;

diff --git a/app/Http/Middleware/LocaleChange.php b/app/Http/Middleware/LocaleChange.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use App\User;
+use App\Models\User;
 use Closure;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;

diff --git a/app/Http/Resources/ProfileResource.php b/app/Http/Resources/ProfileResource.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Resources;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class ProfileResource extends JsonResource

diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
@@ -3,7 +3,7 @@
 namespace App\Http\Resources;
 
 use App\Facades\CampaignLocalization;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserResource extends JsonResource

diff --git a/app/Jobs/Campaigns/Export.php b/app/Jobs/Campaigns/Export.php
@@ -6,7 +6,7 @@
 use App\Models\Campaign;
 use App\Models\CampaignExport;
 use App\Services\Campaign\ExportService;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

diff --git a/app/Jobs/Copyright/DeleteUserImage.php b/app/Jobs/Copyright/DeleteUserImage.php
@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Copyright;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;

diff --git a/app/Jobs/DiscordRoleJob.php b/app/Jobs/DiscordRoleJob.php
@@ -3,7 +3,7 @@
 namespace App\Jobs;
 
 use App\Services\DiscordService;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

diff --git a/app/Jobs/Emails/MailSettingsChangeJob.php b/app/Jobs/Emails/MailSettingsChangeJob.php
@@ -3,7 +3,7 @@
 namespace App\Jobs\Emails;
 
 use App\Services\NewsletterService;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;

diff --git a/app/Jobs/Emails/Purge/FirstWarningJob.php b/app/Jobs/Emails/Purge/FirstWarningJob.php
@@ -4,7 +4,7 @@
 
 use App\Mail\Purge\FirstWarning;
 use App\Models\UserLog;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

diff --git a/app/Jobs/Emails/Purge/SecondWarningJob.php b/app/Jobs/Emails/Purge/SecondWarningJob.php
@@ -4,7 +4,7 @@
 
 use App\Mail\Purge\SecondWarning;
 use App\Models\UserLog;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

diff --git a/app/Jobs/Emails/SubscriptionCancelEmailJob.php b/app/Jobs/Emails/SubscriptionCancelEmailJob.php
@@ -4,7 +4,7 @@
 
 use App\Mail\Subscription\Admin\CancelledSubscriptionMail;
 use App\Mail\Subscription\User\CancelledUserSubscriptionMail;
-use App\User;
+use App\Models\User;
 use App\Models\UserLog;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

diff --git a/app/Jobs/Emails/SubscriptionCreatedEmailJob.php b/app/Jobs/Emails/SubscriptionCreatedEmailJob.php
@@ -4,7 +4,7 @@
 
 use App\Enums\PricingPeriod;
 use App\Mail\Subscription\Admin\NewSubscriptionMail;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;

diff --git a/app/Jobs/Emails/SubscriptionDeletedEmailJob.php b/app/Jobs/Emails/SubscriptionDeletedEmailJob.php
@@ -3,7 +3,7 @@
 namespace App\Jobs\Emails;
 
 use App\Notifications\Header;
-use App\User;
+use App\Models\User;
 use App\Models\UserLog;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

diff --git a/app/Jobs/Emails/SubscriptionDowngradedEmailJob.php b/app/Jobs/Emails/SubscriptionDowngradedEmailJob.php
@@ -3,7 +3,7 @@
 namespace App\Jobs\Emails;
 
 use App\Mail\Subscription\Admin\DowngradedSubscriptionMail;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;

diff --git a/app/Jobs/Emails/SubscriptionFailedEmailJob.php b/app/Jobs/Emails/SubscriptionFailedEmailJob.php
@@ -4,7 +4,7 @@
 
 use App\Mail\Subscription\User\FailedUserSubscriptionMail;
 use App\Notifications\Header;
-use App\User;
+use App\Models\User;
 use App\Models\UserLog;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

diff --git a/app/Jobs/Emails/Subscriptions/EmailValidationJob.php b/app/Jobs/Emails/Subscriptions/EmailValidationJob.php
@@ -4,7 +4,7 @@
 
 use App\Mail\Subscription\User\ValidationEmail;
 use App\Models\UserValidation;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;