X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-comment.ts;h=fee11ec5f971f723b0c7731fbb7b21725e3ff0ed;hb=b876eaf11a1ed9683664d94767ca684ba5b77753;hp=cf6278da77399a423f18040cee265f25b294ffb3;hpb=f7cc67b455a12ccae9b0ea16876d166720364357;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts index cf6278da7..fee11ec5f 100644 --- a/server/models/video/video-comment.ts +++ b/server/models/video/video-comment.ts @@ -1,4 +1,3 @@ -import * as Sequelize from 'sequelize' import { AllowNull, BeforeDestroy, @@ -7,7 +6,6 @@ import { CreatedAt, DataType, ForeignKey, - IFindOptions, Is, Model, Scopes, @@ -18,7 +16,7 @@ import { ActivityTagObject } from '../../../shared/models/activitypub/objects/co import { VideoCommentObject } from '../../../shared/models/activitypub/objects/video-comment-object' import { VideoComment } from '../../../shared/models/videos/video-comment.model' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' -import { CONFIG, CONSTRAINTS_FIELDS } from '../../initializers' +import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants' import { sendDeleteVideoComment } from '../../lib/activitypub/send' import { AccountModel } from '../account/account' import { ActorModel } from '../activitypub/actor' @@ -32,6 +30,7 @@ import { UserModel } from '../account/user' import { actorNameAlphabet } from '../../helpers/custom-validators/activitypub/actor' import { regexpCapture } from '../../helpers/regexp' import { uniq } from 'lodash' +import { FindOptions, Op, Order, ScopeOptions, Sequelize, Transaction } from 'sequelize' enum ScopeNames { WITH_ACCOUNT = 'WITH_ACCOUNT', @@ -40,7 +39,7 @@ enum ScopeNames { ATTRIBUTES_FOR_API = 'ATTRIBUTES_FOR_API' } -@Scopes({ +@Scopes(() => ({ [ScopeNames.ATTRIBUTES_FOR_API]: (serverAccountId: number, userAccountId?: number) => { return { attributes: { @@ -64,22 +63,22 @@ enum ScopeNames { ] ] } - } + } as FindOptions }, [ScopeNames.WITH_ACCOUNT]: { include: [ { - model: () => AccountModel, + model: AccountModel, include: [ { - model: () => ActorModel, + model: ActorModel, include: [ { - model: () => ServerModel, + model: ServerModel, required: false }, { - model: () => AvatarModel, + model: AvatarModel, required: false } ] @@ -91,7 +90,7 @@ enum ScopeNames { [ScopeNames.WITH_IN_REPLY_TO]: { include: [ { - model: () => VideoCommentModel, + model: VideoCommentModel, as: 'InReplyToVideoComment' } ] @@ -99,19 +98,19 @@ enum ScopeNames { [ScopeNames.WITH_VIDEO]: { include: [ { - model: () => VideoModel, + model: VideoModel, required: true, include: [ { - model: () => VideoChannelModel.unscoped(), + model: VideoChannelModel.unscoped(), required: true, include: [ { - model: () => AccountModel, + model: AccountModel, required: true, include: [ { - model: () => ActorModel, + model: ActorModel, required: true } ] @@ -122,7 +121,7 @@ enum ScopeNames { } ] } -}) +})) @Table({ tableName: 'videoComment', indexes: [ @@ -244,8 +243,8 @@ export class VideoCommentModel extends Model { } } - static loadById (id: number, t?: Sequelize.Transaction) { - const query: IFindOptions = { + static loadById (id: number, t?: Transaction) { + const query: FindOptions = { where: { id } @@ -256,8 +255,8 @@ export class VideoCommentModel extends Model { return VideoCommentModel.findOne(query) } - static loadByIdAndPopulateVideoAndAccountAndReply (id: number, t?: Sequelize.Transaction) { - const query: IFindOptions = { + static loadByIdAndPopulateVideoAndAccountAndReply (id: number, t?: Transaction) { + const query: FindOptions = { where: { id } @@ -270,8 +269,8 @@ export class VideoCommentModel extends Model { .findOne(query) } - static loadByUrlAndPopulateAccount (url: string, t?: Sequelize.Transaction) { - const query: IFindOptions = { + static loadByUrlAndPopulateAccount (url: string, t?: Transaction) { + const query: FindOptions = { where: { url } @@ -282,8 +281,8 @@ export class VideoCommentModel extends Model { return VideoCommentModel.scope([ ScopeNames.WITH_ACCOUNT ]).findOne(query) } - static loadByUrlAndPopulateReplyAndVideo (url: string, t?: Sequelize.Transaction) { - const query: IFindOptions = { + static loadByUrlAndPopulateReplyAndVideo (url: string, t?: Transaction) { + const query: FindOptions = { where: { url } @@ -307,15 +306,14 @@ export class VideoCommentModel extends Model { videoId, inReplyToCommentId: null, accountId: { - [Sequelize.Op.notIn]: Sequelize.literal( + [Op.notIn]: Sequelize.literal( '(' + buildBlockedAccountSQL(serverAccountId, userAccountId) + ')' ) } } } - // FIXME: typings - const scopes: any[] = [ + const scopes: (string | ScopeOptions)[] = [ ScopeNames.WITH_ACCOUNT, { method: [ ScopeNames.ATTRIBUTES_FOR_API, serverAccountId, userAccountId ] @@ -336,15 +334,15 @@ export class VideoCommentModel extends Model { const userAccountId = user ? user.Account.id : undefined 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( + [Op.notIn]: Sequelize.literal( '(' + buildBlockedAccountSQL(serverAccountId, userAccountId) + ')' ) } @@ -366,12 +364,12 @@ export class VideoCommentModel extends Model { }) } - static listThreadParentComments (comment: VideoCommentModel, t: Sequelize.Transaction, order: 'ASC' | 'DESC' = 'ASC') { + static listThreadParentComments (comment: VideoCommentModel, t: Transaction, order: 'ASC' | 'DESC' = 'ASC') { 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 ' + @@ -380,7 +378,7 @@ export class VideoCommentModel extends Model { ') ' + 'SELECT id FROM children' + ')'), - [ Sequelize.Op.ne ]: comment.id + [ Op.ne ]: comment.id } }, transaction: t @@ -391,9 +389,9 @@ export class VideoCommentModel extends Model { .findAll(query) } - static listAndCountByVideoId (videoId: number, start: number, count: number, t?: Sequelize.Transaction, order: 'ASC' | 'DESC' = 'ASC') { + static listAndCountByVideoId (videoId: number, start: number, count: number, t?: Transaction, order: 'ASC' | 'DESC' = 'ASC') { const query = { - order: [ [ 'createdAt', order ] ], + order: [ [ 'createdAt', order ] ] as Order, offset: start, limit: count, where: { @@ -407,7 +405,7 @@ export class VideoCommentModel extends Model { static listForFeed (start: number, count: number, videoId?: number) { const query = { - order: [ [ 'createdAt', 'DESC' ] ], + order: [ [ 'createdAt', 'DESC' ] ] as Order, offset: start, limit: count, where: {}, @@ -453,6 +451,19 @@ export class VideoCommentModel extends Model { } } + static cleanOldCommentsOf (videoId: number, beforeUpdatedAt: Date) { + const query = { + where: { + updatedAt: { + [Op.lt]: beforeUpdatedAt + }, + videoId + } + } + + return VideoCommentModel.destroy(query) + } + getCommentStaticPath () { return this.Video.getWatchStaticPath() + ';threadId=' + this.getThreadId() } @@ -466,31 +477,41 @@ export class VideoCommentModel extends Model { } extractMentions () { - if (!this.text) return [] + 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? + : '(?:' + remoteMention + ')' + const firstMentionRegex = new RegExp(`^${mentionRegex} `, 'g') + const endMentionRegex = new RegExp(` ${mentionRegex}$`, 'g') const remoteMentionsRegex = new RegExp(' ' + remoteMention + ' ', 'g') - const localMentionsRegex = new RegExp(' ' + localMention + ' ', 'g') - const firstMentionRegex = new RegExp('^(?:(?:' + remoteMention + ')|(?:' + localMention + ')) ', 'g') - const endMentionRegex = new RegExp(' (?:(?:' + remoteMention + ')|(?:' + localMention + '))$', 'g') - return uniq( - [].concat( - regexpCapture(this.text, remoteMentionsRegex) - .map(([ , username ]) => username), + result = result.concat( + regexpCapture(this.text, firstMentionRegex) + .map(([ , username1, username2 ]) => username1 || username2), - regexpCapture(this.text, localMentionsRegex) - .map(([ , username ]) => username), + regexpCapture(this.text, endMentionRegex) + .map(([ , username1, username2 ]) => username1 || username2), + + regexpCapture(this.text, remoteMentionsRegex) + .map(([ , username ]) => username) + ) - regexpCapture(this.text, firstMentionRegex) - .map(([ , username1, username2 ]) => username1 || username2), + // Include local mentions + if (this.isOwned()) { + const localMentionsRegex = new RegExp(' ' + localMention + ' ', 'g') - regexpCapture(this.text, endMentionRegex) - .map(([ , username1, username2 ]) => username1 || username2) + result = result.concat( + regexpCapture(this.text, localMentionsRegex) + .map(([ , username ]) => username) ) - ) + } + + return uniq(result) } toFormattedJSON () {