Fix auto follow index URL

diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 13456071717889718ca6e48179a40da48778de83..e5cac64d4961e33e875a3037cb86b40bd0a4440d 100644 (file)
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -178,10 +178,6 @@ const SCHEDULER_INTERVALS_MS = {
   removeOldHistory: 60000 * 60 * 24 // 1 day
 }
 
-const INSTANCES_INDEX = {
-  HOSTS_PATH: '/api/v1/instances/hosts'
-}
-
 // ---------------------------------------------------------------------------
 
 const CONSTRAINTS_FIELDS = {
@@ -730,7 +726,6 @@ export {
   PREVIEWS_SIZE,
   REMOTE_SCHEME,
   FOLLOW_STATES,
-  INSTANCES_INDEX,
   DEFAULT_USER_THEME_NAME,
   SERVER_ACTOR_NAME,
   PLUGIN_GLOBAL_CSS_FILE_NAME,

diff --git a/server/lib/schedulers/auto-follow-index-instances.ts b/server/lib/schedulers/auto-follow-index-instances.ts
index a57436a4566d79fb9f77051f3d617b4d13a6a170..f62f52f9cdc237adf6dcea7b34bd3644ae4be30f 100644 (file)
--- a/server/lib/schedulers/auto-follow-index-instances.ts
+++ b/server/lib/schedulers/auto-follow-index-instances.ts
@@ -1,12 +1,12 @@
-import { logger } from '../../helpers/logger'
-import { AbstractScheduler } from './abstract-scheduler'
-import { INSTANCES_INDEX, SCHEDULER_INTERVALS_MS, SERVER_ACTOR_NAME } from '../../initializers/constants'
-import { CONFIG } from '../../initializers/config'
 import { chunk } from 'lodash'
 import { doRequest } from '@server/helpers/requests'
-import { ActorFollowModel } from '@server/models/activitypub/actor-follow'
 import { JobQueue } from '@server/lib/job-queue'
+import { ActorFollowModel } from '@server/models/activitypub/actor-follow'
 import { getServerActor } from '@server/models/application/application'
+import { logger } from '../../helpers/logger'
+import { CONFIG } from '../../initializers/config'
+import { SCHEDULER_INTERVALS_MS, SERVER_ACTOR_NAME } from '../../initializers/constants'
+import { AbstractScheduler } from './abstract-scheduler'
 
 export class AutoFollowIndexInstances extends AbstractScheduler {
 
@@ -34,16 +34,14 @@ export class AutoFollowIndexInstances extends AbstractScheduler {
     try {
       const serverActor = await getServerActor()
 
-      const uri = indexUrl + INSTANCES_INDEX.HOSTS_PATH
-
       const qs = { count: 1000 }
       if (this.lastCheck) Object.assign(qs, { since: this.lastCheck.toISOString() })
 
       this.lastCheck = new Date()
 
-      const { body } = await doRequest<any>({ uri, qs, json: true })
+      const { body } = await doRequest<any>({ uri: indexUrl, qs, json: true })
       if (!body.data || Array.isArray(body.data) === false) {
-        logger.error('Cannot auto follow instances of index %s: bad URL format. Please check the auto follow URL.', indexUrl)
+        logger.error('Cannot auto follow instances of index %s. Please check the auto follow URL.', indexUrl, { body })
         return
       }
 

diff --git a/server/tests/api/server/auto-follows.ts b/server/tests/api/server/auto-follows.ts
index 7efccc3e20d2e274958f8c80b64643cbf6bd5eca..e04d70af4a44dc77d6ca3576181566d0e97ed3af 100644 (file)
--- a/server/tests/api/server/auto-follows.ts
+++ b/server/tests/api/server/auto-follows.ts
@@ -177,7 +177,7 @@ describe('Test auto follows', function () {
         followings: {
           instance: {
             autoFollowIndex: {
-              indexUrl: 'http://localhost:42100/api/v1/instances/hosts',
+              indexUrl: 'http://localhost:42101/api/v1/instances/hosts',
               enabled: true
             }
           }

diff --git a/shared/extra-utils/instances-index/mock-instances-index.ts b/shared/extra-utils/instances-index/mock-instances-index.ts
index c58e8bcf82149dfcfecca1d329ac4919ad1b5a51..ea09c9f6163d62b9797c66b1e764be5854c84b1a 100644 (file)
--- a/shared/extra-utils/instances-index/mock-instances-index.ts
+++ b/shared/extra-utils/instances-index/mock-instances-index.ts
@@ -28,7 +28,7 @@ export class MockInstancesIndex {
         })
       })
 
-      app.listen(42100, () => res())
+      app.listen(42101, () => res())
     })
   }