import * as express from 'express'
-import { UserRight, VideoAbuseCreate, VideoAbuseState } from '../../../../shared'
+import { UserRight, VideoAbuseCreate, VideoAbuseState, VideoAbuse } from '../../../../shared'
import { logger } from '../../../helpers/logger'
import { getFormattedObjects } from '../../../helpers/utils'
-import { sequelizeTypescript } from '../../../initializers'
+import { sequelizeTypescript } from '../../../initializers/database'
import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
videoAbuseGetValidator,
videoAbuseReportValidator,
videoAbusesSortValidator,
- videoAbuseUpdateValidator
+ videoAbuseUpdateValidator,
+ videoAbuseListValidator
} from '../../../middlewares'
import { AccountModel } from '../../../models/account/account'
import { VideoAbuseModel } from '../../../models/video/video-abuse'
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'
const auditLogger = auditLoggerFactory('abuse')
const abuseVideoRouter = express.Router()
videoAbusesSortValidator,
setDefaultSort,
setDefaultPagination,
+ videoAbuseListValidator,
asyncMiddleware(listVideoAbuses)
)
abuseVideoRouter.put('/:videoId/abuse/:id',
// ---------------------------------------------------------------------------
async function listVideoAbuses (req: express.Request, res: express.Response) {
- const resultList = await VideoAbuseModel.listForApi(req.query.start, req.query.count, req.query.sort)
+ const user = res.locals.oauth.token.user
+ const serverActor = await getServerActor()
+
+ const resultList = await VideoAbuseModel.listForApi({
+ start: req.query.start,
+ count: req.query.count,
+ sort: req.query.sort,
+ id: req.query.id,
+ search: req.query.search,
+ state: req.query.state,
+ videoIs: req.query.videoIs,
+ searchReporter: req.query.searchReporter,
+ searchReportee: req.query.searchReportee,
+ searchVideo: req.query.searchVideo,
+ searchVideoChannel: req.query.searchVideoChannel,
+ serverAccountId: serverActor.Account.id,
+ user
+ })
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
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 videoAbuse = await sequelizeTypescript.transaction(async t => {
- const reporterAccount = await AccountModel.load(res.locals.oauth.token.User.Account.id, t)
+ const videoAbuseInstance = await sequelizeTypescript.transaction(async t => {
+ reporterAccount = await AccountModel.load(res.locals.oauth.token.User.Account.id, t)
const abuseToCreate = {
reporterAccountId: reporterAccount.id,
await sendVideoAbuse(reporterAccount.Actor, videoAbuseInstance, videoInstance, t)
}
- auditLogger.create(reporterAccount.Actor.getIdentifier(), new VideoAbuseAuditView(videoAbuseInstance.toFormattedJSON()))
+ videoAbuseJSON = videoAbuseInstance.toFormattedJSON()
+ auditLogger.create(reporterAccount.Actor.getIdentifier(), new VideoAbuseAuditView(videoAbuseJSON))
return videoAbuseInstance
})
- Notifier.Instance.notifyOnNewVideoAbuse(videoAbuse)
+ Notifier.Instance.notifyOnNewVideoAbuse({
+ videoAbuse: videoAbuseJSON,
+ videoAbuseInstance,
+ reporter: reporterAccount.Actor.getIdentifier()
+ })
logger.info('Abuse report for video %s created.', videoInstance.name)
- return res.json({ videoAbuse: videoAbuse.toFormattedJSON() }).end()
+ return res.json({ videoAbuse: videoAbuseJSON }).end()
}