Merge branch 'mw-cleanup' into 'main'

Remove redundant userMiddleware usages in app.ts

See merge request soapbox-pub/ditto!723
This commit is contained in:
Alex Gleason 2025-03-15 18:41:43 +00:00
commit c2f214c9bc

View file

@ -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.route('/api/v1/ditto/cashu', cashuApp);
app.post('/api/v1/reports', userMiddleware(), reportController); app.post('/api/v1/reports', userMiddleware(), reportController);
app.get('/api/v1/admin/reports', userMiddleware(), userMiddleware({ role: 'admin' }), adminReportsController); app.get('/api/v1/admin/reports', userMiddleware({ role: 'admin' }), adminReportsController);
app.get( app.get('/api/v1/admin/reports/:id{[0-9a-f]{64}}', userMiddleware({ role: 'admin' }), adminReportController);
'/api/v1/admin/reports/:id{[0-9a-f]{64}}',
userMiddleware(),
userMiddleware({ role: 'admin' }),
adminReportController,
);
app.post( app.post(
'/api/v1/admin/reports/:id{[0-9a-f]{64}}/resolve', '/api/v1/admin/reports/:id{[0-9a-f]{64}}/resolve',
userMiddleware(),
userMiddleware({ role: 'admin' }), userMiddleware({ role: 'admin' }),
adminReportResolveController, adminReportResolveController,
); );
app.post( app.post(
'/api/v1/admin/reports/:id{[0-9a-f]{64}}/reopen', '/api/v1/admin/reports/:id{[0-9a-f]{64}}/reopen',
userMiddleware(),
userMiddleware({ role: 'admin' }), userMiddleware({ role: 'admin' }),
adminReportReopenController, adminReportReopenController,
); );
app.get('/api/v1/admin/accounts', userMiddleware({ role: 'admin' }), adminAccountsController); app.get('/api/v1/admin/accounts', userMiddleware({ role: 'admin' }), adminAccountsController);
app.post( app.post('/api/v1/admin/accounts/:id{[0-9a-f]{64}}/action', userMiddleware({ role: 'admin' }), adminActionController);
'/api/v1/admin/accounts/:id{[0-9a-f]{64}}/action', app.post('/api/v1/admin/accounts/:id{[0-9a-f]{64}}/approve', userMiddleware({ role: 'admin' }), adminApproveController);
userMiddleware(), app.post('/api/v1/admin/accounts/:id{[0-9a-f]{64}}/reject', userMiddleware({ role: 'admin' }), adminRejectController);
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.put('/api/v1/pleroma/admin/users/tag', userMiddleware({ role: 'admin' }), pleromaAdminTagController); app.put('/api/v1/pleroma/admin/users/tag', userMiddleware({ role: 'admin' }), pleromaAdminTagController);
app.delete('/api/v1/pleroma/admin/users/tag', userMiddleware({ role: 'admin' }), pleromaAdminUntagController); app.delete('/api/v1/pleroma/admin/users/tag', userMiddleware({ role: 'admin' }), pleromaAdminUntagController);