From 4502709205d65c2a0eed70c26cce91b8a911e6fb Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 20 Dec 2023 16:30:54 +0100 Subject: [PATCH] Fix request version error --- server/lib/requests/instances-index.ts | 16 ++++++++++------ server/lib/schedulers/indexation-scheduler.ts | 1 - 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/server/lib/requests/instances-index.ts b/server/lib/requests/instances-index.ts index 210a0e7..6fc58bf 100644 --- a/server/lib/requests/instances-index.ts +++ b/server/lib/requests/instances-index.ts @@ -15,13 +15,17 @@ export async function listIndexInstancesHost (): Promise { } export async function getMajorInstanceVersion (host: string): Promise { - const { body } = await doRequest({ uri: `https://${host}/api/v1/config`, json: true }) + try { + const { body } = await doRequest({ uri: `https://${host}/api/v1/config`, json: true }) - const version = body.serverVersion + const version = body.serverVersion - const majorVersion = parseInt(version.split('.')[0]) + const majorVersion = parseInt(version.split('.')[0]) - return isNaN(majorVersion) - ? 0 - : majorVersion + return isNaN(majorVersion) + ? 0 + : majorVersion + } catch { + return 0 + } } diff --git a/server/lib/schedulers/indexation-scheduler.ts b/server/lib/schedulers/indexation-scheduler.ts index c9375d8..660539d 100644 --- a/server/lib/schedulers/indexation-scheduler.ts +++ b/server/lib/schedulers/indexation-scheduler.ts @@ -10,7 +10,6 @@ import { PlaylistIndexer } from '../indexers/playlist-indexer' import { VideoIndexer } from '../indexers/video-indexer' import { getPlaylistsOf, getVideos } from '../requests/peertube-instance' import { AbstractScheduler } from './abstract-scheduler' -import { getMajorInstanceVersion } from '../requests/instances-index' export class IndexationScheduler extends AbstractScheduler {