Fix shared imports

[github/Chocobozzz/PeerTube.git] / server / lib / activitypub / process / process-dislike.ts

diff --git a/server/lib/activitypub/process/process-dislike.ts b/server/lib/activitypub/process/process-dislike.ts
index 727fcfee0c7bef041f9a9b0567e2b7a39948d581..2f46b83d1be6cb699ae0d0c605796be490d8b1bb 100644 (file)
--- a/server/lib/activitypub/process/process-dislike.ts
+++ b/server/lib/activitypub/process/process-dislike.ts
@@ -1,13 +1,11 @@
-import { ActivityCreate, ActivityDislike } from '../../../../shared'
-import { DislikeObject } from '../../../../shared/models/activitypub/objects'
+import { ActivityCreate, ActivityDislike, DislikeObject } from '@shared/models'
 import { retryTransactionWrapper } from '../../../helpers/database-utils'
-import { sequelizeTypescript } from '../../../initializers'
+import { sequelizeTypescript } from '../../../initializers/database'
 import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
-import { getOrCreateVideoAndAccountAndChannel } from '../videos'
+import { APProcessorOptions } from '../../../types/activitypub-processor.model'
+import { MActorSignature } from '../../../types/models'
 import { forwardVideoRelatedActivity } from '../send/utils'
-import { getVideoDislikeActivityPubUrl } from '../url'
-import { APProcessorOptions } from '../../../typings/activitypub-processor.model'
-import { SignatureActorModel } from '../../../typings/models'
+import { getOrCreateAPVideo } from '../videos'
 
 async function processDislikeActivity (options: APProcessorOptions<ActivityCreate | ActivityDislike>) {
   const { activity, byActor } = options
@@ -22,18 +20,19 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function processDislike (activity: ActivityCreate | ActivityDislike, byActor: SignatureActorModel) {
-  const dislikeObject = activity.type === 'Dislike' ? activity.object : (activity.object as DislikeObject).object
+async function processDislike (activity: ActivityCreate | ActivityDislike, byActor: MActorSignature) {
+  const dislikeObject = activity.type === 'Dislike'
+    ? activity.object
+    : (activity.object as DislikeObject).object
+
   const byAccount = byActor.Account
 
   if (!byAccount) throw new Error('Cannot create dislike with the non account actor ' + byActor.url)
 
-  const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: dislikeObject })
+  const { video } = await getOrCreateAPVideo({ videoObject: dislikeObject })
 
   return sequelizeTypescript.transaction(async t => {
-    const url = getVideoDislikeActivityPubUrl(byActor, video)
-
-    const existingRate = await AccountVideoRateModel.loadByAccountAndVideoOrUrl(byAccount.id, video.id, url)
+    const existingRate = await AccountVideoRateModel.loadByAccountAndVideoOrUrl(byAccount.id, video.id, activity.id, t)
     if (existingRate && existingRate.type === 'dislike') return
 
     await video.increment('dislikes', { transaction: t })
@@ -46,7 +45,7 @@ async function processDislike (activity: ActivityCreate | ActivityDislike, byAct
     rate.type = 'dislike'
     rate.videoId = video.id
     rate.accountId = byAccount.id
-    rate.url = url
+    rate.url = activity.id
 
     await rate.save({ transaction: t })