import * as express from 'express'
-
-import { database as db } from '../../../initializers/database'
-import {
- logger,
- getFormattedObjects,
- retryTransactionWrapper
-} from '../../../helpers'
+import { UserRight, VideoAbuseCreate } from '../../../../shared'
+import { logger } from '../../../helpers/logger'
+import { getFormattedObjects } from '../../../helpers/utils'
+import { sequelizeTypescript } from '../../../initializers'
+import { sendVideoAbuse } from '../../../lib/activitypub/send'
import {
+ asyncMiddleware,
+ asyncRetryTransactionMiddleware,
authenticate,
ensureUserHasRight,
paginationValidator,
+ setDefaultPagination,
+ setDefaultSort,
videoAbuseReportValidator,
- videoAbusesSortValidator,
- setVideoAbusesSort,
- setPagination,
- asyncMiddleware
+ videoAbusesSortValidator
} from '../../../middlewares'
-import { VideoInstance } from '../../../models'
-import { VideoAbuseCreate, UserRight } from '../../../../shared'
-import { sendVideoAbuse } from '../../../lib/index'
+import { AccountModel } from '../../../models/account/account'
+import { VideoModel } from '../../../models/video/video'
+import { VideoAbuseModel } from '../../../models/video/video-abuse'
const abuseVideoRouter = express.Router()
ensureUserHasRight(UserRight.MANAGE_VIDEO_ABUSES),
paginationValidator,
videoAbusesSortValidator,
- setVideoAbusesSort,
- setPagination,
+ setDefaultSort,
+ setDefaultPagination,
asyncMiddleware(listVideoAbuses)
)
abuseVideoRouter.post('/:id/abuse',
authenticate,
- videoAbuseReportValidator,
- asyncMiddleware(reportVideoAbuseRetryWrapper)
+ asyncMiddleware(videoAbuseReportValidator),
+ asyncRetryTransactionMiddleware(reportVideoAbuse)
)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
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)
+ const resultList = await VideoAbuseModel.listForApi(req.query.start, req.query.count, req.query.sort)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
-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.'
- }
-
- await retryTransactionWrapper(reportVideoAbuse, options)
-
- return res.type('json').status(204).end()
-}
-
async function reportVideoAbuse (req: express.Request, res: express.Response) {
- const videoInstance = res.locals.video as VideoInstance
- const reporterAccount = res.locals.oauth.token.User.Account
+ const videoInstance = res.locals.video as VideoModel
+ const reporterAccount = res.locals.oauth.token.User.Account as AccountModel
const body: VideoAbuseCreate = req.body
const abuseToCreate = {
videoId: videoInstance.id
}
- await db.sequelize.transaction(async t => {
- const videoAbuseInstance = await db.VideoAbuse.create(abuseToCreate, { transaction: t })
+ await sequelizeTypescript.transaction(async t => {
+ const videoAbuseInstance = await VideoAbuseModel.create(abuseToCreate, { transaction: t })
+ videoAbuseInstance.Video = videoInstance
// We send the video abuse to the origin server
if (videoInstance.isOwned() === false) {
- await sendVideoAbuse(reporterAccount, videoAbuseInstance, videoInstance, t)
+ await sendVideoAbuse(reporterAccount.Actor, videoAbuseInstance, videoInstance, t)
}
})
logger.info('Abuse report for video %s created.', videoInstance.name)
+
+ return res.type('json').status(204).end()
}