X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Fcomment.ts;h=cfdf2773f634b145c955165610a0d313b1f1eea0;hb=eb34ec30e0b57286fc6f85160490d2e973a3b0b1;hp=a95392543e1bce89b8b7a608b0460cca57e24e11;hpb=b4055e1c23eeefb0c8a85a77f312b2827d98f483;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/comment.ts b/server/controllers/api/videos/comment.ts index a95392543..cfdf2773f 100644 --- a/server/controllers/api/videos/comment.ts +++ b/server/controllers/api/videos/comment.ts @@ -1,14 +1,18 @@ import * as express from 'express' -import { ResultList } from '../../../../shared/models' -import { VideoCommentCreate } from '../../../../shared/models/videos/video-comment.model' -import { logger } from '../../../helpers/logger' +import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' +import { ResultList, ThreadsResultList, UserRight } from '../../../../shared/models' +import { VideoCommentCreate } from '../../../../shared/models/videos/comment/video-comment.model' +import { auditLoggerFactory, CommentAuditView, getAuditIdFromRes } from '../../../helpers/audit-logger' import { getFormattedObjects } from '../../../helpers/utils' -import { sequelizeTypescript } from '../../../initializers' -import { buildFormattedCommentTree, createVideoComment } from '../../../lib/video-comment' +import { sequelizeTypescript } from '../../../initializers/database' +import { Notifier } from '../../../lib/notifier' +import { Hooks } from '../../../lib/plugins/hooks' +import { buildFormattedCommentTree, createVideoComment, removeComment } from '../../../lib/video-comment' import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, + ensureUserHasRight, optionalAuthenticate, paginationValidator, setDefaultPagination, @@ -17,16 +21,15 @@ import { import { addVideoCommentReplyValidator, addVideoCommentThreadValidator, + listVideoCommentsValidator, listVideoCommentThreadsValidator, listVideoThreadCommentsValidator, removeVideoCommentValidator, + videoCommentsValidator, 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 { VideoCommentModel } from '../../../models/video/video-comment' const auditLogger = auditLoggerFactory('comments') const videoCommentRouter = express.Router() @@ -62,6 +65,17 @@ videoCommentRouter.delete('/:videoId/comments/:commentId', asyncRetryTransactionMiddleware(removeVideoComment) ) +videoCommentRouter.get('/comments', + authenticate, + ensureUserHasRight(UserRight.SEE_ALL_COMMENTS), + paginationValidator, + videoCommentsValidator, + setDefaultSort, + setDefaultPagination, + listVideoCommentsValidator, + asyncMiddleware(listComments) +) + // --------------------------------------------------------------------------- export { @@ -70,37 +84,63 @@ export { // --------------------------------------------------------------------------- +async function listComments (req: express.Request, res: express.Response) { + const options = { + start: req.query.start, + count: req.query.count, + sort: req.query.sort, + + isLocal: req.query.isLocal, + search: req.query.search, + searchAccount: req.query.searchAccount, + searchVideo: req.query.searchVideo + } + + const resultList = await VideoCommentModel.listCommentsForApi(options) + + return res.json({ + total: resultList.total, + data: resultList.data.map(c => c.toFormattedAdminJSON()) + }) +} + async function listVideoThreads (req: express.Request, res: express.Response) { - const video = res.locals.video + const video = res.locals.onlyVideo const user = res.locals.oauth ? res.locals.oauth.token.User : undefined - let resultList: ResultList + let resultList: ThreadsResultList if (video.commentsEnabled === true) { const apiOptions = await Hooks.wrapObject({ videoId: video.id, + isVideoOwned: video.isOwned(), start: req.query.start, count: req.query.count, sort: req.query.sort, - user: user + user }, 'filter:api.video-threads.list.params') - resultList = await Hooks.wrapPromise( - VideoCommentModel.listThreadsForApi(apiOptions), + resultList = await Hooks.wrapPromiseFun( + VideoCommentModel.listThreadsForApi, + apiOptions, 'filter:api.video-threads.list.result' ) } else { resultList = { total: 0, + totalNotDeletedComments: 0, data: [] } } - return res.json(getFormattedObjects(resultList.data, resultList.total)) + return res.json({ + ...getFormattedObjects(resultList.data, resultList.total), + totalNotDeletedComments: resultList.totalNotDeletedComments + }) } async function listVideoThreadComments (req: express.Request, res: express.Response) { - const video = res.locals.video + const video = res.locals.onlyVideo const user = res.locals.oauth ? res.locals.oauth.token.User : undefined let resultList: ResultList @@ -108,12 +148,14 @@ async function listVideoThreadComments (req: express.Request, res: express.Respo if (video.commentsEnabled === true) { const apiOptions = await Hooks.wrapObject({ videoId: video.id, + isVideoOwned: video.isOwned(), threadId: res.locals.videoCommentThread.id, - user: user + user }, 'filter:api.video-thread-comments.list.params') - resultList = await Hooks.wrapPromise( - VideoCommentModel.listThreadCommentsForApi(apiOptions), + resultList = await Hooks.wrapPromiseFun( + VideoCommentModel.listThreadCommentsForApi, + apiOptions, 'filter:api.video-thread-comments.list.result' ) } else { @@ -123,6 +165,10 @@ async function listVideoThreadComments (req: express.Request, res: express.Respo } } + if (resultList.data.length === 0) { + return res.sendStatus(HttpStatusCode.NOT_FOUND_404) + } + return res.json(buildFormattedCommentTree(resultList)) } @@ -135,7 +181,7 @@ async function addVideoCommentThread (req: express.Request, res: express.Respons return createVideoComment({ text: videoCommentInfo.text, inReplyToComment: null, - video: res.locals.video, + video: res.locals.videoAll, account }, t) }) @@ -145,9 +191,7 @@ async function addVideoCommentThread (req: express.Request, res: express.Respons Hooks.runAction('action:api.video-thread.created', { comment }) - return res.json({ - comment: comment.toFormattedJSON() - }).end() + return res.json({ comment: comment.toFormattedJSON() }) } async function addVideoCommentReply (req: express.Request, res: express.Response) { @@ -158,8 +202,8 @@ async function addVideoCommentReply (req: express.Request, res: express.Response return createVideoComment({ text: videoCommentInfo.text, - inReplyToComment: res.locals.videoComment, - video: res.locals.video, + inReplyToComment: res.locals.videoCommentFull, + video: res.locals.videoAll, account }, t) }) @@ -169,20 +213,17 @@ async function addVideoCommentReply (req: express.Request, res: express.Response Hooks.runAction('action:api.video-comment-reply.created', { comment }) - return res.json({ comment: comment.toFormattedJSON() }).end() + return res.json({ comment: comment.toFormattedJSON() }) } async function removeVideoComment (req: express.Request, res: express.Response) { - const videoCommentInstance = res.locals.videoComment + const videoCommentInstance = res.locals.videoCommentFull - await sequelizeTypescript.transaction(async t => { - await videoCommentInstance.destroy({ transaction: t }) - }) + await removeComment(videoCommentInstance) auditLogger.delete(getAuditIdFromRes(res), new CommentAuditView(videoCommentInstance.toFormattedJSON())) - logger.info('Video comment %d deleted.', videoCommentInstance.id) - - Hooks.runAction('action:api.video-comment.deleted', { comment: videoCommentInstance }) - return res.type('json').status(204).end() + return res.type('json') + .status(HttpStatusCode.NO_CONTENT_204) + .end() }