import * as express from 'express'
-import { waterfall } from 'async'
import { database as db } from '../../../initializers/database'
import * as friends from '../../../lib/friends'
import {
logger,
- getFormatedObjects,
- retryTransactionWrapper,
- startSerializableTransaction,
- commitTransaction,
- rollbackTransaction
+ getFormattedObjects,
+ retryTransactionWrapper
} from '../../../helpers'
import {
authenticate,
- ensureIsAdmin,
+ ensureUserHasRight,
paginationValidator,
videoAbuseReportValidator,
videoAbusesSortValidator,
setVideoAbusesSort,
- setPagination
+ setPagination,
+ asyncMiddleware
} from '../../../middlewares'
+import { VideoInstance } from '../../../models'
+import { VideoAbuseCreate, UserRight } from '../../../../shared'
const abuseVideoRouter = express.Router()
abuseVideoRouter.get('/abuse',
authenticate,
- ensureIsAdmin,
+ ensureUserHasRight(UserRight.MANAGE_VIDEO_ABUSES),
paginationValidator,
videoAbusesSortValidator,
setVideoAbusesSort,
setPagination,
- listVideoAbuses
+ asyncMiddleware(listVideoAbuses)
)
abuseVideoRouter.post('/:id/abuse',
authenticate,
videoAbuseReportValidator,
- reportVideoAbuseRetryWrapper
+ asyncMiddleware(reportVideoAbuseRetryWrapper)
)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function listVideoAbuses (req, res, next) {
- db.VideoAbuse.listForApi(req.query.start, req.query.count, req.query.sort, function (err, abusesList, abusesTotal) {
- if (err) return next(err)
+async function listVideoAbuses (req: express.Request, res: express.Response, next: express.NextFunction) {
+ const resultList = await db.VideoAbuse.listForApi(req.query.start, req.query.count, req.query.sort)
- res.json(getFormatedObjects(abusesList, abusesTotal))
- })
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
}
-function reportVideoAbuseRetryWrapper (req, res, next) {
+async function reportVideoAbuseRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
const options = {
arguments: [ req, res ],
errorMessage: 'Cannot report abuse to the video with many retries.'
}
- retryTransactionWrapper(reportVideoAbuse, options, function (err) {
- if (err) return next(err)
+ await retryTransactionWrapper(reportVideoAbuse, options)
- return res.type('json').status(204).end()
- })
+ return res.type('json').status(204).end()
}
-function reportVideoAbuse (req, res, finalCallback) {
- const videoInstance = res.locals.video
+async function reportVideoAbuse (req: express.Request, res: express.Response) {
+ const videoInstance = res.locals.video as VideoInstance
const reporterUsername = res.locals.oauth.token.User.username
+ const body: VideoAbuseCreate = req.body
- const abuse = {
+ const abuseToCreate = {
reporterUsername,
- reason: req.body.reason,
+ reason: body.reason,
videoId: videoInstance.id,
reporterPodId: null // This is our pod that reported this abuse
}
- waterfall([
-
- startSerializableTransaction,
-
- function createAbuse (t, callback) {
- db.VideoAbuse.create(abuse).asCallback(function (err, abuse) {
- return callback(err, t, abuse)
- })
- },
-
- function sendToFriendsIfNeeded (t, abuse, callback) {
- // We send the information to the destination pod
- if (videoInstance.isOwned() === false) {
- const reportData = {
- reporterUsername,
- reportReason: abuse.reason,
- videoRemoteId: videoInstance.remoteId
- }
-
- friends.reportAbuseVideoToFriend(reportData, videoInstance)
+ await db.sequelize.transaction(async t => {
+ const abuse = await db.VideoAbuse.create(abuseToCreate, { transaction: t })
+ // We send the information to the destination pod
+ if (videoInstance.isOwned() === false) {
+ const reportData = {
+ reporterUsername,
+ reportReason: abuse.reason,
+ videoUUID: videoInstance.uuid
}
- return callback(null, t)
- },
-
- commitTransaction
-
- ], function andFinally (err, t) {
- if (err) {
- logger.debug('Cannot update the video.', { error: err })
- return rollbackTransaction(err, t, finalCallback)
+ await friends.reportAbuseVideoToFriend(reportData, videoInstance, t)
}
-
- logger.info('Abuse report for video %s created.', videoInstance.name)
- return finalCallback(null)
})
+
+ logger.info('Abuse report for video %s created.', videoInstance.name)
}