Merge branch 'release/2.1.0' into develop

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

diff --git a/server/lib/activitypub/follow.ts b/server/lib/activitypub/follow.ts
index c57e43c9107c73ee91a5e02d3de633e431d2ae53..a1c95504e3d7d6af694598bc5b8c8b306592d99a 100644 (file)
--- a/server/lib/activitypub/follow.ts
+++ b/server/lib/activitypub/follow.ts
@@ -4,7 +4,7 @@ import { SERVER_ACTOR_NAME } from '../../initializers/constants'
 import { JobQueue } from '../job-queue'
 import { logger } from '../../helpers/logger'
 import { getServerActor } from '../../helpers/utils'
-import { ServerModel } from '@server/models/server/server'
+import { ServerModel } from '../../models/server/server'
 
 async function autoFollowBackIfNeeded (actorFollow: MActorFollowActors) {
   if (!CONFIG.FOLLOWINGS.INSTANCE.AUTO_FOLLOW_BACK.ENABLED) return
@@ -27,7 +27,6 @@ async function autoFollowBackIfNeeded (actorFollow: MActorFollowActors) {
     }
 
     JobQueue.Instance.createJob({ type: 'activitypub-follow', payload })
-            .catch(err => logger.error('Cannot create auto follow back job for %s.', host, err))
   }
 }