-import * as Sequelize from 'sequelize'
-import { Op } from 'sequelize'
-import {
- AllowNull,
- BeforeDestroy,
- BelongsTo,
- Column,
- CreatedAt,
- DataType,
- ForeignKey,
- IFindOptions,
- Is,
- Model,
- Scopes,
- Table,
- UpdatedAt
-} from 'sequelize-typescript'
-import { ActivityTagObject } from '../../../shared/models/activitypub/objects/common-objects'
+import * as Bluebird from 'bluebird'
+import { uniq } from 'lodash'
+import { FindOptions, Op, Order, ScopeOptions, Sequelize, Transaction } from 'sequelize'
+import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
+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 { actorNameAlphabet } from '../../helpers/custom-validators/activitypub/actor'
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
-import { CONFIG, CONSTRAINTS_FIELDS } from '../../initializers'
-import { sendDeleteVideoComment } from '../../lib/activitypub/send'
+import { regexpCapture } from '../../helpers/regexp'
+import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants'
+import {
+ MComment,
+ MCommentAP,
+ MCommentFormattable,
+ MCommentId,
+ MCommentOwner,
+ MCommentOwnerReplyVideoLight,
+ MCommentOwnerVideo,
+ MCommentOwnerVideoFeed,
+ MCommentOwnerVideoReply,
+ MVideoImmutable
+} from '../../types/models/video'
import { AccountModel } from '../account/account'
-import { ActorModel } from '../activitypub/actor'
-import { AvatarModel } from '../avatar/avatar'
-import { ServerModel } from '../server/server'
-import { buildBlockedAccountSQL, getSort, throwIfNotValid } from '../utils'
+import { ActorModel, unusedActorAttributesForAPI } from '../activitypub/actor'
+import { buildBlockedAccountSQL, buildLocalAccountIdsIn, getCommentSort, throwIfNotValid } from '../utils'
import { VideoModel } from './video'
import { VideoChannelModel } from './video-channel'
-import { getServerActor } from '../../helpers/utils'
-import { UserModel } from '../account/user'
-import { actorNameAlphabet } from '../../helpers/custom-validators/activitypub/actor'
-import { regexpCapture } from '../../helpers/regexp'
-import { uniq } from 'lodash'
enum ScopeNames {
WITH_ACCOUNT = 'WITH_ACCOUNT',
+ WITH_ACCOUNT_FOR_API = 'WITH_ACCOUNT_FOR_API',
WITH_IN_REPLY_TO = 'WITH_IN_REPLY_TO',
WITH_VIDEO = 'WITH_VIDEO',
ATTRIBUTES_FOR_API = 'ATTRIBUTES_FOR_API'
}
-@Scopes({
- [ScopeNames.ATTRIBUTES_FOR_API]: (serverAccountId: number, userAccountId?: number) => {
+@Scopes(() => ({
+ [ScopeNames.ATTRIBUTES_FOR_API]: (blockerAccountIds: number[]) => {
return {
attributes: {
include: [
[
Sequelize.literal(
'(' +
- 'WITH "blocklist" AS (' + buildBlockedAccountSQL(serverAccountId, userAccountId) + ')' +
+ 'WITH "blocklist" AS (' + buildBlockedAccountSQL(blockerAccountIds) + ')' +
'SELECT COUNT("replies"."id") - (' +
'SELECT COUNT("replies"."id") ' +
'FROM "videoComment" AS "replies" ' +
')'
),
'totalReplies'
+ ],
+ [
+ Sequelize.literal(
+ '(' +
+ 'SELECT COUNT("replies"."id") ' +
+ 'FROM "videoComment" AS "replies" ' +
+ 'INNER JOIN "video" ON "video"."id" = "replies"."videoId" ' +
+ 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' +
+ 'WHERE "replies"."originCommentId" = "VideoCommentModel"."id" ' +
+ 'AND "replies"."accountId" = "videoChannel"."accountId"' +
+ ')'
+ ),
+ 'totalRepliesFromVideoAuthor'
]
]
}
- }
+ } as FindOptions
},
[ScopeNames.WITH_ACCOUNT]: {
include: [
{
- model: () => AccountModel,
+ model: AccountModel
+ }
+ ]
+ },
+ [ScopeNames.WITH_ACCOUNT_FOR_API]: {
+ include: [
+ {
+ model: AccountModel.unscoped(),
include: [
{
- model: () => ActorModel,
- include: [
- {
- model: () => ServerModel,
- required: false
- },
- {
- model: () => AvatarModel,
- required: false
- }
- ]
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
+ model: ActorModel, // Default scope includes avatar and server
+ required: true
}
]
}
[ScopeNames.WITH_IN_REPLY_TO]: {
include: [
{
- model: () => VideoCommentModel,
+ model: VideoCommentModel,
as: 'InReplyToVideoComment'
}
]
[ScopeNames.WITH_VIDEO]: {
include: [
{
- model: () => VideoModel,
+ model: VideoModel,
required: true,
include: [
{
- model: () => VideoChannelModel.unscoped(),
+ model: VideoChannelModel,
required: true,
include: [
{
- model: () => AccountModel,
- required: true,
- include: [
- {
- model: () => ActorModel,
- required: true
- }
- ]
+ model: AccountModel,
+ required: true
}
]
}
}
]
}
-})
+}))
@Table({
tableName: 'videoComment',
indexes: [
},
{
fields: [ 'accountId' ]
+ },
+ {
+ fields: [
+ { name: 'createdAt', order: 'DESC' }
+ ]
}
]
})
@UpdatedAt
updatedAt: Date
+ @AllowNull(true)
+ @Column(DataType.DATE)
+ deletedAt: Date
+
@AllowNull(false)
@Is('VideoCommentUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'url'))
@Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.URL.max))
@BelongsTo(() => AccountModel, {
foreignKey: {
- allowNull: false
+ allowNull: true
},
onDelete: 'CASCADE'
})
Account: AccountModel
- @BeforeDestroy
- static async sendDeleteIfOwned (instance: VideoCommentModel, options) {
- if (!instance.Account || !instance.Account.Actor) {
- instance.Account = await instance.$get('Account', {
- include: [ ActorModel ],
- transaction: options.transaction
- }) as AccountModel
- }
-
- if (!instance.Video) {
- instance.Video = await instance.$get('Video', {
- include: [
- {
- model: VideoChannelModel,
- include: [
- {
- model: AccountModel,
- include: [
- {
- model: ActorModel
- }
- ]
- }
- ]
- }
- ],
- transaction: options.transaction
- }) as VideoModel
- }
-
- if (instance.isOwned()) {
- await sendDeleteVideoComment(instance, options.transaction)
- }
- }
-
- static loadById (id: number, t?: Sequelize.Transaction) {
- const query: IFindOptions<VideoCommentModel> = {
+ static loadById (id: number, t?: Transaction): Bluebird<MComment> {
+ const query: FindOptions = {
where: {
id
}
return VideoCommentModel.findOne(query)
}
- static loadByIdAndPopulateVideoAndAccountAndReply (id: number, t?: Sequelize.Transaction) {
- const query: IFindOptions<VideoCommentModel> = {
+ static loadByIdAndPopulateVideoAndAccountAndReply (id: number, t?: Transaction): Bluebird<MCommentOwnerVideoReply> {
+ const query: FindOptions = {
where: {
id
}
.findOne(query)
}
- static loadByUrlAndPopulateAccount (url: string, t?: Sequelize.Transaction) {
- const query: IFindOptions<VideoCommentModel> = {
+ static loadByUrlAndPopulateAccountAndVideo (url: string, t?: Transaction): Bluebird<MCommentOwnerVideo> {
+ const query: FindOptions = {
where: {
url
}
if (t !== undefined) query.transaction = t
- return VideoCommentModel.scope([ ScopeNames.WITH_ACCOUNT ]).findOne(query)
+ return VideoCommentModel.scope([ ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_VIDEO ]).findOne(query)
}
- static loadByUrlAndPopulateReplyAndVideo (url: string, t?: Sequelize.Transaction) {
- const query: IFindOptions<VideoCommentModel> = {
+ static loadByUrlAndPopulateReplyAndVideoUrlAndAccount (url: string, t?: Transaction): Bluebird<MCommentOwnerReplyVideoLight> {
+ const query: FindOptions = {
where: {
url
- }
+ },
+ include: [
+ {
+ attributes: [ 'id', 'url' ],
+ model: VideoModel.unscoped()
+ }
+ ]
}
if (t !== undefined) query.transaction = t
- return VideoCommentModel.scope([ ScopeNames.WITH_IN_REPLY_TO, ScopeNames.WITH_VIDEO ]).findOne(query)
+ return VideoCommentModel.scope([ ScopeNames.WITH_IN_REPLY_TO, ScopeNames.WITH_ACCOUNT ]).findOne(query)
}
- static async listThreadsForApi (videoId: number, start: number, count: number, sort: string, user?: UserModel) {
- const serverActor = await getServerActor()
- const serverAccountId = serverActor.Account.id
- const userAccountId = user ? user.Account.id : undefined
+ static async listThreadsForApi (parameters: {
+ videoId: number
+ isVideoOwned: boolean
+ start: number
+ count: number
+ sort: string
+ user?: MUserAccountId
+ }) {
+ const { videoId, isVideoOwned, start, count, sort, user } = parameters
+
+ const blockerAccountIds = await VideoCommentModel.buildBlockerAccountIds({ videoId, user, isVideoOwned })
const query = {
offset: start,
limit: count,
- order: getSort(sort),
+ order: getCommentSort(sort),
where: {
- videoId,
- inReplyToCommentId: null,
- accountId: {
- [Sequelize.Op.notIn]: Sequelize.literal(
- '(' + buildBlockedAccountSQL(serverAccountId, userAccountId) + ')'
- )
- }
+ [Op.and]: [
+ {
+ videoId
+ },
+ {
+ inReplyToCommentId: null
+ },
+ {
+ [Op.or]: [
+ {
+ accountId: {
+ [Op.notIn]: Sequelize.literal(
+ '(' + buildBlockedAccountSQL(blockerAccountIds) + ')'
+ )
+ }
+ },
+ {
+ accountId: null
+ }
+ ]
+ }
+ ]
}
}
- // FIXME: typings
- const scopes: any[] = [
- ScopeNames.WITH_ACCOUNT,
+ const scopes: (string | ScopeOptions)[] = [
+ ScopeNames.WITH_ACCOUNT_FOR_API,
{
- method: [ ScopeNames.ATTRIBUTES_FOR_API, serverAccountId, userAccountId ]
+ method: [ ScopeNames.ATTRIBUTES_FOR_API, blockerAccountIds ]
}
]
})
}
- static async listThreadCommentsForApi (videoId: number, threadId: number, user?: UserModel) {
- const serverActor = await getServerActor()
- const serverAccountId = serverActor.Account.id
- const userAccountId = user ? user.Account.id : undefined
+ static async listThreadCommentsForApi (parameters: {
+ videoId: number
+ isVideoOwned: boolean
+ threadId: number
+ user?: MUserAccountId
+ }) {
+ const { videoId, threadId, user, isVideoOwned } = parameters
+
+ const blockerAccountIds = await VideoCommentModel.buildBlockerAccountIds({ videoId, user, isVideoOwned })
const query = {
- order: [ [ 'createdAt', 'ASC' ], [ 'updatedAt', 'ASC' ] ],
+ order: [ [ 'createdAt', 'ASC' ], [ 'updatedAt', 'ASC' ] ] as Order,
where: {
videoId,
- [ Sequelize.Op.or ]: [
+ [Op.or]: [
{ id: threadId },
{ originCommentId: threadId }
],
accountId: {
- [Sequelize.Op.notIn]: Sequelize.literal(
- '(' + buildBlockedAccountSQL(serverAccountId, userAccountId) + ')'
+ [Op.notIn]: Sequelize.literal(
+ '(' + buildBlockedAccountSQL(blockerAccountIds) + ')'
)
}
}
}
const scopes: any[] = [
- ScopeNames.WITH_ACCOUNT,
+ ScopeNames.WITH_ACCOUNT_FOR_API,
{
- method: [ ScopeNames.ATTRIBUTES_FOR_API, serverAccountId, userAccountId ]
+ method: [ ScopeNames.ATTRIBUTES_FOR_API, blockerAccountIds ]
}
]
})
}
- static listThreadParentComments (comment: VideoCommentModel, t: Sequelize.Transaction, order: 'ASC' | 'DESC' = 'ASC') {
+ static listThreadParentComments (comment: MCommentId, t: Transaction, order: 'ASC' | 'DESC' = 'ASC'): Bluebird<MCommentOwner[]> {
const query = {
- order: [ [ 'createdAt', order ] ],
+ order: [ [ 'createdAt', order ] ] as Order,
where: {
id: {
- [ Sequelize.Op.in ]: Sequelize.literal('(' +
+ [Op.in]: Sequelize.literal('(' +
'WITH RECURSIVE children (id, "inReplyToCommentId") AS ( ' +
`SELECT id, "inReplyToCommentId" FROM "videoComment" WHERE id = ${comment.id} ` +
'UNION ' +
') ' +
'SELECT id FROM children' +
')'),
- [ Sequelize.Op.ne ]: comment.id
+ [Op.ne]: comment.id
}
},
transaction: t
.findAll(query)
}
- static listAndCountByVideoId (videoId: number, start: number, count: number, t?: Sequelize.Transaction, order: 'ASC' | 'DESC' = 'ASC') {
+ static async listAndCountByVideoForAP (video: MVideoImmutable, start: number, count: number, t?: Transaction) {
+ const blockerAccountIds = await VideoCommentModel.buildBlockerAccountIds({
+ videoId: video.id,
+ isVideoOwned: video.isOwned()
+ })
+
const query = {
- order: [ [ 'createdAt', order ] ],
+ order: [ [ 'createdAt', 'ASC' ] ] as Order,
offset: start,
limit: count,
where: {
- videoId
+ videoId: video.id,
+ accountId: {
+ [Op.notIn]: Sequelize.literal(
+ '(' + buildBlockedAccountSQL(blockerAccountIds) + ')'
+ )
+ }
},
transaction: t
}
- return VideoCommentModel.findAndCountAll(query)
+ return VideoCommentModel.findAndCountAll<MComment>(query)
}
- static listForFeed (start: number, count: number, videoId?: number) {
+ static async listForFeed (parameters: {
+ start: number
+ count: number
+ videoId?: number
+ accountId?: number
+ videoChannelId?: number
+ }): Promise<MCommentOwnerVideoFeed[]> {
+ 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 accountWhere = accountId
+ ? {
+ [Op.and]: {
+ ...accountExclusion,
+ [Op.eq]: accountId
+ }
+ }
+ : accountExclusion
+
+ const videoChannelWhere = videoChannelId ? { id: videoChannelId } : undefined
+
const query = {
- order: [ [ 'createdAt', 'DESC' ] ],
+ order: [ [ 'createdAt', 'DESC' ] ] as Order,
offset: start,
limit: count,
- where: {},
+ where: {
+ deletedAt: null,
+ accountId: accountWhere
+ },
include: [
{
attributes: [ 'name', 'uuid' ],
model: VideoModel.unscoped(),
- required: true
+ required: true,
+ where: {
+ privacy: VideoPrivacy.PUBLIC
+ },
+ include: [
+ {
+ attributes: [ 'accountId' ],
+ model: VideoChannelModel.unscoped(),
+ required: true,
+ where: videoChannelWhere
+ }
+ ]
}
]
}
.findAll(query)
}
+ static listForBulkDelete (ofAccount: MAccount, filter: { onVideosOfAccount?: MAccountId } = {}) {
+ const accountWhere = filter.onVideosOfAccount
+ ? { id: filter.onVideosOfAccount.id }
+ : {}
+
+ const query = {
+ limit: 1000,
+ where: {
+ deletedAt: null,
+ accountId: ofAccount.id
+ },
+ include: [
+ {
+ model: VideoModel,
+ required: true,
+ include: [
+ {
+ model: VideoChannelModel,
+ required: true,
+ include: [
+ {
+ model: AccountModel,
+ required: true,
+ where: accountWhere
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+
+ return VideoCommentModel
+ .scope([ ScopeNames.WITH_ACCOUNT ])
+ .findAll(query)
+ }
+
static async getStats () {
const totalLocalVideoComments = await VideoCommentModel.count({
include: [
updatedAt: {
[Op.lt]: beforeUpdatedAt
},
- videoId
+ videoId,
+ accountId: {
+ [Op.notIn]: buildLocalAccountIdsIn()
+ },
+ // Do not delete Tombstones
+ deletedAt: null
}
}
}
isOwned () {
+ if (!this.Account) {
+ return false
+ }
+
return this.Account.isOwned()
}
+ isDeleted () {
+ return this.deletedAt !== null
+ }
+
extractMentions () {
let result: string[] = []
const localMention = `@(${actorNameAlphabet}+)`
- const remoteMention = `${localMention}@${CONFIG.WEBSERVER.HOST}`
+ const remoteMention = `${localMention}@${WEBSERVER.HOST}`
const mentionRegex = this.isOwned()
? '(?:(?:' + remoteMention + ')|(?:' + localMention + '))' // Include local mentions?
return uniq(result)
}
- toFormattedJSON () {
+ toFormattedJSON (this: MCommentFormattable) {
return {
id: this.id,
url: this.url,
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.toFormattedJSON()
+ account: this.Account ? this.Account.toFormattedJSON() : null
} as VideoComment
}
- toActivityPubObject (threadParentComments: VideoCommentModel[]): VideoCommentObject {
+ toActivityPubObject (this: MCommentAP, threadParentComments: MCommentOwner[]): VideoCommentObject | ActivityTombstoneObject {
let inReplyTo: string
// New thread, so in AS we reply to the video
if (this.inReplyToCommentId === null) {
inReplyTo = this.InReplyToVideoComment.url
}
+ if (this.isDeleted()) {
+ return {
+ id: this.url,
+ type: 'Tombstone',
+ formerType: 'Note',
+ inReplyTo,
+ published: this.createdAt.toISOString(),
+ updated: this.updatedAt.toISOString(),
+ deleted: this.deletedAt.toISOString()
+ }
+ }
+
const tag: ActivityTagObject[] = []
for (const parentComment of threadParentComments) {
+ if (!parentComment.Account) continue
+
const actor = parentComment.Account.Actor
tag.push({
tag
}
}
+
+ private static async buildBlockerAccountIds (options: {
+ videoId: number
+ isVideoOwned: boolean
+ user?: MUserAccountId
+ }) {
+ const { videoId, user, isVideoOwned } = options
+
+ const serverActor = await getServerActor()
+ const blockerAccountIds = [ serverActor.Account.id ]
+
+ if (user) blockerAccountIds.push(user.Account.id)
+
+ if (isVideoOwned) {
+ const videoOwnerAccount = await AccountModel.loadAccountIdFromVideo(videoId)
+ blockerAccountIds.push(videoOwnerAccount.id)
+ }
+
+ return blockerAccountIds
+ }
}
projects / github / Chocobozzz / PeerTube.git / blobdiff