import { ActivityLike } from '../../../../shared/models/activitypub'
-import { retryTransactionWrapper } from '../../../helpers'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
import { sequelizeTypescript } from '../../../initializers'
-import { AccountModel } from '../../../models/account/account'
import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
-import { VideoModel } from '../../../models/video/video'
-import { getOrCreateAccountAndServer } from '../account'
-import { forwardActivity } from '../send/misc'
+import { ActorModel } from '../../../models/activitypub/actor'
+import { getOrCreateActorAndServerAndModel } from '../actor'
+import { forwardVideoRelatedActivity } from '../send/utils'
+import { getOrCreateAccountAndVideoAndChannel } from '../videos'
async function processLikeActivity (activity: ActivityLike) {
- const account = await getOrCreateAccountAndServer(activity.actor)
+ const actor = await getOrCreateActorAndServerAndModel(activity.actor)
- return processLikeVideo(account, activity)
+ return retryTransactionWrapper(processLikeVideo, actor, activity)
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-async function processLikeVideo (byAccount: AccountModel, activity: ActivityLike) {
- const options = {
- arguments: [ byAccount, activity ],
- errorMessage: 'Cannot like the video with many retries.'
- }
-
- return retryTransactionWrapper(createVideoLike, options)
-}
-
-function createVideoLike (byAccount: AccountModel, activity: ActivityLike) {
+async function processLikeVideo (byActor: ActorModel, activity: ActivityLike) {
const videoUrl = activity.object
- return sequelizeTypescript.transaction(async t => {
- const video = await VideoModel.loadByUrlAndPopulateAccount(videoUrl)
+ const byAccount = byActor.Account
+ if (!byAccount) throw new Error('Cannot create like with the non account actor ' + byActor.url)
- if (!video) throw new Error('Unknown video ' + videoUrl)
+ const { video } = await getOrCreateAccountAndVideoAndChannel(videoUrl)
+ return sequelizeTypescript.transaction(async t => {
const rate = {
type: 'like' as 'like',
videoId: video.id,
if (video.isOwned() && created === true) {
// Don't resend the activity to the sender
- const exceptions = [ byAccount ]
- await forwardActivity(activity, t, exceptions)
+ const exceptions = [ byActor ]
+
+ await forwardVideoRelatedActivity(activity, t, exceptions, video)
}
})
}