diff --git a/app/Console/Commands/AvatarDefaultMigration.php b/app/Console/Commands/AvatarDefaultMigration.php index d56ad25df..db18a96e9 100644 --- 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 diff --git a/app/Console/Commands/AvatarStorage.php b/app/Console/Commands/AvatarStorage.php index ac15af85d..8abbd43b7 100644 --- 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 { diff --git a/app/Console/Commands/AvatarStorageDeepClean.php b/app/Console/Commands/AvatarStorageDeepClean.php index 4e6e40e1c..ed493c983 100644 --- 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 { diff --git a/app/Console/Commands/FixDuplicateProfiles.php b/app/Console/Commands/FixDuplicateProfiles.php index 9b5fdfaa4..452434989 100644 --- 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) diff --git a/app/Console/Commands/FixMissingUserProfile.php b/app/Console/Commands/FixMissingUserProfile.php index 11647e3c0..35c9c78b3 100644 --- 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; diff --git a/app/Console/Commands/FixUsernames.php b/app/Console/Commands/FixUsernames.php index 4c355dd14..4d3eff00e 100644 --- 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 diff --git a/app/Console/Commands/GenerateInstanceActor.php b/app/Console/Commands/GenerateInstanceActor.php index 82c3d560a..1bad66d91 100644 --- 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 diff --git a/app/Console/Commands/HashtagCachedCountUpdate.php b/app/Console/Commands/HashtagCachedCountUpdate.php index d0ff36a60..a1929584e 100644 --- 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 { diff --git a/app/Console/Commands/ImportCities.php b/app/Console/Commands/ImportCities.php index e4ce7839c..9a9ddc01c 100644 --- 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]; diff --git a/app/Console/Commands/ImportUploadCleanStorage.php b/app/Console/Commands/ImportUploadCleanStorage.php index f80fda999..268d6e524 100644 --- 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 { diff --git a/app/Console/Commands/InstanceUpdateTotalLocalPosts.php b/app/Console/Commands/InstanceUpdateTotalLocalPosts.php index ae3db5eff..92ffe87b0 100644 --- 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 { diff --git a/app/Console/Commands/MediaCloudUrlRewrite.php b/app/Console/Commands/MediaCloudUrlRewrite.php index 016fdb5af..a15644b0c 100644 --- 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; diff --git a/app/Console/Commands/RegenerateThumbnails.php b/app/Console/Commands/RegenerateThumbnails.php index 8403bb475..40ae42f8e 100644 --- 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); } }); }); diff --git a/app/Console/Commands/SendUpdateActor.php b/app/Console/Commands/SendUpdateActor.php index ac05fd493..cecb60774 100644 --- 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 diff --git a/app/Console/Commands/SoftwareUpdateRefresh.php b/app/Console/Commands/SoftwareUpdateRefresh.php index e6735001b..cdb9ee241 100644 --- 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 { diff --git a/app/Console/Commands/StatusDedupe.php b/app/Console/Commands/StatusDedupe.php index 12a3c5ce5..a56a5cfc1 100644 --- 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 { diff --git a/app/Console/Commands/TransformImports.php b/app/Console/Commands/TransformImports.php index b22303563..fdc92628b 100644 --- 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 { diff --git a/app/DirectMessage.php b/app/DirectMessage.php index 963699d20..899efaf19 100644 --- 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 { diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 1c05e1828..f4ed34bcd 100644 --- 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 diff --git a/app/Http/Controllers/Admin/AdminAutospamController.php b/app/Http/Controllers/Admin/AdminAutospamController.php index bffb396e6..18988ed37 100644 --- 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.'); diff --git a/app/Http/Controllers/Admin/AdminDirectoryController.php b/app/Http/Controllers/Admin/AdminDirectoryController.php index f53917a5d..fc2dc8182 100644 --- 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; diff --git a/app/Http/Controllers/Admin/AdminGroupsController.php b/app/Http/Controllers/Admin/AdminGroupsController.php index 45a4fd266..76d994713 100644 --- 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 { diff --git a/app/Http/Controllers/Admin/AdminInstanceController.php b/app/Http/Controllers/Admin/AdminInstanceController.php index 52c2c0307..10e75f3c2 100644 --- 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 diff --git a/app/Http/Controllers/Admin/AdminReportController.php b/app/Http/Controllers/Admin/AdminReportController.php index fe894401e..07b9fdfc3 100644 --- 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) { diff --git a/app/Http/Controllers/Admin/AdminSettingsController.php b/app/Http/Controllers/Admin/AdminSettingsController.php index 8a4b04025..aa974cbbc 100644 --- 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 { diff --git a/app/Http/Controllers/Admin/AdminUserController.php b/app/Http/Controllers/Admin/AdminUserController.php index 9bb264c6d..8733ab79c 100644 --- 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 diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 6b2ae0221..8f1c71121 100644 --- 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 { diff --git a/app/Http/Controllers/Api/AdminApiController.php b/app/Http/Controllers/Api/AdminApiController.php index 0c61dbd26..7c2cfa357 100644 --- 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; diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index 76c635e69..5da3376b5 100644 --- 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 { diff --git a/app/Http/Controllers/Api/ApiV1Dot1Controller.php b/app/Http/Controllers/Api/ApiV1Dot1Controller.php index 67cb96a1e..febd1e055 100644 --- 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 { diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php index 45848d423..80f2e0f4e 100644 --- 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; diff --git a/app/Http/Controllers/AvatarController.php b/app/Http/Controllers/AvatarController.php index 40f2f08b1..66335bb44 100644 --- 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 diff --git a/app/Http/Controllers/CircleController.php b/app/Http/Controllers/CircleController.php index 3955dbcaa..8e20ac17f 100644 --- 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 diff --git a/app/Http/Controllers/CollectionController.php b/app/Http/Controllers/CollectionController.php index 7dbba4716..240e0880f 100644 --- 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(); diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php index 42fefa989..9efe36296 100644 --- 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(); diff --git a/app/Http/Controllers/ComposeController.php b/app/Http/Controllers/ComposeController.php index 394cc0b0f..43dd00b08 100644 --- 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, diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index e62fc483d..948efabca 100644 --- 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 { diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php index 5a00dc930..51f427078 100644 --- 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 { diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php index a964cbeea..62c803821 100644 --- 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 { diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php index d560e3245..2a19c765c 100644 --- 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 { diff --git a/app/Http/Controllers/HashtagFollowController.php b/app/Http/Controllers/HashtagFollowController.php index 4fa91eebb..9fbc46b91 100644 --- 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 { diff --git a/app/Http/Controllers/Import/Instagram.php b/app/Http/Controllers/Import/Instagram.php index 153375890..1cbfa9c31 100644 --- 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 diff --git a/app/Http/Controllers/InstanceActorController.php b/app/Http/Controllers/InstanceActorController.php index 730837b01..728e6f783 100644 --- 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 { diff --git a/app/Http/Controllers/InternalApiController.php b/app/Http/Controllers/InternalApiController.php index 905de7c6e..d423634a0 100644 --- 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) diff --git a/app/Http/Controllers/LikeController.php b/app/Http/Controllers/LikeController.php index 6aca393e3..cb929d968 100644 --- 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 { diff --git a/app/Http/Controllers/MicroController.php b/app/Http/Controllers/MicroController.php index 62e0ae969..9094f6ba7 100644 --- 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(); } diff --git a/app/Http/Controllers/MobileController.php b/app/Http/Controllers/MobileController.php index 3b345fb17..8bb265d40 100644 --- 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 { diff --git a/app/Http/Controllers/NewsroomController.php b/app/Http/Controllers/NewsroomController.php index 3820033fd..9e6e0e4f7 100644 --- 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; diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index c4901fdc3..efee41244 100644 --- 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 { diff --git a/app/Http/Controllers/PixelfedDirectoryController.php b/app/Http/Controllers/PixelfedDirectoryController.php index d6a014d07..6d9fc7937 100644 --- 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 { diff --git a/app/Http/Controllers/PortfolioController.php b/app/Http/Controllers/PortfolioController.php index 5ab02acf6..f15d9644d 100644 --- 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 { diff --git a/app/Http/Controllers/ProfileAliasController.php b/app/Http/Controllers/ProfileAliasController.php index c022d4724..db5d918ba 100644 --- 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 { diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index ebf8b2643..ebcf59572 100644 --- 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)) { diff --git a/app/Http/Controllers/ProfileMigrationController.php b/app/Http/Controllers/ProfileMigrationController.php index b1526d1c6..ffcefa3d7 100644 --- 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 { diff --git a/app/Http/Controllers/ProfileSponsorController.php b/app/Http/Controllers/ProfileSponsorController.php index 99e228d53..66928c0d3 100644 --- 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); + } } diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php index 932a0280c..402dfd567 100644 --- 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; diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index e510bb0c1..b4401a73f 100644 --- 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; diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 8e4296e5b..604cf5974 100644 --- 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; diff --git a/app/Http/Controllers/SeasonalController.php b/app/Http/Controllers/SeasonalController.php index 5aba049a2..e54b99328 100644 --- 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', diff --git a/app/Http/Controllers/Settings/ExportSettings.php b/app/Http/Controllers/Settings/ExportSettings.php index bbbc2e7f2..6e0d8e50d 100644 --- 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 { diff --git a/app/Http/Controllers/Settings/HomeSettings.php b/app/Http/Controllers/Settings/HomeSettings.php index 057bc9fed..cb9969e5e 100644 --- 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; diff --git a/app/Http/Controllers/Settings/LabsSettings.php b/app/Http/Controllers/Settings/LabsSettings.php index d3910a0be..c1e3faf45 100644 --- 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 { diff --git a/app/Http/Controllers/Settings/PrivacySettings.php b/app/Http/Controllers/Settings/PrivacySettings.php index 6934a6eb5..604abc69d 100644 --- 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(); diff --git a/app/Http/Controllers/Settings/RelationshipSettings.php b/app/Http/Controllers/Settings/RelationshipSettings.php index 9325a79ea..435349738 100644 --- 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 { diff --git a/app/Http/Controllers/Settings/SecuritySettings.php b/app/Http/Controllers/Settings/SecuritySettings.php index 7b1fe9a70..285b16f5c 100644 --- 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; diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 30cf37cac..33e84797f 100644 --- 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; diff --git a/app/Http/Controllers/SiteController.php b/app/Http/Controllers/SiteController.php index 6837f7a94..8f9f2089d 100644 --- 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 { diff --git a/app/Http/Controllers/SpaController.php b/app/Http/Controllers/SpaController.php index 18a6c5020..0697f0ff6 100644 --- 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 diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index 29dc6f103..6d1175126 100644 --- 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 diff --git a/app/Http/Controllers/StoryComposeController.php b/app/Http/Controllers/StoryComposeController.php index 8473596c4..df093b37e 100644 --- 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 { diff --git a/app/Http/Controllers/StoryController.php b/app/Http/Controllers/StoryController.php index ad24e27e4..d51714970 100644 --- 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 { diff --git a/app/Http/Controllers/TimelineController.php b/app/Http/Controllers/TimelineController.php index b1692034e..c4b219f3b 100644 --- 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(); diff --git a/app/Http/Controllers/UserInviteController.php b/app/Http/Controllers/UserInviteController.php index a639ed488..b0b1efc66 100644 --- 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; diff --git a/app/Http/Middleware/AccountInterstitial.php b/app/Http/Middleware/AccountInterstitial.php index ade6acbe6..0e77f0109 100644 --- 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) diff --git a/app/Http/Middleware/Admin.php b/app/Http/Middleware/Admin.php index 963068ac6..135e5a9fa 100644 --- 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) diff --git a/app/Http/Middleware/Api/Admin.php b/app/Http/Middleware/Api/Admin.php index b6cb70052..3b7f0e9e8 100644 --- 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) diff --git a/app/Http/Middleware/DangerZone.php b/app/Http/Middleware/DangerZone.php index 3264f158a..53b825c65 100644 --- 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) diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php index 37a78d5a6..93f8d738c 100644 --- 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) diff --git a/app/Http/Middleware/TwoFactorAuth.php b/app/Http/Middleware/TwoFactorAuth.php index f300fb251..224ad57c8 100644 --- 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) diff --git a/app/Jobs/AutospamPipeline/AutospamUpdateCachedDataPipeline.php b/app/Jobs/AutospamPipeline/AutospamUpdateCachedDataPipeline.php index 5964213dc..a353276dc 100644 --- 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 diff --git a/app/Jobs/AvatarPipeline/AvatarOptimize.php b/app/Jobs/AvatarPipeline/AvatarOptimize.php index 2b63efcff..b3f2edf4d 100644 --- 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 { diff --git a/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php b/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php index f8a63c5bd..fffc16e52 100644 --- 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 { diff --git a/app/Jobs/CommentPipeline/CommentPipeline.php b/app/Jobs/CommentPipeline/CommentPipeline.php index 5d50083a3..314e05191 100644 --- 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); diff --git a/app/Jobs/ContactPipeline/ContactPipeline.php b/app/Jobs/ContactPipeline/ContactPipeline.php index 985729e8c..57ea332a2 100644 --- 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 { diff --git a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php index e7f7a9600..bf2817bd0 100644 --- 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(); diff --git a/app/Jobs/DeletePipeline/FanoutDeletePipeline.php b/app/Jobs/DeletePipeline/FanoutDeletePipeline.php index 01947ff26..3ea2734d9 100644 --- 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 diff --git a/app/Jobs/FollowPipeline/FollowPipeline.php b/app/Jobs/FollowPipeline/FollowPipeline.php index 2b3bbea59..9badc799a 100644 --- 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); diff --git a/app/Jobs/FollowPipeline/FollowServiceWarmCache.php b/app/Jobs/FollowPipeline/FollowServiceWarmCache.php index a83135b98..b96f068d2 100644 --- 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 { diff --git a/app/Jobs/FollowPipeline/FollowServiceWarmCacheLargeIngestPipeline.php b/app/Jobs/FollowPipeline/FollowServiceWarmCacheLargeIngestPipeline.php index 6f8c88d97..0ab8ee161 100644 --- 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 { diff --git a/app/Jobs/FollowPipeline/UnfollowPipeline.php b/app/Jobs/FollowPipeline/UnfollowPipeline.php index 73c29659d..146719247 100644 --- 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); diff --git a/app/Jobs/GroupPipeline/GroupCommentPipeline.php b/app/Jobs/GroupPipeline/GroupCommentPipeline.php index 47af26711..928b08aac 100644 --- 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; diff --git a/app/Jobs/GroupPipeline/GroupMediaPipeline.php b/app/Jobs/GroupPipeline/GroupMediaPipeline.php index ab5350409..fa396fad1 100644 --- 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 diff --git a/app/Jobs/GroupPipeline/NewStatusPipeline.php b/app/Jobs/GroupPipeline/NewStatusPipeline.php index 5743a13e4..fed62896c 100644 --- 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 diff --git a/app/Jobs/GroupsPipeline/DeleteCommentPipeline.php b/app/Jobs/GroupsPipeline/DeleteCommentPipeline.php index c46ab9a60..545dae62c 100644 --- 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; + } } diff --git a/app/Jobs/GroupsPipeline/ImageResizePipeline.php b/app/Jobs/GroupsPipeline/ImageResizePipeline.php index 34274888c..875bfbc7e 100644 --- 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 { diff --git a/app/Jobs/GroupsPipeline/ImageS3DeletePipeline.php b/app/Jobs/GroupsPipeline/ImageS3DeletePipeline.php index 458bf692d..7591d4cee 100644 --- 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 { diff --git a/app/Jobs/GroupsPipeline/ImageS3UploadPipeline.php b/app/Jobs/GroupsPipeline/ImageS3UploadPipeline.php index f709ce527..c60878804 100644 --- 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 { diff --git a/app/Jobs/GroupsPipeline/NewCommentPipeline.php b/app/Jobs/GroupsPipeline/NewCommentPipeline.php index bc87a18cb..69c7fc160 100644 --- 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; diff --git a/app/Jobs/GroupsPipeline/NewPostPipeline.php b/app/Jobs/GroupsPipeline/NewPostPipeline.php index d782d401c..c3a61dd4f 100644 --- 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 diff --git a/app/Jobs/ImageOptimizePipeline/ImageOptimize.php b/app/Jobs/ImageOptimizePipeline/ImageOptimize.php index 6d1b65d33..15b98cb60 100644 --- 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 { diff --git a/app/Jobs/ImageOptimizePipeline/ImageResize.php b/app/Jobs/ImageOptimizePipeline/ImageResize.php index ad0b11a56..28f3a0b29 100644 --- a/app/Jobs/ImageOptimizePipeline/ImageResize.php +++ b/app/Jobs/ImageOptimizePipeline/ImageResize.php @@ -9,8 +9,8 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Log; -use Storage; +use Illuminate\Support\Facades\Log; +use Illuminate\Support\Facades\Storage; class ImageResize implements ShouldQueue { diff --git a/app/Jobs/ImageOptimizePipeline/ImageThumbnail.php b/app/Jobs/ImageOptimizePipeline/ImageThumbnail.php index ead13df14..fbf38a258 100644 --- a/app/Jobs/ImageOptimizePipeline/ImageThumbnail.php +++ b/app/Jobs/ImageOptimizePipeline/ImageThumbnail.php @@ -10,8 +10,8 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Log; -use Storage; +use Illuminate\Support\Facades\Log; +use Illuminate\Support\Facades\Storage; class ImageThumbnail implements ShouldQueue { diff --git a/app/Jobs/ImageOptimizePipeline/ImageUpdate.php b/app/Jobs/ImageOptimizePipeline/ImageUpdate.php index 62569bae5..50d81f063 100644 --- a/app/Jobs/ImageOptimizePipeline/ImageUpdate.php +++ b/app/Jobs/ImageOptimizePipeline/ImageUpdate.php @@ -9,10 +9,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 Illuminate\Support\Str; use ImageOptimizer; -use Log; -use Storage; class ImageUpdate implements ShouldQueue { diff --git a/app/Jobs/ImportPipeline/ImportInstagram.php b/app/Jobs/ImportPipeline/ImportInstagram.php index d80560a64..c3dcf81ac 100644 --- a/app/Jobs/ImportPipeline/ImportInstagram.php +++ b/app/Jobs/ImportPipeline/ImportInstagram.php @@ -9,13 +9,13 @@ use App\Media; use App\Profile; use App\Status; use Carbon\Carbon; -use DB; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Filesystem\Filesystem; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\DB; class ImportInstagram implements ShouldQueue { diff --git a/app/Jobs/InboxPipeline/DeleteWorker.php b/app/Jobs/InboxPipeline/DeleteWorker.php index 1057c4ff4..0cf04b531 100644 --- a/app/Jobs/InboxPipeline/DeleteWorker.php +++ b/app/Jobs/InboxPipeline/DeleteWorker.php @@ -6,13 +6,13 @@ use App\Jobs\DeletePipeline\DeleteRemoteProfilePipeline; use App\Profile; use App\Util\ActivityPub\Helpers; use App\Util\ActivityPub\HttpSignature; -use Cache; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Http\Client\ConnectionException; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Log; diff --git a/app/Jobs/InboxPipeline/InboxValidator.php b/app/Jobs/InboxPipeline/InboxValidator.php index 9974c4033..02983a80a 100644 --- a/app/Jobs/InboxPipeline/InboxValidator.php +++ b/app/Jobs/InboxPipeline/InboxValidator.php @@ -5,13 +5,13 @@ namespace App\Jobs\InboxPipeline; use App\Profile; use App\Util\ActivityPub\Helpers; use App\Util\ActivityPub\HttpSignature; -use Cache; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Http\Client\ConnectionException; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Http; use Illuminate\Support\Lottery; @@ -71,7 +71,7 @@ class InboxValidator implements ShouldQueue if ($this->verifySignature($headers, $profile, $payload) == true) { if (isset($payload['id'])) { - $lockKey = 'pf:ap:user-inbox:activity:' . hash('sha256', $payload['id']); + $lockKey = 'pf:ap:user-inbox:activity:'.hash('sha256', $payload['id']); if (! Cache::add($lockKey, 1, 3600)) { // Already processed after valid signature check return 1; @@ -81,7 +81,7 @@ class InboxValidator implements ShouldQueue if (isset($payload['type']) && in_array($payload['type'], ['Follow', 'Accept'])) { ActivityHandler::dispatch($headers, $profile, $payload)->onQueue('follow'); } else { - $onQueue = Lottery::odds(1, 12)->winner(fn() => 'high')->loser(fn() => 'inbox')->choose(); + $onQueue = Lottery::odds(1, 12)->winner(fn () => 'high')->loser(fn () => 'inbox')->choose(); ActivityHandler::dispatch($headers, $profile, $payload)->onQueue($onQueue); } @@ -141,7 +141,7 @@ class InboxValidator implements ShouldQueue } } if ( - !$keyDomain || !$idDomain || !$actorDomain + ! $keyDomain || ! $idDomain || ! $actorDomain || $keyDomain !== $idDomain || $keyDomain !== $actorDomain ) { return false; diff --git a/app/Jobs/InboxPipeline/InboxWorker.php b/app/Jobs/InboxPipeline/InboxWorker.php index 0ca18ff07..a700420b8 100644 --- a/app/Jobs/InboxPipeline/InboxWorker.php +++ b/app/Jobs/InboxPipeline/InboxWorker.php @@ -5,13 +5,13 @@ namespace App\Jobs\InboxPipeline; use App\Profile; use App\Util\ActivityPub\Helpers; use App\Util\ActivityPub\HttpSignature; -use Cache; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Http\Client\ConnectionException; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Http; class InboxWorker implements ShouldQueue @@ -57,7 +57,7 @@ class InboxWorker implements ShouldQueue if ($this->verifySignature($headers, $payload) == true) { if (isset($payload['id'])) { - $lockKey = 'pf:ap:user-inbox:activity:' . hash('sha256', $payload['id']); + $lockKey = 'pf:ap:user-inbox:activity:'.hash('sha256', $payload['id']); if (! Cache::add($lockKey, 1, 3600)) { // Already processed after valid signature check return 1; @@ -122,7 +122,7 @@ class InboxWorker implements ShouldQueue } } if ( - !$keyDomain || !$idDomain || !$actorDomain + ! $keyDomain || ! $idDomain || ! $actorDomain || $keyDomain !== $idDomain || $keyDomain !== $actorDomain ) { return false; diff --git a/app/Jobs/InternalPipeline/NotificationEpochUpdatePipeline.php b/app/Jobs/InternalPipeline/NotificationEpochUpdatePipeline.php index 86690940f..9c8ad5e2c 100644 --- a/app/Jobs/InternalPipeline/NotificationEpochUpdatePipeline.php +++ b/app/Jobs/InternalPipeline/NotificationEpochUpdatePipeline.php @@ -4,7 +4,6 @@ namespace App\Jobs\InternalPipeline; use App\Notification; use App\Services\NotificationService; -use Cache; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing; use Illuminate\Contracts\Queue\ShouldQueue; @@ -12,6 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\Middleware\WithoutOverlapping; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Cache; class NotificationEpochUpdatePipeline implements ShouldBeUniqueUntilProcessing, ShouldQueue { diff --git a/app/Jobs/MediaPipeline/MediaSyncLicensePipeline.php b/app/Jobs/MediaPipeline/MediaSyncLicensePipeline.php index bccde8ec1..10e823f48 100644 --- a/app/Jobs/MediaPipeline/MediaSyncLicensePipeline.php +++ b/app/Jobs/MediaPipeline/MediaSyncLicensePipeline.php @@ -4,12 +4,12 @@ namespace App\Jobs\MediaPipeline; use App\Media; use App\Services\StatusService; -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\Log; class MediaSyncLicensePipeline implements ShouldQueue diff --git a/app/Jobs/ModPipeline/HandleSpammerPipeline.php b/app/Jobs/ModPipeline/HandleSpammerPipeline.php index 994892417..eae85114c 100644 --- a/app/Jobs/ModPipeline/HandleSpammerPipeline.php +++ b/app/Jobs/ModPipeline/HandleSpammerPipeline.php @@ -5,12 +5,12 @@ namespace App\Jobs\ModPipeline; use App\Profile; use App\Services\StatusService; use App\Status; -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 HandleSpammerPipeline implements ShouldQueue { diff --git a/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php b/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php index 408886df1..3796d705f 100644 --- a/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php +++ b/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php @@ -7,12 +7,12 @@ use App\Http\Controllers\FollowerController; use App\Profile; use App\Util\ActivityPub\Helpers; use DateTime; -use DB; use Exception; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Queue\Queueable; use Illuminate\Queue\Middleware\ThrottlesExceptionsWithRedis; use Illuminate\Queue\Middleware\WithoutOverlapping; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; class MoveMigrateFollowersPipeline implements ShouldQueue @@ -101,7 +101,7 @@ class MoveMigrateFollowersPipeline implements ShouldQueue try { $targetAccount = Helpers::profileFetch($target); $actorAccount = Helpers::profileFetch($actor); - } catch (\Exception $e) { + } catch (Exception $e) { Log::warning('MoveMigrateFollowersPipeline: Failed to fetch profiles: '.$e->getMessage()); throw $e; } diff --git a/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php b/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php index 6f30b797e..f33664129 100644 --- a/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php +++ b/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php @@ -4,12 +4,12 @@ namespace App\Jobs\MovePipeline; use App\Util\ActivityPub\Helpers; use DateTime; -use DB; use Exception; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Queue\Queueable; use Illuminate\Queue\Middleware\ThrottlesExceptions; use Illuminate\Queue\Middleware\WithoutOverlapping; +use Illuminate\Support\Facades\DB; class UnfollowLegacyAccountMovePipeline implements ShouldQueue { diff --git a/app/Jobs/ProfilePipeline/HandleUpdateActivity.php b/app/Jobs/ProfilePipeline/HandleUpdateActivity.php index 3c870f794..9eba32503 100644 --- a/app/Jobs/ProfilePipeline/HandleUpdateActivity.php +++ b/app/Jobs/ProfilePipeline/HandleUpdateActivity.php @@ -6,12 +6,12 @@ use App\Jobs\AvatarPipeline\RemoteAvatarFetchFromUrl; use App\Profile; use App\Services\SanitizeService; use App\Util\Lexer\Autolink; -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\Log; use Purify; diff --git a/app/Jobs/ProfilePipeline/ProfilePurgeFollowersByDomain.php b/app/Jobs/ProfilePipeline/ProfilePurgeFollowersByDomain.php index 5553f5d04..6f665014a 100644 --- a/app/Jobs/ProfilePipeline/ProfilePurgeFollowersByDomain.php +++ b/app/Jobs/ProfilePipeline/ProfilePurgeFollowersByDomain.php @@ -6,7 +6,6 @@ use App\Follower; use App\Profile; use App\Services\AccountService; use App\Services\FollowerService; -use DB; use Illuminate\Bus\Batchable; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing; @@ -15,6 +14,7 @@ use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\Middleware\WithoutOverlapping; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\DB; class ProfilePurgeFollowersByDomain implements ShouldBeUniqueUntilProcessing, ShouldQueue { diff --git a/app/Jobs/ProfilePipeline/ProfilePurgeNotificationsByDomain.php b/app/Jobs/ProfilePipeline/ProfilePurgeNotificationsByDomain.php index 12fee69c4..0d6f718e1 100644 --- a/app/Jobs/ProfilePipeline/ProfilePurgeNotificationsByDomain.php +++ b/app/Jobs/ProfilePipeline/ProfilePurgeNotificationsByDomain.php @@ -4,7 +4,6 @@ namespace App\Jobs\ProfilePipeline; use App\Notification; use App\Services\NotificationService; -use DB; use Illuminate\Bus\Batchable; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing; @@ -13,6 +12,7 @@ use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\Middleware\WithoutOverlapping; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\DB; class ProfilePurgeNotificationsByDomain implements ShouldBeUniqueUntilProcessing, ShouldQueue { diff --git a/app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php b/app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php index 5765f475a..4603bb08b 100644 --- a/app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php +++ b/app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php @@ -16,9 +16,9 @@ use Illuminate\Http\File; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\Http; +use Illuminate\Support\Facades\Log; +use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; -use Log; -use Storage; class RemoteFollowImportRecent implements ShouldQueue { diff --git a/app/Jobs/StatusPipeline/StatusActivityPubDeliver.php b/app/Jobs/StatusPipeline/StatusActivityPubDeliver.php index 4d666e76d..cf939e357 100644 --- a/app/Jobs/StatusPipeline/StatusActivityPubDeliver.php +++ b/app/Jobs/StatusPipeline/StatusActivityPubDeliver.php @@ -14,9 +14,9 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Log; use League\Fractal; use League\Fractal\Serializer\ArraySerializer; -use Log; class StatusActivityPubDeliver implements ShouldQueue { diff --git a/app/Jobs/StatusPipeline/StatusDelete.php b/app/Jobs/StatusPipeline/StatusDelete.php index 19bbeb006..ed25b1a30 100644 --- a/app/Jobs/StatusPipeline/StatusDelete.php +++ b/app/Jobs/StatusPipeline/StatusDelete.php @@ -22,7 +22,6 @@ use App\StatusHashtag; use App\StatusView; use App\Transformer\ActivityPub\Verb\DeleteNote; use App\Util\ActivityPub\HttpSignature; -use Cache; use GuzzleHttp\Client; use GuzzleHttp\Pool; use Illuminate\Bus\Queueable; @@ -30,6 +29,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; use League\Fractal; use League\Fractal\Serializer\ArraySerializer; @@ -120,7 +120,7 @@ class StatusDelete implements ShouldQueue Bookmark::whereStatusId($status->id)->delete(); - CollectionItem::whereObjectType(\App\Status::class) + CollectionItem::whereObjectType(Status::class) ->whereObjectId($status->id) ->get() ->each(function ($col) { @@ -130,7 +130,7 @@ class StatusDelete implements ShouldQueue $dms = DirectMessage::whereStatusId($status->id)->get(); foreach ($dms as $dm) { - $not = Notification::whereItemType(\App\DirectMessage::class) + $not = Notification::whereItemType(DirectMessage::class) ->whereItemId($dm->id) ->first(); if ($not) { @@ -143,7 +143,7 @@ class StatusDelete implements ShouldQueue $mediaTags = MediaTag::where('status_id', $status->id)->get(); foreach ($mediaTags as $mtag) { - $not = Notification::whereItemType(\App\MediaTag::class) + $not = Notification::whereItemType(MediaTag::class) ->whereItemId($mtag->id) ->first(); if ($not) { @@ -154,11 +154,11 @@ class StatusDelete implements ShouldQueue } Mention::whereStatusId($status->id)->forceDelete(); - Notification::whereItemType(\App\Status::class) + Notification::whereItemType(Status::class) ->whereItemId($status->id) ->forceDelete(); - Report::whereObjectType(\App\Status::class) + Report::whereObjectType(Status::class) ->whereObjectId($status->id) ->delete(); @@ -167,7 +167,7 @@ class StatusDelete implements ShouldQueue StatusView::whereStatusId($status->id)->delete(); Status::whereInReplyToId($status->id)->update(['in_reply_to_id' => null]); - AccountInterstitial::where('item_type', \App\Status::class) + AccountInterstitial::where('item_type', Status::class) ->where('item_id', $status->id) ->delete(); diff --git a/app/Jobs/StatusPipeline/StatusEntityLexer.php b/app/Jobs/StatusPipeline/StatusEntityLexer.php index 4d22627b6..723366c7a 100644 --- a/app/Jobs/StatusPipeline/StatusEntityLexer.php +++ b/app/Jobs/StatusPipeline/StatusEntityLexer.php @@ -16,13 +16,13 @@ use App\StatusHashtag; use App\Util\Lexer\Autolink; use App\Util\Lexer\Extractor; use App\Util\Sentiment\Bouncer; -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 Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; diff --git a/app/Jobs/StatusPipeline/StatusLocalUpdateActivityPubDeliverPipeline.php b/app/Jobs/StatusPipeline/StatusLocalUpdateActivityPubDeliverPipeline.php index a408d6161..0bfab7c02 100644 --- a/app/Jobs/StatusPipeline/StatusLocalUpdateActivityPubDeliverPipeline.php +++ b/app/Jobs/StatusPipeline/StatusLocalUpdateActivityPubDeliverPipeline.php @@ -12,9 +12,9 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Log; use League\Fractal; use League\Fractal\Serializer\ArraySerializer; -use Log; class StatusLocalUpdateActivityPubDeliverPipeline implements ShouldQueue { diff --git a/app/Jobs/StatusPipeline/StatusReplyPipeline.php b/app/Jobs/StatusPipeline/StatusReplyPipeline.php index 2e77f0968..3d9ff59e1 100644 --- a/app/Jobs/StatusPipeline/StatusReplyPipeline.php +++ b/app/Jobs/StatusPipeline/StatusReplyPipeline.php @@ -6,13 +6,13 @@ use App\Notification; use App\Services\NotificationService; use App\Services\StatusService; use App\Status; -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 Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; class StatusReplyPipeline implements ShouldQueue @@ -90,7 +90,7 @@ class StatusReplyPipeline implements ShouldQueue ->whereActorId($actor->id) ->whereIn('action', ['mention', 'comment']) ->whereItemId($status->id) - ->whereItemType(\App\Status::class) + ->whereItemType(Status::class) ->count(); if ($actor->id === $target || $exists !== 0) { @@ -122,7 +122,7 @@ class StatusReplyPipeline implements ShouldQueue $notification->actor_id = $actor->id; $notification->action = 'comment'; $notification->item_id = $status->id; - $notification->item_type = \App\Status::class; + $notification->item_type = Status::class; $notification->save(); NotificationService::setNotification($notification); diff --git a/app/Jobs/StoryPipeline/StoryDelete.php b/app/Jobs/StoryPipeline/StoryDelete.php index 69ba5f982..91783b065 100644 --- a/app/Jobs/StoryPipeline/StoryDelete.php +++ b/app/Jobs/StoryPipeline/StoryDelete.php @@ -13,7 +13,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 StoryDelete implements ShouldQueue { diff --git a/app/Jobs/StoryPipeline/StoryExpire.php b/app/Jobs/StoryPipeline/StoryExpire.php index 39cc4d1f8..ddb70f5c1 100644 --- a/app/Jobs/StoryPipeline/StoryExpire.php +++ b/app/Jobs/StoryPipeline/StoryExpire.php @@ -15,9 +15,9 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Storage; use League\Fractal; use League\Fractal\Serializer\ArraySerializer; -use Storage; class StoryExpire implements ShouldQueue { diff --git a/app/Jobs/StoryPipeline/StoryFetch.php b/app/Jobs/StoryPipeline/StoryFetch.php index acf65d578..371bc0ddd 100644 --- a/app/Jobs/StoryPipeline/StoryFetch.php +++ b/app/Jobs/StoryPipeline/StoryFetch.php @@ -9,7 +9,6 @@ use App\Story; use App\Util\ActivityPub\Helpers; use App\Util\ActivityPub\Validator\StoryValidator; use App\Util\Lexer\Bearcap; -use Cache; use Exception; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; @@ -19,12 +18,13 @@ use Illuminate\Http\Client\RequestException; use Illuminate\Http\File; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Http; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Validator; use Illuminate\Support\Str; -use Log; class StoryFetch implements ShouldQueue { diff --git a/app/Jobs/VideoPipeline/VideoHlsPipeline.php b/app/Jobs/VideoPipeline/VideoHlsPipeline.php index 38db3c611..c2c3580fa 100644 --- a/app/Jobs/VideoPipeline/VideoHlsPipeline.php +++ b/app/Jobs/VideoPipeline/VideoHlsPipeline.php @@ -4,7 +4,6 @@ namespace App\Jobs\VideoPipeline; use App\Services\MediaService; use App\Services\StatusService; -use Cache; use FFMpeg; use FFMpeg\Format\Video\X264; use Illuminate\Bus\Queueable; @@ -14,6 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\Middleware\WithoutOverlapping; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Cache; class VideoHlsPipeline implements ShouldBeUniqueUntilProcessing, ShouldQueue { diff --git a/app/Jobs/VideoPipeline/VideoOptimize.php b/app/Jobs/VideoPipeline/VideoOptimize.php index 9036b428d..83326ba27 100644 --- a/app/Jobs/VideoPipeline/VideoOptimize.php +++ b/app/Jobs/VideoPipeline/VideoOptimize.php @@ -10,7 +10,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 VideoOptimize implements ShouldQueue { diff --git a/app/Jobs/VideoPipeline/VideoThumbnail.php b/app/Jobs/VideoPipeline/VideoThumbnail.php index 25d603633..fcc4a3e44 100644 --- a/app/Jobs/VideoPipeline/VideoThumbnail.php +++ b/app/Jobs/VideoPipeline/VideoThumbnail.php @@ -7,9 +7,7 @@ use App\Media; use App\Services\MediaService; use App\Services\StatusService; use App\Util\Media\Blurhash; -use Cache; use FFMpeg; -use Log; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing; use Illuminate\Contracts\Queue\ShouldQueue; @@ -17,6 +15,8 @@ use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\Middleware\WithoutOverlapping; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\Log; class VideoThumbnail implements ShouldBeUniqueUntilProcessing, ShouldQueue { diff --git a/app/Jobs/VideoPipeline/VideoThumbnailToCloudPipeline.php b/app/Jobs/VideoPipeline/VideoThumbnailToCloudPipeline.php index 80cef8808..eb5f9b435 100644 --- a/app/Jobs/VideoPipeline/VideoThumbnailToCloudPipeline.php +++ b/app/Jobs/VideoPipeline/VideoThumbnailToCloudPipeline.php @@ -7,7 +7,6 @@ use App\Services\MediaService; use App\Services\ResilientMediaStorageService; use App\Services\StatusService; use App\Util\Media\Blurhash; -use Cache; use FFMpeg; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing; @@ -16,7 +15,8 @@ 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\Storage; class VideoThumbnailToCloudPipeline implements ShouldBeUniqueUntilProcessing, ShouldQueue { diff --git a/app/Listeners/AuthLogin.php b/app/Listeners/AuthLogin.php index fb356e3fe..4540cc411 100644 --- a/app/Listeners/AuthLogin.php +++ b/app/Listeners/AuthLogin.php @@ -6,7 +6,7 @@ use App\Jobs\AvatarPipeline\CreateAvatar; use App\Profile; use App\UserDevice; use App\UserSetting; -use DB; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; class AuthLogin diff --git a/app/Media.php b/app/Media.php index 939a74f6d..d798f8e34 100644 --- a/app/Media.php +++ b/app/Media.php @@ -5,8 +5,8 @@ namespace App; use App\Util\Media\License; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; -use Storage; class Media extends Model { diff --git a/app/Models/GroupMedia.php b/app/Models/GroupMedia.php index 821f25fea..3c3ae5b44 100644 --- a/app/Models/GroupMedia.php +++ b/app/Models/GroupMedia.php @@ -4,7 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -use Storage; +use Illuminate\Support\Facades\Storage; class GroupMedia extends Model { diff --git a/app/Models/LiveStream.php b/app/Models/LiveStream.php index e1959c14e..cba933af8 100644 --- a/app/Models/LiveStream.php +++ b/app/Models/LiveStream.php @@ -4,7 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -use Storage; +use Illuminate\Support\Facades\Storage; class LiveStream extends Model { diff --git a/app/Observers/FollowerObserver.php b/app/Observers/FollowerObserver.php index b12421ecd..87f69d3d1 100644 --- a/app/Observers/FollowerObserver.php +++ b/app/Observers/FollowerObserver.php @@ -5,7 +5,7 @@ namespace App\Observers; use App\Follower; use App\Jobs\HomeFeedPipeline\FeedFollowPipeline; use App\Services\FollowerService; -use Cache; +use Illuminate\Support\Facades\Cache; class FollowerObserver { diff --git a/app/Observers/ModLogObserver.php b/app/Observers/ModLogObserver.php index 35fc2f439..7b65c3528 100644 --- a/app/Observers/ModLogObserver.php +++ b/app/Observers/ModLogObserver.php @@ -4,7 +4,7 @@ namespace App\Observers; use App\ModLog; use App\Services\ModLogService; -use Log; +use Illuminate\Support\Facades\Log; class ModLogObserver { diff --git a/app/Observers/StatusHashtagObserver.php b/app/Observers/StatusHashtagObserver.php index dd5ba6898..fdc7d0349 100644 --- a/app/Observers/StatusHashtagObserver.php +++ b/app/Observers/StatusHashtagObserver.php @@ -6,8 +6,8 @@ use App\Jobs\HomeFeedPipeline\HashtagInsertFanoutPipeline; use App\Jobs\HomeFeedPipeline\HashtagRemoveFanoutPipeline; use App\Services\StatusHashtagService; use App\StatusHashtag; -use DB; use Illuminate\Contracts\Events\ShouldHandleEventsAfterCommit; +use Illuminate\Support\Facades\DB; class StatusHashtagObserver implements ShouldHandleEventsAfterCommit { diff --git a/app/Observers/StatusObserver.php b/app/Observers/StatusObserver.php index 43f5ed289..bd411f705 100644 --- a/app/Observers/StatusObserver.php +++ b/app/Observers/StatusObserver.php @@ -8,7 +8,7 @@ use App\Models\ImportPost; use App\Services\ImportService; use App\Services\ProfileStatusService; use App\Status; -use Cache; +use Illuminate\Support\Facades\Cache; class StatusObserver { diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php index bd1120585..959ae1ab6 100644 --- a/app/Observers/UserObserver.php +++ b/app/Observers/UserObserver.php @@ -11,7 +11,7 @@ use App\Profile; use App\Services\FollowerService; use App\User; use App\UserSetting; -use DB; +use Illuminate\Support\Facades\DB; class UserObserver { diff --git a/app/Profile.php b/app/Profile.php index 718e1a80f..81120f917 100644 --- a/app/Profile.php +++ b/app/Profile.php @@ -5,11 +5,12 @@ namespace App; use App\Models\ProfileAlias; use App\Services\FollowerService; use App\Util\Lexer\PrettyNumber; -use Cache; -use DB; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; -use Storage; +use Illuminate\Support\Carbon; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Storage; /** * @property int $id @@ -22,13 +23,13 @@ use Storage; * @property int $status_count * @property int $following_count * @property int $followers_count - * @property \Illuminate\Support\Carbon|null $last_fetched_at - * @property \Illuminate\Support\Carbon|null $last_status_at - * @property \Illuminate\Support\Carbon|null $created_at - * @property \Illuminate\Support\Carbon|null $updated_at - * @property \Illuminate\Support\Carbon|null $deleted_at - * @property-read \App\User|null $user - * @property-read \App\Avatar $avatar + * @property Carbon|null $last_fetched_at + * @property Carbon|null $last_status_at + * @property Carbon|null $created_at + * @property Carbon|null $updated_at + * @property Carbon|null $deleted_at + * @property-read User|null $user + * @property-read Avatar $avatar */ class Profile extends Model { @@ -254,7 +255,7 @@ class Profile extends Model public function mutedIds() { return UserFilter::whereUserId($this->id) - ->whereFilterableType(\App\Profile::class) + ->whereFilterableType(Profile::class) ->whereFilterType('mute') ->pluck('filterable_id'); } @@ -262,7 +263,7 @@ class Profile extends Model public function blockedIds() { return UserFilter::whereUserId($this->id) - ->whereFilterableType(\App\Profile::class) + ->whereFilterableType(Profile::class) ->whereFilterType('block') ->pluck('filterable_id'); } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index c1c58e24d..0738526d9 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -27,18 +27,18 @@ use App\Status; use App\StatusHashtag; use App\User; use App\UserFilter; -use Auth; -use Horizon; use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Database\Eloquent\Model; use Illuminate\Http\Request; use Illuminate\Pagination\Paginator; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\RateLimiter; use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\URL; use Illuminate\Support\Facades\Validator; use Illuminate\Support\ServiceProvider; +use Laravel\Horizon\Horizon; use Laravel\Passport\Passport; use Laravel\Pulse\Facades\Pulse; @@ -108,8 +108,8 @@ class AppServiceProvider extends ServiceProvider : 'missing'; return [ - Limit::perHour(20)->by('app-code-verify:ip:' . $request->ip()), - Limit::perHour(10)->by('app-code-verify:email:' . $emailKey), + Limit::perHour(20)->by('app-code-verify:ip:'.$request->ip()), + Limit::perHour(10)->by('app-code-verify:email:'.$emailKey), ]; }); @@ -125,8 +125,8 @@ class AppServiceProvider extends ServiceProvider $user = $request->user('web'); $actor = $user - ? 'u:' . $user->getAuthIdentifier() - : 'ip:' . $request->ip(); + ? 'u:'.$user->getAuthIdentifier() + : 'ip:'.$request->ip(); $tooMany = function (Request $request, array $headers) { return response()->json([ diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index e0e35c1c0..f022a2bc7 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -4,8 +4,8 @@ namespace App\Providers; use App\Models\CustomFilter; use App\Policies\CustomFilterPolicy; -use Gate; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Gate; class AuthServiceProvider extends ServiceProvider { diff --git a/app/Services/AccountService.php b/app/Services/AccountService.php index 9b9f71345..e8c79d37d 100644 --- a/app/Services/AccountService.php +++ b/app/Services/AccountService.php @@ -8,7 +8,7 @@ use App\Status; use App\Transformer\Api\AccountTransformer; use App\User; use App\UserSetting; -use Cache; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; use League\Fractal; diff --git a/app/Services/ActivityPubFetchService.php b/app/Services/ActivityPubFetchService.php index fa5816869..0a4a7b98f 100644 --- a/app/Services/ActivityPubFetchService.php +++ b/app/Services/ActivityPubFetchService.php @@ -4,11 +4,11 @@ namespace App\Services; use App\Util\ActivityPub\Helpers; use App\Util\ActivityPub\HttpSignature; -use Cache; use GuzzleHttp\Psr7\Uri as GuzzleUri; use GuzzleHttp\Psr7\UriResolver; use Illuminate\Http\Client\ConnectionException; use Illuminate\Http\Client\RequestException; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Http; use Psr\Http\Message\ResponseInterface; @@ -36,7 +36,7 @@ class ActivityPubFetchService $domainKey = base64_encode(strtolower($host)); $urlKey = hash('sha256', $url); - $key = self::CACHE_KEY . $domainKey . ':' . $urlKey; + $key = self::CACHE_KEY.$domainKey.':'.$urlKey; return Cache::remember($key, 450, function () use ($url) { return self::fetchRequest($url); @@ -173,7 +173,6 @@ class ActivityPubFetchService } } - return; } private static function signedHeaders(string $url): array @@ -192,10 +191,10 @@ class ActivityPubFetchService $headers['Accept'] = 'application/activity+json'; $headers['User-Agent'] = - 'PixelFedBot/1.0.0 (Pixelfed/' . - config('pixelfed.version') . - '; +' . - config('app.url') . + 'PixelFedBot/1.0.0 (Pixelfed/'. + config('pixelfed.version'). + '; +'. + config('app.url'). ')'; return $headers; @@ -208,11 +207,11 @@ class ActivityPubFetchService ): string { $addresses = array_map(function ($ip) { return str_contains($ip, ':') - ? '[' . $ip . ']' + ? '['.$ip.']' : $ip; }, $ips); - return $host . ':' . $port . ':' . implode(',', $addresses); + return $host.':'.$port.':'.implode(',', $addresses); } private static function resolveRedirect( diff --git a/app/Services/AdminShadowFilterService.php b/app/Services/AdminShadowFilterService.php index 820263abf..7c8029e2c 100644 --- a/app/Services/AdminShadowFilterService.php +++ b/app/Services/AdminShadowFilterService.php @@ -3,7 +3,8 @@ namespace App\Services; use App\Models\AdminShadowFilter; -use Cache; +use App\Profile; +use Illuminate\Support\Facades\Cache; class AdminShadowFilterService { @@ -11,7 +12,7 @@ class AdminShadowFilterService public static function queryFilter($name = 'hide_from_public_feeds') { - return AdminShadowFilter::whereItemType(\App\Profile::class) + return AdminShadowFilter::whereItemType(Profile::class) ->whereActive(1) ->where('hide_from_public_feeds', true) ->pluck('item_id') @@ -26,7 +27,7 @@ class AdminShadowFilterService } return Cache::remember($key, 86400, function () { - return AdminShadowFilter::whereItemType(\App\Profile::class) + return AdminShadowFilter::whereItemType(Profile::class) ->whereActive(1) ->where('hide_from_public_feeds', true) ->pluck('item_id') diff --git a/app/Services/AdminStatsService.php b/app/Services/AdminStatsService.php index 6b0c7de75..1ea5b8a56 100644 --- a/app/Services/AdminStatsService.php +++ b/app/Services/AdminStatsService.php @@ -12,10 +12,11 @@ use App\Report; use App\Status; use App\User; use App\Util\Lexer\PrettyNumber; -use Cache; +use Carbon\Carbon; use DateInterval; use DatePeriod; -use DB; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; class AdminStatsService { @@ -94,7 +95,7 @@ class AdminStatsService return Cache::remember('admin:dashboard:home:data:v0:24hr', $ttl, function () { return [ - 'failedjobs' => PrettyNumber::convert(FailedJob::where('failed_at', '>=', \Carbon\Carbon::now()->subDay())->count()), + 'failedjobs' => PrettyNumber::convert(FailedJob::where('failed_at', '>=', Carbon::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/Services/AutolinkService.php b/app/Services/AutolinkService.php index c494ab151..0c1c110b4 100644 --- a/app/Services/AutolinkService.php +++ b/app/Services/AutolinkService.php @@ -3,7 +3,7 @@ namespace App\Services; use App\Profile; -use Cache; +use Illuminate\Support\Facades\Cache; use Purify; class AutolinkService diff --git a/app/Services/AvatarService.php b/app/Services/AvatarService.php index c55e9319c..ba905495c 100644 --- a/app/Services/AvatarService.php +++ b/app/Services/AvatarService.php @@ -5,12 +5,12 @@ namespace App\Services; use App\Avatar; use App\Jobs\AvatarPipeline\AvatarStorageLargePurge; use App\Profile; -use Cache; use Exception; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; use League\Flysystem\UnableToCheckDirectoryExistence; use League\Flysystem\UnableToRetrieveMetadata; -use Storage; class AvatarService { diff --git a/app/Services/ConfigCacheService.php b/app/Services/ConfigCacheService.php index 85185cff5..69eaaf614 100644 --- a/app/Services/ConfigCacheService.php +++ b/app/Services/ConfigCacheService.php @@ -3,9 +3,9 @@ namespace App\Services; use App\Models\ConfigCache as ConfigCacheModel; -use Cache; use Exception; use Illuminate\Database\QueryException; +use Illuminate\Support\Facades\Cache; class ConfigCacheService { diff --git a/app/Services/FollowerService.php b/app/Services/FollowerService.php index dab25e75c..d247e423d 100644 --- a/app/Services/FollowerService.php +++ b/app/Services/FollowerService.php @@ -5,8 +5,8 @@ namespace App\Services; use App\Follower; use App\Jobs\FollowPipeline\FollowServiceWarmCache; use App\Profile; -use Cache; -use DB; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Redis; class FollowerService diff --git a/app/Services/GroupPostService.php b/app/Services/GroupPostService.php index f468937e9..4a78c0da7 100644 --- a/app/Services/GroupPostService.php +++ b/app/Services/GroupPostService.php @@ -5,7 +5,7 @@ namespace App\Services; use App\Models\GroupComment; use App\Models\GroupPost; use App\Transformer\Api\GroupPostTransformer; -use Cache; +use Illuminate\Support\Facades\Cache; use League\Fractal; use League\Fractal\Serializer\ArraySerializer; diff --git a/app/Services/GroupService.php b/app/Services/GroupService.php index c5cd9d31f..c73636dc3 100644 --- a/app/Services/GroupService.php +++ b/app/Services/GroupService.php @@ -10,7 +10,7 @@ use App\Models\GroupMember; use App\Models\GroupPost; use App\Profile; use App\Util\ActivityPub\Helpers; -use Cache; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Str; use Purify; diff --git a/app/Services/Groups/GroupAccountService.php b/app/Services/Groups/GroupAccountService.php index 87a934790..63d97db7e 100644 --- a/app/Services/Groups/GroupAccountService.php +++ b/app/Services/Groups/GroupAccountService.php @@ -5,7 +5,7 @@ namespace App\Services\Groups; use App\Models\GroupMember; use App\Services\AccountService; use App\Services\GroupService; -use Cache; +use Illuminate\Support\Facades\Cache; class GroupAccountService { diff --git a/app/Services/Groups/GroupCommentService.php b/app/Services/Groups/GroupCommentService.php index 16c1f911c..f16bd5b76 100644 --- a/app/Services/Groups/GroupCommentService.php +++ b/app/Services/Groups/GroupCommentService.php @@ -4,7 +4,7 @@ namespace App\Services\Groups; use App\Models\GroupComment; use App\Transformer\Api\GroupPostTransformer; -use Cache; +use Illuminate\Support\Facades\Cache; use League\Fractal; use League\Fractal\Serializer\ArraySerializer; diff --git a/app/Services/Groups/GroupMediaService.php b/app/Services/Groups/GroupMediaService.php index 6947d941d..f4d7519e5 100644 --- a/app/Services/Groups/GroupMediaService.php +++ b/app/Services/Groups/GroupMediaService.php @@ -4,7 +4,7 @@ namespace App\Services\Groups; use App\Models\GroupMedia; use App\Services\HashidService; -use Cache; +use Illuminate\Support\Facades\Cache; class GroupMediaService { diff --git a/app/Services/Groups/GroupPostService.php b/app/Services/Groups/GroupPostService.php index 69e6aaf13..644dd4a14 100644 --- a/app/Services/Groups/GroupPostService.php +++ b/app/Services/Groups/GroupPostService.php @@ -5,8 +5,8 @@ namespace App\Services\Groups; use App\Models\Group; use App\Models\GroupPost; use App\Transformer\Api\GroupPostTransformer; -use Cache; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Cache; use League\Fractal; use League\Fractal\Serializer\ArraySerializer; diff --git a/app/Services/HashtagRelatedService.php b/app/Services/HashtagRelatedService.php index 9dc81f132..13df0f310 100644 --- a/app/Services/HashtagRelatedService.php +++ b/app/Services/HashtagRelatedService.php @@ -4,7 +4,7 @@ namespace App\Services; use App\Models\HashtagRelated; use App\StatusHashtag; -use DB; +use Illuminate\Support\Facades\DB; class HashtagRelatedService { diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index facbf6651..c5f3ec141 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -3,9 +3,10 @@ namespace App\Services; use App\Models\ImportPost; -use Cache; -use DB; +use Carbon\Carbon; use Illuminate\Database\QueryException; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; class ImportService { @@ -303,7 +304,7 @@ class ImportService { try { $fullYear = $year < 50 ? 2000 + $year : 1900 + $year; - $date = \Carbon\Carbon::createFromDate($fullYear, $month, $day); + $date = Carbon::createFromDate($fullYear, $month, $day); $nextDay = $date->addDay(); $nextYear2Digit = (int) $nextDay->format('y'); diff --git a/app/Services/MarkerService.php b/app/Services/MarkerService.php index e4805415c..9b6aacd40 100644 --- a/app/Services/MarkerService.php +++ b/app/Services/MarkerService.php @@ -2,7 +2,7 @@ namespace App\Services; -use Cache; +use Illuminate\Support\Facades\Cache; class MarkerService { diff --git a/app/Services/Media/MediaHlsService.php b/app/Services/Media/MediaHlsService.php index 29dd8628d..cb0a654fc 100644 --- a/app/Services/Media/MediaHlsService.php +++ b/app/Services/Media/MediaHlsService.php @@ -2,7 +2,7 @@ namespace App\Services\Media; -use Storage; +use Illuminate\Support\Facades\Storage; class MediaHlsService { diff --git a/app/Services/MediaService.php b/app/Services/MediaService.php index e0c27bc48..82b71172d 100644 --- a/app/Services/MediaService.php +++ b/app/Services/MediaService.php @@ -4,8 +4,8 @@ namespace App\Services; use App\Media; use App\Transformer\Api\MediaTransformer; -use Cache; use Illuminate\Support\Arr; +use Illuminate\Support\Facades\Cache; use League\Fractal; use League\Fractal\Serializer\ArraySerializer; diff --git a/app/Services/MediaTagService.php b/app/Services/MediaTagService.php index d33ee61b0..b5d5ae532 100644 --- a/app/Services/MediaTagService.php +++ b/app/Services/MediaTagService.php @@ -4,7 +4,7 @@ namespace App\Services; use App\MediaTag; use App\Notification; -use Cache; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Redis; class MediaTagService @@ -78,7 +78,7 @@ class MediaTagService $n->profile_id = $tag->profile_id; $n->actor_id = $p->id; $n->item_id = $tag->id; - $n->item_type = \App\MediaTag::class; + $n->item_type = MediaTag::class; $n->action = 'tagged'; $n->save(); diff --git a/app/Services/NotificationAppGatewayService.php b/app/Services/NotificationAppGatewayService.php index e8b2e9624..f59649ef7 100644 --- a/app/Services/NotificationAppGatewayService.php +++ b/app/Services/NotificationAppGatewayService.php @@ -2,9 +2,9 @@ namespace App\Services; -use Cache; use Exception; use Illuminate\Http\Client\RequestException; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Http; class NotificationAppGatewayService diff --git a/app/Services/NotificationService.php b/app/Services/NotificationService.php index 7cda178c6..8a8a01a35 100644 --- a/app/Services/NotificationService.php +++ b/app/Services/NotificationService.php @@ -5,7 +5,7 @@ namespace App\Services; use App\Jobs\InternalPipeline\NotificationEpochUpdatePipeline; use App\Notification; use App\Transformer\Api\NotificationTransformer; -use Cache; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Redis; use League\Fractal; use League\Fractal\Serializer\ArraySerializer; diff --git a/app/Services/PlaceService.php b/app/Services/PlaceService.php index e4e6f8e1c..4ee486eec 100644 --- a/app/Services/PlaceService.php +++ b/app/Services/PlaceService.php @@ -3,7 +3,7 @@ namespace App\Services; use App\Status; -use Cache; +use Illuminate\Support\Facades\Cache; class PlaceService { diff --git a/app/Services/ProfileStatusService.php b/app/Services/ProfileStatusService.php index e3f36aa82..f828234a7 100644 --- a/app/Services/ProfileStatusService.php +++ b/app/Services/ProfileStatusService.php @@ -2,7 +2,7 @@ namespace App\Services; -use DB; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Redis; class ProfileStatusService diff --git a/app/Services/PronounService.php b/app/Services/PronounService.php index 5a105c0d3..6fbe0d7f9 100644 --- a/app/Services/PronounService.php +++ b/app/Services/PronounService.php @@ -3,7 +3,7 @@ namespace App\Services; use App\Models\UserPronoun; -use Cache; +use Illuminate\Support\Facades\Cache; class PronounService { diff --git a/app/Services/ResilientMediaStorageService.php b/app/Services/ResilientMediaStorageService.php index 5b5044bdc..e3463695c 100644 --- a/app/Services/ResilientMediaStorageService.php +++ b/app/Services/ResilientMediaStorageService.php @@ -8,8 +8,8 @@ use GuzzleHttp\Exception\ClientException; use GuzzleHttp\Exception\ConnectException; use Illuminate\Http\File; use Illuminate\Support\Facades\Log; +use Illuminate\Support\Facades\Storage; use League\Flysystem\UnableToWriteFile; -use Storage; class ResilientMediaStorageService { diff --git a/app/Services/SearchApiV2Service.php b/app/Services/SearchApiV2Service.php index 8103518af..21f257d30 100644 --- a/app/Services/SearchApiV2Service.php +++ b/app/Services/SearchApiV2Service.php @@ -7,7 +7,7 @@ use App\Profile; use App\Status; use App\Transformer\Api\AccountTransformer; use App\Util\ActivityPub\Helpers; -use DB; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; use League\Fractal; use League\Fractal\Serializer\ArraySerializer; diff --git a/app/Services/SnowflakeService.php b/app/Services/SnowflakeService.php index fdf9a4f88..725da4b72 100644 --- a/app/Services/SnowflakeService.php +++ b/app/Services/SnowflakeService.php @@ -2,8 +2,8 @@ namespace App\Services; -use Cache; use Illuminate\Support\Carbon; +use Illuminate\Support\Facades\Cache; class SnowflakeService { diff --git a/app/Status.php b/app/Status.php index f262af905..ba29db7c2 100644 --- a/app/Status.php +++ b/app/Status.php @@ -8,11 +8,13 @@ use App\Models\Poll; use App\Models\StatusEdit; use App\Services\AccountService; use App\Services\StatusService; -use Auth; +use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +use Illuminate\Support\Carbon; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; -use Storage; /** * @property int $id @@ -32,13 +34,13 @@ use Storage; * @property int $reply_count * @property bool $local * @property string|null $place - * @property \Illuminate\Support\Carbon|null $created_at - * @property \Illuminate\Support\Carbon|null $updated_at - * @property \Illuminate\Support\Carbon|null $deleted_at - * @property \Illuminate\Support\Carbon|null $edited_at - * @property-read \App\Profile $profile - * @property-read \Illuminate\Database\Eloquent\Collection $media - * @property-read \Illuminate\Database\Eloquent\Collection $mentions + * @property Carbon|null $created_at + * @property Carbon|null $updated_at + * @property Carbon|null $deleted_at + * @property Carbon|null $edited_at + * @property-read Profile $profile + * @property-read Collection $media + * @property-read Collection $mentions */ class Status extends Model { diff --git a/app/Story.php b/app/Story.php index 075be623f..5788654a7 100644 --- a/app/Story.php +++ b/app/Story.php @@ -3,9 +3,10 @@ namespace App; use App\Util\Lexer\Bearcap; -use Auth; use Illuminate\Database\Eloquent\Model; -use Storage; +use Illuminate\Support\Carbon; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Storage; /** * @property int $id @@ -14,10 +15,10 @@ use Storage; * @property string|null $bearcap_token * @property array|null $story * @property int $view_count - * @property \Illuminate\Support\Carbon|null $expires_at - * @property \Illuminate\Support\Carbon|null $created_at - * @property \Illuminate\Support\Carbon|null $updated_at - * @property-read \App\Profile $profile + * @property Carbon|null $expires_at + * @property Carbon|null $created_at + * @property Carbon|null $updated_at + * @property-read Profile $profile */ class Story extends Model { diff --git a/app/StoryItem.php b/app/StoryItem.php index a442587bd..f7402c08d 100644 --- a/app/StoryItem.php +++ b/app/StoryItem.php @@ -3,16 +3,17 @@ namespace App; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Carbon; +use Illuminate\Support\Facades\Storage; use Pixelfed\Snowflake\HasSnowflakePrimary; -use Storage; /** * @property int $id * @property int $story_id * @property string|null $media_path - * @property \Illuminate\Support\Carbon|null $expires_at - * @property \Illuminate\Support\Carbon|null $created_at - * @property \Illuminate\Support\Carbon|null $updated_at + * @property Carbon|null $expires_at + * @property Carbon|null $created_at + * @property Carbon|null $updated_at */ class StoryItem extends Model { diff --git a/app/Transformer/ActivityPub/Verb/StoryVerb.php b/app/Transformer/ActivityPub/Verb/StoryVerb.php index 386f95a79..ddf42470b 100644 --- a/app/Transformer/ActivityPub/Verb/StoryVerb.php +++ b/app/Transformer/ActivityPub/Verb/StoryVerb.php @@ -3,8 +3,8 @@ namespace App\Transformer\ActivityPub\Verb; use App\Story; +use Illuminate\Support\Facades\Storage; use League\Fractal; -use Storage; class StoryVerb extends Fractal\TransformerAbstract { diff --git a/app/Transformer/Api/AccountTransformer.php b/app/Transformer/Api/AccountTransformer.php index 43fdfa064..dc732051e 100644 --- a/app/Transformer/Api/AccountTransformer.php +++ b/app/Transformer/Api/AccountTransformer.php @@ -7,7 +7,7 @@ use App\Services\AccountService; use App\Services\PronounService; use App\User; use App\UserSetting; -use Cache; +use Illuminate\Support\Facades\Cache; use League\Fractal; class AccountTransformer extends Fractal\TransformerAbstract diff --git a/app/Transformer/Api/MediaTransformer.php b/app/Transformer/Api/MediaTransformer.php index 0d52006a4..21906d36e 100644 --- a/app/Transformer/Api/MediaTransformer.php +++ b/app/Transformer/Api/MediaTransformer.php @@ -3,8 +3,8 @@ namespace App\Transformer\Api; use App\Media; +use Illuminate\Support\Facades\Storage; use League\Fractal; -use Storage; class MediaTransformer extends Fractal\TransformerAbstract { diff --git a/app/Transformer/Api/RelationshipTransformer.php b/app/Transformer/Api/RelationshipTransformer.php index 4bbe1cb6c..a198ec100 100644 --- a/app/Transformer/Api/RelationshipTransformer.php +++ b/app/Transformer/Api/RelationshipTransformer.php @@ -5,7 +5,7 @@ namespace App\Transformer\Api; use App\FollowRequest; use App\Models\UserDomainBlock; use App\Profile; -use Auth; +use Illuminate\Support\Facades\Auth; use League\Fractal; class RelationshipTransformer extends Fractal\TransformerAbstract diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index ac77fdcda..1bdda05bb 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -24,12 +24,12 @@ use App\Services\SanitizeService; use App\Services\UserFilterService; use App\Status; use App\Util\Media\License; -use Cache; use Carbon\Carbon; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; use League\Uri\Uri; use Purify; -use Validator; class Helpers { diff --git a/app/Util/ActivityPub/HttpSignature.php b/app/Util/ActivityPub/HttpSignature.php index 160aaefcb..25a61d840 100644 --- a/app/Util/ActivityPub/HttpSignature.php +++ b/app/Util/ActivityPub/HttpSignature.php @@ -4,8 +4,8 @@ namespace App\Util\ActivityPub; use App\Models\InstanceActor; use App\Profile; -use Artisan; use DateTime; +use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Cache; class HttpSignature diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php index 73f930895..66569993d 100644 --- a/app/Util/ActivityPub/Inbox.php +++ b/app/Util/ActivityPub/Inbox.php @@ -49,12 +49,12 @@ use App\Util\ActivityPub\Validator\Like as LikeValidator; use App\Util\ActivityPub\Validator\MoveValidator; use App\Util\ActivityPub\Validator\RejectValidator; use App\Util\ActivityPub\Validator\UpdatePersonValidator; -use Cache; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Bus; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Log; +use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; -use Storage; use Throwable; class Inbox diff --git a/app/Util/ActivityPub/Validator/Accept.php b/app/Util/ActivityPub/Validator/Accept.php index 897eb5c11..5395f9059 100644 --- a/app/Util/ActivityPub/Validator/Accept.php +++ b/app/Util/ActivityPub/Validator/Accept.php @@ -2,8 +2,8 @@ namespace App\Util\ActivityPub\Validator; +use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; -use Validator; class Accept { diff --git a/app/Util/ActivityPub/Validator/Add.php b/app/Util/ActivityPub/Validator/Add.php index 7d374d10d..46b2da234 100644 --- a/app/Util/ActivityPub/Validator/Add.php +++ b/app/Util/ActivityPub/Validator/Add.php @@ -2,8 +2,8 @@ namespace App\Util\ActivityPub\Validator; +use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; -use Validator; class Add { diff --git a/app/Util/ActivityPub/Validator/Announce.php b/app/Util/ActivityPub/Validator/Announce.php index 1a8a40fad..bc767a826 100644 --- a/app/Util/ActivityPub/Validator/Announce.php +++ b/app/Util/ActivityPub/Validator/Announce.php @@ -2,8 +2,8 @@ namespace App\Util\ActivityPub\Validator; +use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; -use Validator; class Announce { diff --git a/app/Util/ActivityPub/Validator/Follow.php b/app/Util/ActivityPub/Validator/Follow.php index 4f2778d74..da2ae55c4 100644 --- a/app/Util/ActivityPub/Validator/Follow.php +++ b/app/Util/ActivityPub/Validator/Follow.php @@ -2,8 +2,8 @@ namespace App\Util\ActivityPub\Validator; +use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; -use Validator; class Follow { diff --git a/app/Util/ActivityPub/Validator/Like.php b/app/Util/ActivityPub/Validator/Like.php index 14fb08176..5a0fa423b 100644 --- a/app/Util/ActivityPub/Validator/Like.php +++ b/app/Util/ActivityPub/Validator/Like.php @@ -2,8 +2,8 @@ namespace App\Util\ActivityPub\Validator; +use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; -use Validator; class Like { diff --git a/app/Util/ActivityPub/Validator/MoveValidator.php b/app/Util/ActivityPub/Validator/MoveValidator.php index a7ca43297..090e92590 100644 --- a/app/Util/ActivityPub/Validator/MoveValidator.php +++ b/app/Util/ActivityPub/Validator/MoveValidator.php @@ -2,8 +2,8 @@ namespace App\Util\ActivityPub\Validator; +use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; -use Validator; class MoveValidator { diff --git a/app/Util/ActivityPub/Validator/RejectValidator.php b/app/Util/ActivityPub/Validator/RejectValidator.php index a95dcd12a..13ebdf82a 100644 --- a/app/Util/ActivityPub/Validator/RejectValidator.php +++ b/app/Util/ActivityPub/Validator/RejectValidator.php @@ -2,8 +2,8 @@ namespace App\Util\ActivityPub\Validator; +use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; -use Validator; class RejectValidator { diff --git a/app/Util/ActivityPub/Validator/StoryValidator.php b/app/Util/ActivityPub/Validator/StoryValidator.php index 0745e6898..26352a746 100644 --- a/app/Util/ActivityPub/Validator/StoryValidator.php +++ b/app/Util/ActivityPub/Validator/StoryValidator.php @@ -2,8 +2,8 @@ namespace App\Util\ActivityPub\Validator; +use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; -use Validator; class StoryValidator { diff --git a/app/Util/ActivityPub/Validator/UndoFollow.php b/app/Util/ActivityPub/Validator/UndoFollow.php index 9c0bb2f29..92131d85c 100644 --- a/app/Util/ActivityPub/Validator/UndoFollow.php +++ b/app/Util/ActivityPub/Validator/UndoFollow.php @@ -2,8 +2,8 @@ namespace App\Util\ActivityPub\Validator; +use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; -use Validator; class UndoFollow { diff --git a/app/Util/ActivityPub/Validator/UpdatePersonValidator.php b/app/Util/ActivityPub/Validator/UpdatePersonValidator.php index 113454eea..7559ae897 100644 --- a/app/Util/ActivityPub/Validator/UpdatePersonValidator.php +++ b/app/Util/ActivityPub/Validator/UpdatePersonValidator.php @@ -3,8 +3,8 @@ namespace App\Util\ActivityPub\Validator; use Closure; +use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; -use Validator; class UpdatePersonValidator { diff --git a/app/Util/Localization/Localization.php b/app/Util/Localization/Localization.php index 433e815a1..d2b362f6b 100644 --- a/app/Util/Localization/Localization.php +++ b/app/Util/Localization/Localization.php @@ -2,8 +2,8 @@ namespace App\Util\Localization; -use Cache; use Illuminate\Support\Arr; +use Illuminate\Support\Facades\Cache; class Localization { diff --git a/app/Util/Media/Image.php b/app/Util/Media/Image.php index f0b0d39d3..695a83549 100644 --- a/app/Util/Media/Image.php +++ b/app/Util/Media/Image.php @@ -4,12 +4,12 @@ namespace App\Util\Media; use App\Media; use App\Services\StatusService; -use Cache; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\Log; +use Illuminate\Support\Facades\Storage; use Intervention\Image\Encoders\JpegEncoder; use Intervention\Image\Encoders\PngEncoder; use Intervention\Image\Encoders\WebpEncoder; -use Log; -use Storage; class Image { @@ -302,11 +302,11 @@ class Image public function setBaseName($basePath, $thumbnail, $extension) { $pathInfo = pathinfo($basePath); - $dir = isset($pathInfo['dirname']) && $pathInfo['dirname'] !== '.' ? $pathInfo['dirname'] . '/' : ''; + $dir = isset($pathInfo['dirname']) && $pathInfo['dirname'] !== '.' ? $pathInfo['dirname'].'/' : ''; $filename = $pathInfo['filename']; - $name = ($thumbnail == true) ? $filename . '_thumb' : $filename; - $basePath = $dir . $name . '.' . $extension; - + $name = ($thumbnail == true) ? $filename.'_thumb' : $filename; + $basePath = $dir.$name.'.'.$extension; + return ['path' => $basePath, 'png' => false]; } diff --git a/app/Util/Sentiment/Bouncer.php b/app/Util/Sentiment/Bouncer.php index 20915134e..0a7e30587 100644 --- a/app/Util/Sentiment/Bouncer.php +++ b/app/Util/Sentiment/Bouncer.php @@ -8,7 +8,7 @@ use App\Notification; use App\Services\AutospamService; use App\Services\StatusService; use App\Status; -use Cache; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Str; class Bouncer @@ -36,7 +36,7 @@ class Bouncer $uid = $status->profile->user_id; $ids = AccountInterstitial::whereUserId($uid) ->whereType('post.autospam') - ->whereItemType(\App\Status::class) + ->whereItemType(Status::class) ->whereNotNull('appeal_handled_at') ->latest() ->take(5) @@ -117,7 +117,7 @@ class Bouncer $ai->user_id = $status->profile->user_id; $ai->type = 'post.autospam'; $ai->view = 'account.moderation.post.autospam'; - $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; @@ -152,7 +152,7 @@ class Bouncer $notification->actor_id = $status->profile_id; $notification->action = 'autospam.warning'; $notification->item_id = $status->id; - $notification->item_type = \App\Status::class; + $notification->item_type = Status::class; $notification->save(); StatusService::del($status->id); diff --git a/app/Util/Site/Config.php b/app/Util/Site/Config.php index c2a915db0..42e6945f4 100644 --- a/app/Util/Site/Config.php +++ b/app/Util/Site/Config.php @@ -2,7 +2,7 @@ namespace App\Util\Site; -use Cache; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Str; class Config diff --git a/tests/Feature/RemoteOidcTest.php b/tests/Feature/RemoteOidcTest.php index a4f13ce12..b2ebbc4c7 100644 --- a/tests/Feature/RemoteOidcTest.php +++ b/tests/Feature/RemoteOidcTest.php @@ -5,7 +5,7 @@ namespace Tests\Feature; use App\Models\UserOidcMapping; use App\Services\UserOidcService; use App\User; -use Auth; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Str; use League\OAuth2\Client\Provider\GenericResourceOwner; use League\OAuth2\Client\Token\AccessToken; diff --git a/tests/database.sqlite b/tests/database.sqlite index e69de29bb..e09e67b8b 100644 Binary files a/tests/database.sqlite and b/tests/database.sqlite differ