import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
import { ActorModel } from '../../../models/activitypub/actor'
import { VideoAbuseModel } from '../../../models/video/video-abuse'
-import { VideoCommentModel } from '../../../models/video/video-comment'
import { getOrCreateActorAndServerAndModel } from '../actor'
-import { resolveThread } from '../video-comments'
-import { getOrCreateAccountAndVideoAndChannel } from '../videos'
+import { addVideoComment, resolveThread } from '../video-comments'
+import { getOrCreateVideoAndAccountAndChannel } from '../videos'
import { forwardActivity, forwardVideoRelatedActivity } from '../send/utils'
+import { Redis } from '../../redis'
async function processCreateActivity (activity: ActivityCreate) {
const activityObject = activity.object
async function processCreateVideo (activity: ActivityCreate) {
const videoToCreateData = activity.object as VideoTorrentObject
- const { video } = await getOrCreateAccountAndVideoAndChannel(videoToCreateData)
+ const { video } = await getOrCreateVideoAndAccountAndChannel(videoToCreateData)
return video
}
if (!byAccount) throw new Error('Cannot create dislike with the non account actor ' + byActor.url)
- const { video } = await getOrCreateAccountAndVideoAndChannel(dislike.object)
+ const { video } = await getOrCreateVideoAndAccountAndChannel(dislike.object)
return sequelizeTypescript.transaction(async t => {
const rate = {
async function processCreateView (byActor: ActorModel, activity: ActivityCreate) {
const view = activity.object as ViewObject
- const { video } = await getOrCreateAccountAndVideoAndChannel(view.object)
+ const { video } = await getOrCreateVideoAndAccountAndChannel(view.object)
const actor = await ActorModel.loadByUrl(view.actor)
if (!actor) throw new Error('Unknown actor ' + view.actor)
- await video.increment('views')
+ await Redis.Instance.addVideoView(video.id)
if (video.isOwned()) {
// Don't resend the activity to the sender
const account = actor.Account
if (!account) throw new Error('Cannot create dislike with the non account actor ' + actor.url)
- const { video } = await getOrCreateAccountAndVideoAndChannel(videoAbuseToCreateData.object)
+ const { video } = await getOrCreateVideoAndAccountAndChannel(videoAbuseToCreateData.object)
return sequelizeTypescript.transaction(async t => {
const videoAbuseData = {
}
async function processCreateVideoComment (byActor: ActorModel, activity: ActivityCreate) {
- const comment = activity.object as VideoCommentObject
+ const commentObject = activity.object as VideoCommentObject
const byAccount = byActor.Account
if (!byAccount) throw new Error('Cannot create video comment with the non account actor ' + byActor.url)
- const { video, parents } = await resolveThread(comment.inReplyTo)
+ const { video } = await resolveThread(commentObject.inReplyTo)
- return sequelizeTypescript.transaction(async t => {
- let originCommentId = null
- let inReplyToCommentId = null
-
- if (parents.length !== 0) {
- const parent = parents[0]
-
- originCommentId = parent.getThreadId()
- inReplyToCommentId = parent.id
- }
-
- // This is a new thread
- const objectToCreate = {
- url: comment.id,
- text: comment.content,
- originCommentId,
- inReplyToCommentId,
- videoId: video.id,
- accountId: byAccount.id
- }
-
- const options = {
- where: {
- url: objectToCreate.url
- },
- defaults: objectToCreate,
- transaction: t
- }
- const [ ,created ] = await VideoCommentModel.findOrCreate(options)
+ const { created } = await addVideoComment(video, commentObject.id)
- if (video.isOwned() && created === true) {
- // Don't resend the activity to the sender
- const exceptions = [ byActor ]
+ if (video.isOwned() && created === true) {
+ // Don't resend the activity to the sender
+ const exceptions = [ byActor ]
- await forwardVideoRelatedActivity(activity, t, exceptions, video)
- }
- })
+ await forwardVideoRelatedActivity(activity, undefined, exceptions, video)
+ }
}