-import * as Bluebird from 'bluebird'
import { invert } from 'lodash'
-import { literal, Op, QueryTypes, WhereOptions } from 'sequelize'
+import { literal, Op, QueryTypes } from 'sequelize'
import {
AllowNull,
BelongsTo,
UpdatedAt
} from 'sequelize-typescript'
import { isAbuseModerationCommentValid, isAbuseReasonValid, isAbuseStateValid } from '@server/helpers/custom-validators/abuses'
+import { abusePredefinedReasonsMap } from '@shared/core-utils'
import {
AbuseFilter,
AbuseObject,
AbusePredefinedReasons,
- abusePredefinedReasonsMap,
AbusePredefinedReasonsString,
AbuseState,
AbuseVideoIs,
UserAbuse,
UserVideoAbuse
} from '@shared/models'
+import { AttributesOnly } from '@shared/typescript-utils'
import { ABUSE_STATES, CONSTRAINTS_FIELDS } from '../../initializers/constants'
-import { MAbuse, MAbuseAdminFormattable, MAbuseAP, MAbuseReporter, MAbuseUserFormattable, MUserAccountId } from '../../types/models'
+import { MAbuseAdminFormattable, MAbuseAP, MAbuseFull, MAbuseReporter, MAbuseUserFormattable, MUserAccountId } from '../../types/models'
import { AccountModel, ScopeNames as AccountScopeNames, SummaryOptions as AccountSummaryOptions } from '../account/account'
-import { getSort, throwIfNotValid } from '../utils'
+import { getSort, throwIfNotValid } from '../shared'
import { ThumbnailModel } from '../video/thumbnail'
-import { VideoModel } from '../video/video'
+import { ScopeNames as VideoScopeNames, VideoModel } from '../video/video'
import { VideoBlacklistModel } from '../video/video-blacklist'
import { ScopeNames as VideoChannelScopeNames, SummaryOptions as ChannelSummaryOptions, VideoChannelModel } from '../video/video-channel'
-import { VideoCommentModel } from '../video/video-comment'
-import { buildAbuseListQuery, BuildAbusesQueryOptions } from './abuse-query-builder'
+import { ScopeNames as CommentScopeNames, VideoCommentModel } from '../video/video-comment'
+import { buildAbuseListQuery, BuildAbusesQueryOptions } from './sql/abuse-query-builder'
import { VideoAbuseModel } from './video-abuse'
import { VideoCommentAbuseModel } from './video-comment-abuse'
}
]
})
-export class AbuseModel extends Model<AbuseModel> {
+export class AbuseModel extends Model<Partial<AttributesOnly<AbuseModel>>> {
@AllowNull(false)
@Default(null)
})
VideoAbuse: VideoAbuseModel
- // FIXME: deprecated in 2.3. Remove these validators
- static loadByIdAndVideoId (id: number, videoId?: number, uuid?: string): Bluebird<MAbuseReporter> {
- const videoWhere: WhereOptions = {}
-
- if (videoId) videoWhere.videoId = videoId
- if (uuid) videoWhere.deletedVideo = { uuid }
-
+ static loadByIdWithReporter (id: number): Promise<MAbuseReporter> {
const query = {
+ where: {
+ id
+ },
include: [
- {
- model: VideoAbuseModel,
- required: true,
- where: videoWhere
- },
{
model: AccountModel,
as: 'ReporterAccount'
}
- ],
- where: {
- id
- }
+ ]
}
+
return AbuseModel.findOne(query)
}
- static loadByIdWithReporter (id: number): Bluebird<MAbuseReporter> {
+ static loadFull (id: number): Promise<MAbuseFull> {
const query = {
where: {
id
},
include: [
{
- model: AccountModel,
+ model: AccountModel.scope(AccountScopeNames.SUMMARY),
+ required: false,
as: 'ReporterAccount'
+ },
+ {
+ model: AccountModel.scope(AccountScopeNames.SUMMARY),
+ as: 'FlaggedAccount'
+ },
+ {
+ model: VideoAbuseModel,
+ required: false,
+ include: [
+ {
+ model: VideoModel.scope([ VideoScopeNames.WITH_ACCOUNT_DETAILS ])
+ }
+ ]
+ },
+ {
+ model: VideoCommentAbuseModel,
+ required: false,
+ include: [
+ {
+ model: VideoCommentModel.scope([
+ CommentScopeNames.WITH_ACCOUNT
+ ]),
+ include: [
+ {
+ model: VideoModel
+ }
+ ]
+ }
+ ]
}
]
}
}
buildBaseVideoCommentAbuse (this: MAbuseUserFormattable) {
- if (!this.VideoCommentAbuse) return null
+ // Associated video comment could have been destroyed if the video has been deleted
+ if (!this.VideoCommentAbuse?.VideoComment) return null
- const abuseModel = this.VideoCommentAbuse
- const entity = abuseModel.VideoComment
+ const entity = this.VideoCommentAbuse.VideoComment
return {
id: entity.id,
blacklisted: abuseModel.Video?.isBlacklisted() || false,
thumbnailPath: abuseModel.Video?.getMiniatureStaticPath(),
- channel: abuseModel.Video?.VideoChannel.toFormattedJSON() || abuseModel.deletedVideo?.channel,
+ channel: abuseModel.Video?.VideoChannel.toFormattedJSON() || abuseModel.deletedVideo?.channel
}
}
: null,
countReportsForReporter: (countReportsForReporter || 0),
- countReportsForReportee: (countReportsForReportee || 0),
-
- // FIXME: deprecated in 2.3, remove this
- startAt: null,
- endAt: null,
- count: countReportsForVideo || 0,
- nth: nthReportForVideo || 0
+ countReportsForReportee: (countReportsForReportee || 0)
})
}
return {
type: 'Flag' as 'Flag',
content: this.reason,
+ mediaType: 'text/markdown',
object,
tag: predefinedReasons.map(r => ({
type: 'Hashtag' as 'Hashtag',
}
private static getPredefinedReasonsStrings (predefinedReasons: AbusePredefinedReasons[]): AbusePredefinedReasonsString[] {
+ const invertedPredefinedReasons = invert(abusePredefinedReasonsMap)
+
return (predefinedReasons || [])
- .filter(r => r in AbusePredefinedReasons)
- .map(r => invert(abusePredefinedReasonsMap)[r] as AbusePredefinedReasonsString)
+ .map(r => invertedPredefinedReasons[r] as AbusePredefinedReasonsString)
+ .filter(v => !!v)
}
}