From 444c0a0e017824fb4ce526281a22c4abe0a13c50 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 14 May 2020 16:56:15 +0200 Subject: Add ability to bulk delete comments --- server/controllers/api/bulk.ts | 41 ++++++++++++++++++++++++++++++++ server/controllers/api/index.ts | 20 +++++++++------- server/controllers/api/videos/comment.ts | 35 +++++++-------------------- 3 files changed, 61 insertions(+), 35 deletions(-) create mode 100644 server/controllers/api/bulk.ts (limited to 'server/controllers') diff --git a/server/controllers/api/bulk.ts b/server/controllers/api/bulk.ts new file mode 100644 index 000000000..1fe139c92 --- /dev/null +++ b/server/controllers/api/bulk.ts @@ -0,0 +1,41 @@ +import * as express from 'express' +import { asyncMiddleware, authenticate } from '../../middlewares' +import { bulkRemoveCommentsOfValidator } from '@server/middlewares/validators/bulk' +import { VideoCommentModel } from '@server/models/video/video-comment' +import { BulkRemoveCommentsOfBody } from '@shared/models/bulk/bulk-remove-comments-of-body.model' +import { removeComment } from '@server/lib/video-comment' + +const bulkRouter = express.Router() + +bulkRouter.post('/remove-comments-of', + authenticate, + asyncMiddleware(bulkRemoveCommentsOfValidator), + asyncMiddleware(bulkRemoveCommentsOf) +) + +// --------------------------------------------------------------------------- + +export { + bulkRouter +} + +// --------------------------------------------------------------------------- + +async function bulkRemoveCommentsOf (req: express.Request, res: express.Response) { + const account = res.locals.account + const body = req.body as BulkRemoveCommentsOfBody + const user = res.locals.oauth.token.User + + const filter = body.scope === 'my-videos' + ? { onVideosOfAccount: user.Account } + : {} + + const comments = await VideoCommentModel.listForBulkDelete(account, filter) + + // Don't wait result + res.sendStatus(204) + + for (const comment of comments) { + await removeComment(comment) + } +} diff --git a/server/controllers/api/index.ts b/server/controllers/api/index.ts index 7bec6c527..c334a26b4 100644 --- a/server/controllers/api/index.ts +++ b/server/controllers/api/index.ts @@ -1,20 +1,21 @@ +import * as cors from 'cors' import * as express from 'express' +import * as RateLimit from 'express-rate-limit' +import { badRequest } from '../../helpers/express-utils' +import { CONFIG } from '../../initializers/config' +import { accountsRouter } from './accounts' +import { bulkRouter } from './bulk' import { configRouter } from './config' import { jobsRouter } from './jobs' import { oauthClientsRouter } from './oauth-clients' +import { overviewsRouter } from './overviews' +import { pluginRouter } from './plugins' +import { searchRouter } from './search' import { serverRouter } from './server' import { usersRouter } from './users' -import { accountsRouter } from './accounts' -import { videosRouter } from './videos' -import { badRequest } from '../../helpers/express-utils' import { videoChannelRouter } from './video-channel' -import * as cors from 'cors' -import { searchRouter } from './search' -import { overviewsRouter } from './overviews' import { videoPlaylistRouter } from './video-playlist' -import { CONFIG } from '../../initializers/config' -import { pluginRouter } from './plugins' -import * as RateLimit from 'express-rate-limit' +import { videosRouter } from './videos' const apiRouter = express.Router() @@ -31,6 +32,7 @@ const apiRateLimiter = RateLimit({ apiRouter.use(apiRateLimiter) apiRouter.use('/server', serverRouter) +apiRouter.use('/bulk', bulkRouter) apiRouter.use('/oauth-clients', oauthClientsRouter) apiRouter.use('/config', configRouter) apiRouter.use('/users', usersRouter) diff --git a/server/controllers/api/videos/comment.ts b/server/controllers/api/videos/comment.ts index 5070bb3c0..bdd3cf9e2 100644 --- a/server/controllers/api/videos/comment.ts +++ b/server/controllers/api/videos/comment.ts @@ -1,11 +1,12 @@ import * as express from 'express' -import { cloneDeep } from 'lodash' import { ResultList } from '../../../../shared/models' import { VideoCommentCreate } from '../../../../shared/models/videos/video-comment.model' -import { logger } from '../../../helpers/logger' +import { auditLoggerFactory, CommentAuditView, getAuditIdFromRes } from '../../../helpers/audit-logger' import { getFormattedObjects } from '../../../helpers/utils' import { sequelizeTypescript } from '../../../initializers/database' -import { buildFormattedCommentTree, createVideoComment, markCommentAsDeleted } from '../../../lib/video-comment' +import { Notifier } from '../../../lib/notifier' +import { Hooks } from '../../../lib/plugins/hooks' +import { buildFormattedCommentTree, createVideoComment, removeComment } from '../../../lib/video-comment' import { asyncMiddleware, asyncRetryTransactionMiddleware, @@ -23,12 +24,8 @@ import { 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' +import { VideoCommentModel } from '../../../models/video/video-comment' const auditLogger = auditLoggerFactory('comments') const videoCommentRouter = express.Router() @@ -149,9 +146,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) { @@ -173,27 +168,15 @@ 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.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() - }) + 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: videoCommentInstanceBefore }) - return res.type('json').status(204).end() + return res.type('json').status(204) } -- cgit v1.2.3