diff options
Diffstat (limited to 'server/controllers')
-rw-r--r-- | server/controllers/api/abuse.ts | 4 | ||||
-rw-r--r-- | server/controllers/api/users/my-abuses.ts | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/server/controllers/api/abuse.ts b/server/controllers/api/abuse.ts index 50d068157..72e62fc0b 100644 --- a/server/controllers/api/abuse.ts +++ b/server/controllers/api/abuse.ts | |||
@@ -16,6 +16,7 @@ import { | |||
16 | asyncMiddleware, | 16 | asyncMiddleware, |
17 | asyncRetryTransactionMiddleware, | 17 | asyncRetryTransactionMiddleware, |
18 | authenticate, | 18 | authenticate, |
19 | checkAbuseValidForMessagesValidator, | ||
19 | deleteAbuseMessageValidator, | 20 | deleteAbuseMessageValidator, |
20 | ensureUserHasRight, | 21 | ensureUserHasRight, |
21 | getAbuseValidator, | 22 | getAbuseValidator, |
@@ -58,12 +59,14 @@ abuseRouter.delete('/:id', | |||
58 | abuseRouter.get('/:id/messages', | 59 | abuseRouter.get('/:id/messages', |
59 | authenticate, | 60 | authenticate, |
60 | asyncMiddleware(getAbuseValidator), | 61 | asyncMiddleware(getAbuseValidator), |
62 | checkAbuseValidForMessagesValidator, | ||
61 | asyncRetryTransactionMiddleware(listAbuseMessages) | 63 | asyncRetryTransactionMiddleware(listAbuseMessages) |
62 | ) | 64 | ) |
63 | 65 | ||
64 | abuseRouter.post('/:id/messages', | 66 | abuseRouter.post('/:id/messages', |
65 | authenticate, | 67 | authenticate, |
66 | asyncMiddleware(getAbuseValidator), | 68 | asyncMiddleware(getAbuseValidator), |
69 | checkAbuseValidForMessagesValidator, | ||
67 | addAbuseMessageValidator, | 70 | addAbuseMessageValidator, |
68 | asyncRetryTransactionMiddleware(addAbuseMessage) | 71 | asyncRetryTransactionMiddleware(addAbuseMessage) |
69 | ) | 72 | ) |
@@ -71,6 +74,7 @@ abuseRouter.post('/:id/messages', | |||
71 | abuseRouter.delete('/:id/messages/:messageId', | 74 | abuseRouter.delete('/:id/messages/:messageId', |
72 | authenticate, | 75 | authenticate, |
73 | asyncMiddleware(getAbuseValidator), | 76 | asyncMiddleware(getAbuseValidator), |
77 | checkAbuseValidForMessagesValidator, | ||
74 | asyncMiddleware(deleteAbuseMessageValidator), | 78 | asyncMiddleware(deleteAbuseMessageValidator), |
75 | asyncRetryTransactionMiddleware(deleteAbuseMessage) | 79 | asyncRetryTransactionMiddleware(deleteAbuseMessage) |
76 | ) | 80 | ) |
diff --git a/server/controllers/api/users/my-abuses.ts b/server/controllers/api/users/my-abuses.ts index e43fc483e..fcd0ce3fc 100644 --- a/server/controllers/api/users/my-abuses.ts +++ b/server/controllers/api/users/my-abuses.ts | |||
@@ -43,6 +43,6 @@ async function listMyAbuses (req: express.Request, res: express.Response) { | |||
43 | 43 | ||
44 | return res.json({ | 44 | return res.json({ |
45 | total: resultList.total, | 45 | total: resultList.total, |
46 | data: resultList.data.map(d => d.toFormattedAdminJSON()) | 46 | data: resultList.data.map(d => d.toFormattedUserJSON()) |
47 | }) | 47 | }) |
48 | } | 48 | } |