From c9b0ffb537041317f3db8aaee02f02eb647a37da Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 15 Mar 2025 13:26:55 -0500 Subject: [PATCH] Remove redundant userMiddleware usages in app.ts --- packages/ditto/app.ts | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/packages/ditto/app.ts b/packages/ditto/app.ts index 6432668c..6e896571 100644 --- a/packages/ditto/app.ts +++ b/packages/ditto/app.ts @@ -476,45 +476,23 @@ app.get('/api/v1/ditto/statuses/:id{[0-9a-f]{64}}/zapped_by', zappedByController app.route('/api/v1/ditto/cashu', cashuApp); app.post('/api/v1/reports', userMiddleware(), reportController); -app.get('/api/v1/admin/reports', userMiddleware(), userMiddleware({ role: 'admin' }), adminReportsController); -app.get( - '/api/v1/admin/reports/:id{[0-9a-f]{64}}', - userMiddleware(), - userMiddleware({ role: 'admin' }), - adminReportController, -); +app.get('/api/v1/admin/reports', userMiddleware({ role: 'admin' }), adminReportsController); +app.get('/api/v1/admin/reports/:id{[0-9a-f]{64}}', userMiddleware({ role: 'admin' }), adminReportController); app.post( '/api/v1/admin/reports/:id{[0-9a-f]{64}}/resolve', - userMiddleware(), userMiddleware({ role: 'admin' }), adminReportResolveController, ); app.post( '/api/v1/admin/reports/:id{[0-9a-f]{64}}/reopen', - userMiddleware(), userMiddleware({ role: 'admin' }), adminReportReopenController, ); app.get('/api/v1/admin/accounts', userMiddleware({ role: 'admin' }), adminAccountsController); -app.post( - '/api/v1/admin/accounts/:id{[0-9a-f]{64}}/action', - userMiddleware(), - userMiddleware({ role: 'admin' }), - adminActionController, -); -app.post( - '/api/v1/admin/accounts/:id{[0-9a-f]{64}}/approve', - userMiddleware(), - userMiddleware({ role: 'admin' }), - adminApproveController, -); -app.post( - '/api/v1/admin/accounts/:id{[0-9a-f]{64}}/reject', - userMiddleware(), - userMiddleware({ role: 'admin' }), - adminRejectController, -); +app.post('/api/v1/admin/accounts/:id{[0-9a-f]{64}}/action', userMiddleware({ role: 'admin' }), adminActionController); +app.post('/api/v1/admin/accounts/:id{[0-9a-f]{64}}/approve', userMiddleware({ role: 'admin' }), adminApproveController); +app.post('/api/v1/admin/accounts/:id{[0-9a-f]{64}}/reject', userMiddleware({ role: 'admin' }), adminRejectController); app.put('/api/v1/pleroma/admin/users/tag', userMiddleware({ role: 'admin' }), pleromaAdminTagController); app.delete('/api/v1/pleroma/admin/users/tag', userMiddleware({ role: 'admin' }), pleromaAdminUntagController);