+import { VideoUploadFile } from 'express'
import { PathLike } from 'fs-extra'
import { Transaction } from 'sequelize/types'
import { AbuseAuditView, auditLoggerFactory } from '@server/helpers/audit-logger'
+import { afterCommitIfTransaction } from '@server/helpers/database-utils'
import { logger } from '@server/helpers/logger'
import { AbuseModel } from '@server/models/abuse/abuse'
import { VideoAbuseModel } from '@server/models/abuse/video-abuse'
import { VideoObject } from '../../shared/models/activitypub/objects'
import { VideoCommentObject } from '../../shared/models/activitypub/objects/video-comment-object'
import { LiveVideoCreate, VideoCreate, VideoImportCreate } from '../../shared/models/videos'
-import { VideoCommentCreate } from '../../shared/models/videos/video-comment.model'
-import { UserModel } from '../models/account/user'
-import { ActorModel } from '../models/activitypub/actor'
+import { VideoCommentCreate } from '../../shared/models/videos/comment'
+import { ActorModel } from '../models/actor/actor'
+import { UserModel } from '../models/user/user'
import { VideoModel } from '../models/video/video'
import { VideoCommentModel } from '../models/video/video-comment'
import { sendAbuse } from './activitypub/send/send-flag'
// Can be filtered by plugins
function isLocalVideoAccepted (object: {
videoBody: VideoCreate
- videoFile: Express.Multer.File & { duration?: number }
+ videoFile: VideoUploadFile
user: UserModel
}): AcceptResult {
return { accepted: true }
endAt: number
transaction: Transaction
reporterAccount: MAccountDefault
+ skipNotification: boolean
}) {
- const { baseAbuse, videoInstance, startAt, endAt, transaction, reporterAccount } = options
+ const { baseAbuse, videoInstance, startAt, endAt, transaction, reporterAccount, skipNotification } = options
const associateFun = async (abuseInstance: MAbuseFull) => {
const videoAbuseInstance: MVideoAbuseVideoFull = await VideoAbuseModel.create({
reporterAccount,
flaggedAccount: videoInstance.VideoChannel.Account,
transaction,
+ skipNotification,
associateFun
})
}
commentInstance: MCommentOwnerVideo
transaction: Transaction
reporterAccount: MAccountDefault
+ skipNotification: boolean
}) {
- const { baseAbuse, commentInstance, transaction, reporterAccount } = options
+ const { baseAbuse, commentInstance, transaction, reporterAccount, skipNotification } = options
const associateFun = async (abuseInstance: MAbuseFull) => {
const commentAbuseInstance: MCommentAbuseAccountVideo = await VideoCommentAbuseModel.create({
reporterAccount,
flaggedAccount: commentInstance.Account,
transaction,
+ skipNotification,
associateFun
})
}
accountInstance: MAccountDefault
transaction: Transaction
reporterAccount: MAccountDefault
+ skipNotification: boolean
}) {
- const { baseAbuse, accountInstance, transaction, reporterAccount } = options
+ const { baseAbuse, accountInstance, transaction, reporterAccount, skipNotification } = options
- const associateFun = async () => {
- return { isOwned: accountInstance.isOwned() }
+ const associateFun = () => {
+ return Promise.resolve({ isOwned: accountInstance.isOwned() })
}
return createAbuse({
reporterAccount,
flaggedAccount: accountInstance,
transaction,
+ skipNotification,
associateFun
})
}
reporterAccount: MAccountDefault
flaggedAccount: MAccountLight
associateFun: (abuseInstance: MAbuseFull) => Promise<{ isOwned: boolean} >
+ skipNotification: boolean
transaction: Transaction
}) {
- const { base, reporterAccount, flaggedAccount, associateFun, transaction } = options
+ const { base, reporterAccount, flaggedAccount, associateFun, transaction, skipNotification } = options
const auditLogger = auditLoggerFactory('abuse')
const abuseAttributes = Object.assign({}, base, { flaggedAccountId: flaggedAccount.id })
const { isOwned } = await associateFun(abuseInstance)
if (isOwned === false) {
- await sendAbuse(reporterAccount.Actor, abuseInstance, abuseInstance.FlaggedAccount, transaction)
+ sendAbuse(reporterAccount.Actor, abuseInstance, abuseInstance.FlaggedAccount, transaction)
}
const abuseJSON = abuseInstance.toFormattedAdminJSON()
auditLogger.create(reporterAccount.Actor.getIdentifier(), new AbuseAuditView(abuseJSON))
- Notifier.Instance.notifyOnNewAbuse({
- abuse: abuseJSON,
- abuseInstance,
- reporter: reporterAccount.Actor.getIdentifier()
- })
+ if (!skipNotification) {
+ afterCommitIfTransaction(transaction, () => {
+ Notifier.Instance.notifyOnNewAbuse({
+ abuse: abuseJSON,
+ abuseInstance,
+ reporter: reporterAccount.Actor.getIdentifier()
+ })
+ })
+ }
logger.info('Abuse report %d created.', abuseInstance.id)