From bf1f650817dadfd5eeee9e5e0b6b6938c136e25d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 22 Dec 2017 10:50:07 +0100 Subject: Add comments controller --- server/controllers/api/videos/comment.ts | 202 +++++++++++++++++-------------- server/controllers/api/videos/index.ts | 2 + 2 files changed, 116 insertions(+), 88 deletions(-) (limited to 'server/controllers/api') diff --git a/server/controllers/api/videos/comment.ts b/server/controllers/api/videos/comment.ts index b69aa5d40..81c9e7d16 100644 --- a/server/controllers/api/videos/comment.ts +++ b/server/controllers/api/videos/comment.ts @@ -1,88 +1,114 @@ -// import * as express from 'express' -// import { logger, getFormattedObjects } from '../../../helpers' -// import { -// authenticate, -// ensureUserHasRight, -// videosBlacklistAddValidator, -// videosBlacklistRemoveValidator, -// paginationValidator, -// blacklistSortValidator, -// setBlacklistSort, -// setPagination, -// asyncMiddleware -// } from '../../../middlewares' -// import { BlacklistedVideo, UserRight } from '../../../../shared' -// import { VideoBlacklistModel } from '../../../models/video/video-blacklist' -// -// const videoCommentRouter = express.Router() -// -// videoCommentRouter.get('/:videoId/comment', -// authenticate, -// ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), -// asyncMiddleware(listVideoCommentsThreadsValidator), -// asyncMiddleware(listVideoCommentsThreads) -// ) -// -// videoCommentRouter.post('/:videoId/comment', -// authenticate, -// ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), -// asyncMiddleware(videosBlacklistAddValidator), -// asyncMiddleware(addVideoToBlacklist) -// ) -// -// videoCommentRouter.get('/blacklist', -// authenticate, -// ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), -// paginationValidator, -// blacklistSortValidator, -// setBlacklistSort, -// setPagination, -// asyncMiddleware(listBlacklist) -// ) -// -// videoCommentRouter.delete('/:videoId/blacklist', -// authenticate, -// ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), -// asyncMiddleware(videosBlacklistRemoveValidator), -// asyncMiddleware(removeVideoFromBlacklistController) -// ) -// -// // --------------------------------------------------------------------------- -// -// export { -// videoCommentRouter -// } -// -// // --------------------------------------------------------------------------- -// -// async function addVideoToBlacklist (req: express.Request, res: express.Response, next: express.NextFunction) { -// const videoInstance = res.locals.video -// -// const toCreate = { -// videoId: videoInstance.id -// } -// -// await VideoBlacklistModel.create(toCreate) -// return res.type('json').status(204).end() -// } -// -// async function listBlacklist (req: express.Request, res: express.Response, next: express.NextFunction) { -// const resultList = await VideoBlacklistModel.listForApi(req.query.start, req.query.count, req.query.sort) -// -// return res.json(getFormattedObjects(resultList.data, resultList.total)) -// } -// -// async function removeVideoFromBlacklistController (req: express.Request, res: express.Response, next: express.NextFunction) { -// const blacklistedVideo = res.locals.blacklistedVideo as VideoBlacklistModel -// -// try { -// await blacklistedVideo.destroy() -// -// logger.info('Video %s removed from blacklist.', res.locals.video.uuid) -// -// return res.sendStatus(204) -// } catch (err) { -// logger.error('Some error while removing video %s from blacklist.', res.locals.video.uuid, err) -// throw err -// } -// } +import * as express from 'express' +import { VideoCommentCreate } from '../../../../shared/models/videos/video-comment.model' +import { getFormattedObjects, retryTransactionWrapper } from '../../../helpers' +import { sequelizeTypescript } from '../../../initializers' +import { buildFormattedCommentTree, createVideoComment } from '../../../lib/video-comment' +import { asyncMiddleware, authenticate, paginationValidator, setPagination, setVideoCommentThreadsSort } from '../../../middlewares' +import { videoCommentThreadsSortValidator } from '../../../middlewares/validators' +import { + addVideoCommentReplyValidator, addVideoCommentThreadValidator, listVideoCommentThreadsValidator, + listVideoThreadCommentsValidator +} from '../../../middlewares/validators/video-comments' +import { VideoCommentModel } from '../../../models/video/video-comment' + +const videoCommentRouter = express.Router() + +videoCommentRouter.get('/:videoId/comment-threads', + paginationValidator, + videoCommentThreadsSortValidator, + setVideoCommentThreadsSort, + setPagination, + asyncMiddleware(listVideoCommentThreadsValidator), + asyncMiddleware(listVideoThreads) +) +videoCommentRouter.get('/:videoId/comment-threads/:threadId', + asyncMiddleware(listVideoThreadCommentsValidator), + asyncMiddleware(listVideoThreadComments) +) + +videoCommentRouter.post('/:videoId/comment-threads', + authenticate, + asyncMiddleware(addVideoCommentThreadValidator), + asyncMiddleware(addVideoCommentThreadRetryWrapper) +) +videoCommentRouter.post('/:videoId/comments/:commentId', + authenticate, + asyncMiddleware(addVideoCommentReplyValidator), + asyncMiddleware(addVideoCommentReplyRetryWrapper) +) + +// --------------------------------------------------------------------------- + +export { + videoCommentRouter +} + +// --------------------------------------------------------------------------- + +async function listVideoThreads (req: express.Request, res: express.Response, next: express.NextFunction) { + const resultList = await VideoCommentModel.listThreadsForApi(res.locals.video.id, req.query.start, req.query.count, req.query.sort) + + return res.json(getFormattedObjects(resultList.data, resultList.total)) +} + +async function listVideoThreadComments (req: express.Request, res: express.Response, next: express.NextFunction) { + const resultList = await VideoCommentModel.listThreadCommentsForApi(res.locals.video.id, res.locals.videoCommentThread.id) + + return res.json(buildFormattedCommentTree(resultList)) +} + +async function addVideoCommentThreadRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { + const options = { + arguments: [ req, res ], + errorMessage: 'Cannot insert the video comment thread with many retries.' + } + + const comment = await retryTransactionWrapper(addVideoCommentThread, options) + + res.json({ + comment: { + id: comment.id + } + }).end() +} + +function addVideoCommentThread (req: express.Request, res: express.Response) { + const videoCommentInfo: VideoCommentCreate = req.body + + return sequelizeTypescript.transaction(async t => { + return createVideoComment({ + text: videoCommentInfo.text, + inReplyToComment: null, + video: res.locals.video, + actorId: res.locals.oauth.token.User.Account.Actor.id + }, t) + }) +} + +async function addVideoCommentReplyRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) { + const options = { + arguments: [ req, res ], + errorMessage: 'Cannot insert the video comment reply with many retries.' + } + + const comment = await retryTransactionWrapper(addVideoCommentReply, options) + + res.json({ + comment: { + id: comment.id + } + }).end() +} + +function addVideoCommentReply (req: express.Request, res: express.Response, next: express.NextFunction) { + const videoCommentInfo: VideoCommentCreate = req.body + + return sequelizeTypescript.transaction(async t => { + return createVideoComment({ + text: videoCommentInfo.text, + inReplyToComment: res.locals.videoComment.id, + video: res.locals.video, + actorId: res.locals.oauth.token.User.Account.Actor.id + }, t) + }) +} diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 8283f2e4e..8e54d95ab 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -47,6 +47,7 @@ import { VideoFileModel } from '../../../models/video/video-file' import { abuseVideoRouter } from './abuse' import { blacklistRouter } from './blacklist' import { videoChannelRouter } from './channel' +import { videoCommentRouter } from './comment' import { rateVideoRouter } from './rate' const videosRouter = express.Router() @@ -78,6 +79,7 @@ videosRouter.use('/', abuseVideoRouter) videosRouter.use('/', blacklistRouter) videosRouter.use('/', rateVideoRouter) videosRouter.use('/', videoChannelRouter) +videosRouter.use('/', videoCommentRouter) videosRouter.get('/categories', listVideoCategories) videosRouter.get('/licences', listVideoLicences) -- cgit v1.2.3