X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-comment.ts;h=1d3178164bb439e0794c0d80fed9bfbb6f05f31d;hb=714e33a7428b71ef98129ce85a4bd64140bcd912;hp=dc7556d441a476bc279ff6e850e4182a84d7750f;hpb=2a021e6cb6836864bb013d5ff451e8a4ae45c9b7;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts index dc7556d44..1d3178164 100644 --- a/server/models/video/video-comment.ts +++ b/server/models/video/video-comment.ts @@ -1,5 +1,5 @@ import { uniq } from 'lodash' -import { FindAndCountOptions, FindOptions, Op, Order, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize' +import { FindOptions, Op, Order, QueryTypes, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize' import { AllowNull, BelongsTo, @@ -17,9 +17,10 @@ import { import { getServerActor } from '@server/models/application/application' import { MAccount, MAccountId, MUserAccountId } from '@server/types/models' import { VideoPrivacy } from '@shared/models' +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,7 +40,7 @@ import { } from '../../types/models/video' import { VideoCommentAbuseModel } from '../abuse/video-comment-abuse' import { AccountModel } from '../account/account' -import { ActorModel, unusedActorAttributesForAPI } from '../activitypub/actor' +import { ActorModel, unusedActorAttributesForAPI } from '../actor/actor' import { buildBlockedAccountSQL, buildBlockedAccountSQLOptimized, @@ -68,14 +69,10 @@ export enum ScopeNames { 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")' + - ')' + + 'SELECT COUNT("replies"."id") ' + 'FROM "videoComment" AS "replies" ' + 'WHERE "replies"."originCommentId" = "VideoCommentModel"."id" ' + + 'AND "deletedAt" IS NULL ' + 'AND "accountId" NOT IN (SELECT "id" FROM "blocklist")' + ')' ), @@ -173,7 +170,7 @@ export enum ScopeNames { } ] }) -export class VideoCommentModel extends Model { +export class VideoCommentModel extends Model>> { @CreatedAt createdAt: Date @@ -366,40 +363,43 @@ export class VideoCommentModel extends Model { 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 - } - ] + const getQuery = (forCount: boolean) => { + return { + offset: start, + limit: count, + order: getCommentSort(sort), + where, + include: [ + { + model: AccountModel.unscoped(), + required: true, + where: whereAccount, + include: [ + { + attributes: { + exclude: unusedActorAttributesForAPI + }, + model: forCount === true + ? ActorModel.unscoped() // Default scope includes avatar and server + : ActorModel, + 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([ + VideoCommentModel.count(getQuery(true)), + VideoCommentModel.findAll(getQuery(false)) + ]).then(([ total, data ]) => ({ total, data })) } static async listThreadsForApi (parameters: { @@ -446,14 +446,20 @@ export class VideoCommentModel extends Model { } } - const scopesList: (string | ScopeOptions)[] = [ + const findScopesList: (string | ScopeOptions)[] = [ ScopeNames.WITH_ACCOUNT_FOR_API, { method: [ ScopeNames.ATTRIBUTES_FOR_API, blockerAccountIds ] } ] - const queryCount = { + const countScopesList: ScopeOptions[] = [ + { + method: [ ScopeNames.ATTRIBUTES_FOR_API, blockerAccountIds ] + } + ] + + const notDeletedQueryCount = { where: { videoId, deletedAt: null, @@ -462,9 +468,10 @@ export class VideoCommentModel extends Model { } return Promise.all([ - VideoCommentModel.scope(scopesList).findAndCountAll(queryList), - VideoCommentModel.count(queryCount) - ]).then(([ { rows, count }, totalNotDeletedComments ]) => { + VideoCommentModel.scope(findScopesList).findAll(queryList), + VideoCommentModel.scope(countScopesList).count(queryList), + VideoCommentModel.count(notDeletedQueryCount) + ]).then(([ rows, count, totalNotDeletedComments ]) => { return { total: count, data: rows, totalNotDeletedComments } }) } @@ -515,11 +522,10 @@ export class VideoCommentModel extends Model { } ] - return VideoCommentModel.scope(scopes) - .findAndCountAll(query) - .then(({ rows, count }) => { - return { total: count, data: rows } - }) + return Promise.all([ + VideoCommentModel.count(query), + VideoCommentModel.scope(scopes).findAll(query) + ]).then(([ total, data ]) => ({ total, data })) } static listThreadParentComments (comment: MCommentId, t: Transaction, order: 'ASC' | 'DESC' = 'ASC'): Promise { @@ -568,7 +574,10 @@ export class VideoCommentModel extends Model { transaction: t } - return VideoCommentModel.findAndCountAll(query) + return Promise.all([ + VideoCommentModel.count(query), + VideoCommentModel.findAll(query) + ]).then(([ total, data ]) => ({ total, data })) } static async listForFeed (parameters: { @@ -588,7 +597,7 @@ export class VideoCommentModel extends Model { if (accountId) { whereAnd.push({ - [Op.eq]: accountId + accountId }) } @@ -674,11 +683,11 @@ export class VideoCommentModel extends Model { const totalLocalVideoComments = await VideoCommentModel.count({ include: [ { - model: AccountModel, + model: AccountModel.unscoped(), required: true, include: [ { - model: ActorModel, + model: ActorModel.unscoped(), required: true, where: { serverId: null @@ -696,6 +705,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: { @@ -730,6 +751,12 @@ export class VideoCommentModel extends Model { return this.Account.isOwned() } + markAsDeleted () { + this.text = '' + this.deletedAt = new Date() + this.accountId = null + } + isDeleted () { return this.deletedAt !== null } @@ -859,7 +886,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(),