X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-follow.ts;h=93df7e191e2a7f6b3c2061a4290c98e86b998905;hb=b211106695bb82f6c32e53306081b5262c3d109d;hp=140bbe9f1322e26fe4cf5326e2e1594810051d75;hpb=14893eb71cb2d4ca47e07589c81958863603aba4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/process/process-follow.ts b/server/lib/activitypub/process/process-follow.ts
index 140bbe9f1..93df7e191 100644
--- a/server/lib/activitypub/process/process-follow.ts
+++ b/server/lib/activitypub/process/process-follow.ts
@@ -1,18 +1,25 @@
+import { getServerActor } from '@server/models/application/application'
 import { ActivityFollow } from '../../../../shared/models/activitypub'
 import { retryTransactionWrapper } from '../../../helpers/database-utils'
 import { logger } from '../../../helpers/logger'
-import { sequelizeTypescript, CONFIG } from '../../../initializers'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
-import { sendAccept, sendReject } from '../send'
+import { CONFIG } from '../../../initializers/config'
+import { sequelizeTypescript } from '../../../initializers/database'
+import { getAPId } from '../../../lib/activitypub/activity'
+import { ActorModel } from '../../../models/actor/actor'
+import { ActorFollowModel } from '../../../models/actor/actor-follow'
+import { APProcessorOptions } from '../../../types/activitypub-processor.model'
+import { MActorFollowActors, MActorSignature } from '../../../types/models'
 import { Notifier } from '../../notifier'
-import { getAPId } from '../../../helpers/activitypub'
-import { getServerActor } from '../../../helpers/utils'
+import { autoFollowBackIfNeeded } from '../follow'
+import { sendAccept, sendReject } from '../send'
 
-async function processFollowActivity (activity: ActivityFollow, byActor: ActorModel) {
-  const activityObject = getAPId(activity.object)
+async function processFollowActivity (options: APProcessorOptions<ActivityFollow>) {
+  const { activity, byActor } = options
 
-  return retryTransactionWrapper(processFollow, byActor, activityObject)
+  const activityId = activity.id
+  const objectId = getAPId(activity.object)
+
+  return retryTransactionWrapper(processFollow, byActor, activityId, objectId)
 }
 
 // ---------------------------------------------------------------------------
@@ -23,51 +30,74 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function processFollow (actor: ActorModel, targetActorURL: string) {
-  const { actorFollow, created } = await sequelizeTypescript.transaction(async t => {
+async function processFollow (byActor: MActorSignature, activityId: string, targetActorURL: string) {
+  const { actorFollow, created, isFollowingInstance, targetActor } = await sequelizeTypescript.transaction(async t => {
     const targetActor = await ActorModel.loadByUrlAndPopulateAccountAndChannel(targetActorURL, t)
 
     if (!targetActor) throw new Error('Unknown actor')
     if (targetActor.isOwned() === false) throw new Error('This is not a local actor.')
 
     const serverActor = await getServerActor()
-    if (targetActor.id === serverActor.id && CONFIG.FOLLOWERS.INSTANCE.ENABLED === false) {
+    const isFollowingInstance = targetActor.id === serverActor.id
+
+    if (isFollowingInstance && CONFIG.FOLLOWERS.INSTANCE.ENABLED === false) {
       logger.info('Rejecting %s because instance followers are disabled.', targetActor.url)
 
-      return sendReject(actor, targetActor)
+      sendReject(activityId, byActor, targetActor)
+
+      return { actorFollow: undefined as MActorFollowActors }
     }
 
-    const [ actorFollow, created ] = await ActorFollowModel.findOrCreate({
-      where: {
-        actorId: actor.id,
-        targetActorId: targetActor.id
-      },
-      defaults: {
-        actorId: actor.id,
-        targetActorId: targetActor.id,
-        state: CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL ? 'pending' : 'accepted'
-      },
+    const [ actorFollow, created ] = await ActorFollowModel.findOrCreateCustom({
+      byActor,
+      targetActor,
+      activityId,
+      state: CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL
+        ? 'pending'
+        : 'accepted',
       transaction: t
     })
 
-    actorFollow.ActorFollower = actor
-    actorFollow.ActorFollowing = targetActor
-
-    if (actorFollow.state !== 'accepted' && CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === false) {
+    // Set the follow as accepted if the remote actor follows a channel or account
+    // Or if the instance automatically accepts followers
+    if (actorFollow.state !== 'accepted' && (isFollowingInstance === false || CONFIG.FOLLOWERS.INSTANCE.MANUAL_APPROVAL === false)) {
       actorFollow.state = 'accepted'
+
       await actorFollow.save({ transaction: t })
     }
 
-    actorFollow.ActorFollower = actor
+    // Before PeerTube V3 we did not save the follow ID. Try to fix these old follows
+    if (!actorFollow.url) {
+      actorFollow.url = activityId
+      await actorFollow.save({ transaction: t })
+    }
+
+    actorFollow.ActorFollower = byActor
     actorFollow.ActorFollowing = targetActor
 
     // Target sends to actor he accepted the follow request
-    if (actorFollow.state === 'accepted') await sendAccept(actorFollow)
+    if (actorFollow.state === 'accepted') {
+      sendAccept(actorFollow)
+
+      await autoFollowBackIfNeeded(actorFollow, t)
+    }
 
-    return { actorFollow, created }
+    return { actorFollow, created, isFollowingInstance, targetActor }
   })
 
-  if (created) Notifier.Instance.notifyOfNewFollow(actorFollow)
+  // Rejected
+  if (!actorFollow) return
+
+  if (created) {
+    const follower = await ActorModel.loadFull(byActor.id)
+    const actorFollowFull = Object.assign(actorFollow, { ActorFollowing: targetActor, ActorFollower: follower })
+
+    if (isFollowingInstance) {
+      Notifier.Instance.notifyOfNewInstanceFollow(actorFollowFull)
+    } else {
+      Notifier.Instance.notifyOfNewUserFollow(actorFollowFull)
+    }
+  }
 
-  logger.info('Actor %s is followed by actor %s.', targetActorURL, actor.url)
+  logger.info('Actor %s is followed by actor %s.', targetActorURL, byActor.url)
 }