diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index b7fdbd6ad..14dde33b9 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -16,7 +16,6 @@ use App\Services\NotificationService; use App\Services\RelationshipService; use App\Services\UserFilterService; use App\Transformer\Api\Mastodon\v1\AccountTransformer; -use Carbon\Carbon; use Illuminate\Contracts\View\View; use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; @@ -56,7 +55,7 @@ class AccountController extends Controller $action = $request->input('a'); $allowed = ['like', 'follow']; - $timeago = Carbon::now()->subMonths(3); + $timeago = now()->subMonths(3); $profile = $request->user()->profile; $following = $profile->following->pluck('id'); diff --git a/app/Http/Controllers/Admin/AdminReportController.php b/app/Http/Controllers/Admin/AdminReportController.php index 293ac7b1f..d20ddc0d9 100644 --- a/app/Http/Controllers/Admin/AdminReportController.php +++ b/app/Http/Controllers/Admin/AdminReportController.php @@ -27,7 +27,6 @@ use App\Services\NotificationService; use App\Services\PublicTimelineService; use App\Services\StatusService; use App\Util\ActivityPub\Helpers; -use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; @@ -495,7 +494,7 @@ trait AdminReportController public function handleReportAction(Report $report, $action) { $item = $report->reported(); - $report->admin_seen = Carbon::now(); + $report->admin_seen = now(); switch ($action) { case 'ignore': diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index 05d28a3ad..118256aab 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -81,7 +81,6 @@ use App\Util\Lexer\PrettyNumber; use App\Util\Localization\Localization; use App\Util\Media\Filter; use App\Util\Media\License; -use Carbon\Carbon; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Http\Response; @@ -2362,7 +2361,7 @@ class ApiV1Controller extends Controller ->where('created_at', '>', now()->subHours(2)) ->find($rpid); if ($removeMedia) { - $dateTime = Carbon::now(); + $dateTime = now(); MediaDeletePipeline::dispatch($removeMedia) ->onQueue('mmo') ->delay($dateTime->addMinutes(15)); diff --git a/app/Http/Controllers/Settings/SecuritySettings.php b/app/Http/Controllers/Settings/SecuritySettings.php index 80b7d1c34..0860cd436 100644 --- a/app/Http/Controllers/Settings/SecuritySettings.php +++ b/app/Http/Controllers/Settings/SecuritySettings.php @@ -8,7 +8,6 @@ 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\Str; use PragmaRX\Google2FA\Google2FA; @@ -88,7 +87,7 @@ trait SecuritySettings $verify = $google2fa->verifyKey($user->{'2fa_secret'}, $code); if ($verify) { $user->{'2fa_enabled'} = true; - $user->{'2fa_setup_at'} = Carbon::now(); + $user->{'2fa_setup_at'} = now(); $user->save(); return response()->json(['msg' => 'success']); diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 7d3e03908..c9ab9bf66 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -14,7 +14,6 @@ use App\Models\OauthClient; use App\Models\ProfileSponsor; use App\Models\UserSetting; use App\Services\AccountService; -use Carbon\Carbon; use Illuminate\Contracts\View\View; use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; @@ -144,7 +143,7 @@ class SettingsController extends Controller ]); $profile = $user->profile; - $ts = Carbon::now()->addMonth(); + $ts = now()->addMonth(); $user->email = $user->id; $user->password = ''; $user->status = 'delete'; diff --git a/app/Http/Middleware/DangerZone.php b/app/Http/Middleware/DangerZone.php index fac349e2b..cdbe77c71 100644 --- a/app/Http/Middleware/DangerZone.php +++ b/app/Http/Middleware/DangerZone.php @@ -2,7 +2,6 @@ namespace App\Http\Middleware; -use Carbon\Carbon; use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -38,7 +37,7 @@ class DangerZone return redirect('/i/auth/sudo'); } - if ($request->session()->get('sudoMode') < Carbon::now()->subMinutes(30)->timestamp) { + if ($request->session()->get('sudoMode') < now()->subMinutes(30)->timestamp) { $request->session()->put('redirectNext', $request->url()); return redirect('/i/auth/sudo'); diff --git a/app/Jobs/AvatarPipeline/AvatarOptimize.php b/app/Jobs/AvatarPipeline/AvatarOptimize.php index 0fd8547bf..5ba557350 100644 --- a/app/Jobs/AvatarPipeline/AvatarOptimize.php +++ b/app/Jobs/AvatarPipeline/AvatarOptimize.php @@ -5,7 +5,6 @@ namespace App\Jobs\AvatarPipeline; use App\Models\Avatar; use App\Models\Profile; use App\Util\Media\ImageDriverManager; -use Carbon\Carbon; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; @@ -94,7 +93,7 @@ class AvatarOptimize implements ShouldQueue $avatar = Avatar::whereProfileId($this->profile->id)->firstOrFail(); $avatar->change_count = ++$avatar->change_count; - $avatar->last_processed_at = Carbon::now(); + $avatar->last_processed_at = now(); $avatar->save(); Cache::forget('avatar:'.$avatar->profile_id); $this->deleteOldAvatar($avatar->media_path, $this->current); diff --git a/app/Jobs/ImageOptimizePipeline/ImageThumbnail.php b/app/Jobs/ImageOptimizePipeline/ImageThumbnail.php index 80e22625b..12b5efe76 100644 --- a/app/Jobs/ImageOptimizePipeline/ImageThumbnail.php +++ b/app/Jobs/ImageOptimizePipeline/ImageThumbnail.php @@ -4,7 +4,6 @@ namespace App\Jobs\ImageOptimizePipeline; use App\Models\Media; use App\Util\Media\Image; -use Carbon\Carbon; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; @@ -73,7 +72,7 @@ class ImageThumbnail implements ShouldQueue return; } - $media->processed_at = Carbon::now(); + $media->processed_at = now(); $media->save(); ImageUpdate::dispatch($media)->onQueue('mmo'); diff --git a/app/Jobs/ImportPipeline/ImportInstagram.php b/app/Jobs/ImportPipeline/ImportInstagram.php index 853c6e936..0e525b6d4 100644 --- a/app/Jobs/ImportPipeline/ImportInstagram.php +++ b/app/Jobs/ImportPipeline/ImportInstagram.php @@ -85,7 +85,7 @@ class ImportInstagram implements ShouldQueue $min = Carbon::create(2010, 10, 6, 0, 0, 0); $taken_at = Carbon::parse($import['taken_at']); if (! $min->lt($taken_at)) { - $taken_at = Carbon::now(); + $taken_at = now(); } } catch (\Exception $e) { @@ -139,7 +139,7 @@ class ImportInstagram implements ShouldQueue }); } - $job->completed_at = Carbon::now(); + $job->completed_at = now(); $job->save(); } } diff --git a/app/Services/AdminStatsService.php b/app/Services/AdminStatsService.php index c07797eba..cddaf70cb 100644 --- a/app/Services/AdminStatsService.php +++ b/app/Services/AdminStatsService.php @@ -12,7 +12,6 @@ use App\Models\Report; use App\Models\Status; use App\Models\User; use App\Util\Lexer\PrettyNumber; -use Carbon\Carbon; use DateInterval; use DatePeriod; use Illuminate\Support\Facades\Cache; @@ -95,7 +94,7 @@ class AdminStatsService return Cache::remember('admin:dashboard:home:data:v0:24hr', $ttl, function () { return [ - 'failedjobs' => PrettyNumber::convert(FailedJob::where('failed_at', '>=', Carbon::now()->subDay())->count()), + 'failedjobs' => PrettyNumber::convert(FailedJob::where('failed_at', '>=', now()->subDay())->count()), 'statuses' => PrettyNumber::convert(intval(StatusService::totalLocalStatuses())), 'statuses_monthly' => PrettyNumber::convert(Status::where('created_at', '>', now()->subMonth())->count()), 'profiles' => PrettyNumber::convert(Profile::count()), diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index 1c6db9a69..016ac4a45 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -555,7 +555,7 @@ class Helpers { try { $date = Carbon::parse($timestamp); - $now = Carbon::now(); + $now = now(); $tenYearsAgo = $now->copy()->subYears(20); $isMoreThanTenYearsOld = $date->lt($tenYearsAgo); $tomorrow = $now->copy()->addDay();