From 19880c2ffb54899f90d000a91a85b393ebb23da7 Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 25 Aug 2026 05:37:50 +0000 Subject: [PATCH] Convert string references to `::class` PHP 5.5.9 adds the new static `class` property which provides the fully qualified class name. This is preferred over using strings for class names since the `class` property references are checked by PHP. --- app/AccountInterstitial.php | 2 +- app/Console/Commands/FixDuplicateProfiles.php | 2 +- app/Http/Controllers/AccountController.php | 4 +-- .../Admin/AdminAutospamController.php | 2 +- .../Admin/AdminReportController.php | 30 +++++++++---------- .../AdminShadowFilterController.php | 2 +- .../Controllers/Api/AdminApiController.php | 10 +++---- app/Http/Controllers/Api/ApiV1Controller.php | 16 +++++----- .../Controllers/Api/ApiV1Dot1Controller.php | 14 ++++----- app/Http/Controllers/Auth/LoginController.php | 2 +- app/Http/Controllers/CollectionController.php | 4 +-- app/Http/Controllers/CommentController.php | 2 +- app/Http/Controllers/ComposeController.php | 8 ++--- .../Controllers/DirectMessageController.php | 10 +++---- .../Controllers/InternalApiController.php | 6 ++-- app/Http/Controllers/MediaTagController.php | 2 +- app/Http/Controllers/ProfileController.php | 2 +- app/Http/Controllers/ReportController.php | 12 ++++---- app/Http/Controllers/SeasonalController.php | 2 +- .../Controllers/Settings/HomeSettings.php | 4 +-- .../Controllers/Settings/PrivacySettings.php | 4 +-- app/Http/Controllers/StatusController.php | 2 +- .../Stories/StoryApiV1Controller.php | 2 +- .../Controllers/StoryComposeController.php | 8 ++--- app/Http/Controllers/TimelineController.php | 2 +- app/Http/Resources/AdminReport.php | 4 +-- app/Http/Resources/AdminSpamReport.php | 2 +- .../AutospamPretrainPipeline.php | 4 +-- app/Jobs/CommentPipeline/CommentPipeline.php | 4 +-- .../DeletePipeline/DeleteAccountPipeline.php | 2 +- .../DeleteRemoteProfilePipeline.php | 2 +- .../DeleteRemoteStatusPipeline.php | 4 +-- app/Jobs/FollowPipeline/FollowPipeline.php | 2 +- app/Jobs/FollowPipeline/UnfollowPipeline.php | 2 +- .../GroupPipeline/GroupCommentPipeline.php | 2 +- app/Jobs/GroupPipeline/GroupMemberInvite.php | 2 +- app/Jobs/GroupPipeline/JoinApproved.php | 2 +- app/Jobs/GroupPipeline/JoinRejected.php | 2 +- app/Jobs/GroupPipeline/LikePipeline.php | 4 +-- app/Jobs/GroupPipeline/UnlikePipeline.php | 2 +- .../GroupsPipeline/NewCommentPipeline.php | 4 +-- .../HomeFeedPipeline/FeedInsertPipeline.php | 2 +- .../FeedInsertRemotePipeline.php | 2 +- .../HashtagInsertFanoutPipeline.php | 2 +- app/Jobs/LikePipeline/LikePipeline.php | 2 +- app/Jobs/LikePipeline/UnlikePipeline.php | 2 +- app/Jobs/MentionPipeline/MentionPipeline.php | 4 +-- .../CleanupLegacyAccountMovePipeline.php | 2 +- app/Jobs/SharePipeline/SharePipeline.php | 2 +- app/Jobs/SharePipeline/UndoSharePipeline.php | 2 +- .../StatusPipeline/RemoteStatusDelete.php | 12 ++++---- app/Jobs/StatusPipeline/StatusDelete.php | 12 ++++---- .../StatusPipeline/StatusReplyPipeline.php | 4 +-- app/Listeners/LogFailedLogin.php | 2 +- app/Mail/AdminNewAutospam.php | 2 +- app/Models/AdminShadowFilter.php | 2 +- app/Observers/UserFilterObserver.php | 4 +-- app/Profile.php | 4 +-- app/Providers/EventServiceProvider.php | 4 +-- app/Report.php | 4 +-- app/Services/AdminShadowFilterService.php | 4 +-- app/Services/MediaTagService.php | 2 +- app/Services/ModLogService.php | 4 +-- app/Services/RelationshipService.php | 4 +-- .../Mastodon/v1/NotificationTransformer.php | 2 +- .../Api/NotificationTransformer.php | 6 ++-- app/UserFilter.php | 4 +-- app/Util/ActivityPub/Inbox.php | 18 +++++------ app/Util/Sentiment/Bouncer.php | 6 ++-- .../2023_04_20_092740_fix_account_blocks.php | 2 +- 70 files changed, 160 insertions(+), 160 deletions(-) diff --git a/app/AccountInterstitial.php b/app/AccountInterstitial.php index 8c6f00dc9..a0752cd3e 100644 --- a/app/AccountInterstitial.php +++ b/app/AccountInterstitial.php @@ -23,7 +23,7 @@ class AccountInterstitial extends Model public function status() { - if ($this->item_type != 'App\Status') { + if ($this->item_type != \App\Status::class) { return; } diff --git a/app/Console/Commands/FixDuplicateProfiles.php b/app/Console/Commands/FixDuplicateProfiles.php index ec0ad4256..9b5fdfaa4 100644 --- a/app/Console/Commands/FixDuplicateProfiles.php +++ b/app/Console/Commands/FixDuplicateProfiles.php @@ -239,7 +239,7 @@ class FixDuplicateProfiles extends Command protected function checkUserFilter($id, $oid) { UserFilter::whereUserId($oid)->update(['user_id' => $id]); - UserFilter::whereFilterableType('App\Profile')->whereFilterableId($oid)->update(['filterable_id' => $id]); + UserFilter::whereFilterableType(\App\Profile::class)->whereFilterableId($oid)->update(['filterable_id' => $id]); } protected function checkUserPronoun($id, $oid) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index b792c3d60..92e5cdd02 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -598,7 +598,7 @@ class AccountController extends Controller $limit = $request->input('limit') ?? 40; $mutes = UserFilter::whereUserId($user->profile_id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('mute') ->simplePaginate($limit) ->pluck('filterable_id'); @@ -631,7 +631,7 @@ class AccountController extends Controller $blocked = UserFilter::select('filterable_id', 'filterable_type', 'filter_type', 'user_id') ->whereUserId($user->profile_id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('block') ->simplePaginate($limit) ->pluck('filterable_id'); diff --git a/app/Http/Controllers/Admin/AdminAutospamController.php b/app/Http/Controllers/Admin/AdminAutospamController.php index 87563022c..bffb396e6 100644 --- a/app/Http/Controllers/Admin/AdminAutospamController.php +++ b/app/Http/Controllers/Admin/AdminAutospamController.php @@ -114,7 +114,7 @@ trait AdminAutospamController public function postAutospamTrainSpamApi(Request $request) { - $aiCount = AccountInterstitial::whereItemType('App\Status') + $aiCount = AccountInterstitial::whereItemType(\App\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/AdminReportController.php b/app/Http/Controllers/Admin/AdminReportController.php index 617fdfba9..fe894401e 100644 --- a/app/Http/Controllers/Admin/AdminReportController.php +++ b/app/Http/Controllers/Admin/AdminReportController.php @@ -230,7 +230,7 @@ trait AdminReportController AccountInterstitial::chunk(500, function ($reports) { foreach ($reports as $report) { - if ($report->item_type != 'App\Status') { + if ($report->item_type != \App\Status::class) { continue; } @@ -326,7 +326,7 @@ trait AdminReportController if ($action == 'dismiss-all') { AccountInterstitial::whereType('post.autospam') - ->whereItemType('App\Status') + ->whereItemType(\App\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') + ->whereItemType(\App\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') + ->whereItemType(\App\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') + ->whereObjectType(\App\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') { + if ($report->object_type === \App\Profile::class) { $profile = Profile::find($report->object_id); - } elseif ($report->object_type === 'App\Status') { + } elseif ($report->object_type === \App\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') { + if ($report->object_type === \App\Profile::class) { $profile = Profile::find($report->object_id); - } elseif ($report->object_type === 'App\Status') { + } elseif ($report->object_type === \App\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') { + if ($report->object_type === \App\Profile::class) { $profile = Profile::find($report->object_id); - } elseif ($report->object_type === 'App\Status') { + } elseif ($report->object_type === \App\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') { + if ($report->object_type === \App\Profile::class) { $profile = Profile::find($report->object_id); - } elseif ($report->object_type === 'App\Status') { + } elseif ($report->object_type === \App\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') + ->whereItemType(\App\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') + ->whereItemType(\App\Status::class) ->whereUserId($appeal->user_id) ->get() ->each(function ($report) use ($meta) { diff --git a/app/Http/Controllers/AdminShadowFilterController.php b/app/Http/Controllers/AdminShadowFilterController.php index 4940d8551..c4d71b6aa 100644 --- a/app/Http/Controllers/AdminShadowFilterController.php +++ b/app/Http/Controllers/AdminShadowFilterController.php @@ -37,7 +37,7 @@ class AdminShadowFilterController extends Controller ->pluck('id') ->toArray(); - return $q->where('item_type', 'App\Profile')->whereIn('item_id', $ids); + return $q->where('item_type', \App\Profile::class)->whereIn('item_id', $ids); }) ->latest() ->paginate(10) diff --git a/app/Http/Controllers/Api/AdminApiController.php b/app/Http/Controllers/Api/AdminApiController.php index 21a832a76..0c61dbd26 100644 --- a/app/Http/Controllers/Api/AdminApiController.php +++ b/app/Http/Controllers/Api/AdminApiController.php @@ -77,7 +77,7 @@ class AdminApiController extends Controller 'item_type' => $report->item_type, 'created_at' => $report->created_at, ]; - if ($report->item_type === 'App\\Status') { + if ($report->item_type === \App\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') + ->whereItemType(\App\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') + ->whereItemType(\App\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') { + if ($report->object_type === \App\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') { + if ($report->object_type === \App\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 18e726470..2ccd6a405 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -911,7 +911,7 @@ class ApiV1Controller extends Controller $blocked = UserFilter::whereUserId($target->id) ->whereFilterType('block') ->whereFilterableId($user->profile_id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->exists(); if ($blocked == true) { @@ -1168,7 +1168,7 @@ class ApiV1Controller extends Controller $blocks = UserFilter::select('filterable_id', 'filterable_type', 'filter_type', 'user_id') ->whereUserId($user->profile_id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('block') ->orderByDesc('id') ->simplePaginate($limit) @@ -1286,7 +1286,7 @@ class ApiV1Controller extends Controller $filter = UserFilter::firstOrCreate([ 'user_id' => $pid, 'filterable_id' => $profile->id, - 'filterable_type' => 'App\Profile', + 'filterable_type' => \App\Profile::class, 'filter_type' => 'block', ]); @@ -1323,7 +1323,7 @@ class ApiV1Controller extends Controller $filter = UserFilter::whereUserId($pid) ->whereFilterableId($profile->id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('block') ->first(); @@ -2304,7 +2304,7 @@ class ApiV1Controller extends Controller } $mutes = UserFilter::whereUserId($user->profile_id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('mute') ->orderByDesc('id') ->simplePaginate($limit) @@ -2388,7 +2388,7 @@ class ApiV1Controller extends Controller $filter = UserFilter::firstOrCreate([ 'user_id' => $pid, 'filterable_id' => $account->id, - 'filterable_type' => 'App\Profile', + 'filterable_type' => \App\Profile::class, 'filter_type' => 'mute', ]); @@ -2424,7 +2424,7 @@ class ApiV1Controller extends Controller $filter = UserFilter::whereUserId($pid) ->whereFilterableId($profile->id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('mute') ->first(); @@ -3966,7 +3966,7 @@ class ApiV1Controller extends Controller $count = $collection->items()->count(); $item = CollectionItem::firstOrCreate([ 'collection_id' => $collection->id, - 'object_type' => 'App\Status', + 'object_type' => \App\Status::class, 'object_id' => $status->id, ], [ 'order' => $count, diff --git a/app/Http/Controllers/Api/ApiV1Dot1Controller.php b/app/Http/Controllers/Api/ApiV1Dot1Controller.php index 43cedcc1f..20fd74951 100644 --- a/app/Http/Controllers/Api/ApiV1Dot1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Dot1Controller.php @@ -126,10 +126,10 @@ class ApiV1Dot1Controller extends Controller if (! $object) { return $this->error('Invalid object id', 400, ['error_code' => 'ERROR_INVALID_OBJECT_ID']); } - $object_type = 'App\Status'; + $object_type = \App\Status::class; $exists = Report::whereUserId($user->id) ->whereObjectId($object->id) - ->whereObjectType('App\Status') + ->whereObjectType(\App\Status::class) ->count(); $rpid = $object->profile_id; @@ -140,10 +140,10 @@ class ApiV1Dot1Controller extends Controller if (! $object) { return $this->error('Invalid object id', 400, ['error_code' => 'ERROR_INVALID_OBJECT_ID']); } - $object_type = 'App\Profile'; + $object_type = \App\Profile::class; $exists = Report::whereUserId($user->id) ->whereObjectId($object->id) - ->whereObjectType('App\Profile') + ->whereObjectType(\App\Profile::class) ->count(); $rpid = $object->id; break; @@ -159,10 +159,10 @@ class ApiV1Dot1Controller extends Controller if (! Follower::whereProfileId($user->profile_id)->whereFollowingId($object->profile_id)->exists()) { return $this->error('Invalid object id', 400, ['error_code' => 'ERROR_INVALID_OBJECT_ID']); } - $object_type = 'App\Story'; + $object_type = \App\Story::class; $exists = Report::whereUserId($user->id) ->whereObjectId($object->id) - ->whereObjectType('App\Story') + ->whereObjectType(\App\Story::class) ->count(); $rpid = $object->profile_id; @@ -313,7 +313,7 @@ class ApiV1Dot1Controller extends Controller $log = new AccountLog; $log->user_id = $user->id; $log->item_id = $user->id; - $log->item_type = 'App\User'; + $log->item_type = \App\User::class; $log->action = 'account.edit.password'; $log->message = 'Password changed'; $log->link = null; diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 93a507679..9b6a83a45 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -104,7 +104,7 @@ class LoginController extends Controller $log = new AccountLog; $log->user_id = $user->id; $log->item_id = $user->id; - $log->item_type = 'App\User'; + $log->item_type = \App\User::class; $log->action = 'auth.login'; $log->message = 'Account Login'; $log->link = null; diff --git a/app/Http/Controllers/CollectionController.php b/app/Http/Controllers/CollectionController.php index bc9518baa..7dbba4716 100644 --- a/app/Http/Controllers/CollectionController.php +++ b/app/Http/Controllers/CollectionController.php @@ -155,7 +155,7 @@ class CollectionController extends Controller $item = CollectionItem::firstOrCreate([ 'collection_id' => $collection->id, - 'object_type' => 'App\Status', + 'object_type' => \App\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') + ->whereObjectType(\App\Status::class) ->whereObjectId($status->id) ->firstOrFail(); diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php index 9ffe53b2d..42fefa989 100644 --- a/app/Http/Controllers/CommentController.php +++ b/app/Http/Controllers/CommentController.php @@ -48,7 +48,7 @@ class CommentController extends Controller } $filtered = UserFilter::whereUserId($status->profile_id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\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 849209988..394cc0b0f 100644 --- a/app/Http/Controllers/ComposeController.php +++ b/app/Http/Controllers/ComposeController.php @@ -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') + $blocked = UserFilter::whereFilterableType(\App\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') + Notification::whereItemType(\App\MediaTag::class) ->whereItemId($tag->id) ->whereProfileId($profile_id) ->whereAction('tagged') @@ -440,7 +440,7 @@ class ComposeController extends Controller return []; } - $blocked = UserFilter::whereFilterableType('App\Profile') + $blocked = UserFilter::whereFilterableType(\App\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', + 'object_type' => \App\Status::class, 'object_id' => $status->id, ], [ 'order' => $count, diff --git a/app/Http/Controllers/DirectMessageController.php b/app/Http/Controllers/DirectMessageController.php index a55bb6546..8ca52d0a3 100644 --- a/app/Http/Controllers/DirectMessageController.php +++ b/app/Http/Controllers/DirectMessageController.php @@ -208,7 +208,7 @@ class DirectMessageController extends Controller $nf = UserFilter::whereUserId($recipient->id) ->whereFilterableId($profile->id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('dm.mute') ->exists(); @@ -218,7 +218,7 @@ class DirectMessageController extends Controller $notification->actor_id = $profile->id; $notification->action = 'dm'; $notification->item_id = $dm->id; - $notification->item_type = "App\DirectMessage"; + $notification->item_type = \App\DirectMessage::class; $notification->save(); } @@ -574,7 +574,7 @@ class DirectMessageController extends Controller $q = mb_substr($q, 1); } - $blocked = UserFilter::whereFilterableType('App\Profile') + $blocked = UserFilter::whereFilterableType(\App\Profile::class) ->whereFilterType('block') ->whereFilterableId($request->user()->profile_id) ->pluck('user_id'); @@ -654,7 +654,7 @@ class DirectMessageController extends Controller [ 'user_id' => $pid, 'filterable_id' => $fid, - 'filterable_type' => 'App\Profile', + 'filterable_type' => \App\Profile::class, 'filter_type' => 'dm.mute', ] ); @@ -676,7 +676,7 @@ class DirectMessageController extends Controller $f = UserFilter::whereUserId($pid) ->whereFilterableId($fid) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('dm.mute') ->firstOrFail(); diff --git a/app/Http/Controllers/InternalApiController.php b/app/Http/Controllers/InternalApiController.php index eb053b5c1..905de7c6e 100644 --- a/app/Http/Controllers/InternalApiController.php +++ b/app/Http/Controllers/InternalApiController.php @@ -184,7 +184,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'; + $ai->item_type = \App\Status::class; $ai->item_id = $status->id; $ai->has_media = (bool) $media->count(); $ai->blurhash = $media->count() ? $media->first()->blurhash : null; @@ -226,7 +226,7 @@ class InternalApiController extends Controller $ai = AccountInterstitial::whereUserId($status->profile->user_id) ->whereType('post.cw') ->whereItemId($status->id) - ->whereItemType('App\Status') + ->whereItemType(\App\Status::class) ->first(); $ai->delete(); } @@ -255,7 +255,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'; + $ai->item_type = \App\Status::class; $ai->item_id = $status->id; $ai->has_media = (bool) $media->count(); $ai->blurhash = $media->count() ? $media->first()->blurhash : null; diff --git a/app/Http/Controllers/MediaTagController.php b/app/Http/Controllers/MediaTagController.php index f461b6fac..fc18010d2 100644 --- a/app/Http/Controllers/MediaTagController.php +++ b/app/Http/Controllers/MediaTagController.php @@ -41,7 +41,7 @@ class MediaTagController extends Controller if (! $tag) { return []; } - Notification::whereItemType('App\MediaTag') + Notification::whereItemType(\App\MediaTag::class) ->whereItemId($tag->id) ->whereProfileId($profile_id) ->whereAction('tagged') diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 7231c519a..ebf8b2643 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -224,7 +224,7 @@ class ProfileController extends Controller $pid = Auth::user()->profile->id; $blocks = UserFilter::whereUserId($profile->id) ->whereFilterType('block') - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->pluck('filterable_id') ->toArray(); if (in_array($pid, $blocks)) { diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 413cdc82b..e510bb0c1 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -150,10 +150,10 @@ class ReportController extends Controller case 'post': case 'comment': $object = Status::findOrFail($object_id); - $object_type = 'App\Status'; + $object_type = \App\Status::class; $exists = Report::whereUserId(Auth::id()) ->whereObjectId($object->id) - ->whereObjectType('App\Status') + ->whereObjectType(\App\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'; + $object_type = \App\Profile::class; $exists = Report::whereUserId(Auth::id()) ->whereObjectId($object->id) - ->whereObjectType('App\Profile') + ->whereObjectType(\App\Profile::class) ->count(); $rpid = $object->id; break; case 'group': $object = Group::findOrFail($object_id); - $object_type = 'App\Models\Group'; + $object_type = \App\Models\Group::class; $exists = Report::whereUserId(Auth::id()) ->whereObjectId($object->id) - ->whereObjectType('App\Models\Group') + ->whereObjectType(\App\Models\Group::class) ->count(); $rpid = $object->profile_id; break; diff --git a/app/Http/Controllers/SeasonalController.php b/app/Http/Controllers/SeasonalController.php index 1d2ad821b..5aba049a2 100644 --- a/app/Http/Controllers/SeasonalController.php +++ b/app/Http/Controllers/SeasonalController.php @@ -225,7 +225,7 @@ class SeasonalController extends Controller $log = AccountLog::firstOrCreate([ [ - 'item_type' => 'App\User', + 'item_type' => \App\User::class, 'item_id' => $user->id, 'user_id' => $user->id, 'action' => 'seasonal.my2020.view', diff --git a/app/Http/Controllers/Settings/HomeSettings.php b/app/Http/Controllers/Settings/HomeSettings.php index 8d73a3ed7..057bc9fed 100644 --- a/app/Http/Controllers/Settings/HomeSettings.php +++ b/app/Http/Controllers/Settings/HomeSettings.php @@ -138,7 +138,7 @@ trait HomeSettings $log = new AccountLog; $log->user_id = $user->id; $log->item_id = $user->id; - $log->item_type = 'App\User'; + $log->item_type = \App\User::class; $log->action = 'account.edit.password'; $log->message = $revokeSessions ? 'Password changed and all sessions revoked' @@ -193,7 +193,7 @@ trait HomeSettings $log = new AccountLog; $log->user_id = $user->id; $log->item_id = $user->id; - $log->item_type = 'App\User'; + $log->item_type = \App\User::class; $log->action = 'account.edit.email'; $log->message = 'Email changed'; $log->link = null; diff --git a/app/Http/Controllers/Settings/PrivacySettings.php b/app/Http/Controllers/Settings/PrivacySettings.php index d259a1da9..6934a6eb5 100644 --- a/app/Http/Controllers/Settings/PrivacySettings.php +++ b/app/Http/Controllers/Settings/PrivacySettings.php @@ -133,7 +133,7 @@ trait PrivacySettings DB::transaction(function () use ($fid, $pid) { $filter = UserFilter::whereUserId($pid) ->whereFilterableId($fid) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\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') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('block') ->firstOrFail(); $filter->delete(); diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index f8875c46b..258c1efc2 100644 --- a/app/Http/Controllers/StatusController.php +++ b/app/Http/Controllers/StatusController.php @@ -265,7 +265,7 @@ class StatusController extends Controller $ai->user_id = $status->profile->user_id; $ai->type = 'post.removed'; $ai->view = 'account.moderation.post.removed'; - $ai->item_type = 'App\Status'; + $ai->item_type = \App\Status::class; $ai->item_id = $status->id; $ai->has_media = (bool) $media->count(); $ai->blurhash = $media->count() ? $media->first()->blurhash : null; diff --git a/app/Http/Controllers/Stories/StoryApiV1Controller.php b/app/Http/Controllers/Stories/StoryApiV1Controller.php index 8a7838ccf..3c951bba9 100644 --- a/app/Http/Controllers/Stories/StoryApiV1Controller.php +++ b/app/Http/Controllers/Stories/StoryApiV1Controller.php @@ -726,7 +726,7 @@ class StoryApiV1Controller extends Controller $n->profile_id = $dm->to_id; $n->actor_id = $dm->from_id; $n->item_id = $dm->id; - $n->item_type = 'App\DirectMessage'; + $n->item_type = \App\DirectMessage::class; $n->action = 'story:comment'; $n->save(); } else { diff --git a/app/Http/Controllers/StoryComposeController.php b/app/Http/Controllers/StoryComposeController.php index 4c03d974e..5e05e0c55 100644 --- a/app/Http/Controllers/StoryComposeController.php +++ b/app/Http/Controllers/StoryComposeController.php @@ -460,7 +460,7 @@ class StoryComposeController extends Controller abort_if(! FollowerService::follows($pid, $story->profile_id), 422, 'Cannot report a story from an account you do not follow'); if (Report::whereProfileId($pid) - ->whereObjectType('App\Story') + ->whereObjectType(\App\Story::class) ->whereObjectId($story->id) ->exists() ) { @@ -474,7 +474,7 @@ class StoryComposeController extends Controller $report->profile_id = $pid; $report->user_id = $request->user()->id; $report->object_id = $story->id; - $report->object_type = 'App\Story'; + $report->object_type = \App\Story::class; $report->reported_profile_id = $story->profile_id; $report->type = $type; $report->message = null; @@ -550,7 +550,7 @@ class StoryComposeController extends Controller $n->profile_id = $dm->to_id; $n->actor_id = $dm->from_id; $n->item_id = $dm->id; - $n->item_type = 'App\DirectMessage'; + $n->item_type = \App\DirectMessage::class; $n->action = 'story:react'; $n->save(); } else { @@ -627,7 +627,7 @@ class StoryComposeController extends Controller $n->profile_id = $dm->to_id; $n->actor_id = $dm->from_id; $n->item_id = $dm->id; - $n->item_type = 'App\DirectMessage'; + $n->item_type = \App\DirectMessage::class; $n->action = 'story:comment'; $n->save(); } else { diff --git a/app/Http/Controllers/TimelineController.php b/app/Http/Controllers/TimelineController.php index 9da6354f9..b1692034e 100644 --- a/app/Http/Controllers/TimelineController.php +++ b/app/Http/Controllers/TimelineController.php @@ -72,7 +72,7 @@ class TimelineController extends Controller }); $filtered = UserFilter::whereUserId($user->profile_id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereIn('filter_type', ['mute', 'block']) ->pluck('filterable_id')->toArray(); diff --git a/app/Http/Resources/AdminReport.php b/app/Http/Resources/AdminReport.php index c74a520a4..d22a0048f 100644 --- a/app/Http/Resources/AdminReport.php +++ b/app/Http/Resources/AdminReport.php @@ -41,11 +41,11 @@ class AdminReport extends JsonResource 'created_at' => $this->created_at, ]; - if ($this->object_id && $this->object_type === 'App\Status') { + if ($this->object_id && $this->object_type === \App\Status::class) { $res['status'] = StatusService::get($this->object_id, false); } - if ($this->object_id && $this->object_type === 'App\Story') { + if ($this->object_id && $this->object_type === \App\Story::class) { $story = Story::find($this->object_id); if ($story) { $res['story'] = $story->toAdminEntity(); diff --git a/app/Http/Resources/AdminSpamReport.php b/app/Http/Resources/AdminSpamReport.php index 01a4ad830..cf082c3b5 100644 --- a/app/Http/Resources/AdminSpamReport.php +++ b/app/Http/Resources/AdminSpamReport.php @@ -31,7 +31,7 @@ class AdminSpamReport extends JsonResource 'created_at' => $this->created_at, ]; - if ($this->item_id && $this->item_type === 'App\Status') { + if ($this->item_id && $this->item_type === \App\Status::class) { $res['status'] = StatusService::get($this->item_id, false); } diff --git a/app/Jobs/AutospamPipeline/AutospamPretrainPipeline.php b/app/Jobs/AutospamPipeline/AutospamPretrainPipeline.php index 7404f9a7e..f6c7fc6b3 100644 --- a/app/Jobs/AutospamPipeline/AutospamPretrainPipeline.php +++ b/app/Jobs/AutospamPipeline/AutospamPretrainPipeline.php @@ -34,7 +34,7 @@ class AutospamPretrainPipeline implements ShouldQueue { $classifier = $this->classifier; - $aiCount = AccountInterstitial::whereItemType('App\Status') + $aiCount = AccountInterstitial::whereItemType(\App\Status::class) ->whereIsSpam(true) ->count(); @@ -42,7 +42,7 @@ class AutospamPretrainPipeline implements ShouldQueue return; } - AccountInterstitial::whereItemType('App\Status') + AccountInterstitial::whereItemType(\App\Status::class) ->whereIsSpam(true) ->inRandomOrder() ->take(config('autospam.nlp.spam_sample_limit')) diff --git a/app/Jobs/CommentPipeline/CommentPipeline.php b/app/Jobs/CommentPipeline/CommentPipeline.php index 5689c10dc..5d50083a3 100644 --- a/app/Jobs/CommentPipeline/CommentPipeline.php +++ b/app/Jobs/CommentPipeline/CommentPipeline.php @@ -106,7 +106,7 @@ class CommentPipeline implements ShouldQueue } $filtered = UserFilter::whereUserId($target->id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereIn('filter_type', ['mute', 'block']) ->whereFilterableId($actor->id) ->exists(); @@ -122,7 +122,7 @@ class CommentPipeline implements ShouldQueue $notification->actor_id = $actor->id; $notification->action = 'comment'; $notification->item_id = $comment->id; - $notification->item_type = "App\Status"; + $notification->item_type = \App\Status::class; $notification->save(); NotificationService::setNotification($notification); diff --git a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php index 6a889a1c0..e7f7a9600 100644 --- a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php +++ b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php @@ -138,7 +138,7 @@ class DeleteAccountPipeline implements ShouldQueue RemoteAuth::whereUserId($user->id)->delete(); - AccountLog::whereItemType('App\User')->whereItemId($user->id)->forceDelete(); + AccountLog::whereItemType(\App\User::class)->whereItemId($user->id)->forceDelete(); AccountInterstitial::whereUserId($user->id)->delete(); diff --git a/app/Jobs/DeletePipeline/DeleteRemoteProfilePipeline.php b/app/Jobs/DeletePipeline/DeleteRemoteProfilePipeline.php index f295bd11a..1c5691b8c 100644 --- a/app/Jobs/DeletePipeline/DeleteRemoteProfilePipeline.php +++ b/app/Jobs/DeletePipeline/DeleteRemoteProfilePipeline.php @@ -119,7 +119,7 @@ class DeleteRemoteProfilePipeline implements ShouldQueue } // Delete mutes/blocks - UserFilter::whereFilterableType('App\Profile')->whereFilterableId($pid)->delete(); + UserFilter::whereFilterableType(\App\Profile::class)->whereFilterableId($pid)->delete(); // Delete mentions Mention::whereProfileId($pid)->forceDelete(); diff --git a/app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php b/app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php index ece922285..6b4c2d645 100644 --- a/app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php +++ b/app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php @@ -76,7 +76,7 @@ class DeleteRemoteStatusPipeline implements ShouldQueue NetworkTimelineService::del($status->id); StatusService::del($status->id, true); Bookmark::whereStatusId($status->id)->delete(); - Notification::whereItemType('App\Status') + Notification::whereItemType(\App\Status::class) ->whereItemId($status->id) ->forceDelete(); DirectMessage::whereStatusId($status->id)->delete(); @@ -88,7 +88,7 @@ class DeleteRemoteStatusPipeline implements ShouldQueue MediaDeletePipeline::dispatch($media)->onQueue('mmo'); }); Mention::whereStatusId($status->id)->forceDelete(); - Report::whereObjectType('App\Status')->whereObjectId($status->id)->delete(); + Report::whereObjectType(\App\Status::class)->whereObjectId($status->id)->delete(); StatusHashtag::whereStatusId($status->id)->delete(); StatusView::whereStatusId($status->id)->delete(); Status::whereReblogOfId($status->id)->forceDelete(); diff --git a/app/Jobs/FollowPipeline/FollowPipeline.php b/app/Jobs/FollowPipeline/FollowPipeline.php index 9aade23cb..2b3bbea59 100644 --- a/app/Jobs/FollowPipeline/FollowPipeline.php +++ b/app/Jobs/FollowPipeline/FollowPipeline.php @@ -82,7 +82,7 @@ class FollowPipeline implements ShouldQueue $notification->actor_id = $actor->id; $notification->action = 'follow'; $notification->item_id = $target->id; - $notification->item_type = "App\Profile"; + $notification->item_type = \App\Profile::class; $notification->save(); } catch (\Exception $e) { Log::error($e); diff --git a/app/Jobs/FollowPipeline/UnfollowPipeline.php b/app/Jobs/FollowPipeline/UnfollowPipeline.php index 9417e535e..73c29659d 100644 --- a/app/Jobs/FollowPipeline/UnfollowPipeline.php +++ b/app/Jobs/FollowPipeline/UnfollowPipeline.php @@ -95,7 +95,7 @@ class UnfollowPipeline implements ShouldQueue ->whereAction('follow') ->whereActorId($actor) ->whereItemId($target) - ->whereItemType('App\Profile') + ->whereItemType(\App\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 3b0b554be..47af26711 100644 --- a/app/Jobs/GroupPipeline/GroupCommentPipeline.php +++ b/app/Jobs/GroupPipeline/GroupCommentPipeline.php @@ -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"; + $notification->item_type = \App\Status::class; $notification->save(); return $notification; diff --git a/app/Jobs/GroupPipeline/GroupMemberInvite.php b/app/Jobs/GroupPipeline/GroupMemberInvite.php index de0c0d287..96387c613 100644 --- a/app/Jobs/GroupPipeline/GroupMemberInvite.php +++ b/app/Jobs/GroupPipeline/GroupMemberInvite.php @@ -47,7 +47,7 @@ class GroupMemberInvite implements ShouldQueue $notification->actor_id = $actor->id; $notification->action = 'group:invite'; $notification->item_id = $invite->group_id; - $notification->item_type = 'App\Models\Group'; + $notification->item_type = \App\Models\Group::class; $notification->save(); } } diff --git a/app/Jobs/GroupPipeline/JoinApproved.php b/app/Jobs/GroupPipeline/JoinApproved.php index b67961167..8702e3506 100644 --- a/app/Jobs/GroupPipeline/JoinApproved.php +++ b/app/Jobs/GroupPipeline/JoinApproved.php @@ -44,7 +44,7 @@ class JoinApproved implements ShouldQueue $n->profile_id = $member->profile_id; $n->actor_id = $member->profile_id; $n->item_id = $member->group_id; - $n->item_type = 'App\Models\Group'; + $n->item_type = \App\Models\Group::class; $n->save(); GroupService::del($member->group_id); diff --git a/app/Jobs/GroupPipeline/JoinRejected.php b/app/Jobs/GroupPipeline/JoinRejected.php index 27a092d33..ac161c709 100644 --- a/app/Jobs/GroupPipeline/JoinRejected.php +++ b/app/Jobs/GroupPipeline/JoinRejected.php @@ -41,7 +41,7 @@ class JoinRejected implements ShouldQueue $n->profile_id = $member->profile_id; $n->actor_id = $member->profile_id; $n->item_id = $member->group_id; - $n->item_type = 'App\Models\Group'; + $n->item_type = \App\Models\Group::class; $n->action = 'group.join.rejected'; $n->save(); } diff --git a/app/Jobs/GroupPipeline/LikePipeline.php b/app/Jobs/GroupPipeline/LikePipeline.php index eb4ec634d..58c3e4996 100644 --- a/app/Jobs/GroupPipeline/LikePipeline.php +++ b/app/Jobs/GroupPipeline/LikePipeline.php @@ -69,7 +69,7 @@ class LikePipeline implements ShouldQueue ->whereActorId($actor->id) ->whereAction('group:like') ->whereItemId($status->id) - ->whereItemType('App\Status') + ->whereItemType(\App\Status::class) ->count(); if ($actor->id === $status->profile_id || $exists !== 0) { @@ -82,7 +82,7 @@ class LikePipeline implements ShouldQueue $notification->actor_id = $actor->id; $notification->action = 'group:like'; $notification->item_id = $status->id; - $notification->item_type = "App\Status"; + $notification->item_type = \App\Status::class; $notification->save(); } catch (\Exception $e) { diff --git a/app/Jobs/GroupPipeline/UnlikePipeline.php b/app/Jobs/GroupPipeline/UnlikePipeline.php index 7ec7edf73..41bb63d9e 100644 --- a/app/Jobs/GroupPipeline/UnlikePipeline.php +++ b/app/Jobs/GroupPipeline/UnlikePipeline.php @@ -73,7 +73,7 @@ class UnlikePipeline implements ShouldQueue ->whereActorId($actor->id) ->whereAction('group:like') ->whereItemId($status->id) - ->whereItemType('App\Status') + ->whereItemType(\App\Status::class) ->first(); if ($exists) { diff --git a/app/Jobs/GroupsPipeline/NewCommentPipeline.php b/app/Jobs/GroupsPipeline/NewCommentPipeline.php index 4fc34cf59..bc87a18cb 100644 --- a/app/Jobs/GroupsPipeline/NewCommentPipeline.php +++ b/app/Jobs/GroupsPipeline/NewCommentPipeline.php @@ -61,12 +61,12 @@ class NewCommentPipeline implements ShouldQueue $groupId = $status->group_id; $postId = $status->id; - if ($parentClass === 'App\Models\GroupPost') { + if ($parentClass === \App\Models\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') { + } elseif ($parentClass === \App\Models\GroupComment::class) { $gp = GroupPost::whereId($parent->status_id)->firstOrFail(); if ($gp->group_id !== $status->group_id) { return; diff --git a/app/Jobs/HomeFeedPipeline/FeedInsertPipeline.php b/app/Jobs/HomeFeedPipeline/FeedInsertPipeline.php index 83bee6b38..08e98d0ea 100644 --- a/app/Jobs/HomeFeedPipeline/FeedInsertPipeline.php +++ b/app/Jobs/HomeFeedPipeline/FeedInsertPipeline.php @@ -115,7 +115,7 @@ class FeedInsertPipeline implements ShouldBeUniqueUntilProcessing, ShouldQueue $skipIds = UserDomainBlock::where('domain', $domain)->pluck('profile_id')->toArray(); } - $filters = UserFilter::whereFilterableType('App\Profile') + $filters = UserFilter::whereFilterableType(\App\Profile::class) ->whereFilterableId($status['account']['id']) ->whereIn('filter_type', ['mute', 'block']) ->pluck('user_id') diff --git a/app/Jobs/HomeFeedPipeline/FeedInsertRemotePipeline.php b/app/Jobs/HomeFeedPipeline/FeedInsertRemotePipeline.php index de8f102ec..97be5c450 100644 --- a/app/Jobs/HomeFeedPipeline/FeedInsertRemotePipeline.php +++ b/app/Jobs/HomeFeedPipeline/FeedInsertRemotePipeline.php @@ -113,7 +113,7 @@ class FeedInsertRemotePipeline implements ShouldBeUniqueUntilProcessing, ShouldQ $skipIds = UserDomainBlock::where('domain', $domain)->pluck('profile_id')->toArray(); } - $filters = UserFilter::whereFilterableType('App\Profile') + $filters = UserFilter::whereFilterableType(\App\Profile::class) ->whereFilterableId($status['account']['id']) ->whereIn('filter_type', ['mute', 'block']) ->pluck('user_id') diff --git a/app/Jobs/HomeFeedPipeline/HashtagInsertFanoutPipeline.php b/app/Jobs/HomeFeedPipeline/HashtagInsertFanoutPipeline.php index 2f957af6e..d0149e59d 100644 --- a/app/Jobs/HomeFeedPipeline/HashtagInsertFanoutPipeline.php +++ b/app/Jobs/HomeFeedPipeline/HashtagInsertFanoutPipeline.php @@ -113,7 +113,7 @@ class HashtagInsertFanoutPipeline implements ShouldBeUniqueUntilProcessing, Shou $skipIds = UserDomainBlock::where('domain', $domain)->pluck('profile_id')->toArray(); } - $filters = UserFilter::whereFilterableType('App\Profile') + $filters = UserFilter::whereFilterableType(\App\Profile::class) ->whereFilterableId($status['account']['id']) ->whereIn('filter_type', ['mute', 'block']) ->pluck('user_id') diff --git a/app/Jobs/LikePipeline/LikePipeline.php b/app/Jobs/LikePipeline/LikePipeline.php index 309d6749c..1bebeadf5 100644 --- a/app/Jobs/LikePipeline/LikePipeline.php +++ b/app/Jobs/LikePipeline/LikePipeline.php @@ -87,7 +87,7 @@ class LikePipeline implements ShouldQueue 'actor_id' => $actor->id, 'action' => 'like', 'item_id' => $status->id, - 'item_type' => 'App\Status', + 'item_type' => \App\Status::class, ] ); diff --git a/app/Jobs/LikePipeline/UnlikePipeline.php b/app/Jobs/LikePipeline/UnlikePipeline.php index eea319ad5..b691b890c 100644 --- a/app/Jobs/LikePipeline/UnlikePipeline.php +++ b/app/Jobs/LikePipeline/UnlikePipeline.php @@ -71,7 +71,7 @@ class UnlikePipeline implements ShouldQueue ->whereActorId($actor->id) ->whereAction('like') ->whereItemId($status->id) - ->whereItemType('App\Status') + ->whereItemType(\App\Status::class) ->chunkById(100, function ($notifications) { foreach ($notifications as $notification) { $notification->forceDelete(); diff --git a/app/Jobs/MentionPipeline/MentionPipeline.php b/app/Jobs/MentionPipeline/MentionPipeline.php index 9f0ecc726..75525617c 100644 --- a/app/Jobs/MentionPipeline/MentionPipeline.php +++ b/app/Jobs/MentionPipeline/MentionPipeline.php @@ -88,7 +88,7 @@ class MentionPipeline implements ShouldQueue ->whereActorId($actor->id) ->whereIn('action', ['mention', 'comment']) ->whereItemId($status->id) - ->whereItemType('App\Status') + ->whereItemType(\App\Status::class) ->count(); if ($actor->id === $target || $exists !== 0) { @@ -100,7 +100,7 @@ class MentionPipeline implements ShouldQueue 'profile_id' => $target, 'actor_id' => $actor->id, 'action' => 'mention', - 'item_type' => 'App\Status', + 'item_type' => \App\Status::class, 'item_id' => $status->id, ] ); diff --git a/app/Jobs/MovePipeline/CleanupLegacyAccountMovePipeline.php b/app/Jobs/MovePipeline/CleanupLegacyAccountMovePipeline.php index 4ba27308f..527eac0d8 100644 --- a/app/Jobs/MovePipeline/CleanupLegacyAccountMovePipeline.php +++ b/app/Jobs/MovePipeline/CleanupLegacyAccountMovePipeline.php @@ -85,7 +85,7 @@ class CleanupLegacyAccountMovePipeline implements ShouldQueue throw new Exception('Invalid move accounts'); } - UserFilter::where('filterable_type', 'App\Profile') + UserFilter::where('filterable_type', \App\Profile::class) ->where('filterable_id', $actorAccount['id']) ->update(['filterable_id' => $targetAccount['id']]); diff --git a/app/Jobs/SharePipeline/SharePipeline.php b/app/Jobs/SharePipeline/SharePipeline.php index 0692529e8..a7a6522b2 100644 --- a/app/Jobs/SharePipeline/SharePipeline.php +++ b/app/Jobs/SharePipeline/SharePipeline.php @@ -79,7 +79,7 @@ class SharePipeline implements ShouldQueue 'profile_id' => $target->id, 'actor_id' => $actor->id, 'action' => 'share', - 'item_type' => 'App\Status', + 'item_type' => \App\Status::class, 'item_id' => $status->reblog_of_id ?? $status->id, ] ); diff --git a/app/Jobs/SharePipeline/UndoSharePipeline.php b/app/Jobs/SharePipeline/UndoSharePipeline.php index 3d6509998..e55171673 100644 --- a/app/Jobs/SharePipeline/UndoSharePipeline.php +++ b/app/Jobs/SharePipeline/UndoSharePipeline.php @@ -54,7 +54,7 @@ class UndoSharePipeline implements ShouldQueue ->whereActorId($status->profile_id) ->whereAction('share') ->whereItemId($status->reblog_of_id) - ->whereItemType('App\Status') + ->whereItemType(\App\Status::class) ->first(); if ($notification) { diff --git a/app/Jobs/StatusPipeline/RemoteStatusDelete.php b/app/Jobs/StatusPipeline/RemoteStatusDelete.php index 7e2e49893..47e992f92 100644 --- a/app/Jobs/StatusPipeline/RemoteStatusDelete.php +++ b/app/Jobs/StatusPipeline/RemoteStatusDelete.php @@ -127,11 +127,11 @@ class RemoteStatusDelete implements ShouldBeUniqueUntilProcessing, ShouldQueue } } - AccountInterstitial::where('item_type', 'App\Status') + AccountInterstitial::where('item_type', \App\Status::class) ->where('item_id', $status->id) ->delete(); Bookmark::whereStatusId($status->id)->delete(); - CollectionItem::whereObjectType('App\Status') + CollectionItem::whereObjectType(\App\Status::class) ->whereObjectId($status->id) ->get() ->each(function ($col) { @@ -140,7 +140,7 @@ class RemoteStatusDelete implements ShouldBeUniqueUntilProcessing, ShouldQueue }); $dms = DirectMessage::whereStatusId($status->id)->get(); foreach ($dms as $dm) { - $not = Notification::whereItemType('App\DirectMessage') + $not = Notification::whereItemType(\App\DirectMessage::class) ->whereItemId($dm->id) ->first(); if ($not) { @@ -157,7 +157,7 @@ class RemoteStatusDelete implements ShouldBeUniqueUntilProcessing, ShouldQueue }); $mediaTags = MediaTag::where('status_id', $status->id)->get(); foreach ($mediaTags as $mtag) { - $not = Notification::whereItemType('App\MediaTag') + $not = Notification::whereItemType(\App\MediaTag::class) ->whereItemId($mtag->id) ->first(); if ($not) { @@ -167,10 +167,10 @@ class RemoteStatusDelete implements ShouldBeUniqueUntilProcessing, ShouldQueue $mtag->delete(); } Mention::whereStatusId($status->id)->forceDelete(); - Notification::whereItemType('App\Status') + Notification::whereItemType(\App\Status::class) ->whereItemId($status->id) ->forceDelete(); - Report::whereObjectType('App\Status') + Report::whereObjectType(\App\Status::class) ->whereObjectId($status->id) ->delete(); StatusArchived::whereStatusId($status->id)->delete(); diff --git a/app/Jobs/StatusPipeline/StatusDelete.php b/app/Jobs/StatusPipeline/StatusDelete.php index 088304509..19bbeb006 100644 --- a/app/Jobs/StatusPipeline/StatusDelete.php +++ b/app/Jobs/StatusPipeline/StatusDelete.php @@ -120,7 +120,7 @@ class StatusDelete implements ShouldQueue Bookmark::whereStatusId($status->id)->delete(); - CollectionItem::whereObjectType('App\Status') + CollectionItem::whereObjectType(\App\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') + $not = Notification::whereItemType(\App\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') + $not = Notification::whereItemType(\App\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') + Notification::whereItemType(\App\Status::class) ->whereItemId($status->id) ->forceDelete(); - Report::whereObjectType('App\Status') + Report::whereObjectType(\App\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') + AccountInterstitial::where('item_type', \App\Status::class) ->where('item_id', $status->id) ->delete(); diff --git a/app/Jobs/StatusPipeline/StatusReplyPipeline.php b/app/Jobs/StatusPipeline/StatusReplyPipeline.php index 05eb2e8c0..2e77f0968 100644 --- a/app/Jobs/StatusPipeline/StatusReplyPipeline.php +++ b/app/Jobs/StatusPipeline/StatusReplyPipeline.php @@ -90,7 +90,7 @@ class StatusReplyPipeline implements ShouldQueue ->whereActorId($actor->id) ->whereIn('action', ['mention', 'comment']) ->whereItemId($status->id) - ->whereItemType('App\Status') + ->whereItemType(\App\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"; + $notification->item_type = \App\Status::class; $notification->save(); NotificationService::setNotification($notification); diff --git a/app/Listeners/LogFailedLogin.php b/app/Listeners/LogFailedLogin.php index 0e703439e..7bcdfb62c 100644 --- a/app/Listeners/LogFailedLogin.php +++ b/app/Listeners/LogFailedLogin.php @@ -34,7 +34,7 @@ class LogFailedLogin $log = new AccountLog; $log->user_id = $user->id; $log->item_id = $user->id; - $log->item_type = 'App\User'; + $log->item_type = \App\User::class; $log->action = 'auth.failed'; $log->message = 'Failed login attempt'; $log->link = null; diff --git a/app/Mail/AdminNewAutospam.php b/app/Mail/AdminNewAutospam.php index 344471f4e..bfcc093cb 100644 --- a/app/Mail/AdminNewAutospam.php +++ b/app/Mail/AdminNewAutospam.php @@ -50,7 +50,7 @@ class AdminNewAutospam extends Mailable $reported_account = null; $url = url('/i/admin/reports/autospam/'.$this->report->id.'?ref=email'); - if ($data['item_type'] === 'App\Status') { + if ($data['item_type'] === \App\Status::class) { $reported_status = StatusService::get($this->report->item_id, false); $reported_account = AccountService::get($reported_status['account']['id'], true); } diff --git a/app/Models/AdminShadowFilter.php b/app/Models/AdminShadowFilter.php index 6edc1cfa3..e004a311a 100644 --- a/app/Models/AdminShadowFilter.php +++ b/app/Models/AdminShadowFilter.php @@ -22,7 +22,7 @@ class AdminShadowFilter extends Model public function account() { - if ($this->item_type === 'App\Profile') { + if ($this->item_type === \App\Profile::class) { return AccountService::get($this->item_id, true); } diff --git a/app/Observers/UserFilterObserver.php b/app/Observers/UserFilterObserver.php index e9cfcac9f..fb8ef2d6c 100644 --- a/app/Observers/UserFilterObserver.php +++ b/app/Observers/UserFilterObserver.php @@ -68,7 +68,7 @@ class UserFilterObserver protected function filterCreate(UserFilter $userFilter) { - if ($userFilter->filterable_type !== 'App\Profile') { + if ($userFilter->filterable_type !== \App\Profile::class) { return; } @@ -87,7 +87,7 @@ class UserFilterObserver protected function filterDelete(UserFilter $userFilter) { - if ($userFilter->filterable_type !== 'App\Profile') { + if ($userFilter->filterable_type !== \App\Profile::class) { return; } diff --git a/app/Profile.php b/app/Profile.php index 0e86c7d2f..718e1a80f 100644 --- a/app/Profile.php +++ b/app/Profile.php @@ -254,7 +254,7 @@ class Profile extends Model public function mutedIds() { return UserFilter::whereUserId($this->id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('mute') ->pluck('filterable_id'); } @@ -262,7 +262,7 @@ class Profile extends Model public function blockedIds() { return UserFilter::whereUserId($this->id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('block') ->pluck('filterable_id'); } diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index b632bca98..8fbc19c95 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -14,10 +14,10 @@ class EventServiceProvider extends ServiceProvider */ protected $listen = [ 'Illuminate\Auth\Events\Login' => [ - 'App\Listeners\AuthLogin', + \App\Listeners\AuthLogin::class, ], 'Illuminate\Auth\Events\Failed' => [ - 'App\Listeners\LogFailedLogin', + \App\Listeners\LogFailedLogin::class, ], ]; diff --git a/app/Report.php b/app/Report.php index 77d2dad48..2a4923416 100644 --- a/app/Report.php +++ b/app/Report.php @@ -30,12 +30,12 @@ class Report extends Model $class = $this->object_type; switch ($class) { - case 'App\Status': + case \App\Status::class: $column = 'id'; break; default: - $class = 'App\Status'; + $class = \App\Status::class; $column = 'id'; break; } diff --git a/app/Services/AdminShadowFilterService.php b/app/Services/AdminShadowFilterService.php index 8d0185d89..820263abf 100644 --- a/app/Services/AdminShadowFilterService.php +++ b/app/Services/AdminShadowFilterService.php @@ -11,7 +11,7 @@ class AdminShadowFilterService public static function queryFilter($name = 'hide_from_public_feeds') { - return AdminShadowFilter::whereItemType('App\Profile') + return AdminShadowFilter::whereItemType(\App\Profile::class) ->whereActive(1) ->where('hide_from_public_feeds', true) ->pluck('item_id') @@ -26,7 +26,7 @@ class AdminShadowFilterService } return Cache::remember($key, 86400, function () { - return AdminShadowFilter::whereItemType('App\Profile') + return AdminShadowFilter::whereItemType(\App\Profile::class) ->whereActive(1) ->where('hide_from_public_feeds', true) ->pluck('item_id') diff --git a/app/Services/MediaTagService.php b/app/Services/MediaTagService.php index f919c521f..d33ee61b0 100644 --- a/app/Services/MediaTagService.php +++ b/app/Services/MediaTagService.php @@ -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'; + $n->item_type = \App\MediaTag::class; $n->action = 'tagged'; $n->save(); diff --git a/app/Services/ModLogService.php b/app/Services/ModLogService.php index 212665f17..e25d3f324 100644 --- a/app/Services/ModLogService.php +++ b/app/Services/ModLogService.php @@ -117,7 +117,7 @@ class ModLogService $log = $this->log; $item_id = $log->id; - $item_type = 'App\ModLog'; + $item_type = \App\ModLog::class; $action = 'admin.user.modlog.comment'; $admins = User::whereNull('status') @@ -139,7 +139,7 @@ class ModLogService public function unfanout() { - Notification::whereItemType('App\ModLog') + Notification::whereItemType(\App\ModLog::class) ->whereItemId($this->log->id) ->delete(); } diff --git a/app/Services/RelationshipService.php b/app/Services/RelationshipService.php index 3d7177279..89afc241e 100644 --- a/app/Services/RelationshipService.php +++ b/app/Services/RelationshipService.php @@ -29,12 +29,12 @@ class RelationshipService 'following' => Follower::whereProfileId($aid)->whereFollowingId($tid)->exists(), 'followed_by' => Follower::whereProfileId($tid)->whereFollowingId($aid)->exists(), 'blocking' => UserFilter::whereUserId($aid) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterableId($tid) ->whereFilterType('block') ->exists(), 'muting' => UserFilter::whereUserId($aid) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterableId($tid) ->whereFilterType('mute') ->exists(), diff --git a/app/Transformer/Api/Mastodon/v1/NotificationTransformer.php b/app/Transformer/Api/Mastodon/v1/NotificationTransformer.php index 4a9a6f1e4..d10ffeafb 100644 --- a/app/Transformer/Api/Mastodon/v1/NotificationTransformer.php +++ b/app/Transformer/Api/Mastodon/v1/NotificationTransformer.php @@ -30,7 +30,7 @@ class NotificationTransformer extends Fractal\TransformerAbstract public function includeStatus(Notification $notification) { $item = $notification; - if ($item->item_id && $item->item_type == 'App\Status') { + if ($item->item_id && $item->item_type == \App\Status::class) { $status = Status::with('media')->find($item->item_id); if ($status) { return $this->item($status, new StatusTransformer); diff --git a/app/Transformer/Api/NotificationTransformer.php b/app/Transformer/Api/NotificationTransformer.php index cad5732b5..7be2fef15 100644 --- a/app/Transformer/Api/NotificationTransformer.php +++ b/app/Transformer/Api/NotificationTransformer.php @@ -27,11 +27,11 @@ class NotificationTransformer extends Fractal\TransformerAbstract } } - if ($n->item_id && $n->item_type == 'App\Status') { + if ($n->item_id && $n->item_type == \App\Status::class) { $res['status'] = StatusService::get($n->item_id, false); } - if ($n->item_id && $n->item_type == 'App\ModLog') { + if ($n->item_id && $n->item_type == \App\ModLog::class) { $ml = $n->item; if ($ml && $ml->object_uid) { $res['modlog'] = [ @@ -41,7 +41,7 @@ class NotificationTransformer extends Fractal\TransformerAbstract } } - if ($n->item_id && $n->item_type == 'App\MediaTag') { + if ($n->item_id && $n->item_type == \App\MediaTag::class) { $ml = $n->item; if ($ml && $ml->tagged_username) { $np = StatusService::get($ml->status_id, false); diff --git a/app/UserFilter.php b/app/UserFilter.php index 92d5e3dad..15664f1cc 100644 --- a/app/UserFilter.php +++ b/app/UserFilter.php @@ -16,7 +16,7 @@ class UserFilter extends Model public function mutedUserIds($profile_id) { return $this->whereUserId($profile_id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('mute') ->pluck('filterable_id'); } @@ -24,7 +24,7 @@ class UserFilter extends Model public function blockedUserIds($profile_id) { return $this->whereUserId($profile_id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('block') ->pluck('filterable_id'); } diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php index 4d383e5c2..97b3ed796 100644 --- a/app/Util/ActivityPub/Inbox.php +++ b/app/Util/ActivityPub/Inbox.php @@ -537,7 +537,7 @@ class Inbox $nf = UserFilter::whereUserId($profile->id) ->whereFilterableId($actor->id) - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->whereFilterType('dm.mute') ->exists(); @@ -547,7 +547,7 @@ class Inbox $notification->actor_id = $actor->id; $notification->action = 'dm'; $notification->item_id = $dm->id; - $notification->item_type = "App\DirectMessage"; + $notification->item_type = \App\DirectMessage::class; $notification->save(); if (NotificationAppGatewayService::enabled()) { @@ -678,7 +678,7 @@ class Inbox 'actor_id' => $actor->id, 'action' => 'share', 'item_id' => $parent->id, - 'item_type' => 'App\Status', + 'item_type' => \App\Status::class, ] ); @@ -817,7 +817,7 @@ class Inbox } $notifications = Notification::whereActorId($status->profile_id) ->whereItemId($status->id) - ->whereItemType('App\Status') + ->whereItemType(\App\Status::class) ->get(); foreach ($notifications as $notification) { $notification->forceDelete(); @@ -955,7 +955,7 @@ class Inbox ->whereActorId($profile->id) ->whereAction('share') ->whereItemId($status->id) - ->whereItemType('App\Status') + ->whereItemType(\App\Status::class) ->get(); foreach ($notifications as $notification) { $notification->forceDelete(); @@ -983,7 +983,7 @@ class Inbox ->whereActorId($profile->id) ->whereAction('follow') ->whereItemId($following->id) - ->whereItemType('App\Profile') + ->whereItemType(\App\Profile::class) ->get(); foreach ($notifications as $notification) { $notification->forceDelete(); @@ -1017,7 +1017,7 @@ class Inbox ->whereActorId($profile->id) ->whereAction('like') ->whereItemId($status->id) - ->whereItemType('App\Status') + ->whereItemType(\App\Status::class) ->get(); foreach ($notifications as $notification) { @@ -1203,7 +1203,7 @@ class Inbox $n->profile_id = $dm->to_id; $n->actor_id = $dm->from_id; $n->item_id = $dm->id; - $n->item_type = 'App\DirectMessage'; + $n->item_type = \App\DirectMessage::class; $n->action = 'story:react'; $n->save(); @@ -1323,7 +1323,7 @@ class Inbox $n->profile_id = $dm->to_id; $n->actor_id = $dm->from_id; $n->item_id = $dm->id; - $n->item_type = 'App\DirectMessage'; + $n->item_type = \App\DirectMessage::class; $n->action = 'story:comment'; $n->save(); diff --git a/app/Util/Sentiment/Bouncer.php b/app/Util/Sentiment/Bouncer.php index 359f7ebc5..20915134e 100644 --- a/app/Util/Sentiment/Bouncer.php +++ b/app/Util/Sentiment/Bouncer.php @@ -36,7 +36,7 @@ class Bouncer $uid = $status->profile->user_id; $ids = AccountInterstitial::whereUserId($uid) ->whereType('post.autospam') - ->whereItemType('App\Status') + ->whereItemType(\App\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'; + $ai->item_type = \App\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"; + $notification->item_type = \App\Status::class; $notification->save(); StatusService::del($status->id); diff --git a/database/migrations/2023_04_20_092740_fix_account_blocks.php b/database/migrations/2023_04_20_092740_fix_account_blocks.php index 3d07d6390..c80f86647 100644 --- a/database/migrations/2023_04_20_092740_fix_account_blocks.php +++ b/database/migrations/2023_04_20_092740_fix_account_blocks.php @@ -21,7 +21,7 @@ return new class extends Migration public function up(): void { UserFilter::whereFilterType('block') - ->whereFilterableType('App\Profile') + ->whereFilterableType(\App\Profile::class) ->chunk(10, function($filters) { foreach($filters as $filter) { $actor = Profile::whereNull('status')->find($filter->user_id);