From 7e7c00e2cf4c2da5bee3e06d9ec89ed13d5cd9ff Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Wed, 9 Jun 2021 09:37:42 +0100
Subject: [PATCH] Fixed the Radarr issues, we are now no longer using the old
 Radarr API's that have now been removed #4215

---
 src/Ombi.Api.Radarr/RadarrV3Api.cs                            | 2 +-
 src/Ombi.HealthChecks/Checks/RadarrHealthCheck.cs             | 2 +-
 src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs                   | 4 ++--
 .../ClientApp/src/app/settings/radarr/radarr.component.html   | 4 ++--
 src/Ombi/Controllers/V1/External/TesterController.cs          | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Ombi.Api.Radarr/RadarrV3Api.cs b/src/Ombi.Api.Radarr/RadarrV3Api.cs
index c50ccb8df..9e7e0f4c2 100644
--- a/src/Ombi.Api.Radarr/RadarrV3Api.cs
+++ b/src/Ombi.Api.Radarr/RadarrV3Api.cs
@@ -41,7 +41,7 @@ namespace Ombi.Api.Radarr
 
         public async Task<SystemStatus> SystemStatus(string apiKey, string baseUrl)
         {
-            var request = new Request("/api/v3/status", baseUrl, HttpMethod.Get);
+            var request = new Request("/api/v3/system/status", baseUrl, HttpMethod.Get);
             AddHeaders(request, apiKey);
 
             return await Api.Request<SystemStatus>(request);
diff --git a/src/Ombi.HealthChecks/Checks/RadarrHealthCheck.cs b/src/Ombi.HealthChecks/Checks/RadarrHealthCheck.cs
index e365c73bb..9d5b31e5f 100644
--- a/src/Ombi.HealthChecks/Checks/RadarrHealthCheck.cs
+++ b/src/Ombi.HealthChecks/Checks/RadarrHealthCheck.cs
@@ -21,7 +21,7 @@ namespace Ombi.HealthChecks.Checks
             using (var scope = CreateScope())
             {
                 var settingsProvider = scope.ServiceProvider.GetRequiredService<ISettingsService<RadarrSettings>>();
-                var api = scope.ServiceProvider.GetRequiredService<IRadarrApi>();
+                var api = scope.ServiceProvider.GetRequiredService<IRadarrV3Api>();
                 var settings = await settingsProvider.GetSettingsAsync();
                 if (!settings.Enabled)
                 {
diff --git a/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs b/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs
index ed867fd8b..3cda06281 100644
--- a/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs
+++ b/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs
@@ -17,7 +17,7 @@ namespace Ombi.Schedule.Jobs.Radarr
 {
     public class RadarrSync : IRadarrSync
     {
-        public RadarrSync(ISettingsService<RadarrSettings> radarr, IRadarrApi radarrApi, ILogger<RadarrSync> log, ExternalContext ctx)
+        public RadarrSync(ISettingsService<RadarrSettings> radarr, IRadarrV3Api radarrApi, ILogger<RadarrSync> log, ExternalContext ctx)
         {
             RadarrSettings = radarr;
             RadarrApi = radarrApi;
@@ -27,7 +27,7 @@ namespace Ombi.Schedule.Jobs.Radarr
         }
 
         private ISettingsService<RadarrSettings> RadarrSettings { get; }
-        private IRadarrApi RadarrApi { get; }
+        private IRadarrV3Api RadarrApi { get; }
         private ILogger<RadarrSync> Logger { get; }
         private readonly ExternalContext _ctx;
 
diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
index cb5324048..b6d30998a 100644
--- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.html
@@ -56,7 +56,7 @@
                     <label for="username" class="control-label"><h3>Radarr Interface</h3></label>
                     <div class="md-form-field">
                     <div class="md-form-field" style="display:inline;">
-                        <button mat-raised-button (click)="getProfiles(form)" color="primary">Load Profiles <span *ngIf="profilesRunning" class="fas fa-spinner fa-spin"></span></button>
+                        <button mat-raised-button (click)="getProfiles(form)"  type="button" color="primary">Load Profiles <span *ngIf="profilesRunning" class="fas fa-spinner fa-spin"></span></button>
                     </div>
                     <div class="md-form-field" style="margin-top:1em;"></div>
                         <mat-form-field appearance="outline" >
@@ -71,7 +71,7 @@
                     </div>
                     <div class="md-form-field">
                         <div class="md-form-field" style="display:inline;">
-                            <button mat-raised-button (click)="getRootFolders(form)" color="primary">Load Root Folders <span *ngIf="rootFoldersRunning" class="fas fa-spinner fa-spin"></span></button>
+                            <button mat-raised-button (click)="getRootFolders(form)" type="button" color="primary">Load Root Folders <span *ngIf="rootFoldersRunning" class="fas fa-spinner fa-spin"></span></button>
                         </div>
                         <div class="md-form-field" style="margin-top:1em;"></div>
                         <mat-form-field appearance="outline" >
diff --git a/src/Ombi/Controllers/V1/External/TesterController.cs b/src/Ombi/Controllers/V1/External/TesterController.cs
index df6491578..13bf44a1d 100644
--- a/src/Ombi/Controllers/V1/External/TesterController.cs
+++ b/src/Ombi/Controllers/V1/External/TesterController.cs
@@ -45,7 +45,7 @@ namespace Ombi.Controllers.V1.External
         /// </summary>
         public TesterController(INotificationService service, IDiscordNotification notification, IEmailNotification emailN,
             IPushbulletNotification pushbullet, ISlackNotification slack, IPushoverNotification po, IMattermostNotification mm,
-            IPlexApi plex, IEmbyApiFactory emby, IRadarrApi radarr, ISonarrApi sonarr, ILogger<TesterController> log, IEmailProvider provider,
+            IPlexApi plex, IEmbyApiFactory emby, IRadarrV3Api radarr, ISonarrApi sonarr, ILogger<TesterController> log, IEmailProvider provider,
             ICouchPotatoApi cpApi, ITelegramNotification telegram, ISickRageApi srApi, INewsletterJob newsletter, ILegacyMobileNotification mobileNotification,
             ILidarrApi lidarrApi, IGotifyNotification gotifyNotification, IWhatsAppApi whatsAppApi, OmbiUserManager um, IWebhookNotification webhookNotification,
             IJellyfinApi jellyfinApi)
@@ -86,7 +86,7 @@ namespace Ombi.Controllers.V1.External
         private IWebhookNotification WebhookNotification { get; }
         private IMattermostNotification MattermostNotification { get; }
         private IPlexApi PlexApi { get; }
-        private IRadarrApi RadarrApi { get; }
+        private IRadarrV3Api RadarrApi { get; }
         private IEmbyApiFactory EmbyApi { get; }
         private ISonarrApi SonarrApi { get; }
         private ICouchPotatoApi CouchPotatoApi { get; }