]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Fix sending accept to old follows
authorChocobozzz <me@florianbigard.com>
Fri, 19 Feb 2021 12:55:00 +0000 (13:55 +0100)
committerChocobozzz <me@florianbigard.com>
Fri, 19 Feb 2021 12:55:00 +0000 (13:55 +0100)
server/lib/activitypub/process/process-follow.ts

index 076ad9cf42e8889bd46b697207a8667494e8d6e5..38d684512e1ccbdc6f25b2a5b151cf43eb7c06c5 100644 (file)
@@ -69,6 +69,13 @@ async function processFollow (byActor: MActorSignature, activityId: string, targ
     // 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 })
+    }
+
+    // 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 })
     }