diff --git a/server/api/radarr.ts b/server/api/radarr.ts index 8e8488d03..187a52ba0 100644 --- a/server/api/radarr.ts +++ b/server/api/radarr.ts @@ -242,7 +242,7 @@ class RadarrAPI extends ExternalAPI { public getProfiles = async (): Promise => { try { const data = await this.getRolling( - `/profile`, + `/qualityProfile`, undefined, 3600 ); diff --git a/server/api/sonarr.ts b/server/api/sonarr.ts index 1283c0bf8..20f16d3bd 100644 --- a/server/api/sonarr.ts +++ b/server/api/sonarr.ts @@ -291,7 +291,7 @@ class SonarrAPI extends ExternalAPI { public async getProfiles(): Promise { try { const data = await this.getRolling( - '/profile', + '/qualityProfile', undefined, 3600 ); @@ -331,7 +331,7 @@ class SonarrAPI extends ExternalAPI { public async getLanguageProfiles(): Promise { try { const data = await this.getRolling( - '/v3/languageprofile', + '/languageprofile', undefined, 3600 ); diff --git a/server/entity/MediaRequest.ts b/server/entity/MediaRequest.ts index 206d2d393..658aee679 100644 --- a/server/entity/MediaRequest.ts +++ b/server/entity/MediaRequest.ts @@ -387,9 +387,7 @@ export class MediaRequest { const tmdb = new TheMovieDb(); const radarr = new RadarrAPI({ apiKey: radarrSettings.apiKey, - url: `${radarrSettings.useSsl ? 'https' : 'http'}://${ - radarrSettings.hostname - }:${radarrSettings.port}${radarrSettings.baseUrl ?? ''}/api`, + url: RadarrAPI.buildRadarrUrl(radarrSettings, '/api/v3'), }); const movie = await tmdb.getMovie({ movieId: this.media.tmdbId }); @@ -535,9 +533,7 @@ export class MediaRequest { const tmdb = new TheMovieDb(); const sonarr = new SonarrAPI({ apiKey: sonarrSettings.apiKey, - url: `${sonarrSettings.useSsl ? 'https' : 'http'}://${ - sonarrSettings.hostname - }:${sonarrSettings.port}${sonarrSettings.baseUrl ?? ''}/api`, + url: SonarrAPI.buildSonarrUrl(sonarrSettings, '/api/v3'), }); const series = await tmdb.getTvShow({ tvId: media.tmdbId }); const tvdbId = series.external_ids.tvdb_id ?? media.tvdbId; diff --git a/server/routes/service.ts b/server/routes/service.ts index 8bf4ffce8..5e6dccc84 100644 --- a/server/routes/service.ts +++ b/server/routes/service.ts @@ -46,9 +46,7 @@ serviceRoutes.get<{ radarrId: string }>( const radarr = new RadarrAPI({ apiKey: radarrSettings.apiKey, - url: `${radarrSettings.useSsl ? 'https' : 'http'}://${ - radarrSettings.hostname - }:${radarrSettings.port}${radarrSettings.baseUrl ?? ''}/api`, + url: RadarrAPI.buildRadarrUrl(radarrSettings, '/api/v3'), }); const profiles = await radarr.getProfiles(); @@ -116,9 +114,7 @@ serviceRoutes.get<{ sonarrId: string }>( const sonarr = new SonarrAPI({ apiKey: sonarrSettings.apiKey, - url: `${sonarrSettings.useSsl ? 'https' : 'http'}://${ - sonarrSettings.hostname - }:${sonarrSettings.port}${sonarrSettings.baseUrl ?? ''}/api`, + url: SonarrAPI.buildSonarrUrl(sonarrSettings, '/api/v3'), }); try { diff --git a/server/routes/settings/radarr.ts b/server/routes/settings/radarr.ts index 1bbcf2088..1e17a4757 100644 --- a/server/routes/settings/radarr.ts +++ b/server/routes/settings/radarr.ts @@ -39,9 +39,7 @@ radarrRoutes.post('/test', async (req, res, next) => { try { const radarr = new RadarrAPI({ apiKey: req.body.apiKey, - url: `${req.body.useSsl ? 'https' : 'http'}://${req.body.hostname}:${ - req.body.port - }${req.body.baseUrl ?? ''}/api`, + url: RadarrAPI.buildRadarrUrl(req.body, '/api/v3'), }); const profiles = await radarr.getProfiles(); @@ -112,9 +110,7 @@ radarrRoutes.get<{ id: string }>('/:id/profiles', async (req, res) => { const radarr = new RadarrAPI({ apiKey: radarrSettings.apiKey, - url: `${radarrSettings.useSsl ? 'https' : 'http'}://${ - radarrSettings.hostname - }:${radarrSettings.port}${radarrSettings.baseUrl ?? ''}/api`, + url: RadarrAPI.buildRadarrUrl(radarrSettings, '/api/v3'), }); const profiles = await radarr.getProfiles(); diff --git a/server/routes/settings/sonarr.ts b/server/routes/settings/sonarr.ts index 71627b78c..d9bbe3c2c 100644 --- a/server/routes/settings/sonarr.ts +++ b/server/routes/settings/sonarr.ts @@ -39,9 +39,7 @@ sonarrRoutes.post('/test', async (req, res, next) => { try { const sonarr = new SonarrAPI({ apiKey: req.body.apiKey, - url: `${req.body.useSsl ? 'https' : 'http'}://${req.body.hostname}:${ - req.body.port - }${req.body.baseUrl ?? ''}/api`, + url: SonarrAPI.buildSonarrUrl(req.body, '/api/v3'), }); const profiles = await sonarr.getProfiles();