X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-comment.ts;h=ff514280936bb50cc39291293e2358f1bfe2c68a;hb=d5b0313c0c6f1cb2ce1510f0317f8fbdef663145;hp=151c2bc81a793fd11ec3622ec1cc363fe7fcbf3a;hpb=74d249bc1346c7cfaac7ee49bebbebcf2a01f82a;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts index 151c2bc81..ff5142809 100644 --- a/server/models/video/video-comment.ts +++ b/server/models/video/video-comment.ts @@ -1,5 +1,4 @@ -import { uniq } from 'lodash' -import { FindAndCountOptions, FindOptions, Op, Order, QueryTypes, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize' +import { FindOptions, Op, Order, QueryTypes, Sequelize, Transaction } from 'sequelize' import { AllowNull, BelongsTo, @@ -16,10 +15,11 @@ 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, VideoCommentAdmin } 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' @@ -39,65 +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, - buildBlockedAccountSQLOptimized, - buildLocalAccountIdsIn, - getCommentSort, - searchAttribute, - 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: [ { @@ -105,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: [ { @@ -173,7 +111,7 @@ export enum ScopeNames { } ] }) -export class VideoCommentModel extends Model { +export class VideoCommentModel extends Model>> { @CreatedAt createdAt: Date @@ -254,6 +192,18 @@ export class VideoCommentModel extends Model { }) CommentAbuses: VideoCommentAbuseModel[] + // --------------------------------------------------------------------------- + + static getSQLAttributes (tableName: string, aliasPrefix = '') { + return buildSQLAttributes({ + model: this, + tableName, + aliasPrefix + }) + } + + // --------------------------------------------------------------------------- + static loadById (id: number, t?: Transaction): Promise { const query: FindOptions = { where: { @@ -315,91 +265,25 @@ export class VideoCommentModel extends Model { count: number sort: string + onLocalVideo?: boolean isLocal?: boolean search?: string searchAccount?: string searchVideo?: string }) { - const { start, count, sort, isLocal, search, searchAccount, searchVideo } = parameters + const queryOptions: ListVideoCommentsOptions = { + ...pick(parameters, [ 'start', 'count', 'sort', 'isLocal', 'search', 'searchVideo', 'searchAccount', 'onLocalVideo' ]), - const where: WhereOptions = { - deletedAt: null + selectType: 'api', + notDeleted: true } - 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 } - }) + 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: { @@ -410,116 +294,70 @@ 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 accountBlockedWhere = { - accountId: { - [Op.notIn]: Sequelize.literal( - '(' + buildBlockedAccountSQL(blockerAccountIds) + ')' - ) - } + const commonOptions: ListVideoCommentsOptions = { + selectType: 'api', + videoId, + blockerAccountIds } - const queryList = { - offset: start, - limit: count, - order: getCommentSort(sort), - where: { - [Op.and]: [ - { - videoId - }, - { - inReplyToCommentId: null - }, - { - [Op.or]: [ - accountBlockedWhere, - { - accountId: null - } - ] - } - ] - } + const listOptions: ListVideoCommentsOptions = { + ...commonOptions, + ...pick(parameters, [ 'sort', 'start', 'count' ]), + + isThread: true, + includeReplyCounters: true } - const scopesList: (string | ScopeOptions)[] = [ - ScopeNames.WITH_ACCOUNT_FOR_API, - { - method: [ ScopeNames.ATTRIBUTES_FOR_API, blockerAccountIds ] - } - ] + const countOptions: ListVideoCommentsOptions = { + ...commonOptions, - const queryCount = { - where: { - videoId, - deletedAt: null, - ...accountBlockedWhere - } + isThread: true + } + + const notDeletedCountOptions: ListVideoCommentsOptions = { + ...commonOptions, + + notDeleted: true } return Promise.all([ - VideoCommentModel.scope(scopesList).findAndCountAll(queryList), - VideoCommentModel.count(queryCount) - ]).then(([ { rows, count }, totalNotDeletedComments ]) => { + 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.and]: [ - { - [Op.or]: [ - { id: threadId }, - { originCommentId: threadId } - ] - }, - { - [Op.or]: [ - { - accountId: { - [Op.notIn]: Sequelize.literal( - '(' + buildBlockedAccountSQL(blockerAccountIds) + ')' - ) - } - }, - { - accountId: null - } - ] - } - ] - } - } + 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'): Promise { @@ -547,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: { @@ -577,108 +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 whereAnd: WhereOptions[] = buildBlockedAccountSQLOptimized( - '"VideoCommentModel"."accountId"', - [ serverActor.Account.id, '"Video->VideoChannel"."accountId"' ] - ) + }) { + const blockerAccountIds = await VideoCommentModel.buildBlockerAccountIds({ user: null }) - if (accountId) { - whereAnd.push({ - [Op.eq]: accountId - }) - } + const queryOptions: ListVideoCommentsOptions = { + ...pick(parameters, [ 'start', 'count', 'accountId', 'videoId', 'videoChannelId' ]), - const accountWhere = { - [Op.and]: whereAnd - } + selectType: 'feed', - const videoChannelWhere = videoChannelId ? { id: videoChannelId } : undefined + sort: '-createdAt', + onPublicVideo: true, + notDeleted: true, - 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 - } - ] - } - ] + blockerAccountIds } - if (videoId) query.where['videoId'] = videoId - - 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 @@ -735,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 } @@ -781,7 +565,7 @@ export class VideoCommentModel extends Model { ) } - return uniq(result) + return uniqify(result) } toFormattedJSON (this: MCommentFormattable) { @@ -871,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(), @@ -882,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 } }