diff --git a/routes/api.php b/routes/api.php index fd3919909..d530d78da 100644 --- a/routes/api.php +++ b/routes/api.php @@ -126,9 +126,9 @@ Route::prefix('api/v0/groups')->middleware($middleware)->group(function () { Route::get('{id}', [GroupController::class, 'getGroup']); }); -Route::group(['prefix' => 'api'], function () use ($middleware) { +Route::prefix('api')->group(function () use ($middleware) { - Route::group(['prefix' => 'v1'], function () use ($middleware) { + Route::prefix('v1')->group(function () use ($middleware) { Route::post('apps', [ApiV1Controller::class, 'apps']); Route::get('apps/verify_credentials', [ApiV1Controller::class, 'getApp'])->middleware($middleware); Route::get('instance', [ApiV1Controller::class, 'instance']); @@ -213,7 +213,7 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::get('statuses/{id}/history', [StatusEditController::class, 'history'])->middleware($middleware); Route::put('statuses/{id}', [StatusEditController::class, 'store'])->middleware($middleware); - Route::group(['prefix' => 'admin'], function () use ($middleware) { + Route::prefix('admin')->group(function () use ($middleware) { Route::get('domain_blocks', [DomainBlocksController::class, 'index'])->middleware($middleware); Route::post('domain_blocks', [DomainBlocksController::class, 'create'])->middleware($middleware); Route::get('domain_blocks/{id}', [DomainBlocksController::class, 'show'])->middleware($middleware); @@ -222,7 +222,7 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { })->middleware($middleware); }); - Route::group(['prefix' => 'v2'], function () use ($middleware) { + Route::prefix('v2')->group(function () use ($middleware) { Route::get('search', [ApiV2Controller::class, 'search'])->middleware($middleware); Route::post('media', [ApiV2Controller::class, 'mediaUploadV2'])->middleware($middleware); Route::get('streaming/config', [ApiV2Controller::class, 'getWebsocketConfig']); @@ -235,10 +235,10 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::delete('filters/{id}', [CustomFilterController::class, 'delete'])->middleware($middleware); }); - Route::group(['prefix' => 'v1.1'], function () use ($middleware) { + Route::prefix('v1.1')->group(function () use ($middleware) { Route::post('report', [ApiV1Dot1Controller::class, 'report'])->middleware($middleware); - Route::group(['prefix' => 'accounts'], function () use ($middleware) { + Route::prefix('accounts')->group(function () use ($middleware) { Route::get('timelines/home', [ApiV1Controller::class, 'timelineHome'])->middleware($middleware); Route::delete('avatar', [ApiV1Dot1Controller::class, 'deleteAvatar'])->middleware($middleware); Route::get('{id}/posts', [ApiV1Dot1Controller::class, 'accountPosts'])->middleware($middleware); @@ -251,7 +251,7 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::get('username/{username}', [ApiV1Dot1Controller::class, 'accountUsernameToId'])->middleware($middleware); }); - Route::group(['prefix' => 'collections'], function () use ($middleware) { + Route::prefix('collections')->group(function () use ($middleware) { Route::get('accounts/{id}', [CollectionController::class, 'getUserCollections'])->middleware($middleware); Route::get('items/{id}', [CollectionController::class, 'getItems'])->middleware($middleware); Route::get('view/{id}', [CollectionController::class, 'getCollection'])->middleware($middleware); @@ -262,7 +262,7 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::get('self', [CollectionController::class, 'getSelfCollections'])->middleware($middleware); }); - Route::group(['prefix' => 'direct'], function () use ($middleware) { + Route::prefix('direct')->group(function () use ($middleware) { Route::get('thread', [DirectMessageController::class, 'thread'])->middleware($middleware); Route::post('thread/send', [DirectMessageController::class, 'create'])->middleware($middleware); Route::delete('thread/message', [DirectMessageController::class, 'delete'])->middleware($middleware); @@ -274,17 +274,17 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::get('compose/mutuals', [DirectMessageController::class, 'composeMutuals'])->middleware($middleware); }); - Route::group(['prefix' => 'archive'], function () use ($middleware) { + Route::prefix('archive')->group(function () use ($middleware) { Route::post('add/{id}', [ApiV1Dot1Controller::class, 'archive'])->middleware($middleware); Route::post('remove/{id}', [ApiV1Dot1Controller::class, 'unarchive'])->middleware($middleware); Route::get('list', [ApiV1Dot1Controller::class, 'archivedPosts'])->middleware($middleware); }); - Route::group(['prefix' => 'places'], function () use ($middleware) { + Route::prefix('places')->group(function () use ($middleware) { Route::get('posts/{id}/{slug}', [ApiV1Dot1Controller::class, 'placesById'])->middleware($middleware); }); - Route::group(['prefix' => 'stories'], function () use ($middleware) { + Route::prefix('stories')->group(function () use ($middleware) { Route::get('carousel', [StoryApiV1Controller::class, 'carousel'])->middleware($middleware); Route::post('add', [StoryApiV1Controller::class, 'add'])->middleware($middleware); Route::post('publish', [StoryApiV1Controller::class, 'publish'])->middleware($middleware); @@ -293,23 +293,23 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::post('comment', [StoryApiV1Controller::class, 'comment'])->middleware($middleware); }); - Route::group(['prefix' => 'compose'], function () use ($middleware) { + Route::prefix('compose')->group(function () use ($middleware) { Route::get('search/location', [ComposeController::class, 'searchLocation'])->middleware($middleware); Route::get('settings', [ComposeController::class, 'composeSettings'])->middleware($middleware); }); - Route::group(['prefix' => 'discover'], function () use ($middleware) { + Route::prefix('discover')->group(function () use ($middleware) { Route::get('accounts/popular', [ApiV1Controller::class, 'discoverAccountsPopular'])->middleware($middleware); Route::get('posts/trending', [DiscoverController::class, 'trendingApi'])->middleware($middleware); Route::get('posts/hashtags', [DiscoverController::class, 'trendingHashtags'])->middleware($middleware); Route::get('posts/network/trending', [DiscoverController::class, 'discoverNetworkTrending'])->middleware($middleware); }); - Route::group(['prefix' => 'directory'], function () { + Route::prefix('directory')->group(function () { Route::get('listing', [PixelfedDirectoryController::class, 'get']); }); - Route::group(['prefix' => 'auth'], function () { + Route::prefix('auth')->group(function () { Route::get('iarpfc', [ApiV1Dot1Controller::class, 'inAppRegistrationPreFlightCheck']); Route::post('iar', [ApiV1Dot1Controller::class, 'inAppRegistration']); Route::post('iarc', [ApiV1Dot1Controller::class, 'inAppRegistrationConfirm']); @@ -320,7 +320,7 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::post('invite/admin/ec', [AdminInviteController::class, 'apiEmailCheck'])->middleware('throttle:10,1440'); }); - Route::group(['prefix' => 'push'], function () use ($middleware) { + Route::prefix('push')->group(function () use ($middleware) { Route::get('state', [ApiV1Dot1Controller::class, 'getPushState'])->middleware($middleware); Route::post('compare', [ApiV1Dot1Controller::class, 'comparePush'])->middleware($middleware); Route::post('update', [ApiV1Dot1Controller::class, 'updatePush'])->middleware($middleware); @@ -331,8 +331,8 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::get('nag/state', [ApiV1Dot1Controller::class, 'nagState']); }); - Route::group(['prefix' => 'v1.2'], function () use ($middleware) { - Route::group(['prefix' => 'stories'], function () use ($middleware) { + Route::prefix('v1.2')->group(function () use ($middleware) { + Route::prefix('stories')->group(function () use ($middleware) { Route::get('viewers', [StoryApiV1Controller::class, 'viewers'])->middleware($middleware); Route::post('publish', [StoryApiV1Controller::class, 'publishNext'])->middleware($middleware); Route::get('carousel', [StoryApiV1Controller::class, 'carouselNext'])->middleware($middleware); @@ -340,7 +340,7 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { }); }); - Route::group(['prefix' => 'live'], function () { + Route::prefix('live')->group(function () { // Route::post('create_stream', [LiveStreamController::class, 'createStream'])->middleware($middleware); // Route::post('stream/edit', [LiveStreamController::class, 'editStream'])->middleware($middleware); // Route::get('active/list', [LiveStreamController::class, 'getActiveStreams'])->middleware($middleware); @@ -358,7 +358,7 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { // Route::post('broadcast/finish', [LiveStreamController::class, 'clientBroadcastFinish'])->middleware($middleware); }); - Route::group(['prefix' => 'admin'], function () use ($middleware) { + Route::prefix('admin')->group(function () use ($middleware) { Route::post('moderate/post/{id}', [ApiV1Dot1Controller::class, 'moderatePost'])->middleware($middleware); Route::get('supported', [AdminApiController::class, 'supported'])->middleware($middleware); Route::get('stats', [AdminApiController::class, 'getStats'])->middleware($middleware); @@ -379,15 +379,15 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::get('instance/stats', [AdminApiController::class, 'getAllStats'])->middleware($middleware); }); - Route::group(['prefix' => 'landing/v1'], function () { + Route::prefix('landing/v1')->group(function () { Route::get('directory', [LandingController::class, 'getDirectoryApi']); }); - Route::group(['prefix' => 'pixelfed'], function () use ($middleware) { - Route::group(['prefix' => 'v1'], function () use ($middleware) { + Route::prefix('pixelfed')->group(function () use ($middleware) { + Route::prefix('v1')->group(function () use ($middleware) { Route::post('report', [ApiV1Dot1Controller::class, 'report'])->middleware($middleware); - Route::group(['prefix' => 'accounts'], function () use ($middleware) { + Route::prefix('accounts')->group(function () use ($middleware) { Route::get('timelines/home', [ApiV1Controller::class, 'timelineHome'])->middleware($middleware); Route::delete('avatar', [ApiV1Dot1Controller::class, 'deleteAvatar'])->middleware($middleware); Route::get('{id}/posts', [ApiV1Dot1Controller::class, 'accountPosts'])->middleware($middleware); @@ -398,13 +398,13 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::get('apps-and-applications', [ApiV1Dot1Controller::class, 'accountApps'])->middleware($middleware); }); - Route::group(['prefix' => 'archive'], function () use ($middleware) { + Route::prefix('archive')->group(function () use ($middleware) { Route::post('add/{id}', [ApiV1Dot1Controller::class, 'archive'])->middleware($middleware); Route::post('remove/{id}', [ApiV1Dot1Controller::class, 'unarchive'])->middleware($middleware); Route::get('list', [ApiV1Dot1Controller::class, 'archivedPosts'])->middleware($middleware); }); - Route::group(['prefix' => 'collections'], function () use ($middleware) { + Route::prefix('collections')->group(function () use ($middleware) { Route::get('accounts/{id}', [CollectionController::class, 'getUserCollections'])->middleware($middleware); Route::get('items/{id}', [CollectionController::class, 'getItems'])->middleware($middleware); Route::get('view/{id}', [CollectionController::class, 'getCollection'])->middleware($middleware); @@ -415,12 +415,12 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::get('self', [CollectionController::class, 'getSelfCollections'])->middleware($middleware); }); - Route::group(['prefix' => 'compose'], function () use ($middleware) { + Route::prefix('compose')->group(function () use ($middleware) { Route::get('search/location', [ComposeController::class, 'searchLocation'])->middleware($middleware); Route::get('settings', [ComposeController::class, 'composeSettings'])->middleware($middleware); }); - Route::group(['prefix' => 'direct'], function () use ($middleware) { + Route::prefix('direct')->group(function () use ($middleware) { Route::get('thread', [DirectMessageController::class, 'thread'])->middleware($middleware); Route::post('thread/send', [DirectMessageController::class, 'create'])->middleware($middleware); Route::delete('thread/message', [DirectMessageController::class, 'delete'])->middleware($middleware); @@ -431,17 +431,17 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::post('lookup', [DirectMessageController::class, 'composeLookup'])->middleware($middleware); }); - Route::group(['prefix' => 'discover'], function () use ($middleware) { + Route::prefix('discover')->group(function () use ($middleware) { Route::get('accounts/popular', [ApiV1Controller::class, 'discoverAccountsPopular'])->middleware($middleware); Route::get('posts/trending', [DiscoverController::class, 'trendingApi'])->middleware($middleware); Route::get('posts/hashtags', [DiscoverController::class, 'trendingHashtags'])->middleware($middleware); }); - Route::group(['prefix' => 'directory'], function () { + Route::prefix('directory')->group(function () { Route::get('listing', [PixelfedDirectoryController::class, 'get']); }); - Route::group(['prefix' => 'places'], function () use ($middleware) { + Route::prefix('places')->group(function () use ($middleware) { Route::get('posts/{id}/{slug}', [ApiV1Dot1Controller::class, 'placesById'])->middleware($middleware); }); @@ -450,7 +450,7 @@ Route::group(['prefix' => 'api'], function () use ($middleware) { Route::get('app/settings', [UserAppSettingsController::class, 'get'])->middleware($middleware); Route::post('app/settings', [UserAppSettingsController::class, 'store'])->middleware($middleware); - Route::group(['prefix' => 'stories'], function () use ($middleware) { + Route::prefix('stories')->group(function () use ($middleware) { Route::get('carousel', [StoryApiV1Controller::class, 'carousel'])->middleware($middleware); Route::get('self-carousel', [StoryApiV1Controller::class, 'selfCarousel'])->middleware($middleware); Route::post('add', [StoryApiV1Controller::class, 'add'])->middleware($middleware); diff --git a/routes/web-api.php b/routes/web-api.php index a3ef1b178..12425e4e3 100644 --- a/routes/web-api.php +++ b/routes/web-api.php @@ -25,18 +25,18 @@ use App\Http\Controllers\StatusController; use App\Http\Controllers\StoryController; Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofactor', 'localization'])->group(function () { - Route::group(['prefix' => 'api'], function () { + Route::prefix('api')->group(function () { Route::get('search', [SearchController::class, 'searchAPI']); Route::post('status/view', [StatusController::class, 'storeView']); Route::get('v1/polls/{id}', [PollController::class, 'getPoll']); Route::post('v1/polls/{id}/votes', [PollController::class, 'vote']); - Route::group(['prefix' => 'web-admin'], function () { + Route::prefix('web-admin')->group(function () { Route::get('software-update/check', [SoftwareUpdateController::class, 'getSoftwareUpdateCheck']); }); - Route::group(['prefix' => 'compose'], function () { - Route::group(['prefix' => 'v0'], function () { + Route::prefix('compose')->group(function () { + Route::prefix('v0')->group(function () { Route::post('/media/upload', [ComposeController::class, 'mediaUpload']); Route::post('/media/update', [ComposeController::class, 'mediaUpdate']); Route::delete('/media/delete', [ComposeController::class, 'mediaDelete']); @@ -53,7 +53,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact }); }); - Route::group(['prefix' => 'direct'], function () { + Route::prefix('direct')->group(function () { Route::get('browse', [DirectMessageController::class, 'browse']); Route::post('create', [DirectMessageController::class, 'create']); Route::get('thread', [DirectMessageController::class, 'thread']); @@ -65,7 +65,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::post('read', [DirectMessageController::class, 'read']); }); - Route::group(['prefix' => 'v2'], function () { + Route::prefix('v2')->group(function () { Route::get('config', [ApiController::class, 'siteConfiguration']); Route::get('discover', [InternalApiController::class, 'discover']); Route::get('discover/posts', [InternalApiController::class, 'discoverPosts'])->middleware('auth:api'); @@ -80,8 +80,8 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('statuses/{id}/state', [ApiV1Controller::class, 'statusState']); }); - Route::group(['prefix' => 'pixelfed'], function () { - Route::group(['prefix' => 'v1'], function () { + Route::prefix('pixelfed')->group(function () { + Route::prefix('v1')->group(function () { Route::get('accounts/verify_credentials', [ApiController::class, 'verifyCredentials']); Route::get('accounts/relationships', [ApiV1Controller::class, 'accountRelationshipsById']); Route::get('accounts/search', [ApiV1Controller::class, 'accountSearch']); @@ -106,7 +106,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('blocks', [AccountController::class, 'accountBlocks']); }); - Route::group(['prefix' => 'v2'], function () { + Route::prefix('v2')->group(function () { Route::get('config', [ApiController::class, 'siteConfiguration']); Route::get('discover', [InternalApiController::class, 'discover']); Route::get('discover/posts', [InternalApiController::class, 'discoverPosts']); @@ -140,7 +140,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::post('web/change-language.json', [SpaController::class, 'updateLanguage']); }); - Route::group(['prefix' => 'local'], function () { + Route::prefix('local')->group(function () { // Route::post('status/compose', [InternalApiController::class, 'composePost'])->middleware('throttle:maxPostsPerHour,60')->middleware('throttle:maxPostsPerDay,1440'); Route::post('discover/tag/subscribe', [HashtagFollowController::class, 'store']); Route::get('discover/tag/list', [HashtagFollowController::class, 'getTags']); @@ -165,7 +165,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::post('import/ig/processing', [ImportPostController::class, 'getProcessingCount']); }); - Route::group(['prefix' => 'web/stories'], function () { + Route::prefix('web/stories')->group(function () { Route::get('v1/recent', [StoryController::class, 'recent']); Route::get('v1/viewers', [StoryController::class, 'viewers']); Route::get('v1/profile/{id}', [StoryController::class, 'profile']); @@ -183,7 +183,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::delete('v1/delete/{id}', [StoryController::class, 'apiV1Delete']); }); - Route::group(['prefix' => 'portfolio'], function () { + Route::prefix('portfolio')->group(function () { Route::post('self/curated.json', [PortfolioController::class, 'storeCurated']); Route::post('self/settings.json', [PortfolioController::class, 'getSettings']); Route::get('account/settings.json', [PortfolioController::class, 'getAccountSettings']); diff --git a/routes/web.php b/routes/web.php index 7335360aa..3d7131ee0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -103,11 +103,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('auth/forgot/email', [UserEmailForgotController::class, 'index'])->name('email.forgot'); Route::post('auth/forgot/email', [UserEmailForgotController::class, 'store'])->middleware('throttle:10,900,forgotEmail'); - Route::group([ - 'as' => 'passport.', - 'prefix' => 'oauth', - 'middleware' => ['oauth-web'], - ], function () { + Route::name('passport.')->prefix('oauth')->middleware('oauth-web')->group(function () { Route::post('/token', [ApiTokenController::class, 'issueToken']) ->name('token') ->middleware('throttle:10,1'); @@ -175,7 +171,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('/i/app-email-resend', [AppRegisterController::class, 'resendVerification']); Route::post('/i/app-email-resend', [AppRegisterController::class, 'resendVerificationStore'])->middleware('throttle:app-code-resend'); - Route::group(['prefix' => 'i'], function () { + Route::prefix('i')->group(function () { Route::redirect('/', '/'); Route::get('compose', [StatusController::class, 'compose'])->name('compose'); Route::post('comment', [CommentController::class, 'store']); @@ -207,7 +203,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::post('metro/dark-mode', [SettingsController::class, 'metroDarkMode']); - Route::group(['prefix' => 'report'], function () { + Route::prefix('report')->group(function () { Route::get('/', [ReportController::class, 'showForm'])->name('report.form'); Route::post('/', [ReportController::class, 'formStore']); Route::get('not-interested', [ReportController::class, 'notInterestedForm'])->name('report.not-interested'); @@ -233,7 +229,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('web/profile/_/{id}', [InternalApiController::class, 'remoteProfile']); Route::get('web/post/_/{profileId}/{statusid}', [InternalApiController::class, 'remoteStatus']); - Route::group(['prefix' => 'import', 'middleware' => 'dangerzone'], function () { + Route::prefix('import')->middleware('dangerzone')->group(function () { Route::get('job/{uuid}/1', [ImportController::class, 'instagramStepOne']); Route::post('job/{uuid}/1', [ImportController::class, 'instagramStepOneStore']); Route::get('job/{uuid}/2', [ImportController::class, 'instagramStepTwo']); @@ -261,7 +257,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('web', [SpaController::class, 'index']); }); - Route::group(['prefix' => 'account'], function () { + Route::prefix('account')->group(function () { Route::redirect('/', '/'); Route::get('direct', [AccountController::class, 'direct']); Route::get('direct/t/{id}', [AccountController::class, 'directMessage']); @@ -273,7 +269,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('portfolio/{username}.rss', [PortfolioController::class, 'getRssFeed']); }); - Route::group(['prefix' => 'settings'], function () { + Route::prefix('settings')->group(function () { Route::redirect('/', '/settings/home'); Route::get('home', [SettingsController::class, 'home']) ->name('settings'); @@ -298,14 +294,14 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::post('privacy/blocked-instances/unblock', [SettingsController::class, 'blockedInstanceUnblock'])->name('settings.privacy.blocked-instances.unblock'); Route::get('privacy/blocked-keywords', [SettingsController::class, 'blockedKeywords'])->name('settings.privacy.blocked-keywords'); Route::post('privacy/account', [SettingsController::class, 'privateAccountOptions'])->name('settings.privacy.account'); - Route::group(['prefix' => 'remove', 'middleware' => 'dangerzone'], function () { + Route::prefix('remove')->middleware('dangerzone')->group(function () { Route::get('request/temporary', [SettingsController::class, 'removeAccountTemporary'])->name('settings.remove.temporary'); Route::post('request/temporary', [SettingsController::class, 'removeAccountTemporarySubmit']); Route::get('request/permanent', [SettingsController::class, 'removeAccountPermanent'])->name('settings.remove.permanent'); Route::post('request/permanent', [SettingsController::class, 'removeAccountPermanentSubmit']); }); - Route::group(['prefix' => 'security', 'middleware' => 'dangerzone'], function () { + Route::prefix('security')->middleware('dangerzone')->group(function () { Route::get( '/', [SettingsController::class, 'security'] @@ -361,7 +357,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('accessibility', [SettingsController::class, 'accessibility'])->name('settings.accessibility'); Route::post('accessibility', [SettingsController::class, 'accessibilityStore']); - Route::group(['prefix' => 'relationships'], function () { + Route::prefix('relationships')->group(function () { Route::redirect('/', '/settings/relationships/home'); Route::get('home', [SettingsController::class, 'relationshipsHome'])->name('settings.relationships'); }); @@ -370,7 +366,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('invites', [UserInviteController::class, 'show'])->name('settings.invites'); // Route::get('sponsor', [SettingsController::class, 'sponsor'])->name('settings.sponsor'); // Route::post('sponsor', [SettingsController::class, 'sponsorStore']); - Route::group(['prefix' => 'import', 'middleware' => 'dangerzone'], function () { + Route::prefix('import')->middleware('dangerzone')->group(function () { Route::get('/', [SettingsController::class, 'dataImport'])->name('settings.import'); Route::prefix('instagram')->group(function () { Route::get('/', [ImportController::class, 'instagram'])->name('settings.import.ig'); @@ -386,23 +382,23 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('media', [SettingsController::class, 'mediaSettings'])->name('settings.media'); Route::post('media', [SettingsController::class, 'updateMediaSettings']); - Route::group(['prefix' => 'account/aliases', 'middleware' => 'dangerzone'], function () { + Route::prefix('account/aliases')->middleware('dangerzone')->group(function () { Route::get('manage', [ProfileAliasController::class, 'index']); Route::post('manage', [ProfileAliasController::class, 'store']); Route::post('manage/delete', [ProfileAliasController::class, 'delete']); }); - Route::group(['prefix' => 'account/migration', 'middleware' => 'dangerzone'], function () { + Route::prefix('account/migration')->middleware('dangerzone')->group(function () { Route::get('manage', [ProfileMigrationController::class, 'index']); Route::post('manage', [ProfileMigrationController::class, 'store']); }); - Route::group(['prefix' => 'filters'], function () { + Route::prefix('filters')->group(function () { Route::get('/', [SettingsController::class, 'filtersHome'])->name('settings.filters'); }); }); - Route::group(['prefix' => 'site'], function () { + Route::prefix('site')->group(function () { Route::redirect('/', '/'); Route::get('about', [SiteController::class, 'about'])->name('site.about'); Route::view('help', 'site.help')->name('site.help'); @@ -416,7 +412,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::view('language', 'site.language')->name('site.language'); Route::get('contact', [ContactController::class, 'show'])->name('site.contact'); Route::post('contact', [ContactController::class, 'store']); - Route::group(['prefix' => 'kb'], function () { + Route::prefix('kb')->group(function () { Route::view('getting-started', 'site.help.getting-started')->name('help.getting-started'); Route::view('sharing-media', 'site.help.sharing-media')->name('help.sharing-media'); Route::view('your-profile', 'site.help.your-profile')->name('help.your-profile'); @@ -452,13 +448,13 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('legal-notice', [SiteController::class, 'legalNotice']); }); - Route::group(['prefix' => 'timeline'], function () { + Route::prefix('timeline')->group(function () { Route::redirect('/', '/'); Route::get('public', [TimelineController::class, 'local'])->name('timeline.public'); Route::get('network', [TimelineController::class, 'network'])->name('timeline.network'); }); - Route::group(['prefix' => 'users'], function () { + Route::prefix('users')->group(function () { Route::redirect('/', '/'); Route::get('{user}.atom', [ProfileController::class, 'showAtomFeed'])->where('user', '.*'); Route::get('{username}/outbox', [FederationController::class, 'userOutbox']); @@ -467,7 +463,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('{username}', [ProfileController::class, 'permalinkRedirect']); }); - Route::group(['prefix' => 'installer'], function () { + Route::prefix('installer')->group(function () { Route::get('api/requirements', [InstallController::class, 'getRequirements'])->withoutMiddleware(['web']); Route::post('precheck/database', [InstallController::class, 'precheckDatabase'])->withoutMiddleware(['web']); Route::post('store', [InstallController::class, 'store'])->withoutMiddleware(['web']); @@ -475,7 +471,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('/{q}', [InstallController::class, 'index'])->withoutMiddleware(['web'])->where('q', '.*'); }); - Route::group(['prefix' => 'e'], function () { + Route::prefix('e')->group(function () { Route::get('terms', [MobileController::class, 'terms']); Route::get('privacy', [MobileController::class, 'privacy']); });