Fix playlist more button with long video names

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

diff --git a/server/lib/activitypub/send/send-follow.ts b/server/lib/activitypub/send/send-follow.ts
index 51735ddfd0599569b4079c722b5cff27f2602f71..a59ed50cf9d9d9d52523e19dce36cb291cb3dc56 100644 (file)
--- a/server/lib/activitypub/send/send-follow.ts
+++ b/server/lib/activitypub/send/send-follow.ts
@@ -1,26 +1,32 @@
-import { Transaction } from 'sequelize'
 import { ActivityFollow } from '../../../../shared/models/activitypub'
-import { AccountModel } from '../../../models/account/account'
-import { AccountFollowModel } from '../../../models/account/account-follow'
-import { getAccountFollowActivityPubUrl } from '../url'
-import { unicastTo } from './misc'
+import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
+import { getActorFollowActivityPubUrl } from '../url'
+import { unicastTo } from './utils'
+import { logger } from '../../../helpers/logger'
+import { Transaction } from 'sequelize'
+import { ActorModelOnly } from '../../../typings/models'
+
+function sendFollow (actorFollow: ActorFollowModel, t: Transaction) {
+  const me = actorFollow.ActorFollower
+  const following = actorFollow.ActorFollowing
+
+  // Same server as ours
+  if (!following.serverId) return
 
-function sendFollow (accountFollow: AccountFollowModel, t: Transaction) {
-  const me = accountFollow.AccountFollower
-  const following = accountFollow.AccountFollowing
+  logger.info('Creating job to send follow request to %s.', following.url)
 
-  const url = getAccountFollowActivityPubUrl(accountFollow)
-  const data = followActivityData(url, me, following)
+  const url = getActorFollowActivityPubUrl(me, following)
+  const data = buildFollowActivity(url, me, following)
 
-  return unicastTo(data, me, following.inboxUrl, t)
+  t.afterCommit(() => unicastTo(data, me, following.inboxUrl))
 }
 
-function followActivityData (url: string, byAccount: AccountModel, targetAccount: AccountModel): ActivityFollow {
+function buildFollowActivity (url: string, byActor: ActorModelOnly, targetActor: ActorModelOnly): ActivityFollow {
   return {
     type: 'Follow',
     id: url,
-    actor: byAccount.url,
-    object: targetAccount.url
+    actor: byActor.url,
+    object: targetActor.url
   }
 }
 
@@ -28,5 +34,5 @@ function followActivityData (url: string, byAccount: AccountModel, targetAccount
 
 export {
   sendFollow,
-  followActivityData
+  buildFollowActivity
 }