import * as express from 'express'
-import { UserRight, VideoAbuseCreate, VideoAbuseState, VideoAbuse } from '../../../../shared'
-import { logger } from '../../../helpers/logger'
-import { getFormattedObjects } from '../../../helpers/utils'
-import { sequelizeTypescript } from '../../../initializers/database'
+import { AbuseModel } from '@server/models/abuse/abuse'
+import { getServerActor } from '@server/models/application/application'
+import { AbuseCreate, UserRight, VideoAbuseCreate } from '../../../../shared'
import {
+ abusesSortValidator,
asyncMiddleware,
asyncRetryTransactionMiddleware,
authenticate,
setDefaultPagination,
setDefaultSort,
videoAbuseGetValidator,
+ videoAbuseListValidator,
videoAbuseReportValidator,
- videoAbusesSortValidator,
- videoAbuseUpdateValidator,
- videoAbuseListValidator
+ videoAbuseUpdateValidator
} from '../../../middlewares'
-import { AccountModel } from '../../../models/account/account'
-import { VideoAbuseModel } from '../../../models/video/video-abuse'
-import { auditLoggerFactory, VideoAbuseAuditView } from '../../../helpers/audit-logger'
-import { Notifier } from '../../../lib/notifier'
-import { sendVideoAbuse } from '../../../lib/activitypub/send/send-flag'
-import { MVideoAbuseAccountVideo } from '../../../typings/models/video'
-import { getServerActor } from '@server/models/application/application'
-import { MAccountDefault } from '@server/typings/models'
+import { deleteAbuse, reportAbuse, updateAbuse } from '../abuse'
+
+// FIXME: deprecated in 2.3. Remove this controller
-const auditLogger = auditLoggerFactory('abuse')
const abuseVideoRouter = express.Router()
abuseVideoRouter.get('/abuse',
authenticate,
- ensureUserHasRight(UserRight.MANAGE_VIDEO_ABUSES),
+ ensureUserHasRight(UserRight.MANAGE_ABUSES),
paginationValidator,
- videoAbusesSortValidator,
+ abusesSortValidator,
setDefaultSort,
setDefaultPagination,
videoAbuseListValidator,
)
abuseVideoRouter.put('/:videoId/abuse/:id',
authenticate,
- ensureUserHasRight(UserRight.MANAGE_VIDEO_ABUSES),
+ ensureUserHasRight(UserRight.MANAGE_ABUSES),
asyncMiddleware(videoAbuseUpdateValidator),
asyncRetryTransactionMiddleware(updateVideoAbuse)
)
)
abuseVideoRouter.delete('/:videoId/abuse/:id',
authenticate,
- ensureUserHasRight(UserRight.MANAGE_VIDEO_ABUSES),
+ ensureUserHasRight(UserRight.MANAGE_ABUSES),
asyncMiddleware(videoAbuseGetValidator),
asyncRetryTransactionMiddleware(deleteVideoAbuse)
)
const user = res.locals.oauth.token.user
const serverActor = await getServerActor()
- const resultList = await VideoAbuseModel.listForApi({
+ const resultList = await AbuseModel.listForAdminApi({
start: req.query.start,
count: req.query.count,
sort: req.query.sort,
id: req.query.id,
+ filter: 'video',
+ predefinedReason: req.query.predefinedReason,
search: req.query.search,
state: req.query.state,
videoIs: req.query.videoIs,
user
})
- return res.json(getFormattedObjects(resultList.data, resultList.total))
+ return res.json({
+ total: resultList.total,
+ data: resultList.data.map(d => d.toFormattedAdminJSON())
+ })
}
async function updateVideoAbuse (req: express.Request, res: express.Response) {
- const videoAbuse = res.locals.videoAbuse
-
- if (req.body.moderationComment !== undefined) videoAbuse.moderationComment = req.body.moderationComment
- if (req.body.state !== undefined) videoAbuse.state = req.body.state
-
- await sequelizeTypescript.transaction(t => {
- return videoAbuse.save({ transaction: t })
- })
-
- // Do not send the delete to other instances, we updated OUR copy of this video abuse
-
- return res.type('json').status(204).end()
+ return updateAbuse(req, res)
}
async function deleteVideoAbuse (req: express.Request, res: express.Response) {
- const videoAbuse = res.locals.videoAbuse
-
- await sequelizeTypescript.transaction(t => {
- return videoAbuse.destroy({ transaction: t })
- })
-
- // Do not send the delete to other instances, we delete OUR copy of this video abuse
-
- return res.type('json').status(204).end()
+ return deleteAbuse(req, res)
}
async function reportVideoAbuse (req: express.Request, res: express.Response) {
- const videoInstance = res.locals.videoAll
- const body: VideoAbuseCreate = req.body
- let reporterAccount: MAccountDefault
- let videoAbuseJSON: VideoAbuse
-
- const videoAbuseInstance = await sequelizeTypescript.transaction(async t => {
- reporterAccount = await AccountModel.load(res.locals.oauth.token.User.Account.id, t)
-
- const abuseToCreate = {
- reporterAccountId: reporterAccount.id,
- reason: body.reason,
- videoId: videoInstance.id,
- state: VideoAbuseState.PENDING
- }
-
- const videoAbuseInstance: MVideoAbuseAccountVideo = await VideoAbuseModel.create(abuseToCreate, { transaction: t })
- videoAbuseInstance.Video = videoInstance
- videoAbuseInstance.Account = reporterAccount
+ const oldBody = req.body as VideoAbuseCreate
- // We send the video abuse to the origin server
- if (videoInstance.isOwned() === false) {
- await sendVideoAbuse(reporterAccount.Actor, videoAbuseInstance, videoInstance, t)
- }
+ req.body = {
+ accountId: res.locals.videoAll.VideoChannel.accountId,
- videoAbuseJSON = videoAbuseInstance.toFormattedJSON()
- auditLogger.create(reporterAccount.Actor.getIdentifier(), new VideoAbuseAuditView(videoAbuseJSON))
+ reason: oldBody.reason,
+ predefinedReasons: oldBody.predefinedReasons,
- return videoAbuseInstance
- })
-
- Notifier.Instance.notifyOnNewVideoAbuse({
- videoAbuse: videoAbuseJSON,
- videoAbuseInstance,
- reporter: reporterAccount.Actor.getIdentifier()
- })
-
- logger.info('Abuse report for video %s created.', videoInstance.name)
+ video: {
+ id: res.locals.videoAll.id,
+ startAt: oldBody.startAt,
+ endAt: oldBody.endAt
+ }
+ } as AbuseCreate
- return res.json({ videoAbuse: videoAbuseJSON }).end()
+ return reportAbuse(req, res)
}