X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-comment.ts;h=ff514280936bb50cc39291293e2358f1bfe2c68a;hb=d5b0313c0c6f1cb2ce1510f0317f8fbdef663145;hp=1d5c7280df284b3cbccf32ba7dad3bacb919ea71;hpb=594d3e48d8a887bbf48ce4cc594c1c36c9640fb1;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts index 1d5c7280d..ff5142809 100644 --- a/server/models/video/video-comment.ts +++ b/server/models/video/video-comment.ts @@ -1,6 +1,4 @@ -import * as Bluebird from 'bluebird' -import { uniq } from 'lodash' -import { FindOptions, Op, Order, ScopeOptions, Sequelize, Transaction } from 'sequelize' +import { FindOptions, Op, Order, QueryTypes, Sequelize, Transaction } from 'sequelize' import { AllowNull, BelongsTo, @@ -17,16 +15,18 @@ import { } from 'sequelize-typescript' import { getServerActor } from '@server/models/application/application' import { MAccount, MAccountId, MUserAccountId } from '@server/types/models' -import { VideoPrivacy } from '@shared/models' +import { pick, uniqify } from '@shared/core-utils' +import { AttributesOnly } from '@shared/typescript-utils' 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/comment/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, @@ -39,58 +39,19 @@ import { } from '../../types/models/video' 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 { ActorModel } from '../actor/actor' +import { buildLocalAccountIdsIn, buildSQLAttributes, throwIfNotValid } from '../shared' +import { ListVideoCommentsOptions, VideoCommentListQueryBuilder } from './sql/comment/video-comment-list-query-builder' import { VideoModel } from './video' import { VideoChannelModel } from './video-channel' export 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' + WITH_VIDEO = 'WITH_VIDEO' } @Scopes(() => ({ - [ScopeNames.ATTRIBUTES_FOR_API]: (blockerAccountIds: number[]) => { - return { - attributes: { - include: [ - [ - Sequelize.literal( - '(' + - 'WITH "blocklist" AS (' + buildBlockedAccountSQL(blockerAccountIds) + ')' + - 'SELECT COUNT("replies"."id") - (' + - 'SELECT COUNT("replies"."id") ' + - 'FROM "videoComment" AS "replies" ' + - 'WHERE "replies"."originCommentId" = "VideoCommentModel"."id" ' + - 'AND "accountId" IN (SELECT "id" FROM "blocklist")' + - ')' + - 'FROM "videoComment" AS "replies" ' + - 'WHERE "replies"."originCommentId" = "VideoCommentModel"."id" ' + - 'AND "accountId" NOT IN (SELECT "id" FROM "blocklist")' + - ')' - ), - '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: [ { @@ -98,22 +59,6 @@ export enum ScopeNames { } ] }, - [ScopeNames.WITH_ACCOUNT_FOR_API]: { - include: [ - { - model: AccountModel.unscoped(), - include: [ - { - attributes: { - exclude: unusedActorAttributesForAPI - }, - model: ActorModel, // Default scope includes avatar and server - required: true - } - ] - } - ] - }, [ScopeNames.WITH_IN_REPLY_TO]: { include: [ { @@ -166,7 +111,7 @@ export enum ScopeNames { } ] }) -export class VideoCommentModel extends Model { +export class VideoCommentModel extends Model>> { @CreatedAt createdAt: Date @@ -247,7 +192,19 @@ export class VideoCommentModel extends Model { }) CommentAbuses: VideoCommentAbuseModel[] - static loadById (id: number, t?: Transaction): Bluebird { + // --------------------------------------------------------------------------- + + static getSQLAttributes (tableName: string, aliasPrefix = '') { + return buildSQLAttributes({ + model: this, + tableName, + aliasPrefix + }) + } + + // --------------------------------------------------------------------------- + + static loadById (id: number, t?: Transaction): Promise { const query: FindOptions = { where: { id @@ -259,7 +216,7 @@ export class VideoCommentModel extends Model { return VideoCommentModel.findOne(query) } - static loadByIdAndPopulateVideoAndAccountAndReply (id: number, t?: Transaction): Bluebird { + static loadByIdAndPopulateVideoAndAccountAndReply (id: number, t?: Transaction): Promise { const query: FindOptions = { where: { id @@ -273,7 +230,7 @@ export class VideoCommentModel extends Model { .findOne(query) } - static loadByUrlAndPopulateAccountAndVideo (url: string, t?: Transaction): Bluebird { + static loadByUrlAndPopulateAccountAndVideo (url: string, t?: Transaction): Promise { const query: FindOptions = { where: { url @@ -285,7 +242,7 @@ export class VideoCommentModel extends Model { return VideoCommentModel.scope([ ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_VIDEO ]).findOne(query) } - static loadByUrlAndPopulateReplyAndVideoUrlAndAccount (url: string, t?: Transaction): Bluebird { + static loadByUrlAndPopulateReplyAndVideoUrlAndAccount (url: string, t?: Transaction): Promise { const query: FindOptions = { where: { url @@ -303,6 +260,32 @@ export class VideoCommentModel extends Model { return VideoCommentModel.scope([ ScopeNames.WITH_IN_REPLY_TO, ScopeNames.WITH_ACCOUNT ]).findOne(query) } + static listCommentsForApi (parameters: { + start: number + count: number + sort: string + + onLocalVideo?: boolean + isLocal?: boolean + search?: string + searchAccount?: string + searchVideo?: string + }) { + const queryOptions: ListVideoCommentsOptions = { + ...pick(parameters, [ 'start', 'count', 'sort', 'isLocal', 'search', 'searchVideo', 'searchAccount', 'onLocalVideo' ]), + + selectType: 'api', + notDeleted: true + } + + return Promise.all([ + new VideoCommentListQueryBuilder(VideoCommentModel.sequelize, queryOptions).listComments(), + new VideoCommentListQueryBuilder(VideoCommentModel.sequelize, queryOptions).countComments() + ]).then(([ rows, count ]) => { + return { total: count, data: rows } + }) + } + static async listThreadsForApi (parameters: { videoId: number isVideoOwned: boolean @@ -311,97 +294,73 @@ export class VideoCommentModel extends Model { sort: string user?: MUserAccountId }) { - const { videoId, isVideoOwned, start, count, sort, user } = parameters + const { videoId, user } = parameters - const blockerAccountIds = await VideoCommentModel.buildBlockerAccountIds({ videoId, user, isVideoOwned }) + const blockerAccountIds = await VideoCommentModel.buildBlockerAccountIds({ user }) - const query = { - offset: start, - limit: count, - order: getCommentSort(sort), - where: { - [Op.and]: [ - { - videoId - }, - { - inReplyToCommentId: null - }, - { - [Op.or]: [ - { - accountId: { - [Op.notIn]: Sequelize.literal( - '(' + buildBlockedAccountSQL(blockerAccountIds) + ')' - ) - } - }, - { - accountId: null - } - ] - } - ] - } + const commonOptions: ListVideoCommentsOptions = { + selectType: 'api', + videoId, + blockerAccountIds } - const scopes: (string | ScopeOptions)[] = [ - ScopeNames.WITH_ACCOUNT_FOR_API, - { - method: [ ScopeNames.ATTRIBUTES_FOR_API, blockerAccountIds ] - } - ] + const listOptions: ListVideoCommentsOptions = { + ...commonOptions, + ...pick(parameters, [ 'sort', 'start', 'count' ]), - return VideoCommentModel - .scope(scopes) - .findAndCountAll(query) - .then(({ rows, count }) => { - return { total: count, data: rows } - }) + isThread: true, + includeReplyCounters: true + } + + const countOptions: ListVideoCommentsOptions = { + ...commonOptions, + + isThread: true + } + + const notDeletedCountOptions: ListVideoCommentsOptions = { + ...commonOptions, + + notDeleted: true + } + + return Promise.all([ + new VideoCommentListQueryBuilder(VideoCommentModel.sequelize, listOptions).listComments(), + new VideoCommentListQueryBuilder(VideoCommentModel.sequelize, countOptions).countComments(), + new VideoCommentListQueryBuilder(VideoCommentModel.sequelize, notDeletedCountOptions).countComments() + ]).then(([ rows, count, totalNotDeletedComments ]) => { + return { total: count, data: rows, totalNotDeletedComments } + }) } static async listThreadCommentsForApi (parameters: { videoId: number - isVideoOwned: boolean threadId: number user?: MUserAccountId }) { - const { videoId, threadId, user, isVideoOwned } = parameters + const { user } = parameters - const blockerAccountIds = await VideoCommentModel.buildBlockerAccountIds({ videoId, user, isVideoOwned }) + const blockerAccountIds = await VideoCommentModel.buildBlockerAccountIds({ user }) - const query = { - order: [ [ 'createdAt', 'ASC' ], [ 'updatedAt', 'ASC' ] ] as Order, - where: { - videoId, - [Op.or]: [ - { id: threadId }, - { originCommentId: threadId } - ], - accountId: { - [Op.notIn]: Sequelize.literal( - '(' + buildBlockedAccountSQL(blockerAccountIds) + ')' - ) - } - } - } + const queryOptions: ListVideoCommentsOptions = { + ...pick(parameters, [ 'videoId', 'threadId' ]), - const scopes: any[] = [ - ScopeNames.WITH_ACCOUNT_FOR_API, - { - method: [ ScopeNames.ATTRIBUTES_FOR_API, blockerAccountIds ] - } - ] + selectType: 'api', + sort: 'createdAt', - return VideoCommentModel - .scope(scopes) - .findAndCountAll(query) - .then(({ rows, count }) => { - return { total: count, data: rows } - }) + blockerAccountIds, + includeReplyCounters: true + } + + return Promise.all([ + new VideoCommentListQueryBuilder(VideoCommentModel.sequelize, queryOptions).listComments(), + new VideoCommentListQueryBuilder(VideoCommentModel.sequelize, queryOptions).countComments() + ]).then(([ rows, count ]) => { + return { total: count, data: rows } + }) } - static listThreadParentComments (comment: MCommentId, t: Transaction, order: 'ASC' | 'DESC' = 'ASC'): Bluebird { + static listThreadParentComments (comment: MCommentId, t: Transaction, order: 'ASC' | 'DESC' = 'ASC'): Promise { const query = { order: [ [ 'createdAt', order ] ] as Order, where: { @@ -426,28 +385,31 @@ export class VideoCommentModel extends Model { .findAll(query) } - static async listAndCountByVideoForAP (video: MVideoImmutable, start: number, count: number, t?: Transaction) { - const blockerAccountIds = await VideoCommentModel.buildBlockerAccountIds({ + static async listAndCountByVideoForAP (parameters: { + video: MVideoImmutable + start: number + count: number + }) { + const { video } = parameters + + const blockerAccountIds = await VideoCommentModel.buildBlockerAccountIds({ user: null }) + + const queryOptions: ListVideoCommentsOptions = { + ...pick(parameters, [ 'start', 'count' ]), + + selectType: 'comment-only', videoId: video.id, - isVideoOwned: video.isOwned() - }) + sort: 'createdAt', - const query = { - order: [ [ 'createdAt', 'ASC' ] ] as Order, - offset: start, - limit: count, - where: { - videoId: video.id, - accountId: { - [Op.notIn]: Sequelize.literal( - '(' + buildBlockedAccountSQL(blockerAccountIds) + ')' - ) - } - }, - transaction: t + blockerAccountIds } - return VideoCommentModel.findAndCountAll(query) + return Promise.all([ + new VideoCommentListQueryBuilder(VideoCommentModel.sequelize, queryOptions).listComments(), + new VideoCommentListQueryBuilder(VideoCommentModel.sequelize, queryOptions).countComments() + ]).then(([ rows, count ]) => { + return { total: count, data: rows } + }) } static async listForFeed (parameters: { @@ -456,107 +418,47 @@ export class VideoCommentModel extends Model { videoId?: number accountId?: number videoChannelId?: number - }): Promise { - const serverActor = await getServerActor() - const { start, count, videoId, accountId, videoChannelId } = parameters + }) { + const blockerAccountIds = await VideoCommentModel.buildBlockerAccountIds({ user: null }) - const accountExclusion = { - [Op.notIn]: Sequelize.literal( - '(' + buildBlockedAccountSQL([ serverActor.Account.id, '"Video->VideoChannel"."accountId"' ]) + ')' - ) - } - const accountWhere = accountId - ? { - [Op.and]: { - ...accountExclusion, - [Op.eq]: accountId - } - } - : accountExclusion + const queryOptions: ListVideoCommentsOptions = { + ...pick(parameters, [ 'start', 'count', 'accountId', 'videoId', 'videoChannelId' ]), - const videoChannelWhere = videoChannelId ? { id: videoChannelId } : undefined + selectType: 'feed', - const query = { - order: [ [ 'createdAt', 'DESC' ] ] as Order, - offset: start, - limit: count, - where: { - deletedAt: null, - accountId: accountWhere - }, - include: [ - { - attributes: [ 'name', 'uuid' ], - model: VideoModel.unscoped(), - required: true, - where: { - privacy: VideoPrivacy.PUBLIC - }, - include: [ - { - attributes: [ 'accountId' ], - model: VideoChannelModel.unscoped(), - required: true, - where: videoChannelWhere - } - ] - } - ] - } + sort: '-createdAt', + onPublicVideo: true, + notDeleted: true, - if (videoId) query.where['videoId'] = videoId + blockerAccountIds + } - return VideoCommentModel - .scope([ ScopeNames.WITH_ACCOUNT ]) - .findAll(query) + return new VideoCommentListQueryBuilder(VideoCommentModel.sequelize, queryOptions).listComments() } static listForBulkDelete (ofAccount: MAccount, filter: { onVideosOfAccount?: MAccountId } = {}) { - const accountWhere = filter.onVideosOfAccount - ? { id: filter.onVideosOfAccount.id } - : {} + const queryOptions: ListVideoCommentsOptions = { + selectType: 'comment-only', - 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 - } - ] - } - ] - } - ] + accountId: ofAccount.id, + videoAccountOwnerId: filter.onVideosOfAccount?.id, + + notDeleted: true, + count: 5000 } - return VideoCommentModel - .scope([ ScopeNames.WITH_ACCOUNT ]) - .findAll(query) + return new VideoCommentListQueryBuilder(VideoCommentModel.sequelize, queryOptions).listComments() } static async getStats () { const totalLocalVideoComments = await VideoCommentModel.count({ include: [ { - model: AccountModel, + model: AccountModel.unscoped(), required: true, include: [ { - model: ActorModel, + model: ActorModel.unscoped(), required: true, where: { serverId: null @@ -574,6 +476,18 @@ export class VideoCommentModel extends Model { } } + static listRemoteCommentUrlsOfLocalVideos () { + const query = `SELECT "videoComment".url FROM "videoComment" ` + + `INNER JOIN account ON account.id = "videoComment"."accountId" ` + + `INNER JOIN actor ON actor.id = "account"."actorId" AND actor."serverId" IS NOT NULL ` + + `INNER JOIN video ON video.id = "videoComment"."videoId" AND video.remote IS FALSE` + + return VideoCommentModel.sequelize.query<{ url: string }>(query, { + type: QueryTypes.SELECT, + raw: true + }).then(rows => rows.map(r => r.url)) + } + static cleanOldCommentsOf (videoId: number, beforeUpdatedAt: Date) { const query = { where: { @@ -601,13 +515,17 @@ export class VideoCommentModel extends Model { } isOwned () { - if (!this.Account) { - return false - } + if (!this.Account) return false return this.Account.isOwned() } + markAsDeleted () { + this.text = '' + this.deletedAt = new Date() + this.accountId = null + } + isDeleted () { return this.deletedAt !== null } @@ -647,7 +565,7 @@ export class VideoCommentModel extends Model { ) } - return uniq(result) + return uniqify(result) } toFormattedJSON (this: MCommentFormattable) { @@ -655,19 +573,51 @@ export class VideoCommentModel extends Model { 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, 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 @@ -705,7 +655,10 @@ export class VideoCommentModel extends Model { return { type: 'Note' as 'Note', id: this.url, + content: this.text, + mediaType: 'text/markdown', + inReplyTo, updated: this.updatedAt.toISOString(), published: this.createdAt.toISOString(), @@ -716,22 +669,15 @@ export class VideoCommentModel extends Model { } private static async buildBlockerAccountIds (options: { - videoId: number - isVideoOwned: boolean - user?: MUserAccountId - }) { - const { videoId, user, isVideoOwned } = options + user: MUserAccountId + }): Promise { + const { user } = 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 } }