Convert followers/following in raw SQL queries

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

diff --git a/server/lib/activitypub/send/send-reject.ts b/server/lib/activitypub/send/send-reject.ts
index 63110b43395dbfa7e7941ad1c142d00ab5e08d38..83d8dfba72366e78888216535a0aec006b2c32de 100644 (file)
--- a/server/lib/activitypub/send/send-reject.ts
+++ b/server/lib/activitypub/send/send-reject.ts
@@ -1,12 +1,11 @@
-import { ActivityFollow, ActivityReject } from '../../../../shared/models/activitypub'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { getActorFollowActivityPubUrl, getActorFollowRejectActivityPubUrl } from '../url'
-import { unicastTo } from './utils'
-import { buildFollowActivity } from './send-follow'
+import { ActivityFollow, ActivityReject } from '@shared/models'
 import { logger } from '../../../helpers/logger'
-import { SignatureActorModel } from '../../../typings/models'
+import { MActor } from '../../../types/models'
+import { getLocalActorFollowRejectActivityPubUrl } from '../url'
+import { buildFollowActivity } from './send-follow'
+import { unicastTo } from './shared/send-utils'
 
-async function sendReject (follower: SignatureActorModel, following: ActorModel) {
+function sendReject (followUrl: string, follower: MActor, following: MActor) {
   if (!follower.serverId) { // This should never happen
     logger.warn('Do not sending reject to local follower.')
     return
@@ -14,13 +13,12 @@ async function sendReject (follower: SignatureActorModel, following: ActorModel)
 
   logger.info('Creating job to reject follower %s.', follower.url)
 
-  const followUrl = getActorFollowActivityPubUrl(follower, following)
   const followData = buildFollowActivity(followUrl, follower, following)
 
-  const url = getActorFollowRejectActivityPubUrl(follower, following)
+  const url = getLocalActorFollowRejectActivityPubUrl(follower, following)
   const data = buildRejectActivity(url, following, followData)
 
-  return unicastTo(data, following, follower.inboxUrl)
+  return unicastTo({ data, byActor: following, toActorUrl: follower.inboxUrl, contextType: 'Reject' })
 }
 
 // ---------------------------------------------------------------------------
@@ -31,7 +29,7 @@ export {
 
 // ---------------------------------------------------------------------------
 
-function buildRejectActivity (url: string, byActor: ActorModel, followActivityData: ActivityFollow): ActivityReject {
+function buildRejectActivity (url: string, byActor: MActor, followActivityData: ActivityFollow): ActivityReject {
   return {
     type: 'Reject',
     id: url,