-import * as Bluebird from 'bluebird'
import { uniq } from 'lodash'
-import { FindOptions, Op, Order, ScopeOptions, Sequelize, Transaction } from 'sequelize'
+import { FindAndCountOptions, FindOptions, Op, Order, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize'
import {
AllowNull,
- BeforeDestroy,
BelongsTo,
Column,
CreatedAt,
Table,
UpdatedAt
} from 'sequelize-typescript'
-import { logger } from '@server/helpers/logger'
import { getServerActor } from '@server/models/application/application'
import { MAccount, MAccountId, MUserAccountId } from '@server/types/models'
import { VideoPrivacy } from '@shared/models'
import { ActivityTagObject, ActivityTombstoneObject } from '../../../shared/models/activitypub/objects/common-objects'
import { VideoCommentObject } from '../../../shared/models/activitypub/objects/video-comment-object'
-import { VideoComment } from '../../../shared/models/videos/video-comment.model'
+import { VideoComment, VideoCommentAdmin } from '../../../shared/models/videos/video-comment.model'
import { actorNameAlphabet } from '../../helpers/custom-validators/activitypub/actor'
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
import { regexpCapture } from '../../helpers/regexp'
import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants'
import {
MComment,
+ MCommentAdminFormattable,
MCommentAP,
MCommentFormattable,
MCommentId,
import { VideoCommentAbuseModel } from '../abuse/video-comment-abuse'
import { AccountModel } from '../account/account'
import { ActorModel, unusedActorAttributesForAPI } from '../activitypub/actor'
-import { buildBlockedAccountSQL, buildLocalAccountIdsIn, getCommentSort, throwIfNotValid } from '../utils'
+import {
+ buildBlockedAccountSQL,
+ buildBlockedAccountSQLOptimized,
+ buildLocalAccountIdsIn,
+ getCommentSort,
+ searchAttribute,
+ throwIfNotValid
+} from '../utils'
import { VideoModel } from './video'
import { VideoChannelModel } from './video-channel'
-enum ScopeNames {
+export enum ScopeNames {
WITH_ACCOUNT = 'WITH_ACCOUNT',
WITH_ACCOUNT_FOR_API = 'WITH_ACCOUNT_FOR_API',
WITH_IN_REPLY_TO = 'WITH_IN_REPLY_TO',
}
]
})
-export class VideoCommentModel extends Model<VideoCommentModel> {
+export class VideoCommentModel extends Model {
@CreatedAt
createdAt: Date
@HasMany(() => VideoCommentAbuseModel, {
foreignKey: {
- name: 'commentId',
+ name: 'videoCommentId',
allowNull: true
},
onDelete: 'set null'
})
CommentAbuses: VideoCommentAbuseModel[]
- @BeforeDestroy
- static async saveEssentialDataToAbuses (instance: VideoCommentModel, options) {
- const tasks: Promise<any>[] = []
-
- if (!Array.isArray(instance.CommentAbuses)) {
- instance.CommentAbuses = await instance.$get('CommentAbuses')
-
- if (instance.CommentAbuses.length === 0) return undefined
- }
-
- if (!instance.Video) {
- instance.Video = await instance.$get('Video')
- }
-
- logger.info('Saving video comment %s for abuse.', instance.url)
-
- const details = Object.assign(instance.toFormattedJSON(), {
- Video: {
- id: instance.Video.id,
- name: instance.Video.name,
- uuid: instance.Video.uuid
- }
- })
-
- for (const abuse of instance.CommentAbuses) {
- abuse.deletedComment = details
-
- tasks.push(abuse.save({ transaction: options.transaction }))
- }
-
- Promise.all(tasks)
- .catch(err => {
- logger.error('Some errors when saving details of comment %s in its abuses before destroy hook.', instance.url, { err })
- })
-
- return undefined
- }
-
- static loadById (id: number, t?: Transaction): Bluebird<MComment> {
+ static loadById (id: number, t?: Transaction): Promise<MComment> {
const query: FindOptions = {
where: {
id
return VideoCommentModel.findOne(query)
}
- static loadByIdAndPopulateVideoAndAccountAndReply (id: number, t?: Transaction): Bluebird<MCommentOwnerVideoReply> {
+ static loadByIdAndPopulateVideoAndAccountAndReply (id: number, t?: Transaction): Promise<MCommentOwnerVideoReply> {
const query: FindOptions = {
where: {
id
.findOne(query)
}
- static loadByUrlAndPopulateAccountAndVideo (url: string, t?: Transaction): Bluebird<MCommentOwnerVideo> {
+ static loadByUrlAndPopulateAccountAndVideo (url: string, t?: Transaction): Promise<MCommentOwnerVideo> {
const query: FindOptions = {
where: {
url
return VideoCommentModel.scope([ ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_VIDEO ]).findOne(query)
}
- static loadByUrlAndPopulateReplyAndVideoUrlAndAccount (url: string, t?: Transaction): Bluebird<MCommentOwnerReplyVideoLight> {
+ static loadByUrlAndPopulateReplyAndVideoUrlAndAccount (url: string, t?: Transaction): Promise<MCommentOwnerReplyVideoLight> {
const query: FindOptions = {
where: {
url
return VideoCommentModel.scope([ ScopeNames.WITH_IN_REPLY_TO, ScopeNames.WITH_ACCOUNT ]).findOne(query)
}
+ static listCommentsForApi (parameters: {
+ start: number
+ count: number
+ sort: string
+
+ isLocal?: boolean
+ search?: string
+ searchAccount?: string
+ searchVideo?: string
+ }) {
+ const { start, count, sort, isLocal, search, searchAccount, searchVideo } = parameters
+
+ const where: WhereOptions = {
+ deletedAt: null
+ }
+
+ const whereAccount: WhereOptions = {}
+ const whereActor: WhereOptions = {}
+ const whereVideo: WhereOptions = {}
+
+ if (isLocal === true) {
+ Object.assign(whereActor, {
+ serverId: null
+ })
+ } else if (isLocal === false) {
+ Object.assign(whereActor, {
+ serverId: {
+ [Op.ne]: null
+ }
+ })
+ }
+
+ if (search) {
+ Object.assign(where, {
+ [Op.or]: [
+ searchAttribute(search, 'text'),
+ searchAttribute(search, '$Account.Actor.preferredUsername$'),
+ searchAttribute(search, '$Account.name$'),
+ searchAttribute(search, '$Video.name$')
+ ]
+ })
+ }
+
+ if (searchAccount) {
+ Object.assign(whereActor, {
+ [Op.or]: [
+ searchAttribute(searchAccount, '$Account.Actor.preferredUsername$'),
+ searchAttribute(searchAccount, '$Account.name$')
+ ]
+ })
+ }
+
+ if (searchVideo) {
+ Object.assign(whereVideo, searchAttribute(searchVideo, 'name'))
+ }
+
+ const query: FindAndCountOptions = {
+ offset: start,
+ limit: count,
+ order: getCommentSort(sort),
+ where,
+ include: [
+ {
+ model: AccountModel.unscoped(),
+ required: true,
+ where: whereAccount,
+ include: [
+ {
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
+ model: ActorModel, // Default scope includes avatar and server
+ required: true,
+ where: whereActor
+ }
+ ]
+ },
+ {
+ model: VideoModel.unscoped(),
+ required: true,
+ where: whereVideo
+ }
+ ]
+ }
+
+ return VideoCommentModel
+ .findAndCountAll(query)
+ .then(({ rows, count }) => {
+ return { total: count, data: rows }
+ })
+ }
+
static async listThreadsForApi (parameters: {
videoId: number
isVideoOwned: boolean
})
}
- static listThreadParentComments (comment: MCommentId, t: Transaction, order: 'ASC' | 'DESC' = 'ASC'): Bluebird<MCommentOwner[]> {
+ static listThreadParentComments (comment: MCommentId, t: Transaction, order: 'ASC' | 'DESC' = 'ASC'): Promise<MCommentOwner[]> {
const query = {
order: [ [ 'createdAt', order ] ] as Order,
where: {
const serverActor = await getServerActor()
const { start, count, videoId, accountId, videoChannelId } = parameters
- const accountExclusion = {
- [Op.notIn]: Sequelize.literal(
- '(' + buildBlockedAccountSQL([ serverActor.Account.id, '"Video->VideoChannel"."accountId"' ]) + ')'
- )
+ const whereAnd: WhereOptions[] = buildBlockedAccountSQLOptimized(
+ '"VideoCommentModel"."accountId"',
+ [ serverActor.Account.id, '"Video->VideoChannel"."accountId"' ]
+ )
+
+ if (accountId) {
+ whereAnd.push({
+ [Op.eq]: accountId
+ })
+ }
+
+ const accountWhere = {
+ [Op.and]: whereAnd
}
- const accountWhere = accountId
- ? {
- [Op.and]: {
- ...accountExclusion,
- [Op.eq]: accountId
- }
- }
- : accountExclusion
const videoChannelWhere = videoChannelId ? { id: videoChannelId } : undefined
id: this.id,
url: this.url,
text: this.text,
- threadId: this.originCommentId || this.id,
+
+ threadId: this.getThreadId(),
inReplyToCommentId: this.inReplyToCommentId || null,
videoId: this.videoId,
+
createdAt: this.createdAt,
updatedAt: this.updatedAt,
deletedAt: this.deletedAt,
+
isDeleted: this.isDeleted(),
+
totalRepliesFromVideoAuthor: this.get('totalRepliesFromVideoAuthor') || 0,
totalReplies: this.get('totalReplies') || 0,
- account: this.Account ? this.Account.toFormattedJSON() : null
+
+ account: this.Account
+ ? this.Account.toFormattedJSON()
+ : null
} as VideoComment
}
+ toFormattedAdminJSON (this: MCommentAdminFormattable) {
+ return {
+ id: this.id,
+ url: this.url,
+ text: this.text,
+
+ threadId: this.getThreadId(),
+ inReplyToCommentId: this.inReplyToCommentId || null,
+ videoId: this.videoId,
+
+ createdAt: this.createdAt,
+ updatedAt: this.updatedAt,
+
+ video: {
+ id: this.Video.id,
+ uuid: this.Video.uuid,
+ name: this.Video.name
+ },
+
+ account: this.Account
+ ? this.Account.toFormattedJSON()
+ : null
+ } as VideoCommentAdmin
+ }
+
toActivityPubObject (this: MCommentAP, threadParentComments: MCommentOwner[]): VideoCommentObject | ActivityTombstoneObject {
let inReplyTo: string
// New thread, so in AS we reply to the video
projects / github / Chocobozzz / PeerTube.git / blobdiff