X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Fcomment.ts;h=5f3fed5c098f246a5984667e9ca8414e06cec025;hb=3cc665f48fd233d09f778d7e887488dde6f03ef6;hp=81c9e7d161b689d6ff4b064a427982bd716edef5;hpb=bf1f650817dadfd5eeee9e5e0b6b6938c136e25d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/comment.ts b/server/controllers/api/videos/comment.ts index 81c9e7d16..5f3fed5c0 100644 --- a/server/controllers/api/videos/comment.ts +++ b/server/controllers/api/videos/comment.ts @@ -1,40 +1,67 @@ import * as express from 'express' +import { cloneDeep } from 'lodash' +import { ResultList } from '../../../../shared/models' import { VideoCommentCreate } from '../../../../shared/models/videos/video-comment.model' -import { getFormattedObjects, retryTransactionWrapper } from '../../../helpers' +import { logger } from '../../../helpers/logger' +import { getFormattedObjects } from '../../../helpers/utils' 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 { buildFormattedCommentTree, createVideoComment, markCommentAsDeleted } from '../../../lib/video-comment' import { - addVideoCommentReplyValidator, addVideoCommentThreadValidator, listVideoCommentThreadsValidator, - listVideoThreadCommentsValidator -} from '../../../middlewares/validators/video-comments' + asyncMiddleware, + asyncRetryTransactionMiddleware, + authenticate, + optionalAuthenticate, + paginationValidator, + setDefaultPagination, + setDefaultSort +} from '../../../middlewares' +import { + addVideoCommentReplyValidator, + addVideoCommentThreadValidator, + listVideoCommentThreadsValidator, + listVideoThreadCommentsValidator, + removeVideoCommentValidator, + videoCommentThreadsSortValidator +} from '../../../middlewares/validators' import { VideoCommentModel } from '../../../models/video/video-comment' +import { auditLoggerFactory, CommentAuditView, getAuditIdFromRes } from '../../../helpers/audit-logger' +import { AccountModel } from '../../../models/account/account' +import { Notifier } from '../../../lib/notifier' +import { Hooks } from '../../../lib/plugins/hooks' +import { sendDeleteVideoComment } from '../../../lib/activitypub/send' +const auditLogger = auditLoggerFactory('comments') const videoCommentRouter = express.Router() videoCommentRouter.get('/:videoId/comment-threads', paginationValidator, videoCommentThreadsSortValidator, - setVideoCommentThreadsSort, - setPagination, + setDefaultSort, + setDefaultPagination, asyncMiddleware(listVideoCommentThreadsValidator), + optionalAuthenticate, asyncMiddleware(listVideoThreads) ) videoCommentRouter.get('/:videoId/comment-threads/:threadId', asyncMiddleware(listVideoThreadCommentsValidator), + optionalAuthenticate, asyncMiddleware(listVideoThreadComments) ) videoCommentRouter.post('/:videoId/comment-threads', authenticate, asyncMiddleware(addVideoCommentThreadValidator), - asyncMiddleware(addVideoCommentThreadRetryWrapper) + asyncRetryTransactionMiddleware(addVideoCommentThread) ) videoCommentRouter.post('/:videoId/comments/:commentId', authenticate, asyncMiddleware(addVideoCommentReplyValidator), - asyncMiddleware(addVideoCommentReplyRetryWrapper) + asyncRetryTransactionMiddleware(addVideoCommentReply) +) +videoCommentRouter.delete('/:videoId/comments/:commentId', + authenticate, + asyncMiddleware(removeVideoCommentValidator), + asyncRetryTransactionMiddleware(removeVideoComment) ) // --------------------------------------------------------------------------- @@ -45,70 +72,128 @@ export { // --------------------------------------------------------------------------- -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) +async function listVideoThreads (req: express.Request, res: express.Response) { + const video = res.locals.onlyVideo + const user = res.locals.oauth ? res.locals.oauth.token.User : undefined + + let resultList: ResultList + + if (video.commentsEnabled === true) { + const apiOptions = await Hooks.wrapObject({ + videoId: video.id, + start: req.query.start, + count: req.query.count, + sort: req.query.sort, + user + }, 'filter:api.video-threads.list.params') + + resultList = await Hooks.wrapPromiseFun( + VideoCommentModel.listThreadsForApi, + apiOptions, + 'filter:api.video-threads.list.result' + ) + } else { + resultList = { + total: 0, + data: [] + } + } 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.' +async function listVideoThreadComments (req: express.Request, res: express.Response) { + const video = res.locals.onlyVideo + const user = res.locals.oauth ? res.locals.oauth.token.User : undefined + + let resultList: ResultList + + if (video.commentsEnabled === true) { + const apiOptions = await Hooks.wrapObject({ + videoId: video.id, + threadId: res.locals.videoCommentThread.id, + user + }, 'filter:api.video-thread-comments.list.params') + + resultList = await Hooks.wrapPromiseFun( + VideoCommentModel.listThreadCommentsForApi, + apiOptions, + 'filter:api.video-thread-comments.list.result' + ) + } else { + resultList = { + total: 0, + data: [] + } } - const comment = await retryTransactionWrapper(addVideoCommentThread, options) - - res.json({ - comment: { - id: comment.id - } - }).end() + return res.json(buildFormattedCommentTree(resultList)) } -function addVideoCommentThread (req: express.Request, res: express.Response) { +async function addVideoCommentThread (req: express.Request, res: express.Response) { const videoCommentInfo: VideoCommentCreate = req.body - return sequelizeTypescript.transaction(async t => { + const comment = await sequelizeTypescript.transaction(async t => { + const account = await AccountModel.load(res.locals.oauth.token.User.Account.id, t) + return createVideoComment({ text: videoCommentInfo.text, inReplyToComment: null, - video: res.locals.video, - actorId: res.locals.oauth.token.User.Account.Actor.id + video: res.locals.videoAll, + account }, 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.' - } + Notifier.Instance.notifyOnNewComment(comment) + auditLogger.create(getAuditIdFromRes(res), new CommentAuditView(comment.toFormattedJSON())) - const comment = await retryTransactionWrapper(addVideoCommentReply, options) + Hooks.runAction('action:api.video-thread.created', { comment }) - res.json({ - comment: { - id: comment.id - } + return res.json({ + comment: comment.toFormattedJSON() }).end() } -function addVideoCommentReply (req: express.Request, res: express.Response, next: express.NextFunction) { +async function addVideoCommentReply (req: express.Request, res: express.Response) { const videoCommentInfo: VideoCommentCreate = req.body - return sequelizeTypescript.transaction(async t => { + const comment = await sequelizeTypescript.transaction(async t => { + const account = await AccountModel.load(res.locals.oauth.token.User.Account.id, t) + return createVideoComment({ text: videoCommentInfo.text, - inReplyToComment: res.locals.videoComment.id, - video: res.locals.video, - actorId: res.locals.oauth.token.User.Account.Actor.id + inReplyToComment: res.locals.videoCommentFull, + video: res.locals.videoAll, + account }, t) }) + + Notifier.Instance.notifyOnNewComment(comment) + auditLogger.create(getAuditIdFromRes(res), new CommentAuditView(comment.toFormattedJSON())) + + Hooks.runAction('action:api.video-comment-reply.created', { comment }) + + return res.json({ comment: comment.toFormattedJSON() }).end() +} + +async function removeVideoComment (req: express.Request, res: express.Response) { + const videoCommentInstance = res.locals.videoCommentFull + const videoCommentInstanceBefore = cloneDeep(videoCommentInstance) + + await sequelizeTypescript.transaction(async t => { + if (videoCommentInstance.isOwned() || videoCommentInstance.Video.isOwned()) { + await sendDeleteVideoComment(videoCommentInstance, t) + } + + markCommentAsDeleted(videoCommentInstance) + + await videoCommentInstance.save() + }) + + auditLogger.delete(getAuditIdFromRes(res), new CommentAuditView(videoCommentInstance.toFormattedJSON())) + logger.info('Video comment %d deleted.', videoCommentInstance.id) + + Hooks.runAction('action:api.video-comment.deleted', { comment: videoCommentInstanceBefore }) + + return res.type('json').status(204).end() }