import * as Sequelize from 'sequelize'
import {
- AfterDestroy, AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, IFindOptions, Is, Model, Scopes, Table,
+ 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 { 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'
},
{
fields: [ 'videoId', 'originCommentId' ]
+ },
+ {
+ fields: [ 'url' ],
+ unique: true
}
]
})
})
Account: AccountModel
- @AfterDestroy
- static async sendDeleteIfOwned (instance: VideoCommentModel) {
+ @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.isOwned()) {
- await sendDeleteVideoComment(instance, undefined)
+ await sendDeleteVideoComment(instance, options.transaction)
}
}
.findOne(query)
}
- static loadByUrl (url: string, t?: Sequelize.Transaction) {
+ static loadByUrlAndPopulateAccount (url: string, t?: Sequelize.Transaction) {
const query: IFindOptions<VideoCommentModel> = {
where: {
url
if (t !== undefined) query.transaction = t
- return VideoCommentModel.findOne(query)
+ return VideoCommentModel.scope([ ScopeNames.WITH_ACCOUNT ]).findOne(query)
}
- static loadByUrlAndPopulateAccount (url: string, t?: Sequelize.Transaction) {
+ static loadByUrlAndPopulateReplyAndVideo (url: string, t?: Sequelize.Transaction) {
const query: IFindOptions<VideoCommentModel> = {
where: {
url
if (t !== undefined) query.transaction = t
- return VideoCommentModel.scope([ ScopeNames.WITH_ACCOUNT ]).findOne(query)
+ return VideoCommentModel.scope([ ScopeNames.WITH_IN_REPLY_TO, ScopeNames.WITH_VIDEO ]).findOne(query)
}
static listThreadsForApi (videoId: number, start: number, count: number, sort: string) {
static listThreadCommentsForApi (videoId: number, threadId: number) {
const query = {
- order: [ [ 'createdAt', 'ASC' ] ],
+ order: [ [ 'createdAt', 'ASC' ], [ 'updatedAt', 'ASC' ] ],
where: {
videoId,
[ Sequelize.Op.or ]: [
})
}
+ static listThreadParentComments (comment: VideoCommentModel, t: Sequelize.Transaction, order: 'ASC' | 'DESC' = 'ASC') {
+ const query = {
+ order: [ [ 'createdAt', order ] ],
+ where: {
+ [ Sequelize.Op.or ]: [
+ { id: comment.getThreadId() },
+ { originCommentId: comment.getThreadId() }
+ ],
+ id: {
+ [ Sequelize.Op.ne ]: comment.id
+ },
+ createdAt: {
+ [ Sequelize.Op.lt ]: comment.createdAt
+ }
+ },
+ transaction: t
+ }
+
+ return VideoCommentModel
+ .scope([ ScopeNames.WITH_ACCOUNT ])
+ .findAll(query)
+ }
+
+ getThreadId (): number {
+ return this.originCommentId || this.id
+ }
+
isOwned () {
return this.Account.isOwned()
}
} as VideoComment
}
- toActivityPubObject (): VideoCommentObject {
+ toActivityPubObject (threadParentComments: VideoCommentModel[]): VideoCommentObject {
let inReplyTo: string
// New thread, so in AS we reply to the video
if (this.inReplyToCommentId === null) {
inReplyTo = this.InReplyToVideoComment.url
}
+ const tag: ActivityTagObject[] = []
+ for (const parentComment of threadParentComments) {
+ const actor = parentComment.Account.Actor
+
+ tag.push({
+ type: 'Mention',
+ href: actor.url,
+ name: `@${actor.preferredUsername}@${actor.getHost()}`
+ })
+ }
+
return {
type: 'Note' as 'Note',
id: this.url,
updated: this.updatedAt.toISOString(),
published: this.createdAt.toISOString(),
url: this.url,
- attributedTo: this.Account.Actor.url
+ attributedTo: this.Account.Actor.url,
+ tag
}
}
}