Convert followers/following in raw SQL queries

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

diff --git a/server/lib/activitypub/send/send-dislike.ts b/server/lib/activitypub/send/send-dislike.ts
index a88436f2c963ee061e07dbc0f531d4109212cdb6..959e74823f928a085df818ac7030353465bab55c 100644 (file)
--- a/server/lib/activitypub/send/send-dislike.ts
+++ b/server/lib/activitypub/send/send-dislike.ts
@@ -1,25 +1,24 @@
 import { Transaction } from 'sequelize'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { VideoModel } from '../../../models/video/video'
-import { getVideoDislikeActivityPubUrl } from '../url'
+import { ActivityAudience, ActivityDislike } from '@shared/models'
 import { logger } from '../../../helpers/logger'
-import { ActivityAudience, ActivityDislike } from '../../../../shared/models/activitypub'
-import { sendVideoRelatedActivity } from './utils'
+import { MActor, MActorAudience, MVideoAccountLight, MVideoUrl } from '../../../types/models'
 import { audiencify, getAudience } from '../audience'
+import { getVideoDislikeActivityPubUrlByLocalActor } from '../url'
+import { sendVideoActivityToOrigin } from './shared/send-utils'
 
-async function sendDislike (byActor: ActorModel, video: VideoModel, t: Transaction) {
+function sendDislike (byActor: MActor, video: MVideoAccountLight, transaction: Transaction) {
   logger.info('Creating job to dislike %s.', video.url)
 
   const activityBuilder = (audience: ActivityAudience) => {
-    const url = getVideoDislikeActivityPubUrl(byActor, video)
+    const url = getVideoDislikeActivityPubUrlByLocalActor(byActor, video)
 
     return buildDislikeActivity(url, byActor, video, audience)
   }
 
-  return sendVideoRelatedActivity(activityBuilder, { byActor, video, transaction: t })
+  return sendVideoActivityToOrigin(activityBuilder, { byActor, video, transaction, contextType: 'Rate' })
 }
 
-function buildDislikeActivity (url: string, byActor: ActorModel, video: VideoModel, audience?: ActivityAudience): ActivityDislike {
+function buildDislikeActivity (url: string, byActor: MActorAudience, video: MVideoUrl, audience?: ActivityAudience): ActivityDislike {
   if (!audience) audience = getAudience(byActor)
 
   return audiencify(