diff --git a/app/Console/Commands/AvatarStorage.php b/app/Console/Commands/AvatarStorage.php index a6bb70e3d..1a80dc8cb 100644 --- a/app/Console/Commands/AvatarStorage.php +++ b/app/Console/Commands/AvatarStorage.php @@ -130,23 +130,18 @@ class AvatarStorage extends Command switch ($id) { case 'Cancel': return; - break; case 'Upload default avatar to cloud': return $this->uploadDefaultAvatar(); - break; case 'Move local avatars to cloud': return $this->uploadAvatarsToCloud(); - break; case 'Re-fetch remote avatars': return $this->refetchRemoteAvatars(); - break; case 'Fix missing avatars': return $this->fixMissingAvatars(); - break; } } diff --git a/app/Console/Commands/CuratedOnboardingCommand.php b/app/Console/Commands/CuratedOnboardingCommand.php index d8a3d6c00..9e5986c9c 100644 --- a/app/Console/Commands/CuratedOnboardingCommand.php +++ b/app/Console/Commands/CuratedOnboardingCommand.php @@ -50,15 +50,12 @@ class CuratedOnboardingCommand extends Command switch ($action) { case 'Stats': return $this->stats(); - break; case 'Edit': return $this->edit(); - break; default: exit; - break; } } diff --git a/app/Console/Commands/InstanceManager.php b/app/Console/Commands/InstanceManager.php index a495d9617..684eccb11 100644 --- a/app/Console/Commands/InstanceManager.php +++ b/app/Console/Commands/InstanceManager.php @@ -50,31 +50,24 @@ class InstanceManager extends Command switch($action) { case 'Recalculate Stats': return $this->recalculateStats(); - break; case 'Unlisted Instances': return $this->viewUnlistedInstances(); - break; case 'Banned Instances': return $this->viewBannedInstances(); - break; case 'Unlist Instance': return $this->unlistInstance(); - break; case 'Ban Instance': return $this->banInstance(); - break; case 'Unban Instance': return $this->unbanInstance(); - break; case 'Relist Instance': return $this->relistInstance(); - break; } } diff --git a/app/Console/Commands/MediaCloudUrlRewrite.php b/app/Console/Commands/MediaCloudUrlRewrite.php index 9ce00140d..016fdb5af 100644 --- a/app/Console/Commands/MediaCloudUrlRewrite.php +++ b/app/Console/Commands/MediaCloudUrlRewrite.php @@ -111,7 +111,6 @@ class MediaCloudUrlRewrite extends Command implements PromptsForMissingInput $this->error('Invalid selection'); return; - break; } } diff --git a/app/Http/Controllers/Admin/AdminReportController.php b/app/Http/Controllers/Admin/AdminReportController.php index bdd1c33a4..6df69627b 100644 --- a/app/Http/Controllers/Admin/AdminReportController.php +++ b/app/Http/Controllers/Admin/AdminReportController.php @@ -181,13 +181,10 @@ trait AdminReportController switch ($tab) { case 'home': return $q->whereNull('appeal_handled_at'); - break; case 'spam': return $q->whereIsSpam(true); - break; case 'not-spam': return $q->whereIsSpam(false); - break; } }) ->latest() @@ -728,7 +725,6 @@ trait AdminReportController ]); return [200]; - break; case 'delete': $profile = Profile::find($report->reported_profile_id); @@ -760,7 +756,6 @@ trait AdminReportController StoryDelete::dispatch($story)->onQueue('story'); return [200]; - break; case 'delete-all': $profile = Profile::find($report->reported_profile_id); @@ -792,7 +787,6 @@ trait AdminReportController }); return [200]; - break; } } @@ -807,7 +801,6 @@ trait AdminReportController ]); return [200]; - break; case 'nsfw': if ($report->object_type === 'App\Profile') { @@ -867,7 +860,6 @@ trait AdminReportController ]); return [200]; - break; case 'unlist': if ($report->object_type === 'App\Profile') { @@ -927,7 +919,6 @@ trait AdminReportController ]); return [200]; - break; case 'private': if ($report->object_type === 'App\Profile') { @@ -987,7 +978,6 @@ trait AdminReportController ]); return [200]; - break; case 'delete': if (config('pixelfed.account_deletion') == false) { @@ -1070,7 +1060,6 @@ trait AdminReportController } return [200]; - break; } } @@ -1085,7 +1074,6 @@ trait AdminReportController ]); return [200]; - break; case 'nsfw': $status = Status::find($report->object_id); @@ -1120,7 +1108,6 @@ trait AdminReportController ]); return [200]; - break; case 'private': $status = Status::find($report->object_id); @@ -1157,7 +1144,6 @@ trait AdminReportController ]); return [200]; - break; case 'unlist': $status = Status::find($report->object_id); @@ -1196,7 +1182,6 @@ trait AdminReportController ]); return [200]; - break; case 'delete': $status = Status::find($report->object_id); @@ -1226,7 +1211,6 @@ trait AdminReportController ]); return [200]; - break; } } diff --git a/app/Http/Controllers/Admin/AdminSettingsController.php b/app/Http/Controllers/Admin/AdminSettingsController.php index 13b9e9a49..c2c4b490c 100644 --- a/app/Http/Controllers/Admin/AdminSettingsController.php +++ b/app/Http/Controllers/Admin/AdminSettingsController.php @@ -493,35 +493,27 @@ trait AdminSettingsController switch ($type) { case 'home': return $this->settingsApiUpdateHomeType($request); - break; case 'landing': return $this->settingsApiUpdateLandingType($request); - break; case 'posts': return $this->settingsApiUpdatePostsType($request); - break; case 'platform': return $this->settingsApiUpdatePlatformType($request); - break; case 'branding': return $this->settingsApiUpdateBrandingType($request); - break; case 'media': return $this->settingsApiUpdateMediaType($request); - break; case 'users': return $this->settingsApiUpdateUsersType($request); - break; case 'storage': return $this->settingsApiUpdateStorageType($request); - break; default: abort(404); diff --git a/app/Http/Controllers/Api/ApiV1Dot1Controller.php b/app/Http/Controllers/Api/ApiV1Dot1Controller.php index 6181b8b01..e69894c66 100644 --- a/app/Http/Controllers/Api/ApiV1Dot1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Dot1Controller.php @@ -170,7 +170,6 @@ class ApiV1Dot1Controller extends Controller default: return $this->error('Invalid report type', 400, ['error_code' => 'ERROR_REPORT_OBJECT_TYPE_INVALID']); - break; } if ($exists !== 0) { diff --git a/app/Http/Controllers/CuratedRegisterController.php b/app/Http/Controllers/CuratedRegisterController.php index ef929b73b..6011a728d 100644 --- a/app/Http/Controllers/CuratedRegisterController.php +++ b/app/Http/Controllers/CuratedRegisterController.php @@ -315,7 +315,6 @@ class CuratedRegisterController extends Controller $request->session()->put('cur-step', 1); return view('auth.curated-register.index', compact('step')); - break; case 2: $this->stepTwo($request); @@ -323,7 +322,6 @@ class CuratedRegisterController extends Controller $request->session()->put('cur-step', 2); return view('auth.curated-register.index', compact('step')); - break; case 3: $this->stepThree($request); @@ -333,7 +331,6 @@ class CuratedRegisterController extends Controller $request->session()->pull('cur-reg'); return view('auth.curated-register.index', compact('step', 'verifiedEmail')); - break; } } diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php index a1c012192..40dea5d7c 100644 --- a/app/Http/Controllers/GroupController.php +++ b/app/Http/Controllers/GroupController.php @@ -462,7 +462,6 @@ class GroupController extends GroupFederationController ); return response()->json([200]); - break; case 'ignore': GroupReport::whereGroupId($group->id) @@ -486,7 +485,6 @@ class GroupController extends GroupFederationController ); return response()->json([200]); - break; } } diff --git a/app/Http/Controllers/GroupFederationController.php b/app/Http/Controllers/GroupFederationController.php index 0e5879b01..0bfac9f3c 100644 --- a/app/Http/Controllers/GroupFederationController.php +++ b/app/Http/Controllers/GroupFederationController.php @@ -48,22 +48,23 @@ class GroupFederationController extends Controller 'url' => $group->permalink(), ]; - if ($group->metadata && isset($group->metadata['avatar'])) { - $res['icon'] = [ - 'type' => 'Image', - 'url' => $group->metadata['avatar']['url'], - ]; - } + //Dead - after a return + // if ($group->metadata && isset($group->metadata['avatar'])) { + // $res['icon'] = [ + // 'type' => 'Image', + // 'url' => $group->metadata['avatar']['url'], + // ]; + // } - if ($group->metadata && isset($group->metadata['header'])) { - $res['image'] = [ - 'type' => 'Image', - 'url' => $group->metadata['header']['url'], - ]; - } - ksort($res); + // if ($group->metadata && isset($group->metadata['header'])) { + // $res['image'] = [ + // 'type' => 'Image', + // 'url' => $group->metadata['header']['url'], + // ]; + // } + // ksort($res); - return $res; + // return $res; }); } diff --git a/app/Http/Controllers/Groups/GroupsAdminController.php b/app/Http/Controllers/Groups/GroupsAdminController.php index 4bdf0f504..7bd6408d6 100644 --- a/app/Http/Controllers/Groups/GroupsAdminController.php +++ b/app/Http/Controllers/Groups/GroupsAdminController.php @@ -148,7 +148,6 @@ class GroupsAdminController extends Controller ); return [200]; - break; case 'user': $profile = Profile::whereUsername($item)->first(); @@ -175,7 +174,6 @@ class GroupsAdminController extends Controller ); return [200]; - break; case 'moderate': $instance = Instance::whereDomain($item)->first(); @@ -201,11 +199,9 @@ class GroupsAdminController extends Controller ); return [200]; - break; default: return response()->json([], 422, []); - break; } } @@ -251,7 +247,6 @@ class GroupsAdminController extends Controller $gb->delete(); return [200]; - break; case 'user': $profile = Profile::whereUsername($item)->first(); @@ -279,7 +274,6 @@ class GroupsAdminController extends Controller $gb->delete(); return [200]; - break; case 'moderate': $instance = Instance::whereDomain($item)->first(); @@ -306,11 +300,9 @@ class GroupsAdminController extends Controller $gb->delete(); return [200]; - break; default: return response()->json([], 422, []); - break; } } diff --git a/app/Http/Controllers/PortfolioController.php b/app/Http/Controllers/PortfolioController.php index 26279e22b..439b43660 100644 --- a/app/Http/Controllers/PortfolioController.php +++ b/app/Http/Controllers/PortfolioController.php @@ -517,7 +517,7 @@ class PortfolioController extends Controller return response() ->view('portfolio.rss_feed', compact('account', 'now', 'feed', 'portfolioUrl'), 200) ->header('Content-Type', 'text/xml'); - return response($feed)->withHeaders(['Content-Type' => 'text/xml']); + //Dead return response($feed)->withHeaders(['Content-Type' => 'text/xml']); } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index effd21b70..c4d740479 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -209,7 +209,6 @@ class ProfileController extends Controller case 'suspended': case 'delete': return view('profile.disabled'); - break; default: break; diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index a6b029747..0c1f50b38 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -184,7 +184,6 @@ class ReportController extends Controller } else { return redirect('/timeline')->with('error', 'Invalid report type'); } - break; } if ($exists !== 0) { diff --git a/app/Jobs/AdminPipeline/AdminProfileActionPipeline.php b/app/Jobs/AdminPipeline/AdminProfileActionPipeline.php index 24b24ba6e..6c331b5d2 100644 --- a/app/Jobs/AdminPipeline/AdminProfileActionPipeline.php +++ b/app/Jobs/AdminPipeline/AdminProfileActionPipeline.php @@ -54,16 +54,12 @@ class AdminProfileActionPipeline implements ShouldQueue switch($action) { case 'mark-all-cw': return $this->markAllPostsWithContentWarnings(); - break; case 'unlist-all': return $this->unlistAllPosts(); - break; case 'purge': return $this->purgeAllPosts(); - break; case 'refetch': return $this->refetchAllPosts(); - break; } } diff --git a/app/Jobs/StatusPipeline/StatusLocalUpdateActivityPubDeliverPipeline.php b/app/Jobs/StatusPipeline/StatusLocalUpdateActivityPubDeliverPipeline.php index 047c392af..6f834844b 100644 --- a/app/Jobs/StatusPipeline/StatusLocalUpdateActivityPubDeliverPipeline.php +++ b/app/Jobs/StatusPipeline/StatusLocalUpdateActivityPubDeliverPipeline.php @@ -84,7 +84,6 @@ class StatusLocalUpdateActivityPubDeliverPipeline implements ShouldQueue case 'poll': // Polls not yet supported return; - break; default: $activitypubObject = new UpdateNote(); diff --git a/app/Models/CustomFilter.php b/app/Models/CustomFilter.php index 976a0d84c..dd0019033 100644 --- a/app/Models/CustomFilter.php +++ b/app/Models/CustomFilter.php @@ -93,15 +93,12 @@ class CustomFilter extends Model switch ($this->action) { case 0: return 'warn'; - break; case 1: return 'hide'; - break; case 2: return 'blur'; - break; } } diff --git a/app/Services/Groups/GroupActivityPubService.php b/app/Services/Groups/GroupActivityPubService.php index 4c48b22c4..84ee62900 100644 --- a/app/Services/Groups/GroupActivityPubService.php +++ b/app/Services/Groups/GroupActivityPubService.php @@ -152,7 +152,6 @@ class GroupActivityPubService if($validator->fails()) { return $validator->errors(); - return false; } return $validator->validated(); diff --git a/app/Services/SearchApiV2Service.php b/app/Services/SearchApiV2Service.php index 6d28c949f..58bac54ac 100644 --- a/app/Services/SearchApiV2Service.php +++ b/app/Services/SearchApiV2Service.php @@ -45,21 +45,18 @@ class SearchApiV2Service 'hashtags' => [], 'statuses' => [], ]; - break; case 'hashtags': return [ 'accounts' => [], 'hashtags' => $this->hashtags(), 'statuses' => [], ]; - break; case 'statuses': return [ 'accounts' => [], 'hashtags' => [], 'statuses' => $this->statuses(), ]; - break; } } @@ -335,7 +332,6 @@ class SearchApiV2Service $default['statuses'][] = $note; return $default; - break; case 'Person': $obj = Helpers::profileFetch($query); @@ -350,7 +346,6 @@ class SearchApiV2Service AccountService::get($obj['id'], true); return $default; - break; default: return [ @@ -358,7 +353,6 @@ class SearchApiV2Service 'hashtags' => [], 'statuses' => [], ]; - break; } } } catch (\Exception $e) { diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php index 9db018196..963fb14e7 100644 --- a/app/Util/ActivityPub/Inbox.php +++ b/app/Util/ActivityPub/Inbox.php @@ -778,7 +778,6 @@ class Inbox DeleteRemoteProfilePipeline::dispatch($profile)->onQueue('inbox'); return; - break; case 'Tombstone': $profile = Profile::whereRemoteUrl($actor)->first(); @@ -804,7 +803,6 @@ class Inbox RemoteStatusDelete::dispatch($status)->onQueue('high'); return; - break; case 'Story': $story = Story::whereObjectId($id) @@ -814,11 +812,9 @@ class Inbox } return; - break; default: return; - break; } }