RemoveAlwaysElseRector

.gitignore

@@ -38,3 +38,4 @@
 /storage/psalm-reports
 /psalm.sarif.json
 /.psalm-cache
+.kiro/

app/Console/Commands/Admin/SendUpdateActor.php

@@ -52,7 +52,7 @@ class SendUpdateActor extends Command
             );
 
             return Command::SUCCESS;
-        } else {
+        }
         $domain = $this->anticipate('Enter the instance domain', function ($input) {
             return Instance::where('domain', 'like', '%'.$input.'%')->pluck('domain')->toArray();
         });
@@ -80,7 +80,6 @@ class SendUpdateActor extends Command
         $this->info('Found sharedInbox: '.$url);
         $bar = $this->output->createProgressBar($totalUserCount);
         $bar->start();
-
         $startCache = $this->getStorageCache($domain);
         User::whereNull('status')->when($startCache, function ($query, $startCache) use ($bar) {
             $bar->advance($startCache);
@@ -111,9 +110,7 @@ class SendUpdateActor extends Command
         $instance->actors_last_synced_at = now();
         $instance->save();
         $this->info('Finished!');
-
         return Command::SUCCESS;
-        }
 
         return Command::SUCCESS;
     }

app/Console/Commands/Internal/PushGatewayRefresh.php

@@ -37,36 +37,29 @@ class PushGatewayRefresh extends Command
             $this->info('Push Notification support is active!');
 
             return;
-        } else {
+        }
         $this->error('Push notification support is NOT active');
-
         $action = select(
             label: 'Do you want to force re-check?',
             options: ['Yes', 'No'],
             required: true
         );
-
         if ($action === 'Yes') {
             $recheck = NotificationAppGatewayService::forceSupportRecheck();
             if ($recheck) {
                 $this->info('Success! Push Notifications are now active!');
 
                 return;
-                } else {
+            }
             $this->error('Error, please ensure you have a valid API key.');
             $this->line(' ');
             $this->line('For more info, visit https://docs.pixelfed.org/running-pixelfed/push-notifications.html');
             $this->line(' ');
-
             return;
-                }
 
             return;
-            } else {
-                exit;
         }
-
+        exit;
         return;
     }
 }
-}

app/Http/Controllers/AccountController.php

@@ -133,9 +133,8 @@ class AccountController extends Controller
 
         if ($request->wantsJson()) {
             return response()->json($res);
-        } else {
-            return redirect()->back();
         }
+        return redirect()->back();
     }
 
     public function unmute(Request $request): JsonResponse|RedirectResponse
@@ -185,9 +184,8 @@ class AccountController extends Controller
 
         if ($request->wantsJson()) {
             return response()->json($res);
-        } else {
-            return redirect()->back();
         }
+        return redirect()->back();
     }
 
     public function block(Request $request): JsonResponse|RedirectResponse
@@ -271,9 +269,8 @@ class AccountController extends Controller
 
         if ($request->wantsJson()) {
             return response()->json($res);
-        } else {
-            return redirect()->back();
         }
+        return redirect()->back();
     }
 
     public function unblock(Request $request): JsonResponse|RedirectResponse
@@ -322,9 +319,8 @@ class AccountController extends Controller
 
         if ($request->wantsJson()) {
             return response()->json($res);
-        } else {
-            return redirect()->back();
         }
+        return redirect()->back();
     }
 
     public function followRequests(Request $request): View

app/Http/Controllers/Admin/AdminReportController.php

@@ -704,12 +704,14 @@ trait AdminReportController
         ]);
 
         $report = Report::whereObjectId($request->input('object_id'))->findOrFail($request->input('id'));
-
         if ($request->input('action_type') === 'profile') {
             return $this->reportsHandleProfileAction($report, $request->input('action'));
-        } elseif ($request->input('action_type') === 'post') {
+        }
+        if ($request->input('action_type') === 'post') {
             return $this->reportsHandleStatusAction($report, $request->input('action'));
-        } elseif ($request->input('action_type') === 'story') {
+        }
+
+        if ($request->input('action_type') === 'story') {
             return $this->reportsHandleStoryAction($report, $request->input('action'));
         }
 

app/Http/Controllers/Admin/AdminSettingsController.php

@@ -373,7 +373,7 @@ trait AdminSettingsController
 
         if (! $rules) {
             return [];
-        } else {
+        }
         $json = json_decode($rules, true);
         $idx = array_search($val, $json);
         if ($idx !== false) {
@@ -381,7 +381,6 @@ trait AdminSettingsController
             $json = array_values($json);
         }
         ConfigCacheService::put('app.rules', json_encode(array_values($json)));
-        }
 
         Cache::forget('api:v1:instance-data:rules');
         Cache::forget('api:v1:instance-data-response-v1');
@@ -397,9 +396,8 @@ trait AdminSettingsController
 
         if (! $rules) {
             return [];
-        } else {
-            ConfigCacheService::put('app.rules', json_encode([]));
         }
+        ConfigCacheService::put('app.rules', json_encode([]));
 
         Cache::forget('api:v1:instance-data:rules');
         Cache::forget('api:v1:instance-data-response-v1');
@@ -535,9 +533,8 @@ trait AdminSettingsController
                 $cloud_ready = ! empty(config('filesystems.disks.'.$cloud_disk.'.key')) && ! empty(config('filesystems.disks.'.$cloud_disk.'.secret'));
                 if (! $cloud_ready) {
                     return redirect()->back()->withErrors(['cloud_storage' => 'Must configure cloud storage before enabling!']);
-                } else {
-                    ConfigCacheService::put('pixelfed.cloud_storage', true);
                 }
+                ConfigCacheService::put('pixelfed.cloud_storage', true);
             }
         }
         ConfigCacheService::put('federation.activitypub.authorized_fetch', $request->boolean('authorized_fetch'));

app/Http/Controllers/AdminController.php

@@ -559,18 +559,22 @@ class AdminController extends Controller
             if ($sort == 'all') {
                 if ($pg) {
                     return $query->latest();
-                } else {
+                }
                 return $query->groupBy('shortcode')->latest();
             }
-            } elseif ($sort == 'local') {
+            if ($sort == 'local') {
                 return $query->latest()->where('domain', '=', config('pixelfed.domain.app'));
-            } elseif ($sort == 'remote') {
+            }
+            if ($sort == 'remote') {
                 return $query->latest()->where('domain', '!=', config('pixelfed.domain.app'));
-            } elseif ($sort == 'duplicates') {
+            }
+            if ($sort == 'duplicates') {
                 return $query->latest()->duplicateShortcodes();
-            } elseif ($sort == 'disabled') {
+            }
+            if ($sort == 'disabled') {
                 return $query->latest()->whereDisabled(true);
-            } elseif ($sort == 'search') {
+            }
+            if ($sort == 'search') {
                 $q = $query
                     ->latest()
                     ->where('shortcode', 'like', '%'.$request->input('q').'%')
@@ -580,7 +584,6 @@ class AdminController extends Controller
                         $q = $q->groupBy('shortcode');
                     }
                 }
-
                 return $q;
             }
         })
@@ -698,15 +701,17 @@ class AdminController extends Controller
             ->when($filter, function ($q, $filter) {
                 if ($filter === 'cw') {
                     return $q->where('cw', true);
-                } elseif ($filter === 'unlisted') {
+                }
+                if ($filter === 'unlisted') {
                     return $q->where('unlisted', true);
-                } elseif ($filter === 'banned') {
+                }
+                if ($filter === 'banned') {
                     return $q->where('status', 'banned');
-                } elseif ($filter === 'newest') {
+                }
+                if ($filter === 'newest') {
                     return $q->orderByDesc('id');
-                } else {
-                    return $q;
                 }
+                return $q;
             })
             ->cursorPaginate(10)
             ->withQueryString();

app/Http/Controllers/AdminCuratedRegisterController.php

@@ -40,22 +40,27 @@ class AdminCuratedRegisterController extends Controller
                     })
                     ->whereNotNull('email_verified_at')
                     ->whereIsClosed(false);
-            } elseif ($filter === 'all') {
+            }
+            if ($filter === 'all') {
                 return $q;
-            } elseif ($filter === 'responses') {
+            }
+            if ($filter === 'responses') {
                 return $q->whereIsClosed(false)
                     ->whereNotNull('email_verified_at')
                     ->where('user_has_responded', true)
                     ->where('is_awaiting_more_info', true);
-            } elseif ($filter === 'awaiting') {
+            }
+            if ($filter === 'awaiting') {
                 return $q->whereIsClosed(false)
                     ->where('is_rejected', false)
                     ->where('is_approved', false)
                     ->where('user_has_responded', false)
                     ->where('is_awaiting_more_info', true);
-            } elseif ($filter === 'approved') {
+            }
+            if ($filter === 'approved') {
                 return $q->whereIsClosed(true)->whereIsApproved(true);
-            } elseif ($filter === 'rejected') {
+            }
+            if ($filter === 'rejected') {
                 return $q->whereIsClosed(true)->whereIsRejected(true);
             }
         })

app/Http/Controllers/AdminShadowFilterController.php

@@ -23,11 +23,11 @@ class AdminShadowFilterController extends Controller
             ->when($filter, function ($q, $filter) {
                 if ($filter == 'all') {
                     return $q;
-                } elseif ($filter == 'inactive') {
+                }
+                if ($filter == 'inactive') {
                     return $q->whereActive(false);
-                } else {
-                    return $q;
                 }
+                return $q;
             }, function ($q, $filter) {
                 return $q->whereActive(true);
             })

app/Http/Controllers/Api/AdminApiController.php

@@ -560,24 +560,18 @@ class AdminApiController extends Controller
         $action = $request->input('action');
 
         abort_if($user->is_admin == true && $action !== 'refresh_stats', 400, 'Cannot moderate admin accounts');
-
         if ($action === 'delete') {
             if (config('pixelfed.account_deletion') == false) {
                 abort(404);
             }
-
             abort_if($user->is_admin, 400, 'Cannot delete an admin account.');
-
             $ts = now()->addMonth();
-
             $user->status = 'delete';
             $user->delete_after = $ts;
             $user->save();
-
             $profile->status = 'delete';
             $profile->delete_after = $ts;
             $profile->save();
-
             ModLogService::boot()
                 ->objectUid($profile->id)
                 ->objectId($profile->id)
@@ -586,10 +580,8 @@ class AdminApiController extends Controller
                 ->action('admin.user.delete')
                 ->accessLevel('admin')
                 ->save();
-
             PublicTimelineService::deleteByProfileId($profile->id);
             NetworkTimelineService::deleteByProfileId($profile->id);
-
             if ($profile->user_id) {
                 DB::table('oauth_access_tokens')->whereUserId($user->id)->delete();
                 DB::table('oauth_auth_codes')->whereUserId($user->id)->delete();
@@ -609,12 +601,13 @@ class AdminApiController extends Controller
                 AccountService::del($profile->id);
                 DeleteRemoteProfilePipeline::dispatch($profile)->onQueue('high');
             }
-
             return [
                 'status' => 200,
                 'msg' => 'deleted',
             ];
-        } elseif ($action === 'refresh_stats') {
+        }
+
+        if ($action === 'refresh_stats') {
             $profile->following_count = DB::table('followers')->whereProfileId($user->profile_id)->count();
             $profile->followers_count = DB::table('followers')->whereFollowingId($user->profile_id)->count();
             $statusCount = Status::whereProfileId($user->profile_id)
@@ -685,7 +678,8 @@ class AdminApiController extends Controller
                 ->save();
             $profile->no_autolink = ! $profile->no_autolink;
             $profile->save();
-        } else {
+        }
+        else {
             $profile->{$action} = filter_var($request->input('value'), FILTER_VALIDATE_BOOLEAN);
             $profile->save();
 
@@ -741,9 +735,8 @@ class AdminApiController extends Controller
             ->when($filter, function ($query, $filter) {
                 if ($filter === 'all') {
                     return $query;
-                } else {
-                    return $query->where($filter, true);
                 }
+                return $query->where($filter, true);
             })
             ->when($sortBy, function ($query, $sortBy) use ($sort) {
                 return $query->orderBy($sortBy, $sort);

app/Http/Controllers/Api/ApiV1Controller.php

@@ -1579,9 +1579,8 @@ class ApiV1Controller extends Controller
             }
 
             return $this->json($res, 200, ['Link' => $link]);
-        } else {
-            return $this->json($res);
         }
+        return $this->json($res);
     }
 
     /**
@@ -2738,12 +2737,10 @@ class ApiV1Controller extends Controller
                     FeedWarmCachePipeline::dispatchSync($pid);
 
                     return response()->json([], 206);
-                } else {
+                }
                 Cache::set('pf:services:apiv1:home:cached:coldbootcheck:'.$pid, 1, 86400);
-
                 return response()->json([], 206);
             }
-            }
 
             $res = collect($res)
                 ->map(function ($id) use ($napi) {

app/Http/Controllers/Auth/RegisterController.php

@@ -155,16 +155,13 @@ class RegisterController extends Controller
                 }
 
                 return view('auth.register');
-            } else {
+            }
             return view('auth.register');
         }
-        } else {
         if ((bool) config_cache('instance.curated_registration.enabled') && config('instance.curated_registration.state.fallback_on_closed_reg')) {
             return redirect('/auth/sign_up');
-            } else {
-                abort(404);
-            }
         }
+        abort(404);
     }
 
     /**

app/Http/Controllers/FederationController.php

@@ -104,9 +104,8 @@ class FederationController extends Controller
 
                 return response()->json($webfinger, 200, [], JSON_UNESCAPED_SLASHES)
                     ->header('Access-Control-Allow-Origin', '*');
-            } else {
-                return response('', 400);
             }
+            return response('', 400);
         }
         $hash = hash('sha256', $resource);
         $key = 'federation:webfinger:sha256:'.$hash;
@@ -182,7 +181,6 @@ class FederationController extends Controller
         if (in_array($domain, InstanceService::getBannedDomains())) {
             return;
         }
-
         if (isset($obj['type']) && $obj['type'] === 'Delete') {
             if (isset($obj['object']) && isset($obj['object']['type']) && isset($obj['object']['id'])) {
                 if ($obj['object']['type'] === 'Person') {
@@ -207,11 +205,13 @@ class FederationController extends Controller
                     return;
                 }
             }
-
             return;
-        } elseif (isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
+        }
+
+        if (isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
             dispatch(new InboxValidator($username, $headers, $payload))->onQueue('follow');
-        } else {
+        }
+        else {
             dispatch(new InboxValidator($username, $headers, $payload))->onQueue('high');
         }
     }
@@ -237,7 +237,6 @@ class FederationController extends Controller
         if (in_array($domain, InstanceService::getBannedDomains())) {
             return;
         }
-
         if (isset($obj['type']) && $obj['type'] === 'Delete') {
             if (isset($obj['object']) && isset($obj['object']['type']) && isset($obj['object']['id'])) {
                 if ($obj['object']['type'] === 'Person') {
@@ -262,11 +261,13 @@ class FederationController extends Controller
                     return;
                 }
             }
-
             return;
-        } elseif (isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
+        }
+
+        if (isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
             dispatch(new InboxWorker($headers, $payload))->onQueue('follow');
-        } else {
+        }
+        else {
             dispatch(new InboxWorker($headers, $payload))->onQueue('shared');
         }
     }

app/Http/Controllers/Groups/GroupsPostController.php

@@ -253,9 +253,8 @@ class GroupsPostController extends Controller
 
         if ($request->wantsJson()) {
             return response()->json(['Status successfully deleted.']);
-        } else {
-            return redirect($user->url());
         }
+        return redirect($user->url());
     }
 
     public function likePost(Request $request): array

app/Http/Controllers/ImportPostController.php

@@ -275,27 +275,22 @@ class ImportPostController extends Controller
             if ($exts->contains('mp4')) {
                 if ($exts->contains('jpg', 'png', 'webp')) {
                     return 'photo:video:album';
-                } else {
+                }
                 return 'video:album';
             }
-            } else {
             return 'photo:album';
         }
-        } else {
         if ($exts->isEmpty()) {
             return 'photo';
         }
-
         $ext = $exts[0];
-
         if (in_array($ext, ['jpg', 'jpeg', 'png', 'webp'])) {
             return 'photo';
-            } elseif (in_array($ext, ['mp4'])) {
-                return 'video';
-            } else {
-                return 'photo';
         }
+        if (in_array($ext, ['mp4'])) {
+            return 'video';
         }
+        return 'photo';
     }
 
     private function sanitizeFilename($filename): string
@@ -320,9 +315,8 @@ class ImportPostController extends Controller
         if ($user->is_admin) {
             if (! $abortOnFail) {
                 return true;
-            } else {
-                return true;
             }
+            return true;
         }
 
         $admin = User::whereIsAdmin(true)->first();

app/Http/Controllers/ProfileController.php

@@ -107,7 +107,7 @@ class ProfileController extends Controller
             }
 
             return view('profile.show', ['profile' => $profile, 'settings' => $settings]);
-        } else {
+        }
         $key = 'profile:settings:'.$user->id;
         $ttl = now()->addHours(6);
         $settings = Cache::remember($key, $ttl, function () use ($user) {
@@ -125,16 +125,12 @@ class ProfileController extends Controller
                 ],
             ];
         });
-
         if ($user->is_private == true) {
             $isPrivate = $this->privateProfileCheck($user, $loggedIn);
         }
-
         $isBlocked = $this->blockedProfileCheck($user);
-
         $owner = $loggedIn && Auth::id() === $user->user_id;
         $is_following = ($owner === false && $request->user() !== null) ? $user->followedBy($request->user()->profile) : false;
-
         if ($isPrivate === true || $isBlocked === true) {
             $requested = $request->user() !== null ? FollowRequest::whereFollowerId($request->user()->profile_id)
                 ->whereFollowingId($user->id)
@@ -142,16 +138,13 @@ class ProfileController extends Controller
 
             return view('profile.private', ['user' => $user, 'is_following' => $is_following, 'requested' => $requested]);
         }
-
         $is_admin = is_null($user->domain) ? $user->user->is_admin : false;
         $profile = $user;
         if ($carousel) {
             return view('profile.show_carousel', ['profile' => $profile, 'settings' => $settings]);
         }
-
         return view('profile.show', ['profile' => $profile, 'settings' => $settings]);
     }
-    }
 
     protected function getCachedUser($username, $withTrashed = false)
     {
@@ -166,12 +159,11 @@ class ProfileController extends Controller
                 return Profile::whereNull(['domain', 'status'])
                     ->whereUsername($username)
                     ->first();
-            } else {
+            }
             return Profile::withTrashed()
                 ->whereNull(['domain', 'status'])
                 ->whereUsername($username)
                 ->first();
-            }
         });
     }
 

app/Http/Controllers/PublicApiController.php

@@ -44,9 +44,8 @@ class PublicApiController extends Controller
     {
         if (! $user) {
             return [];
-        } else {
-            return AccountService::get($user->profile_id);
         }
+        return AccountService::get($user->profile_id);
     }
 
     public function getStatus(Request $request, $id)
@@ -482,7 +481,7 @@ class PublicApiController extends Controller
                 })
                 ->values()
                 ->toArray();
-        } else {
+        }
         return Status::select(
             'id',
             'uri',
@@ -532,7 +531,6 @@ class PublicApiController extends Controller
             ->values()
             ->toArray();
     }
-    }
 
     public function networkTimelineApi(Request $request): JsonResponse|Response
     {
@@ -853,16 +851,14 @@ class PublicApiController extends Controller
             $isFollowing = FollowerService::follows($pid, $profile['id']);
 
             return $isFollowing ? ['public', 'unlisted', 'private'] : ['public'];
-        } else {
+        }
         if ($user) {
             $pid = $user->profile_id;
             $isFollowing = FollowerService::follows($pid, $profile['id']);
 
             return $isFollowing ? ['public', 'unlisted', 'private'] : ['public', 'unlisted'];
-            } else {
-                return ['public', 'unlisted'];
-            }
         }
+        return ['public', 'unlisted'];
     }
 
     private function processStatuses($statuses, $user, $onlyMedia)

app/Http/Controllers/RemoteAuthController.php

@@ -555,22 +555,19 @@ class RemoteAuthController extends Controller
             $user = User::where('username', $username)->first();
             if ($user) {
                 return ['id' => (string) $user->profile_id];
-            } else {
+            }
             return [];
         }
-        } else {
         try {
             $profile = Helpers::profileFetch($account);
             if ($profile) {
                 return ['id' => (string) $profile->id];
-                } else {
-                    return [];
             }
+            return [];
         } catch (RequestException|\Exception) {
             return [];
         }
     }
-    }
 
     public function storeAvatar(Request $request): array
     {

app/Http/Controllers/SiteController.php

@@ -24,9 +24,8 @@ class SiteController extends Controller
     {
         if ($request->user() !== null) {
             return $this->homeTimeline($request);
-        } else {
-            return $this->homeGuest();
         }
+        return $this->homeGuest();
     }
 
     public function homeGuest(): View

app/Http/Middleware/AccountInterstitial.php

@@ -34,14 +34,11 @@ class AccountInterstitial
                     $res = ['_refresh' => true, 'error' => 403, 'message' => \App\Models\AccountInterstitial::JSON_MESSAGE];
 
                     return response()->json($res, 403);
-                } else {
+                }
                 return redirect('/i/warning');
             }
-            } else {
             return $next($request);
         }
-        } else {
         return $next($request);
     }
 }
-}

app/Jobs/InboxPipeline/DeleteWorker.php

@@ -100,30 +100,24 @@ class DeleteWorker implements ShouldQueue
                         }
 
                         return 1;
-                    } else {
+                    }
                     // Signature verification failed, exit.
                     return 1;
                 }
-                } else {
                 // Remote user doesn't exist, exit early.
                 return 1;
-                }
 
                 return 1;
-            } else {
+            }
             return 1;
         }
-        } else {
         $profile = null;
-
         if ($this->verifySignature($headers, $payload) == true) {
             ActivityHandler::dispatch($headers, $profile, $payload)->onQueue('delete');
 
-                return 1;
-            } else {
             return 1;
         }
-        }
+        return 1;
 
     }
 
@@ -200,8 +194,7 @@ class DeleteWorker implements ShouldQueue
         [$verified, $headers] = HttpSignature::verify($pkey, $signatureData, $headers, $inboxPath, $body);
         if ($verified == 1) {
             return true;
-        } else {
-            return false;
         }
+        return false;
     }
 }

app/Jobs/InboxPipeline/InboxWorker.php

@@ -159,9 +159,8 @@ class InboxWorker implements ShouldQueue
         [$verified, $headers] = HttpSignature::verify($pkey, $signatureData, $headers, $inboxPath, $body);
         if ($verified == 1) {
             return true;
-        } else {
-            return false;
         }
+        return false;
     }
 
     /**

app/Services/AutospamService.php

@@ -50,11 +50,10 @@ class AutospamService
 
             if (! Storage::exists(self::MODEL_FILE_PATH)) {
                 return false;
-            } else {
+            }
             if (Storage::size(self::MODEL_FILE_PATH) < 1000) {
                 return false;
             }
-            }
 
             return true;
         });

app/Services/Federation/ActiveSharedInboxService.php

@@ -139,22 +139,18 @@ class ActiveSharedInboxService
             $res = Storage::get(self::CACHE_FILE_NAME);
             if (! $res) {
                 return false;
-            } else {
+            }
             $res = json_decode($res, true);
             if (! $res || isset($res['version'], $res['data'], $res['created'], $res['updated'])) {
                 if (now()->parse($res['updated'])->lt(now()->subMonths(6))) {
                     return false;
-                    } else {
+                }
                 if ($res['version'] === self::CACHE_FILE_VERSION) {
                     return $res;
-                        } else {
-                            return false;
-                        }
                 }
-                } else {
                 return false;
             }
-            }
+            return false;
         }
 
         return false;

app/Services/SearchApiV2Service.php

@@ -230,16 +230,15 @@ class SearchApiV2Service
         if (Helpers::validateLocalUrl($query)) {
             if (Str::contains($query, '/p/') || Str::contains($query, 'i/web/post/')) {
                 return $this->resolveLocalStatus();
-            } elseif (Str::contains($query, 'i/web/profile/')) {
+            }
+            if (Str::contains($query, 'i/web/profile/')) {
                 return $this->resolveLocalProfileId();
-            } else {
+            }
             return $this->resolveLocalProfile();
         }
-        } else {
         if (! Helpers::validateUrl($query) && !str_contains($query, '@')) {
             return $default;
         }
-
         if (
             ! Str::startsWith($query, 'http') &&
             Str::substrCount($query, '@') == 1 &&
@@ -263,12 +262,10 @@ class SearchApiV2Service
                     $default['accounts'] = [];
                 }
 
-                    return $default;
-                } else {
                 return $default;
             }
+            return $default;
         }
-
         if (Str::substrCount($query, '@') == 2) {
             try {
                 $res = WebfingerService::lookup($query, $mastodonMode);
@@ -287,12 +284,10 @@ class SearchApiV2Service
                     $default['accounts'] = [];
                 }
 
-                    return $default;
-                } else {
                 return $default;
             }
+            return $default;
         }
-
         if ($sid = Status::whereUri($query)->first()) {
             $s = StatusService::get($sid->id, false);
             if (! $s || isset($s['account']['moved'], $s['account']['moved']['id'])) {
@@ -304,7 +299,6 @@ class SearchApiV2Service
                 return $default;
             }
         }
-
         try {
             $res = ActivityPubFetchService::get($query);
 
@@ -367,10 +361,8 @@ class SearchApiV2Service
                 'statuses' => [],
             ];
         }
-
         return $default;
     }
-    }
 
     /**
      * @return mixed[][]

app/Util/ActivityPub/Helpers.php

@@ -540,9 +540,8 @@ class Helpers
             $res = json_decode($res, true, 8);
             if (json_last_error() === JSON_ERROR_NONE) {
                 return $res;
-            } else {
-                return false;
             }
+            return false;
         });
     }
 

app/Util/Lexer/Validator.php

@@ -384,8 +384,7 @@ class Validator extends Regex
         $found = preg_match($pattern, $string, $matches);
         if (! $optional) {
             return ($string || $string === '') && $found && $matches[0] === $string;
-        } else {
-            return ! (($string || $string === '') && (! $found || $matches[0] !== $string));
         }
+        return ! (($string || $string === '') && (! $found || $matches[0] !== $string));
     }
 }

rector.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__.'/app',
+    ])
+    ->withSkip([
+        __DIR__.'/bootstrap/cache',
+        __DIR__.'/storage',
+        __DIR__.'/vendor',
+    ])
+    ->withRules([
+        RemoveAlwaysElseRector::class,
+    ]);