diff options
Diffstat (limited to 'server/controllers')
-rw-r--r-- | server/controllers/api/accounts.ts | 12 | ||||
-rw-r--r-- | server/controllers/services.ts | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts index ccae0436b..8e937276c 100644 --- a/server/controllers/api/accounts.ts +++ b/server/controllers/api/accounts.ts | |||
@@ -8,7 +8,7 @@ import { | |||
8 | setDefaultPagination, | 8 | setDefaultPagination, |
9 | setDefaultSort | 9 | setDefaultSort |
10 | } from '../../middlewares' | 10 | } from '../../middlewares' |
11 | import { accountsGetValidator, accountsSortValidator, videosSortValidator } from '../../middlewares/validators' | 11 | import { accountsNameWithHostGetValidator, accountsSortValidator, videosSortValidator } from '../../middlewares/validators' |
12 | import { AccountModel } from '../../models/account/account' | 12 | import { AccountModel } from '../../models/account/account' |
13 | import { VideoModel } from '../../models/video/video' | 13 | import { VideoModel } from '../../models/video/video' |
14 | import { isNSFWHidden } from '../../helpers/express-utils' | 14 | import { isNSFWHidden } from '../../helpers/express-utils' |
@@ -24,13 +24,13 @@ accountsRouter.get('/', | |||
24 | asyncMiddleware(listAccounts) | 24 | asyncMiddleware(listAccounts) |
25 | ) | 25 | ) |
26 | 26 | ||
27 | accountsRouter.get('/:id', | 27 | accountsRouter.get('/:accountName', |
28 | asyncMiddleware(accountsGetValidator), | 28 | asyncMiddleware(accountsNameWithHostGetValidator), |
29 | getAccount | 29 | getAccount |
30 | ) | 30 | ) |
31 | 31 | ||
32 | accountsRouter.get('/:id/videos', | 32 | accountsRouter.get('/:accountName/videos', |
33 | asyncMiddleware(accountsGetValidator), | 33 | asyncMiddleware(accountsNameWithHostGetValidator), |
34 | paginationValidator, | 34 | paginationValidator, |
35 | videosSortValidator, | 35 | videosSortValidator, |
36 | setDefaultSort, | 36 | setDefaultSort, |
@@ -39,7 +39,7 @@ accountsRouter.get('/:id/videos', | |||
39 | asyncMiddleware(listAccountVideos) | 39 | asyncMiddleware(listAccountVideos) |
40 | ) | 40 | ) |
41 | 41 | ||
42 | accountsRouter.get('/:accountId/video-channels', | 42 | accountsRouter.get('/:accountName/video-channels', |
43 | asyncMiddleware(listVideoAccountChannelsValidator), | 43 | asyncMiddleware(listVideoAccountChannelsValidator), |
44 | asyncMiddleware(listVideoAccountChannels) | 44 | asyncMiddleware(listVideoAccountChannels) |
45 | ) | 45 | ) |
diff --git a/server/controllers/services.ts b/server/controllers/services.ts index c272edccd..a58a5b8cf 100644 --- a/server/controllers/services.ts +++ b/server/controllers/services.ts | |||
@@ -10,7 +10,7 @@ servicesRouter.use('/oembed', | |||
10 | asyncMiddleware(oembedValidator), | 10 | asyncMiddleware(oembedValidator), |
11 | generateOEmbed | 11 | generateOEmbed |
12 | ) | 12 | ) |
13 | servicesRouter.use('/redirect/accounts/:nameWithHost', | 13 | servicesRouter.use('/redirect/accounts/:accountName', |
14 | asyncMiddleware(accountsNameWithHostGetValidator), | 14 | asyncMiddleware(accountsNameWithHostGetValidator), |
15 | redirectToAccountUrl | 15 | redirectToAccountUrl |
16 | ) | 16 | ) |