X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Fcomment.ts;h=44d64776c60a351232c4ea9b3cf547a2f3c28b81;hb=44e702ded455c118f9908b70d25e7c7e5512abe9;hp=70c1148ba3839945a4a45a5d9556f66d5bb486b0;hpb=73471b1a52f242e86364ffb077ea6cadb3b07ae2;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/comment.ts b/server/controllers/api/videos/comment.ts index 70c1148ba..44d64776c 100644 --- a/server/controllers/api/videos/comment.ts +++ b/server/controllers/api/videos/comment.ts @@ -1,14 +1,19 @@ -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 express from 'express' +import { ResultList, ThreadsResultList, UserRight, VideoCommentCreate } from '../../../../shared/models' +import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes' +import { VideoCommentThreads } 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, optionalAuthenticate, + authenticate, + ensureUserHasRight, + optionalAuthenticate, paginationValidator, setDefaultPagination, setDefaultSort @@ -16,17 +21,15 @@ import { import { addVideoCommentReplyValidator, addVideoCommentThreadValidator, + listVideoCommentsValidator, listVideoCommentThreadsValidator, listVideoThreadCommentsValidator, removeVideoCommentValidator, + videoCommentsValidator, videoCommentThreadsSortValidator } from '../../../middlewares/validators' -import { VideoModel } from '../../../models/video/video' -import { VideoCommentModel } from '../../../models/video/video-comment' -import { auditLoggerFactory, CommentAuditView, getAuditIdFromRes } from '../../../helpers/audit-logger' import { AccountModel } from '../../../models/account/account' -import { UserModel } from '../../../models/account/user' -import { Notifier } from '../../../lib/notifier' +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,32 +84,81 @@ export { // --------------------------------------------------------------------------- -async function listVideoThreads (req: express.Request, res: express.Response, next: express.NextFunction) { - const video = res.locals.video as VideoModel - const user: UserModel = res.locals.oauth ? res.locals.oauth.token.User : undefined +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, + onLocalVideo: req.query.onLocalVideo, + search: req.query.search, + searchAccount: req.query.searchAccount, + searchVideo: req.query.searchVideo + } - let resultList: ResultList + 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.onlyVideo + const user = res.locals.oauth ? res.locals.oauth.token.User : undefined + + let resultList: ThreadsResultList if (video.commentsEnabled === true) { - resultList = await VideoCommentModel.listThreadsForApi(video.id, req.query.start, req.query.count, req.query.sort, user) + const apiOptions = await Hooks.wrapObject({ + videoId: video.id, + isVideoOwned: video.isOwned(), + 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, + totalNotDeletedComments: 0, data: [] } } - return res.json(getFormattedObjects(resultList.data, resultList.total)) + return res.json({ + ...getFormattedObjects(resultList.data, resultList.total), + totalNotDeletedComments: resultList.totalNotDeletedComments + } as VideoCommentThreads) } -async function listVideoThreadComments (req: express.Request, res: express.Response, next: express.NextFunction) { - const video = res.locals.video as VideoModel - const user: UserModel = res.locals.oauth ? res.locals.oauth.token.User : undefined +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) { - resultList = await VideoCommentModel.listThreadCommentsForApi(video.id, res.locals.videoCommentThread.id, user) + const apiOptions = await Hooks.wrapObject({ + videoId: video.id, + isVideoOwned: video.isOwned(), + 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, @@ -103,6 +166,13 @@ async function listVideoThreadComments (req: express.Request, res: express.Respo } } + if (resultList.data.length === 0) { + return res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: 'No comments were found' + }) + } + return res.json(buildFormattedCommentTree(resultList)) } @@ -110,12 +180,12 @@ async function addVideoCommentThread (req: express.Request, res: express.Respons const videoCommentInfo: VideoCommentCreate = req.body const comment = await sequelizeTypescript.transaction(async t => { - const account = await AccountModel.load((res.locals.oauth.token.User as UserModel).Account.id, 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, + video: res.locals.videoAll, account }, t) }) @@ -123,21 +193,21 @@ async function addVideoCommentThread (req: express.Request, res: express.Respons Notifier.Instance.notifyOnNewComment(comment) auditLogger.create(getAuditIdFromRes(res), new CommentAuditView(comment.toFormattedJSON())) - return res.json({ - comment: comment.toFormattedJSON() - }).end() + Hooks.runAction('action:api.video-thread.created', { comment, req, res }) + + return res.json({ comment: comment.toFormattedJSON() }) } async function addVideoCommentReply (req: express.Request, res: express.Response) { const videoCommentInfo: VideoCommentCreate = req.body const comment = await sequelizeTypescript.transaction(async t => { - const account = await AccountModel.load((res.locals.oauth.token.User as UserModel).Account.id, t) + const account = await AccountModel.load(res.locals.oauth.token.User.Account.id, t) return createVideoComment({ text: videoCommentInfo.text, - inReplyToComment: res.locals.videoComment, - video: res.locals.video, + inReplyToComment: res.locals.videoCommentFull, + video: res.locals.videoAll, account }, t) }) @@ -145,21 +215,19 @@ async function addVideoCommentReply (req: express.Request, res: express.Response Notifier.Instance.notifyOnNewComment(comment) auditLogger.create(getAuditIdFromRes(res), new CommentAuditView(comment.toFormattedJSON())) - return res.json({ comment: comment.toFormattedJSON() }).end() + Hooks.runAction('action:api.video-comment-reply.created', { comment, req, res }) + + return res.json({ comment: comment.toFormattedJSON() }) } async function removeVideoComment (req: express.Request, res: express.Response) { - const videoCommentInstance: VideoCommentModel = res.locals.videoComment + const videoCommentInstance = res.locals.videoCommentFull - await sequelizeTypescript.transaction(async t => { - await videoCommentInstance.destroy({ transaction: t }) - }) + await removeComment(videoCommentInstance, req, res) - auditLogger.delete( - getAuditIdFromRes(res), - new CommentAuditView(videoCommentInstance.toFormattedJSON()) - ) - logger.info('Video comment %d deleted.', videoCommentInstance.id) + auditLogger.delete(getAuditIdFromRes(res), new CommentAuditView(videoCommentInstance.toFormattedJSON())) - return res.type('json').status(204).end() + return res.type('json') + .status(HttpStatusCode.NO_CONTENT_204) + .end() }